cvs: php4 /ext/gd config.m4
| From: | Sascha Schumann | Date: | Wed, 23 Aug 2000 12:28:48 +0000 |
| Subject: | cvs: php4 /ext/gd config.m4 | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-1337@lists.php.net to get a copy of this message | ||
sas Wed Aug 23 05:28:48 2000 EDT
Modified files:
/php4/ext/gd config.m4
Log:
Fix library order for -lpng -lz.
PR: #3978
Index: php4/ext/gd/config.m4
diff -u php4/ext/gd/config.m4:1.35 php4/ext/gd/config.m4:1.36
--- php4/ext/gd/config.m4:1.35 Mon Jun 26 08:23:52 2000
+++ php4/ext/gd/config.m4 Wed Aug 23 05:28:48 2000
@@ -70,8 +70,8 @@
AC_CHECK_LIB(gd, gdImageString16, [ AC_DEFINE(HAVE_LIBGD13,1,[ ]) ])
AC_CHECK_LIB(gd, gdImagePaletteCopy, [ AC_DEFINE(HAVE_LIBGD15,1,[ ]) ])
AC_CHECK_LIB(gd, gdImageColorClosestHWB, [ AC_DEFINE(HAVE_COLORCLOSESTHWB,1,[ ]) ])
- AC_CHECK_LIB(z,compress, LIBS="$LIBS -lz",,)
- AC_CHECK_LIB(png,png_info_init, LIBS="$LIBS -lpng",,)
+ AC_CHECK_LIB(z,compress, LIBS="-lz $LIBS",,)
+ AC_CHECK_LIB(png,png_info_init, LIBS="-lpng $LIBS",,)
AC_CHECK_LIB(gd, gdImageColorResolve, [AC_DEFINE(HAVE_GDIMAGECOLORRESOLVE,1,[ ])])
dnl Some versions of GD support both PNG and GIF. Check for both.
AC_CHECK_LIB(gd, gdImageCreateFromPng, [AC_DEFINE(HAVE_GD_PNG, 1, [ ])])
@@ -126,8 +126,8 @@
LDFLAGS="$LDFLAGS -L$GD_LIB"
old_LIBS=$LIBS
AC_CHECK_LIB(gd, gdImageString16, [ AC_DEFINE(HAVE_LIBGD13,1, [ ]) ])
- AC_CHECK_LIB(z,compress, LIBS="$LIBS -lz",,)
- AC_CHECK_LIB(png,png_info_init, LIBS="$LIBS -lpng",,)
+ AC_CHECK_LIB(z,compress, LIBS="-lz $LIBS",,)
+ AC_CHECK_LIB(png,png_info_init, LIBS="-lpng $LIBS",,)
AC_CHECK_LIB(gd, gdImageColorResolve, [AC_DEFINE(HAVE_GDIMAGECOLORRESOLVE,1,[ ])])
AC_CHECK_LIB(gd, gdImageCreateFromPng, [AC_DEFINE(HAVE_GD_PNG, 1, [ ])])
AC_CHECK_LIB(gd, gdImageCreateFromGif, [AC_DEFINE(HAVE_GD_GIF, 1, [ ])])
@@ -154,8 +154,8 @@
if test "$ac_cv_lib_gd_gdImageLine" = "yes"; then
old_LIBS=$LIBS
AC_CHECK_LIB(gd, gdImageString16, [ AC_DEFINE(HAVE_LIBGD13,1, [ ]) ])
- AC_CHECK_LIB(z,compress, LIBS="$LIBS -lz",,)
- AC_CHECK_LIB(png,png_info_init, LIBS="$LIBS -lpng",,)
+ AC_CHECK_LIB(z,compress, LIBS="-lz $LIBS",,)
+ AC_CHECK_LIB(png,png_info_init, LIBS="-lpng $LIBS",,)
AC_CHECK_LIB(gd, gdImageColorResolve, [AC_DEFINE(HAVE_GDIMAGECOLORRESOLVE,1, [ ])])
AC_CHECK_LIB(gd, gdImageCreateFromPng, [AC_DEFINE(HAVE_GD_PNG, 1, [ ])])
AC_CHECK_LIB(gd, gdImageCreateFromGif, [AC_DEFINE(HAVE_GD_GIF, 1, [ ])])