diff options
| author | Rasmus Lerdorf <rasmus@php.net> | 2001-08-10 09:05:37 +0000 |
|---|---|---|
| committer | Rasmus Lerdorf <rasmus@php.net> | 2001-08-10 09:05:37 +0000 |
| commit | eee9187ecb6b54a3984c40653df63885d682b0be (patch) | |
| tree | f485cc0460607422da1489bc6e5d582499292b8a | |
| parent | 18c893d0df895bfb51c0305c60d6e09876b1b558 (diff) | |
| download | php-git-eee9187ecb6b54a3984c40653df63885d682b0be.tar.gz | |
The checks were in the wrong order here. sablot depends on expat, so
check for expat first and add -lexpat then check for sablot
| -rw-r--r-- | ext/sablot/config.m4 | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/ext/sablot/config.m4 b/ext/sablot/config.m4 index 52a4a19591..e719434123 100644 --- a/ext/sablot/config.m4 +++ b/ext/sablot/config.m4 @@ -9,6 +9,7 @@ PHP_ARG_WITH(expat-dir, libexpat dir for Sablotron 0.50, if test "$PHP_SABLOT" != "no"; then + PHP_EXTENSION(sablot, $ext_shared) PHP_SUBST(SABLOT_SHARED_LIBADD) @@ -29,9 +30,6 @@ if test "$PHP_SABLOT" != "no"; then 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 @@ -48,6 +46,9 @@ if test "$PHP_SABLOT" != "no"; then 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) if test "$found_iconv" = "no"; then |