scottmac Sat Jun 28 15:31:50 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/hash config.w32
/php-src/ext/mhash config.w32
Log:
MFH: Sort Windows changes for mhash BC layer
http://cvs.php.net/viewvc.cgi/php-src/ext/hash/config.w32?r1=1.8.2.3&r2=1.8.2.3.4.1&diff_format=u
Index: php-src/ext/hash/config.w32
diff -u php-src/ext/hash/config.w32:1.8.2.3
php-src/ext/hash/config.w32:1.8.2.3.4.1
--- php-src/ext/hash/config.w32:1.8.2.3 Fri Mar 3 14:34:34 2006
+++ php-src/ext/hash/config.w32 Sat Jun 28 15:31:50 2008
@@ -1,8 +1,15 @@
-// $Id: config.w32,v 1.8.2.3 2006/03/03 14:34:34 edink Exp $
+// $Id: config.w32,v 1.8.2.3.4.1 2008/06/28 15:31:50 scottmac Exp $
// vim:ft=javascript
ARG_ENABLE("hash", "enable hash support", "yes");
+if (PHP_MHASH != "no") {
+ if (PHP_HASH == "no") {
+ PHP_HASH = "yes";
+ }
+ AC_DEFINE('PHP_MHASH_BC', 1);
+}
+
if (PHP_HASH != "no") {
AC_DEFINE('HAVE_HASH_EXT', 1);
EXTENSION("hash", "hash.c hash_md.c hash_sha.c hash_ripemd.c
hash_haval.c "
http://cvs.php.net/viewvc.cgi/php-src/ext/mhash/config.w32?r1=1.1&r2=1.1.8.1&diff_format=u
Index: php-src/ext/mhash/config.w32
diff -u php-src/ext/mhash/config.w32:1.1 php-src/ext/mhash/config.w32:1.1.8.1
--- php-src/ext/mhash/config.w32:1.1 Fri Jan 9 13:42:14 2004
+++ php-src/ext/mhash/config.w32 Sat Jun 28 15:31:50 2008
@@ -1,16 +1,10 @@
-// $Id: config.w32,v 1.1 2004/01/09 13:42:14 wez Exp $
+// $Id: config.w32,v 1.1.8.1 2008/06/28 15:31:50 scottmac Exp $
// vim:ft=javascript
ARG_WITH("mhash", "mhash support", "no");
if (PHP_MHASH != "no") {
-
- if (CHECK_HEADER_ADD_INCLUDE('mhash.h', 'CFLAGS_MHASH') &&
- CHECK_LIB('libmhash.lib', 'mhash')) {
- EXTENSION('mhash', 'mhash.c');
- AC_DEFINE('HAVE_LIBMHASH', 1);
- } else {
- WARNING("mhash not enabled; libraries and headers not found");
- }
+ EXTENSION('mhash', 'mhash.c');
+ ADD_EXTENSION_DEP('mhash', 'hash', true);
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
