cvs: php4 /ext/dba config.m4 /ext/zziplib config.m4

sas Sat May 12 02:26:47 2001 EDT Modified files: /php4/ext/dba config.m4 /php4/ext/zziplib config.m4 Log: Rename some custom macros from AC_* to PHP_* Index: php4/ext/dba/config.m4 diff -u php4/ext/dba/config.m4:1.11 php4/ext/dba/config.m4:1.12 --- php4/ext/dba/config.m4:1.11 Tue Mar 27 12:34:24 2001 +++ php4/ext/dba/config.m4 Sat May 12 02:26:47 2001 @@ -1,25 +1,25 @@ -dnl $Id: config.m4,v 1.11 2001/03/27 20:34:24 sniper Exp $ +dnl $Id: config.m4,v 1.12 2001/05/12 09:26:47 sas Exp $ dnl config.m4 for extension dba dnl don't forget to call PHP_EXTENSION(dba) -AC_DEFUN(AC_TEMP_LDFLAGS,[ - old_LDFLAGS="$LDFLAGS" +AC_DEFUN(PHP_TEMP_LDFLAGS,[ + old_LDFLAGS=$LDFLAGS LDFLAGS="$1 $LDFLAGS" $2 - LDFLAGS="$old_LDFLAGS" + LDFLAGS=$old_LDFLAGS ]) dnl Assign INCLUDE/LFLAGS from PREFIX -AC_DEFUN(AC_DBA_STD_ASSIGN,[ - if test "$THIS_PREFIX" != "" -a "$THIS_PREFIX" != "/usr"; then +AC_DEFUN(PHP_DBA_STD_ASSIGN,[ + if test -n "$THIS_PREFIX" && test "$THIS_PREFIX" != "/usr"; then THIS_INCLUDE="$THIS_PREFIX/include" THIS_LFLAGS="$THIS_PREFIX/lib" fi ]) dnl Standard check -AC_DEFUN(AC_DBA_STD_CHECK,[ +AC_DEFUN(PHP_DBA_STD_CHECK,[ THIS_RESULT="yes" if test "$THIS_PREFIX" != "/usr" -a "$THIS_INCLUDE" = ""; then AC_MSG_ERROR(cannot find necessary header file(s)) @@ -30,7 +30,7 @@ ]) dnl Attach THIS_x to DBA_x -AC_DEFUN(AC_DBA_STD_ATTACH,[ +AC_DEFUN(PHP_DBA_STD_ATTACH,[ PHP_ADD_INCLUDE($THIS_INCLUDE) PHP_ADD_LIBRARY_WITH_PATH($THIS_LIBS, $THIS_LFLAGS, DBA_SHARED_LIBADD) @@ -64,13 +64,13 @@ done unset ac_cv_lib_gdbm_gdbm_open - AC_TEMP_LDFLAGS(-L$THIS_PREFIX/lib,[ + PHP_TEMP_LDFLAGS(-L$THIS_PREFIX/lib,[ AC_CHECK_LIB(gdbm, gdbm_open, [AC_DEFINE(DBA_GDBM, 1, [ ]) THIS_LIBS="gdbm"]) ]) - AC_DBA_STD_ASSIGN - AC_DBA_STD_CHECK - AC_DBA_STD_ATTACH + PHP_DBA_STD_ASSIGN + PHP_DBA_STD_CHECK + PHP_DBA_STD_ATTACH fi ]) AC_MSG_CHECKING(for GDBM support) @@ -94,14 +94,14 @@ fi for LIB in db1 ndbm c; do - AC_TEMP_LDFLAGS(-L$THIS_PREFIX/lib,[ + PHP_TEMP_LDFLAGS(-L$THIS_PREFIX/lib,[ AC_CHECK_LIB($LIB, dbm_open, [AC_DEFINE(DBA_NDBM,1, [ ]) THIS_LIBS="$LIB"]) ]) done - AC_DBA_STD_ASSIGN - AC_DBA_STD_CHECK - AC_DBA_STD_ATTACH + PHP_DBA_STD_ASSIGN + PHP_DBA_STD_CHECK + PHP_DBA_STD_ATTACH fi ]) AC_MSG_CHECKING(for NDBM support) @@ -139,14 +139,14 @@ fi for LIB in db db2 c; do - AC_TEMP_LDFLAGS(-L$THIS_PREFIX/lib,[ + PHP_TEMP_LDFLAGS(-L$THIS_PREFIX/lib,[ AC_CHECK_LIB($LIB, db_appinit, [AC_DEFINE(DBA_DB2,1,[ ]) THIS_LIBS="$LIB"]) ]) done - AC_DBA_STD_ASSIGN - AC_DBA_STD_CHECK - AC_DBA_STD_ATTACH + PHP_DBA_STD_ASSIGN + PHP_DBA_STD_CHECK + PHP_DBA_STD_ATTACH fi ]) AC_MSG_CHECKING(for Berkeley DB2 support) @@ -167,14 +167,14 @@ fi for LIB in db db-3; do - AC_TEMP_LDFLAGS(-L$THIS_PREFIX/lib,[ + PHP_TEMP_LDFLAGS(-L$THIS_PREFIX/lib,[ AC_CHECK_LIB($LIB, db_create, [AC_DEFINE(DBA_DB3,1,[ ]) THIS_LIBS="$LIB"]) ]) done - AC_DBA_STD_ASSIGN - AC_DBA_STD_CHECK - AC_DBA_STD_ATTACH + PHP_DBA_STD_ASSIGN + PHP_DBA_STD_CHECK + PHP_DBA_STD_ATTACH fi ]) AC_MSG_CHECKING(for Berkeley DB3 support) @@ -190,14 +190,14 @@ done for LIB in db1 dbm c; do - AC_TEMP_LDFLAGS(-L$THIS_PREFIX/lib,[ + PHP_TEMP_LDFLAGS(-L$THIS_PREFIX/lib,[ AC_CHECK_LIB($LIB, dbminit, [AC_DEFINE(DBA_DBM,1,[ ]) THIS_LIBS="$LIB"]) ]) done - AC_DBA_STD_ASSIGN - AC_DBA_STD_CHECK - AC_DBA_STD_ATTACH + PHP_DBA_STD_ASSIGN + PHP_DBA_STD_CHECK + PHP_DBA_STD_ATTACH fi ]) AC_MSG_CHECKING(for DBM support) @@ -213,14 +213,14 @@ done for LIB in cdb c; do - AC_TEMP_LDFLAGS(-L$THIS_PREFIX/lib,[ + PHP_TEMP_LDFLAGS(-L$THIS_PREFIX/lib,[ AC_CHECK_LIB($LIB, cdb_bread, [AC_DEFINE(DBA_CDB,1,[ ]) THIS_LIBS="$LIB"]) ]) done - AC_DBA_STD_ASSIGN - AC_DBA_STD_CHECK - AC_DBA_STD_ATTACH + PHP_DBA_STD_ASSIGN + PHP_DBA_STD_CHECK + PHP_DBA_STD_ATTACH fi ]) AC_MSG_CHECKING(for CDB support) Index: php4/ext/zziplib/config.m4 diff -u php4/ext/zziplib/config.m4:1.2 php4/ext/zziplib/config.m4:1.3 --- php4/ext/zziplib/config.m4:1.2 Tue Mar 27 12:34:44 2001 +++ php4/ext/zziplib/config.m4 Sat May 12 02:26:47 2001 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.2 2001/03/27 20:34:44 sniper Exp $ +dnl $Id: config.m4,v 1.3 2001/05/12 09:26:47 sas Exp $ dnl config.m4 for extension zziplib PHP_ARG_WITH(zziplib,whether to include zziplib support, @@ -25,7 +25,7 @@ ZZIPLIB_LIBDIR=$ZZIPLIB_DIR/lib - AC_TEMP_LDFLAGS(-L$ZZIPLIB_LIBDIR,[ + PHP_TEMP_LDFLAGS(-L$ZZIPLIB_LIBDIR,[ AC_CHECK_LIB(zzip, zzip_open, [AC_DEFINE(HAVE_ZZIPLIB,1,[ ])], [AC_MSG_ERROR(zziplib module requires zzlib >= 0.10.6.)]) ])