summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ext/hash/config.w328
-rw-r--r--ext/mhash/config.w3210
2 files changed, 10 insertions, 8 deletions
diff --git a/ext/hash/config.w32 b/ext/hash/config.w32
index a3e3f845cc..a1041e4e19 100644
--- a/ext/hash/config.w32
+++ b/ext/hash/config.w32
@@ -3,6 +3,14 @@
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 "
diff --git a/ext/mhash/config.w32 b/ext/mhash/config.w32
index f3da3bb0b6..ef4f9682e1 100644
--- a/ext/mhash/config.w32
+++ b/ext/mhash/config.w32
@@ -4,13 +4,7 @@
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);
}