andi Tue Mar 20 12:13:09 2001 EDT
Modified files: (Branch: PHP_4_0_5)
/php4/ext/midgard config.m4
Log:
- MFH - This is required for PHP to build. If anything else needs merging
for midgard that is related then please do it or rollback the latest
midgard fixes.
Index: php4/ext/midgard/config.m4
diff -u php4/ext/midgard/config.m4:1.13.2.1 php4/ext/midgard/config.m4:1.13.2.2
--- php4/ext/midgard/config.m4:1.13.2.1 Sun Mar 18 23:52:03 2001
+++ php4/ext/midgard/config.m4 Tue Mar 20 12:13:08 2001
@@ -1,4 +1,4 @@
-dnl $Id: config.m4,v 1.13.2.1 2001/03/19 07:52:03 ab Exp $
+dnl $Id: config.m4,v 1.13.2.2 2001/03/20 20:13:08 andi Exp $
dnl Copyright (C) 1999 Jukka Zitting <[EMAIL PROTECTED]>
dnl Copyright (C) 2000 The Midgard Project ry
@@ -32,8 +32,6 @@
else
AC_ADD_LIBRARY(midgard)
fi
- AC_DEFINE(HAVE_MIDGARD, 1, [ ])
- PHP_EXTENSION(midgard, $ext_shared)
dnl EEH/TODO: Add checks for apache-static compilation
AC_PATH_PROG(APXS, apxs)
@@ -68,10 +66,8 @@
fi
if test "$php_always_shared" = "yes"; then
- MIDCONFIG_FILE="config.h"
- else
- MIDCONFIG_FILE="php_config.h"
+ AC_DEFINE(MGD_INCLUDE_PHP_CONFIG, 1, [ ])
fi
- PHP_SUBST_OLD(MIDCONFIG_FILE)
- AC_OUTPUT(php_midgard.h, [], [])
+ AC_DEFINE(HAVE_MIDGARD, 1, [ ])
+ PHP_EXTENSION(midgard, $ext_shared)
fi
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
To contact the list administrators, e-mail: [EMAIL PROTECTED]
