cvs: php4(PHP_4_2_0) /ext/xslt config.m4
| From: | Jani Taskinen | Date: | Thu, 02 May 2002 10:21:51 +0000 |
| Subject: | cvs: php4(PHP_4_2_0) /ext/xslt config.m4 | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-11618@lists.php.net to get a copy of this message | ||
sniper Thu May 2 06:21:51 2002 EDT
Modified files: (Branch: PHP_4_2_0)
/php4/ext/xslt config.m4
Log:
Added the usual search paths where to look for expat.
Index: php4/ext/xslt/config.m4
diff -u php4/ext/xslt/config.m4:1.14.2.5 php4/ext/xslt/config.m4:1.14.2.6
--- php4/ext/xslt/config.m4:1.14.2.5 Tue Apr 16 06:12:57 2002
+++ php4/ext/xslt/config.m4 Thu May 2 06:21:51 2002
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.14.2.5 2002/04/16 10:12:57 derick Exp $
+dnl $Id: config.m4,v 1.14.2.6 2002/05/02 10:21:51 sniper Exp $
dnl
dnl +------------------------------------------------------------------------------+
dnl | This is where the magic of the extension reallly is. Depending on what |
@@ -55,12 +55,13 @@
if test "$PHP_XSLT_SABLOT" != "no"; then
found_expat=no
- for i in $PHP_EXPAT_DIR $XSLT_DIR; do
+ for i in $PHP_EXPAT_DIR $XSLT_DIR /usr/local /usr; do
if test -f $i/lib/libexpat.a -o -f $i/lib/libexpat.$SHLIB_SUFFIX_NAME; then
AC_DEFINE(HAVE_LIBEXPAT2, 1, [ ])
PHP_ADD_INCLUDE($i/include)
PHP_ADD_LIBRARY_WITH_PATH(expat, $i/lib, XSLT_SHARED_LIBADD)
found_expat=yes
+ break
fi
done
@@ -72,6 +73,7 @@
if test "$PHP_ICONV" = "no"; then
PHP_ICONV=yes
fi
+
PHP_SETUP_ICONV(XSLT_SHARED_LIBADD, [], [
AC_MSG_ERROR([iconv not found, in order to build sablotron you need the iconv library])
])