diff options
| author | foobar <sniper@php.net> | 2001-05-10 00:55:48 +0000 |
|---|---|---|
| committer | foobar <sniper@php.net> | 2001-05-10 00:55:48 +0000 |
| commit | 14e883c3a0ab9641be5b86836a23eba1f0527208 (patch) | |
| tree | e3b90e10a3f987e7f58e9b96531c6ddc0bc145c2 /ext/mcrypt/config.m4 | |
| parent | 63b3fa262c346fa1d87d64c0022a0c540283439c (diff) | |
| download | php-git-14e883c3a0ab9641be5b86836a23eba1f0527208.tar.gz | |
Cleaned up this a bit..
Diffstat (limited to 'ext/mcrypt/config.m4')
| -rw-r--r-- | ext/mcrypt/config.m4 | 44 |
1 files changed, 22 insertions, 22 deletions
diff --git a/ext/mcrypt/config.m4 b/ext/mcrypt/config.m4 index 58fb050ced..075ef06430 100644 --- a/ext/mcrypt/config.m4 +++ b/ext/mcrypt/config.m4 @@ -1,10 +1,9 @@ +dnl dnl $Id$ -dnl config.m4 for extension mcrypt -dnl don't forget to call PHP_EXTENSION(mcrypt) +dnl PHP_ARG_WITH(mcrypt, for mcrypt support, -[ --with-mcrypt[=DIR] Include mcrypt support. DIR is the mcrypt - install directory.]) +[ --with-mcrypt[=DIR] Include mcrypt support. DIR is the mcrypt install directory.]) if test "$PHP_MCRYPT" != "no"; then for i in /usr/local /usr $PHP_MCRYPT; do @@ -14,29 +13,30 @@ if test "$PHP_MCRYPT" != "no"; then done if test -z "$MCRYPT_DIR"; then - AC_MSG_ERROR(Please reinstall libmcrypt - I cannot find mcrypt.h) + AC_MSG_ERROR(mcrypt.h not found. Please reinstall libmcrypt.) fi - PHP_ADD_INCLUDE($MCRYPT_DIR/include) - PHP_SUBST(MCRYPT_SHARED_LIBADD) - old_LDFLAGS="$LDFLAGS" - LDFLAGS="$LDFLAGS $ld_runpath_switch$MCRYPT_DIR/lib -L$MCRYPT_DIR/lib" - AC_CHECK_LIB(mcrypt, init_mcrypt) - old_LIBS=$LIBS - LIBS="$LIBS -lltdl" - AC_CHECK_LIB(mcrypt, mcrypt_module_open, [LIBS="$LIBS -lltdl"],[ ],) - LIBS=$old_LIBS - LDFLAGS="$old_LDFLAGS" - if test "$ac_cv_lib_mcrypt_mcrypt_module_open" = "yes"; then - PHP_ADD_LIBRARY(ltdl) + AC_CHECK_LIB(mcrypt, mcrypt_module_open, + [ + PHP_ADD_LIBRARY(ltdl,, MCRYPT_SHARED_LIBADD) AC_DEFINE(HAVE_LIBMCRYPT24,1,[ ]) - elif test "$ac_cv_lib_mcrypt_init_mcrypt" = "yes"; then - AC_DEFINE(HAVE_LIBMCRYPT22,1,[ ]) - else - AC_MSG_ERROR(Sorry, I was not able to diagnose which libmcrypt version you have installed.) - fi + ],[ + AC_CHECK_LIB(mcrypt, init_mcrypt, + [ + AC_DEFINE(HAVE_LIBMCRYPT22,1,[ ]) + ],[ + AC_MSG_ERROR(Sorry, I was not able to diagnose which libmcrypt version you have installed.) + ],[ + -L$MCRYPT_DIR/lib + ]) + ],[ + -L$MCRYPT_DIR/lib -lltdl + ]) + PHP_ADD_LIBRARY_WITH_PATH(mcrypt, $MCRYPT_DIR/lib, MCRYPT_SHARED_LIBADD) + PHP_ADD_INCLUDE($MCRYPT_DIR/include) AC_DEFINE(HAVE_LIBMCRYPT,1,[ ]) + PHP_SUBST(MCRYPT_SHARED_LIBADD) PHP_EXTENSION(mcrypt, $ext_shared) fi |