summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ext/bz2/config.m44
-rw-r--r--ext/cpdf/config.m46
-rw-r--r--ext/curl/config.m46
-rw-r--r--ext/dba/config.m416
-rw-r--r--ext/fam/config.m44
-rw-r--r--ext/gd/config.m428
-rw-r--r--ext/gettext/config.m42
-rw-r--r--ext/gmp/config.m46
-rw-r--r--ext/iconv/config.m42
-rw-r--r--ext/imap/config.m414
-rw-r--r--ext/ldap/config.m48
-rw-r--r--ext/mbstring/config.m44
-rw-r--r--ext/mysql/config.m46
-rw-r--r--ext/ncurses/config.m48
-rw-r--r--ext/odbc/config.m420
-rw-r--r--ext/pcre/config.m42
-rw-r--r--ext/pcre/config0.m42
-rw-r--r--ext/pgsql/config.m42
-rw-r--r--ext/pspell/config.m42
-rw-r--r--ext/readline/config.m414
-rw-r--r--ext/recode/config.m46
-rw-r--r--ext/session/config.m42
-rw-r--r--ext/sqlite/config.m44
-rw-r--r--ext/xml/config.m44
-rw-r--r--ext/xmlrpc/config.m46
-rw-r--r--ext/xsl/config.m42
-rw-r--r--ext/zlib/config0.m44
27 files changed, 92 insertions, 92 deletions
diff --git a/ext/bz2/config.m4 b/ext/bz2/config.m4
index bd6e8a6ab9..3e6aa78d05 100644
--- a/ext/bz2/config.m4
+++ b/ext/bz2/config.m4
@@ -27,12 +27,12 @@ if test "$PHP_BZ2" != "no"; then
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)
diff --git a/ext/cpdf/config.m4 b/ext/cpdf/config.m4
index 95627bd970..40d024e64d 100644
--- a/ext/cpdf/config.m4
+++ b/ext/cpdf/config.m4
@@ -4,7 +4,7 @@ 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_DEFUN(CPDF_TIFF_TEST,[
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 @@ if test "$PHP_CPDFLIB" != "no"; then
], [
AC_MSG_ERROR([Cpdflib module requires cpdflib >= 2.])
], [
- -L$i/lib $CPDF_SHARED_LIBADD
+ -L$i/$PHP_LIBDIR $CPDF_SHARED_LIBADD
])
break
fi
diff --git a/ext/curl/config.m4 b/ext/curl/config.m4
index 1e683072c5..44b869a6b3 100644
--- a/ext/curl/config.m4
+++ b/ext/curl/config.m4
@@ -51,7 +51,7 @@ if test "$PHP_CURL" != "no"; then
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 @@ if test "$PHP_CURL" != "no"; then
],[
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
diff --git a/ext/dba/config.m4 b/ext/dba/config.m4
index d57d1bd564..72a7611908 100644
--- a/ext/dba/config.m4
+++ b/ext/dba/config.m4
@@ -21,7 +21,7 @@ AC_DEFUN(PHP_TEMP_LDFLAGS,[
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_ARG_WITH(qdbm,
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_ARG_WITH(gdbm,
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_ARG_WITH(ndbm,
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 Berkeley specific (library and version test)
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 @@ AC_ARG_WITH(dbm,
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_ARG_WITH(cdb,
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
diff --git a/ext/fam/config.m4 b/ext/fam/config.m4
index ebbd0e4db1..63a6efcdfa 100644
--- a/ext/fam/config.m4
+++ b/ext/fam/config.m4
@@ -42,12 +42,12 @@ LIBSYMBOL=FAMOpen # you most likely want to change this
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)
diff --git a/ext/gd/config.m4 b/ext/gd/config.m4
index fba27659a9..f5d3c95275 100644
--- a/ext/gd/config.m4
+++ b/ext/gd/config.m4
@@ -51,7 +51,7 @@ AC_DEFUN(PHP_GD_JPEG,[
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 @@ AC_DEFUN(PHP_GD_JPEG,[
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 @@ AC_DEFUN(PHP_GD_PNG,[
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 @@ AC_DEFUN(PHP_GD_PNG,[
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 @@ AC_DEFUN(PHP_GD_XPM,[
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 @@ AC_DEFUN(PHP_GD_XPM,[
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 @@ AC_DEFUN(PHP_GD_FREETYPE1,[
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 @@ AC_DEFUN(PHP_GD_FREETYPE2,[
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_DEFUN(PHP_GD_T1LIB,[
[
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.])
],[
diff --git a/ext/gettext/config.m4 b/ext/gettext/config.m4
index 23bc9ae6f3..ef9f00d693 100644
--- a/ext/gettext/config.m4
+++ b/ext/gettext/config.m4
@@ -14,7 +14,7 @@ if test "$PHP_GETTEXT" != "no"; then
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
diff --git a/ext/gmp/config.m4 b/ext/gmp/config.m4
index aeb7edbd55..9606b2f56d 100644
--- a/ext/gmp/config.m4
+++ b/ext/gmp/config.m4
@@ -21,13 +21,13 @@ if test "$PHP_GMP" != "no"; then
[],[
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)
diff --git a/ext/iconv/config.m4 b/ext/iconv/config.m4
index 6f49e423f2..e8cf8afb46 100644
--- a/ext/iconv/config.m4
+++ b/ext/iconv/config.m4
@@ -24,7 +24,7 @@ if test "$PHP_ICONV" != "no"; then
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"
diff --git a/ext/imap/config.m4 b/ext/imap/config.m4
index d0bb00b14b..69e1ff092c 100644
--- a/ext/imap/config.m4
+++ b/ext/imap/config.m4
@@ -59,7 +59,7 @@ AC_DEFUN(PHP_IMAP_KRB_CHK, [
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 @@ AC_DEFUN(PHP_IMAP_KRB_CHK, [
])
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_DEFUN(PHP_IMAP_SSL_CHK, [
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 "$PHP_IMAP" != "no"; then
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
diff --git a/ext/ldap/config.m4 b/ext/ldap/config.m4
index 2eb00971b8..b762efbe36 100644
--- a/ext/ldap/config.m4
+++ b/ext/ldap/config.m4
@@ -6,15 +6,15 @@ 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 @@ AC_DEFUN(PHP_LDAP_SASL_CHECKS, [
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
diff --git a/ext/mbstring/config.m4 b/ext/mbstring/config.m4
index 311c6458e0..d316bddf3a 100644
--- a/ext/mbstring/config.m4
+++ b/ext/mbstring/config.m4
@@ -225,11 +225,11 @@ AC_DEFUN([PHP_MBSTRING_SETUP_LIBMBFL], [
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
])
diff --git a/ext/mysql/config.m4 b/ext/mysql/config.m4
index 8bf0a6a879..c45c8d4776 100644
--- a/ext/mysql/config.m4
+++ b/ext/mysql/config.m4
@@ -83,7 +83,7 @@ if test "$PHP_MYSQL" != "no"; then
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 @@ Note that the MySQL client library is not bundled anymore.])
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, [], [
diff --git a/ext/ncurses/config.m4 b/ext/ncurses/config.m4
index 28ae210fce..57b29a768a 100644
--- a/ext/ncurses/config.m4
+++ b/ext/ncurses/config.m4
@@ -40,18 +40,18 @@ if test "$PHP_NCURSES" != "no"; then
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, [ ])])
diff --git a/ext/odbc/config.m4 b/ext/odbc/config.m4
index ce518dca5c..228228ac5a 100644
--- a/ext/odbc/config.m4
+++ b/ext/odbc/config.m4
@@ -101,8 +101,8 @@ AC_ARG_WITH(adabas,
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 @@ AC_ARG_WITH(solid,
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 @@ AC_ARG_WITH(ibm-db2,
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 @@ AC_ARG_WITH(birdstep,
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 @@ AC_ARG_WITH(custom-odbc,
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 @@ AC_ARG_WITH(iodbc,
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 @@ AC_ARG_WITH(esoob,
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 @@ AC_ARG_WITH(unixODBC,
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 @@ AC_ARG_WITH(dbmaker,
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
diff --git a/ext/pcre/config.m4 b/ext/pcre/config.m4
index 02e71bd25b..7970cdb6a3 100644
--- a/ext/pcre/config.m4
+++ b/ext/pcre/config.m4
@@ -25,7 +25,7 @@ if test "$PHP_PCRE_REGEX" != "no"; then
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
diff --git a/ext/pcre/config0.m4 b/ext/pcre/config0.m4
index 02e71bd25b..7970cdb6a3 100644
--- a/ext/pcre/config0.m4
+++ b/ext/pcre/config0.m4
@@ -25,7 +25,7 @@ if test "$PHP_PCRE_REGEX" != "no"; then
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
diff --git a/ext/pgsql/config.m4 b/ext/pgsql/config.m4
index b6ebfb1a57..dbe7b41230 100644
--- a/ext/pgsql/config.m4
+++ b/ext/pgsql/config.m4
@@ -44,7 +44,7 @@ if test "$PHP_PGSQL" != "no"; then
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
diff --git a/ext/pspell/config.m4 b/ext/pspell/config.m4
index 955ddbf770..2f0581eaf3 100644
--- a/ext/pspell/config.m4
+++ b/ext/pspell/config.m4
@@ -27,7 +27,7 @@ if test "$PHP_PSPELL" != "no"; then
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)
diff --git a/ext/readline/config.m4 b/ext/readline/config.m4
index 8ed89206e8..7bcfdca8e9 100644
--- a/ext/readline/config.m4
+++ b/ext/readline/config.m4
@@ -34,27 +34,27 @@ if test "$PHP_READLINE" != "no"; then
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 @@ elif test "$PHP_LIBEDIT" != "no"; then
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)
diff --git a/ext/recode/config.m4 b/ext/recode/config.m4
index aa94914df8..fbdade3d9f 100644
--- a/ext/recode/config.m4
+++ b/ext/recode/config.m4
@@ -12,17 +12,17 @@ if test "$PHP_RECODE" != "no"; then
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
diff --git a/ext/session/config.m4 b/ext/session/config.m4
index 3f74899676..cda321bfc1 100644
--- a/ext/session/config.m4
+++ b/ext/session/config.m4
@@ -25,7 +25,7 @@ if test "$PHP_MM" != "no"; then
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
diff --git a/ext/sqlite/config.m4 b/ext/sqlite/config.m4
index bec92bbb6e..828a31ae97 100644
--- a/ext/sqlite/config.m4
+++ b/ext/sqlite/config.m4
@@ -40,12 +40,12 @@ if test "$PHP_SQLITE" != "no"; then
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)
diff --git a/ext/xml/config.m4 b/ext/xml/config.m4
index a7c87e3673..71afc5a5f6 100644
--- a/ext/xml/config.m4
+++ b/ext/xml/config.m4
@@ -30,7 +30,7 @@ if test "$PHP_XML" != "no" && test "$PHP_LIBXML" != "no" -o "$PHP_LIBEXPAT_DIR"
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 @@ if test "$PHP_XML" != "no" && test "$PHP_LIBXML" != "no" -o "$PHP_LIBEXPAT_DIR"
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
diff --git a/ext/xmlrpc/config.m4 b/ext/xmlrpc/config.m4
index 8551f6b958..54335dfea4 100644
--- a/ext/xmlrpc/config.m4
+++ b/ext/xmlrpc/config.m4
@@ -23,9 +23,9 @@ if test "$PHP_XMLRPC" != "no"; then
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 @@ dnl for xmlrpc-epi because of this.
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
diff --git a/ext/xsl/config.m4 b/ext/xsl/config.m4
index 552ed94f2d..b1cb844882 100644
--- a/ext/xsl/config.m4
+++ b/ext/xsl/config.m4
@@ -45,7 +45,7 @@ if test "$PHP_XSL" != "no"; then
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
diff --git a/ext/zlib/config0.m4 b/ext/zlib/config0.m4
index 495a952c2c..bc87e5fb79 100644
--- a/ext/zlib/config0.m4
+++ b/ext/zlib/config0.m4
@@ -38,7 +38,7 @@ if test "$PHP_ZLIB" != "no" -o "$PHP_ZLIB_DIR" != "no"; then
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 @@ if test "$PHP_ZLIB" != "no" -o "$PHP_ZLIB_DIR" != "no"; then
$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)
View Lorry Controller Status