[PATCH] add --with-libdir flag (was Re: [PHP-DEV] ./configure, PHP, SuSE and the AMD64)
| From: | Joe Orton | Date: | Mon, 27 Sep 2004 16:09:42 +0000 |
| Subject: | [PATCH] add --with-libdir flag (was Re: [PHP-DEV] ./configure, PHP, SuSE and the AMD64) | ||
| References: | 1 2 | Groups: | php.internals |
| Request: | Send a blank email to internals+get-13012@lists.php.net to get a copy of this message | ||
On Mon, Sep 27, 2004 at 10:13:04AM +0200, Derick Rethans wrote:
> On Sat, 25 Sep 2004, Robert Silva wrote:
> > Again, if you look at the Suse php config patch it will show you what you
> > need to change to get it up and running.
> >
> > http://www.bobsilva.com/php-4.3.3-lib64.diff
>
> I think this patch is the way to go for this, but it won't address
> issues when you mix both 64bit and 32bit libraries as this one simply
> requires you to have everything in either 32bit or 64bit. So we can't
> really commit it.
I don't know what you mean by that. You can't link both 32-bit or 64-bit
libraries into one program, that doesn't work, of course.
Fundamentally this approach is messy, but the alternative is to rewrite
90% of ext/*/config*.m4 to not test for presence of libraries using
"test -f".
I have a patch based loosely on the SuSE patch which adds a
--with-libdir flag, which defines PHP_LIBDIR and adjusts
ext/*/config*.m4 to use that rather than assuming libraries are in
/path/foo/lib/lib*.
I've attached two patches: the first showing just the changes neeeded to
configure.in and acinclude.m4, and the second including all the gory
details to ext/*.
Any objections to committing this to HEAD? Tested on RHEL3/x86_64 using
--with-libdir=lib64 (where it builds rather than dying horribly), and on
Fedora Core 3 test 2/i686 (where it still builds).
joe
Index: configure.in =================================================================== RCS file: /repository/php-src/configure.in,v retrieving revision 1.518 diff -u -r1.518 configure.in --- configure.in 26 Sep 2004 01:10:05 -0000 1.518 +++ configure.in 27 Sep 2004 16:04:18 -0000 @@ -1,4 +1,4 @@ -dnl ## $Id: configure.in,v 1.518 2004/09/26 01:10:05 wez Exp $ -*- sh -*- +dnl ## $Id: configure.in,v 1.518 2004/09/26 01:10:05 wez Exp $ -*- autoconf -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -124,6 +124,11 @@ dnl AC_PROG_CXX dnl AC_PROG_CXXCPP +dnl Support systems with system libraries in e.g. /usr/lib64 +AC_ARG_WITH(libdir, +[ --with-libdir=NAME Look for libraries in .../NAME rather than .../lib], +[PHP_LIBDIR=$withval], [PHP_LIBDIR=lib]) + dnl check for -R, etc. switch PHP_RUNPATH_SWITCH Index: acinclude.m4 =================================================================== RCS file: /repository/php-src/acinclude.m4,v retrieving revision 1.273 diff -u -r1.273 acinclude.m4 --- acinclude.m4 12 Sep 2004 06:35:51 -0000 1.273 +++ acinclude.m4 27 Sep 2004 16:04:18 -0000 @@ -176,7 +176,7 @@ unset ac_new_flags for i in [$]$1; do case [$]i in - -L/usr/lib|-L/usr/lib/[)] ;; + -L/usr/$PHP_LIBDIR|-L/usr/$PHP_LIBDIR/[)] ;; *[)] ac_new_flags="[$]ac_new_flags [$]i" ;; esac done @@ -638,7 +638,7 @@ AC_MSG_CHECKING([if compiler supports -R]) AC_CACHE_VAL(php_cv_cc_dashr,[ SAVE_LIBS=$LIBS - LIBS="-R /usr/lib $LIBS" + LIBS="-R /usr/$PHP_LIBDIR $LIBS" AC_TRY_LINK([], [], php_cv_cc_dashr=yes, php_cv_cc_dashr=no) LIBS=$SAVE_LIBS]) AC_MSG_RESULT([$php_cv_cc_dashr]) @@ -648,7 +648,7 @@ AC_MSG_CHECKING([if compiler supports -Wl,-rpath,]) AC_CACHE_VAL(php_cv_cc_rpath,[ SAVE_LIBS=$LIBS - LIBS="-Wl,-rpath,/usr/lib $LIBS" + LIBS="-Wl,-rpath,/usr/$PHP_LIBDIR $LIBS" AC_TRY_LINK([], [], php_cv_cc_rpath=yes, php_cv_cc_rpath=no) LIBS=$SAVE_LIBS]) AC_MSG_RESULT([$php_cv_cc_rpath]) @@ -832,7 +832,7 @@ dnl add a library to linkpath/runpath dnl AC_DEFUN([PHP_ADD_LIBPATH],[ - if test "$1" != "/usr/lib"; then + if test "$1" != "/usr/$PHP_LIBDIR"; then PHP_EXPAND_PATH($1, ai_p) ifelse([$2],,[ _PHP_ADD_LIBPATH_GLOBAL([$ai_p]) ? 64.diff ? core.14801 ? core.diff ? diff Index: acinclude.m4 =================================================================== RCS file: /repository/php-src/acinclude.m4,v retrieving revision 1.273 diff -u -r1.273 acinclude.m4 --- acinclude.m4 12 Sep 2004 06:35:51 -0000 1.273 +++ acinclude.m4 27 Sep 2004 16:07:21 -0000 @@ -176,7 +176,7 @@ unset ac_new_flags for i in [$]$1; do case [$]i in - -L/usr/lib|-L/usr/lib/[)] ;; + -L/usr/$PHP_LIBDIR|-L/usr/$PHP_LIBDIR/[)] ;; *[)] ac_new_flags="[$]ac_new_flags [$]i" ;; esac done @@ -638,7 +638,7 @@ AC_MSG_CHECKING([if compiler supports -R]) AC_CACHE_VAL(php_cv_cc_dashr,[ SAVE_LIBS=$LIBS - LIBS="-R /usr/lib $LIBS" + LIBS="-R /usr/$PHP_LIBDIR $LIBS" AC_TRY_LINK([], [], php_cv_cc_dashr=yes, php_cv_cc_dashr=no) LIBS=$SAVE_LIBS]) AC_MSG_RESULT([$php_cv_cc_dashr]) @@ -648,7 +648,7 @@ AC_MSG_CHECKING([if compiler supports -Wl,-rpath,]) AC_CACHE_VAL(php_cv_cc_rpath,[ SAVE_LIBS=$LIBS - LIBS="-Wl,-rpath,/usr/lib $LIBS" + LIBS="-Wl,-rpath,/usr/$PHP_LIBDIR $LIBS" AC_TRY_LINK([], [], php_cv_cc_rpath=yes, php_cv_cc_rpath=no) LIBS=$SAVE_LIBS]) AC_MSG_RESULT([$php_cv_cc_rpath]) @@ -832,7 +832,7 @@ dnl add a library to linkpath/runpath dnl AC_DEFUN([PHP_ADD_LIBPATH],[ - if test "$1" != "/usr/lib"; then + if test "$1" != "/usr/$PHP_LIBDIR"; then PHP_EXPAND_PATH($1, ai_p) ifelse([$2],,[ _PHP_ADD_LIBPATH_GLOBAL([$ai_p]) @@ -1622,8 +1622,8 @@ if test -r $i/include/openssl/evp.h; then OPENSSL_INCDIR=$i/include fi - if test -r $i/lib/libssl.a -o -r $i/lib/libssl.$SHLIB_SUFFIX_NAME; then - OPENSSL_LIBDIR=$i/lib + if test -r $i/$PHP_LIBDIR/libssl.a -o -r $i/$PHP_LIBDIR/libssl.$SHLIB_SUFFIX_NAME; then + OPENSSL_LIBDIR=$i/$PHP_LIBDIR fi test -n "$OPENSSL_INCDIR" && test -n "$OPENSSL_LIBDIR" && break done @@ -1732,8 +1732,8 @@ AC_MSG_ERROR([Please specify the install prefix of iconv with --with-iconv=<DIR>]) fi - if test -f $ICONV_DIR/lib/lib$iconv_lib_name.a || - test -f $ICONV_DIR/lib/lib$iconv_lib_name.$SHLIB_SUFFIX_NAME + if test -f $ICONV_DIR/$PHP_LIBDIR/lib$iconv_lib_name.a || + test -f $ICONV_DIR/$PHP_LIBDIR/lib$iconv_lib_name.$SHLIB_SUFFIX_NAME then PHP_CHECK_LIBRARY($iconv_lib_name, libiconv, [ found_iconv=yes @@ -1743,10 +1743,10 @@ found_iconv=yes PHP_DEFINE(HAVE_ICONV) ], [], [ - -L$ICONV_DIR/lib + -L$ICONV_DIR/$PHP_LIBDIR ]) ], [ - -L$ICONV_DIR/lib + -L$ICONV_DIR/$PHP_LIBDIR ]) fi fi @@ -1754,7 +1754,7 @@ if test "$found_iconv" = "yes"; then if test -n "$ICONV_DIR"; then AC_DEFINE(HAVE_ICONV, 1, [ ]) - PHP_ADD_LIBRARY_WITH_PATH($iconv_lib_name, $ICONV_DIR/lib, $1) + PHP_ADD_LIBRARY_WITH_PATH($iconv_lib_name, $ICONV_DIR/$PHP_LIBDIR, $1) PHP_ADD_INCLUDE($ICONV_DIR/include) fi $2 Index: configure.in =================================================================== RCS file: /repository/php-src/configure.in,v retrieving revision 1.518 diff -u -r1.518 configure.in --- configure.in 26 Sep 2004 01:10:05 -0000 1.518 +++ configure.in 27 Sep 2004 16:07:22 -0000 @@ -1,4 +1,4 @@ -dnl ## $Id: configure.in,v 1.518 2004/09/26 01:10:05 wez Exp $ -*- sh -*- +dnl ## $Id: configure.in,v 1.518 2004/09/26 01:10:05 wez Exp $ -*- autoconf -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -124,6 +124,11 @@ dnl AC_PROG_CXX dnl AC_PROG_CXXCPP +dnl Support systems with system libraries in e.g. /usr/lib64 +AC_ARG_WITH(libdir, +[ --with-libdir=NAME Look for libraries in .../NAME rather than .../lib], +[PHP_LIBDIR=$withval], [PHP_LIBDIR=lib]) + dnl check for -R, etc. switch PHP_RUNPATH_SWITCH Index: ext/bz2/config.m4 =================================================================== RCS file: /repository/php-src/ext/bz2/config.m4,v retrieving revision 1.4 diff -u -r1.4 config.m4 --- ext/bz2/config.m4 20 Jul 2004 05:26:33 -0000 1.4 +++ ext/bz2/config.m4 27 Sep 2004 16:07:22 -0000 @@ -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) Index: ext/curl/config.m4 =================================================================== RCS file: /repository/php-src/ext/curl/config.m4,v retrieving revision 1.25 diff -u -r1.25 config.m4 --- ext/curl/config.m4 22 May 2003 13:08:49 -0000 1.25 +++ ext/curl/config.m4 27 Sep 2004 16:07:22 -0000 @@ -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 Index: ext/dba/config.m4 =================================================================== RCS file: /repository/php-src/ext/dba/config.m4,v retrieving revision 1.61 diff -u -r1.61 config.m4 --- ext/dba/config.m4 25 Sep 2004 15:29:19 -0000 1.61 +++ ext/dba/config.m4 27 Sep 2004 16:07:22 -0000 @@ -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 Index: ext/fam/config.m4 =================================================================== RCS file: /repository/php-src/ext/fam/config.m4,v retrieving revision 1.2 diff -u -r1.2 config.m4 --- ext/fam/config.m4 10 Dec 2002 20:09:35 -0000 1.2 +++ ext/fam/config.m4 27 Sep 2004 16:07:22 -0000 @@ -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) Index: ext/gd/config.m4 =================================================================== RCS file: /repository/php-src/ext/gd/config.m4,v retrieving revision 1.147 diff -u -r1.147 config.m4 --- ext/gd/config.m4 27 Jul 2004 12:44:25 -0000 1.147 +++ ext/gd/config.m4 27 Sep 2004 16:07:22 -0000 @@ -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.]) ],[ Index: ext/gettext/config.m4 =================================================================== RCS file: /repository/php-src/ext/gettext/config.m4,v retrieving revision 1.13 diff -u -r1.13 config.m4 --- ext/gettext/config.m4 1 Oct 2003 02:53:07 -0000 1.13 +++ ext/gettext/config.m4 27 Sep 2004 16:07:22 -0000 @@ -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 Index: ext/gmp/config.m4 =================================================================== RCS file: /repository/php-src/ext/gmp/config.m4,v retrieving revision 1.10 diff -u -r1.10 config.m4 --- ext/gmp/config.m4 19 Nov 2003 04:44:06 -0000 1.10 +++ ext/gmp/config.m4 27 Sep 2004 16:07:22 -0000 @@ -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) Index: ext/iconv/config.m4 =================================================================== RCS file: /repository/php-src/ext/iconv/config.m4,v retrieving revision 1.27 diff -u -r1.27 config.m4 --- ext/iconv/config.m4 14 Jul 2004 09:54:02 -0000 1.27 +++ ext/iconv/config.m4 27 Sep 2004 16:07:22 -0000 @@ -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" Index: ext/imap/config.m4 =================================================================== RCS file: /repository/php-src/ext/imap/config.m4,v retrieving revision 1.63 diff -u -r1.63 config.m4 --- ext/imap/config.m4 23 Feb 2004 03:24:58 -0000 1.63 +++ ext/imap/config.m4 27 Sep 2004 16:07:22 -0000 @@ -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 Index: ext/ldap/config.m4 =================================================================== RCS file: /repository/php-src/ext/ldap/config.m4,v retrieving revision 1.34 diff -u -r1.34 config.m4 --- ext/ldap/config.m4 1 Jul 2003 00:02:13 -0000 1.34 +++ ext/ldap/config.m4 27 Sep 2004 16:07:22 -0000 @@ -6,15 +6,15 @@ 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 Index: ext/mysql/config.m4 =================================================================== RCS file: /repository/php-src/ext/mysql/config.m4,v retrieving revision 1.61 diff -u -r1.61 config.m4 --- ext/mysql/config.m4 31 Dec 2003 11:27:52 -0000 1.61 +++ ext/mysql/config.m4 27 Sep 2004 16:07:22 -0000 @@ -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, [], [ Index: ext/ncurses/config.m4 =================================================================== RCS file: /repository/php-src/ext/ncurses/config.m4,v retrieving revision 1.17 diff -u -r1.17 config.m4 --- ext/ncurses/config.m4 9 Dec 2003 20:33:08 -0000 1.17 +++ ext/ncurses/config.m4 27 Sep 2004 16:07:22 -0000 @@ -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, [ ])]) Index: ext/odbc/config.m4 =================================================================== RCS file: /repository/php-src/ext/odbc/config.m4,v retrieving revision 1.65 diff -u -r1.65 config.m4 --- ext/odbc/config.m4 17 Jan 2004 12:59:40 -0000 1.65 +++ ext/odbc/config.m4 27 Sep 2004 16:07:22 -0000 @@ -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 Index: ext/pcre/config.m4 =================================================================== RCS file: /repository/php-src/ext/pcre/config.m4,v retrieving revision 1.32 diff -u -r1.32 config.m4 --- ext/pcre/config.m4 28 Jun 2003 04:30:51 -0000 1.32 +++ ext/pcre/config.m4 27 Sep 2004 16:07:22 -0000 @@ -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 Index: ext/pgsql/config.m4 =================================================================== RCS file: /repository/php-src/ext/pgsql/config.m4,v retrieving revision 1.37 diff -u -r1.37 config.m4 --- ext/pgsql/config.m4 9 Jan 2004 18:44:33 -0000 1.37 +++ ext/pgsql/config.m4 27 Sep 2004 16:07:22 -0000 @@ -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 Index: ext/pspell/config.m4 =================================================================== RCS file: /repository/php-src/ext/pspell/config.m4,v retrieving revision 1.9 diff -u -r1.9 config.m4 --- ext/pspell/config.m4 9 Aug 2003 18:43:45 -0000 1.9 +++ ext/pspell/config.m4 27 Sep 2004 16:07:23 -0000 @@ -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) Index: ext/readline/config.m4 =================================================================== RCS file: /repository/php-src/ext/readline/config.m4,v retrieving revision 1.23 diff -u -r1.23 config.m4 --- ext/readline/config.m4 24 Aug 2004 12:52:07 -0000 1.23 +++ ext/readline/config.m4 27 Sep 2004 16:07:23 -0000 @@ -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) Index: ext/recode/config.m4 =================================================================== RCS file: /repository/php-src/ext/recode/config.m4,v retrieving revision 1.11 diff -u -r1.11 config.m4 --- ext/recode/config.m4 1 Oct 2003 02:53:14 -0000 1.11 +++ ext/recode/config.m4 27 Sep 2004 16:07:23 -0000 @@ -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 Index: ext/session/config.m4 =================================================================== RCS file: /repository/php-src/ext/session/config.m4,v retrieving revision 1.25 diff -u -r1.25 config.m4 --- ext/session/config.m4 1 Oct 2003 02:53:15 -0000 1.25 +++ ext/session/config.m4 27 Sep 2004 16:07:23 -0000 @@ -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 Index: ext/xml/config.m4 =================================================================== RCS file: /repository/php-src/ext/xml/config.m4,v retrieving revision 1.49 diff -u -r1.49 config.m4 --- ext/xml/config.m4 18 Jul 2004 12:03:51 -0000 1.49 +++ ext/xml/config.m4 27 Sep 2004 16:07:23 -0000 @@ -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 Index: ext/xmlrpc/config.m4 =================================================================== RCS file: /repository/php-src/ext/xmlrpc/config.m4,v retrieving revision 1.21 diff -u -r1.21 config.m4 --- ext/xmlrpc/config.m4 1 Oct 2003 02:53:15 -0000 1.21 +++ ext/xmlrpc/config.m4 27 Sep 2004 16:07:23 -0000 @@ -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 Index: ext/xsl/config.m4 =================================================================== RCS file: /repository/php-src/ext/xsl/config.m4,v retrieving revision 1.8 diff -u -r1.8 config.m4 --- ext/xsl/config.m4 18 Jul 2004 12:03:51 -0000 1.8 +++ ext/xsl/config.m4 27 Sep 2004 16:07:23 -0000 @@ -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 Index: ext/zlib/config0.m4 =================================================================== RCS file: /repository/php-src/ext/zlib/config0.m4,v retrieving revision 1.15 diff -u -r1.15 config0.m4 --- ext/zlib/config0.m4 17 Jul 2004 00:05:30 -0000 1.15 +++ ext/zlib/config0.m4 27 Sep 2004 16:07:23 -0000 @@ -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)
Index: configure.in =================================================================== RCS file: /repository/php-src/configure.in,v retrieving revision 1.518 diff -u -r1.518 configure.in --- configure.in 26 Sep 2004 01:10:05 -0000 1.518 +++ configure.in 27 Sep 2004 16:04:18 -0000 @@ -1,4 +1,4 @@ -dnl ## $Id: configure.in,v 1.518 2004/09/26 01:10:05 wez Exp $ -*- sh -*- +dnl ## $Id: configure.in,v 1.518 2004/09/26 01:10:05 wez Exp $ -*- autoconf -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -124,6 +124,11 @@ dnl AC_PROG_CXX dnl AC_PROG_CXXCPP +dnl Support systems with system libraries in e.g. /usr/lib64 +AC_ARG_WITH(libdir, +[ --with-libdir=NAME Look for libraries in .../NAME rather than .../lib], +[PHP_LIBDIR=$withval], [PHP_LIBDIR=lib]) + dnl check for -R, etc. switch PHP_RUNPATH_SWITCH Index: acinclude.m4 =================================================================== RCS file: /repository/php-src/acinclude.m4,v retrieving revision 1.273 diff -u -r1.273 acinclude.m4 --- acinclude.m4 12 Sep 2004 06:35:51 -0000 1.273 +++ acinclude.m4 27 Sep 2004 16:04:18 -0000 @@ -176,7 +176,7 @@ unset ac_new_flags for i in [$]$1; do case [$]i in - -L/usr/lib|-L/usr/lib/[)] ;; + -L/usr/$PHP_LIBDIR|-L/usr/$PHP_LIBDIR/[)] ;; *[)] ac_new_flags="[$]ac_new_flags [$]i" ;; esac done @@ -638,7 +638,7 @@ AC_MSG_CHECKING([if compiler supports -R]) AC_CACHE_VAL(php_cv_cc_dashr,[ SAVE_LIBS=$LIBS - LIBS="-R /usr/lib $LIBS" + LIBS="-R /usr/$PHP_LIBDIR $LIBS" AC_TRY_LINK([], [], php_cv_cc_dashr=yes, php_cv_cc_dashr=no) LIBS=$SAVE_LIBS]) AC_MSG_RESULT([$php_cv_cc_dashr]) @@ -648,7 +648,7 @@ AC_MSG_CHECKING([if compiler supports -Wl,-rpath,]) AC_CACHE_VAL(php_cv_cc_rpath,[ SAVE_LIBS=$LIBS - LIBS="-Wl,-rpath,/usr/lib $LIBS" + LIBS="-Wl,-rpath,/usr/$PHP_LIBDIR $LIBS" AC_TRY_LINK([], [], php_cv_cc_rpath=yes, php_cv_cc_rpath=no) LIBS=$SAVE_LIBS]) AC_MSG_RESULT([$php_cv_cc_rpath]) @@ -832,7 +832,7 @@ dnl add a library to linkpath/runpath dnl AC_DEFUN([PHP_ADD_LIBPATH],[ - if test "$1" != "/usr/lib"; then + if test "$1" != "/usr/$PHP_LIBDIR"; then PHP_EXPAND_PATH($1, ai_p) ifelse([$2],,[ _PHP_ADD_LIBPATH_GLOBAL([$ai_p]) ? 64.diff ? core.14801 ? core.diff ? diff Index: acinclude.m4 =================================================================== RCS file: /repository/php-src/acinclude.m4,v retrieving revision 1.273 diff -u -r1.273 acinclude.m4 --- acinclude.m4 12 Sep 2004 06:35:51 -0000 1.273 +++ acinclude.m4 27 Sep 2004 16:07:21 -0000 @@ -176,7 +176,7 @@ unset ac_new_flags for i in [$]$1; do case [$]i in - -L/usr/lib|-L/usr/lib/[)] ;; + -L/usr/$PHP_LIBDIR|-L/usr/$PHP_LIBDIR/[)] ;; *[)] ac_new_flags="[$]ac_new_flags [$]i" ;; esac done @@ -638,7 +638,7 @@ AC_MSG_CHECKING([if compiler supports -R]) AC_CACHE_VAL(php_cv_cc_dashr,[ SAVE_LIBS=$LIBS - LIBS="-R /usr/lib $LIBS" + LIBS="-R /usr/$PHP_LIBDIR $LIBS" AC_TRY_LINK([], [], php_cv_cc_dashr=yes, php_cv_cc_dashr=no) LIBS=$SAVE_LIBS]) AC_MSG_RESULT([$php_cv_cc_dashr]) @@ -648,7 +648,7 @@ AC_MSG_CHECKING([if compiler supports -Wl,-rpath,]) AC_CACHE_VAL(php_cv_cc_rpath,[ SAVE_LIBS=$LIBS - LIBS="-Wl,-rpath,/usr/lib $LIBS" + LIBS="-Wl,-rpath,/usr/$PHP_LIBDIR $LIBS" AC_TRY_LINK([], [], php_cv_cc_rpath=yes, php_cv_cc_rpath=no) LIBS=$SAVE_LIBS]) AC_MSG_RESULT([$php_cv_cc_rpath]) @@ -832,7 +832,7 @@ dnl add a library to linkpath/runpath dnl AC_DEFUN([PHP_ADD_LIBPATH],[ - if test "$1" != "/usr/lib"; then + if test "$1" != "/usr/$PHP_LIBDIR"; then PHP_EXPAND_PATH($1, ai_p) ifelse([$2],,[ _PHP_ADD_LIBPATH_GLOBAL([$ai_p]) @@ -1622,8 +1622,8 @@ if test -r $i/include/openssl/evp.h; then OPENSSL_INCDIR=$i/include fi - if test -r $i/lib/libssl.a -o -r $i/lib/libssl.$SHLIB_SUFFIX_NAME; then - OPENSSL_LIBDIR=$i/lib + if test -r $i/$PHP_LIBDIR/libssl.a -o -r $i/$PHP_LIBDIR/libssl.$SHLIB_SUFFIX_NAME; then + OPENSSL_LIBDIR=$i/$PHP_LIBDIR fi test -n "$OPENSSL_INCDIR" && test -n "$OPENSSL_LIBDIR" && break done @@ -1732,8 +1732,8 @@ AC_MSG_ERROR([Please specify the install prefix of iconv with --with-iconv=<DIR>]) fi - if test -f $ICONV_DIR/lib/lib$iconv_lib_name.a || - test -f $ICONV_DIR/lib/lib$iconv_lib_name.$SHLIB_SUFFIX_NAME + if test -f $ICONV_DIR/$PHP_LIBDIR/lib$iconv_lib_name.a || + test -f $ICONV_DIR/$PHP_LIBDIR/lib$iconv_lib_name.$SHLIB_SUFFIX_NAME then PHP_CHECK_LIBRARY($iconv_lib_name, libiconv, [ found_iconv=yes @@ -1743,10 +1743,10 @@ found_iconv=yes PHP_DEFINE(HAVE_ICONV) ], [], [ - -L$ICONV_DIR/lib + -L$ICONV_DIR/$PHP_LIBDIR ]) ], [ - -L$ICONV_DIR/lib + -L$ICONV_DIR/$PHP_LIBDIR ]) fi fi @@ -1754,7 +1754,7 @@ if test "$found_iconv" = "yes"; then if test -n "$ICONV_DIR"; then AC_DEFINE(HAVE_ICONV, 1, [ ]) - PHP_ADD_LIBRARY_WITH_PATH($iconv_lib_name, $ICONV_DIR/lib, $1) + PHP_ADD_LIBRARY_WITH_PATH($iconv_lib_name, $ICONV_DIR/$PHP_LIBDIR, $1) PHP_ADD_INCLUDE($ICONV_DIR/include) fi $2 Index: configure.in =================================================================== RCS file: /repository/php-src/configure.in,v retrieving revision 1.518 diff -u -r1.518 configure.in --- configure.in 26 Sep 2004 01:10:05 -0000 1.518 +++ configure.in 27 Sep 2004 16:07:22 -0000 @@ -1,4 +1,4 @@ -dnl ## $Id: configure.in,v 1.518 2004/09/26 01:10:05 wez Exp $ -*- sh -*- +dnl ## $Id: configure.in,v 1.518 2004/09/26 01:10:05 wez Exp $ -*- autoconf -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -124,6 +124,11 @@ dnl AC_PROG_CXX dnl AC_PROG_CXXCPP +dnl Support systems with system libraries in e.g. /usr/lib64 +AC_ARG_WITH(libdir, +[ --with-libdir=NAME Look for libraries in .../NAME rather than .../lib], +[PHP_LIBDIR=$withval], [PHP_LIBDIR=lib]) + dnl check for -R, etc. switch PHP_RUNPATH_SWITCH Index: ext/bz2/config.m4 =================================================================== RCS file: /repository/php-src/ext/bz2/config.m4,v retrieving revision 1.4 diff -u -r1.4 config.m4 --- ext/bz2/config.m4 20 Jul 2004 05:26:33 -0000 1.4 +++ ext/bz2/config.m4 27 Sep 2004 16:07:22 -0000 @@ -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) Index: ext/curl/config.m4 =================================================================== RCS file: /repository/php-src/ext/curl/config.m4,v retrieving revision 1.25 diff -u -r1.25 config.m4 --- ext/curl/config.m4 22 May 2003 13:08:49 -0000 1.25 +++ ext/curl/config.m4 27 Sep 2004 16:07:22 -0000 @@ -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 Index: ext/dba/config.m4 =================================================================== RCS file: /repository/php-src/ext/dba/config.m4,v retrieving revision 1.61 diff -u -r1.61 config.m4 --- ext/dba/config.m4 25 Sep 2004 15:29:19 -0000 1.61 +++ ext/dba/config.m4 27 Sep 2004 16:07:22 -0000 @@ -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 Index: ext/fam/config.m4 =================================================================== RCS file: /repository/php-src/ext/fam/config.m4,v retrieving revision 1.2 diff -u -r1.2 config.m4 --- ext/fam/config.m4 10 Dec 2002 20:09:35 -0000 1.2 +++ ext/fam/config.m4 27 Sep 2004 16:07:22 -0000 @@ -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) Index: ext/gd/config.m4 =================================================================== RCS file: /repository/php-src/ext/gd/config.m4,v retrieving revision 1.147 diff -u -r1.147 config.m4 --- ext/gd/config.m4 27 Jul 2004 12:44:25 -0000 1.147 +++ ext/gd/config.m4 27 Sep 2004 16:07:22 -0000 @@ -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.]) ],[ Index: ext/gettext/config.m4 =================================================================== RCS file: /repository/php-src/ext/gettext/config.m4,v retrieving revision 1.13 diff -u -r1.13 config.m4 --- ext/gettext/config.m4 1 Oct 2003 02:53:07 -0000 1.13 +++ ext/gettext/config.m4 27 Sep 2004 16:07:22 -0000 @@ -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 Index: ext/gmp/config.m4 =================================================================== RCS file: /repository/php-src/ext/gmp/config.m4,v retrieving revision 1.10 diff -u -r1.10 config.m4 --- ext/gmp/config.m4 19 Nov 2003 04:44:06 -0000 1.10 +++ ext/gmp/config.m4 27 Sep 2004 16:07:22 -0000 @@ -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) Index: ext/iconv/config.m4 =================================================================== RCS file: /repository/php-src/ext/iconv/config.m4,v retrieving revision 1.27 diff -u -r1.27 config.m4 --- ext/iconv/config.m4 14 Jul 2004 09:54:02 -0000 1.27 +++ ext/iconv/config.m4 27 Sep 2004 16:07:22 -0000 @@ -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" Index: ext/imap/config.m4 =================================================================== RCS file: /repository/php-src/ext/imap/config.m4,v retrieving revision 1.63 diff -u -r1.63 config.m4 --- ext/imap/config.m4 23 Feb 2004 03:24:58 -0000 1.63 +++ ext/imap/config.m4 27 Sep 2004 16:07:22 -0000 @@ -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 Index: ext/ldap/config.m4 =================================================================== RCS file: /repository/php-src/ext/ldap/config.m4,v retrieving revision 1.34 diff -u -r1.34 config.m4 --- ext/ldap/config.m4 1 Jul 2003 00:02:13 -0000 1.34 +++ ext/ldap/config.m4 27 Sep 2004 16:07:22 -0000 @@ -6,15 +6,15 @@ 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 Index: ext/mysql/config.m4 =================================================================== RCS file: /repository/php-src/ext/mysql/config.m4,v retrieving revision 1.61 diff -u -r1.61 config.m4 --- ext/mysql/config.m4 31 Dec 2003 11:27:52 -0000 1.61 +++ ext/mysql/config.m4 27 Sep 2004 16:07:22 -0000 @@ -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, [], [ Index: ext/ncurses/config.m4 =================================================================== RCS file: /repository/php-src/ext/ncurses/config.m4,v retrieving revision 1.17 diff -u -r1.17 config.m4 --- ext/ncurses/config.m4 9 Dec 2003 20:33:08 -0000 1.17 +++ ext/ncurses/config.m4 27 Sep 2004 16:07:22 -0000 @@ -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, [ ])]) Index: ext/odbc/config.m4 =================================================================== RCS file: /repository/php-src/ext/odbc/config.m4,v retrieving revision 1.65 diff -u -r1.65 config.m4 --- ext/odbc/config.m4 17 Jan 2004 12:59:40 -0000 1.65 +++ ext/odbc/config.m4 27 Sep 2004 16:07:22 -0000 @@ -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 Index: ext/pcre/config.m4 =================================================================== RCS file: /repository/php-src/ext/pcre/config.m4,v retrieving revision 1.32 diff -u -r1.32 config.m4 --- ext/pcre/config.m4 28 Jun 2003 04:30:51 -0000 1.32 +++ ext/pcre/config.m4 27 Sep 2004 16:07:22 -0000 @@ -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 Index: ext/pgsql/config.m4 =================================================================== RCS file: /repository/php-src/ext/pgsql/config.m4,v retrieving revision 1.37 diff -u -r1.37 config.m4 --- ext/pgsql/config.m4 9 Jan 2004 18:44:33 -0000 1.37 +++ ext/pgsql/config.m4 27 Sep 2004 16:07:22 -0000 @@ -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 Index: ext/pspell/config.m4 =================================================================== RCS file: /repository/php-src/ext/pspell/config.m4,v retrieving revision 1.9 diff -u -r1.9 config.m4 --- ext/pspell/config.m4 9 Aug 2003 18:43:45 -0000 1.9 +++ ext/pspell/config.m4 27 Sep 2004 16:07:23 -0000 @@ -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) Index: ext/readline/config.m4 =================================================================== RCS file: /repository/php-src/ext/readline/config.m4,v retrieving revision 1.23 diff -u -r1.23 config.m4 --- ext/readline/config.m4 24 Aug 2004 12:52:07 -0000 1.23 +++ ext/readline/config.m4 27 Sep 2004 16:07:23 -0000 @@ -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) Index: ext/recode/config.m4 =================================================================== RCS file: /repository/php-src/ext/recode/config.m4,v retrieving revision 1.11 diff -u -r1.11 config.m4 --- ext/recode/config.m4 1 Oct 2003 02:53:14 -0000 1.11 +++ ext/recode/config.m4 27 Sep 2004 16:07:23 -0000 @@ -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 Index: ext/session/config.m4 =================================================================== RCS file: /repository/php-src/ext/session/config.m4,v retrieving revision 1.25 diff -u -r1.25 config.m4 --- ext/session/config.m4 1 Oct 2003 02:53:15 -0000 1.25 +++ ext/session/config.m4 27 Sep 2004 16:07:23 -0000 @@ -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 Index: ext/xml/config.m4 =================================================================== RCS file: /repository/php-src/ext/xml/config.m4,v retrieving revision 1.49 diff -u -r1.49 config.m4 --- ext/xml/config.m4 18 Jul 2004 12:03:51 -0000 1.49 +++ ext/xml/config.m4 27 Sep 2004 16:07:23 -0000 @@ -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 Index: ext/xmlrpc/config.m4 =================================================================== RCS file: /repository/php-src/ext/xmlrpc/config.m4,v retrieving revision 1.21 diff -u -r1.21 config.m4 --- ext/xmlrpc/config.m4 1 Oct 2003 02:53:15 -0000 1.21 +++ ext/xmlrpc/config.m4 27 Sep 2004 16:07:23 -0000 @@ -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 Index: ext/xsl/config.m4 =================================================================== RCS file: /repository/php-src/ext/xsl/config.m4,v retrieving revision 1.8 diff -u -r1.8 config.m4 --- ext/xsl/config.m4 18 Jul 2004 12:03:51 -0000 1.8 +++ ext/xsl/config.m4 27 Sep 2004 16:07:23 -0000 @@ -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 Index: ext/zlib/config0.m4 =================================================================== RCS file: /repository/php-src/ext/zlib/config0.m4,v retrieving revision 1.15 diff -u -r1.15 config0.m4 --- ext/zlib/config0.m4 17 Jul 2004 00:05:30 -0000 1.15 +++ ext/zlib/config0.m4 27 Sep 2004 16:07:23 -0000 @@ -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)