From ccff383d447e3f0a8206144c0090d14ede893920 Mon Sep 17 00:00:00 2001
From: Glenn Randers-Pehrson <glennrp at users.sourceforge.net>
Date: Fri, 9 Sep 2011 07:55:25 -0500
Subject: [PATCH] [libpng15] Relocated new HAVE_SOLARIS_LD definition in
 configure.ac

---
 ANNOUNCE     |  1 +
 CHANGES      |  1 +
 configure    | 21 +++++++++++----------
 configure.ac | 19 ++++++++++---------
 4 files changed, 23 insertions(+), 19 deletions(-)

diff --git a/ANNOUNCE b/ANNOUNCE
index e86ad55c0..779bf6dca 100644
--- a/ANNOUNCE
+++ b/ANNOUNCE
@@ -93,6 +93,7 @@ Version 1.5.5beta08 [September 9, 2011]
     world (uLong and png_size_t) become 64 bits in the 64-bit
     world.  This produces potential truncation errors which the
     compiler correctly flags.
+  Relocated new HAVE_SOLARIS_LD definition configure.ac
 
 Send comments/corrections/commendations to png-mng-implement at lists.sf.net:
 (subscription required; visit
diff --git a/CHANGES b/CHANGES
index 8511a73b0..cb4a6e564 100644
--- a/CHANGES
+++ b/CHANGES
@@ -3577,6 +3577,7 @@ Version 1.5.5beta08 [September 9, 2011]
     world (uLong and png_size_t) become 64 bits in the 64-bit
     world.  This produces potential truncation errors which the
     compiler correctly flags.
+  Relocated new HAVE_SOLARIS_LD definition configure.ac
 
 Send comments/corrections/commendations to png-mng-implement at lists.sf.net
 (subscription required; visit
diff --git a/configure b/configure
index 8decf1c22..79d9e2d5d 100755
--- a/configure
+++ b/configure
@@ -12409,16 +12409,6 @@ LIBPNG_DEFINES=$LIBPNG_DEFINES
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking if libraries can be versioned" >&5
 $as_echo_n "checking if libraries can be versioned... " >&6; }
-# Special case for PE/COFF platforms: ld reports
-# support for version-script, but doesn't actually
-# DO anything with it.
-case $host in
-*cygwin* | *mingw32* | *interix* )
-    have_ld_version_script=no
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-;;
-* )
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking if using Solaris linker" >&5
 $as_echo_n "checking if using Solaris linker... " >&6; }
@@ -12441,6 +12431,17 @@ else
 fi
 
 
+# Special case for PE/COFF platforms: ld reports
+# support for version-script, but doesn't actually
+# DO anything with it.
+case $host in
+*cygwin* | *mingw32* | *interix* )
+    have_ld_version_script=no
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+;;
+* )
+
 if test "$have_solaris_ld" = "yes"; then
     GLD=`$LD --help < /dev/null 2>&1 | grep 'M mapfile'`
 else
diff --git a/configure.ac b/configure.ac
index 3d94274e7..9a168516a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -95,15 +95,6 @@ LIBPNG_DEFINES=$LIBPNG_DEFINES
 AC_SUBST(LIBPNG_DEFINES)
 
 AC_MSG_CHECKING([if libraries can be versioned])
-# Special case for PE/COFF platforms: ld reports
-# support for version-script, but doesn't actually
-# DO anything with it.
-case $host in
-*cygwin* | *mingw32* | *interix* )
-    have_ld_version_script=no
-    AC_MSG_RESULT(no)
-;;
-* )
 
 AC_MSG_CHECKING([if using Solaris linker])
 SLD=`$LD --version 2>&1 | grep Solaris`
@@ -116,6 +107,16 @@ else
 fi
 AM_CONDITIONAL(HAVE_SOLARIS_LD, test "$have_solaris_ld" = "yes")
 
+# Special case for PE/COFF platforms: ld reports
+# support for version-script, but doesn't actually
+# DO anything with it.
+case $host in
+*cygwin* | *mingw32* | *interix* )
+    have_ld_version_script=no
+    AC_MSG_RESULT(no)
+;;
+* )
+
 if test "$have_solaris_ld" = "yes"; then
     GLD=`$LD --help < /dev/null 2>&1 | grep 'M mapfile'`
 else