davidg Mon Mar 19 15:37:03 2001 EDT
Modified files:
/php4/ext/midgard config.m4 php_midgard.h
Log:
Fixed the build (hope so).
Index: php4/ext/midgard/config.m4
diff -u php4/ext/midgard/config.m4:1.19 php4/ext/midgard/config.m4:1.20
--- php4/ext/midgard/config.m4:1.19 Mon Mar 19 10:38:09 2001
+++ php4/ext/midgard/config.m4 Mon Mar 19 15:37:03 2001
@@ -1,4 +1,4 @@
-dnl $Id: config.m4,v 1.19 2001/03/19 18:38:09 sniper Exp $
+dnl $Id: config.m4,v 1.20 2001/03/19 23:37:03 davidg Exp $
dnl Copyright (C) 1999 Jukka Zitting <[EMAIL PROTECTED]>
dnl Copyright (C) 2000 The Midgard Project ry
@@ -66,12 +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(MIDCONFIG_FILE)
- PHP_OUTPUT(php_midgard.h, [], [])
AC_DEFINE(HAVE_MIDGARD, 1, [ ])
PHP_EXTENSION(midgard, $ext_shared)
fi
Index: php4/ext/midgard/php_midgard.h
diff -u php4/ext/midgard/php_midgard.h:1.9 php4/ext/midgard/php_midgard.h:1.10
--- php4/ext/midgard/php_midgard.h:1.9 Sun Mar 18 10:29:55 2001
+++ php4/ext/midgard/php_midgard.h Mon Mar 19 15:37:03 2001
@@ -1,4 +1,4 @@
-/* $Id: php_midgard.h,v 1.9 2001/03/18 18:29:55 ab Exp $
+/* $Id: php_midgard.h,v 1.10 2001/03/19 23:37:03 davidg Exp $
Copyright (C) 1999 Jukka Zitting <[EMAIL PROTECTED]>
Copyright (C) 2000 The Midgard Project ry
Copyright (C) 2000 Emile Heyns, Aurora SA <[EMAIL PROTECTED]>
@@ -25,7 +25,14 @@
gets defined.
*/
#include "php.h"
-#include "config.h"
+
+#if (PHP_API_VERSION >= 20010119)
+#ifndef MGD_INCLUDE_PHP_CONFIG
+#include "php_config.h"
+#endif // MGD_INCLUDE_PHP_CONFIG
+#else
+#include "php_config.h"
+#endif
#if HAVE_MIDGARD
--
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]
