cvs: /php3 ChangeLog configure.in
| From: | Rasmus Lerdorf | Date: | Tue, 04 Jan 2000 02:18:45 +0000 |
| Subject: | cvs: /php3 ChangeLog configure.in | ||
| Groups: | php.dev | ||
| Request: | Send a blank email to php-dev+get-14244@lists.php.net to get a copy of this message | ||
rasmus Mon Jan 3 21:18:45 2000 EDT
Modified files:
/php3 ChangeLog configure.in
Log:
Fixed broken GD autoconf check - GIF support was not detected unless libpng
and libz were both installed.
Index: php3/ChangeLog
diff -u php3/ChangeLog:1.806 php3/ChangeLog:1.807
--- php3/ChangeLog:1.806 Fri Dec 31 23:33:19 1999
+++ php3/ChangeLog Mon Jan 3 21:18:44 2000
@@ -1,5 +1,8 @@
PHP 3.0 CHANGE LOG ChangeLog
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
+??
+- Fixed broken GD autoconf check - GIF support was not detected unless libpng
+ and libz were both installed on the system (Rasmus)
January 1, 2000, Version 3.0.13
- Fixed timezone conflict on AIX (Sascha)
Index: php3/configure.in
diff -u php3/configure.in:1.485 php3/configure.in:1.486
--- php3/configure.in:1.485 Mon Jan 3 13:25:27 2000
+++ php3/configure.in Mon Jan 3 21:18:44 2000
@@ -1,4 +1,4 @@
-dnl $Id: configure.in,v 1.485 2000/01/03 18:25:27 kk Exp $
+dnl $Id: configure.in,v 1.486 2000/01/04 02:18:44 rasmus Exp $
dnl Process this file with autoconf to produce a configure script.
AC_INIT(main.c)
@@ -779,7 +779,8 @@
AC_MSG_RESULT(yes)
AC_CHECK_LIB(gd, gdImageLzw, [ AC_DEFINE(HAVE_LIBGD_LZW) ])
old_LIBS=$LIBS
- LIBS="$LIBS -lpng -lz"
+ AC_CHECK_LIB(z,compress, LIBS="$LIBS -lz",,)
+ AC_CHECK_LIB(png,png_info_init, LIBS="$LIBS -lpng",,)
AC_CHECK_LIB(gd, gdImageCreateFromPng, [AC_DEFINE(HAVE_GD_PNG)])
AC_CHECK_LIB(gd, gdImageCreateFromGif, [AC_DEFINE(HAVE_GD_GIF)])
AC_CHECK_LIB(gd, gdImageColorResolve, [ AC_DEFINE(HAVE_GDIMAGECOLORRESOLVE) ])
@@ -834,7 +835,8 @@
LDFLAGS="$LDFLAGS -L$GD_LIB"
AC_CHECK_LIB(gd, gdImageLzw, [ AC_DEFINE(HAVE_LIBGD_LZW) ])
old_LIBS=$LIBS
- LIBS="$LIBS -lpng -lz"
+ AC_CHECK_LIB(z,compress, LIBS="$LIBS -lz",,)
+ AC_CHECK_LIB(png,png_info_init, LIBS="$LIBS -lpng",,)
AC_CHECK_LIB(gd, gdImageCreateFromPng, [AC_DEFINE(HAVE_GD_PNG)])
AC_CHECK_LIB(gd, gdImageCreateFromGif, [AC_DEFINE(HAVE_GD_GIF)])
AC_CHECK_LIB(gd, gdImageColorResolve, [ AC_DEFINE(HAVE_GDIMAGECOLORRESOLVE) ])
@@ -860,7 +862,8 @@
])
AC_CHECK_LIB(gd, gdImageLzw, [ AC_DEFINE(HAVE_LIBGD_LZW) ])
old_LIBS=$LIBS
- LIBS="$LIBS -lpng -lz"
+ AC_CHECK_LIB(z,compress, LIBS="$LIBS -lz",,)
+ AC_CHECK_LIB(png,png_info_init, LIBS="$LIBS -lpng",,)
AC_CHECK_LIB(gd, gdImageCreateFromPng, [AC_DEFINE(HAVE_GD_PNG)])
AC_CHECK_LIB(gd, gdImageCreateFromGif, [AC_DEFINE(HAVE_GD_GIF)])
AC_CHECK_LIB(gd, gdImageColorResolve, [ AC_DEFINE(HAVE_GDIMAGECOLORRESOLVE) ])