Hannes Magnusson kirjoitti:
2008/6/28 Scott MacVicar <[EMAIL PROTECTED]>:
scottmac Sat Jun 28 15:20:49 2008 UTC
Removed files:
/php-src/ext/mhash mhash.dsp
/php-src/ext/mhash/tests 001.phpt 002.phpt 003.phpt skip.inc
Modified files:
/php-src/ext/hash CREDITS config.m4 hash.c
/php-src/ext/hash/tests mhash_001.phpt mhash_002.phpt
mhash_003.phpt skip_mhash.inc
/php-src/ext/mhash config.m4 mhash.c php_mhash.h
Log:
MFB: Make the old mhash API a wrapper around hash, this removes a dependency.
+++ php-src/ext/hash/config.m4 Sat Jun 28 15:20:49 2008
@@ -1,9 +1,17 @@
-dnl $Id: config.m4,v 1.12 2007/07/03 17:24:36 sniper Exp $
+dnl $Id: config.m4,v 1.13 2008/06/28 15:20:49 scottmac Exp $
dnl config.m4 for extension hash
PHP_ARG_ENABLE(hash, whether to enable hash support,
[ --disable-hash Disable hash support], yes)
+if test "$PHP_MHASH" != "no"; then
+ if test "$PHP_HASH" == "no"; then
+ PHP_HASH="yes"
+ fi
+
+ AC_DEFINE(PHP_MHASH_BC, 1, [ ])
+fi
+
Will $PHP_MHASH ever be anything here?
afaict ext/hash cannot be disabled after this change
-Hannes
I wasn't paying attention to this..what was done for ext/mhash/config.m4? :)
And == is not correct. It's just one = in m4.
Anyway, IMO, you could simply move ext/mhash/*mhash.* (.c and .h files :) to
ext/hash and simply include them with the hash sources. There's really no need
anymore for the extra directory.
--Jani
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
