cvs: php4(PHP_4_0_7) /ext/crack config.m4

sniper Thu Oct 11 20:22:38 2001 EDT Modified files: (Branch: PHP_4_0_7) /php4/ext/crack config.m4 Log: MFH Index: php4/ext/crack/config.m4 diff -u php4/ext/crack/config.m4:1.3 php4/ext/crack/config.m4:1.3.2.1 --- php4/ext/crack/config.m4:1.3 Sat Jul 28 03:09:42 2001 +++ php4/ext/crack/config.m4 Thu Oct 11 20:22:38 2001 @@ -1,23 +1,22 @@ -dnl $Id: config.m4,v 1.3 2001/07/28 07:09:42 sasha Exp $ +dnl $Id: config.m4,v 1.3.2.1 2001/10/12 00:22:38 sniper Exp $ 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 @@ 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)