diff options
| -rw-r--r-- | ext/crack/config.m4 | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/ext/crack/config.m4 b/ext/crack/config.m4 index be7313f615..0f60b4c46a 100644 --- a/ext/crack/config.m4 +++ b/ext/crack/config.m4 @@ -4,20 +4,19 @@ PHP_ARG_WITH(crack, whether to include crack support, [ --with-crack[=DIR] Include crack support.]) if test "$PHP_CRACK" != "no"; then + for i in /usr/local/lib /usr/lib $PHP_CRACK $PHP_CRACK/cracklib; do - if test -f $i/libcrack.a; then - CRACK_LIBDIR=$i - fi + test -f $i/lib/libcrack.$SHLIB_SUFFIX_NAME -o -f $i/lib/libcrack.a && CRACK_LIBDIR=$i done + for i in /usr/local/include /usr/include $PHP_CRACK $PHP_CRACK/cracklib; do - if test -f $i/packer.h; then - CRACK_INCLUDEDIR=$i - fi + test -f $i/packer.h && CRACK_INCLUDEDIR=$i done if test -z "$CRACK_LIBDIR"; then AC_MSG_ERROR(Cannot find the cracklib library file) fi + if test -z "$CRACK_INCLUDEDIR"; then AC_MSG_ERROR(Cannot find a cracklib header file) fi @@ -26,8 +25,7 @@ if test "$PHP_CRACK" != "no"; then PHP_ADD_LIBRARY_WITH_PATH(crack, $CRACK_LIBDIR, CRACK_SHARED_LIBADD) PHP_EXTENSION(crack, $ext_shared) - + PHP_SUBST(CRACK_SHARED_LIBADD) AC_DEFINE(HAVE_CRACK, 1, [ ]) fi -PHP_SUBST(CRACK_SHARED_LIBADD) |