CVS update: php3

Date: Sunday June 20, 1999 @ 14:14 Author: sas Update of /repository/php3 In directory php:/tmp/cvs-serv10653 Modified Files: Makefile.in config.h.in configure.in libphp3.module.in Log Message: Use AC_ADD_* for SNMP, GETTEXT and GD Index: php3/Makefile.in diff -u php3/Makefile.in:1.322 php3/Makefile.in:1.323 --- php3/Makefile.in:1.322 Sun Jun 20 08:38:37 1999 +++ php3/Makefile.in Sun Jun 20 14:14:53 1999 @@ -24,7 +24,7 @@ # +----------------------------------------------------------------------+ # -# $Id: Makefile.in,v 1.322 1999/06/20 12:38:37 sas Exp $ +# $Id: Makefile.in,v 1.323 1999/06/20 18:14:53 sas Exp $ # prefix = @prefix@ @@ -38,7 +38,7 @@ AR = ar rc BINNAME = @BINNAME@ INSTALL_IT = @INSTALL_IT@ -INCLUDE = -I$(srcdir) -I. @GDBM_INCLUDE@ @ORACLE_INCLUDE@ @APACHE_INCLUDE@ @FHTTPD_INCLUDE@ @ADA_INCLUDE@ @IODBC_INCLUDE@ @SYBASE_INCLUDE@ @SYBASE_CT_INCLUDE@ @SOLID_INCLUDE@ @EMPRESS_INCLUDE@ @OPENLINK_INCLUDE@ @MCK_INCLUDE@ @VELOCIS_INCLUDE@ @CODBC_INCLUDE@ @GD_INCLUDE@ @IMAP_INCLUDE@ @ZLIB_INCLUDE@ @PDFLIB_INCLUDE@ @CPDFLIB_INCLUDE@ @FDFLIB_INCLUDE@ @IFX_INCLUDE@ @SNMP_INCLUDE@ @IBASE_INCLUDE@ @GETTEXT_INCLUDE@ @INCLUDES@ +INCLUDE = -I$(srcdir) -I. @GDBM_INCLUDE@ @ORACLE_INCLUDE@ @APACHE_INCLUDE@ @FHTTPD_INCLUDE@ @ADA_INCLUDE@ @IODBC_INCLUDE@ @SYBASE_INCLUDE@ @SYBASE_CT_INCLUDE@ @SOLID_INCLUDE@ @EMPRESS_INCLUDE@ @OPENLINK_INCLUDE@ @MCK_INCLUDE@ @VELOCIS_INCLUDE@ @CODBC_INCLUDE@ @IMAP_INCLUDE@ @ZLIB_INCLUDE@ @PDFLIB_INCLUDE@ @CPDFLIB_INCLUDE@ @FDFLIB_INCLUDE@ @IFX_INCLUDE@ @IBASE_INCLUDE@ @INCLUDES@ PROF_CFLAGS = CFLAGS_SHLIB = @CFLAGS_SHLIB@ LDFLAGS_SHLIB = @LDFLAGS_SHLIB@ @@ -102,7 +102,7 @@ FUNCTIONS = $(FUNCTIONS_SOURCE:.c=.o) -LIBS = @RPATHS@ @SYBASE_CT_LFLAGS@ @SYBASE_CT_LIBS@ @FHTTPD_LIB@ @DBASE_LIB@ @PCRE_LIB@ @REGEX_LIB@ @DBM_LIB@ @ORACLE_LFLAGS@ @ORACLE_LIBS@ @IODBC_LFLAGS@ @IODBC_LIBS@ @SYBASE_LFLAGS@ @SYBASE_LIBS@ @SYBASE_CT_LFLAGS@ @SYBASE_CT_LIBS@ @ADA_LFLAGS@ @ADA_LIBS@ @SOLID_LIBS@ @EMPRESS_LIBS@ @OPENLINK_LFLAGS@ @OPENLINK_LIBS@ @MCK_LFLAGS@ @MCK_LIBS@ @VELOCIS_LIBS@ @CODBC_LFLAGS@ @CODBC_LIBS@ @IMAP_LIBS@ @GD_LIBS@ @ZLIB_LIBS@ @PDFLIB_LIBS@ @CPDFLIB_LIBS@ @FDFLIB_LIBS@ @IFX_LFLAGS@ @IFX_LIBS@ @SNMP_LFLAGS@ @SNMP_LIBS@ @IBASE_LFLAGS@ @IBASE_LIBS@ @GETTEXT_LFLAGS@ @GETTEXT_LIBS@ @EXTRA_LIBS@ @LIBS@ +LIBS = @RPATHS@ @SYBASE_CT_LFLAGS@ @SYBASE_CT_LIBS@ @FHTTPD_LIB@ @DBASE_LIB@ @PCRE_LIB@ @REGEX_LIB@ @DBM_LIB@ @ORACLE_LFLAGS@ @ORACLE_LIBS@ @IODBC_LFLAGS@ @IODBC_LIBS@ @SYBASE_LFLAGS@ @SYBASE_LIBS@ @SYBASE_CT_LFLAGS@ @SYBASE_CT_LIBS@ @ADA_LFLAGS@ @ADA_LIBS@ @SOLID_LIBS@ @EMPRESS_LIBS@ @OPENLINK_LFLAGS@ @OPENLINK_LIBS@ @MCK_LFLAGS@ @MCK_LIBS@ @VELOCIS_LIBS@ @CODBC_LFLAGS@ @CODBC_LIBS@ @IMAP_LIBS@ @ZLIB_LIBS@ @PDFLIB_LIBS@ @CPDFLIB_LIBS@ @FDFLIB_LIBS@ @IFX_LFLAGS@ @IFX_LIBS@ @IBASE_LFLAGS@ @IBASE_LIBS@ @EXTRA_LIBS@ @LIBS@ all: $(BINNAME) php: $(OBJS) $(FUNCTIONS) @PCRE_LIB@ @REGEX_LIB@ @FHTTPD_LIB@ @DBASE_LIB@ Index: php3/config.h.in diff -u php3/config.h.in:1.170 php3/config.h.in:1.171 --- php3/config.h.in:1.170 Sun Jun 20 14:11:42 1999 +++ php3/config.h.in Sun Jun 20 14:14:53 1999 @@ -608,9 +608,6 @@ /* Define if you have the <unix.h> header file. */ #undef HAVE_UNIX_H -/* Define if you have the gd library (-lgd). */ -#undef HAVE_LIBGD - /* Define if you have the m library (-lm). */ #undef HAVE_LIBM Index: php3/configure.in diff -u php3/configure.in:1.399 php3/configure.in:1.400 --- php3/configure.in:1.399 Sun Jun 20 14:11:42 1999 +++ php3/configure.in Sun Jun 20 14:14:53 1999 @@ -1,4 +1,4 @@ -dnl $Id: configure.in,v 1.399 1999/06/20 18:11:42 jim Exp $ +dnl $Id: configure.in,v 1.400 1999/06/20 18:14:53 sas Exp $ dnl Process this file with autoconf to produce a configure script. AC_INIT(main.c) @@ -249,7 +249,7 @@ withval=apxs fi APXS="$withval" - APXS_LDFLAGS="@RPATHS@ @SYBASE_CT_LFLAGS@ @SYBASE_CT_LIBS@ @FHTTPD_LIB@ @ORACLE_LFLAGS@ @ORACLE_LIBS@ @IODBC_LFLAGS@ @IODBC_LIBS@ @SYBASE_LFLAGS@ @SYBASE_LIBS@ @SYBASE_CT_LFLAGS@ @SYBASE_CT_LIBS@ @ADA_LFLAGS@ @ADA_LIBS@ @SOLID_LIBS@ @EMPRESS_LIBS@ @OPENLINK_LFLAGS@ @OPENLINK_LIBS@ @MCK_LFLAGS@ @MCK_LIBS@ @VELOCIS_LIBS@ @CODBC_LFLAGS@ @CODBC_LIBS@ @GD_LIBS@ @ZLIB_LIBS@ @PDFLIB_LIBS@ @CPDFLIB_LIBS@ @FDFLIB_LIBS@ @IFX_LFLAGS@ @IFX_LIBS@ @SNMP_LFLAGS@ @SNMP_LIBS@ @IBASE_LFLAGS@ @IBASE_LIBS@ @GETTEXT_LFLAGS@ @GETTEXT_LIBS@ @DBM_LIB@ @IMAP_LIBS@ @DBASE_LIBS@ @PCRE_LIB@ @EXTRA_LIBS@" + APXS_LDFLAGS="@RPATHS@ @SYBASE_CT_LFLAGS@ @SYBASE_CT_LIBS@ @FHTTPD_LIB@ @ORACLE_LFLAGS@ @ORACLE_LIBS@ @IODBC_LFLAGS@ @IODBC_LIBS@ @SYBASE_LFLAGS@ @SYBASE_LIBS@ @SYBASE_CT_LFLAGS@ @SYBASE_CT_LIBS@ @ADA_LFLAGS@ @ADA_LIBS@ @SOLID_LIBS@ @EMPRESS_LIBS@ @OPENLINK_LFLAGS@ @OPENLINK_LIBS@ @MCK_LFLAGS@ @MCK_LIBS@ @VELOCIS_LIBS@ @CODBC_LFLAGS@ @CODBC_LIBS@ @ZLIB_LIBS@ @PDFLIB_LIBS@ @CPDFLIB_LIBS@ @FDFLIB_LIBS@ @IFX_LFLAGS@ @IFX_LIBS@ @IBASE_LFLAGS@ @IBASE_LIBS@ @DBM_LIB@ @IMAP_LIBS@ @DBASE_LIBS@ @PCRE_LIB@ @EXTRA_LIBS@" APACHE_INCLUDE="-I$APXS -q INCLUDEDIR" BINNAME=libphp3.so @@ -696,7 +696,7 @@ no) AC_MSG_RESULT(no) ;; yes) - GD_LIBS="-lgd" + AC_ADD_LIBRARY(gd) AC_DEFINE(HAVE_LIBGD) AC_MSG_RESULT(yes) AC_CHECK_LIB(gd, gdImageString16, [ AC_DEFINE(HAVE_LIBGD13) ]) @@ -704,12 +704,12 @@ ;; *) dnl A whole whack of possible places where this might be - test -f $withval/include/gd1.3/gd.h && GD_INCLUDE="-I$withval/include/gd1.3" - test -f $withval/include/gd/gd.h && GD_INCLUDE="-I$withval/include/gd" - test -f $withval/include/gd.h && GD_INCLUDE="-I$withval/include" - test -f $withval/gd1.3/gd.h && GD_INCLUDE="-I$withval/gd1.3" - test -f $withval/gd/gd.h && GD_INCLUDE="-I$withval/gd" - test -f $withval/gd.h && GD_INCLUDE="-I$withval" + 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.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" @@ -719,7 +719,8 @@ test -f $withval/gd1.3/libgd.a && GD_LIB="$withval/gd1.3" if test -n "$GD_INCLUDE" && test -n "$GD_LIB" ; then - GD_LIBS="-L$GD_LIB -lgd" + AC_ADD_INCLUDE($GD_INCLUDE) + AC_ADD_LIBRARY_WITH_PATH(gd, $GD_LIB) AC_DEFINE(HAVE_LIBGD) AC_MSG_RESULT(yes) old_LDFLAGS=$LDFLAGS @@ -732,14 +733,15 @@ fi ;; esac ],[ - AC_CHECK_LIB(gd, gdImageLine) + AC_CHECK_LIB(gd, gdImageLine, [ + AC_DEFINE(HAVE_LIBGD) + AC_ADD_LIBRARY(gd) + ]) AC_CHECK_LIB(gd, gdImageString16, [ AC_DEFINE(HAVE_LIBGD13) ]) ]) -AC_SUBST(GD_LIBS) if test -f /usr/pkg/include/gd/gd.h -a -z "$GD_INCLUDE" ; then - GD_INCLUDE="-I/usr/pkg/include/gd" + AC_ADD_INCLUDE(/usr/pkg/include/gd) fi -AC_SUBST(GD_INCLUDE) if test "$ac_cv_lib_gd_gdImageLine" = "yes"; then AC_ARG_WITH(ttf, [ --with-ttf[=DIR] Include Freetype support],[ @@ -807,6 +809,10 @@ test -f $withval/include/libintl.h && GETTEXT_INCDIR=$withval/include GETTEXT_LIBDIR=$withval/lib fi + + AC_ADD_INCLUDE($GETTEXT_INCDIR) + AC_ADD_LIBPATH($GETTEXT_LIBDIR) + GETTEXT_INCLUDE=-I$GETTEXT_INCDIR GETTEXT_LFLAGS=-L$GETTEXT_LIBDIR O_CPPFLAGS="$CPPFLAGS" @@ -815,11 +821,12 @@ LDFLAGS="$LDFLAGS -L$GETTEXT_LIBDIR" GETTEXT_LIBS= AC_MSG_RESULT(yes) - AC_CHECK_LIB(intl, bindtextdomain, GETTEXT_LIBS="-lintl",[ + AC_CHECK_LIB(intl, bindtextdomain, GETTEXT_LIBS="intl",[ AC_CHECK_LIB(c, bindtextdomain, GETTEXT_LIBS=,[ AC_MSG_ERROR(Unable to find required gettext library) ],) ],) + AC_ADD_LIBRARY($GETTEXT_LIBS) AC_DEFINE(HAVE_LIBINTL) @@ -829,9 +836,6 @@ ],[ AC_MSG_RESULT(no) ]) -AC_SUBST(GETTEXT_LIBS) -AC_SUBST(GETTEXT_LFLAGS) -AC_SUBST(GETTEXT_INCLUDE) AC_MSG_CHECKING(whether to include ImageMagick support) AC_ARG_WITH(imagick, @@ -1522,9 +1526,8 @@ test -d $withval/include/ucd-snmp && SNMP_INCDIR=$withval/include/ucd-snmp SNMP_LIBDIR=$withval/lib fi - SNMP_INCLUDE=-I$SNMP_INCDIR - SNMP_LFLAGS=-L$SNMP_LIBDIR - SNMP_LIBS="-lsnmp" + AC_ADD_LIBRARY_WITH_PATH(snmp, $SNMP_LIBDIR) + AC_ADD_INCLUDE($SNMP_INCDIR) AC_DEFINE(HAVE_SNMP) @@ -1535,9 +1538,6 @@ ],[ AC_MSG_RESULT(no) ]) -AC_SUBST(SNMP_LIBS) -AC_SUBST(SNMP_LFLAGS) -AC_SUBST(SNMP_INCLUDE) AC_MSG_CHECKING(for Velocis support) AC_ARG_WITH(velocis, @@ -2468,7 +2468,7 @@ CFLAGS="-I$THIS_PREFIX/include/db1 $CFLAGS" fi - for LIB in gdbm db1 ndbm c; do + for LIB in db1 ndbm c; do AC_TEMP_LDFLAGS(-L$THIS_PREFIX/lib,[ AC_CHECK_LIB($LIB, dbm_open, [AC_DEFINE(DBA_NDBM,1) THIS_LIBS="$LIB"]) ]) @@ -2536,7 +2536,7 @@ fi done - for LIB in gdbm db1 dbm c; do + for LIB in db1 dbm c; do AC_TEMP_LDFLAGS(-L$THIS_PREFIX/lib,[ AC_CHECK_LIB($LIB, dbminit, [AC_DEFINE(DBA_DBM,1) THIS_LIBS="$LIB"]) ]) Index: php3/libphp3.module.in diff -u php3/libphp3.module.in:1.26 php3/libphp3.module.in:1.27 --- php3/libphp3.module.in:1.26 Sun Jun 20 08:38:41 1999 +++ php3/libphp3.module.in Sun Jun 20 14:14:53 1999 @@ -1,7 +1,7 @@ Name: php3_module ConfigStart RULE_WANTHSREGEX=@HSREGEX@ - LIBS="@RPATHS@ @PHP_LIBS@ @ORACLE_LFLAGS@ @ORACLE_LIBS@ @IODBC_LFLAGS@ @IODBC_LIBS@ @OPENLINK_LFLAGS@ @OPENLINK_LIBS@ @SYBASE_LFLAGS@ @SYBASE_LIBS@ @SYBASE_CT_LFLAGS@ @SYBASE_CT_LIBS@ @ADA_LFLAGS@ @ADA_LIBS@ @SOLID_LIBS@ @VELOCIS_LIBS@ @GD_LIBS@ @ZLIB_LIBS@ @CODBC_LFLAGS@ @CODBC_LIBS@ @IMAP_LIBS@ @IFX_LFLAGS@ @IFX_LIBS@ @SNMP_LFLAGS@ @SNMP_LIBS@ @IBASE_LFLAGS@ @IBASE_LIBS@ @PDFLIB_LIBS@ @GETTEXT_LFLAGS@ @GETTEXT_LIBS@ @LIBS@ $LIBS @DBM_LIB@ @EXTRA_LIBS@" + LIBS="@RPATHS@ @PHP_LIBS@ @ORACLE_LFLAGS@ @ORACLE_LIBS@ @IODBC_LFLAGS@ @IODBC_LIBS@ @OPENLINK_LFLAGS@ @OPENLINK_LIBS@ @SYBASE_LFLAGS@ @SYBASE_LIBS@ @SYBASE_CT_LFLAGS@ @SYBASE_CT_LIBS@ @ADA_LFLAGS@ @ADA_LIBS@ @SOLID_LIBS@ @VELOCIS_LIBS@ @ZLIB_LIBS@ @CODBC_LFLAGS@ @CODBC_LIBS@ @IMAP_LIBS@ @IFX_LFLAGS@ @IFX_LIBS@ @IBASE_LFLAGS@ @IBASE_LIBS@ @PDFLIB_LIBS@ @LIBS@ $LIBS @DBM_LIB@ @EXTRA_LIBS@" RULE_HIDE=yes ConfigEnd