From 4c1eaadf38832729bc6fb2d26d0a6ee57a59d363 Mon Sep 17 00:00:00 2001
From: John Bowler <jbowler@acm.org>
Date: Wed, 6 Feb 2013 18:42:53 -0600
Subject: [PATCH] [libpng15] Turn serial tests back on (recently turned off by
 autotools upgrade).

---
 ANNOUNCE     |  6 ++++--
 CHANGES      |  4 +++-
 configure.ac | 33 ++++++++-------------------------
 3 files changed, 15 insertions(+), 28 deletions(-)

diff --git a/ANNOUNCE b/ANNOUNCE
index 910004bf0..c9972150d 100644
--- a/ANNOUNCE
+++ b/ANNOUNCE
@@ -1,5 +1,5 @@
 
-Libpng 1.5.15beta03 - February 5, 2013
+Libpng 1.5.15beta03 - February 7, 2013
 
 This is not intended to be a public release.  It will be replaced
 within a few weeks by a public version or by another test version.
@@ -41,7 +41,9 @@ Version 1.5.15beta02 [February 5, 2013]
   Rebuilt Makefile.in, configure, etc., with autoconf-2.69 and automake-1.13
   Fix 'setting' handling in options.awk and fixed palette_max API
 
-Version 1.5.15beta03 [February 5, 2013]
+Version 1.5.15beta03 [February 7, 2013]
+  Remove SUN OS cc -E workround - no longer required
+  Turn serial tests back on (recently turned off by autotools upgrade).
 
 Send comments/corrections/commendations to png-mng-implement at lists.sf.net
 (subscription required; visit
diff --git a/CHANGES b/CHANGES
index f22a935ba..dd773f695 100644
--- a/CHANGES
+++ b/CHANGES
@@ -3998,7 +3998,9 @@ Version 1.5.15beta02 [February 5, 2013]
   Rebuilt Makefile.in, configure, etc., with autoconf-2.69 and automake-1.13
   Fix 'setting' handling in options.awk and fixed palette_max API
 
-Version 1.5.15beta03 [February 5, 2013]
+Version 1.5.15beta03 [February 7, 2013]
+  Remove SUN OS cc -E workround - no longer required
+  Turn serial tests back on (recently turned off by autotools upgrade).
 
   ===========================================================================
                        NOTICE November 17, 2012:
diff --git a/configure.ac b/configure.ac
index c2c65c674..d1ca44892 100644
--- a/configure.ac
+++ b/configure.ac
@@ -19,7 +19,7 @@ AC_PREREQ(2.59)
 dnl Version number stuff here:
 
 AC_INIT([libpng], [1.5.15beta03], [png-mng-implement@lists.sourceforge.net])
-AM_INIT_AUTOMAKE
+AM_INIT_AUTOMAKE([serial-tests])
 dnl stop configure from automagically running automake
 AM_MAINTAINER_MODE
 
@@ -39,35 +39,13 @@ AC_PROG_CC
 AM_PROG_AS
 AC_PROG_LD
 AC_PROG_CPP
-AC_CHECK_TOOL(SED, sed, :)
-AC_CHECK_TOOL(AWK, awk, :)
+AC_PROG_SED
+AC_PROG_AWK
 AC_PROG_INSTALL
 AC_PROG_LN_S
 AC_PROG_MAKE_SET
 LT_INIT([win32-dll])
 
-# On Solaris 10 and 12 CPP gets set to cc -E, however this still
-# does some input parsing.  We need strict ANSI-C style tokenization,
-# check this:
-AC_REQUIRE_CPP
-AC_MSG_CHECKING([for a C preprocessor that does not parse its input])
-AC_TRY_CPP([1.5.0 16BIT],
-   [DFNCPP="$CPP"],
-   [DFNCPP=""
-   sav_CPP="$CPP"
-   for CPP in "${CC-cc} -E" "${CC-cc} -E -traditional-cpp" "/lib/cpp" "cpp"; do
-      AC_TRY_CPP([1.5.0 16BIT],
-         [DFNCPP="$CPP"]
-         [break],,)
-   done
-   CPP="$sav_CPP"])
-if test -n "$DFNCPP"; then
-   AC_MSG_RESULT([$DFNCPP])
-   AC_SUBST(DFNCPP)
-else
-   AC_MSG_FAILURE([not found], 1)
-fi
-
 # Checks for header files.
 AC_HEADER_STDC
 AC_CHECK_HEADERS([malloc.h stdlib.h string.h strings.h])
@@ -78,6 +56,11 @@ AC_TYPE_SIZE_T
 AC_STRUCT_TM
 AC_C_RESTRICT
 
+# This is a remnant of the old cc -E validation, where it may have been
+# necessary to use a different preprocessor for .dfn files
+DFNCPP="$CPP"
+AC_SUBST(DFNCPP)
+
 # Checks for library functions.
 AC_FUNC_STRTOD
 AC_CHECK_FUNCS([memset], , AC_ERROR([memset not found in libc]))