Use PHP_ARG_WITH

diff --git a/ext/mcrypt/config.m4 b/ext/mcrypt/config.m4
index 5066b4ac44ba2c9a0ed0897423e228acb18041e9..7bd7c7314dea45a216e1e741ae8a32f11405fdc6 100644 (file)
--- a/ext/mcrypt/config.m4
+++ b/ext/mcrypt/config.m4
@@ -2,30 +2,25 @@ dnl $Id$
 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

diff --git a/ext/mhash/config.m4 b/ext/mhash/config.m4
index de4bf5d270a74a9d17292c30df835a4d4e47eb17..f1426fbe3ba545dea2f7ed1659dbd6ef7aaff32c 100644 (file)
--- a/ext/mhash/config.m4
+++ b/ext/mhash/config.m4
@@ -2,30 +2,24 @@ dnl $Id$
 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