cvs: php-src /ext/bz2 config.m4 /ext/cpdf config.m4 /ext/curl config.m4 /ext/dba config.m4 /ext/fam config.m4 /ext/gd config.m4 /ext/gettext
config.m4 /ext/gmp config.m4 /ext/iconv config.m4 /ext/imap config.m4 /ext/ldap config.m4 /ext/mbstring config.m4 /ext/mysql config.m4
/ext/ncurses config.m4 /ext/odbc config.m4 /ext/pcre config.m4 /ext/pgsql config.m4 /ext/pspell config.m4 /ext/readline config.m4 /ext/recode
config.m4 /ext/session config.m4 /ext/sqlite config.m4 /ext/xml config.m4 /ext/xmlrpc config.m4 /ext/xsl config.m4 /ext/zlib config0.m4
| From: | Joe Orton | Date: | Wed, 03 Nov 2004 14:32:53 +0000 |
| Subject: | cvs: php-src /ext/bz2 config.m4 /ext/cpdf config.m4 /ext/curl config.m4 /ext/dba config.m4 /ext/fam config.m4 /ext/gd config.m4 /ext/gettext config.m4 /ext/gmp config.m4 /ext/iconv config.m4 /ext/imap config.m4 /ext/ldap config.m4 /ext/mbstring config.m4 /ext/mysql config.m4 /ext/ncurses config.m4 /ext/odbc config.m4 /ext/pcre config.m4 /ext/pgsql config.m4 /ext/pspell config.m4 /ext/readline config.m4 /ext/recode config.m4 /ext/session config.m4 /ext/sqlite config.m4 /ext/xml config.m4 /ext/xmlrpc config.m4 /ext/xsl config.m4 /ext/zlib config0.m4 |
||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-29118@lists.php.net to get a copy of this message | ||
jorton Wed Nov 3 09:32:53 2004 EDT
Modified files:
/php-src/ext/bz2 config.m4
/php-src/ext/cpdf config.m4
/php-src/ext/curl config.m4
/php-src/ext/dba config.m4
/php-src/ext/fam config.m4
/php-src/ext/gd config.m4
/php-src/ext/gettext config.m4
/php-src/ext/gmp config.m4
/php-src/ext/iconv config.m4
/php-src/ext/imap config.m4
/php-src/ext/ldap config.m4
/php-src/ext/mbstring config.m4
/php-src/ext/mysql config.m4
/php-src/ext/ncurses config.m4
/php-src/ext/odbc config.m4
/php-src/ext/pcre config.m4
/php-src/ext/pgsql config.m4
/php-src/ext/pspell config.m4
/php-src/ext/readline config.m4
/php-src/ext/recode config.m4
/php-src/ext/session config.m4
/php-src/ext/sqlite config.m4
/php-src/ext/xml config.m4
/php-src/ext/xmlrpc config.m4
/php-src/ext/xsl config.m4
/php-src/ext/zlib config0.m4
Log:
Update extensions to use /path/to/$PHP_LIBDIR rather than /path/to/lib
to support multi-ABI platforms.
http://cvs.php.net/diff.php/php-src/ext/bz2/config.m4?r1=1.4&r2=1.5&ty=u Index: php-src/ext/bz2/config.m4 diff -u php-src/ext/bz2/config.m4:1.4 php-src/ext/bz2/config.m4:1.5 --- php-src/ext/bz2/config.m4:1.4 Tue Jul 20 01:26:33 2004 +++ php-src/ext/bz2/config.m4 Wed Nov 3 09:32:48 2004 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.4 2004/07/20 05:26:33 pollita Exp $ +dnl $Id: config.m4,v 1.5 2004/11/03 14:32:48 jorton Exp $ dnl PHP_ARG_WITH(bz2, for BZip2 support, @@ -27,12 +27,12 @@ PHP_CHECK_LIBRARY(bz2, BZ2_bzerror, [ PHP_ADD_INCLUDE($BZIP_DIR/include) - PHP_ADD_LIBRARY_WITH_PATH(bz2, $BZIP_DIR/lib, BZ2_SHARED_LIBADD) + PHP_ADD_LIBRARY_WITH_PATH(bz2, $BZIP_DIR/$PHP_LIBDIR, BZ2_SHARED_LIBADD) AC_DEFINE(HAVE_BZ2,1,[ ]) ], [ AC_MSG_ERROR(bz2 module requires libbz2 >= 1.0.0) ], [ - -L$BZIP_DIR/lib + -L$BZIP_DIR/$PHP_LIBDIR ]) PHP_NEW_EXTENSION(bz2, bz2.c bz2_filter.c, $ext_shared) http://cvs.php.net/diff.php/php-src/ext/cpdf/config.m4?r1=1.20&r2=1.21&ty=u Index: php-src/ext/cpdf/config.m4 diff -u php-src/ext/cpdf/config.m4:1.20 php-src/ext/cpdf/config.m4:1.21 --- php-src/ext/cpdf/config.m4:1.20 Tue Dec 9 15:10:22 2003 +++ php-src/ext/cpdf/config.m4 Wed Nov 3 09:32:49 2004 @@ -1,10 +1,10 @@ -dnl $Id: config.m4,v 1.20 2003/12/09 20:10:22 sniper Exp $ +dnl $Id: config.m4,v 1.21 2004/11/03 14:32:49 jorton Exp $ AC_DEFUN(CPDF_JPEG_TEST,[ AC_ARG_WITH(jpeg-dir, [ --with-jpeg-dir[=DIR] CPDF: Set the path to libjpeg install prefix.],[ for i in $withval /usr/local /usr; do - if test -f "$i/lib/libjpeg.$SHLIB_SUFFIX_NAME" -o -f "$i/lib/libjpeg.a"; then + if test -f "$i/$PHP_LIBDIR/libjpeg.$SHLIB_SUFFIX_NAME" -o -f "$i/$PHP_LIBDIR/libjpeg.a"; then CPDF_JPEG_DIR=$i break; fi @@ -26,7 +26,7 @@ AC_ARG_WITH(tiff-dir, [ --with-tiff-dir[=DIR] CPDF: Set the path to libtiff install prefix.],[ for i in $withval /usr/local /usr; do - if test -f "$i/lib/libtiff.$SHLIB_SUFFIX_NAME" -o -f "$i/lib/libtiff.a"; then + if test -f "$i/$PHP_LIBDIR/libtiff.$SHLIB_SUFFIX_NAME" -o -f "$i/$PHP_LIBDIR/libtiff.a"; then CPDF_TIFF_DIR=$i break; fi @@ -64,7 +64,7 @@ ], [ AC_MSG_ERROR([Cpdflib module requires cpdflib >= 2.]) ], [ - -L$i/lib $CPDF_SHARED_LIBADD + -L$i/$PHP_LIBDIR $CPDF_SHARED_LIBADD ]) break fi http://cvs.php.net/diff.php/php-src/ext/curl/config.m4?r1=1.25&r2=1.26&ty=u Index: php-src/ext/curl/config.m4 diff -u php-src/ext/curl/config.m4:1.25 php-src/ext/curl/config.m4:1.26 --- php-src/ext/curl/config.m4:1.25 Thu May 22 09:08:49 2003 +++ php-src/ext/curl/config.m4 Wed Nov 3 09:32:49 2004 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.25 2003/05/22 13:08:49 derick Exp $ +dnl $Id: config.m4,v 1.26 2004/11/03 14:32:49 jorton Exp $ dnl PHP_ARG_WITH(curl, for CURL support, @@ -51,7 +51,7 @@ PHP_ADD_INCLUDE($CURL_DIR/include) PHP_EVAL_LIBLINE($CURL_LIBS, CURL_SHARED_LIBADD) - PHP_ADD_LIBRARY_WITH_PATH(curl, $CURL_DIR/lib, CURL_SHARED_LIBADD) + PHP_ADD_LIBRARY_WITH_PATH(curl, $CURL_DIR/$PHP_LIBDIR, CURL_SHARED_LIBADD) PHP_CHECK_LIBRARY(curl,curl_easy_perform, [ @@ -59,14 +59,14 @@ ],[ AC_MSG_ERROR(There is something wrong. Please check config.log for more information.) ],[ - $CURL_LIBS -L$CURL_DIR/lib + $CURL_LIBS -L$CURL_DIR/$PHP_LIBDIR ]) PHP_CHECK_LIBRARY(curl,curl_version_info, [ AC_DEFINE(HAVE_CURL_VERSION_INFO,1,[ ]) ],[],[ - $CURL_LIBS -L$CURL_DIR/lib + $CURL_LIBS -L$CURL_DIR/$PHP_LIBDIR ]) if test "$PHP_CURLWRAPPERS" != "no" ; then http://cvs.php.net/diff.php/php-src/ext/dba/config.m4?r1=1.61&r2=1.62&ty=u Index: php-src/ext/dba/config.m4 diff -u php-src/ext/dba/config.m4:1.61 php-src/ext/dba/config.m4:1.62 --- php-src/ext/dba/config.m4:1.61 Sat Sep 25 11:29:19 2004 +++ php-src/ext/dba/config.m4 Wed Nov 3 09:32:49 2004 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.61 2004/09/25 15:29:19 helly Exp $ +dnl $Id: config.m4,v 1.62 2004/11/03 14:32:49 jorton Exp $ dnl dnl Suppose we need FlatFile if no support or only CDB is used. @@ -21,7 +21,7 @@ dnl Assign INCLUDE/LFLAGS from PREFIX AC_DEFUN(PHP_DBA_STD_ASSIGN,[ if test -n "$THIS_PREFIX" && test "$THIS_PREFIX" != "/usr"; then - THIS_LFLAGS=$THIS_PREFIX/lib + THIS_LFLAGS=$THIS_PREFIX/$PHP_LIBDIR fi ]) @@ -86,7 +86,7 @@ AC_DEFINE_UNQUOTED(QDBM_INCLUDE_FILE, "$THIS_INCLUDE", [ ]) AC_DEFINE(DBA_QDBM, 1, [ ]) THIS_LIBS=$LIB - ], [], [-L$THIS_PREFIX/lib]) + ], [], [-L$THIS_PREFIX/$PHP_LIBDIR]) if test -n "$THIS_LIBS"; then break fi @@ -121,7 +121,7 @@ AC_DEFINE_UNQUOTED(GDBM_INCLUDE_FILE, "$THIS_INCLUDE", [ ]) AC_DEFINE(DBA_GDBM, 1, [ ]) THIS_LIBS=gdbm - ], [], [-L$THIS_PREFIX/lib]) + ], [], [-L$THIS_PREFIX/$PHP_LIBDIR]) fi PHP_DBA_STD_ASSIGN @@ -153,7 +153,7 @@ AC_DEFINE_UNQUOTED(NDBM_INCLUDE_FILE, "$THIS_INCLUDE", [ ]) AC_DEFINE(DBA_NDBM, 1, [ ]) THIS_LIBS=$LIB - ], [], [-L$THIS_PREFIX/lib]) + ], [], [-L$THIS_PREFIX/$PHP_LIBDIR]) if test -n "$THIS_LIBS"; then break fi @@ -171,8 +171,8 @@ dnl parameters(version, library list, function) AC_DEFUN(PHP_DBA_DB_CHECK,[ for LIB in $2; do - if test -f $THIS_PREFIX/lib/lib$LIB.a -o -f $THIS_PREFIX/lib/lib$LIB.$SHLIB_SUFFIX_NAME; then - PHP_TEMP_LDFLAGS(-L$THIS_PREFIX/lib, -l$LIB,[ + if test -f $THIS_PREFIX/$PHP_LIBDIR/lib$LIB.a -o -f $THIS_PREFIX/$PHP_LIBDIR/lib$LIB.$SHLIB_SUFFIX_NAME; then + PHP_TEMP_LDFLAGS(-L$THIS_PREFIX/$PHP_LIBDIR, -l$LIB,[ AC_TRY_LINK([ #include "$THIS_INCLUDE" ],[ @@ -367,7 +367,7 @@ fi AC_DEFINE(DBA_DBM, 1, [ ]) THIS_LIBS=$LIB - ], [], [-L$THIS_PREFIX/lib]) + ], [], [-L$THIS_PREFIX/$PHP_LIBDIR]) if test -n "$THIS_LIBS"; then break fi @@ -409,7 +409,7 @@ AC_DEFINE_UNQUOTED(CDB_INCLUDE_FILE, "$THIS_INCLUDE", [ ]) AC_DEFINE(DBA_CDB, 1, [ ]) THIS_LIBS=$LIB - ], [], [-L$THIS_PREFIX/lib]) + ], [], [-L$THIS_PREFIX/$PHP_LIBDIR]) if test -n "$THIS_LIBS"; then break fi http://cvs.php.net/diff.php/php-src/ext/fam/config.m4?r1=1.2&r2=1.3&ty=u Index: php-src/ext/fam/config.m4 diff -u php-src/ext/fam/config.m4:1.2 php-src/ext/fam/config.m4:1.3 --- php-src/ext/fam/config.m4:1.2 Tue Dec 10 15:09:35 2002 +++ php-src/ext/fam/config.m4 Wed Nov 3 09:32:49 2004 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.2 2002/12/10 20:09:35 helly Exp $ +dnl $Id: config.m4,v 1.3 2004/11/03 14:32:49 jorton Exp $ dnl config.m4 for extension fam dnl Comments in this file start with the string 'dnl'. @@ -42,12 +42,12 @@ PHP_CHECK_LIBRARY($LIBNAME,$LIBSYMBOL, [ - PHP_ADD_LIBRARY_WITH_PATH($LIBNAME, $FAM_DIR/lib, FAM_SHARED_LIBADD) + PHP_ADD_LIBRARY_WITH_PATH($LIBNAME, $FAM_DIR/$PHP_LIBDIR, FAM_SHARED_LIBADD) AC_DEFINE(HAVE_FAMLIB,1,[ ]) ],[ AC_MSG_ERROR([wrong fam lib version or lib not found]) ],[ - -L$FAM_DIR/lib -lm -ldl + -L$FAM_DIR/$PHP_LIBDIR -lm -ldl ]) PHP_SUBST(FAM_SHARED_LIBADD) http://cvs.php.net/diff.php/php-src/ext/gd/config.m4?r1=1.147&r2=1.148&ty=u Index: php-src/ext/gd/config.m4 diff -u php-src/ext/gd/config.m4:1.147 php-src/ext/gd/config.m4:1.148 --- php-src/ext/gd/config.m4:1.147 Tue Jul 27 08:44:25 2004 +++ php-src/ext/gd/config.m4 Wed Nov 3 09:32:49 2004 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.147 2004/07/27 12:44:25 iliaa Exp $ +dnl $Id: config.m4,v 1.148 2004/11/03 14:32:49 jorton Exp $ dnl dnl @@ -51,7 +51,7 @@ if test "$PHP_JPEG_DIR" != "no"; then for i in $PHP_JPEG_DIR /usr/local /usr; do - test -f $i/lib/libjpeg.$SHLIB_SUFFIX_NAME -o -f $i/lib/libjpeg.a && GD_JPEG_DIR=$i && break + test -f $i/$PHP_LIBDIR/libjpeg.$SHLIB_SUFFIX_NAME -o -f $i/$PHP_LIBDIR/libjpeg.a && GD_JPEG_DIR=$i && break done if test -z "$GD_JPEG_DIR"; then @@ -61,11 +61,11 @@ PHP_CHECK_LIBRARY(jpeg,jpeg_read_header, [ PHP_ADD_INCLUDE($GD_JPEG_DIR/include) - PHP_ADD_LIBRARY_WITH_PATH(jpeg, $GD_JPEG_DIR/lib, GD_SHARED_LIBADD) + PHP_ADD_LIBRARY_WITH_PATH(jpeg, $GD_JPEG_DIR/$PHP_LIBDIR, GD_SHARED_LIBADD) ],[ AC_MSG_ERROR([Problem with libjpeg.(a|so). Please check config.log for more information.]) ],[ - -L$GD_JPEG_DIR/lib + -L$GD_JPEG_DIR/$PHP_LIBDIR ]) else AC_MSG_RESULT([If configure fails try --with-jpeg-dir=<DIR>]) @@ -76,7 +76,7 @@ if test "$PHP_PNG_DIR" != "no"; then for i in $PHP_PNG_DIR /usr/local /usr; do - test -f $i/lib/libpng.$SHLIB_SUFFIX_NAME -o -f $i/lib/libpng.a && GD_PNG_DIR=$i && break + test -f $i/$PHP_LIBDIR/libpng.$SHLIB_SUFFIX_NAME -o -f $i/$PHP_LIBDIR/libpng.a && GD_PNG_DIR=$i && break done if test -z "$GD_PNG_DIR"; then @@ -94,12 +94,12 @@ PHP_CHECK_LIBRARY(png,png_write_image, [ PHP_ADD_INCLUDE($GD_PNG_DIR/include) - PHP_ADD_LIBRARY_WITH_PATH(z, $PHP_ZLIB_DIR/lib, GD_SHARED_LIBADD) - PHP_ADD_LIBRARY_WITH_PATH(png, $GD_PNG_DIR/lib, GD_SHARED_LIBADD) + PHP_ADD_LIBRARY_WITH_PATH(z, $PHP_ZLIB_DIR/$PHP_LIBDIR, GD_SHARED_LIBADD) + PHP_ADD_LIBRARY_WITH_PATH(png, $GD_PNG_DIR/$PHP_LIBDIR, GD_SHARED_LIBADD) ],[ AC_MSG_ERROR([Problem with libpng.(a|so) or libz.(a|so). Please check config.log for more information.]) ],[ - -L$PHP_ZLIB_DIR/lib -lz -L$GD_PNG_DIR/lib + -L$PHP_ZLIB_DIR/$PHP_LIBDIR -lz -L$GD_PNG_DIR/$PHP_LIBDIR ]) else @@ -111,7 +111,7 @@ if test "$PHP_XPM_DIR" != "no"; then for i in $PHP_XPM_DIR /usr/local /usr/X11R6 /usr; do - test -f $i/lib/libXpm.$SHLIB_SUFFIX_NAME -o -f $i/lib/libXpm.a && GD_XPM_DIR=$i && break + test -f $i/$PHP_LIBDIR/libXpm.$SHLIB_SUFFIX_NAME -o -f $i/$PHP_LIBDIR/libXpm.a && GD_XPM_DIR=$i && break done if test -z "$GD_XPM_DIR"; then @@ -129,12 +129,12 @@ PHP_CHECK_LIBRARY(Xpm,XpmFreeXpmImage, [ PHP_ADD_INCLUDE($GD_XPM_INC) - PHP_ADD_LIBRARY_WITH_PATH(Xpm, $GD_XPM_DIR/lib, GD_SHARED_LIBADD) - PHP_ADD_LIBRARY_WITH_PATH(X11, $GD_XPM_DIR/lib, GD_SHARED_LIBADD) + PHP_ADD_LIBRARY_WITH_PATH(Xpm, $GD_XPM_DIR/$PHP_LIBDIR, GD_SHARED_LIBADD) + PHP_ADD_LIBRARY_WITH_PATH(X11, $GD_XPM_DIR/$PHP_LIBDIR, GD_SHARED_LIBADD) ],[ AC_MSG_ERROR([Problem with libXpm.(a|so) or libX11.(a|so). Please check config.log for more information.]) ],[ - -L$GD_XPM_DIR/lib -lX11 + -L$GD_XPM_DIR/$PHP_LIBDIR -lX11 ]) else AC_MSG_RESULT(If configure fails try --with-xpm-dir=<DIR>) @@ -163,7 +163,7 @@ fi if test -n "$TTF_DIR" ; then AC_DEFINE(HAVE_LIBTTF,1,[ ]) - PHP_ADD_LIBRARY_WITH_PATH(ttf, $TTF_DIR/lib, GD_SHARED_LIBADD) + PHP_ADD_LIBRARY_WITH_PATH(ttf, $TTF_DIR/$PHP_LIBDIR, GD_SHARED_LIBADD) fi if test -z "$TTF_INC_DIR"; then TTF_INC_DIR=$TTF_DIR/include @@ -188,7 +188,7 @@ done if test -n "$FREETYPE2_DIR" ; then - PHP_ADD_LIBRARY_WITH_PATH(freetype, $FREETYPE2_DIR/lib, GD_SHARED_LIBADD) + PHP_ADD_LIBRARY_WITH_PATH(freetype, $FREETYPE2_DIR/$PHP_LIBDIR, GD_SHARED_LIBADD) PHP_ADD_INCLUDE($FREETYPE2_DIR/include) PHP_ADD_INCLUDE($FREETYPE2_INC_DIR) AC_DEFINE(USE_GD_IMGSTRTTF, 1, [ ]) @@ -216,7 +216,7 @@ [ AC_DEFINE(HAVE_LIBT1,1,[ ]) PHP_ADD_INCLUDE($GD_T1_DIR/include) - PHP_ADD_LIBRARY_WITH_PATH(t1, $GD_T1_DIR/lib, GD_SHARED_LIBADD) + PHP_ADD_LIBRARY_WITH_PATH(t1, $GD_T1_DIR/$PHP_LIBDIR, GD_SHARED_LIBADD) ],[ AC_MSG_ERROR([Problem with libt1.(a|so). Please check config.log for more information.]) ],[ http://cvs.php.net/diff.php/php-src/ext/gettext/config.m4?r1=1.13&r2=1.14&ty=u Index: php-src/ext/gettext/config.m4 diff -u php-src/ext/gettext/config.m4:1.13 php-src/ext/gettext/config.m4:1.14 --- php-src/ext/gettext/config.m4:1.13 Tue Sep 30 22:53:07 2003 +++ php-src/ext/gettext/config.m4 Wed Nov 3 09:32:50 2004 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.13 2003/10/01 02:53:07 sniper Exp $ +dnl $Id: config.m4,v 1.14 2004/11/03 14:32:50 jorton Exp $ dnl PHP_ARG_WITH(gettext,for GNU gettext support, @@ -14,7 +14,7 @@ AC_MSG_ERROR(Cannot locate header file libintl.h) fi - GETTEXT_LIBDIR=$GETTEXT_DIR/lib + GETTEXT_LIBDIR=$GETTEXT_DIR/$PHP_LIBDIR GETTEXT_INCDIR=$GETTEXT_DIR/include O_LDFLAGS=$LDFLAGS http://cvs.php.net/diff.php/php-src/ext/gmp/config.m4?r1=1.10&r2=1.11&ty=u Index: php-src/ext/gmp/config.m4 diff -u php-src/ext/gmp/config.m4:1.10 php-src/ext/gmp/config.m4:1.11 --- php-src/ext/gmp/config.m4:1.10 Tue Nov 18 23:44:06 2003 +++ php-src/ext/gmp/config.m4 Wed Nov 3 09:32:50 2004 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.10 2003/11/19 04:44:06 sniper Exp $ +dnl $Id: config.m4,v 1.11 2004/11/03 14:32:50 jorton Exp $ dnl PHP_ARG_WITH(gmp, for GNU MP support, @@ -21,13 +21,13 @@ [],[ AC_MSG_ERROR([GNU MP Library version 4.1.2 or greater required.]) ],[ - -L$GMP_DIR/lib + -L$GMP_DIR/$PHP_LIBDIR ]) ],[ - -L$GMP_DIR/lib + -L$GMP_DIR/$PHP_LIBDIR ]) - PHP_ADD_LIBRARY_WITH_PATH(gmp, $GMP_DIR/lib, GMP_SHARED_LIBADD) + PHP_ADD_LIBRARY_WITH_PATH(gmp, $GMP_DIR/$PHP_LIBDIR, GMP_SHARED_LIBADD) PHP_ADD_INCLUDE($GMP_DIR/include) PHP_NEW_EXTENSION(gmp, gmp.c, $ext_shared) http://cvs.php.net/diff.php/php-src/ext/iconv/config.m4?r1=1.27&r2=1.28&ty=u Index: php-src/ext/iconv/config.m4 diff -u php-src/ext/iconv/config.m4:1.27 php-src/ext/iconv/config.m4:1.28 --- php-src/ext/iconv/config.m4:1.27 Wed Jul 14 05:54:02 2004 +++ php-src/ext/iconv/config.m4 Wed Nov 3 09:32:50 2004 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.27 2004/07/14 09:54:02 derick Exp $ +dnl $Id: config.m4,v 1.28 2004/11/03 14:32:50 jorton Exp $ dnl PHP_ARG_WITH(iconv, for iconv support, @@ -24,7 +24,7 @@ fi CFLAGS="-I$PHP_ICONV_PREFIX/include $CFLAGS" - LDFLAGS="-L$PHP_ICONV_PREFIX/lib $LDFLAGS" + LDFLAGS="-L$PHP_ICONV_PREFIX/$PHP_LIBDIR $LDFLAGS" if test -r $PHP_ICONV_PREFIX/include/giconv.h; then PHP_ICONV_H_PATH="$PHP_ICONV_PREFIX/include/giconv.h" http://cvs.php.net/diff.php/php-src/ext/imap/config.m4?r1=1.63&r2=1.64&ty=u Index: php-src/ext/imap/config.m4 diff -u php-src/ext/imap/config.m4:1.63 php-src/ext/imap/config.m4:1.64 --- php-src/ext/imap/config.m4:1.63 Sun Feb 22 22:24:58 2004 +++ php-src/ext/imap/config.m4 Wed Nov 3 09:32:50 2004 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.63 2004/02/23 03:24:58 sniper Exp $ +dnl $Id: config.m4,v 1.64 2004/11/03 14:32:50 jorton Exp $ dnl AC_DEFUN(IMAP_INC_CHK,[if test -r "$i$1/c-client.h"; then @@ -59,7 +59,7 @@ fi for i in $SEARCH_PATHS; do - if test -f $i/lib/libkrb5.a || test -f $i/lib/libkrb5.$SHLIB_SUFFIX_NAME; then + if test -f $i/$PHP_LIBDIR/libkrb5.a || test -f $i/$PHP_LIBDIR/libkrb5.$SHLIB_SUFFIX_NAME; then PHP_KERBEROS_DIR=$i break fi @@ -72,7 +72,7 @@ ]) fi AC_DEFINE(HAVE_IMAP_KRB,1,[ ]) - PHP_ADD_LIBPATH($PHP_KERBEROS_DIR/lib, IMAP_SHARED_LIBADD) + PHP_ADD_LIBPATH($PHP_KERBEROS_DIR/$PHP_LIBDIR, IMAP_SHARED_LIBADD) PHP_ADD_LIBRARY(gssapi_krb5, 1, IMAP_SHARED_LIBADD) PHP_ADD_LIBRARY(krb5, 1, IMAP_SHARED_LIBADD) PHP_ADD_LIBRARY(k5crypto, 1, IMAP_SHARED_LIBADD) @@ -104,11 +104,11 @@ AC_MSG_CHECKING([whether SSL libraries are needed for c-client]) if test "$PHP_IMAP_SSL" != "no"; then - AC_MSG_RESULT([$PHP_IMAP_SSL/lib]) + AC_MSG_RESULT([$PHP_IMAP_SSL/$PHP_LIBDIR]) AC_DEFINE(HAVE_IMAP_SSL,1,[ ]) PHP_ADD_LIBRARY_DEFER(ssl, 1, IMAP_SHARED_LIBADD) PHP_ADD_LIBRARY_DEFER(crypto, 1, IMAP_SHARED_LIBADD) - PHP_ADD_LIBPATH($PHP_IMAP_SSL/lib, IMAP_SHARED_LIBADD) + PHP_ADD_LIBPATH($PHP_IMAP_SSL/$PHP_LIBDIR, IMAP_SHARED_LIBADD) else AC_MSG_RESULT(no) fi @@ -166,13 +166,13 @@ if test -r "$IMAP_DIR/c-client/c-client.a"; then ln -s "$IMAP_DIR/c-client/c-client.a" "$IMAP_DIR/c-client/libc-client.a" >/dev/null 2>&1 - elif test -r "$IMAP_DIR/lib/c-client.a"; then - ln -s "$IMAP_DIR/lib/c-client.a" "$IMAP_DIR/lib/libc-client.a" >/dev/null 2>&1 + elif test -r "$IMAP_DIR/$PHP_LIBDIR/c-client.a"; then + ln -s "$IMAP_DIR/$PHP_LIBDIR/c-client.a" "$IMAP_DIR/$PHP_LIBDIR/libc-client.a" >/dev/null 2>&1 fi for lib in c-client4 c-client imap; do IMAP_LIB=$lib - IMAP_LIB_CHK(lib) + IMAP_LIB_CHK($PHP_LIBDIR) IMAP_LIB_CHK(c-client) done http://cvs.php.net/diff.php/php-src/ext/ldap/config.m4?r1=1.34&r2=1.35&ty=u Index: php-src/ext/ldap/config.m4 diff -u php-src/ext/ldap/config.m4:1.34 php-src/ext/ldap/config.m4:1.35 --- php-src/ext/ldap/config.m4:1.34 Mon Jun 30 20:02:13 2003 +++ php-src/ext/ldap/config.m4 Wed Nov 3 09:32:50 2004 @@ -1,20 +1,20 @@ dnl -dnl $Id: config.m4,v 1.34 2003/07/01 00:02:13 sniper Exp $ +dnl $Id: config.m4,v 1.35 2004/11/03 14:32:50 jorton Exp $ dnl AC_DEFUN(PHP_LDAP_CHECKS, [ if test -f $1/include/ldap.h; then LDAP_DIR=$1 LDAP_INCDIR=$1/include - LDAP_LIBDIR=$1/lib + LDAP_LIBDIR=$1/$PHP_LIBDIR elif test -f $1/include/umich-ldap/ldap.h; then LDAP_DIR=$1 LDAP_INCDIR=$1/include/umich-ldap - LDAP_LIBDIR=$1/lib + LDAP_LIBDIR=$1/$PHP_LIBDIR elif test -f $1/ldap/public/ldap.h; then LDAP_DIR=$1 LDAP_INCDIR=$1/ldap/public - LDAP_LIBDIR=$1/lib + LDAP_LIBDIR=$1/$PHP_LIBDIR fi ]) @@ -39,7 +39,7 @@ if test "$LDAP_SASL_DIR"; then LDAP_SASL_INCDIR=$LDAP_SASL_DIR/include - LDAP_SASL_LIBDIR=$LDAP_SASL_DIR/lib + LDAP_SASL_LIBDIR=$LDAP_SASL_DIR/$PHP_LIBDIR else AC_MSG_ERROR([sasl.h not found!]) fi http://cvs.php.net/diff.php/php-src/ext/mbstring/config.m4?r1=1.53&r2=1.54&ty=u Index: php-src/ext/mbstring/config.m4 diff -u php-src/ext/mbstring/config.m4:1.53 php-src/ext/mbstring/config.m4:1.54 --- php-src/ext/mbstring/config.m4:1.53 Fri Oct 8 10:24:06 2004 +++ php-src/ext/mbstring/config.m4 Wed Nov 3 09:32:50 2004 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.53 2004/10/08 14:24:06 moriyoshi Exp $ +dnl $Id: config.m4,v 1.54 2004/11/03 14:32:50 jorton Exp $ dnl AC_DEFUN([PHP_MBSTRING_ADD_SOURCES], [ @@ -225,11 +225,11 @@ fi PHP_CHECK_LIBRARY(mbfl, mbfl_buffer_converter_new, [ - PHP_ADD_LIBRARY_WITH_PATH(mbfl, $PHP_LIBMBFL/lib, MBSTRING_SHARED_LIBADD) + PHP_ADD_LIBRARY_WITH_PATH(mbfl, $PHP_LIBMBFL/$PHP_LIBDIR, MBSTRING_SHARED_LIBADD) ],[ AC_MSG_ERROR([Problem with libmbfl. Please check config.log for more information.]) ], [ - -LPHP_LIBMBFL/lib + -LPHP_LIBMBFL/$PHP_LIBDIR ]) fi ]) http://cvs.php.net/diff.php/php-src/ext/mysql/config.m4?r1=1.61&r2=1.62&ty=u Index: php-src/ext/mysql/config.m4 diff -u php-src/ext/mysql/config.m4:1.61 php-src/ext/mysql/config.m4:1.62 --- php-src/ext/mysql/config.m4:1.61 Wed Dec 31 06:27:52 2003 +++ php-src/ext/mysql/config.m4 Wed Nov 3 09:32:50 2004 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.61 2003/12/31 11:27:52 derick Exp $ +dnl $Id: config.m4,v 1.62 2004/11/03 14:32:50 jorton Exp $ dnl AC_DEFUN(MYSQL_LIB_CHK, [ @@ -83,7 +83,7 @@ Note that the MySQL client library is not bundled anymore.]) fi - for i in lib lib/mysql; do + for i in $PHP_LIBDIR $PHP_LIBDIR/mysql; do MYSQL_LIB_CHK($i) done @@ -99,9 +99,9 @@ PHP_CHECK_LIBRARY(mysqlclient, mysql_error, [], [ AC_MSG_ERROR([mysql configure failed. Please check config.log for more information.]) ], [ - -L$PHP_ZLIB_DIR/lib -L$MYSQL_LIB_DIR + -L$PHP_ZLIB_DIR/$PHP_LIBDIR -L$MYSQL_LIB_DIR ]) - MYSQL_LIBS="-L$PHP_ZLIB_DIR/lib -lz" + MYSQL_LIBS="-L$PHP_ZLIB_DIR/$PHP_LIBDIR -lz" else PHP_ADD_LIBRARY(z,, MYSQL_SHARED_LIBADD) PHP_CHECK_LIBRARY(mysqlclient, mysql_errno, [], [ http://cvs.php.net/diff.php/php-src/ext/ncurses/config.m4?r1=1.17&r2=1.18&ty=u Index: php-src/ext/ncurses/config.m4 diff -u php-src/ext/ncurses/config.m4:1.17 php-src/ext/ncurses/config.m4:1.18 --- php-src/ext/ncurses/config.m4:1.17 Tue Dec 9 15:33:08 2003 +++ php-src/ext/ncurses/config.m4 Wed Nov 3 09:32:51 2004 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.17 2003/12/09 20:33:08 sniper Exp $ +dnl $Id: config.m4,v 1.18 2004/11/03 14:32:51 jorton Exp $ dnl PHP_ARG_WITH(ncurses, for ncurses support, @@ -40,18 +40,18 @@ PHP_CHECK_LIBRARY($LIBNAME, $LIBSYMBOL, [ AC_DEFINE(HAVE_NCURSESLIB,1,[ ]) - PHP_ADD_LIBRARY_WITH_PATH($LIBNAME, $NCURSES_DIR/lib, NCURSES_SHARED_LIBADD) + PHP_ADD_LIBRARY_WITH_PATH($LIBNAME, $NCURSES_DIR/$PHP_LIBDIR, NCURSES_SHARED_LIBADD) PHP_CHECK_LIBRARY(panel, new_panel, [ AC_DEFINE(HAVE_NCURSES_PANEL,1,[ ]) - PHP_ADD_LIBRARY_WITH_PATH(panel, $NCURSES_DIR/lib, NCURSES_SHARED_LIBADD) + PHP_ADD_LIBRARY_WITH_PATH(panel, $NCURSES_DIR/$PHP_LIBDIR, NCURSES_SHARED_LIBADD) ], [], [ - -L$NCURSES_DIR/lib -l$LIBNAME -lm + -L$NCURSES_DIR/$PHP_LIBDIR -l$LIBNAME -lm ]) ], [ AC_MSG_ERROR(Wrong ncurses lib version or lib not found) ], [ - -L$NCURSES_DIR/lib -lm + -L$NCURSES_DIR/$PHP_LIBDIR -lm ]) AC_CHECK_LIB($LIBNAME, color_set, [AC_DEFINE(HAVE_NCURSES_COLOR_SET, 1, [ ])]) http://cvs.php.net/diff.php/php-src/ext/odbc/config.m4?r1=1.65&r2=1.66&ty=u Index: php-src/ext/odbc/config.m4 diff -u php-src/ext/odbc/config.m4:1.65 php-src/ext/odbc/config.m4:1.66 --- php-src/ext/odbc/config.m4:1.65 Sat Jan 17 07:59:40 2004 +++ php-src/ext/odbc/config.m4 Wed Nov 3 09:32:51 2004 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.65 2004/01/17 12:59:40 sniper Exp $ +dnl $Id: config.m4,v 1.66 2004/11/03 14:32:51 jorton Exp $ dnl dnl @@ -101,8 +101,8 @@ fi if test "$withval" != "no"; then PHP_ADD_INCLUDE($withval/incl) - PHP_ADD_LIBPATH($withval/lib) - ODBC_OBJS="$withval/lib/odbclib.a" + PHP_ADD_LIBPATH($withval/$PHP_LIBDIR) + ODBC_OBJS="$withval/$PHP_LIBDIR/odbclib.a" ODBC_LIB="$abs_builddir/ext/odbc/libodbc_adabas.a" $srcdir/build/shtool mkdir -f -p ext/odbc rm -f "$ODBC_LIB" @@ -159,7 +159,7 @@ fi if test "$withval" != "no"; then ODBC_INCDIR=$withval/include - ODBC_LIBDIR=$withval/lib + ODBC_LIBDIR=$withval/$PHP_LIBDIR ODBC_INCLUDE=-I$ODBC_INCDIR ODBC_TYPE=solid if test -f $ODBC_LIBDIR/soc*35.a; then @@ -192,7 +192,7 @@ ODBC_LIBDIR=/home/db2inst1/sqllib/lib else ODBC_INCDIR=$withval/include - ODBC_LIBDIR=$withval/lib + ODBC_LIBDIR=$withval/$PHP_LIBDIR fi ODBC_INCLUDE=-I$ODBC_INCDIR ODBC_LFLAGS=-L$ODBC_LIBDIR @@ -302,7 +302,7 @@ ODBC_LIBDIR=/usr/local/birdstep/lib else ODBC_INCDIR=$withval/include - ODBC_LIBDIR=$withval/lib + ODBC_LIBDIR=$withval/$PHP_LIBDIR fi ODBC_INCLUDE=-I$ODBC_INCDIR ODBC_TYPE=birdstep @@ -340,7 +340,7 @@ fi if test "$withval" != "no"; then ODBC_INCDIR=$withval/include - ODBC_LIBDIR=$withval/lib + ODBC_LIBDIR=$withval/$PHP_LIBDIR ODBC_LFLAGS=-L$ODBC_LIBDIR ODBC_INCLUDE=-I$ODBC_INCDIR ODBC_LIBS=$CUSTOM_ODBC_LIBS @@ -370,7 +370,7 @@ PHP_ADD_INCLUDE($withval/include, 1) ODBC_TYPE=iodbc ODBC_INCLUDE=-I$withval/include - ODBC_LFLAGS=-L$withval/lib + ODBC_LFLAGS=-L$withval/$PHP_LIBDIR ODBC_LIBS=-liodbc AC_DEFINE(HAVE_IODBC,1,[ ]) AC_DEFINE(HAVE_ODBC2,1,[ ]) @@ -396,7 +396,7 @@ fi if test "$withval" != "no"; then ODBC_INCDIR=$withval/include - ODBC_LIBDIR=$withval/lib + ODBC_LIBDIR=$withval/$PHP_LIBDIR ODBC_LFLAGS=-L$ODBC_LIBDIR ODBC_INCLUDE=-I$ODBC_INCDIR ODBC_LIBS=-lesoobclient @@ -423,7 +423,7 @@ fi if test "$withval" != "no"; then ODBC_INCDIR=$withval/include - ODBC_LIBDIR=$withval/lib + ODBC_LIBDIR=$withval/$PHP_LIBDIR ODBC_LFLAGS=-L$ODBC_LIBDIR ODBC_INCLUDE=-I$ODBC_INCDIR ODBC_LIBS=-lodbc @@ -472,7 +472,7 @@ if test "$withval" != "no"; then ODBC_INCDIR=$withval/include - ODBC_LIBDIR=$withval/lib + ODBC_LIBDIR=$withval/$PHP_LIBDIR ODBC_INCLUDE=-I$ODBC_INCDIR ODBC_LFLAGS=-L$ODBC_LIBDIR ODBC_INCLUDE=-I$ODBC_INCDIR http://cvs.php.net/diff.php/php-src/ext/pcre/config.m4?r1=1.32&r2=1.33&ty=u Index: php-src/ext/pcre/config.m4 diff -u php-src/ext/pcre/config.m4:1.32 php-src/ext/pcre/config.m4:1.33 --- php-src/ext/pcre/config.m4:1.32 Sat Jun 28 00:30:51 2003 +++ php-src/ext/pcre/config.m4 Wed Nov 3 09:32:51 2004 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.32 2003/06/28 04:30:51 sterling Exp $ +dnl $Id: config.m4,v 1.33 2004/11/03 14:32:51 jorton Exp $ dnl dnl By default we'll compile and link against the bundled PCRE library @@ -25,7 +25,7 @@ AC_MSG_ERROR([Could not find pcre.h in $PHP_PCRE_REGEX]) fi - for j in $PHP_PCRE_REGEX $PHP_PCRE_REGEX/lib; do + for j in $PHP_PCRE_REGEX $PHP_PCRE_REGEX/$PHP_LIBDIR; do test -f $j/libpcre.a -o -f $j/libpcre.$SHLIB_SUFFIX_NAME && PCRE_LIBDIR=$j done http://cvs.php.net/diff.php/php-src/ext/pgsql/config.m4?r1=1.37&r2=1.38&ty=u Index: php-src/ext/pgsql/config.m4 diff -u php-src/ext/pgsql/config.m4:1.37 php-src/ext/pgsql/config.m4:1.38 --- php-src/ext/pgsql/config.m4:1.37 Fri Jan 9 13:44:33 2004 +++ php-src/ext/pgsql/config.m4 Wed Nov 3 09:32:51 2004 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.37 2004/01/09 18:44:33 helly Exp $ +dnl $Id: config.m4,v 1.38 2004/11/03 14:32:51 jorton Exp $ dnl AC_DEFUN(PHP_PGSQL_CHECK_FUNCTIONS,[ @@ -44,7 +44,7 @@ fi done - for j in lib lib/pgsql lib/postgres lib/postgresql ""; do + for j in $PHP_LIBDIR $PHP_LIBDIR/pgsql $PHP_LIBDIR/postgres $PHP_LIBDIR/postgresql ""; do if test -f "$i/$j/libpq.so" || test -f "$i/$j/libpq.a"; then PGSQL_LIBDIR=$i/$j fi http://cvs.php.net/diff.php/php-src/ext/pspell/config.m4?r1=1.9&r2=1.10&ty=u Index: php-src/ext/pspell/config.m4 diff -u php-src/ext/pspell/config.m4:1.9 php-src/ext/pspell/config.m4:1.10 --- php-src/ext/pspell/config.m4:1.9 Sat Aug 9 14:43:45 2003 +++ php-src/ext/pspell/config.m4 Wed Nov 3 09:32:51 2004 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.9 2003/08/09 18:43:45 sniper Exp $ +dnl $Id: config.m4,v 1.10 2004/11/03 14:32:51 jorton Exp $ dnl PHP_ARG_WITH(pspell,for PSPELL support, @@ -27,7 +27,7 @@ AC_MSG_ERROR(Cannot find pspell) fi - PSPELL_LIBDIR=$PSPELL_DIR/lib + PSPELL_LIBDIR=$PSPELL_DIR/$PHP_LIBDIR AC_DEFINE(HAVE_PSPELL,1,[ ]) PHP_SUBST(PSPELL_SHARED_LIBADD) http://cvs.php.net/diff.php/php-src/ext/readline/config.m4?r1=1.23&r2=1.24&ty=u Index: php-src/ext/readline/config.m4 diff -u php-src/ext/readline/config.m4:1.23 php-src/ext/readline/config.m4:1.24 --- php-src/ext/readline/config.m4:1.23 Tue Aug 24 08:52:07 2004 +++ php-src/ext/readline/config.m4 Wed Nov 3 09:32:51 2004 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.23 2004/08/24 12:52:07 wez Exp $ +dnl $Id: config.m4,v 1.24 2004/11/03 14:32:51 jorton Exp $ dnl PHP_ARG_WITH(libedit,for libedit readline replacement, @@ -34,27 +34,27 @@ PHP_CHECK_LIBRARY(readline, readline, [ - PHP_ADD_LIBRARY_WITH_PATH(readline, $READLINE_DIR/lib, READLINE_SHARED_LIBADD) + PHP_ADD_LIBRARY_WITH_PATH(readline, $READLINE_DIR/$PHP_LIBDIR, READLINE_SHARED_LIBADD) ], [ AC_MSG_ERROR(readline library not found) ], [ - -L$READLINE_DIR/lib $PHP_READLINE_LIBS + -L$READLINE_DIR/$PHP_LIBDIR $PHP_READLINE_LIBS ]) PHP_CHECK_LIBRARY(readline, rl_callback_read_char, [ AC_DEFINE(HAVE_RL_CALLBACK_READ_CHAR, 1, [ ]) ],[],[ - -L$READLINE_DIR/lib $PHP_READLINE_LIBS + -L$READLINE_DIR/$PHP_LIBDIR $PHP_READLINE_LIBS ]) PHP_CHECK_LIBRARY(history, add_history, [ - PHP_ADD_LIBRARY_WITH_PATH(history, $READLINE_DIR/lib, READLINE_SHARED_LIBADD) + PHP_ADD_LIBRARY_WITH_PATH(history, $READLINE_DIR/$PHP_LIBDIR, READLINE_SHARED_LIBADD) ], [ AC_MSG_ERROR(history library required by readline not found) ], [ - -L$READLINE_DIR/lib $PHP_READLINE_LIBS + -L$READLINE_DIR/$PHP_LIBDIR $PHP_READLINE_LIBS ]) PHP_NEW_EXTENSION(readline, readline.c, $ext_shared, cli) @@ -85,11 +85,11 @@ PHP_CHECK_LIBRARY(edit, readline, [ - PHP_ADD_LIBRARY_WITH_PATH(edit, $LIBEDIT_DIR/lib, READLINE_SHARED_LIBADD) + PHP_ADD_LIBRARY_WITH_PATH(edit, $LIBEDIT_DIR/$PHP_LIBDIR, READLINE_SHARED_LIBADD) ], [ AC_MSG_ERROR(edit library required by readline not found) ], [ - -L$READLINE_DIR/lib + -L$READLINE_DIR/$PHP_LIBDIR ]) PHP_NEW_EXTENSION(readline, readline.c, $ext_shared, cli) http://cvs.php.net/diff.php/php-src/ext/recode/config.m4?r1=1.11&r2=1.12&ty=u Index: php-src/ext/recode/config.m4 diff -u php-src/ext/recode/config.m4:1.11 php-src/ext/recode/config.m4:1.12 --- php-src/ext/recode/config.m4:1.11 Tue Sep 30 22:53:14 2003 +++ php-src/ext/recode/config.m4 Wed Nov 3 09:32:51 2004 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.11 2003/10/01 02:53:14 sniper Exp $ +dnl $Id: config.m4,v 1.12 2004/11/03 14:32:51 jorton Exp $ dnl PHP_ARG_WITH(recode,for recode support, @@ -12,17 +12,17 @@ if test -f $i/include/recode.h; then RECODE_DIR=$i RECODE_INC=include - RECODE_LIB=lib + RECODE_LIB=$PHP_LIBDIR fi if test -f $i/include/recode/recode.h; then RECODE_DIR=$i RECODE_INC=include/recode - RECODE_LIB=lib/recode + RECODE_LIB=$PHP_LIBDIR/recode fi if test -f $i/recode/include/recode.h; then RECODE_DIR=$i/recode RECODE_INC=include - RECODE_LIB=lib + RECODE_LIB=$PHP_LIBDIR fi test -n "$RECODE_DIR" && break done http://cvs.php.net/diff.php/php-src/ext/session/config.m4?r1=1.25&r2=1.26&ty=u Index: php-src/ext/session/config.m4 diff -u php-src/ext/session/config.m4:1.25 php-src/ext/session/config.m4:1.26 --- php-src/ext/session/config.m4:1.25 Tue Sep 30 22:53:15 2003 +++ php-src/ext/session/config.m4 Wed Nov 3 09:32:51 2004 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.25 2003/10/01 02:53:15 sniper Exp $ +dnl $Id: config.m4,v 1.26 2004/11/03 14:32:51 jorton Exp $ dnl PHP_ARG_ENABLE(session, whether to enable PHP sessions, @@ -25,7 +25,7 @@ AC_MSG_ERROR(cannot find mm library) fi - PHP_ADD_LIBRARY_WITH_PATH(mm, $MM_DIR/lib, SESSION_SHARED_LIBADD) + PHP_ADD_LIBRARY_WITH_PATH(mm, $MM_DIR/$PHP_LIBDIR, SESSION_SHARED_LIBADD) PHP_ADD_INCLUDE($MM_DIR/include) AC_DEFINE(HAVE_LIBMM, 1, [Whether you have libmm]) fi http://cvs.php.net/diff.php/php-src/ext/sqlite/config.m4?r1=1.27&r2=1.28&ty=u Index: php-src/ext/sqlite/config.m4 diff -u php-src/ext/sqlite/config.m4:1.27 php-src/ext/sqlite/config.m4:1.28 --- php-src/ext/sqlite/config.m4:1.27 Sat Jul 10 08:49:34 2004 +++ php-src/ext/sqlite/config.m4 Wed Nov 3 09:32:52 2004 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.27 2004/07/10 12:49:34 wez Exp $ +dnl $Id: config.m4,v 1.28 2004/11/03 14:32:52 jorton Exp $ dnl config.m4 for extension sqlite dnl vim:et:ts=2:sw=2 @@ -40,12 +40,12 @@ PHP_CHECK_LIBRARY($LIBNAME,$LIBSYMBOL, [ - PHP_ADD_LIBRARY_WITH_PATH($LIBNAME, $SQLITE_DIR/lib, SQLITE_SHARED_LIBADD) + PHP_ADD_LIBRARY_WITH_PATH($LIBNAME, $SQLITE_DIR/$PHP_LIBDIR, SQLITE_SHARED_LIBADD) AC_DEFINE(HAVE_SQLITELIB,1,[ ]) ],[ AC_MSG_ERROR([wrong sqlite lib version or lib not found]) ],[ - -L$SQLITE_DIR/lib -lm + -L$SQLITE_DIR/$PHP_LIBDIR -lm ]) PHP_SUBST(SQLITE_SHARED_LIBADD) http://cvs.php.net/diff.php/php-src/ext/xml/config.m4?r1=1.49&r2=1.50&ty=u Index: php-src/ext/xml/config.m4 diff -u php-src/ext/xml/config.m4:1.49 php-src/ext/xml/config.m4:1.50 --- php-src/ext/xml/config.m4:1.49 Sun Jul 18 08:03:51 2004 +++ php-src/ext/xml/config.m4 Wed Nov 3 09:32:52 2004 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.49 2004/07/18 12:03:51 wez Exp $ +dnl $Id: config.m4,v 1.50 2004/11/03 14:32:52 jorton Exp $ dnl PHP_ARG_ENABLE(xml,whether to enable XML support, @@ -30,7 +30,7 @@ dnl if test "$PHP_LIBEXPAT_DIR" != "no"; then for i in $PHP_XML $PHP_LIBEXPAT_DIR; do - if test -f "$i/lib/libexpat.a" -o -f "$i/lib/libexpat.$SHLIB_SUFFIX_NAME"; then + if test -f "$i/$PHP_LIBDIR/libexpat.a" -o -f "$i/$PHP_LIBDIR/libexpat.$SHLIB_SUFFIX_NAME"; then EXPAT_DIR=$i break fi @@ -41,7 +41,7 @@ fi PHP_ADD_INCLUDE($EXPAT_DIR/include) - PHP_ADD_LIBRARY_WITH_PATH(expat, $EXPAT_DIR/lib, XML_SHARED_LIBADD) + PHP_ADD_LIBRARY_WITH_PATH(expat, $EXPAT_DIR/$PHP_LIBDIR, XML_SHARED_LIBADD) AC_DEFINE(HAVE_LIBEXPAT, 1, [ ]) fi http://cvs.php.net/diff.php/php-src/ext/xmlrpc/config.m4?r1=1.21&r2=1.22&ty=u Index: php-src/ext/xmlrpc/config.m4 diff -u php-src/ext/xmlrpc/config.m4:1.21 php-src/ext/xmlrpc/config.m4:1.22 --- php-src/ext/xmlrpc/config.m4:1.21 Tue Sep 30 22:53:15 2003 +++ php-src/ext/xmlrpc/config.m4 Wed Nov 3 09:32:52 2004 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.21 2003/10/01 02:53:15 sniper Exp $ +dnl $Id: config.m4,v 1.22 2004/11/03 14:32:52 jorton Exp $ dnl sinclude(ext/xmlrpc/libxmlrpc/acinclude.m4) @@ -23,9 +23,9 @@ testval=no for i in $PHP_EXPAT_DIR $XMLRPC_DIR /usr/local /usr; do - if test -f $i/lib/libexpat.a -o -f $i/lib/libexpat.$SHLIB_SUFFIX_NAME; then + if test -f $i/$PHP_LIBDIR/libexpat.a -o -f $i/$PHP_LIBDIR/libexpat.$SHLIB_SUFFIX_NAME; then AC_DEFINE(HAVE_LIBEXPAT2,1,[ ]) - PHP_ADD_LIBRARY_WITH_PATH(expat, $i/lib, XMLRPC_SHARED_LIBADD) + PHP_ADD_LIBRARY_WITH_PATH(expat, $i/$PHP_LIBDIR, XMLRPC_SHARED_LIBADD) PHP_ADD_INCLUDE($i/include) testval=yes break @@ -88,6 +88,6 @@ fi PHP_ADD_INCLUDE($XMLRPC_DIR) - PHP_ADD_LIBRARY_WITH_PATH(xmlrpc, $XMLRPC_DIR/lib, XMLRPC_SHARED_LIBADD) + PHP_ADD_LIBRARY_WITH_PATH(xmlrpc, $XMLRPC_DIR/$PHP_LIBDIR, XMLRPC_SHARED_LIBADD) fi http://cvs.php.net/diff.php/php-src/ext/xsl/config.m4?r1=1.8&r2=1.9&ty=u Index: php-src/ext/xsl/config.m4 diff -u php-src/ext/xsl/config.m4:1.8 php-src/ext/xsl/config.m4:1.9 --- php-src/ext/xsl/config.m4:1.8 Sun Jul 18 08:03:51 2004 +++ php-src/ext/xsl/config.m4 Wed Nov 3 09:32:52 2004 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.8 2004/07/18 12:03:51 wez Exp $ +dnl $Id: config.m4,v 1.9 2004/11/03 14:32:52 jorton Exp $ dnl PHP_ARG_WITH(xsl, for XSL support, @@ -45,7 +45,7 @@ AC_MSG_RESULT(not found) else AC_MSG_RESULT(found) - PHP_ADD_LIBRARY_WITH_PATH(exslt, $PHP_XSL_EXSL_DIR/lib, XSL_SHARED_LIBADD) + PHP_ADD_LIBRARY_WITH_PATH(exslt, $PHP_XSL_EXSL_DIR/$PHP_LIBDIR, XSL_SHARED_LIBADD) PHP_ADD_INCLUDE($PHP_XSL_EXSL_DIR/include) AC_DEFINE(HAVE_XSL_EXSLT,1,[ ]) fi http://cvs.php.net/diff.php/php-src/ext/zlib/config0.m4?r1=1.15&r2=1.16&ty=u Index: php-src/ext/zlib/config0.m4 diff -u php-src/ext/zlib/config0.m4:1.15 php-src/ext/zlib/config0.m4:1.16 --- php-src/ext/zlib/config0.m4:1.15 Fri Jul 16 20:05:30 2004 +++ php-src/ext/zlib/config0.m4 Wed Nov 3 09:32:52 2004 @@ -1,5 +1,5 @@ dnl -dnl $Id: config0.m4,v 1.15 2004/07/17 00:05:30 pollita Exp $ +dnl $Id: config0.m4,v 1.16 2004/11/03 14:32:52 jorton Exp $ dnl PHP_ARG_WITH(zlib,for ZLIB support, @@ -38,7 +38,7 @@ case $ZLIB_DIR in /usr) ac_extra= ;; - *) ac_extra=-L$ZLIB_DIR/lib ;; + *) ac_extra=-L$ZLIB_DIR/$PHP_LIBDIR ;; esac PHP_CHECK_LIBRARY(z, gzgets, [ @@ -49,7 +49,7 @@ $ac_extra ]) - PHP_ADD_LIBPATH($ZLIB_DIR/lib, ZLIB_SHARED_LIBADD) + PHP_ADD_LIBPATH($ZLIB_DIR/$PHP_LIBDIR, ZLIB_SHARED_LIBADD) PHP_ZLIB_DIR=$ZLIB_DIR PHP_ADD_LIBRARY(z,, ZLIB_SHARED_LIBADD)
http://cvs.php.net/diff.php/php-src/ext/bz2/config.m4?r1=1.4&r2=1.5&ty=u Index: php-src/ext/bz2/config.m4 diff -u php-src/ext/bz2/config.m4:1.4 php-src/ext/bz2/config.m4:1.5 --- php-src/ext/bz2/config.m4:1.4 Tue Jul 20 01:26:33 2004 +++ php-src/ext/bz2/config.m4 Wed Nov 3 09:32:48 2004 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.4 2004/07/20 05:26:33 pollita Exp $ +dnl $Id: config.m4,v 1.5 2004/11/03 14:32:48 jorton Exp $ dnl PHP_ARG_WITH(bz2, for BZip2 support, @@ -27,12 +27,12 @@ PHP_CHECK_LIBRARY(bz2, BZ2_bzerror, [ PHP_ADD_INCLUDE($BZIP_DIR/include) - PHP_ADD_LIBRARY_WITH_PATH(bz2, $BZIP_DIR/lib, BZ2_SHARED_LIBADD) + PHP_ADD_LIBRARY_WITH_PATH(bz2, $BZIP_DIR/$PHP_LIBDIR, BZ2_SHARED_LIBADD) AC_DEFINE(HAVE_BZ2,1,[ ]) ], [ AC_MSG_ERROR(bz2 module requires libbz2 >= 1.0.0) ], [ - -L$BZIP_DIR/lib + -L$BZIP_DIR/$PHP_LIBDIR ]) PHP_NEW_EXTENSION(bz2, bz2.c bz2_filter.c, $ext_shared) http://cvs.php.net/diff.php/php-src/ext/cpdf/config.m4?r1=1.20&r2=1.21&ty=u Index: php-src/ext/cpdf/config.m4 diff -u php-src/ext/cpdf/config.m4:1.20 php-src/ext/cpdf/config.m4:1.21 --- php-src/ext/cpdf/config.m4:1.20 Tue Dec 9 15:10:22 2003 +++ php-src/ext/cpdf/config.m4 Wed Nov 3 09:32:49 2004 @@ -1,10 +1,10 @@ -dnl $Id: config.m4,v 1.20 2003/12/09 20:10:22 sniper Exp $ +dnl $Id: config.m4,v 1.21 2004/11/03 14:32:49 jorton Exp $ AC_DEFUN(CPDF_JPEG_TEST,[ AC_ARG_WITH(jpeg-dir, [ --with-jpeg-dir[=DIR] CPDF: Set the path to libjpeg install prefix.],[ for i in $withval /usr/local /usr; do - if test -f "$i/lib/libjpeg.$SHLIB_SUFFIX_NAME" -o -f "$i/lib/libjpeg.a"; then + if test -f "$i/$PHP_LIBDIR/libjpeg.$SHLIB_SUFFIX_NAME" -o -f "$i/$PHP_LIBDIR/libjpeg.a"; then CPDF_JPEG_DIR=$i break; fi @@ -26,7 +26,7 @@ AC_ARG_WITH(tiff-dir, [ --with-tiff-dir[=DIR] CPDF: Set the path to libtiff install prefix.],[ for i in $withval /usr/local /usr; do - if test -f "$i/lib/libtiff.$SHLIB_SUFFIX_NAME" -o -f "$i/lib/libtiff.a"; then + if test -f "$i/$PHP_LIBDIR/libtiff.$SHLIB_SUFFIX_NAME" -o -f "$i/$PHP_LIBDIR/libtiff.a"; then CPDF_TIFF_DIR=$i break; fi @@ -64,7 +64,7 @@ ], [ AC_MSG_ERROR([Cpdflib module requires cpdflib >= 2.]) ], [ - -L$i/lib $CPDF_SHARED_LIBADD + -L$i/$PHP_LIBDIR $CPDF_SHARED_LIBADD ]) break fi http://cvs.php.net/diff.php/php-src/ext/curl/config.m4?r1=1.25&r2=1.26&ty=u Index: php-src/ext/curl/config.m4 diff -u php-src/ext/curl/config.m4:1.25 php-src/ext/curl/config.m4:1.26 --- php-src/ext/curl/config.m4:1.25 Thu May 22 09:08:49 2003 +++ php-src/ext/curl/config.m4 Wed Nov 3 09:32:49 2004 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.25 2003/05/22 13:08:49 derick Exp $ +dnl $Id: config.m4,v 1.26 2004/11/03 14:32:49 jorton Exp $ dnl PHP_ARG_WITH(curl, for CURL support, @@ -51,7 +51,7 @@ PHP_ADD_INCLUDE($CURL_DIR/include) PHP_EVAL_LIBLINE($CURL_LIBS, CURL_SHARED_LIBADD) - PHP_ADD_LIBRARY_WITH_PATH(curl, $CURL_DIR/lib, CURL_SHARED_LIBADD) + PHP_ADD_LIBRARY_WITH_PATH(curl, $CURL_DIR/$PHP_LIBDIR, CURL_SHARED_LIBADD) PHP_CHECK_LIBRARY(curl,curl_easy_perform, [ @@ -59,14 +59,14 @@ ],[ AC_MSG_ERROR(There is something wrong. Please check config.log for more information.) ],[ - $CURL_LIBS -L$CURL_DIR/lib + $CURL_LIBS -L$CURL_DIR/$PHP_LIBDIR ]) PHP_CHECK_LIBRARY(curl,curl_version_info, [ AC_DEFINE(HAVE_CURL_VERSION_INFO,1,[ ]) ],[],[ - $CURL_LIBS -L$CURL_DIR/lib + $CURL_LIBS -L$CURL_DIR/$PHP_LIBDIR ]) if test "$PHP_CURLWRAPPERS" != "no" ; then http://cvs.php.net/diff.php/php-src/ext/dba/config.m4?r1=1.61&r2=1.62&ty=u Index: php-src/ext/dba/config.m4 diff -u php-src/ext/dba/config.m4:1.61 php-src/ext/dba/config.m4:1.62 --- php-src/ext/dba/config.m4:1.61 Sat Sep 25 11:29:19 2004 +++ php-src/ext/dba/config.m4 Wed Nov 3 09:32:49 2004 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.61 2004/09/25 15:29:19 helly Exp $ +dnl $Id: config.m4,v 1.62 2004/11/03 14:32:49 jorton Exp $ dnl dnl Suppose we need FlatFile if no support or only CDB is used. @@ -21,7 +21,7 @@ dnl Assign INCLUDE/LFLAGS from PREFIX AC_DEFUN(PHP_DBA_STD_ASSIGN,[ if test -n "$THIS_PREFIX" && test "$THIS_PREFIX" != "/usr"; then - THIS_LFLAGS=$THIS_PREFIX/lib + THIS_LFLAGS=$THIS_PREFIX/$PHP_LIBDIR fi ]) @@ -86,7 +86,7 @@ AC_DEFINE_UNQUOTED(QDBM_INCLUDE_FILE, "$THIS_INCLUDE", [ ]) AC_DEFINE(DBA_QDBM, 1, [ ]) THIS_LIBS=$LIB - ], [], [-L$THIS_PREFIX/lib]) + ], [], [-L$THIS_PREFIX/$PHP_LIBDIR]) if test -n "$THIS_LIBS"; then break fi @@ -121,7 +121,7 @@ AC_DEFINE_UNQUOTED(GDBM_INCLUDE_FILE, "$THIS_INCLUDE", [ ]) AC_DEFINE(DBA_GDBM, 1, [ ]) THIS_LIBS=gdbm - ], [], [-L$THIS_PREFIX/lib]) + ], [], [-L$THIS_PREFIX/$PHP_LIBDIR]) fi PHP_DBA_STD_ASSIGN @@ -153,7 +153,7 @@ AC_DEFINE_UNQUOTED(NDBM_INCLUDE_FILE, "$THIS_INCLUDE", [ ]) AC_DEFINE(DBA_NDBM, 1, [ ]) THIS_LIBS=$LIB - ], [], [-L$THIS_PREFIX/lib]) + ], [], [-L$THIS_PREFIX/$PHP_LIBDIR]) if test -n "$THIS_LIBS"; then break fi @@ -171,8 +171,8 @@ dnl parameters(version, library list, function) AC_DEFUN(PHP_DBA_DB_CHECK,[ for LIB in $2; do - if test -f $THIS_PREFIX/lib/lib$LIB.a -o -f $THIS_PREFIX/lib/lib$LIB.$SHLIB_SUFFIX_NAME; then - PHP_TEMP_LDFLAGS(-L$THIS_PREFIX/lib, -l$LIB,[ + if test -f $THIS_PREFIX/$PHP_LIBDIR/lib$LIB.a -o -f $THIS_PREFIX/$PHP_LIBDIR/lib$LIB.$SHLIB_SUFFIX_NAME; then + PHP_TEMP_LDFLAGS(-L$THIS_PREFIX/$PHP_LIBDIR, -l$LIB,[ AC_TRY_LINK([ #include "$THIS_INCLUDE" ],[ @@ -367,7 +367,7 @@ fi AC_DEFINE(DBA_DBM, 1, [ ]) THIS_LIBS=$LIB - ], [], [-L$THIS_PREFIX/lib]) + ], [], [-L$THIS_PREFIX/$PHP_LIBDIR]) if test -n "$THIS_LIBS"; then break fi @@ -409,7 +409,7 @@ AC_DEFINE_UNQUOTED(CDB_INCLUDE_FILE, "$THIS_INCLUDE", [ ]) AC_DEFINE(DBA_CDB, 1, [ ]) THIS_LIBS=$LIB - ], [], [-L$THIS_PREFIX/lib]) + ], [], [-L$THIS_PREFIX/$PHP_LIBDIR]) if test -n "$THIS_LIBS"; then break fi http://cvs.php.net/diff.php/php-src/ext/fam/config.m4?r1=1.2&r2=1.3&ty=u Index: php-src/ext/fam/config.m4 diff -u php-src/ext/fam/config.m4:1.2 php-src/ext/fam/config.m4:1.3 --- php-src/ext/fam/config.m4:1.2 Tue Dec 10 15:09:35 2002 +++ php-src/ext/fam/config.m4 Wed Nov 3 09:32:49 2004 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.2 2002/12/10 20:09:35 helly Exp $ +dnl $Id: config.m4,v 1.3 2004/11/03 14:32:49 jorton Exp $ dnl config.m4 for extension fam dnl Comments in this file start with the string 'dnl'. @@ -42,12 +42,12 @@ PHP_CHECK_LIBRARY($LIBNAME,$LIBSYMBOL, [ - PHP_ADD_LIBRARY_WITH_PATH($LIBNAME, $FAM_DIR/lib, FAM_SHARED_LIBADD) + PHP_ADD_LIBRARY_WITH_PATH($LIBNAME, $FAM_DIR/$PHP_LIBDIR, FAM_SHARED_LIBADD) AC_DEFINE(HAVE_FAMLIB,1,[ ]) ],[ AC_MSG_ERROR([wrong fam lib version or lib not found]) ],[ - -L$FAM_DIR/lib -lm -ldl + -L$FAM_DIR/$PHP_LIBDIR -lm -ldl ]) PHP_SUBST(FAM_SHARED_LIBADD) http://cvs.php.net/diff.php/php-src/ext/gd/config.m4?r1=1.147&r2=1.148&ty=u Index: php-src/ext/gd/config.m4 diff -u php-src/ext/gd/config.m4:1.147 php-src/ext/gd/config.m4:1.148 --- php-src/ext/gd/config.m4:1.147 Tue Jul 27 08:44:25 2004 +++ php-src/ext/gd/config.m4 Wed Nov 3 09:32:49 2004 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.147 2004/07/27 12:44:25 iliaa Exp $ +dnl $Id: config.m4,v 1.148 2004/11/03 14:32:49 jorton Exp $ dnl dnl @@ -51,7 +51,7 @@ if test "$PHP_JPEG_DIR" != "no"; then for i in $PHP_JPEG_DIR /usr/local /usr; do - test -f $i/lib/libjpeg.$SHLIB_SUFFIX_NAME -o -f $i/lib/libjpeg.a && GD_JPEG_DIR=$i && break + test -f $i/$PHP_LIBDIR/libjpeg.$SHLIB_SUFFIX_NAME -o -f $i/$PHP_LIBDIR/libjpeg.a && GD_JPEG_DIR=$i && break done if test -z "$GD_JPEG_DIR"; then @@ -61,11 +61,11 @@ PHP_CHECK_LIBRARY(jpeg,jpeg_read_header, [ PHP_ADD_INCLUDE($GD_JPEG_DIR/include) - PHP_ADD_LIBRARY_WITH_PATH(jpeg, $GD_JPEG_DIR/lib, GD_SHARED_LIBADD) + PHP_ADD_LIBRARY_WITH_PATH(jpeg, $GD_JPEG_DIR/$PHP_LIBDIR, GD_SHARED_LIBADD) ],[ AC_MSG_ERROR([Problem with libjpeg.(a|so). Please check config.log for more information.]) ],[ - -L$GD_JPEG_DIR/lib + -L$GD_JPEG_DIR/$PHP_LIBDIR ]) else AC_MSG_RESULT([If configure fails try --with-jpeg-dir=<DIR>]) @@ -76,7 +76,7 @@ if test "$PHP_PNG_DIR" != "no"; then for i in $PHP_PNG_DIR /usr/local /usr; do - test -f $i/lib/libpng.$SHLIB_SUFFIX_NAME -o -f $i/lib/libpng.a && GD_PNG_DIR=$i && break + test -f $i/$PHP_LIBDIR/libpng.$SHLIB_SUFFIX_NAME -o -f $i/$PHP_LIBDIR/libpng.a && GD_PNG_DIR=$i && break done if test -z "$GD_PNG_DIR"; then @@ -94,12 +94,12 @@ PHP_CHECK_LIBRARY(png,png_write_image, [ PHP_ADD_INCLUDE($GD_PNG_DIR/include) - PHP_ADD_LIBRARY_WITH_PATH(z, $PHP_ZLIB_DIR/lib, GD_SHARED_LIBADD) - PHP_ADD_LIBRARY_WITH_PATH(png, $GD_PNG_DIR/lib, GD_SHARED_LIBADD) + PHP_ADD_LIBRARY_WITH_PATH(z, $PHP_ZLIB_DIR/$PHP_LIBDIR, GD_SHARED_LIBADD) + PHP_ADD_LIBRARY_WITH_PATH(png, $GD_PNG_DIR/$PHP_LIBDIR, GD_SHARED_LIBADD) ],[ AC_MSG_ERROR([Problem with libpng.(a|so) or libz.(a|so). Please check config.log for more information.]) ],[ - -L$PHP_ZLIB_DIR/lib -lz -L$GD_PNG_DIR/lib + -L$PHP_ZLIB_DIR/$PHP_LIBDIR -lz -L$GD_PNG_DIR/$PHP_LIBDIR ]) else @@ -111,7 +111,7 @@ if test "$PHP_XPM_DIR" != "no"; then for i in $PHP_XPM_DIR /usr/local /usr/X11R6 /usr; do - test -f $i/lib/libXpm.$SHLIB_SUFFIX_NAME -o -f $i/lib/libXpm.a && GD_XPM_DIR=$i && break + test -f $i/$PHP_LIBDIR/libXpm.$SHLIB_SUFFIX_NAME -o -f $i/$PHP_LIBDIR/libXpm.a && GD_XPM_DIR=$i && break done if test -z "$GD_XPM_DIR"; then @@ -129,12 +129,12 @@ PHP_CHECK_LIBRARY(Xpm,XpmFreeXpmImage, [ PHP_ADD_INCLUDE($GD_XPM_INC) - PHP_ADD_LIBRARY_WITH_PATH(Xpm, $GD_XPM_DIR/lib, GD_SHARED_LIBADD) - PHP_ADD_LIBRARY_WITH_PATH(X11, $GD_XPM_DIR/lib, GD_SHARED_LIBADD) + PHP_ADD_LIBRARY_WITH_PATH(Xpm, $GD_XPM_DIR/$PHP_LIBDIR, GD_SHARED_LIBADD) + PHP_ADD_LIBRARY_WITH_PATH(X11, $GD_XPM_DIR/$PHP_LIBDIR, GD_SHARED_LIBADD) ],[ AC_MSG_ERROR([Problem with libXpm.(a|so) or libX11.(a|so). Please check config.log for more information.]) ],[ - -L$GD_XPM_DIR/lib -lX11 + -L$GD_XPM_DIR/$PHP_LIBDIR -lX11 ]) else AC_MSG_RESULT(If configure fails try --with-xpm-dir=<DIR>) @@ -163,7 +163,7 @@ fi if test -n "$TTF_DIR" ; then AC_DEFINE(HAVE_LIBTTF,1,[ ]) - PHP_ADD_LIBRARY_WITH_PATH(ttf, $TTF_DIR/lib, GD_SHARED_LIBADD) + PHP_ADD_LIBRARY_WITH_PATH(ttf, $TTF_DIR/$PHP_LIBDIR, GD_SHARED_LIBADD) fi if test -z "$TTF_INC_DIR"; then TTF_INC_DIR=$TTF_DIR/include @@ -188,7 +188,7 @@ done if test -n "$FREETYPE2_DIR" ; then - PHP_ADD_LIBRARY_WITH_PATH(freetype, $FREETYPE2_DIR/lib, GD_SHARED_LIBADD) + PHP_ADD_LIBRARY_WITH_PATH(freetype, $FREETYPE2_DIR/$PHP_LIBDIR, GD_SHARED_LIBADD) PHP_ADD_INCLUDE($FREETYPE2_DIR/include) PHP_ADD_INCLUDE($FREETYPE2_INC_DIR) AC_DEFINE(USE_GD_IMGSTRTTF, 1, [ ]) @@ -216,7 +216,7 @@ [ AC_DEFINE(HAVE_LIBT1,1,[ ]) PHP_ADD_INCLUDE($GD_T1_DIR/include) - PHP_ADD_LIBRARY_WITH_PATH(t1, $GD_T1_DIR/lib, GD_SHARED_LIBADD) + PHP_ADD_LIBRARY_WITH_PATH(t1, $GD_T1_DIR/$PHP_LIBDIR, GD_SHARED_LIBADD) ],[ AC_MSG_ERROR([Problem with libt1.(a|so). Please check config.log for more information.]) ],[ http://cvs.php.net/diff.php/php-src/ext/gettext/config.m4?r1=1.13&r2=1.14&ty=u Index: php-src/ext/gettext/config.m4 diff -u php-src/ext/gettext/config.m4:1.13 php-src/ext/gettext/config.m4:1.14 --- php-src/ext/gettext/config.m4:1.13 Tue Sep 30 22:53:07 2003 +++ php-src/ext/gettext/config.m4 Wed Nov 3 09:32:50 2004 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.13 2003/10/01 02:53:07 sniper Exp $ +dnl $Id: config.m4,v 1.14 2004/11/03 14:32:50 jorton Exp $ dnl PHP_ARG_WITH(gettext,for GNU gettext support, @@ -14,7 +14,7 @@ AC_MSG_ERROR(Cannot locate header file libintl.h) fi - GETTEXT_LIBDIR=$GETTEXT_DIR/lib + GETTEXT_LIBDIR=$GETTEXT_DIR/$PHP_LIBDIR GETTEXT_INCDIR=$GETTEXT_DIR/include O_LDFLAGS=$LDFLAGS http://cvs.php.net/diff.php/php-src/ext/gmp/config.m4?r1=1.10&r2=1.11&ty=u Index: php-src/ext/gmp/config.m4 diff -u php-src/ext/gmp/config.m4:1.10 php-src/ext/gmp/config.m4:1.11 --- php-src/ext/gmp/config.m4:1.10 Tue Nov 18 23:44:06 2003 +++ php-src/ext/gmp/config.m4 Wed Nov 3 09:32:50 2004 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.10 2003/11/19 04:44:06 sniper Exp $ +dnl $Id: config.m4,v 1.11 2004/11/03 14:32:50 jorton Exp $ dnl PHP_ARG_WITH(gmp, for GNU MP support, @@ -21,13 +21,13 @@ [],[ AC_MSG_ERROR([GNU MP Library version 4.1.2 or greater required.]) ],[ - -L$GMP_DIR/lib + -L$GMP_DIR/$PHP_LIBDIR ]) ],[ - -L$GMP_DIR/lib + -L$GMP_DIR/$PHP_LIBDIR ]) - PHP_ADD_LIBRARY_WITH_PATH(gmp, $GMP_DIR/lib, GMP_SHARED_LIBADD) + PHP_ADD_LIBRARY_WITH_PATH(gmp, $GMP_DIR/$PHP_LIBDIR, GMP_SHARED_LIBADD) PHP_ADD_INCLUDE($GMP_DIR/include) PHP_NEW_EXTENSION(gmp, gmp.c, $ext_shared) http://cvs.php.net/diff.php/php-src/ext/iconv/config.m4?r1=1.27&r2=1.28&ty=u Index: php-src/ext/iconv/config.m4 diff -u php-src/ext/iconv/config.m4:1.27 php-src/ext/iconv/config.m4:1.28 --- php-src/ext/iconv/config.m4:1.27 Wed Jul 14 05:54:02 2004 +++ php-src/ext/iconv/config.m4 Wed Nov 3 09:32:50 2004 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.27 2004/07/14 09:54:02 derick Exp $ +dnl $Id: config.m4,v 1.28 2004/11/03 14:32:50 jorton Exp $ dnl PHP_ARG_WITH(iconv, for iconv support, @@ -24,7 +24,7 @@ fi CFLAGS="-I$PHP_ICONV_PREFIX/include $CFLAGS" - LDFLAGS="-L$PHP_ICONV_PREFIX/lib $LDFLAGS" + LDFLAGS="-L$PHP_ICONV_PREFIX/$PHP_LIBDIR $LDFLAGS" if test -r $PHP_ICONV_PREFIX/include/giconv.h; then PHP_ICONV_H_PATH="$PHP_ICONV_PREFIX/include/giconv.h" http://cvs.php.net/diff.php/php-src/ext/imap/config.m4?r1=1.63&r2=1.64&ty=u Index: php-src/ext/imap/config.m4 diff -u php-src/ext/imap/config.m4:1.63 php-src/ext/imap/config.m4:1.64 --- php-src/ext/imap/config.m4:1.63 Sun Feb 22 22:24:58 2004 +++ php-src/ext/imap/config.m4 Wed Nov 3 09:32:50 2004 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.63 2004/02/23 03:24:58 sniper Exp $ +dnl $Id: config.m4,v 1.64 2004/11/03 14:32:50 jorton Exp $ dnl AC_DEFUN(IMAP_INC_CHK,[if test -r "$i$1/c-client.h"; then @@ -59,7 +59,7 @@ fi for i in $SEARCH_PATHS; do - if test -f $i/lib/libkrb5.a || test -f $i/lib/libkrb5.$SHLIB_SUFFIX_NAME; then + if test -f $i/$PHP_LIBDIR/libkrb5.a || test -f $i/$PHP_LIBDIR/libkrb5.$SHLIB_SUFFIX_NAME; then PHP_KERBEROS_DIR=$i break fi @@ -72,7 +72,7 @@ ]) fi AC_DEFINE(HAVE_IMAP_KRB,1,[ ]) - PHP_ADD_LIBPATH($PHP_KERBEROS_DIR/lib, IMAP_SHARED_LIBADD) + PHP_ADD_LIBPATH($PHP_KERBEROS_DIR/$PHP_LIBDIR, IMAP_SHARED_LIBADD) PHP_ADD_LIBRARY(gssapi_krb5, 1, IMAP_SHARED_LIBADD) PHP_ADD_LIBRARY(krb5, 1, IMAP_SHARED_LIBADD) PHP_ADD_LIBRARY(k5crypto, 1, IMAP_SHARED_LIBADD) @@ -104,11 +104,11 @@ AC_MSG_CHECKING([whether SSL libraries are needed for c-client]) if test "$PHP_IMAP_SSL" != "no"; then - AC_MSG_RESULT([$PHP_IMAP_SSL/lib]) + AC_MSG_RESULT([$PHP_IMAP_SSL/$PHP_LIBDIR]) AC_DEFINE(HAVE_IMAP_SSL,1,[ ]) PHP_ADD_LIBRARY_DEFER(ssl, 1, IMAP_SHARED_LIBADD) PHP_ADD_LIBRARY_DEFER(crypto, 1, IMAP_SHARED_LIBADD) - PHP_ADD_LIBPATH($PHP_IMAP_SSL/lib, IMAP_SHARED_LIBADD) + PHP_ADD_LIBPATH($PHP_IMAP_SSL/$PHP_LIBDIR, IMAP_SHARED_LIBADD) else AC_MSG_RESULT(no) fi @@ -166,13 +166,13 @@ if test -r "$IMAP_DIR/c-client/c-client.a"; then ln -s "$IMAP_DIR/c-client/c-client.a" "$IMAP_DIR/c-client/libc-client.a" >/dev/null 2>&1 - elif test -r "$IMAP_DIR/lib/c-client.a"; then - ln -s "$IMAP_DIR/lib/c-client.a" "$IMAP_DIR/lib/libc-client.a" >/dev/null 2>&1 + elif test -r "$IMAP_DIR/$PHP_LIBDIR/c-client.a"; then + ln -s "$IMAP_DIR/$PHP_LIBDIR/c-client.a" "$IMAP_DIR/$PHP_LIBDIR/libc-client.a" >/dev/null 2>&1 fi for lib in c-client4 c-client imap; do IMAP_LIB=$lib - IMAP_LIB_CHK(lib) + IMAP_LIB_CHK($PHP_LIBDIR) IMAP_LIB_CHK(c-client) done http://cvs.php.net/diff.php/php-src/ext/ldap/config.m4?r1=1.34&r2=1.35&ty=u Index: php-src/ext/ldap/config.m4 diff -u php-src/ext/ldap/config.m4:1.34 php-src/ext/ldap/config.m4:1.35 --- php-src/ext/ldap/config.m4:1.34 Mon Jun 30 20:02:13 2003 +++ php-src/ext/ldap/config.m4 Wed Nov 3 09:32:50 2004 @@ -1,20 +1,20 @@ dnl -dnl $Id: config.m4,v 1.34 2003/07/01 00:02:13 sniper Exp $ +dnl $Id: config.m4,v 1.35 2004/11/03 14:32:50 jorton Exp $ dnl AC_DEFUN(PHP_LDAP_CHECKS, [ if test -f $1/include/ldap.h; then LDAP_DIR=$1 LDAP_INCDIR=$1/include - LDAP_LIBDIR=$1/lib + LDAP_LIBDIR=$1/$PHP_LIBDIR elif test -f $1/include/umich-ldap/ldap.h; then LDAP_DIR=$1 LDAP_INCDIR=$1/include/umich-ldap - LDAP_LIBDIR=$1/lib + LDAP_LIBDIR=$1/$PHP_LIBDIR elif test -f $1/ldap/public/ldap.h; then LDAP_DIR=$1 LDAP_INCDIR=$1/ldap/public - LDAP_LIBDIR=$1/lib + LDAP_LIBDIR=$1/$PHP_LIBDIR fi ]) @@ -39,7 +39,7 @@ if test "$LDAP_SASL_DIR"; then LDAP_SASL_INCDIR=$LDAP_SASL_DIR/include - LDAP_SASL_LIBDIR=$LDAP_SASL_DIR/lib + LDAP_SASL_LIBDIR=$LDAP_SASL_DIR/$PHP_LIBDIR else AC_MSG_ERROR([sasl.h not found!]) fi http://cvs.php.net/diff.php/php-src/ext/mbstring/config.m4?r1=1.53&r2=1.54&ty=u Index: php-src/ext/mbstring/config.m4 diff -u php-src/ext/mbstring/config.m4:1.53 php-src/ext/mbstring/config.m4:1.54 --- php-src/ext/mbstring/config.m4:1.53 Fri Oct 8 10:24:06 2004 +++ php-src/ext/mbstring/config.m4 Wed Nov 3 09:32:50 2004 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.53 2004/10/08 14:24:06 moriyoshi Exp $ +dnl $Id: config.m4,v 1.54 2004/11/03 14:32:50 jorton Exp $ dnl AC_DEFUN([PHP_MBSTRING_ADD_SOURCES], [ @@ -225,11 +225,11 @@ fi PHP_CHECK_LIBRARY(mbfl, mbfl_buffer_converter_new, [ - PHP_ADD_LIBRARY_WITH_PATH(mbfl, $PHP_LIBMBFL/lib, MBSTRING_SHARED_LIBADD) + PHP_ADD_LIBRARY_WITH_PATH(mbfl, $PHP_LIBMBFL/$PHP_LIBDIR, MBSTRING_SHARED_LIBADD) ],[ AC_MSG_ERROR([Problem with libmbfl. Please check config.log for more information.]) ], [ - -LPHP_LIBMBFL/lib + -LPHP_LIBMBFL/$PHP_LIBDIR ]) fi ]) http://cvs.php.net/diff.php/php-src/ext/mysql/config.m4?r1=1.61&r2=1.62&ty=u Index: php-src/ext/mysql/config.m4 diff -u php-src/ext/mysql/config.m4:1.61 php-src/ext/mysql/config.m4:1.62 --- php-src/ext/mysql/config.m4:1.61 Wed Dec 31 06:27:52 2003 +++ php-src/ext/mysql/config.m4 Wed Nov 3 09:32:50 2004 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.61 2003/12/31 11:27:52 derick Exp $ +dnl $Id: config.m4,v 1.62 2004/11/03 14:32:50 jorton Exp $ dnl AC_DEFUN(MYSQL_LIB_CHK, [ @@ -83,7 +83,7 @@ Note that the MySQL client library is not bundled anymore.]) fi - for i in lib lib/mysql; do + for i in $PHP_LIBDIR $PHP_LIBDIR/mysql; do MYSQL_LIB_CHK($i) done @@ -99,9 +99,9 @@ PHP_CHECK_LIBRARY(mysqlclient, mysql_error, [], [ AC_MSG_ERROR([mysql configure failed. Please check config.log for more information.]) ], [ - -L$PHP_ZLIB_DIR/lib -L$MYSQL_LIB_DIR + -L$PHP_ZLIB_DIR/$PHP_LIBDIR -L$MYSQL_LIB_DIR ]) - MYSQL_LIBS="-L$PHP_ZLIB_DIR/lib -lz" + MYSQL_LIBS="-L$PHP_ZLIB_DIR/$PHP_LIBDIR -lz" else PHP_ADD_LIBRARY(z,, MYSQL_SHARED_LIBADD) PHP_CHECK_LIBRARY(mysqlclient, mysql_errno, [], [ http://cvs.php.net/diff.php/php-src/ext/ncurses/config.m4?r1=1.17&r2=1.18&ty=u Index: php-src/ext/ncurses/config.m4 diff -u php-src/ext/ncurses/config.m4:1.17 php-src/ext/ncurses/config.m4:1.18 --- php-src/ext/ncurses/config.m4:1.17 Tue Dec 9 15:33:08 2003 +++ php-src/ext/ncurses/config.m4 Wed Nov 3 09:32:51 2004 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.17 2003/12/09 20:33:08 sniper Exp $ +dnl $Id: config.m4,v 1.18 2004/11/03 14:32:51 jorton Exp $ dnl PHP_ARG_WITH(ncurses, for ncurses support, @@ -40,18 +40,18 @@ PHP_CHECK_LIBRARY($LIBNAME, $LIBSYMBOL, [ AC_DEFINE(HAVE_NCURSESLIB,1,[ ]) - PHP_ADD_LIBRARY_WITH_PATH($LIBNAME, $NCURSES_DIR/lib, NCURSES_SHARED_LIBADD) + PHP_ADD_LIBRARY_WITH_PATH($LIBNAME, $NCURSES_DIR/$PHP_LIBDIR, NCURSES_SHARED_LIBADD) PHP_CHECK_LIBRARY(panel, new_panel, [ AC_DEFINE(HAVE_NCURSES_PANEL,1,[ ]) - PHP_ADD_LIBRARY_WITH_PATH(panel, $NCURSES_DIR/lib, NCURSES_SHARED_LIBADD) + PHP_ADD_LIBRARY_WITH_PATH(panel, $NCURSES_DIR/$PHP_LIBDIR, NCURSES_SHARED_LIBADD) ], [], [ - -L$NCURSES_DIR/lib -l$LIBNAME -lm + -L$NCURSES_DIR/$PHP_LIBDIR -l$LIBNAME -lm ]) ], [ AC_MSG_ERROR(Wrong ncurses lib version or lib not found) ], [ - -L$NCURSES_DIR/lib -lm + -L$NCURSES_DIR/$PHP_LIBDIR -lm ]) AC_CHECK_LIB($LIBNAME, color_set, [AC_DEFINE(HAVE_NCURSES_COLOR_SET, 1, [ ])]) http://cvs.php.net/diff.php/php-src/ext/odbc/config.m4?r1=1.65&r2=1.66&ty=u Index: php-src/ext/odbc/config.m4 diff -u php-src/ext/odbc/config.m4:1.65 php-src/ext/odbc/config.m4:1.66 --- php-src/ext/odbc/config.m4:1.65 Sat Jan 17 07:59:40 2004 +++ php-src/ext/odbc/config.m4 Wed Nov 3 09:32:51 2004 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.65 2004/01/17 12:59:40 sniper Exp $ +dnl $Id: config.m4,v 1.66 2004/11/03 14:32:51 jorton Exp $ dnl dnl @@ -101,8 +101,8 @@ fi if test "$withval" != "no"; then PHP_ADD_INCLUDE($withval/incl) - PHP_ADD_LIBPATH($withval/lib) - ODBC_OBJS="$withval/lib/odbclib.a" + PHP_ADD_LIBPATH($withval/$PHP_LIBDIR) + ODBC_OBJS="$withval/$PHP_LIBDIR/odbclib.a" ODBC_LIB="$abs_builddir/ext/odbc/libodbc_adabas.a" $srcdir/build/shtool mkdir -f -p ext/odbc rm -f "$ODBC_LIB" @@ -159,7 +159,7 @@ fi if test "$withval" != "no"; then ODBC_INCDIR=$withval/include - ODBC_LIBDIR=$withval/lib + ODBC_LIBDIR=$withval/$PHP_LIBDIR ODBC_INCLUDE=-I$ODBC_INCDIR ODBC_TYPE=solid if test -f $ODBC_LIBDIR/soc*35.a; then @@ -192,7 +192,7 @@ ODBC_LIBDIR=/home/db2inst1/sqllib/lib else ODBC_INCDIR=$withval/include - ODBC_LIBDIR=$withval/lib + ODBC_LIBDIR=$withval/$PHP_LIBDIR fi ODBC_INCLUDE=-I$ODBC_INCDIR ODBC_LFLAGS=-L$ODBC_LIBDIR @@ -302,7 +302,7 @@ ODBC_LIBDIR=/usr/local/birdstep/lib else ODBC_INCDIR=$withval/include - ODBC_LIBDIR=$withval/lib + ODBC_LIBDIR=$withval/$PHP_LIBDIR fi ODBC_INCLUDE=-I$ODBC_INCDIR ODBC_TYPE=birdstep @@ -340,7 +340,7 @@ fi if test "$withval" != "no"; then ODBC_INCDIR=$withval/include - ODBC_LIBDIR=$withval/lib + ODBC_LIBDIR=$withval/$PHP_LIBDIR ODBC_LFLAGS=-L$ODBC_LIBDIR ODBC_INCLUDE=-I$ODBC_INCDIR ODBC_LIBS=$CUSTOM_ODBC_LIBS @@ -370,7 +370,7 @@ PHP_ADD_INCLUDE($withval/include, 1) ODBC_TYPE=iodbc ODBC_INCLUDE=-I$withval/include - ODBC_LFLAGS=-L$withval/lib + ODBC_LFLAGS=-L$withval/$PHP_LIBDIR ODBC_LIBS=-liodbc AC_DEFINE(HAVE_IODBC,1,[ ]) AC_DEFINE(HAVE_ODBC2,1,[ ]) @@ -396,7 +396,7 @@ fi if test "$withval" != "no"; then ODBC_INCDIR=$withval/include - ODBC_LIBDIR=$withval/lib + ODBC_LIBDIR=$withval/$PHP_LIBDIR ODBC_LFLAGS=-L$ODBC_LIBDIR ODBC_INCLUDE=-I$ODBC_INCDIR ODBC_LIBS=-lesoobclient @@ -423,7 +423,7 @@ fi if test "$withval" != "no"; then ODBC_INCDIR=$withval/include - ODBC_LIBDIR=$withval/lib + ODBC_LIBDIR=$withval/$PHP_LIBDIR ODBC_LFLAGS=-L$ODBC_LIBDIR ODBC_INCLUDE=-I$ODBC_INCDIR ODBC_LIBS=-lodbc @@ -472,7 +472,7 @@ if test "$withval" != "no"; then ODBC_INCDIR=$withval/include - ODBC_LIBDIR=$withval/lib + ODBC_LIBDIR=$withval/$PHP_LIBDIR ODBC_INCLUDE=-I$ODBC_INCDIR ODBC_LFLAGS=-L$ODBC_LIBDIR ODBC_INCLUDE=-I$ODBC_INCDIR http://cvs.php.net/diff.php/php-src/ext/pcre/config.m4?r1=1.32&r2=1.33&ty=u Index: php-src/ext/pcre/config.m4 diff -u php-src/ext/pcre/config.m4:1.32 php-src/ext/pcre/config.m4:1.33 --- php-src/ext/pcre/config.m4:1.32 Sat Jun 28 00:30:51 2003 +++ php-src/ext/pcre/config.m4 Wed Nov 3 09:32:51 2004 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.32 2003/06/28 04:30:51 sterling Exp $ +dnl $Id: config.m4,v 1.33 2004/11/03 14:32:51 jorton Exp $ dnl dnl By default we'll compile and link against the bundled PCRE library @@ -25,7 +25,7 @@ AC_MSG_ERROR([Could not find pcre.h in $PHP_PCRE_REGEX]) fi - for j in $PHP_PCRE_REGEX $PHP_PCRE_REGEX/lib; do + for j in $PHP_PCRE_REGEX $PHP_PCRE_REGEX/$PHP_LIBDIR; do test -f $j/libpcre.a -o -f $j/libpcre.$SHLIB_SUFFIX_NAME && PCRE_LIBDIR=$j done http://cvs.php.net/diff.php/php-src/ext/pgsql/config.m4?r1=1.37&r2=1.38&ty=u Index: php-src/ext/pgsql/config.m4 diff -u php-src/ext/pgsql/config.m4:1.37 php-src/ext/pgsql/config.m4:1.38 --- php-src/ext/pgsql/config.m4:1.37 Fri Jan 9 13:44:33 2004 +++ php-src/ext/pgsql/config.m4 Wed Nov 3 09:32:51 2004 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.37 2004/01/09 18:44:33 helly Exp $ +dnl $Id: config.m4,v 1.38 2004/11/03 14:32:51 jorton Exp $ dnl AC_DEFUN(PHP_PGSQL_CHECK_FUNCTIONS,[ @@ -44,7 +44,7 @@ fi done - for j in lib lib/pgsql lib/postgres lib/postgresql ""; do + for j in $PHP_LIBDIR $PHP_LIBDIR/pgsql $PHP_LIBDIR/postgres $PHP_LIBDIR/postgresql ""; do if test -f "$i/$j/libpq.so" || test -f "$i/$j/libpq.a"; then PGSQL_LIBDIR=$i/$j fi http://cvs.php.net/diff.php/php-src/ext/pspell/config.m4?r1=1.9&r2=1.10&ty=u Index: php-src/ext/pspell/config.m4 diff -u php-src/ext/pspell/config.m4:1.9 php-src/ext/pspell/config.m4:1.10 --- php-src/ext/pspell/config.m4:1.9 Sat Aug 9 14:43:45 2003 +++ php-src/ext/pspell/config.m4 Wed Nov 3 09:32:51 2004 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.9 2003/08/09 18:43:45 sniper Exp $ +dnl $Id: config.m4,v 1.10 2004/11/03 14:32:51 jorton Exp $ dnl PHP_ARG_WITH(pspell,for PSPELL support, @@ -27,7 +27,7 @@ AC_MSG_ERROR(Cannot find pspell) fi - PSPELL_LIBDIR=$PSPELL_DIR/lib + PSPELL_LIBDIR=$PSPELL_DIR/$PHP_LIBDIR AC_DEFINE(HAVE_PSPELL,1,[ ]) PHP_SUBST(PSPELL_SHARED_LIBADD) http://cvs.php.net/diff.php/php-src/ext/readline/config.m4?r1=1.23&r2=1.24&ty=u Index: php-src/ext/readline/config.m4 diff -u php-src/ext/readline/config.m4:1.23 php-src/ext/readline/config.m4:1.24 --- php-src/ext/readline/config.m4:1.23 Tue Aug 24 08:52:07 2004 +++ php-src/ext/readline/config.m4 Wed Nov 3 09:32:51 2004 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.23 2004/08/24 12:52:07 wez Exp $ +dnl $Id: config.m4,v 1.24 2004/11/03 14:32:51 jorton Exp $ dnl PHP_ARG_WITH(libedit,for libedit readline replacement, @@ -34,27 +34,27 @@ PHP_CHECK_LIBRARY(readline, readline, [ - PHP_ADD_LIBRARY_WITH_PATH(readline, $READLINE_DIR/lib, READLINE_SHARED_LIBADD) + PHP_ADD_LIBRARY_WITH_PATH(readline, $READLINE_DIR/$PHP_LIBDIR, READLINE_SHARED_LIBADD) ], [ AC_MSG_ERROR(readline library not found) ], [ - -L$READLINE_DIR/lib $PHP_READLINE_LIBS + -L$READLINE_DIR/$PHP_LIBDIR $PHP_READLINE_LIBS ]) PHP_CHECK_LIBRARY(readline, rl_callback_read_char, [ AC_DEFINE(HAVE_RL_CALLBACK_READ_CHAR, 1, [ ]) ],[],[ - -L$READLINE_DIR/lib $PHP_READLINE_LIBS + -L$READLINE_DIR/$PHP_LIBDIR $PHP_READLINE_LIBS ]) PHP_CHECK_LIBRARY(history, add_history, [ - PHP_ADD_LIBRARY_WITH_PATH(history, $READLINE_DIR/lib, READLINE_SHARED_LIBADD) + PHP_ADD_LIBRARY_WITH_PATH(history, $READLINE_DIR/$PHP_LIBDIR, READLINE_SHARED_LIBADD) ], [ AC_MSG_ERROR(history library required by readline not found) ], [ - -L$READLINE_DIR/lib $PHP_READLINE_LIBS + -L$READLINE_DIR/$PHP_LIBDIR $PHP_READLINE_LIBS ]) PHP_NEW_EXTENSION(readline, readline.c, $ext_shared, cli) @@ -85,11 +85,11 @@ PHP_CHECK_LIBRARY(edit, readline, [ - PHP_ADD_LIBRARY_WITH_PATH(edit, $LIBEDIT_DIR/lib, READLINE_SHARED_LIBADD) + PHP_ADD_LIBRARY_WITH_PATH(edit, $LIBEDIT_DIR/$PHP_LIBDIR, READLINE_SHARED_LIBADD) ], [ AC_MSG_ERROR(edit library required by readline not found) ], [ - -L$READLINE_DIR/lib + -L$READLINE_DIR/$PHP_LIBDIR ]) PHP_NEW_EXTENSION(readline, readline.c, $ext_shared, cli) http://cvs.php.net/diff.php/php-src/ext/recode/config.m4?r1=1.11&r2=1.12&ty=u Index: php-src/ext/recode/config.m4 diff -u php-src/ext/recode/config.m4:1.11 php-src/ext/recode/config.m4:1.12 --- php-src/ext/recode/config.m4:1.11 Tue Sep 30 22:53:14 2003 +++ php-src/ext/recode/config.m4 Wed Nov 3 09:32:51 2004 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.11 2003/10/01 02:53:14 sniper Exp $ +dnl $Id: config.m4,v 1.12 2004/11/03 14:32:51 jorton Exp $ dnl PHP_ARG_WITH(recode,for recode support, @@ -12,17 +12,17 @@ if test -f $i/include/recode.h; then RECODE_DIR=$i RECODE_INC=include - RECODE_LIB=lib + RECODE_LIB=$PHP_LIBDIR fi if test -f $i/include/recode/recode.h; then RECODE_DIR=$i RECODE_INC=include/recode - RECODE_LIB=lib/recode + RECODE_LIB=$PHP_LIBDIR/recode fi if test -f $i/recode/include/recode.h; then RECODE_DIR=$i/recode RECODE_INC=include - RECODE_LIB=lib + RECODE_LIB=$PHP_LIBDIR fi test -n "$RECODE_DIR" && break done http://cvs.php.net/diff.php/php-src/ext/session/config.m4?r1=1.25&r2=1.26&ty=u Index: php-src/ext/session/config.m4 diff -u php-src/ext/session/config.m4:1.25 php-src/ext/session/config.m4:1.26 --- php-src/ext/session/config.m4:1.25 Tue Sep 30 22:53:15 2003 +++ php-src/ext/session/config.m4 Wed Nov 3 09:32:51 2004 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.25 2003/10/01 02:53:15 sniper Exp $ +dnl $Id: config.m4,v 1.26 2004/11/03 14:32:51 jorton Exp $ dnl PHP_ARG_ENABLE(session, whether to enable PHP sessions, @@ -25,7 +25,7 @@ AC_MSG_ERROR(cannot find mm library) fi - PHP_ADD_LIBRARY_WITH_PATH(mm, $MM_DIR/lib, SESSION_SHARED_LIBADD) + PHP_ADD_LIBRARY_WITH_PATH(mm, $MM_DIR/$PHP_LIBDIR, SESSION_SHARED_LIBADD) PHP_ADD_INCLUDE($MM_DIR/include) AC_DEFINE(HAVE_LIBMM, 1, [Whether you have libmm]) fi http://cvs.php.net/diff.php/php-src/ext/sqlite/config.m4?r1=1.27&r2=1.28&ty=u Index: php-src/ext/sqlite/config.m4 diff -u php-src/ext/sqlite/config.m4:1.27 php-src/ext/sqlite/config.m4:1.28 --- php-src/ext/sqlite/config.m4:1.27 Sat Jul 10 08:49:34 2004 +++ php-src/ext/sqlite/config.m4 Wed Nov 3 09:32:52 2004 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.27 2004/07/10 12:49:34 wez Exp $ +dnl $Id: config.m4,v 1.28 2004/11/03 14:32:52 jorton Exp $ dnl config.m4 for extension sqlite dnl vim:et:ts=2:sw=2 @@ -40,12 +40,12 @@ PHP_CHECK_LIBRARY($LIBNAME,$LIBSYMBOL, [ - PHP_ADD_LIBRARY_WITH_PATH($LIBNAME, $SQLITE_DIR/lib, SQLITE_SHARED_LIBADD) + PHP_ADD_LIBRARY_WITH_PATH($LIBNAME, $SQLITE_DIR/$PHP_LIBDIR, SQLITE_SHARED_LIBADD) AC_DEFINE(HAVE_SQLITELIB,1,[ ]) ],[ AC_MSG_ERROR([wrong sqlite lib version or lib not found]) ],[ - -L$SQLITE_DIR/lib -lm + -L$SQLITE_DIR/$PHP_LIBDIR -lm ]) PHP_SUBST(SQLITE_SHARED_LIBADD) http://cvs.php.net/diff.php/php-src/ext/xml/config.m4?r1=1.49&r2=1.50&ty=u Index: php-src/ext/xml/config.m4 diff -u php-src/ext/xml/config.m4:1.49 php-src/ext/xml/config.m4:1.50 --- php-src/ext/xml/config.m4:1.49 Sun Jul 18 08:03:51 2004 +++ php-src/ext/xml/config.m4 Wed Nov 3 09:32:52 2004 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.49 2004/07/18 12:03:51 wez Exp $ +dnl $Id: config.m4,v 1.50 2004/11/03 14:32:52 jorton Exp $ dnl PHP_ARG_ENABLE(xml,whether to enable XML support, @@ -30,7 +30,7 @@ dnl if test "$PHP_LIBEXPAT_DIR" != "no"; then for i in $PHP_XML $PHP_LIBEXPAT_DIR; do - if test -f "$i/lib/libexpat.a" -o -f "$i/lib/libexpat.$SHLIB_SUFFIX_NAME"; then + if test -f "$i/$PHP_LIBDIR/libexpat.a" -o -f "$i/$PHP_LIBDIR/libexpat.$SHLIB_SUFFIX_NAME"; then EXPAT_DIR=$i break fi @@ -41,7 +41,7 @@ fi PHP_ADD_INCLUDE($EXPAT_DIR/include) - PHP_ADD_LIBRARY_WITH_PATH(expat, $EXPAT_DIR/lib, XML_SHARED_LIBADD) + PHP_ADD_LIBRARY_WITH_PATH(expat, $EXPAT_DIR/$PHP_LIBDIR, XML_SHARED_LIBADD) AC_DEFINE(HAVE_LIBEXPAT, 1, [ ]) fi http://cvs.php.net/diff.php/php-src/ext/xmlrpc/config.m4?r1=1.21&r2=1.22&ty=u Index: php-src/ext/xmlrpc/config.m4 diff -u php-src/ext/xmlrpc/config.m4:1.21 php-src/ext/xmlrpc/config.m4:1.22 --- php-src/ext/xmlrpc/config.m4:1.21 Tue Sep 30 22:53:15 2003 +++ php-src/ext/xmlrpc/config.m4 Wed Nov 3 09:32:52 2004 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.21 2003/10/01 02:53:15 sniper Exp $ +dnl $Id: config.m4,v 1.22 2004/11/03 14:32:52 jorton Exp $ dnl sinclude(ext/xmlrpc/libxmlrpc/acinclude.m4) @@ -23,9 +23,9 @@ testval=no for i in $PHP_EXPAT_DIR $XMLRPC_DIR /usr/local /usr; do - if test -f $i/lib/libexpat.a -o -f $i/lib/libexpat.$SHLIB_SUFFIX_NAME; then + if test -f $i/$PHP_LIBDIR/libexpat.a -o -f $i/$PHP_LIBDIR/libexpat.$SHLIB_SUFFIX_NAME; then AC_DEFINE(HAVE_LIBEXPAT2,1,[ ]) - PHP_ADD_LIBRARY_WITH_PATH(expat, $i/lib, XMLRPC_SHARED_LIBADD) + PHP_ADD_LIBRARY_WITH_PATH(expat, $i/$PHP_LIBDIR, XMLRPC_SHARED_LIBADD) PHP_ADD_INCLUDE($i/include) testval=yes break @@ -88,6 +88,6 @@ fi PHP_ADD_INCLUDE($XMLRPC_DIR) - PHP_ADD_LIBRARY_WITH_PATH(xmlrpc, $XMLRPC_DIR/lib, XMLRPC_SHARED_LIBADD) + PHP_ADD_LIBRARY_WITH_PATH(xmlrpc, $XMLRPC_DIR/$PHP_LIBDIR, XMLRPC_SHARED_LIBADD) fi http://cvs.php.net/diff.php/php-src/ext/xsl/config.m4?r1=1.8&r2=1.9&ty=u Index: php-src/ext/xsl/config.m4 diff -u php-src/ext/xsl/config.m4:1.8 php-src/ext/xsl/config.m4:1.9 --- php-src/ext/xsl/config.m4:1.8 Sun Jul 18 08:03:51 2004 +++ php-src/ext/xsl/config.m4 Wed Nov 3 09:32:52 2004 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.8 2004/07/18 12:03:51 wez Exp $ +dnl $Id: config.m4,v 1.9 2004/11/03 14:32:52 jorton Exp $ dnl PHP_ARG_WITH(xsl, for XSL support, @@ -45,7 +45,7 @@ AC_MSG_RESULT(not found) else AC_MSG_RESULT(found) - PHP_ADD_LIBRARY_WITH_PATH(exslt, $PHP_XSL_EXSL_DIR/lib, XSL_SHARED_LIBADD) + PHP_ADD_LIBRARY_WITH_PATH(exslt, $PHP_XSL_EXSL_DIR/$PHP_LIBDIR, XSL_SHARED_LIBADD) PHP_ADD_INCLUDE($PHP_XSL_EXSL_DIR/include) AC_DEFINE(HAVE_XSL_EXSLT,1,[ ]) fi http://cvs.php.net/diff.php/php-src/ext/zlib/config0.m4?r1=1.15&r2=1.16&ty=u Index: php-src/ext/zlib/config0.m4 diff -u php-src/ext/zlib/config0.m4:1.15 php-src/ext/zlib/config0.m4:1.16 --- php-src/ext/zlib/config0.m4:1.15 Fri Jul 16 20:05:30 2004 +++ php-src/ext/zlib/config0.m4 Wed Nov 3 09:32:52 2004 @@ -1,5 +1,5 @@ dnl -dnl $Id: config0.m4,v 1.15 2004/07/17 00:05:30 pollita Exp $ +dnl $Id: config0.m4,v 1.16 2004/11/03 14:32:52 jorton Exp $ dnl PHP_ARG_WITH(zlib,for ZLIB support, @@ -38,7 +38,7 @@ case $ZLIB_DIR in /usr) ac_extra= ;; - *) ac_extra=-L$ZLIB_DIR/lib ;; + *) ac_extra=-L$ZLIB_DIR/$PHP_LIBDIR ;; esac PHP_CHECK_LIBRARY(z, gzgets, [ @@ -49,7 +49,7 @@ $ac_extra ]) - PHP_ADD_LIBPATH($ZLIB_DIR/lib, ZLIB_SHARED_LIBADD) + PHP_ADD_LIBPATH($ZLIB_DIR/$PHP_LIBDIR, ZLIB_SHARED_LIBADD) PHP_ZLIB_DIR=$ZLIB_DIR PHP_ADD_LIBRARY(z,, ZLIB_SHARED_LIBADD)