cvs: /php4/ext/mhash config.m4 /php4/ext/mcrypt config.m4

sas Mon Mar 27 15:43:00 2000 EDT Modified files: /php4/ext/mhash config.m4 /php4/ext/mcrypt config.m4 Log: Use PHP_ARG_WITH Index: php4/ext/mhash/config.m4 diff -u php4/ext/mhash/config.m4:1.6 php4/ext/mhash/config.m4:1.7 --- php4/ext/mhash/config.m4:1.6 Wed Dec 29 20:52:08 1999 +++ php4/ext/mhash/config.m4 Mon Mar 27 15:43:00 2000 @@ -1,31 +1,25 @@ -dnl $Id: config.m4,v 1.6 1999/12/30 04:52:08 sas Exp $ +dnl $Id: config.m4,v 1.7 2000/03/27 23:43:00 sas Exp $ dnl config.m4 for extension mhash dnl don't forget to call PHP_EXTENSION(mhash) -AC_MSG_CHECKING(for mhash support) -AC_ARG_WITH(mhash, +PHP_ARG_WITH(mhash, for mhash support, [ --with-mhash[=DIR] Include mhash support. DIR is the mhash - install directory.], -[ - if test "$withval" != "no"; then - for i in /usr/local /usr /opt/mhash $withval; do - if test -f $i/include/mhash.h; then - MHASH_DIR=$i - fi - done - if test "$MHASH_DIR" = ""; then - AC_MSG_ERROR(Please reinstall libmhash - I cannot find mhash.h) - fi - AC_ADD_INCLUDE($MHASH_DIR/include) - AC_ADD_LIBRARY_WITH_PATH(mhash, $MHASH_DIR/lib) + install directory.]) - AC_DEFINE(HAVE_LIBMHASH,1,[ ]) +if test "$PHP_MHASH" != "no"; then + for i in /usr/local /usr /opt/mhash $PHP_MHASH; do + if test -f $i/include/mhash.h; then + MHASH_DIR=$i + fi + done - AC_MSG_RESULT(yes) - PHP_EXTENSION(mhash) - else - AC_MSG_RESULT(no) + if test -z "$MHASH_DIR"; then + AC_MSG_ERROR(Please reinstall libmhash - I cannot find mhash.h) fi -],[ - AC_MSG_RESULT(no) -]) + AC_ADD_INCLUDE($MHASH_DIR/include) + AC_ADD_LIBRARY_WITH_PATH(mhash, $MHASH_DIR/lib) + + AC_DEFINE(HAVE_LIBMHASH,1,[ ]) + + PHP_EXTENSION(mhash) +fi Index: php4/ext/mcrypt/config.m4 diff -u php4/ext/mcrypt/config.m4:1.6 php4/ext/mcrypt/config.m4:1.7 --- php4/ext/mcrypt/config.m4:1.6 Wed Dec 29 20:52:07 1999 +++ php4/ext/mcrypt/config.m4 Mon Mar 27 15:43:00 2000 @@ -1,31 +1,26 @@ -dnl $Id: config.m4,v 1.6 1999/12/30 04:52:07 sas Exp $ +dnl $Id: config.m4,v 1.7 2000/03/27 23:43:00 sas Exp $ dnl config.m4 for extension mcrypt dnl don't forget to call PHP_EXTENSION(mcrypt) -AC_MSG_CHECKING(for mcrypt support) -AC_ARG_WITH(mcrypt, +PHP_ARG_WITH(mcrypt, for mcrypt support, [ --with-mcrypt[=DIR] Include mcrypt support. DIR is the mcrypt - install directory.], -[ - if test "$withval" != "no"; then - for i in /usr/local /usr $withval; do - if test -f $i/include/mcrypt.h; then - MCRYPT_DIR=$i - fi - done - if test "$MCRYPT_DIR" = ""; then - AC_MSG_ERROR(Please reinstall libmcrypt - I cannot find mcrypt.h) - fi - AC_ADD_INCLUDE($MCRYPT_DIR/include) - AC_ADD_LIBRARY_WITH_PATH(mcrypt, $MCRYPT_DIR/lib) + install directory.]) - AC_DEFINE(HAVE_LIBMCRYPT,1,[ ]) +if test "$PHP_MCRYPT" != "no"; then + for i in /usr/local /usr $PHP_MCRYPT; do + if test -f $i/include/mcrypt.h; then + MCRYPT_DIR=$i + fi + done - AC_MSG_RESULT(yes) - PHP_EXTENSION(mcrypt) - else - AC_MSG_RESULT(no) + if test -z "$MCRYPT_DIR"; then + AC_MSG_ERROR(Please reinstall libmcrypt - I cannot find mcrypt.h) fi -],[ - AC_MSG_RESULT(no) -]) + + AC_ADD_INCLUDE($MCRYPT_DIR/include) + AC_ADD_LIBRARY_WITH_PATH(mcrypt, $MCRYPT_DIR/lib) + + AC_DEFINE(HAVE_LIBMCRYPT,1,[ ]) + + PHP_EXTENSION(mcrypt) +fi