cvs: php4 /ext/sablot config.m4
| From: | Rasmus Lerdorf | Date: | Fri, 10 Aug 2001 09:05:38 +0000 |
| Subject: | cvs: php4 /ext/sablot config.m4 | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-6692@lists.php.net to get a copy of this message | ||
rasmus Fri Aug 10 05:05:38 2001 EDT
Modified files:
/php4/ext/sablot config.m4
Log:
The checks were in the wrong order here. sablot depends on expat, so
check for expat first and add -lexpat then check for sablot
Index: php4/ext/sablot/config.m4
diff -u php4/ext/sablot/config.m4:1.19 php4/ext/sablot/config.m4:1.20
--- php4/ext/sablot/config.m4:1.19 Sun Jul 1 21:55:42 2001
+++ php4/ext/sablot/config.m4 Fri Aug 10 05:05:37 2001
@@ -1,4 +1,4 @@
-dnl $Id: config.m4,v 1.19 2001/07/02 01:55:42 hirokawa Exp $
+dnl $Id: config.m4,v 1.20 2001/08/10 09:05:37 rasmus Exp $
dnl config.m4 for extension Sablot
PHP_ARG_WITH(sablot, for Sablotron XSL support,
@@ -9,6 +9,7 @@
if test "$PHP_SABLOT" != "no"; then
+
PHP_EXTENSION(sablot, $ext_shared)
PHP_SUBST(SABLOT_SHARED_LIBADD)
@@ -29,9 +30,6 @@
AC_MSG_ERROR(Please reinstall the Sablotron distribution)
fi
- PHP_ADD_INCLUDE($SABLOT_DIR/include)
- PHP_ADD_LIBRARY_WITH_PATH(sablot, $SABLOT_DIR/lib, SABLOT_SHARED_LIBADD)
-
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
@@ -47,6 +45,9 @@
PHP_ADD_LIBRARY(xmlparse)
PHP_ADD_LIBRARY(xmltok)
fi
+
+ PHP_ADD_INCLUDE($SABLOT_DIR/include)
+ PHP_ADD_LIBRARY_WITH_PATH(sablot, $SABLOT_DIR/lib, SABLOT_SHARED_LIBADD)
found_iconv=no
AC_CHECK_LIB(c, iconv_open, found_iconv=yes)