Skip to content

Commit 2685ca9

Browse files
author
Joe Orton
committed
Update extensions to use /path/to/$PHP_LIBDIR rather than /path/to/lib
to support multi-ABI platforms.
1 parent 557cda4 commit 2685ca9

File tree

27 files changed

+92
-92
lines changed

27 files changed

+92
-92
lines changed

‎ext/bz2/config.m4

+2-2
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,12 @@ if test "$PHP_BZ2" != "no"; then
2727
PHP_CHECK_LIBRARY(bz2, BZ2_bzerror,
2828
[
2929
PHP_ADD_INCLUDE($BZIP_DIR/include)
30-
PHP_ADD_LIBRARY_WITH_PATH(bz2, $BZIP_DIR/lib, BZ2_SHARED_LIBADD)
30+
PHP_ADD_LIBRARY_WITH_PATH(bz2, $BZIP_DIR/$PHP_LIBDIR, BZ2_SHARED_LIBADD)
3131
AC_DEFINE(HAVE_BZ2,1,[ ])
3232
], [
3333
AC_MSG_ERROR(bz2 module requires libbz2 >= 1.0.0)
3434
], [
35-
-L$BZIP_DIR/lib
35+
-L$BZIP_DIR/$PHP_LIBDIR
3636
])
3737

3838
PHP_NEW_EXTENSION(bz2, bz2.c bz2_filter.c, $ext_shared)

‎ext/cpdf/config.m4

