[libpng15] Relocated new HAVE_SOLARIS_LD definition in configure.ac
This commit is contained in:
parent
f3f7e14727
commit
ccff383d44
1
ANNOUNCE
1
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 (uLong and png_size_t) become 64 bits in the 64-bit
|
||||||
world. This produces potential truncation errors which the
|
world. This produces potential truncation errors which the
|
||||||
compiler correctly flags.
|
compiler correctly flags.
|
||||||
|
Relocated new HAVE_SOLARIS_LD definition configure.ac
|
||||||
|
|
||||||
Send comments/corrections/commendations to png-mng-implement at lists.sf.net:
|
Send comments/corrections/commendations to png-mng-implement at lists.sf.net:
|
||||||
(subscription required; visit
|
(subscription required; visit
|
||||||
|
1
CHANGES
1
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 (uLong and png_size_t) become 64 bits in the 64-bit
|
||||||
world. This produces potential truncation errors which the
|
world. This produces potential truncation errors which the
|
||||||
compiler correctly flags.
|
compiler correctly flags.
|
||||||
|
Relocated new HAVE_SOLARIS_LD definition configure.ac
|
||||||
|
|
||||||
Send comments/corrections/commendations to png-mng-implement at lists.sf.net
|
Send comments/corrections/commendations to png-mng-implement at lists.sf.net
|
||||||
(subscription required; visit
|
(subscription required; visit
|
||||||
|
21
configure
vendored
21
configure
vendored
@ -12409,16 +12409,6 @@ LIBPNG_DEFINES=$LIBPNG_DEFINES
|
|||||||
|
|
||||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if libraries can be versioned" >&5
|
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if libraries can be versioned" >&5
|
||||||
$as_echo_n "checking if libraries can be versioned... " >&6; }
|
$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 "$as_me:${as_lineno-$LINENO}: checking if using Solaris linker" >&5
|
||||||
$as_echo_n "checking if using Solaris linker... " >&6; }
|
$as_echo_n "checking if using Solaris linker... " >&6; }
|
||||||
@ -12441,6 +12431,17 @@ else
|
|||||||
fi
|
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
|
if test "$have_solaris_ld" = "yes"; then
|
||||||
GLD=`$LD --help < /dev/null 2>&1 | grep 'M mapfile'`
|
GLD=`$LD --help < /dev/null 2>&1 | grep 'M mapfile'`
|
||||||
else
|
else
|
||||||
|
19
configure.ac
19
configure.ac
@ -95,15 +95,6 @@ LIBPNG_DEFINES=$LIBPNG_DEFINES
|
|||||||
AC_SUBST(LIBPNG_DEFINES)
|
AC_SUBST(LIBPNG_DEFINES)
|
||||||
|
|
||||||
AC_MSG_CHECKING([if libraries can be versioned])
|
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])
|
AC_MSG_CHECKING([if using Solaris linker])
|
||||||
SLD=`$LD --version 2>&1 | grep Solaris`
|
SLD=`$LD --version 2>&1 | grep Solaris`
|
||||||
@ -116,6 +107,16 @@ else
|
|||||||
fi
|
fi
|
||||||
AM_CONDITIONAL(HAVE_SOLARIS_LD, test "$have_solaris_ld" = "yes")
|
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
|
if test "$have_solaris_ld" = "yes"; then
|
||||||
GLD=`$LD --help < /dev/null 2>&1 | grep 'M mapfile'`
|
GLD=`$LD --help < /dev/null 2>&1 | grep 'M mapfile'`
|
||||||
else
|
else
|
||||||
|
Loading…
Reference in New Issue
Block a user