cvs: php4 /ext/domxml config.m4 /ext/gd config.m4 /ext/iconv config.m4 /ext/oci8 config.m4 /ext/oracle config.m4 /ext/sablot config.m4 /ext/snmp
config.m4 /ext/xml config.m4
| From: | Jani Taskinen | Date: | Fri, 07 Sep 2001 00:24:08 +0000 |
| Subject: | cvs: php4 /ext/domxml config.m4 /ext/gd config.m4 /ext/iconv config.m4 /ext/oci8 config.m4 /ext/oracle config.m4 /ext/sablot config.m4 /ext/snmp config.m4 /ext/xml config.m4 |
||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-7262@lists.php.net to get a copy of this message | ||
sniper Thu Sep 6 20:24:08 2001 EDT
Modified files:
/php4/ext/domxml config.m4
/php4/ext/gd config.m4
/php4/ext/iconv config.m4
/php4/ext/oci8 config.m4
/php4/ext/oracle config.m4
/php4/ext/sablot config.m4
/php4/ext/snmp config.m4
/php4/ext/xml config.m4
Log:
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.. :(
#
Index: php4/ext/domxml/config.m4 diff -u php4/ext/domxml/config.m4:1.27 php4/ext/domxml/config.m4:1.28 --- php4/ext/domxml/config.m4:1.27 Sat Aug 18 17:08:52 2001 +++ php4/ext/domxml/config.m4 Thu Sep 6 20:24:01 2001 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.27 2001/08/18 21:08:52 sniper Exp $ +dnl $Id: config.m4,v 1.28 2001/09/07 00:24:01 sniper Exp $ dnl config.m4 for extension domxml AC_DEFUN(PHP_DOM_CHECK_VERSION,[ @@ -40,7 +40,7 @@ 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 Index: php4/ext/gd/config.m4 diff -u php4/ext/gd/config.m4:1.76 php4/ext/gd/config.m4:1.77 --- php4/ext/gd/config.m4:1.76 Thu Sep 6 19:10:36 2001 +++ php4/ext/gd/config.m4 Thu Sep 6 20:24:03 2001 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.76 2001/09/06 23:10:36 sniper Exp $ +dnl $Id: config.m4,v 1.77 2001/09/07 00:24:03 sniper Exp $ dnl AC_DEFUN(PHP_GD_JPEG,[ @@ -9,7 +9,7 @@ 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 @@ 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 @@ 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 @@ 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 Index: php4/ext/iconv/config.m4 diff -u php4/ext/iconv/config.m4:1.5 php4/ext/iconv/config.m4:1.6 --- php4/ext/iconv/config.m4:1.5 Fri Aug 17 02:54:55 2001 +++ php4/ext/iconv/config.m4 Thu Sep 6 20:24:04 2001 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.5 2001/08/17 06:54:55 sniper Exp $ +dnl $Id: config.m4,v 1.6 2001/09/07 00:24:04 sniper Exp $ dnl config.m4 for extension iconv PHP_ARG_WITH(iconv, for iconv support, @@ -14,7 +14,7 @@ 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, [ ]) Index: php4/ext/oci8/config.m4 diff -u php4/ext/oci8/config.m4:1.31 php4/ext/oci8/config.m4:1.32 --- php4/ext/oci8/config.m4:1.31 Thu Jul 26 19:07:45 2001 +++ php4/ext/oci8/config.m4 Thu Sep 6 20:24:04 2001 @@ -1,15 +1,15 @@ -dnl $Id: config.m4,v 1.31 2001/07/26 23:07:45 thies Exp $ +dnl $Id: config.m4,v 1.32 2001/09/07 00:24:04 sniper Exp $ AC_DEFUN(AC_OCI8_VERSION,[ AC_MSG_CHECKING([Oracle 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 Index: php4/ext/oracle/config.m4 diff -u php4/ext/oracle/config.m4:1.25 php4/ext/oracle/config.m4:1.26 --- php4/ext/oracle/config.m4:1.25 Sat Jun 23 06:20:58 2001 +++ php4/ext/oracle/config.m4 Thu Sep 6 20:24:05 2001 @@ -1,13 +1,13 @@ -dnl $Id: config.m4,v 1.25 2001/06/23 10:20:58 sniper Exp $ +dnl $Id: config.m4,v 1.26 2001/09/07 00:24:05 sniper Exp $ AC_DEFUN(AC_ORACLE_VERSION,[ AC_MSG_CHECKING([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 @@ 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 @@ ;; 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 @@ ;; 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) Index: php4/ext/sablot/config.m4 diff -u php4/ext/sablot/config.m4:1.21 php4/ext/sablot/config.m4:1.22 --- php4/ext/sablot/config.m4:1.21 Fri Aug 17 04:33:48 2001 +++ php4/ext/sablot/config.m4 Thu Sep 6 20:24:05 2001 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.21 2001/08/17 08:33:48 sniper Exp $ +dnl $Id: config.m4,v 1.22 2001/09/07 00:24:05 sniper Exp $ dnl config.m4 for extension Sablot PHP_ARG_WITH(sablot, for Sablotron XSL support, @@ -32,7 +32,7 @@ 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 @@ 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 Index: php4/ext/snmp/config.m4 diff -u php4/ext/snmp/config.m4:1.21 php4/ext/snmp/config.m4:1.22 --- php4/ext/snmp/config.m4:1.21 Mon Aug 20 10:04:48 2001 +++ php4/ext/snmp/config.m4 Thu Sep 6 20:24:05 2001 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.21 2001/08/20 14:04:48 sniper Exp $ +dnl $Id: config.m4,v 1.22 2001/09/07 00:24:05 sniper Exp $ dnl PHP_ARG_WITH(snmp,for SNMP support, @@ -19,7 +19,7 @@ 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 Index: php4/ext/xml/config.m4 diff -u php4/ext/xml/config.m4:1.31 php4/ext/xml/config.m4:1.32 --- php4/ext/xml/config.m4:1.31 Sun Jun 3 13:11:05 2001 +++ php4/ext/xml/config.m4 Thu Sep 6 20:24:06 2001 @@ -1,5 +1,5 @@ # $Source: /usr/repository/php4/ext/xml/config.m4,v $ -# $Id: config.m4,v 1.31 2001/06/03 17:11:05 sas Exp $ +# $Id: config.m4,v 1.32 2001/09/07 00:24:06 sniper Exp $ dnl Fallback for --with-xml[=DIR] AC_ARG_WITH(xml,[],enable_xml=$withval) @@ -42,7 +42,7 @@ 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
Index: php4/ext/domxml/config.m4 diff -u php4/ext/domxml/config.m4:1.27 php4/ext/domxml/config.m4:1.28 --- php4/ext/domxml/config.m4:1.27 Sat Aug 18 17:08:52 2001 +++ php4/ext/domxml/config.m4 Thu Sep 6 20:24:01 2001 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.27 2001/08/18 21:08:52 sniper Exp $ +dnl $Id: config.m4,v 1.28 2001/09/07 00:24:01 sniper Exp $ dnl config.m4 for extension domxml AC_DEFUN(PHP_DOM_CHECK_VERSION,[ @@ -40,7 +40,7 @@ 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 Index: php4/ext/gd/config.m4 diff -u php4/ext/gd/config.m4:1.76 php4/ext/gd/config.m4:1.77 --- php4/ext/gd/config.m4:1.76 Thu Sep 6 19:10:36 2001 +++ php4/ext/gd/config.m4 Thu Sep 6 20:24:03 2001 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.76 2001/09/06 23:10:36 sniper Exp $ +dnl $Id: config.m4,v 1.77 2001/09/07 00:24:03 sniper Exp $ dnl AC_DEFUN(PHP_GD_JPEG,[ @@ -9,7 +9,7 @@ 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 @@ 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 @@ 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 @@ 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 Index: php4/ext/iconv/config.m4 diff -u php4/ext/iconv/config.m4:1.5 php4/ext/iconv/config.m4:1.6 --- php4/ext/iconv/config.m4:1.5 Fri Aug 17 02:54:55 2001 +++ php4/ext/iconv/config.m4 Thu Sep 6 20:24:04 2001 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.5 2001/08/17 06:54:55 sniper Exp $ +dnl $Id: config.m4,v 1.6 2001/09/07 00:24:04 sniper Exp $ dnl config.m4 for extension iconv PHP_ARG_WITH(iconv, for iconv support, @@ -14,7 +14,7 @@ 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, [ ]) Index: php4/ext/oci8/config.m4 diff -u php4/ext/oci8/config.m4:1.31 php4/ext/oci8/config.m4:1.32 --- php4/ext/oci8/config.m4:1.31 Thu Jul 26 19:07:45 2001 +++ php4/ext/oci8/config.m4 Thu Sep 6 20:24:04 2001 @@ -1,15 +1,15 @@ -dnl $Id: config.m4,v 1.31 2001/07/26 23:07:45 thies Exp $ +dnl $Id: config.m4,v 1.32 2001/09/07 00:24:04 sniper Exp $ AC_DEFUN(AC_OCI8_VERSION,[ AC_MSG_CHECKING([Oracle 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 Index: php4/ext/oracle/config.m4 diff -u php4/ext/oracle/config.m4:1.25 php4/ext/oracle/config.m4:1.26 --- php4/ext/oracle/config.m4:1.25 Sat Jun 23 06:20:58 2001 +++ php4/ext/oracle/config.m4 Thu Sep 6 20:24:05 2001 @@ -1,13 +1,13 @@ -dnl $Id: config.m4,v 1.25 2001/06/23 10:20:58 sniper Exp $ +dnl $Id: config.m4,v 1.26 2001/09/07 00:24:05 sniper Exp $ AC_DEFUN(AC_ORACLE_VERSION,[ AC_MSG_CHECKING([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 @@ 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 @@ ;; 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 @@ ;; 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) Index: php4/ext/sablot/config.m4 diff -u php4/ext/sablot/config.m4:1.21 php4/ext/sablot/config.m4:1.22 --- php4/ext/sablot/config.m4:1.21 Fri Aug 17 04:33:48 2001 +++ php4/ext/sablot/config.m4 Thu Sep 6 20:24:05 2001 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.21 2001/08/17 08:33:48 sniper Exp $ +dnl $Id: config.m4,v 1.22 2001/09/07 00:24:05 sniper Exp $ dnl config.m4 for extension Sablot PHP_ARG_WITH(sablot, for Sablotron XSL support, @@ -32,7 +32,7 @@ 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 @@ 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 Index: php4/ext/snmp/config.m4 diff -u php4/ext/snmp/config.m4:1.21 php4/ext/snmp/config.m4:1.22 --- php4/ext/snmp/config.m4:1.21 Mon Aug 20 10:04:48 2001 +++ php4/ext/snmp/config.m4 Thu Sep 6 20:24:05 2001 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.21 2001/08/20 14:04:48 sniper Exp $ +dnl $Id: config.m4,v 1.22 2001/09/07 00:24:05 sniper Exp $ dnl PHP_ARG_WITH(snmp,for SNMP support, @@ -19,7 +19,7 @@ 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 Index: php4/ext/xml/config.m4 diff -u php4/ext/xml/config.m4:1.31 php4/ext/xml/config.m4:1.32 --- php4/ext/xml/config.m4:1.31 Sun Jun 3 13:11:05 2001 +++ php4/ext/xml/config.m4 Thu Sep 6 20:24:06 2001 @@ -1,5 +1,5 @@ # $Source: /usr/repository/php4/ext/xml/config.m4,v $ -# $Id: config.m4,v 1.31 2001/06/03 17:11:05 sas Exp $ +# $Id: config.m4,v 1.32 2001/09/07 00:24:06 sniper Exp $ dnl Fallback for --with-xml[=DIR] AC_ARG_WITH(xml,[],enable_xml=$withval) @@ -42,7 +42,7 @@ 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