Skip to content

Commit e4df7dc

Browse files
author
foobar
committed
if test -f /usr/local/lib/libexample.s?; then <-- no workie
if test -f /usr/local/lib/libexample.so; then <-- workie # # You can all point at me and laugh now.. :( #
1 parent f6dfcb5 commit e4df7dc

File tree

8 files changed

+18
-18
lines changed

8 files changed

+18
-18
lines changed

‎ext/domxml/config.m4

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ if test "$PHP_DOM" != "no"; then
4040

4141
PHP_DOM_CHECK_VERSION
4242

43-
if test -f $DOMXML_DIR/lib/libxml2.a -o -f $DOMXML_DIR/lib/libxml2.s? ; then
43+
if test -f $DOMXML_DIR/lib/libxml2.a -o -f $DOMXML_DIR/lib/libxml2.$SHLIB_SUFFIX_NAME ; then
4444
DOM_LIBNAME=xml2
4545
else
4646
DOM_LIBNAME=xml

‎ext/gd/config.m4

+4-4
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ AC_DEFUN(PHP_GD_JPEG,[
99
if test "$PHP_JPEG_DIR" != "no"; then
1010
1111
for i in /usr /usr/local $PHP_JPEG_DIR; do
12-
test -f "$i/lib/libjpeg.s?" -o -f "$i/lib/libjpeg.a" && GD_JPEG_DIR=$i
12+
test -f $i/lib/libjpeg.$SHLIB_SUFFIX_NAME -o -f $i/lib/libjpeg.a && GD_JPEG_DIR=$i
1313
done
1414
1515
if test -z "$GD_JPEG_DIR"; then
@@ -36,7 +36,7 @@ AC_DEFUN(PHP_GD_PNG,[
3636
if test "$PHP_PNG_DIR" != "no"; then
3737
3838
for i in /usr /usr/local $PHP_PNG_DIR; do
39-
test -f "$i/lib/libpng.s?" -o -f "$i/lib/libpng.a" && GD_PNG_DIR=$i
39+
test -f $i/lib/libpng.$SHLIB_SUFFIX_NAME -o -f $i/lib/libpng.a && GD_PNG_DIR=$i
4040
done
4141
4242
if test -z "$GD_PNG_DIR"; then
@@ -69,7 +69,7 @@ AC_DEFUN(PHP_GD_XPM,[
6969
if test "$PHP_XPM_DIR" != "no"; then
7070
7171
for i in /usr /usr/local /usr/X11R6 $PHP_XPM_DIR; do
72-
test -f "$i/lib/libXpm.s?" -o -f "$i/lib/libXpm.a" && GD_XPM_DIR=$i
72+
test -f $i/lib/libXpm.$SHLIB_SUFFIX_NAME -o -f $i/lib/libXpm.a && GD_XPM_DIR=$i
7373
done
7474
7575
if test -z "$GD_XPM_DIR"; then
@@ -237,7 +237,7 @@ dnl A whole whack of possible places where these might be
237237
done
238238

239239
for i in lib/gd1.3 lib/gd lib gd1.3 gd ""; do
240-
test -f $PHP_GD/$i/libgd.s? -o -f $PHP_GD/$i/libgd.a && GD_LIB=$PHP_GD/$i
240+
test -f $PHP_GD/$i/libgd.$SHLIB_SUFFIX_NAME -o -f $PHP_GD/$i/libgd.a && GD_LIB=$PHP_GD/$i
241241
done
242242

243243
if test -n "$GD_INCLUDE" -a -n "$GD_LIB" ; then

‎ext/iconv/config.m4

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ if test "$PHP_ICONV" != "no"; then
1414
AC_MSG_ERROR(Please reinstall the iconv library.)
1515
fi
1616

17-
if test -f $ICONV_DIR/lib/libconv.a -o -f $ICONV_DIR/lib/libiconv.s? ; then
17+
if test -f $ICONV_DIR/lib/libconv.a -o -f $ICONV_DIR/lib/libiconv.$SHLIB_SUFFIX_NAME ; then
1818
PHP_ADD_LIBRARY_WITH_PATH(iconv, $ICONV_DIR/lib, ICONV_SHARED_LIBADD)
1919
AC_CHECK_LIB(iconv, libiconv_open, [
2020
AC_DEFINE(HAVE_ICONV, 1, [ ])

‎ext/oci8/config.m4

+3-3
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@ AC_DEFUN(AC_OCI8_VERSION,[
55
if test -s "$OCI8_DIR/orainst/unix.rgs"; then
66
OCI8_VERSION=`grep '"ocommon"' $OCI8_DIR/orainst/unix.rgs | sed 's/[ ][ ]*/:/g' | cut -d: -f 6 | cut -c 2-4`
77
test -z "$OCI8_VERSION" && OCI8_VERSION=7.3
8-
elif test -f $OCI8_DIR/lib/libclntsh.s?.9.0; then
8+
elif test -f $OCI8_DIR/lib/libclntsh.$SHLIB_SUFFIX_NAME.9.0; then
99
OCI8_VERSION=9.0
10-
elif test -f $OCI8_DIR/lib/libclntsh.s?.8.0; then
10+
elif test -f $OCI8_DIR/lib/libclntsh.$SHLIB_SUFFIX_NAME.8.0; then
1111
OCI8_VERSION=8.1
12-
elif test -f $OCI8_DIR/lib/libclntsh.s?.1.0; then
12+
elif test -f $OCI8_DIR/lib/libclntsh.$SHLIB_SUFFIX_NAME.1.0; then
1313
OCI8_VERSION=8.0
1414
elif test -f $OCI8_DIR/lib/libclntsh.a; then
1515
if test -f $OCI8_DIR/lib/libcore4.a; then

‎ext/oracle/config.m4

+5-5
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ AC_DEFUN(AC_ORACLE_VERSION,[
55
if test -s "$ORACLE_DIR/orainst/unix.rgs"; then
66
ORACLE_VERSION=`grep '"ocommon"' $ORACLE_DIR/orainst/unix.rgs | sed 's/[ ][ ]*/:/g' | cut -d: -f 6 | cut -c 2-4`
77
test -z "$ORACLE_VERSION" && ORACLE_VERSION=7.3
8-
elif test -f $ORACLE_DIR/lib/libclntsh.s?.8.0; then
8+
elif test -f $ORACLE_DIR/lib/libclntsh.$SHLIB_SUFFIX_NAME.8.0; then
99
ORACLE_VERSION=8.1
10-
elif test -f $ORACLE_DIR/lib/libclntsh.s?.1.0; then
10+
elif test -f $ORACLE_DIR/lib/libclntsh.$SHLIB_SUFFIX_NAME.1.0; then
1111
ORACLE_VERSION=8.0
1212
elif test -f $ORACLE_DIR/lib/libclntsh.a; then
1313
if test -f $ORACLE_DIR/lib/libcore4.a; then
@@ -56,7 +56,7 @@ if test "$PHP_ORACLE" != "no"; then
5656
AC_ORACLE_VERSION($ORACLE_DIR)
5757
case $ORACLE_VERSION in
5858
7.0|7.1)
59-
if test -f $ORACLE_DIR/lib/liboracle.s?; then
59+
if test -f $ORACLE_DIR/lib/liboracle.$SHLIB_SUFFIX_NAME; then
6060
PHP_ADD_LIBRARY_WITH_PATH(oracle, $ORACLE_DIR/lib, ORACLE_SHARED_LIBADD)
6161
else
6262
PHP_ADD_LIBRARY_WITH_PATH(core, $ORACLE_DIR/lib, ORACLE_SHARED_LIBADD)
@@ -85,7 +85,7 @@ if test "$PHP_ORACLE" != "no"; then
8585
;;
8686

8787
7.2)
88-
if test -f $ORACLE_DIR/lib/libclntsh.s?; then
88+
if test -f $ORACLE_DIR/lib/libclntsh.$SHLIB_SUFFIX_NAME; then
8989
PHP_ADD_LIBRARY_WITH_PATH(clntsh, $ORACLE_DIR/lib, ORACLE_SHARED_LIBADD)
9090
else
9191
PHP_ADD_LIBRARY_WITH_PATH(core3, $ORACLE_DIR/lib, ORACLE_SHARED_LIBADD)
@@ -106,7 +106,7 @@ if test "$PHP_ORACLE" != "no"; then
106106
;;
107107

108108
7.3)
109-
if test -f $ORACLE_DIR/lib/libclntsh.s?; then
109+
if test -f $ORACLE_DIR/lib/libclntsh.$SHLIB_SUFFIX_NAME; then
110110
PHP_ADD_LIBRARY_WITH_PATH(clntsh, $ORACLE_DIR/lib, ORACLE_SHARED_LIBADD)
111111
else
112112
PHP_ADD_LIBRARY_WITH_PATH(core3, $ORACLE_DIR/lib, ORACLE_SHARED_LIBADD)

‎ext/sablot/config.m4

+2-2
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ if test "$PHP_SABLOT" != "no"; then
3232

3333
testval=no
3434
for i in $PHP_EXPAT_DIR $SABLOT_DIR; do
35-
if test -f $i/lib/libexpat.a -o -f $i/lib/libexpat.s?; then
35+
if test -f $i/lib/libexpat.a -o -f $i/lib/libexpat.$SHLIB_SUFFIX_NAME; then
3636
AC_DEFINE(HAVE_LIBEXPAT2,1,[ ])
3737
PHP_ADD_LIBRARY_WITH_PATH(expat, $i/lib, SABLOT_SHARED_LIBADD)
3838
PHP_ADD_INCLUDE($i/include)
@@ -53,7 +53,7 @@ if test "$PHP_SABLOT" != "no"; then
5353
AC_CHECK_LIB(c, iconv_open, found_iconv=yes)
5454
if test "$found_iconv" = "no"; then
5555
for i in /usr /usr/local $ICONV_DIR; do
56-
if test -f $i/lib/libconv.a -o -f $i/lib/libiconv.s?; then
56+
if test -f $i/lib/libconv.a -o -f $i/lib/libiconv.$SHLIB_SUFFIX_NAME; then
5757
PHP_ADD_LIBRARY_WITH_PATH(iconv, $i/lib, SABLOT_SHARED_LIBADD)
5858
found_iconv=yes
5959
fi

‎ext/snmp/config.m4

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ PHP_ARG_WITH(snmp,for SNMP support,
1919
test -f $i/snmp/include/ucd-snmp/snmp.h && SNMP_INCDIR=$i/snmp/include/ucd-snmp
2020
done
2121
for i in /usr /usr/snmp /usr/local /usr/local/snmp; do
22-
test -f $i/lib/libsnmp.a -o -f $i/lib/libsnmp.s? && SNMP_LIBDIR=$i/lib
22+
test -f $i/lib/libsnmp.a -o -f $i/lib/libsnmp.$SHLIB_SUFFIX_NAME && SNMP_LIBDIR=$i/lib
2323
done
2424
else
2525
SNMP_INCDIR=$PHP_SNMP/include

‎ext/xml/config.m4

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ else
4242
AC_DEFINE(HAVE_LIBEXPAT, 1, [ ])
4343

4444
for i in $PHP_XML $PHP_EXPAT_DIR; do
45-
if test -f $i/lib/libexpat.a -o -f $i/lib/libexpat.s? ; then
45+
if test -f $i/lib/libexpat.a -o -f $i/lib/libexpat.$SHLIB_SUFFIX_NAME ; then
4646
EXPAT_DIR=$i
4747
fi
4848
done

0 commit comments

Comments
 (0)