mirror of
https://github.com/php/php-src.git
synced 2024-09-22 18:37:25 +00:00
The checks were in the wrong order here. sablot depends on expat, so
check for expat first and add -lexpat then check for sablot
This commit is contained in:
parent
18c893d0df
commit
eee9187ecb
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user