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)

diff --git a/ext/mcrypt/config.m4 b/ext/mcrypt/config.m4
index 67ed516c39e28a72874be7f34b93f482131a6734..649817a76e09ee92c02b4647470d64cf6d4fb197 100644 (file)
--- a/ext/mcrypt/config.m4
+++ b/ext/mcrypt/config.m4
@@ -19,19 +19,23 @@ if test "$PHP_MCRYPT" != "no"; then
 
   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)