cvs: /php4/ext/dba config.m4 /php4/ext/icap config.m4 /php4/ext/mcrypt config.m4 /php4/ext/mhash config.m4 /php4/ext/mysql config.m4 /php4/ext/pcre
config.m4 /php4/ext/pgsql config.m4 /php4/ext/session Makefile.in config.m4 /php4/ext/swf config.m4 /php4/ext/zlib config.m4

sas Tue May 2 06:01:15 2000 EDT Modified files: /php4/ext/dba config.m4 /php4/ext/icap config.m4 /php4/ext/mcrypt config.m4 /php4/ext/mhash config.m4 /php4/ext/mysql config.m4 /php4/ext/pcre config.m4 /php4/ext/pgsql config.m4 /php4/ext/session Makefile.in config.m4 /php4/ext/swf config.m4 /php4/ext/zlib config.m4 Log: Use the new AC_ADD_LIBRARY_WITH_PATH option shared-libadd Index: php4/ext/dba/config.m4 diff -u php4/ext/dba/config.m4:1.8 php4/ext/dba/config.m4:1.9 --- php4/ext/dba/config.m4:1.8 Tue May 2 05:38:26 2000 +++ php4/ext/dba/config.m4 Tue May 2 06:01:14 2000 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.8 2000/05/02 03:38:26 sas Exp $ +dnl $Id: config.m4,v 1.9 2000/05/02 04:01:14 sas Exp $ dnl config.m4 for extension dba dnl don't forget to call PHP_EXTENSION(dba) @@ -33,15 +33,7 @@ dnl Attach THIS_x to DBA_x AC_DEFUN(AC_DBA_STD_ATTACH,[ AC_ADD_INCLUDE($THIS_INCLUDE) - if test "$ext_shared" = "yes"; then - if test -z "$THIS_LFLAGS"; then - DBA_SHARED_LIBADD="$DBA_SHARED_LIBADD -l$THIS_LIBS" - else - DBA_SHARED_LIBADD="$DBA_SHARED_LIBADD -R$THIS_LFLAGS -L$THIS_LFLAGS -l$THIS_LIBS" - fi - else - AC_ADD_LIBRARY_WITH_PATH($THIS_LIBS, $THIS_LFLAGS) - fi + AC_ADD_LIBRARY_WITH_PATH($THIS_LIBS, $THIS_LFLAGS, DBA_SHARED_LIBADD) THIS_INCLUDE="" THIS_LIBS="" Index: php4/ext/icap/config.m4 diff -u php4/ext/icap/config.m4:1.7 php4/ext/icap/config.m4:1.8 --- php4/ext/icap/config.m4:1.7 Tue May 2 04:01:13 2000 +++ php4/ext/icap/config.m4 Tue May 2 06:01:14 2000 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.7 2000/05/02 02:01:13 sas Exp $ +dnl $Id: config.m4,v 1.8 2000/05/02 04:01:14 sas Exp $ PHP_ARG_WITH(icap,for ICAP support, [ --with-icap[=DIR] Include ICAP support.]) @@ -8,12 +8,8 @@ test "$ICAP_DIR" = "yes" && ICAP_DIR=/usr/local AC_ADD_INCLUDE($ICAP_DIR) - if test "$ext_shared" = "yes"; then - ICAP_SHARED_LIBADD="-R$ICAP_DIR/lib -L$ICAP_DIR/lib -licap" - PHP_SUBST(ICAP_SHARED_LIBADD) - else - AC_ADD_LIBRARY_WITH_PATH(icap, $ICAP_DIR) - fi + PHP_SUBST(ICAP_SHARED_LIBADD) + AC_ADD_LIBRARY_WITH_PATH(icap, $ICAP_DIR, ICAP_SHARED_LIBADD) AC_DEFINE(HAVE_ICAP,1,[ ]) PHP_EXTENSION(icap, $ext_shared) fi Index: php4/ext/mcrypt/config.m4 diff -u php4/ext/mcrypt/config.m4:1.8 php4/ext/mcrypt/config.m4:1.9 --- php4/ext/mcrypt/config.m4:1.8 Tue May 2 05:29:28 2000 +++ php4/ext/mcrypt/config.m4 Tue May 2 06:01:14 2000 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.8 2000/05/02 03:29:28 sas Exp $ +dnl $Id: config.m4,v 1.9 2000/05/02 04:01:14 sas Exp $ dnl config.m4 for extension mcrypt dnl don't forget to call PHP_EXTENSION(mcrypt) @@ -18,12 +18,8 @@ fi AC_ADD_INCLUDE($MCRYPT_DIR/include) - if test "$ext_shared" = "yes"; then - MCRYPT_SHARED_LIBADD="-R$MCRYPT_DIR/lib -L$MCRYPT_DIR/lib -lmcrypt" - PHP_SUBST(MCRYPT_SHARED_LIBADD) - else - AC_ADD_LIBRARY_WITH_PATH(mcrypt, $MCRYPT_DIR/lib) - fi + PHP_SUBST(MCRYPT_SHARED_LIBADD) + AC_ADD_LIBRARY_WITH_PATH(mcrypt, $MCRYPT_DIR/lib, MCRYPT_SHARED_LIBADD) AC_DEFINE(HAVE_LIBMCRYPT,1,[ ]) Index: php4/ext/mhash/config.m4 diff -u php4/ext/mhash/config.m4:1.8 php4/ext/mhash/config.m4:1.9 --- php4/ext/mhash/config.m4:1.8 Tue May 2 05:29:45 2000 +++ php4/ext/mhash/config.m4 Tue May 2 06:01:14 2000 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.8 2000/05/02 03:29:45 sas Exp $ +dnl $Id: config.m4,v 1.9 2000/05/02 04:01:14 sas Exp $ dnl config.m4 for extension mhash dnl don't forget to call PHP_EXTENSION(mhash) @@ -17,12 +17,8 @@ AC_MSG_ERROR(Please reinstall libmhash - I cannot find mhash.h) fi AC_ADD_INCLUDE($MHASH_DIR/include) - if test "$ext_shared" = "yes"; then - MHASH_SHARED_LIBADD="-R$MHASH_DIR/lib -L$MHASH_DIR/lib -lmhash" - PHP_SUBST(MHASH_SHARED_LIBADD) - else - AC_ADD_LIBRARY_WITH_PATH(mhash, $MHASH_DIR/lib) - fi + AC_ADD_LIBRARY_WITH_PATH(mhash, $MHASH_DIR/lib, MHASH_SHARED_LIBADD) + PHP_SUBST(MHASH_SHARED_LIBADD) AC_DEFINE(HAVE_LIBMHASH,1,[ ]) Index: php4/ext/mysql/config.m4 diff -u php4/ext/mysql/config.m4:1.21 php4/ext/mysql/config.m4:1.22 --- php4/ext/mysql/config.m4:1.21 Mon May 1 04:41:43 2000 +++ php4/ext/mysql/config.m4 Tue May 2 06:01:15 2000 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.21 2000/05/01 02:41:43 sas Exp $ +dnl $Id: config.m4,v 1.22 2000/05/02 04:01:15 sas Exp $ sinclude(ext/mysql/libmysql/acinclude.m4) sinclude(ext/mysql/libmysql/mysql.m4) @@ -54,13 +54,7 @@ AC_MSG_ERROR(Cannot find header files under $PHP_MYSQL) fi - - if test "$ext_shared" = "yes"; then - MYSQL_SHARED_LIBADD="-R$MYSQL_DIR/lib/mysql -L$MYSQL_DIR/lib/mysql -lmysqlclient" - else - AC_ADD_LIBPATH($MYSQL_DIR/lib/mysql) - AC_ADD_LIBRARY(mysqlclient) - fi + AC_ADD_LIBRARY_WITH_PATH(mysqlclient, $MYSQL_DIR/lib/mysql, MYSQL_SHARED_LIBADD) AC_ADD_INCLUDE($MYSQL_INC_DIR) fi Index: php4/ext/pcre/config.m4 diff -u php4/ext/pcre/config.m4:1.19 php4/ext/pcre/config.m4:1.20 --- php4/ext/pcre/config.m4:1.19 Mon May 1 04:41:44 2000 +++ php4/ext/pcre/config.m4 Tue May 2 06:01:15 2000 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.19 2000/05/01 02:41:44 sas Exp $ +dnl $Id: config.m4,v 1.20 2000/05/02 04:01:15 sas Exp $ dnl config.m4 for extension pcre dnl By default we'll compile and link against the bundled PCRE library @@ -49,11 +49,7 @@ AC_MSG_ERROR(Could not find libpcre.a in $PHP_PCRE_REGEX) fi - if test "$ext_shared" = "yes"; then - PCRE_SHARED_LIBADD="-R$PCRE_LIBDIR -L$PCRE_LIBDIR -lpcre" - else - AC_ADD_LIBRARY_WITH_PATH(pcre, $PCRE_LIBDIR) - fi + AC_ADD_LIBRARY_WITH_PATH(pcre, $PCRE_LIBDIR, PCRE_SHARED_LIBADD) AC_ADD_INCLUDE($PCRE_INCDIR) AC_DEFINE(HAVE_PCRE, 1, [ ]) Index: php4/ext/pgsql/config.m4 diff -u php4/ext/pgsql/config.m4:1.10 php4/ext/pgsql/config.m4:1.11 --- php4/ext/pgsql/config.m4:1.10 Mon May 1 23:32:26 2000 +++ php4/ext/pgsql/config.m4 Tue May 2 06:01:15 2000 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.10 2000/05/01 21:32:26 sas Exp $ +dnl $Id: config.m4,v 1.11 2000/05/02 04:01:15 sas Exp $ AC_DEFUN(PGSQL_INC_CHK,[if test -r $i$1/libpq-fe.h; then PGSQL_DIR=$i; PGSQL_INCDIR=$i$1]) @@ -34,11 +34,7 @@ AC_DEFINE(HAVE_PGSQL,1,[ ]) - if test "$ext_shared" = "yes"; then - PGSQL_SHARED_LIBADD="-R$PGSQL_LIBDIR -L$PGSQL_LIBDIR -lpq" - else - AC_ADD_LIBRARY_WITH_PATH(pq, $PGSQL_LIBDIR) - fi + AC_ADD_LIBRARY_WITH_PATH(pq, $PGSQL_LIBDIR, PGSQL_SHARED_LIBADD) PHP_EXTENSION(pgsql,$ext_shared) fi Index: php4/ext/session/Makefile.in diff -u php4/ext/session/Makefile.in:1.6 php4/ext/session/Makefile.in:1.7 --- php4/ext/session/Makefile.in:1.6 Tue May 2 00:38:32 2000 +++ php4/ext/session/Makefile.in Tue May 2 06:01:15 2000 @@ -2,6 +2,6 @@ LTLIBRARY_NAME = libsession.la LTLIBRARY_SOURCES = session.c mod_files.c mod_mm.c mod_user.c LTLIBRARY_SHARED_NAME = session.la -LTLIBRARY_SHARED_LIBADD = $(SESSION_LIBADD) +LTLIBRARY_SHARED_LIBADD = $(SESSION_SHARED_LIBADD) include $(top_srcdir)/build/dynlib.mk Index: php4/ext/session/config.m4 diff -u php4/ext/session/config.m4:1.8 php4/ext/session/config.m4:1.9 --- php4/ext/session/config.m4:1.8 Mon May 1 04:41:46 2000 +++ php4/ext/session/config.m4 Tue May 2 06:01:15 2000 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.8 2000/05/01 02:41:46 sas Exp $ +dnl $Id: config.m4,v 1.9 2000/05/02 04:01:15 sas Exp $ PHP_ARG_WITH(mm,for mm support, [ --with-mm[=DIR] Include mm support for session storage]) @@ -20,12 +20,7 @@ AC_MSG_ERROR(cannot find mm library) fi - if test "$ext_shared" = "yes"; then - PHP_SUBST(SESSION_LIBADD) - SESSION_LIBADD="-R$MM_DIR/lib -L$MM_DIR/lib -lmm" - else - AC_ADD_LIBRARY_WITH_PATH(mm, $MM_DIR/lib) - fi + AC_ADD_LIBRARY_WITH_PATH(mm, $MM_DIR/lib, SESSION_SHARED_LIBADD) AC_ADD_INCLUDE($MM_DIR/include) AC_DEFINE(HAVE_LIBMM, 1, [Whether you have libmm]) PHP_MODULE_PTR(phpext_ps_mm_ptr) @@ -37,4 +32,5 @@ if test "$PHP_SESSION" != "no"; then PHP_EXTENSION(session,$ext_shared) + PHP_SUBST(SESSION_SHARED_LIBADD) fi Index: php4/ext/swf/config.m4 diff -u php4/ext/swf/config.m4:1.2 php4/ext/swf/config.m4:1.3 --- php4/ext/swf/config.m4:1.2 Mon May 1 04:42:26 2000 +++ php4/ext/swf/config.m4 Tue May 2 06:01:15 2000 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.2 2000/05/01 02:42:26 sas Exp $ +dnl $Id: config.m4,v 1.3 2000/05/02 04:01:15 sas Exp $ dnl config.m4 for extension libswf dnl don't forget to call PHP_EXTENSION(swf) dnl This file is a modified version of config.m4 @@ -20,12 +20,8 @@ AC_ADD_INCLUDE($SWF_DIR) - if test "$ext_shared" = "yes"; then - SWF_SHARED_LIBADD="-R$SWF_DIR -L$SWF_DIR -lswf" - PHP_SUBST(SWF_SHARED_LIBADD) - else - AC_ADD_LIBRARY_WITH_PATH(swf, $SWF_DIR) - fi + PHP_SUBST(SWF_SHARED_LIBADD) + AC_ADD_LIBRARY_WITH_PATH(swf, $SWF_DIR, SWF_SHARED_LIBADD) AC_DEFINE(HAVE_SWF,1,[ ]) PHP_EXTENSION(swf, $ext_shared) Index: php4/ext/zlib/config.m4 diff -u php4/ext/zlib/config.m4:1.5 php4/ext/zlib/config.m4:1.6 --- php4/ext/zlib/config.m4:1.5 Tue May 2 03:15:10 2000 +++ php4/ext/zlib/config.m4 Tue May 2 06:01:15 2000 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.5 2000/05/02 01:15:10 sas Exp $ +dnl $Id: config.m4,v 1.6 2000/05/02 04:01:15 sas Exp $ @@ -32,12 +32,8 @@ LIBS="$old_LIBS" LDFLAGS="$old_LDFLAGS" - if test "$ext_shared" = "yes"; then - ZLIB_SHARED_LIBADD="-R$ZLIB_LIBDIR -L$ZLIB_LIBDIR -lz" - PHP_SUBST(ZLIB_SHARED_LIBADD) - else - AC_ADD_LIBRARY_WITH_PATH(z, $ZLIB_LIBDIR) - fi + PHP_SUBST(ZLIB_SHARED_LIBADD) + AC_ADD_LIBRARY_WITH_PATH(z, $ZLIB_LIBDIR, ZLIB_SHARED_LIBADD) AC_ADD_INCLUDE($ZLIB_INCLUDE) fi