cvs: php4 /ext/midgard config.m4 config.m4.session

ab Thu Mar 29 02:35:33 2001 EDT Modified files: /php4/ext/midgard config.m4 config.m4.session Log: - Typo fixed - config.m4.session updated to config.m4 Index: php4/ext/midgard/config.m4 diff -u php4/ext/midgard/config.m4:1.21 php4/ext/midgard/config.m4:1.22 --- php4/ext/midgard/config.m4:1.21 Tue Mar 27 12:34:32 2001 +++ php4/ext/midgard/config.m4 Thu Mar 29 02:35:33 2001 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.21 2001/03/27 20:34:32 sniper Exp $ +dnl $Id: config.m4,v 1.22 2001/03/29 10:35:33 ab Exp $ dnl Copyright (C) 1999 Jukka Zitting <jukka.zitting@iki.fi> dnl Copyright (C) 2000 The Midgard Project ry @@ -55,7 +55,7 @@ PHP_SUBST(GLIBCONFIG) - PHP_SUBST(MIDGARD_SHARED_LIB) + PHP_SUBST(MIDGARD_SHARED_LIBADD) AC_MSG_CHECKING(for midgard experimental functions support) AC_ARG_ENABLE(mgd-experimental, Index: php4/ext/midgard/config.m4.session diff -u php4/ext/midgard/config.m4.session:1.9 php4/ext/midgard/config.m4.session:1.10 --- php4/ext/midgard/config.m4.session:1.9 Tue Mar 27 12:34:32 2001 +++ php4/ext/midgard/config.m4.session Thu Mar 29 02:35:33 2001 @@ -1,4 +1,4 @@ -dnl $Id: config.m4.session,v 1.9 2001/03/27 20:34:32 sniper Exp $ +dnl $Id: config.m4.session,v 1.10 2001/03/29 10:35:33 ab Exp $ dnl Copyright (C) 1999 Jukka Zitting <jukka.zitting@iki.fi> dnl Copyright (C) 2000 The Midgard Project ry @@ -55,7 +55,7 @@ PHP_SUBST(GLIBCONFIG) - PHP_SUBST(MIDGARD_SHARED_LIB) + PHP_SUBST(MIDGARD_SHARED_LIBADD) AC_MSG_CHECKING(for midgard experimental functions support) AC_ARG_ENABLE(mgd-experimental, @@ -72,14 +72,10 @@ if test "$PHP_MIDGARD_SESSION" != "no"; then AC_DEFINE(HAVE_MIDGARD_SESSION, 1, [ ]) 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) - AC_SUBST(MIDCONFIG_FILE) - AC_OUTPUT(php_midgard.h, [], []) AC_DEFINE(HAVE_MIDGARD, 1, [ ]) PHP_EXTENSION(midgard, $ext_shared) fi