From e4df7dc7bfb596c4da9f8e54214fd60657aa6a98 Mon Sep 17 00:00:00 2001 From: foobar Date: Fri, 7 Sep 2001 00:24:06 +0000 Subject: [PATCH] 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.. :( # --- ext/domxml/config.m4 | 2 +- ext/gd/config.m4 | 8 ++++---- ext/iconv/config.m4 | 2 +- ext/oci8/config.m4 | 6 +++--- ext/oracle/config.m4 | 10 +++++----- ext/sablot/config.m4 | 4 ++-- ext/snmp/config.m4 | 2 +- ext/xml/config.m4 | 2 +- 8 files changed, 18 insertions(+), 18 deletions(-) diff --git a/ext/domxml/config.m4 b/ext/domxml/config.m4 index 4a490e77a1..09320cf4e9 100644 --- a/ext/domxml/config.m4 +++ b/ext/domxml/config.m4 @@ -40,7 +40,7 @@ if test "$PHP_DOM" != "no"; then PHP_DOM_CHECK_VERSION - if test -f $DOMXML_DIR/lib/libxml2.a -o -f $DOMXML_DIR/lib/libxml2.s? ; then + if test -f $DOMXML_DIR/lib/libxml2.a -o -f $DOMXML_DIR/lib/libxml2.$SHLIB_SUFFIX_NAME ; then DOM_LIBNAME=xml2 else DOM_LIBNAME=xml diff --git a/ext/gd/config.m4 b/ext/gd/config.m4 index c4bee5f521..1a089242f6 100644 --- a/ext/gd/config.m4 +++ b/ext/gd/config.m4 @@ -9,7 +9,7 @@ AC_DEFUN(PHP_GD_JPEG,[ if test "$PHP_JPEG_DIR" != "no"; then for i in /usr /usr/local $PHP_JPEG_DIR; do - test -f "$i/lib/libjpeg.s?" -o -f "$i/lib/libjpeg.a" && GD_JPEG_DIR=$i + test -f $i/lib/libjpeg.$SHLIB_SUFFIX_NAME -o -f $i/lib/libjpeg.a && GD_JPEG_DIR=$i done if test -z "$GD_JPEG_DIR"; then @@ -36,7 +36,7 @@ AC_DEFUN(PHP_GD_PNG,[ if test "$PHP_PNG_DIR" != "no"; then for i in /usr /usr/local $PHP_PNG_DIR; do - test -f "$i/lib/libpng.s?" -o -f "$i/lib/libpng.a" && GD_PNG_DIR=$i + test -f $i/lib/libpng.$SHLIB_SUFFIX_NAME -o -f $i/lib/libpng.a && GD_PNG_DIR=$i done if test -z "$GD_PNG_DIR"; then @@ -69,7 +69,7 @@ AC_DEFUN(PHP_GD_XPM,[ if test "$PHP_XPM_DIR" != "no"; then for i in /usr /usr/local /usr/X11R6 $PHP_XPM_DIR; do - test -f "$i/lib/libXpm.s?" -o -f "$i/lib/libXpm.a" && GD_XPM_DIR=$i + test -f $i/lib/libXpm.$SHLIB_SUFFIX_NAME -o -f $i/lib/libXpm.a && GD_XPM_DIR=$i done if test -z "$GD_XPM_DIR"; then @@ -237,7 +237,7 @@ dnl A whole whack of possible places where these might be done for i in lib/gd1.3 lib/gd lib gd1.3 gd ""; do - test -f $PHP_GD/$i/libgd.s? -o -f $PHP_GD/$i/libgd.a && GD_LIB=$PHP_GD/$i + test -f $PHP_GD/$i/libgd.$SHLIB_SUFFIX_NAME -o -f $PHP_GD/$i/libgd.a && GD_LIB=$PHP_GD/$i done if test -n "$GD_INCLUDE" -a -n "$GD_LIB" ; then diff --git a/ext/iconv/config.m4 b/ext/iconv/config.m4 index dfc20ed7cd..39aa64135b 100644 --- a/ext/iconv/config.m4 +++ b/ext/iconv/config.m4 @@ -14,7 +14,7 @@ if test "$PHP_ICONV" != "no"; then AC_MSG_ERROR(Please reinstall the iconv library.) fi - if test -f $ICONV_DIR/lib/libconv.a -o -f $ICONV_DIR/lib/libiconv.s? ; then + if test -f $ICONV_DIR/lib/libconv.a -o -f $ICONV_DIR/lib/libiconv.$SHLIB_SUFFIX_NAME ; then PHP_ADD_LIBRARY_WITH_PATH(iconv, $ICONV_DIR/lib, ICONV_SHARED_LIBADD) AC_CHECK_LIB(iconv, libiconv_open, [ AC_DEFINE(HAVE_ICONV, 1, [ ]) diff --git a/ext/oci8/config.m4 b/ext/oci8/config.m4 index 9c7d422a8c..5473d1f723 100644 --- a/ext/oci8/config.m4 +++ b/ext/oci8/config.m4 @@ -5,11 +5,11 @@ AC_DEFUN(AC_OCI8_VERSION,[ if test -s "$OCI8_DIR/orainst/unix.rgs"; then OCI8_VERSION=`grep '"ocommon"' $OCI8_DIR/orainst/unix.rgs | sed 's/[ ][ ]*/:/g' | cut -d: -f 6 | cut -c 2-4` test -z "$OCI8_VERSION" && OCI8_VERSION=7.3 - elif test -f $OCI8_DIR/lib/libclntsh.s?.9.0; then + elif test -f $OCI8_DIR/lib/libclntsh.$SHLIB_SUFFIX_NAME.9.0; then OCI8_VERSION=9.0 - elif test -f $OCI8_DIR/lib/libclntsh.s?.8.0; then + elif test -f $OCI8_DIR/lib/libclntsh.$SHLIB_SUFFIX_NAME.8.0; then OCI8_VERSION=8.1 - elif test -f $OCI8_DIR/lib/libclntsh.s?.1.0; then + elif test -f $OCI8_DIR/lib/libclntsh.$SHLIB_SUFFIX_NAME.1.0; then OCI8_VERSION=8.0 elif test -f $OCI8_DIR/lib/libclntsh.a; then if test -f $OCI8_DIR/lib/libcore4.a; then diff --git a/ext/oracle/config.m4 b/ext/oracle/config.m4 index 2150b01700..d6eab7b28f 100644 --- a/ext/oracle/config.m4 +++ b/ext/oracle/config.m4 @@ -5,9 +5,9 @@ AC_DEFUN(AC_ORACLE_VERSION,[ if test -s "$ORACLE_DIR/orainst/unix.rgs"; then ORACLE_VERSION=`grep '"ocommon"' $ORACLE_DIR/orainst/unix.rgs | sed 's/[ ][ ]*/:/g' | cut -d: -f 6 | cut -c 2-4` test -z "$ORACLE_VERSION" && ORACLE_VERSION=7.3 - elif test -f $ORACLE_DIR/lib/libclntsh.s?.8.0; then + elif test -f $ORACLE_DIR/lib/libclntsh.$SHLIB_SUFFIX_NAME.8.0; then ORACLE_VERSION=8.1 - elif test -f $ORACLE_DIR/lib/libclntsh.s?.1.0; then + elif test -f $ORACLE_DIR/lib/libclntsh.$SHLIB_SUFFIX_NAME.1.0; then ORACLE_VERSION=8.0 elif test -f $ORACLE_DIR/lib/libclntsh.a; then if test -f $ORACLE_DIR/lib/libcore4.a; then @@ -56,7 +56,7 @@ if test "$PHP_ORACLE" != "no"; then AC_ORACLE_VERSION($ORACLE_DIR) case $ORACLE_VERSION in 7.0|7.1) - if test -f $ORACLE_DIR/lib/liboracle.s?; then + if test -f $ORACLE_DIR/lib/liboracle.$SHLIB_SUFFIX_NAME; then PHP_ADD_LIBRARY_WITH_PATH(oracle, $ORACLE_DIR/lib, ORACLE_SHARED_LIBADD) else PHP_ADD_LIBRARY_WITH_PATH(core, $ORACLE_DIR/lib, ORACLE_SHARED_LIBADD) @@ -85,7 +85,7 @@ if test "$PHP_ORACLE" != "no"; then ;; 7.2) - if test -f $ORACLE_DIR/lib/libclntsh.s?; then + if test -f $ORACLE_DIR/lib/libclntsh.$SHLIB_SUFFIX_NAME; then PHP_ADD_LIBRARY_WITH_PATH(clntsh, $ORACLE_DIR/lib, ORACLE_SHARED_LIBADD) else PHP_ADD_LIBRARY_WITH_PATH(core3, $ORACLE_DIR/lib, ORACLE_SHARED_LIBADD) @@ -106,7 +106,7 @@ if test "$PHP_ORACLE" != "no"; then ;; 7.3) - if test -f $ORACLE_DIR/lib/libclntsh.s?; then + if test -f $ORACLE_DIR/lib/libclntsh.$SHLIB_SUFFIX_NAME; then PHP_ADD_LIBRARY_WITH_PATH(clntsh, $ORACLE_DIR/lib, ORACLE_SHARED_LIBADD) else PHP_ADD_LIBRARY_WITH_PATH(core3, $ORACLE_DIR/lib, ORACLE_SHARED_LIBADD) diff --git a/ext/sablot/config.m4 b/ext/sablot/config.m4 index 12ef1c69a2..72d4836960 100644 --- a/ext/sablot/config.m4 +++ b/ext/sablot/config.m4 @@ -32,7 +32,7 @@ if test "$PHP_SABLOT" != "no"; then testval=no for i in $PHP_EXPAT_DIR $SABLOT_DIR; do - if test -f $i/lib/libexpat.a -o -f $i/lib/libexpat.s?; then + if test -f $i/lib/libexpat.a -o -f $i/lib/libexpat.$SHLIB_SUFFIX_NAME; then AC_DEFINE(HAVE_LIBEXPAT2,1,[ ]) PHP_ADD_LIBRARY_WITH_PATH(expat, $i/lib, SABLOT_SHARED_LIBADD) PHP_ADD_INCLUDE($i/include) @@ -53,7 +53,7 @@ if test "$PHP_SABLOT" != "no"; then AC_CHECK_LIB(c, iconv_open, found_iconv=yes) if test "$found_iconv" = "no"; then for i in /usr /usr/local $ICONV_DIR; do - if test -f $i/lib/libconv.a -o -f $i/lib/libiconv.s?; then + if test -f $i/lib/libconv.a -o -f $i/lib/libiconv.$SHLIB_SUFFIX_NAME; then PHP_ADD_LIBRARY_WITH_PATH(iconv, $i/lib, SABLOT_SHARED_LIBADD) found_iconv=yes fi diff --git a/ext/snmp/config.m4 b/ext/snmp/config.m4 index 2075e3e11f..b941b86011 100644 --- a/ext/snmp/config.m4 +++ b/ext/snmp/config.m4 @@ -19,7 +19,7 @@ PHP_ARG_WITH(snmp,for SNMP support, test -f $i/snmp/include/ucd-snmp/snmp.h && SNMP_INCDIR=$i/snmp/include/ucd-snmp done for i in /usr /usr/snmp /usr/local /usr/local/snmp; do - test -f $i/lib/libsnmp.a -o -f $i/lib/libsnmp.s? && SNMP_LIBDIR=$i/lib + test -f $i/lib/libsnmp.a -o -f $i/lib/libsnmp.$SHLIB_SUFFIX_NAME && SNMP_LIBDIR=$i/lib done else SNMP_INCDIR=$PHP_SNMP/include diff --git a/ext/xml/config.m4 b/ext/xml/config.m4 index e1eaeb0863..cacc65ec52 100644 --- a/ext/xml/config.m4 +++ b/ext/xml/config.m4 @@ -42,7 +42,7 @@ else AC_DEFINE(HAVE_LIBEXPAT, 1, [ ]) for i in $PHP_XML $PHP_EXPAT_DIR; do - if test -f $i/lib/libexpat.a -o -f $i/lib/libexpat.s? ; then + if test -f $i/lib/libexpat.a -o -f $i/lib/libexpat.$SHLIB_SUFFIX_NAME ; then EXPAT_DIR=$i fi done -- 2.50.1