From ad8b7b71b4753b5f7f2f9180f8f2936990faff49 Mon Sep 17 00:00:00 2001
From: Glenn Randers-Pehrson <glennrp at users.sourceforge.net>
Date: Thu, 1 Sep 2011 19:38:08 -0500
Subject: [PATCH] [devel] Add SunOS support to configure and Makefile.am

---
 Makefile.am  | 2 +-
 Makefile.in  | 2 +-
 configure    | 3 ---
 configure.ac | 2 --
 4 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 69fa5d9f7..c80f0ce89 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -46,7 +46,7 @@ libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@_la_LDFLAGS = -no-undefined -export-dynamic \
 if HAVE_LD_VERSION_SCRIPT
 #   Versioned symbols and restricted exports
 if HAVE_SOLARIS_LD
-  libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@_la_LDFLAGS += -Wl,-M -Ll,libpng.vers
+  libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@_la_LDFLAGS += -Wl,-M Wl,libpng.vers
 else
   libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@_la_LDFLAGS += -Wl,--version-script=libpng.vers
 endif
diff --git a/Makefile.in b/Makefile.in
index ce1f82fed..cd7b99800 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -43,7 +43,7 @@ host_triplet = @host@
 check_PROGRAMS = pngtest$(EXEEXT) pngvalid$(EXEEXT)
 
 #   Versioned symbols and restricted exports
-@HAVE_LD_VERSION_SCRIPT_TRUE@@HAVE_SOLARIS_LD_TRUE@am__append_1 = -Wl,-M -Ll,libpng.vers
+@HAVE_LD_VERSION_SCRIPT_TRUE@@HAVE_SOLARIS_LD_TRUE@am__append_1 = -Wl,-M Wl,libpng.vers
 @HAVE_LD_VERSION_SCRIPT_TRUE@@HAVE_SOLARIS_LD_FALSE@am__append_2 = -Wl,--version-script=libpng.vers
 #   Only restricted exports when possible
 @HAVE_LD_VERSION_SCRIPT_FALSE@am__append_3 = -export-symbols libpng.sym
diff --git a/configure b/configure
index 6755b2519..4b9802543 100755
--- a/configure
+++ b/configure
@@ -12441,15 +12441,12 @@ else
 fi
 
 
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking if libraries can be versioned" >&5
-$as_echo_n "checking if libraries can be versioned... " >&6; }
 if test "$have_solaris_ld" = "yes"; then
     GLD=`$LD --help < /dev/null 2>&1 | grep 'M mapfile'`
 else
     GLD=`$LD --help < /dev/null 2>/dev/null | grep version-script`
 fi
 
- if test "$GLD"; then
 if test "$GLD"; then
     have_ld_version_script=yes
     { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
diff --git a/configure.ac b/configure.ac
index 0d0b72405..5e653429d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -116,14 +116,12 @@ else
 fi
 AM_CONDITIONAL(HAVE_SOLARIS_LD, test "$have_solaris_ld" = "yes")
 
- AC_MSG_CHECKING([if libraries can be versioned])
 if test "$have_solaris_ld" = "yes"; then
     GLD=`$LD --help < /dev/null 2>&1 | grep 'M mapfile'`
 else
     GLD=`$LD --help < /dev/null 2>/dev/null | grep version-script`
 fi
 
- if test "$GLD"; then
 if test "$GLD"; then
     have_ld_version_script=yes
     AC_MSG_RESULT(yes)