CVS update: php3

Date: Wednesday May 12, 1999 @ 13:54 Author: sas Update of /repository/php3 In directory php:/tmp/cvs-serv16777 Modified Files: Makefile.in aclocal.m4 configure.in Log Message: autoconf work for DBA module, Sleepycat changed the interface in DB 2.6.4 Index: php3/Makefile.in diff -u php3/Makefile.in:1.306 php3/Makefile.in:1.307 --- php3/Makefile.in:1.306 Sun May 9 12:54:33 1999 +++ php3/Makefile.in Wed May 12 13:54:23 1999 @@ -24,7 +24,7 @@ # +----------------------------------------------------------------------+ # -# $Id: Makefile.in,v 1.306 1999/05/09 16:54:33 sas Exp $ +# $Id: Makefile.in,v 1.307 1999/05/12 17:54:23 sas Exp $ # prefix = @prefix@ @@ -37,7 +37,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@ @MYSQL_INCLUDE@ @MSQL_INCLUDE@ @SOLID_INCLUDE@ @EMPRESS_INCLUDE@ @OPENLINK_INCLUDE@ @PGSQL_INCLUDE@ @LDAP_INCLUDE@ @MCK_INCLUDE@ @VELOCIS_INCLUDE@ @CODBC_INCLUDE@ @GD_INCLUDE@ @IMAP_INCLUDE@ @ASPELL_INCLUDE@ @ZLIB_INCLUDE@ @PDFLIB_INCLUDE@ @FDFLIB_INCLUDE@ @IFX_INCLUDE@ @SNMP_INCLUDE@ @IBASE_INCLUDE@ @GETTEXT_INCLUDE@ @IMAGICK_INCLUDE@ @DBA_INCLUDE@ @INCLUDES@ +INCLUDE = -I$(srcdir) -I. @DBA_INCLUDE@ @GDBM_INCLUDE@ @ORACLE_INCLUDE@ @APACHE_INCLUDE@ @FHTTPD_INCLUDE@ @ADA_INCLUDE@ @IODBC_INCLUDE@ @SYBASE_INCLUDE@ @SYBASE_CT_INCLUDE@ @MYSQL_INCLUDE@ @MSQL_INCLUDE@ @SOLID_INCLUDE@ @EMPRESS_INCLUDE@ @OPENLINK_INCLUDE@ @PGSQL_INCLUDE@ @LDAP_INCLUDE@ @MCK_INCLUDE@ @VELOCIS_INCLUDE@ @CODBC_INCLUDE@ @GD_INCLUDE@ @IMAP_INCLUDE@ @ASPELL_INCLUDE@ @ZLIB_INCLUDE@ @PDFLIB_INCLUDE@ @FDFLIB_INCLUDE@ @IFX_INCLUDE@ @SNMP_INCLUDE@ @IBASE_INCLUDE@ @GETTEXT_INCLUDE@ @IMAGICK_INCLUDE@ @INCLUDES@ PROF_CFLAGS = CFLAGS_SHLIB = @CFLAGS_SHLIB@ LDFLAGS_SHLIB = @LDFLAGS_SHLIB@ Index: php3/aclocal.m4 diff -u php3/aclocal.m4:1.36 php3/aclocal.m4:1.37 --- php3/aclocal.m4:1.36 Sun Apr 25 18:24:08 1999 +++ php3/aclocal.m4 Wed May 12 13:54:23 1999 @@ -1,10 +1,17 @@ -dnl $Id: aclocal.m4,v 1.36 1999/04/25 22:24:08 sas Exp $ +dnl $Id: aclocal.m4,v 1.37 1999/05/12 17:54:23 sas Exp $ dnl dnl This file contains local autoconf functions. dnl dummy function for PHP4 compatibility AC_DEFUN(PHP_EXTENSION,[]) +AC_DEFUN(AC_TEMP_LDFLAGS,[ + old_LDFLAGS="$LDFLAGS" + LDFLAGS="$1 $LDFLAGS" + $2 + LDFLAGS="$old_LDFLAGS" +]) + AC_DEFUN(AC_ORACLE_VERSION,[ AC_MSG_CHECKING([Oracle version]) if test -f "$ORACLEINST_TOP/orainst/unix.rgs" @@ -124,7 +131,7 @@ dnl Assign INCLUDE/LFLAGS from PREFIX AC_DEFUN(AC_DBA_STD_ASSIGN,[ - if test "$THIS_PREFIX" != ""; then + if test "$THIS_PREFIX" != "" -a "$THIS_PREFIX" != "/usr"; then THIS_INCLUDE="-I$THIS_PREFIX/include" THIS_LFLAGS="-L$THIS_PREFIX/lib" fi @@ -133,10 +140,12 @@ dnl Standard check AC_DEFUN(AC_DBA_STD_CHECK,[ THIS_RESULT="yes" + if test "$THIS_PREFIX" != "/usr"; then if test "$THIS_INCLUDE" = "" ; then AC_MSG_ERROR(cannot find necessary header file(s)) elif test "$THIS_LIBS" = "" ; then AC_MSG_ERROR(cannot find necessary library) + fi fi ]) Index: php3/configure.in diff -u php3/configure.in:1.355 php3/configure.in:1.356 --- php3/configure.in:1.355 Wed May 12 09:14:30 1999 +++ php3/configure.in Wed May 12 13:54:23 1999 @@ -1,4 +1,4 @@ -dnl $Id: configure.in,v 1.355 1999/05/12 13:14:30 sas Exp $ +dnl $Id: configure.in,v 1.356 1999/05/12 17:54:23 sas Exp $ dnl Process this file with autoconf to produce a configure script. AC_INIT(main.c) @@ -2302,7 +2302,9 @@ THIS_PREFIX="$i" fi done + AC_TEMP_LDFLAGS(-L$THIS_PREFIX/lib,[ AC_CHECK_LIB(gdbm, gdbm_open, [AC_DEFINE(DBA_GDBM, 1) THIS_LIBS="-lgdbm"]) + ]) AC_DBA_STD_ASSIGN AC_DBA_STD_CHECK @@ -2333,11 +2335,10 @@ CFLAGS="-I$THIS_PREFIX/include/db1 $CFLAGS" fi - for LIB in gdbm db1 ndbm c; do - old_LFLAGS="$LFLAGS" - LFLAGS="-L$THIS_PREFIX/lib $LFLAGS" + for LIB in gdbm db1 ndbm c; do + AC_TEMP_LDFLAGS(-L$THIS_PREFIX/lib,[ AC_CHECK_LIB($LIB, dbm_open, [AC_DEFINE(DBA_NDBM,1) THIS_LIBS="-l$LIB"]) - LFLAGS="$old_LFLAGS" + ]) done AC_DBA_STD_ASSIGN @@ -2379,11 +2380,10 @@ eval "AC_DEFINE($DB2_EXTRA, 1)" fi - for LIB in db db2 c; do - old_LFLAGS="$LFLAGS" - LFLAGS="-L$THIS_PREFIX/lib $LFLAGS" + for LIB in db db2 c; do + AC_TEMP_LDFLAGS(-L$THIS_PREFIX/lib,[ AC_CHECK_LIB($LIB, db_appinit, [AC_DEFINE(DBA_DB2,1) THIS_LIBS="-l$LIB"]) - LFLAGS="$old_LFLAGS" + ]) done AC_DBA_STD_ASSIGN @@ -2403,11 +2403,10 @@ fi done - for LIB in gdbm db1 dbm c; do - old_LFLAGS="$LFLAGS" - LFLAGS="-L$THIS_PREFIX/lib $LFLAGS" + for LIB in gdbm db1 dbm c; do + AC_TEMP_LDFLAGS(-L$THIS_PREFIX/lib,[ AC_CHECK_LIB($LIB, dbminit, [AC_DEFINE(DBA_DBM,1) THIS_LIBS="-l$LIB"]) - LFLAGS="$old_LFLAGS" + ]) done AC_DBA_STD_ASSIGN @@ -2427,11 +2426,10 @@ fi done - for LIB in cdb c; do - old_LFLAGS="$LFLAGS" - LFLAGS="-L$THIS_PREFIX/lib $LFLAGS" + for LIB in cdb c; do + AC_TEMP_LDFLAGS(-L$THIS_PREFIX/lib,[ AC_CHECK_LIB($LIB, cdb_bread, [AC_DEFINE(DBA_CDB,1) THIS_LIBS="-l$LIB"]) - LFLAGS="$old_LFLAGS" + ]) done AC_DBA_STD_ASSIGN -- PHP Development Mailing List http://www.php.net/ To unsubscribe send an empty message to php-dev-unsubscribe@lists.php.net For help: php-dev-help@lists.php.net