[libpng15] Do not depend upon a GCC feature macro being available for use in
generating the linker mapfile symbol prefix.
diff --git a/ANNOUNCE b/ANNOUNCE
index 4f44fac..06fe692 100644
--- a/ANNOUNCE
+++ b/ANNOUNCE
@@ -1,5 +1,5 @@
-Libpng 1.5.11rc03 - May 29, 2012
+Libpng 1.5.11rc03 - June 4, 2012
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.
@@ -47,7 +47,9 @@
and renamed three whose names were inconsistent with those in
pngsuite/README.txt.
-Version 1.5.11rc03 [May 29, 2012]
+Version 1.5.11rc03 [June 4, 2012]
+ Do not depend upon a GCC feature macro being available for use in generating
+ the linker mapfile symbol prefix.
Send comments/corrections/commendations to png-mng-implement at lists.sf.net:
(subscription required; visit
diff --git a/CHANGES b/CHANGES
index 5036f4f..a98cedb 100644
--- a/CHANGES
+++ b/CHANGES
@@ -3875,7 +3875,9 @@
and renamed three whose names were inconsistent with those in
pngsuite/README.txt.
-Version 1.5.11rc03 [May 29, 2012]
+Version 1.5.11rc03 [June 4, 2012]
+ Do not depend upon a GCC feature macro being available for use in generating
+ the linker mapfile symbol prefix.
Send comments/corrections/commendations to png-mng-implement at lists.sf.net
(subscription required; visit
diff --git a/configure.ac b/configure.ac
index 0f51e90..7e5dd0b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -145,9 +145,9 @@
if test "$have_ld_version_script" = "yes"; then
AC_MSG_CHECKING([for symbol prefix])
SYMBOL_PREFIX=`echo "PREFIX=__USER_LABEL_PREFIX__" \
- | ${CPP-${CC-gcc} -E} - 2>&1 \
- | ${EGREP-grep} "^PREFIX=" \
- | ${SED-sed} "s:^PREFIX=::"`
+ | ${CPP-${CC-gcc} -E} - 2>&1 \
+ | ${EGREP-grep} "^PREFIX=" \
+ | ${SED-sed} -e "s:^PREFIX=::" -e "s:__USER_LABEL_PREFIX__::"`
AC_SUBST(SYMBOL_PREFIX)
AC_MSG_RESULT($SYMBOL_PREFIX)
fi