+3-3
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ AC_DEFUN(CPDF_JPEG_TEST,[
44
AC_ARG_WITH(jpeg-dir,
55
[ --with-jpeg-dir[=DIR] CPDF: Set the path to libjpeg install prefix.],[
66
for i in $withval /usr/local /usr; do
7-
if test -f "$i/lib/libjpeg.$SHLIB_SUFFIX_NAME" -o -f "$i/lib/libjpeg.a"; then
7+
if test -f "$i/$PHP_LIBDIR/libjpeg.$SHLIB_SUFFIX_NAME" -o -f "$i/$PHP_LIBDIR/libjpeg.a"; then
88
CPDF_JPEG_DIR=$i
99
break;
1010
fi
@@ -26,7 +26,7 @@ AC_DEFUN(CPDF_TIFF_TEST,[
2626
AC_ARG_WITH(tiff-dir,
2727
[ --with-tiff-dir[=DIR] CPDF: Set the path to libtiff install prefix.],[
2828
for i in $withval /usr/local /usr; do
29-
if test -f "$i/lib/libtiff.$SHLIB_SUFFIX_NAME" -o -f "$i/lib/libtiff.a"; then
29+
if test -f "$i/$PHP_LIBDIR/libtiff.$SHLIB_SUFFIX_NAME" -o -f "$i/$PHP_LIBDIR/libtiff.a"; then
3030
CPDF_TIFF_DIR=$i
3131
break;
3232
fi
@@ -64,7 +64,7 @@ if test "$PHP_CPDFLIB" != "no"; then
6464
], [
6565
AC_MSG_ERROR([Cpdflib module requires cpdflib >= 2.])
6666
], [
67-
-L$i/lib $CPDF_SHARED_LIBADD
67+
-L$i/$PHP_LIBDIR $CPDF_SHARED_LIBADD
6868
])
6969
break
7070
fi

‎ext/curl/config.m4

+3-3
Original file line numberDiff line numberDiff line change
@@ -51,22 +51,22 @@ if test "$PHP_CURL" != "no"; then
5151

5252
PHP_ADD_INCLUDE($CURL_DIR/include)
5353
PHP_EVAL_LIBLINE($CURL_LIBS, CURL_SHARED_LIBADD)
54-
PHP_ADD_LIBRARY_WITH_PATH(curl, $CURL_DIR/lib, CURL_SHARED_LIBADD)
54+
PHP_ADD_LIBRARY_WITH_PATH(curl, $CURL_DIR/$PHP_LIBDIR, CURL_SHARED_LIBADD)
5555

5656
PHP_CHECK_LIBRARY(curl,curl_easy_perform,
5757
[
5858
AC_DEFINE(HAVE_CURL,1,[ ])
5959
],[
6060
AC_MSG_ERROR(There is something wrong. Please check config.log for more information.)
6161
],[
62-
$CURL_LIBS -L$CURL_DIR/lib
62+
$CURL_LIBS -L$CURL_DIR/$PHP_LIBDIR
6363
])
6464

6565
PHP_CHECK_LIBRARY(curl,curl_version_info,
6666
[
6767
AC_DEFINE(HAVE_CURL_VERSION_INFO,1,[ ])
6868
],[],[
69-
$CURL_LIBS -L$CURL_DIR/lib
69+
$CURL_LIBS -L$CURL_DIR/$PHP_LIBDIR
7070
])
7171

7272
if test "$PHP_CURLWRAPPERS" != "no" ; then

‎ext/dba/config.m4

+8-8
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ AC_DEFUN(PHP_TEMP_LDFLAGS,[
2121
dnl Assign INCLUDE/LFLAGS from PREFIX
2222
AC_DEFUN(PHP_DBA_STD_ASSIGN,[
2323
if test -n "$THIS_PREFIX" && test "$THIS_PREFIX" != "/usr"; then
24-
THIS_LFLAGS=$THIS_PREFIX/lib
24+
THIS_LFLAGS=$THIS_PREFIX/$PHP_LIBDIR
2525
fi
2626
])
2727

@@ -86,7 +86,7 @@ AC_ARG_WITH(qdbm,
8686
AC_DEFINE_UNQUOTED(QDBM_INCLUDE_FILE, "$THIS_INCLUDE", [ ])
8787
AC_DEFINE(DBA_QDBM, 1, [ ])
8888
THIS_LIBS=$LIB
89-
], [], [-L$THIS_PREFIX/lib])
89+
], [], [-L$THIS_PREFIX/$PHP_LIBDIR])
9090
if test -n "$THIS_LIBS"; then
9191
break
9292
fi
@@ -121,7 +121,7 @@ AC_ARG_WITH(gdbm,
121121
AC_DEFINE_UNQUOTED(GDBM_INCLUDE_FILE, "$THIS_INCLUDE", [ ])
122122
AC_DEFINE(DBA_GDBM, 1, [ ])
123123
THIS_LIBS=gdbm
124-
], [], [-L$THIS_PREFIX/lib])
124+
], [], [-L$THIS_PREFIX/$PHP_LIBDIR])
125125
fi
126126
127127
PHP_DBA_STD_ASSIGN
@@ -153,7 +153,7 @@ AC_ARG_WITH(ndbm,
153153
AC_DEFINE_UNQUOTED(NDBM_INCLUDE_FILE, "$THIS_INCLUDE", [ ])
154154
AC_DEFINE(DBA_NDBM, 1, [ ])
155155
THIS_LIBS=$LIB
156-
], [], [-L$THIS_PREFIX/lib])
156+
], [], [-L$THIS_PREFIX/$PHP_LIBDIR])
157157
if test -n "$THIS_LIBS"; then
158158
break
159159
fi
@@ -171,8 +171,8 @@ dnl Berkeley specific (library and version test)
171171
dnl parameters(version, library list, function)
172172
AC_DEFUN(PHP_DBA_DB_CHECK,[
173173
for LIB in $2; do
174-
if test -f $THIS_PREFIX/lib/lib$LIB.a -o -f $THIS_PREFIX/lib/lib$LIB.$SHLIB_SUFFIX_NAME; then
175-
PHP_TEMP_LDFLAGS(-L$THIS_PREFIX/lib, -l$LIB,[
174+
if test -f $THIS_PREFIX/$PHP_LIBDIR/lib$LIB.a -o -f $THIS_PREFIX/$PHP_LIBDIR/lib$LIB.$SHLIB_SUFFIX_NAME; then
175+
PHP_TEMP_LDFLAGS(-L$THIS_PREFIX/$PHP_LIBDIR, -l$LIB,[
176176
AC_TRY_LINK([
177177
#include "$THIS_INCLUDE"
178178
],[
@@ -367,7 +367,7 @@ AC_ARG_WITH(dbm,
367367
fi
368368
AC_DEFINE(DBA_DBM, 1, [ ])
369369
THIS_LIBS=$LIB
370-
], [], [-L$THIS_PREFIX/lib])
370+
], [], [-L$THIS_PREFIX/$PHP_LIBDIR])
371371
if test -n "$THIS_LIBS"; then
372372
break
373373
fi
@@ -409,7 +409,7 @@ AC_ARG_WITH(cdb,
409409
AC_DEFINE_UNQUOTED(CDB_INCLUDE_FILE, "$THIS_INCLUDE", [ ])
410410
AC_DEFINE(DBA_CDB, 1, [ ])
411411
THIS_LIBS=$LIB
412-
], [], [-L$THIS_PREFIX/lib])
412+
], [], [-L$THIS_PREFIX/$PHP_LIBDIR])
413413
if test -n "$THIS_LIBS"; then
414414
break
415415
fi

‎ext/fam/config.m4

+2-2
Original file line numberDiff line numberDiff line change
@@ -42,12 +42,12 @@ LIBSYMBOL=FAMOpen # you most likely want to change this
4242

4343
PHP_CHECK_LIBRARY($LIBNAME,$LIBSYMBOL,
4444
[
45-
PHP_ADD_LIBRARY_WITH_PATH($LIBNAME, $FAM_DIR/lib, FAM_SHARED_LIBADD)
45+
PHP_ADD_LIBRARY_WITH_PATH($LIBNAME, $FAM_DIR/$PHP_LIBDIR, FAM_SHARED_LIBADD)
4646
AC_DEFINE(HAVE_FAMLIB,1,[ ])
4747
],[
4848
AC_MSG_ERROR([wrong fam lib version or lib not found])
4949
],[
50-
-L$FAM_DIR/lib -lm -ldl
50+
-L$FAM_DIR/$PHP_LIBDIR -lm -ldl
5151
])
5252

5353
PHP_SUBST(FAM_SHARED_LIBADD)

‎ext/gd/config.m4

+14-14
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ AC_DEFUN(PHP_GD_JPEG,[
5151
if test "$PHP_JPEG_DIR" != "no"; then
5252
5353
for i in $PHP_JPEG_DIR /usr/local /usr; do
54-
test -f $i/lib/libjpeg.$SHLIB_SUFFIX_NAME -o -f $i/lib/libjpeg.a && GD_JPEG_DIR=$i && break
54+
test -f $i/$PHP_LIBDIR/libjpeg.$SHLIB_SUFFIX_NAME -o -f $i/$PHP_LIBDIR/libjpeg.a && GD_JPEG_DIR=$i && break
5555
done
5656
5757
if test -z "$GD_JPEG_DIR"; then
@@ -61,11 +61,11 @@ AC_DEFUN(PHP_GD_JPEG,[
6161
PHP_CHECK_LIBRARY(jpeg,jpeg_read_header,
6262
[
6363
PHP_ADD_INCLUDE($GD_JPEG_DIR/include)
64-
PHP_ADD_LIBRARY_WITH_PATH(jpeg, $GD_JPEG_DIR/lib, GD_SHARED_LIBADD)
64+
PHP_ADD_LIBRARY_WITH_PATH(jpeg, $GD_JPEG_DIR/$PHP_LIBDIR, GD_SHARED_LIBADD)
6565
],[
6666
AC_MSG_ERROR([Problem with libjpeg.(a|so). Please check config.log for more information.])
6767
],[
68-
-L$GD_JPEG_DIR/lib
68+
-L$GD_JPEG_DIR/$PHP_LIBDIR
6969
])
7070
else
7171
AC_MSG_RESULT([If configure fails try --with-jpeg-dir=<DIR>])
@@ -76,7 +76,7 @@ AC_DEFUN(PHP_GD_PNG,[
7676
if test "$PHP_PNG_DIR" != "no"; then
7777
7878
for i in $PHP_PNG_DIR /usr/local /usr; do
79-
test -f $i/lib/libpng.$SHLIB_SUFFIX_NAME -o -f $i/lib/libpng.a && GD_PNG_DIR=$i && break
79+
test -f $i/$PHP_LIBDIR/libpng.$SHLIB_SUFFIX_NAME -o -f $i/$PHP_LIBDIR/libpng.a && GD_PNG_DIR=$i && break
8080
done
8181
8282
if test -z "$GD_PNG_DIR"; then
@@ -94,12 +94,12 @@ AC_DEFUN(PHP_GD_PNG,[
9494
PHP_CHECK_LIBRARY(png,png_write_image,
9595
[
9696
PHP_ADD_INCLUDE($GD_PNG_DIR/include)
97-
PHP_ADD_LIBRARY_WITH_PATH(z, $PHP_ZLIB_DIR/lib, GD_SHARED_LIBADD)
98-
PHP_ADD_LIBRARY_WITH_PATH(png, $GD_PNG_DIR/lib, GD_SHARED_LIBADD)
97+
PHP_ADD_LIBRARY_WITH_PATH(z, $PHP_ZLIB_DIR/$PHP_LIBDIR, GD_SHARED_LIBADD)
98+
PHP_ADD_LIBRARY_WITH_PATH(png, $GD_PNG_DIR/$PHP_LIBDIR, GD_SHARED_LIBADD)
9999
],[
100100
AC_MSG_ERROR([Problem with libpng.(a|so) or libz.(a|so). Please check config.log for more information.])
101101
],[
102-
-L$PHP_ZLIB_DIR/lib -lz -L$GD_PNG_DIR/lib
102+
-L$PHP_ZLIB_DIR/$PHP_LIBDIR -lz -L$GD_PNG_DIR/$PHP_LIBDIR
103103
])
104104
105105
else
@@ -111,7 +111,7 @@ AC_DEFUN(PHP_GD_XPM,[
111111
if test "$PHP_XPM_DIR" != "no"; then
112112
113113
for i in $PHP_XPM_DIR /usr/local /usr/X11R6 /usr; do
114-
test -f $i/lib/libXpm.$SHLIB_SUFFIX_NAME -o -f $i/lib/libXpm.a && GD_XPM_DIR=$i && break
114+
test -f $i/$PHP_LIBDIR/libXpm.$SHLIB_SUFFIX_NAME -o -f $i/$PHP_LIBDIR/libXpm.a && GD_XPM_DIR=$i && break
115115
done
116116
117117
if test -z "$GD_XPM_DIR"; then
@@ -129,12 +129,12 @@ AC_DEFUN(PHP_GD_XPM,[
129129
PHP_CHECK_LIBRARY(Xpm,XpmFreeXpmImage,
130130
[
131131
PHP_ADD_INCLUDE($GD_XPM_INC)
132-
PHP_ADD_LIBRARY_WITH_PATH(Xpm, $GD_XPM_DIR/lib, GD_SHARED_LIBADD)
133-
PHP_ADD_LIBRARY_WITH_PATH(X11, $GD_XPM_DIR/lib, GD_SHARED_LIBADD)
132+
PHP_ADD_LIBRARY_WITH_PATH(Xpm, $GD_XPM_DIR/$PHP_LIBDIR, GD_SHARED_LIBADD)
133+
PHP_ADD_LIBRARY_WITH_PATH(X11, $GD_XPM_DIR/$PHP_LIBDIR, GD_SHARED_LIBADD)
134134
],[
135135
AC_MSG_ERROR([Problem with libXpm.(a|so) or libX11.(a|so). Please check config.log for more information.])
136136
],[
137-
-L$GD_XPM_DIR/lib -lX11
137+
-L$GD_XPM_DIR/$PHP_LIBDIR -lX11
138138
])
139139
else
140140
AC_MSG_RESULT(If configure fails try --with-xpm-dir=<DIR>)
@@ -163,7 +163,7 @@ AC_DEFUN(PHP_GD_FREETYPE1,[
163163
fi
164164
if test -n "$TTF_DIR" ; then
165165
AC_DEFINE(HAVE_LIBTTF,1,[ ])
166-
PHP_ADD_LIBRARY_WITH_PATH(ttf, $TTF_DIR/lib, GD_SHARED_LIBADD)
166+
PHP_ADD_LIBRARY_WITH_PATH(ttf, $TTF_DIR/$PHP_LIBDIR, GD_SHARED_LIBADD)
167167
fi
168168
if test -z "$TTF_INC_DIR"; then
169169
TTF_INC_DIR=$TTF_DIR/include
@@ -188,7 +188,7 @@ AC_DEFUN(PHP_GD_FREETYPE2,[
188188
done
189189
190190
if test -n "$FREETYPE2_DIR" ; then
191-
PHP_ADD_LIBRARY_WITH_PATH(freetype, $FREETYPE2_DIR/lib, GD_SHARED_LIBADD)
191+
PHP_ADD_LIBRARY_WITH_PATH(freetype, $FREETYPE2_DIR/$PHP_LIBDIR, GD_SHARED_LIBADD)
192192
PHP_ADD_INCLUDE($FREETYPE2_DIR/include)
193193
PHP_ADD_INCLUDE($FREETYPE2_INC_DIR)
194194
AC_DEFINE(USE_GD_IMGSTRTTF, 1, [ ])
@@ -216,7 +216,7 @@ AC_DEFUN(PHP_GD_T1LIB,[
216216
[
217217
AC_DEFINE(HAVE_LIBT1,1,[ ])
218218
PHP_ADD_INCLUDE($GD_T1_DIR/include)
219-
PHP_ADD_LIBRARY_WITH_PATH(t1, $GD_T1_DIR/lib, GD_SHARED_LIBADD)
219+
PHP_ADD_LIBRARY_WITH_PATH(t1, $GD_T1_DIR/$PHP_LIBDIR, GD_SHARED_LIBADD)
220220
],[
221221
AC_MSG_ERROR([Problem with libt1.(a|so). Please check config.log for more information.])
222222
],[

‎ext/gettext/config.m4

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ if test "$PHP_GETTEXT" != "no"; then
1414
AC_MSG_ERROR(Cannot locate header file libintl.h)
1515
fi
1616

17-
GETTEXT_LIBDIR=$GETTEXT_DIR/lib
17+
GETTEXT_LIBDIR=$GETTEXT_DIR/$PHP_LIBDIR
1818
GETTEXT_INCDIR=$GETTEXT_DIR/include
1919

2020
O_LDFLAGS=$LDFLAGS

‎ext/gmp/config.m4

+3-3
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,13 @@ if test "$PHP_GMP" != "no"; then
2121
[],[
2222
AC_MSG_ERROR([GNU MP Library version 4.1.2 or greater required.])
2323
],[
24-
-L$GMP_DIR/lib
24+
-L$GMP_DIR/$PHP_LIBDIR
2525
])
2626
],[
27-
-L$GMP_DIR/lib
27+
-L$GMP_DIR/$PHP_LIBDIR
2828
])
2929

30-
PHP_ADD_LIBRARY_WITH_PATH(gmp, $GMP_DIR/lib, GMP_SHARED_LIBADD)
30+
PHP_ADD_LIBRARY_WITH_PATH(gmp, $GMP_DIR/$PHP_LIBDIR, GMP_SHARED_LIBADD)
3131
PHP_ADD_INCLUDE($GMP_DIR/include)
3232

3333
PHP_NEW_EXTENSION(gmp, gmp.c, $ext_shared)

‎ext/iconv/config.m4

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ if test "$PHP_ICONV" != "no"; then
2424
fi
2525

2626
CFLAGS="-I$PHP_ICONV_PREFIX/include $CFLAGS"
27-
LDFLAGS="-L$PHP_ICONV_PREFIX/lib $LDFLAGS"
27+
LDFLAGS="-L$PHP_ICONV_PREFIX/$PHP_LIBDIR $LDFLAGS"
2828

2929
if test -r $PHP_ICONV_PREFIX/include/giconv.h; then
3030
PHP_ICONV_H_PATH="$PHP_ICONV_PREFIX/include/giconv.h"

‎ext/imap/config.m4

+7-7
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ AC_DEFUN(PHP_IMAP_KRB_CHK, [
5959
fi
6060
6161
for i in $SEARCH_PATHS; do
62-
if test -f $i/lib/libkrb5.a || test -f $i/lib/libkrb5.$SHLIB_SUFFIX_NAME; then
62+
if test -f $i/$PHP_LIBDIR/libkrb5.a || test -f $i/$PHP_LIBDIR/libkrb5.$SHLIB_SUFFIX_NAME; then
6363
PHP_KERBEROS_DIR=$i
6464
break
6565
fi
@@ -72,7 +72,7 @@ AC_DEFUN(PHP_IMAP_KRB_CHK, [
7272
])
7373
fi
7474
AC_DEFINE(HAVE_IMAP_KRB,1,[ ])
75-
PHP_ADD_LIBPATH($PHP_KERBEROS_DIR/lib, IMAP_SHARED_LIBADD)
75+
PHP_ADD_LIBPATH($PHP_KERBEROS_DIR/$PHP_LIBDIR, IMAP_SHARED_LIBADD)
7676
PHP_ADD_LIBRARY(gssapi_krb5, 1, IMAP_SHARED_LIBADD)
7777
PHP_ADD_LIBRARY(krb5, 1, IMAP_SHARED_LIBADD)
7878
PHP_ADD_LIBRARY(k5crypto, 1, IMAP_SHARED_LIBADD)
@@ -104,11 +104,11 @@ AC_DEFUN(PHP_IMAP_SSL_CHK, [
104104
AC_MSG_CHECKING([whether SSL libraries are needed for c-client])
105105
106106
if test "$PHP_IMAP_SSL" != "no"; then
107-
AC_MSG_RESULT([$PHP_IMAP_SSL/lib])
107+
AC_MSG_RESULT([$PHP_IMAP_SSL/$PHP_LIBDIR])
108108
AC_DEFINE(HAVE_IMAP_SSL,1,[ ])
109109
PHP_ADD_LIBRARY_DEFER(ssl, 1, IMAP_SHARED_LIBADD)
110110
PHP_ADD_LIBRARY_DEFER(crypto, 1, IMAP_SHARED_LIBADD)
111-
PHP_ADD_LIBPATH($PHP_IMAP_SSL/lib, IMAP_SHARED_LIBADD)
111+
PHP_ADD_LIBPATH($PHP_IMAP_SSL/$PHP_LIBDIR, IMAP_SHARED_LIBADD)
112112
else
113113
AC_MSG_RESULT(no)
114114
fi
@@ -166,13 +166,13 @@ if test "$PHP_IMAP" != "no"; then
166166

167167
if test -r "$IMAP_DIR/c-client/c-client.a"; then
168168
ln -s "$IMAP_DIR/c-client/c-client.a" "$IMAP_DIR/c-client/libc-client.a" >/dev/null 2>&1
169-
elif test -r "$IMAP_DIR/lib/c-client.a"; then
170-
ln -s "$IMAP_DIR/lib/c-client.a" "$IMAP_DIR/lib/libc-client.a" >/dev/null 2>&1
169+
elif test -r "$IMAP_DIR/$PHP_LIBDIR/c-client.a"; then
170+
ln -s "$IMAP_DIR/$PHP_LIBDIR/c-client.a" "$IMAP_DIR/$PHP_LIBDIR/libc-client.a" >/dev/null 2>&1
171171
fi
172172

173173
for lib in c-client4 c-client imap; do
174174
IMAP_LIB=$lib
175-
IMAP_LIB_CHK(lib)
175+
IMAP_LIB_CHK($PHP_LIBDIR)
176176
IMAP_LIB_CHK(c-client)
177177
done
178178

‎ext/ldap/config.m4

+4-4
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,15 @@ AC_DEFUN(PHP_LDAP_CHECKS, [
66
if test -f $1/include/ldap.h; then
77
LDAP_DIR=$1
88
LDAP_INCDIR=$1/include
9-
LDAP_LIBDIR=$1/lib
9+
LDAP_LIBDIR=$1/$PHP_LIBDIR
1010
elif test -f $1/include/umich-ldap/ldap.h; then
1111
LDAP_DIR=$1
1212
LDAP_INCDIR=$1/include/umich-ldap
13-
LDAP_LIBDIR=$1/lib
13+
LDAP_LIBDIR=$1/$PHP_LIBDIR
1414
elif test -f $1/ldap/public/ldap.h; then
1515
LDAP_DIR=$1
1616
LDAP_INCDIR=$1/ldap/public
17-
LDAP_LIBDIR=$1/lib
17+
LDAP_LIBDIR=$1/$PHP_LIBDIR
1818
fi
1919
])
2020

@@ -39,7 +39,7 @@ AC_DEFUN(PHP_LDAP_SASL_CHECKS, [
3939
4040
if test "$LDAP_SASL_DIR"; then
4141
LDAP_SASL_INCDIR=$LDAP_SASL_DIR/include
42-
LDAP_SASL_LIBDIR=$LDAP_SASL_DIR/lib
42+
LDAP_SASL_LIBDIR=$LDAP_SASL_DIR/$PHP_LIBDIR
4343
else
4444
AC_MSG_ERROR([sasl.h not found!])
4545
fi

‎ext/mbstring/config.m4

+2-2
Original file line numberDiff line numberDiff line change
@@ -225,11 +225,11 @@ AC_DEFUN([PHP_MBSTRING_SETUP_LIBMBFL], [
225225
fi
226226
227227
PHP_CHECK_LIBRARY(mbfl, mbfl_buffer_converter_new, [
228-
PHP_ADD_LIBRARY_WITH_PATH(mbfl, $PHP_LIBMBFL/lib, MBSTRING_SHARED_LIBADD)
228+
PHP_ADD_LIBRARY_WITH_PATH(mbfl, $PHP_LIBMBFL/$PHP_LIBDIR, MBSTRING_SHARED_LIBADD)
229229
],[
230230
AC_MSG_ERROR([Problem with libmbfl. Please check config.log for more information.])
231231
], [
232-
-LPHP_LIBMBFL/lib
232+
-LPHP_LIBMBFL/$PHP_LIBDIR
233233
])
234234
fi
235235
])

‎ext/mysql/config.m4

+3-3
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ if test "$PHP_MYSQL" != "no"; then
8383
Note that the MySQL client library is not bundled anymore.])
8484
fi
8585

86-
for i in lib lib/mysql; do
86+
for i in $PHP_LIBDIR $PHP_LIBDIR/mysql; do
8787
MYSQL_LIB_CHK($i)
8888
done
8989

@@ -99,9 +99,9 @@ Note that the MySQL client library is not bundled anymore.])
9999
PHP_CHECK_LIBRARY(mysqlclient, mysql_error, [], [
100100
AC_MSG_ERROR([mysql configure failed. Please check config.log for more information.])
101101
], [
102-
-L$PHP_ZLIB_DIR/lib -L$MYSQL_LIB_DIR
102+
-L$PHP_ZLIB_DIR/$PHP_LIBDIR -L$MYSQL_LIB_DIR
103103
])
104-
MYSQL_LIBS="-L$PHP_ZLIB_DIR/lib -lz"
104+
MYSQL_LIBS="-L$PHP_ZLIB_DIR/$PHP_LIBDIR -lz"
105105
else
106106
PHP_ADD_LIBRARY(z,, MYSQL_SHARED_LIBADD)
107107
PHP_CHECK_LIBRARY(mysqlclient, mysql_errno, [], [

0 commit comments

Comments
 (0)