CVS update: php3

Date: Friday July 2, 1999 @ 9:18 Author: markonen Update of /repository/php3 In directory php:/tmp/cvs-serv12070 Modified Files: config.h.in configure.in Log Message: Starting the work for supporting the new features in recent GD versions. Index: php3/config.h.in diff -u php3/config.h.in:1.177 php3/config.h.in:1.178 --- php3/config.h.in:1.177 Wed Jun 30 20:03:52 1999 +++ php3/config.h.in Fri Jul 2 09:18:50 1999 @@ -152,6 +152,15 @@ /* Define if you have the zlib library */ #define HAVE_ZLIB 0 +/* Define if you have the gd version 1.5 library with the LZW option. */ +#define HAVE_LIBGD_LZW 0 + +/* Define if you have the gd version 1.5 library (-lgd). */ +#define HAVE_LIBGD15 0 + +/* Define if you have the gd version 1.4 library (-lgd). */ +#define HAVE_LIBGD14 0 + /* Define if you have the gd version 1.3 library (-lgd). */ #define HAVE_LIBGD13 0 Index: php3/configure.in diff -u php3/configure.in:1.423 php3/configure.in:1.424 --- php3/configure.in:1.423 Thu Jul 1 08:04:05 1999 +++ php3/configure.in Fri Jul 2 09:18:50 1999 @@ -1,4 +1,4 @@ -dnl $Id: configure.in,v 1.423 1999/07/01 12:04:05 sas Exp $ +dnl $Id: configure.in,v 1.424 1999/07/02 13:18:50 markonen Exp $ dnl Process this file with autoconf to produce a configure script. AC_INIT(main.c) @@ -684,23 +684,34 @@ AC_ADD_LIBRARY(gd) AC_DEFINE(HAVE_LIBGD) AC_MSG_RESULT(yes) - AC_CHECK_LIB(gd, gdImageString16, [ AC_DEFINE(HAVE_LIBGD13) ]) + AC_CHECK_LIB(gd, gdImageLzw, [ AC_DEFINE(HAVE_LIBGD_LZW) ]) + AC_CHECK_LIB(gd, gdImageCopyMerge, [ AC_DEFINE(HAVE_LIBGD13) ]) + AC_CHECK_LIB(gd, gdImageGifToSink, [ AC_DEFINE(HAVE_LIBGD14) ]) + AC_CHECK_LIB(gd, gdImageString16, [ AC_DEFINE(HAVE_LIBGD15) ]) ac_cv_lib_gd_gdImageLine=yes ;; *) dnl A whole whack of possible places where this might be + test -f $withval/include/gd1.5/gd.h && GD_INCLUDE="$withval/include/gd1.5" + test -f $withval/include/gd1.4/gd.h && GD_INCLUDE="$withval/include/gd1.4" test -f $withval/include/gd1.3/gd.h && GD_INCLUDE="$withval/include/gd1.3" test -f $withval/include/gd/gd.h && GD_INCLUDE="$withval/include/gd" test -f $withval/include/gd.h && GD_INCLUDE="$withval/include" + test -f $withval/gd1.5/gd.h && GD_INCLUDE="$withval/gd1.5" + test -f $withval/gd1.4/gd.h && GD_INCLUDE="$withval/gd1.4" test -f $withval/gd1.3/gd.h && GD_INCLUDE="$withval/gd1.3" test -f $withval/gd/gd.h && GD_INCLUDE="$withval/gd" test -f $withval/gd.h && GD_INCLUDE="$withval" test -f $withval/lib/libgd.a && GD_LIB="$withval/lib" test -f $withval/lib/gd/libgd.a && GD_LIB="$withval/lib/gd" + test -f $withval/lib/gd1.5/libgd.a && GD_LIB="$withval/lib/gd1.5" + test -f $withval/lib/gd1.4/libgd.a && GD_LIB="$withval/lib/gd1.4" test -f $withval/lib/gd1.3/libgd.a && GD_LIB="$withval/lib/gd1.3" test -f $withval/libgd.a && GD_LIB="$withval" test -f $withval/gd/libgd.a && GD_LIB="$withval/gd" + test -f $withval/gd1.5/libgd.a && GD_LIB="$withval/gd1.5" + test -f $withval/gd1.4/libgd.a && GD_LIB="$withval/gd1.4" test -f $withval/gd1.3/libgd.a && GD_LIB="$withval/gd1.3" if test -n "$GD_INCLUDE" && test -n "$GD_LIB" ; then @@ -710,7 +721,10 @@ AC_MSG_RESULT(yes) old_LDFLAGS=$LDFLAGS LDFLAGS="$LDFLAGS -L$GD_LIB" - AC_CHECK_LIB(gd, gdImageString16, [ AC_DEFINE(HAVE_LIBGD13) ]) + AC_CHECK_LIB(gd, gdImageLzw, [ AC_DEFINE(HAVE_LIBGD_LZW) ]) + AC_CHECK_LIB(gd, gdImageCopyMerge, [ AC_DEFINE(HAVE_LIBGD13) ]) + AC_CHECK_LIB(gd, gdImageGifToSink, [ AC_DEFINE(HAVE_LIBGD14) ]) + AC_CHECK_LIB(gd, gdImageString16, [ AC_DEFINE(HAVE_LIBGD15) ]) LDFLAGS=$old_LDFLAGS; ac_cv_lib_gd_gdImageLine=yes else @@ -722,7 +736,10 @@ AC_DEFINE(HAVE_LIBGD) AC_ADD_LIBRARY(gd) ]) - AC_CHECK_LIB(gd, gdImageString16, [ AC_DEFINE(HAVE_LIBGD13) ]) + AC_CHECK_LIB(gd, gdImageLzw, [ AC_DEFINE(HAVE_LIBGD_LZW) ]) + AC_CHECK_LIB(gd, gdImageCopyMerge, [ AC_DEFINE(HAVE_LIBGD13) ]) + AC_CHECK_LIB(gd, gdImageGifToSink, [ AC_DEFINE(HAVE_LIBGD14) ]) + AC_CHECK_LIB(gd, gdImageString16, [ AC_DEFINE(HAVE_LIBGD15) ]) ]) if test -f /usr/pkg/include/gd/gd.h -a -z "$GD_INCLUDE" ; then AC_ADD_INCLUDE(/usr/pkg/include/gd)