cvs: php4 /ext/mcrypt config.m4

sas Mon Aug 14 12:17:17 2000 EDT Modified files: /php4/ext/mcrypt config.m4 Log: Fix check for libmcrypt in non-system library paths. Fix case where neither libmcrypt 2.4.x and 2.2.x were found. Fix library order (scope limited to static libraries) Index: php4/ext/mcrypt/config.m4 diff -u php4/ext/mcrypt/config.m4:1.10 php4/ext/mcrypt/config.m4:1.11 --- php4/ext/mcrypt/config.m4:1.10 Fri Aug 11 11:45:17 2000 +++ php4/ext/mcrypt/config.m4 Mon Aug 14 12:17:16 2000 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.10 2000/08/11 18:45:17 derick Exp $ +dnl $Id: config.m4,v 1.11 2000/08/14 19:17:16 sas Exp $ dnl config.m4 for extension mcrypt dnl don't forget to call PHP_EXTENSION(mcrypt) @@ -19,19 +19,23 @@ AC_ADD_INCLUDE($MCRYPT_DIR/include) PHP_SUBST(MCRYPT_SHARED_LIBADD) - AC_CHECK_LIB(mcrypt, init_mcrypt, [ AC_DEFINE(HAVE_LIBMCRYPT22,1,[ ]) ]) + old_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 - AC_ADD_LIBRARY_WITH_PATH(mcrypt, $MCRYPT_DIR/lib, MCRYPT_SHARED_LIBADD) + LDFLAGS="$old_LDFLAGS" if test "$ac_cv_lib_mcrypt_init_mcrypt" = "yes"; then AC_DEFINE(HAVE_LIBMCRYPT22,1,[ ]) - fi - if test "$ac_cv_lib_mcrypt_mcrypt_module_open" = "yes"; then + elif test "$ac_cv_lib_mcrypt_mcrypt_module_open" = "yes"; then AC_ADD_LIBRARY(ltdl) AC_DEFINE(HAVE_LIBMCRYPT24,1,[ ]) + else + AC_MSG_ERROR(Sorry, I was not able to diagnose which libmcrypt version you have installed.) fi + AC_ADD_LIBRARY_WITH_PATH(mcrypt, $MCRYPT_DIR/lib, MCRYPT_SHARED_LIBADD) AC_DEFINE(HAVE_LIBMCRYPT,1,[ ]) PHP_EXTENSION(mcrypt, $ext_shared)