MFH: Fixed #45911 (Cannot disable ext/hash)

diff --git a/NEWS b/NEWS
index 5cf88c0e8e5c055e76b20a86685c729b109f1e11..85af09f99360cea507f93500c63698355b97aede 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,7 @@
 PHP                                                                        NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 ?? ??? 200?, PHP 5.3.0 Alpha 3
+- Fixed bug #45911 (Cannot disable ext/hash). (Arnaud)
 
 02 Sep 2008, PHP 5.3.0 Alpha 2
 - Removed special treatment of "/tmp" in sessions for open_basedir.

diff --git a/ext/hash/config.m4 b/ext/hash/config.m4
index 1c61b89b047ff7039c71682a03ccbefe32b15fd3..dd4b275c6964d8bbd4cc28c2b6356910275b9b11 100644 (file)
--- a/ext/hash/config.m4
+++ b/ext/hash/config.m4
@@ -1,6 +1,9 @@
 dnl $Id$
 dnl config.m4 for extension hash
 
+PHP_ARG_WITH(mhash, for mhash support,
+[  --with-mhash[=DIR]      Include mhash support])
+
 PHP_ARG_ENABLE(hash, whether to enable hash support,
 [  --disable-hash          Disable hash support], yes)
 

diff --git a/ext/mhash/config.m4 b/ext/mhash/config.m4
index 358fae47268d95b8734bb534f51077e2a776ccab..167184291e669ebf8a21893ac4a5182ca8c2c879 100644 (file)
--- a/ext/mhash/config.m4
+++ b/ext/mhash/config.m4
@@ -2,9 +2,6 @@ dnl
 dnl $Id$
 dnl
 
-PHP_ARG_WITH(mhash, for mhash support,
-[  --with-mhash[=DIR]      Include mhash support])
-
 if test "$PHP_MHASH" != "no"; then
   PHP_NEW_EXTENSION(mhash, mhash.c, $ext_shared)
   PHP_SUBST(MHASH_SHARED_LIBADD)