Re[2]: [PHP-CVS] cvs: php4 /ext/midgard config.m4 config.m4.session
Hello James, Thursday, March 29, 2001, 2:09:17 PM, you wrote: On Thu, Mar 29, 2001 at 11:50:29AM +0100, James Moore wrote: abThu 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 What does this fix do?? does it need to be included in 4.0.5?? or will ming work without it?? 1) It is not ming but midgard 2) It does add libmidgard.so into the list of linked libraries. Yes, it need to be included into 4.0.5 Hmm.. we dont really want another RC if we can avoid it.. whats the best thing to do here people? Alex, what happens if its not in 4.0.5?? is it related to somthing that has been changed in midgard recently (IE isnt in the RC Branch?) or is it a long term issue that has needed fixing? If It is not related to Midgard itself but it was an error caused by porting PHP module for Midgard to PHP4. I assume that it is general way to add libraries with path in to steps: 1. AC_ADD_LIBRARY_WITH_PATH(library, path, FOO_SHARED_LIBADD) 2. PHP_SUBST(FOO_SHARED_LIBADD) In past second step wasn't done correctly in revision 1.6 (if memory serves me) of config.m4. This commit fixes following error: extension uses functions provided by libmidgard.so but was not linked against it. midgard doesnt work without this change then I suppose it will have to go into 4.0.5 and we will probably need another (quick) RC otherwise I think it can probably wait until 4.0.6. Also can some of you midgard guys build and check the latest RC[4] to make sure midgard works etc as I dont think anyone else is. I think this should be in 4.0.5 or Midgard PHP4 extension will be unusable for masses. I'll do test rebuild with RC4 tonight but could somebody point me to tarball with it on the php.net site? My connection works faster with HTTP traffic than with CVS checkouts. -- Best regards, Alexandermailto:[EMAIL PROTECTED] -- 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]
[PHP-CVS] 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 [EMAIL PROTECTED] 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 [EMAIL PROTECTED] 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 -- 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]
RE: [PHP-CVS] cvs: php4 /ext/midgard config.m4 config.m4.session
abThu 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 What does this fix do?? does it need to be included in 4.0.5?? or will ming work without it?? James -- 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]
Re: [PHP-CVS] cvs: php4 /ext/midgard config.m4 config.m4.session
On Thu, Mar 29, 2001 at 11:50:29AM +0100, James Moore wrote: 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 What does this fix do?? does it need to be included in 4.0.5?? or will ming work without it?? 1) It is not ming but midgard 2) It does add libmidgard.so into the list of linked libraries. Yes, it need to be included into 4.0.5 -- Sincerely yours, Alexander Bokovoy The Midgard Project| ALT Linux Team | Minsk Linux Users Group www.midgard-project.org | www.altlinux.ru |www.minsk-lug.net -- Better to be nouveau than never to have been riche at all. -- 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]
RE: [PHP-CVS] cvs: php4 /ext/midgard config.m4 config.m4.session
On Thu, Mar 29, 2001 at 11:50:29AM +0100, James Moore wrote: abThu 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 What does this fix do?? does it need to be included in 4.0.5?? or will ming work without it?? 1) It is not ming but midgard 2) It does add libmidgard.so into the list of linked libraries. Yes, it need to be included into 4.0.5 Hmm.. we dont really want another RC if we can avoid it.. whats the best thing to do here people? Alex, what happens if its not in 4.0.5?? is it related to somthing that has been changed in midgard recently (IE isnt in the RC Branch?) or is it a long term issue that has needed fixing? If midgard doesnt work without this change then I suppose it will have to go into 4.0.5 and we will probably need another (quick) RC otherwise I think it can probably wait until 4.0.6. Also can some of you midgard guys build and check the latest RC[4] to make sure midgard works etc as I dont think anyone else is. James -- 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]
[PHP-CVS] cvs: php4 /ext/midgard config.m4 config.m4.session
ab Mon Mar 19 01:56:06 2001 EDT Modified files: /php4/ext/midgard config.m4 config.m4.session Log: Keep compability with 4.0.4pl1 Index: php4/ext/midgard/config.m4 diff -u php4/ext/midgard/config.m4:1.15 php4/ext/midgard/config.m4:1.16 --- php4/ext/midgard/config.m4:1.15 Sun Mar 18 23:37:00 2001 +++ php4/ext/midgard/config.m4 Mon Mar 19 01:56:06 2001 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.15 2001/03/19 07:37:00 ab Exp $ +dnl $Id: config.m4,v 1.16 2001/03/19 09:56:06 ab Exp $ dnl Copyright (C) 1999 Jukka Zitting [EMAIL PROTECTED] dnl Copyright (C) 2000 The Midgard Project ry @@ -72,6 +72,7 @@ else MIDCONFIG_FILE="php_config.h" fi - PHP_SUBST_OLD(MIDCONFIG_FILE) + PHP_SUBST(MIDCONFIG_FILE) + AC_SUBST(MIDCONFIG_FILE) AC_OUTPUT(php_midgard.h, [], []) fi Index: php4/ext/midgard/config.m4.session diff -u php4/ext/midgard/config.m4.session:1.5 php4/ext/midgard/config.m4.session:1.6 --- php4/ext/midgard/config.m4.session:1.5 Sun Mar 18 23:37:00 2001 +++ php4/ext/midgard/config.m4.session Mon Mar 19 01:56:06 2001 @@ -1,4 +1,4 @@ -dnl $Id: config.m4.session,v 1.5 2001/03/19 07:37:00 ab Exp $ +dnl $Id: config.m4.session,v 1.6 2001/03/19 09:56:06 ab Exp $ dnl Copyright (C) 1999 Jukka Zitting [EMAIL PROTECTED] dnl Copyright (C) 2000 The Midgard Project ry @@ -79,6 +79,7 @@ else MIDCONFIG_FILE="php_config.h" fi - PHP_SUBST_OLD(MIDCONFIG_FILE) + PHP_SUBST(MIDCONFIG_FILE) + AC_SUBST(MIDCONFIG_FILE) AC_OUTPUT(php_midgard.h, [], []) 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]
[PHP-CVS] cvs: php4 /ext/midgard config.m4
davidg Mon Mar 19 04:38:35 2001 EDT Modified files: /php4/ext/midgard config.m4 Log: fixed a compatibility problem with 4.0.4 Index: php4/ext/midgard/config.m4 diff -u php4/ext/midgard/config.m4:1.16 php4/ext/midgard/config.m4:1.17 --- php4/ext/midgard/config.m4:1.16 Mon Mar 19 01:56:06 2001 +++ php4/ext/midgard/config.m4 Mon Mar 19 04:38:35 2001 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.16 2001/03/19 09:56:06 ab Exp $ +dnl $Id: config.m4,v 1.17 2001/03/19 12:38:35 davidg Exp $ dnl Copyright (C) 1999 Jukka Zitting [EMAIL PROTECTED] dnl Copyright (C) 2000 The Midgard Project ry @@ -32,7 +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 @@ -75,4 +74,5 @@ PHP_SUBST(MIDCONFIG_FILE) AC_SUBST(MIDCONFIG_FILE) AC_OUTPUT(php_midgard.h, [], []) + AC_DEFINE(HAVE_MIDGARD, 1, [ ]) 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]
[PHP-CVS] cvs: php4 /ext/midgard config.m4 config.m4.session
ab Mon Mar 19 04:52:01 2001 EDT Modified files: /php4/ext/midgard config.m4 config.m4.session Log: 4.0.4pl1 compability finally fixed Index: php4/ext/midgard/config.m4 diff -u php4/ext/midgard/config.m4:1.17 php4/ext/midgard/config.m4:1.18 --- php4/ext/midgard/config.m4:1.17 Mon Mar 19 04:38:35 2001 +++ php4/ext/midgard/config.m4 Mon Mar 19 04:52:00 2001 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.17 2001/03/19 12:38:35 davidg Exp $ +dnl $Id: config.m4,v 1.18 2001/03/19 12:52:00 ab Exp $ dnl Copyright (C) 1999 Jukka Zitting [EMAIL PROTECTED] dnl Copyright (C) 2000 The Midgard Project ry @@ -32,7 +32,6 @@ else AC_ADD_LIBRARY(midgard) fi - PHP_EXTENSION(midgard, $ext_shared) dnl EEH/TODO: Add checks for apache-static compilation AC_PATH_PROG(APXS, apxs) @@ -75,4 +74,5 @@ AC_SUBST(MIDCONFIG_FILE) AC_OUTPUT(php_midgard.h, [], []) AC_DEFINE(HAVE_MIDGARD, 1, [ ]) + PHP_EXTENSION(midgard, $ext_shared) fi Index: php4/ext/midgard/config.m4.session diff -u php4/ext/midgard/config.m4.session:1.7 php4/ext/midgard/config.m4.session:1.8 --- php4/ext/midgard/config.m4.session:1.7 Mon Mar 19 04:41:19 2001 +++ php4/ext/midgard/config.m4.session Mon Mar 19 04:52:00 2001 @@ -1,4 +1,4 @@ -dnl $Id: config.m4.session,v 1.7 2001/03/19 12:41:19 davidg Exp $ +dnl $Id: config.m4.session,v 1.8 2001/03/19 12:52:00 ab Exp $ dnl Copyright (C) 1999 Jukka Zitting [EMAIL PROTECTED] dnl Copyright (C) 2000 The Midgard Project ry @@ -32,7 +32,6 @@ else AC_ADD_LIBRARY(midgard) fi - PHP_EXTENSION(midgard, $ext_shared) dnl EEH/TODO: Add checks for apache-static compilation AC_PATH_PROG(APXS, apxs) @@ -82,4 +81,5 @@ AC_SUBST(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]
Re: [PHP-CVS] cvs: php4 /ext/midgard config.m4 config.m4.session
On Mon, 19 Mar 2001, Alexander Bokovoy wrote: abSun Mar 18 23:37:01 2001 EDT Modified files: /php4/ext/midgard config.m4 config.m4.session Log: Oops. Substitution code fixed AC_OUTPUT is not intended to be called twice. Did not PHP_OUTPUT work for you? - PHP_OUTPUT(php_midgard.h) + PHP_SUBST_OLD(MIDCONFIG_FILE) + AC_OUTPUT(php_midgard.h, [], []) - Sascha Experience IRCG http://schumann.cx/http://schumann.cx/ircg -- 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]
[PHP-CVS] cvs: php4 /ext/midgard config.m4
sniper Mon Mar 19 10:38:09 2001 EDT Modified files: /php4/ext/midgard config.m4 Log: Fix the build. Again. # Read README.CVS-RULES # And TEST before commit. Index: php4/ext/midgard/config.m4 diff -u php4/ext/midgard/config.m4:1.18 php4/ext/midgard/config.m4:1.19 --- php4/ext/midgard/config.m4:1.18 Mon Mar 19 04:52:00 2001 +++ php4/ext/midgard/config.m4 Mon Mar 19 10:38:09 2001 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.18 2001/03/19 12:52:00 ab Exp $ +dnl $Id: config.m4,v 1.19 2001/03/19 18:38:09 sniper Exp $ dnl Copyright (C) 1999 Jukka Zitting [EMAIL PROTECTED] dnl Copyright (C) 2000 The Midgard Project ry @@ -71,8 +71,7 @@ MIDCONFIG_FILE="php_config.h" fi PHP_SUBST(MIDCONFIG_FILE) - AC_SUBST(MIDCONFIG_FILE) - AC_OUTPUT(php_midgard.h, [], []) + PHP_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]
Re: [PHP-CVS] cvs: php4 /ext/midgard config.m4
On Mon, Mar 19, 2001 at 06:38:09PM -, Jani Taskinen wrote: sniperMon Mar 19 10:38:09 2001 EDT Modified files: /php4/ext/midgard config.m4 Log: Fix the build. Again. # Read README.CVS-RULES # And TEST before commit. Index: php4/ext/midgard/config.m4 diff -u php4/ext/midgard/config.m4:1.18 php4/ext/midgard/config.m4:1.19 --- php4/ext/midgard/config.m4:1.18 Mon Mar 19 04:52:00 2001 +++ php4/ext/midgard/config.m4Mon Mar 19 10:38:09 2001 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.18 2001/03/19 12:52:00 ab Exp $ +dnl $Id: config.m4,v 1.19 2001/03/19 18:38:09 sniper Exp $ dnl Copyright (C) 1999 Jukka Zitting [EMAIL PROTECTED] dnl Copyright (C) 2000 The Midgard Project ry @@ -71,8 +71,7 @@ MIDCONFIG_FILE="php_config.h" fi PHP_SUBST(MIDCONFIG_FILE) - AC_SUBST(MIDCONFIG_FILE) - AC_OUTPUT(php_midgard.h, [], []) + PHP_OUTPUT(php_midgard.h, [], []) AC_DEFINE(HAVE_MIDGARD, 1, [ ]) PHP_EXTENSION(midgard, $ext_shared) fi This fix does not work because @MIDCONFIG_FILE@ in php_midgard.h does not substituted by PHP_OUTPUT using template file php_midgard.h.in. Either fix building environment in PHP4 which does not allow output variable's value through template header file for extensions or revert change back. That change was tested before commit. -- Sincerely yours, Alexander Bokovoy The Midgard Project | www.midgard-project.org |Aurora RD team Minsk Linux Users Group |www.minsk-lug.net| www.aurora-linux.com ALT Linux Team |www.alt-linux.org| Architecte Open Source -- God must love the common man; He made so many of them. -- 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]
Re: [PHP-CVS] cvs: php4 /ext/midgard config.m4
On Mon, 19 Mar 2001, Alexander Bokovoy wrote: This fix does not work because @MIDCONFIG_FILE@ in php_midgard.h does not substituted by PHP_OUTPUT using template file php_midgard.h.in. Either fix building environment in PHP4 which does not allow output variable's value through template header file for extensions or revert change back. That change was tested before commit. Well, it wasn't tested well enough. I am against reverting it, because it completely breaks the build. -Andrei * Entropy isn't what it used to be. * -- 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]
Re: [PHP-CVS] cvs: php4 /ext/midgard config.m4
On Mon, Mar 19, 2001 at 08:28:20PM +0100, Jani Taskinen wrote: On Mon, 19 Mar 2001, Alexander Bokovoy wrote: On Mon, Mar 19, 2001 at 01:19:06PM -0600, Andrei Zmievski wrote: On Mon, 19 Mar 2001, Alexander Bokovoy wrote: This fix does not work because @MIDCONFIG_FILE@ in php_midgard.h does not substituted by PHP_OUTPUT using template file php_midgard.h.in. Either fix building environment in PHP4 which does not allow output variable's value through template header file for extensions or revert change back. That change was tested before commit. Well, it wasn't tested well enough. I am against reverting it, because it completely breaks the build. Andrei, problem is that build environment needs to be fixed, not module alone. This is really serious problem because it prevents people from using Midgard extension with, say, PHP 4.0.4pl1 (latest stable PHP4 version) though they could do it (there are no dependencies on PHP 4.0.5 in Midgard extension). Uh. This comes back to the fact that this extension shouldn't even be in PHP CVS. Where's that PEAR thing? :) :-) Shouldn't that means that almost all extensions from ext/ directory could be classified as PEAR thing? Still, you should not break the whole build by just getting ONE extension to work. I don't think midgard is that important. As I stated in my commit comment, read the README.CVS-RULES. They are to be followed. ie. ASK before commit..TEST before commit. If unsure - DO NOT commit. I refrain: PHP_REAL_ARG_WITH has a bug. Please see my other mail with description. -- Sincerely yours, Alexander Bokovoy The Midgard Project | www.midgard-project.org |Aurora RD team Minsk Linux Users Group |www.minsk-lug.net| www.aurora-linux.com ALT Linux Team |www.alt-linux.org| Architecte Open Source -- You will always find something in the last place you look. -- 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]
Re: [PHP-CVS] cvs: php4 /ext/midgard config.m4
On Mon, 19 Mar 2001, Alexander Bokovoy wrote: On Mon, Mar 19, 2001 at 01:19:06PM -0600, Andrei Zmievski wrote: On Mon, 19 Mar 2001, Alexander Bokovoy wrote: This fix does not work because @MIDCONFIG_FILE@ in php_midgard.h does not substituted by PHP_OUTPUT using template file php_midgard.h.in. Either fix building environment in PHP4 which does not allow output variable's value through template header file for extensions or revert change back. That change was tested before commit. Well, it wasn't tested well enough. I am against reverting it, because it completely breaks the build. Andrei, problem is that build environment needs to be fixed, not module alone. This is really serious problem because it prevents people from using Midgard extension with, say, PHP 4.0.4pl1 (latest stable PHP4 version) though they could do it (there are no dependencies on PHP 4.0.5 in Midgard extension). Uh. This comes back to the fact that this extension shouldn't even be in PHP CVS. Where's that PEAR thing? :) Still, you should not break the whole build by just getting ONE extension to work. I don't think midgard is that important. As I stated in my commit comment, read the README.CVS-RULES. They are to be followed. ie. ASK before commit..TEST before commit. If unsure - DO NOT commit. --Jani -- 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]
Re: [PHP-CVS] cvs: php4 /ext/midgard config.m4
On Mon, 19 Mar 2001, Alexander Bokovoy wrote: fi PHP_SUBST(MIDCONFIG_FILE) - AC_SUBST(MIDCONFIG_FILE) - AC_OUTPUT(php_midgard.h, [], []) + PHP_OUTPUT(php_midgard.h, [], []) AC_DEFINE(HAVE_MIDGARD, 1, [ ]) PHP_EXTENSION(midgard, $ext_shared) fi This fix does not work because @MIDCONFIG_FILE@ in php_midgard.h does not substituted by PHP_OUTPUT using template file php_midgard.h.in. Either fix building environment in PHP4 which does not allow output variable's value through template header file for extensions or revert change back. That change was tested before commit. Eh? Did you test WITHOUT having --with-midgard in your configure line? I bet you didn't. --Jani -- 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]
Re: [PHP-CVS] cvs: php4 /ext/midgard config.m4
On Mon, Mar 19, 2001 at 01:19:06PM -0600, Andrei Zmievski wrote: On Mon, 19 Mar 2001, Alexander Bokovoy wrote: This fix does not work because @MIDCONFIG_FILE@ in php_midgard.h does not substituted by PHP_OUTPUT using template file php_midgard.h.in. Either fix building environment in PHP4 which does not allow output variable's value through template header file for extensions or revert change back. That change was tested before commit. Well, it wasn't tested well enough. I am against reverting it, because it completely breaks the build. Andrei, problem is that build environment needs to be fixed, not module alone. This is really serious problem because it prevents people from using Midgard extension with, say, PHP 4.0.4pl1 (latest stable PHP4 version) though they could do it (there are no dependencies on PHP 4.0.5 in Midgard extension). -- Sincerely yours, Alexander Bokovoy The Midgard Project | www.midgard-project.org |Aurora RD team Minsk Linux Users Group |www.minsk-lug.net| www.aurora-linux.com ALT Linux Team |www.alt-linux.org| Architecte Open Source -- You will always find something in the last place you look. -- 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]
Re: [PHP-CVS] cvs: php4 /ext/midgard config.m4
On Mon, 19 Mar 2001, Alexander Bokovoy wrote: Andrei, problem is that build environment needs to be fixed, not module alone. This is really serious problem because it prevents people from using Midgard extension with, say, PHP 4.0.4pl1 (latest stable PHP4 version) though they could do it (there are no dependencies on PHP 4.0.5 in Midgard extension). I am not saying that it's not a problem with PHP build environment, but your change to Midgard's config.m4 made all hell break loose. Please submit a patch for the build system if you know how to fix it. -Andrei * Software never has bugs. It just develops random features. * -- 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]
Re: [PHP-CVS] cvs: php4 /ext/midgard config.m4
On Mon, 19 Mar 2001, Jani Taskinen wrote: On Mon, 19 Mar 2001, Alexander Bokovoy wrote: On Mon, Mar 19, 2001 at 01:19:06PM -0600, Andrei Zmievski wrote: On Mon, 19 Mar 2001, Alexander Bokovoy wrote: This fix does not work because @MIDCONFIG_FILE@ in php_midgard.h does not substituted by PHP_OUTPUT using template file php_midgard.h.in. Either fix building environment in PHP4 which does not allow output variable's value through template header file for extensions or revert change back. That change was tested before commit. Well, it wasn't tested well enough. I am against reverting it, because it completely breaks the build. Andrei, problem is that build environment needs to be fixed, not module alone. This is really serious problem because it prevents people from using Midgard extension with, say, PHP 4.0.4pl1 (latest stable PHP4 version) though they could do it (there are no dependencies on PHP 4.0.5 in Midgard extension). Uh. This comes back to the fact that this extension shouldn't even be in PHP CVS. Where's that PEAR thing? :) I don't think it belongs in PEAR at all. I could see the logic behind distributing it with PHP, but don't see any reason to distribute it in pear... -Sterling -- 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]
Re: [PHP-CVS] cvs: php4 /ext/midgard config.m4
I don't think it belongs in PEAR at all. I could see the logic behind distributing it with PHP, but don't see any reason to distribute it in pear... Except that isn't this what PEAR was for all along? A collection of classes and add-on modules to extend PHP's functionality? I don't have anything against the Midguard folks personally, but isn't distributing Midguard with the main PHP distribution implicitly saying PHP supports/prefers the Midguard content management system over any other similar system? What happens when someone else wants *their* system to be part of the main PHP distribution? What criteria are we basing these decisions on? There is also the license issue (which I know has been discussed before). But the first thing I read on the Midguard website is: Midgard will always implement an OS development to publishing solution, future releases will include APIs for implementing commercial applications. Are we going to run into trouble down the road when this happens (and end up having to take Midguard out of PHP anyway)? [There is also the fact that Midguard accepts donations and collects membership fees ... how is that going to change if Midguard is part of the main PHP distribution?] And as for Alexander's comment: Shouldn't that means that almost all extensions from ext/ directory could be classified as PEAR thing? My opinion is that yes they *could* be classified that way, but it doesn't make a lot of sense. PHP users don't have a choice of which module they want to use for Blowfish encryption, for example ... so mcrypt is part of the standard distribution. Perhaps the PDF modules should be, since we have several. I don't know. But, to me at least, Midguard seems to be code that is a "layer above" what I would feel belongs in the main PHP distribution. In the same way the DB abstraction class is (even the C version of it) ... and that they both belong in PEAR. Just my 2 cents (and given without intent to offend). -- Colin Viebrock Co-Founder, easyDNS Technologies Inc. http://www.easyDNS.com/ -- 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]
Re: [PHP-CVS] cvs: php4 /ext/midgard config.m4
Colin Viebrock wrote: There is also the license issue (which I know has been discussed before). But the first thing I read on the Midguard website is: Midgard will always implement an OS development to publishing solution, future releases will include APIs for implementing commercial applications. All of Midgard that could affect PHP is LGPL. There are applications written using Midgard, which do not affect PHP in any way, which are under the X license. Glibc, expat, mysqlclient, etc, all "include APIs for implementing commercial applications". And note that commercial != closed source in the first place. [There is also the fact that Midguard accepts donations and collects membership fees ... how is that going to change if Midguard is part of the main PHP distribution?] MySQL access functions were in PHP long before it went open source. I'm not saying that Midgard is on the same level of general usefullness but just that the fact that there's an organization behind it doesn't change it's licensing. But, to me at least, Midguard seems to be code that is a "layer above" what I would feel belongs in the main PHP distribution. In the same way the DB abstraction class is (even the C version of it) ... and that they both belong in PEAR. This is a discussion that I'm fully open to. Emile -- 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]
Re: [PHP-CVS] cvs: php4 /ext/midgard config.m4
I don't think it belongs in PEAR at all. I could see the logic behind distributing it with PHP, but don't see any reason to distribute it in pear... Except that isn't this what PEAR was for all along? A collection of classes and add-on modules to extend PHP's functionality? I don't have anything against the Midguard folks personally, but isn't distributing Midguard with the main PHP distribution implicitly saying PHP supports/prefers the Midguard content management system over any other similar system? What happens when someone else wants *their* system to be part of the main PHP distribution? What criteria are we basing these decisions on? There is also the license issue (which I know has been discussed before). But the first thing I read on the Midguard website is: Midgard will always implement an OS development to publishing solution, future releases will include APIs for implementing commercial applications. Are we going to run into trouble down the road when this happens (and end up having to take Midguard out of PHP anyway)? [There is also the fact that Midguard accepts donations and collects membership fees ... how is that going to change if Midguard is part of the main PHP distribution?] And as for Alexander's comment: Shouldn't that means that almost all extensions from ext/ directory could be classified as PEAR thing? My opinion is that yes they *could* be classified that way, but it doesn't make a lot of sense. PHP users don't have a choice of which module they want to use for Blowfish encryption, for example ... so mcrypt is part of the standard distribution. Perhaps the PDF modules should be, since we have several. I don't know. But, to me at least, Midguard seems to be code that is a "layer above" what I would feel belongs in the main PHP distribution. In the same way the DB abstraction class is (even the C version of it) ... and that they both belong in PEAR. Midgard is not exactly a layer above PHP, it's an extension to PHP, exactly like the session extension, or the gd extension. Here is my own point of view (far from objective, cause I'm from the Midgard team ;): Midgard is a CMS, like MySQL is a DBMS. MySQL has it's own module in php4/ext, as well as pgsql, oracle, etc... That gives users the choice of what DBMS they can use with PHP. I don't mind *at all* if Zope, or Websphere or whatever other CMS has its own module in php4/ext (in fact, that would give users more choice, thus that'd be better). My own 2 cents. Just my 2 cents (and given without intent to offend). -- Colin Viebrock Co-Founder, easyDNS Technologies Inc. http://www.easyDNS.com/ -- David -- 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]
Re: [PHP-CVS] cvs: php4 /ext/midgard config.m4
At 00:30 20/3/2001, Emiliano wrote: Colin Viebrock wrote: There is also the license issue (which I know has been discussed before). But the first thing I read on the Midguard website is: Midgard will always implement an OS development to publishing solution, future releases will include APIs for implementing commercial applications. All of Midgard that could affect PHP is LGPL. There are applications written using Midgard, which do not affect PHP in any way, which are under the X license. Glibc, expat, mysqlclient, etc, all "include APIs for implementing commercial applications". And note that commercial != closed source in the first place. [There is also the fact that Midguard accepts donations and collects membership fees ... how is that going to change if Midguard is part of the main PHP distribution?] MySQL access functions were in PHP long before it went open source. I'm not saying that Midgard is on the same level of general usefullness but just that the fact that there's an organization behind it doesn't change it's licensing. MySQL was always opensource. It was perhaps not opensource(tm), but it was opensource, before people came along and put rules on what opensource means. But, to me at least, Midguard seems to be code that is a "layer above" what I would feel belongs in the main PHP distribution. In the same way the DB abstraction class is (even the C version of it) ... and that they both belong in PEAR. This is a discussion that I'm fully open to. I tend to agree to Colin's statement. I don't see the big added value (to everyone involved) in distributing midgard alongside PHP, and one of the reasons PEAR was born was for such extensions exactly. Zeev -- Zeev Suraski [EMAIL PROTECTED] CTO co-founder, Zend Technologies Ltd. http://www.zend.com/ -- 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]
Re: [PHP-CVS] cvs: php4 /ext/midgard config.m4
On Mon, 19 Mar 2001, Colin Viebrock wrote: I don't think it belongs in PEAR at all. I could see the logic behind distributing it with PHP, but don't see any reason to distribute it in pear... Except that isn't this what PEAR was for all along? A collection of classes and add-on modules to extend PHP's functionality? Yes. But the midgard extension doesn't really do that, it provides some propreitary functions and classes for use by Midgard only. The reason its being distributed as an extension is -- a) It helps the Midguard users to have the extension distributed with PHP (not too sure on why this is so). b) No one likes reversing commits :))) I don't have anything against the Midguard folks personally, but isn't distributing Midguard with the main PHP distribution implicitly saying PHP supports/prefers the Midguard content management system over any other similar system? What happens when someone else wants *their* system to be part of the main PHP distribution? What criteria are we basing these decisions on? Plus it contributes bloat and doesn't make sense. There is also the license issue (which I know has been discussed before). But the first thing I read on the Midguard website is: Midgard will always implement an OS development to publishing solution, future releases will include APIs for implementing commercial applications. Are we going to run into trouble down the road when this happens (and end up having to take Midguard out of PHP anyway)? [There is also the fact that Midguard accepts donations and collects membership fees ... how is that going to change if Midguard is part of the main PHP distribution?] Don't quite see the problem here, can you spell it out for me :)))? And as for Alexander's comment: Shouldn't that means that almost all extensions from ext/ directory could be classified as PEAR thing? My opinion is that yes they *could* be classified that way, but it doesn't make a lot of sense. PHP users don't have a choice of which module they want to use for Blowfish encryption, for example ... so mcrypt is part of the standard distribution. Perhaps the PDF modules should be, since we have several. I don't know. But, to me at least, Midguard seems to be code that is a "layer above" what I would feel belongs in the main PHP distribution. In the same way the DB abstraction class is (even the C version of it) ... and that they both belong in PEAR. Well, I think a db abstraction layer could and should be distributed. But that's off topic. The midguard code, imho, belongs distributed with midguard, not in pear (where it doesn't fit) or as an extension... Just my 2 cents (and given without intent to offend). Same for me. -Sterling -- 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]
Re: [PHP-CVS] cvs: php4 /ext/midgard config.m4
Sterling Hughes wrote: Yes. But the midgard extension doesn't really do that, it provides some propreitary functions and classes for use by Midgard only. The reason its being distributed as an extension is -- Proprietary? If you mean 'only disclose functionality to deal with' then all extensions to PHP are proprietary. Emile -- 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]
Re: [PHP-CVS] cvs: php4 /ext/midgard config.m4
At 00:53 20/3/2001, Emiliano wrote: Zeev Suraski wrote: MySQL access functions were in PHP long before it went open source. I'm not saying that Midgard is on the same level of general usefullness but just that the fact that there's an organization behind it doesn't change it's licensing. MySQL was always opensource. It was perhaps not opensource(tm), but it was opensource, before people came along and put rules on what opensource means. OK, substitute OCI8, the argument stands. That's only an interface module though. OCI8 isn't a part of PHP... I tend to agree to Colin's statement. I don't see the big added value (to everyone involved) in distributing midgard alongside PHP, and one of the reasons PEAR was born was for such extensions exactly. Not a problem for me. But how is PEAR being made available, then? PEAR is available already. There aren't any C modules in it yet, though. Zeev -- 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]
Re: [PHP-CVS] cvs: php4 /ext/midgard config.m4
On Tue, 20 Mar 2001, Zeev Suraski wrote: Not a problem for me. But how is PEAR being made available, then? We still don't have a good framework for having PEAR extensions that contain PHP extensions written in C in them. That was always the goal, it just hasn't been done yet. And yes, I concur with most others here, when that gets finished, the midgard stuff belongs there. It probably won't get finished until people start using it. The midgard people may be the right people for the job :) One question about this: Could we setup a separate module for Pear in the CVS? As now it's also 'bundled' with php. --Jani -- 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]
Re: [PHP-CVS] cvs: php4 /ext/midgard config.m4
Jani Taskinen wrote: It probably won't get finished until people start using it. The midgard people may be the right people for the job :) One question about this: Could we setup a separate module for Pear in the CVS? As now it's also 'bundled' with php. That's exactly what I meant. Emile -- 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]
Re: [PHP-CVS] cvs: php4 /ext/midgard config.m4
missed the reply-all button... At 00:29 20/3/2001, [EMAIL PROTECTED] wrote: Midgard is not exactly a layer above PHP, it's an extension to PHP, exactly like the session extension, or the gd extension. Here is my own point of view (far from objective, cause I'm from the Midgard team ;): Midgard is a CMS, like MySQL is a DBMS. MySQL has it's own module in php4/ext, as well as pgsql, oracle, etc... That gives users the choice of what DBMS they can use with PHP. I don't mind *at all* if Zope, or Websphere or whatever other CMS has its own module in php4/ext (in fact, that would give users more choice, thus that'd be better). Not quite :) The main difference is that, unlike most other extensions, this extension isn't a 'glue' layer that connects PHP to some external resource. In this case, we're including the resource itself. It's more similar to including the source code of MySQL or PostgreSQL inside PHP, not a module that connects to them... well, AFAIK Midgard is a glue between PHP, mysql and apache. Did you already try it ? Did you read the documentation on www.midgard-project.org ? There were a few exceptions to the rule over the years (mostly in PHP 4.0) - PCRE, XML being the most notable ones, and the MySQL client library being another type of exception, made due to the huge popularity of the PHP/MySQL combination. There are a few open issues here, which should help us understand whether or not this module belongs inside PHP: - Is it mutually exclusive to other alternatives? The problem Colin raised does exist, there are quite a few content management applications for PHP out there, and it's a bit unfair to them to bundle a specific one inside PHP. I don't know any written as a PHP extension, only pure PHP code. - The license issue - does the inclusion of midgard effect the overall license restrictions of PHP or not? I don't think so, we changed the license to be compatible with PHP. - Is the midgard group willing and interested in playing by the php-dev rules? In particular, "Thou shalt never break the CVS build" is one of the 'higher laws' around here :) Yes, unfortunatly you can't tell a blind person not to bump into walls in an unknown place ;) More documentations on PHP m4 macros would help. Zeev -- David -- David -- 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]
[PHP-CVS] cvs: php4 /ext/midgard config.m4 php_midgard.h
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]
[PHP-CVS] cvs: php4 /ext/midgard config.m4 config.m4.session php_midgard.h.in
ab Sun Mar 18 23:04:56 2001 EDT Added files: /php4/ext/midgard php_midgard.h.in Modified files: /php4/ext/midgard config.m4 config.m4.session Log: Automatically generate correct #include for cases when module build using phpize or within main PHP4 tree Index: php4/ext/midgard/config.m4 diff -u php4/ext/midgard/config.m4:1.13 php4/ext/midgard/config.m4:1.14 --- php4/ext/midgard/config.m4:1.13 Sun Mar 11 15:45:57 2001 +++ php4/ext/midgard/config.m4 Sun Mar 18 23:04:56 2001 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.13 2001/03/11 23:45:57 davidg Exp $ +dnl $Id: config.m4,v 1.14 2001/03/19 07:04:56 ab Exp $ dnl Copyright (C) 1999 Jukka Zitting [EMAIL PROTECTED] dnl Copyright (C) 2000 The Midgard Project ry @@ -66,4 +66,12 @@ if test "$PHP_MIDGARD_EXPERIMENTAL" != "no"; then AC_DEFINE(YOU_WANT_TO_TEST, 1, [ ]) fi + + if test "$php_always_shared" = "yes"; then +MIDCONFIG_FILE="config.h" + else +MIDCONFIG_FILE="php_config.h" + fi + PHP_SUBST(MIDCONFIG_FILE) + PHP_OUTPUT(php_midgard.h) fi Index: php4/ext/midgard/config.m4.session diff -u php4/ext/midgard/config.m4.session:1.3 php4/ext/midgard/config.m4.session:1.4 --- php4/ext/midgard/config.m4.session:1.3 Sun Mar 11 15:45:57 2001 +++ php4/ext/midgard/config.m4.session Sun Mar 18 23:04:56 2001 @@ -1,4 +1,4 @@ -dnl $Id: config.m4.session,v 1.3 2001/03/11 23:45:57 davidg Exp $ +dnl $Id: config.m4.session,v 1.4 2001/03/19 07:04:56 ab Exp $ dnl Copyright (C) 1999 Jukka Zitting [EMAIL PROTECTED] dnl Copyright (C) 2000 The Midgard Project ry @@ -74,4 +74,11 @@ 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" + fi + PHP_SUBST(MIDCONFIG_FILE) + PHP_OUTPUT(php_midgard.h) fi Index: php4/ext/midgard/php_midgard.h.in +++ php4/ext/midgard/php_midgard.h.in /* $Id: php_midgard.h.in,v 1.1 2001/03/19 07:04:56 ab Exp $ Copyright (C) 1999 Jukka Zitting [EMAIL PROTECTED] Copyright (C) 2000 The Midgard Project ry Copyright (C) 2000 Emile Heyns, Aurora SA [EMAIL PROTECTED] This program is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #ifndef PHP_MIDGARD_H #define PHP_MIDGARD_H /* You should tweak config.m4 so this symbol (or some else suitable) gets defined. */ #include "php.h" #include "@MIDCONFIG_FILE@" #if HAVE_MIDGARD #include midgard/midgard.h #include midgard/apache.h /* #include Zend/zend_modules.h */ midgard_request_config *mgd_rcfg(); midgard_directory_config *mgd_dcfg(); midgard *mgd_handle(); zval *mgd_getudf(); int mgd_get_errno(); void mgd_reset_errno(); void mgd_set_errno(int mgd_errno); void mgd_log_debug(int flags, const char *fmt, ...); extern zend_module_entry midgard_module_entry; #define phpext_midgard_ptr midgard_module_entry #ifdef PHP_WIN32 #define PHP_MIDGARD_API __declspec(dllexport) #else #define PHP_MIDGARD_API #endif PHP_MINIT_FUNCTION(midgard); PHP_MSHUTDOWN_FUNCTION(midgard); PHP_RINIT_FUNCTION(midgard); PHP_RSHUTDOWN_FUNCTION(midgard); PHP_MINFO_FUNCTION(midgard); PHP_FUNCTION(confirm_midgard_compiled); /* For testing, remove later. */ ZEND_BEGIN_MODULE_GLOBALS(midgard) midgard_request_config *rcfg; midgard_directory_config *dcfg; midgard *mgd; int mgd_errno; zval *udf; ZEND_END_MODULE_GLOBALS(midgard) /* In every function that needs to use variables in php_midgard_globals, do call MGDLS_FETCH(); after declaring other variables used by that function, and always refer to them as MGDG(variable). You are encouraged to rename these macros something shorter, see examples in any other php module directory. */ #ifdef ZTS #define MGDG(v) (midgard_globals-v) #define MGDLS_FETCH() php_midgard_globals *midgard_globals = ts_resource(midgard_globals_id) #else #define MGDG(v) (midgard_globals.v) #define MGDLS_FETCH() #endif #else #define phpext_midgard_ptr NULL #endif #endif /* PHP_MIDGARD_H */ /* * Local variables: * tab-width: 4 * c-basic-offset: 4 * End: */ -- 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]
[PHP-CVS] cvs: php4 /ext/midgard config.m4 config.m4.session
ab Sun Mar 18 23:37:01 2001 EDT Modified files: /php4/ext/midgard config.m4 config.m4.session Log: Oops. Substitution code fixed Index: php4/ext/midgard/config.m4 diff -u php4/ext/midgard/config.m4:1.14 php4/ext/midgard/config.m4:1.15 --- php4/ext/midgard/config.m4:1.14 Sun Mar 18 23:04:56 2001 +++ php4/ext/midgard/config.m4 Sun Mar 18 23:37:00 2001 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.14 2001/03/19 07:04:56 ab Exp $ +dnl $Id: config.m4,v 1.15 2001/03/19 07:37:00 ab Exp $ dnl Copyright (C) 1999 Jukka Zitting [EMAIL PROTECTED] dnl Copyright (C) 2000 The Midgard Project ry @@ -72,6 +72,6 @@ else MIDCONFIG_FILE="php_config.h" fi - PHP_SUBST(MIDCONFIG_FILE) - PHP_OUTPUT(php_midgard.h) + PHP_SUBST_OLD(MIDCONFIG_FILE) + AC_OUTPUT(php_midgard.h, [], []) fi Index: php4/ext/midgard/config.m4.session diff -u php4/ext/midgard/config.m4.session:1.4 php4/ext/midgard/config.m4.session:1.5 --- php4/ext/midgard/config.m4.session:1.4 Sun Mar 18 23:04:56 2001 +++ php4/ext/midgard/config.m4.session Sun Mar 18 23:37:00 2001 @@ -1,4 +1,4 @@ -dnl $Id: config.m4.session,v 1.4 2001/03/19 07:04:56 ab Exp $ +dnl $Id: config.m4.session,v 1.5 2001/03/19 07:37:00 ab Exp $ dnl Copyright (C) 1999 Jukka Zitting [EMAIL PROTECTED] dnl Copyright (C) 2000 The Midgard Project ry @@ -79,6 +79,6 @@ else MIDCONFIG_FILE="php_config.h" fi - PHP_SUBST(MIDCONFIG_FILE) - PHP_OUTPUT(php_midgard.h) + PHP_SUBST_OLD(MIDCONFIG_FILE) + AC_OUTPUT(php_midgard.h, [], []) 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]
[PHP-CVS] cvs: php4 /ext/midgard config.m4 config.m4.session
davidg Sun Mar 11 15:45:58 2001 EDT Modified files: /php4/ext/midgard config.m4 config.m4.session Log: fixed misplaced PHP_SUBST Index: php4/ext/midgard/config.m4 diff -u php4/ext/midgard/config.m4:1.12 php4/ext/midgard/config.m4:1.13 --- php4/ext/midgard/config.m4:1.12 Sun Mar 11 15:30:36 2001 +++ php4/ext/midgard/config.m4 Sun Mar 11 15:45:57 2001 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.12 2001/03/11 23:30:36 davidg Exp $ +dnl $Id: config.m4,v 1.13 2001/03/11 23:45:57 davidg Exp $ dnl Copyright (C) 1999 Jukka Zitting [EMAIL PROTECTED] dnl Copyright (C) 2000 The Midgard Project ry @@ -22,8 +22,6 @@ AC_DECL_YYTEXT AC_PROG_LEX -PHP_SUBST(MIDGARD_SHARED_LIB) - PHP_ARG_WITH(midgard, for midgard support, [ --with-midgard Include midgard 1.4 support]) @@ -58,6 +56,8 @@ LFLAGS="$LFLAGS -Pmgd -olex.yy.c" PHP_SUBST(GLIBCONFIG) + + PHP_SUBST(MIDGARD_SHARED_LIB) 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.2 php4/ext/midgard/config.m4.session:1.3 --- php4/ext/midgard/config.m4.session:1.2 Sun Mar 11 15:30:36 2001 +++ php4/ext/midgard/config.m4.session Sun Mar 11 15:45:57 2001 @@ -1,4 +1,4 @@ -dnl $Id: config.m4.session,v 1.2 2001/03/11 23:30:36 davidg Exp $ +dnl $Id: config.m4.session,v 1.3 2001/03/11 23:45:57 davidg Exp $ dnl Copyright (C) 1999 Jukka Zitting [EMAIL PROTECTED] dnl Copyright (C) 2000 The Midgard Project ry @@ -22,8 +22,6 @@ AC_DECL_YYTEXT AC_PROG_LEX -PHP_SUBST(MIDGARD_SHARED_LIB) - PHP_ARG_WITH(midgard, for midgard support, [ --with-midgard Include midgard 1.4 support]) @@ -58,6 +56,8 @@ LFLAGS="$LFLAGS -Pmgd -olex.yy.c" PHP_SUBST(GLIBCONFIG) + + PHP_SUBST(MIDGARD_SHARED_LIB) AC_MSG_CHECKING(for midgard experimental functions support) AC_ARG_ENABLE(mgd-experimental, -- 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]
[PHP-CVS] cvs: php4 /ext/midgard config.m4
davidg Thu Mar 8 02:49:18 2001 EDT Modified files: /php4/ext/midgard config.m4 Log: Midgard experimental functions support was not displayed correctly in ./configure Index: php4/ext/midgard/config.m4 diff -u php4/ext/midgard/config.m4:1.10 php4/ext/midgard/config.m4:1.11 --- php4/ext/midgard/config.m4:1.10 Fri Feb 23 15:14:42 2001 +++ php4/ext/midgard/config.m4 Thu Mar 8 02:49:18 2001 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.10 2001/02/23 23:14:42 davidg Exp $ +dnl $Id: config.m4,v 1.11 2001/03/08 10:49:18 davidg Exp $ dnl Copyright (C) 1999 Jukka Zitting [EMAIL PROTECTED] dnl Copyright (C) 2000 The Midgard Project ry @@ -61,7 +61,7 @@ AC_ARG_ENABLE(mgd-experimental, [ --enable-mgd-experimental Enable midgard 1.4.1 experimental functions support], PHP_MIDGARD_EXPERIMENTAL=[$]enableval, PHP_MIDGARD_EXPERIMENTAL="no") echo "$PHP_MIDGARD_EXPERIMENTAL"; - if test "$PHP_MIDGARD_EXPERIMENTAL" = "yes"; then + if test "$PHP_MIDGARD_EXPERIMENTAL" != "no"; then AC_DEFINE(YOU_WANT_TO_TEST, 1, [ ]) fi 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]
[PHP-CVS] cvs: php4 /ext/midgard config.m4
davidg Fri Feb 23 03:55:57 2001 EDT Modified files: /php4/ext/midgard config.m4 Log: Added --with-mgd-experimental option to compile experimental stuff (off by defeult) Index: php4/ext/midgard/config.m4 diff -u php4/ext/midgard/config.m4:1.7 php4/ext/midgard/config.m4:1.8 --- php4/ext/midgard/config.m4:1.7 Tue Feb 20 16:57:28 2001 +++ php4/ext/midgard/config.m4 Fri Feb 23 03:55:57 2001 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.7 2001/02/21 00:57:28 emile Exp $ +dnl $Id: config.m4,v 1.8 2001/02/23 11:55:57 davidg Exp $ dnl Copyright (C) 1999 Jukka Zitting [EMAIL PROTECTED] dnl Copyright (C) 2000 The Midgard Project ry @@ -56,4 +56,12 @@ LFLAGS="$LFLAGS -Pmgd -olex.yy.c" PHP_SUBST(GLIBCONFIG) + + AC_MSG_CHECKING(for midgard experimental functions support) + AC_ARG_WITH(mgd-experimental, + [ --with-mgd-experimental Include midgard 1.4.1 experimental functions +support], PHP_MIDGARD_EXPERIMENTAL=[$]withval, PHP_MIDGARD_EXPERIMENTAL="no") + echo "$PHP_MIDGARD_EXPERIMENTAL"; + if test "$PHP_MIDGARD_EXPERIMENTAL" == "yes"; then +AC_DEFINE(YOU_WANT_TO_TEST, 1, [ ]) + fi 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]
[PHP-CVS] cvs: php4 /ext/midgard config.m4 preparser.c
davidg Fri Feb 23 15:14:42 2001 EDT
Modified files:
/php4/ext/midgard preparser.c config.m4
Log:
- workaround for the function mgd_eval() to return a value like the PHP eval().
- changed --with-mgd-experimental to --enable-mgd-experimental
Index: php4/ext/midgard/preparser.c
diff -u php4/ext/midgard/preparser.c:1.5 php4/ext/midgard/preparser.c:1.6
--- php4/ext/midgard/preparser.c:1.5Tue Feb 20 03:14:55 2001
+++ php4/ext/midgard/preparser.cFri Feb 23 15:14:42 2001
@@ -1,4 +1,4 @@
-/* $Id: preparser.c,v 1.5 2001/02/20 11:14:55 emile Exp $
+/* $Id: preparser.c,v 1.6 2001/02/23 23:14:42 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]
@@ -345,6 +345,77 @@
mgd_free_pool(pool);
}
+/* DG {HACK ALERT}: Since the function zend_eval_string does not behave like
+ * the statement eval(), thie following function is the exact copy of the
+ * function zend_eval_string with some lines commented out.
+ * This is necessary to keep the compatibility between eval() and mgd_eval()
+ */
+static int mgd_eval_string(char *str, zval *retval_ptr, char *string_name CLS_DC
+ELS_DC)
+{
+ zval pv;
+ zend_op_array *new_op_array;
+ zend_op_array *original_active_op_array = EG(active_op_array);
+ zend_function_state *original_function_state_ptr = EG(function_state_ptr);
+ int original_handle_op_arrays;
+ int retval;
+
+// if (retval_ptr) {
+// pv.value.str.len = strlen(str)+sizeof("return ;")-1;
+// pv.value.str.val = emalloc(pv.value.str.len+1);
+// strcpy(pv.value.str.val, "return ");
+// strcat(pv.value.str.val, str);
+// strcat(pv.value.str.val, " ;");
+// } else {
+ pv.value.str.len = strlen(str);
+ pv.value.str.val = estrndup(str, pv.value.str.len);
+// }
+ pv.type = IS_STRING;
+
+ /*printf("Evaluating '%s'\n", pv.value.str.val);*/
+
+ original_handle_op_arrays = CG(handle_op_arrays);
+ CG(handle_op_arrays) = 0;
+ new_op_array = compile_string(pv, string_name CLS_CC);
+ CG(handle_op_arrays) = original_handle_op_arrays;
+
+ if (new_op_array) {
+ zval *local_retval_ptr=NULL;
+ zval **original_return_value_ptr_ptr = EG(return_value_ptr_ptr);
+ zend_op **original_opline_ptr = EG(opline_ptr);
+
+ EG(return_value_ptr_ptr) = local_retval_ptr;
+ EG(active_op_array) = new_op_array;
+ EG(no_extensions)=1;
+
+ zend_execute(new_op_array ELS_CC);
+
+ if (local_retval_ptr) {
+ if (retval_ptr) {
+ COPY_PZVAL_TO_ZVAL(*retval_ptr, local_retval_ptr);
+ } else {
+ zval_ptr_dtor(local_retval_ptr);
+ }
+ } else {
+ if (retval_ptr) {
+ INIT_ZVAL(*retval_ptr);
+ }
+ }
+
+ EG(no_extensions)=0;
+ EG(opline_ptr) = original_opline_ptr;
+ EG(active_op_array) = original_active_op_array;
+ EG(function_state_ptr) = original_function_state_ptr;
+ destroy_op_array(new_op_array);
+ efree(new_op_array);
+ EG(return_value_ptr_ptr) = original_return_value_ptr_ptr;
+ retval = SUCCESS;
+ } else {
+ retval = FAILURE;
+ }
+ zval_dtor(pv);
+ return retval;
+}
+
MGD_FUNCTION(eval)
{
zval **string, **name;
@@ -370,20 +441,9 @@
WRONG_PARAM_COUNT;
}
if((*string)-value.str.len) {
-#ifdef MGD_PREPARSER_LOG
- zend_syntax_highlighter_ini syntax_highlighter_ini;
- php_get_highlight_struct(syntax_highlighter_ini);
-// highlight_string(*string, syntax_highlighter_ini, tmp);
-#endif
pool = mgd_alloc_pool();
value = php_eval_midgard(pool, tmp, (*string)-value.str.val, 0);
-#ifdef MGD_PREPARSER_LOG
-MGD_LOG_START("mgd_eval(%s) '%s'\n\n\n\n\n\n\n\n")
- MGD_LOG_ARG(tmp)
- MGD_LOG_ARG(value)
-MGD_LOG_END()
-#endif
- if(zend_eval_string(value, NULL /* return_value */, tmp CLS_CC ELS_CC)
!= SUCCESS) {
+ if(mgd_eval_string(value, return_value, tmp CLS_CC ELS_CC) != SUCCESS)
+{
/* DG: we probably want to turn that off when stable and ready to release
* or at least offer the user an option to turn it off, as it exposes the
* PHP source (security issue here)
@@ -449,4 +509,5 @@
}
}
}
+
#endif /* HAVE_MIDGARD */
Index: php4/ext/midgard/config.m4
diff -u php4/ext/midgard/config.m4:1.9 php4/ext/midgard/config.m4:1.10
---
[PHP-CVS] cvs: php4 /ext/midgard config.m4 mgd_access.h mgd_preparser.h php_midgard.h
emile Tue Feb 20 03:29:52 2001 EDT
Modified files:
/php4/ext/midgard config.m4 mgd_access.h mgd_preparser.h
php_midgard.h
Log:
Header file moved.
Index: php4/ext/midgard/config.m4
diff -u php4/ext/midgard/config.m4:1.5 php4/ext/midgard/config.m4:1.6
--- php4/ext/midgard/config.m4:1.5 Sat Feb 17 15:21:49 2001
+++ php4/ext/midgard/config.m4 Tue Feb 20 03:29:51 2001
@@ -1,4 +1,4 @@
-dnl $Id: config.m4,v 1.5 2001/02/17 23:21:49 emile Exp $
+dnl $Id: config.m4,v 1.6 2001/02/20 11:29:51 emile Exp $
dnl Copyright (C) 1999 Jukka Zitting [EMAIL PROTECTED]
dnl Copyright (C) 2000 The Midgard Project ry
@@ -28,7 +28,7 @@
if test "$PHP_MIDGARD" != "no"; then
if test "$PHP_MIDGARD" != "yes"; then
AC_ADD_LIBRARY_WITH_PATH(midgard, "$PHP_MIDGARD/lib", MIDGARD_SHARED_LIBADD)
-AC_ADD_INCLUDE("$PHP_MIDGARD/include")
+AC_ADD_INCLUDE("$PHP_MIDGARD/include/midgard")
else
AC_ADD_LIBRARY(midgard)
fi
Index: php4/ext/midgard/mgd_access.h
diff -u php4/ext/midgard/mgd_access.h:1.3 php4/ext/midgard/mgd_access.h:1.4
--- php4/ext/midgard/mgd_access.h:1.3 Sat Feb 17 15:21:50 2001
+++ php4/ext/midgard/mgd_access.h Tue Feb 20 03:29:52 2001
@@ -1,4 +1,4 @@
-/* $Id: mgd_access.h,v 1.3 2001/02/17 23:21:50 emile Exp $
+/* $Id: mgd_access.h,v 1.4 2001/02/20 11:29:52 emile Exp $
Copyright (C) 1999 Jukka Zitting [EMAIL PROTECTED]
Copyright (C) 2000 The Midgard Project ry
Copyright (C) 2000 Emile Heyns, Aurora SA [EMAIL PROTECTED]
@@ -21,7 +21,7 @@
#ifndef MGD_ACCESS_H
#define MGD_ACCESS_H
-#include midgard.h
+#include midgard/midgard.h
#define istopicreader(topic) mgd_istopicreader(mgd_handle(), (topic))
#define istopicowner(topic) mgd_istopicowner(mgd_handle(),(topic))
Index: php4/ext/midgard/mgd_preparser.h
diff -u php4/ext/midgard/mgd_preparser.h:1.3 php4/ext/midgard/mgd_preparser.h:1.4
--- php4/ext/midgard/mgd_preparser.h:1.3Sat Feb 17 15:21:50 2001
+++ php4/ext/midgard/mgd_preparser.hTue Feb 20 03:29:52 2001
@@ -1,4 +1,4 @@
-/* $Id: mgd_preparser.h,v 1.3 2001/02/17 23:21:50 emile Exp $
+/* $Id: mgd_preparser.h,v 1.4 2001/02/20 11:29:52 emile Exp $
Copyright (C) 1999 Jukka Zitting [EMAIL PROTECTED]
Copyright (C) 2000 The Midgard Project ry
Copyright (C) 2000 Emile Heyns, Aurora SA [EMAIL PROTECTED]
@@ -21,7 +21,7 @@
#ifndef MGD_PREPARSER_H
#define MGD_PREPARSER_H
#include "mgd_internal.h"
-#include "midgard.h"
+#include "midgard/midgard.h"
#include glib.h
extern MGD_FUNCTION(template);
Index: php4/ext/midgard/php_midgard.h
diff -u php4/ext/midgard/php_midgard.h:1.4 php4/ext/midgard/php_midgard.h:1.5
--- php4/ext/midgard/php_midgard.h:1.4 Tue Feb 20 02:59:55 2001
+++ php4/ext/midgard/php_midgard.h Tue Feb 20 03:29:52 2001
@@ -1,4 +1,4 @@
-/* $Id: php_midgard.h,v 1.4 2001/02/20 10:59:55 emile Exp $
+/* $Id: php_midgard.h,v 1.5 2001/02/20 11:29:52 emile Exp $
Copyright (C) 1999 Jukka Zitting [EMAIL PROTECTED]
Copyright (C) 2000 The Midgard Project ry
Copyright (C) 2000 Emile Heyns, Aurora SA [EMAIL PROTECTED]
@@ -29,7 +29,7 @@
#if HAVE_MIDGARD
#include php.h
-#include midgard.h
+#include midgard/midgard.h
#include midgard/apache.h
#include Zend/modules.h
--
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]
[PHP-CVS] cvs: php4 /ext/midgard config.m4
emile Tue Feb 20 16:57:28 2001 EDT
Modified files:
/php4/ext/midgard config.m4
Log:
Source files explicitly include midgard/something.h
Index: php4/ext/midgard/config.m4
diff -u php4/ext/midgard/config.m4:1.6 php4/ext/midgard/config.m4:1.7
--- php4/ext/midgard/config.m4:1.6 Tue Feb 20 03:29:51 2001
+++ php4/ext/midgard/config.m4 Tue Feb 20 16:57:28 2001
@@ -1,4 +1,4 @@
-dnl $Id: config.m4,v 1.6 2001/02/20 11:29:51 emile Exp $
+dnl $Id: config.m4,v 1.7 2001/02/21 00:57:28 emile Exp $
dnl Copyright (C) 1999 Jukka Zitting [EMAIL PROTECTED]
dnl Copyright (C) 2000 The Midgard Project ry
@@ -28,7 +28,7 @@
if test "$PHP_MIDGARD" != "no"; then
if test "$PHP_MIDGARD" != "yes"; then
AC_ADD_LIBRARY_WITH_PATH(midgard, "$PHP_MIDGARD/lib", MIDGARD_SHARED_LIBADD)
-AC_ADD_INCLUDE("$PHP_MIDGARD/include/midgard")
+AC_ADD_INCLUDE("$PHP_MIDGARD/include")
else
AC_ADD_LIBRARY(midgard)
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]
[PHP-CVS] cvs: php4 /ext/midgard config.m4
sas Tue Feb 13 03:58:34 2001 EDT
Modified files:
/php4/ext/midgard config.m4
Log:
Outcomment everything contained in here.
This file must not perform any checks, unless the user has enabled
Midgard.
Index: php4/ext/midgard/config.m4
diff -u php4/ext/midgard/config.m4:1.1 php4/ext/midgard/config.m4:1.2
--- php4/ext/midgard/config.m4:1.1 Mon Feb 12 09:23:36 2001
+++ php4/ext/midgard/config.m4 Tue Feb 13 03:58:34 2001
@@ -1,42 +1,42 @@
-dnl $Id: config.m4,v 1.1 2001/02/12 17:23:36 emile Exp $
-dnl config.m4 for extension midgard
-dnl don't forget to call PHP_EXTENSION(midgard)
-
-AC_PROG_YACC
-AC_DECL_YYTEXT
-AC_PROG_LEX
-
-PHP_ARG_WITH(midgard, for midgard support,
-[ --with-midgard Include midgard 1.4 support])
-
-if test "$PHP_MIDGARD" != "no"; then
- if test "$PHP_MIDGARD" != "yes"; then
-AC_ADD_LIBRARY_WITH_PATH(midgard, "$PHP_MIDGARD/lib", MIDGARD_SHARED_LIBADD)
-AC_ADD_INCLUDE("$PHP_MIDGARD/include")
- else
-AC_ADD_LIBRARY(midgard)
- fi
- AC_DEFINE(HAVE_MIDGARD, 1, [ ])
- PHP_EXTENSION(midgard, $ext_shared)
-fi
-
-dnl EEH/TODO: Add checks for apache-static compilation
-AC_PATH_PROG(APXS, apxs)
-if test -z $APXS; then
- AC_MSG_ERROR(apxs not found.)
-fi
-APACHE_INCLUDES=`$APXS -q INCLUDEDIR`
-AC_ADD_INCLUDE($APACHE_INCLUDES)
-
-AC_PATH_PROG(GLIBCONFIG, glib-config)
-dnl Ackackack... why do people do this?
-if test -z $GLIBCONFIG; then
- AC_PATH_PROG(GLIBCONFIG, glib12-config)
-fi
-if test -z $GLIBCONFIG; then
- AC_MSG_ERROR(glib-config not found. Did you install glib?)
-fi
-AC_ADD_LIBRARY_WITH_PATH(`$GLIBCONFIG --libs`)
-LFLAGS="-Pmgd -olex.yy.c"
-
-PHP_SUBST(GLIBCONFIG)
+dnl dnl $Id: config.m4,v 1.2 2001/02/13 11:58:34 sas Exp $
+dnl dnl config.m4 for extension midgard
+dnl dnl don't forget to call PHP_EXTENSION(midgard)
+dnl
+dnl AC_PROG_YACC
+dnl AC_DECL_YYTEXT
+dnl AC_PROG_LEX
+dnl
+dnl PHP_ARG_WITH(midgard, for midgard support,
+dnl [ --with-midgard Include midgard 1.4 support])
+dnl
+dnl if test "$PHP_MIDGARD" != "no"; then
+dnl if test "$PHP_MIDGARD" != "yes"; then
+dnl AC_ADD_LIBRARY_WITH_PATH(midgard, "$PHP_MIDGARD/lib", MIDGARD_SHARED_LIBADD)
+dnl AC_ADD_INCLUDE("$PHP_MIDGARD/include")
+dnl else
+dnl AC_ADD_LIBRARY(midgard)
+dnl fi
+dnl AC_DEFINE(HAVE_MIDGARD, 1, [ ])
+dnl PHP_EXTENSION(midgard, $ext_shared)
+dnl fi
+dnl
+dnl dnl EEH/TODO: Add checks for apache-static compilation
+dnl AC_PATH_PROG(APXS, apxs)
+dnl if test -z $APXS; then
+dnl AC_MSG_ERROR(apxs not found.)
+dnl fi
+dnl APACHE_INCLUDES=`$APXS -q INCLUDEDIR`
+dnl AC_ADD_INCLUDE($APACHE_INCLUDES)
+dnl
+dnl AC_PATH_PROG(GLIBCONFIG, glib-config)
+dnl dnl Ackackack... why do people do this?
+dnl if test -z $GLIBCONFIG; then
+dnl AC_PATH_PROG(GLIBCONFIG, glib12-config)
+dnl fi
+dnl if test -z $GLIBCONFIG; then
+dnl AC_MSG_ERROR(glib-config not found. Did you install glib?)
+dnl fi
+dnl AC_ADD_LIBRARY_WITH_PATH(`$GLIBCONFIG --libs`)
+dnl LFLAGS="-Pmgd -olex.yy.c"
+dnl
+dnl PHP_SUBST(GLIBCONFIG)
--
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]
[PHP-CVS] cvs: php4 /ext/midgard config.m4
emile Tue Feb 13 08:13:34 2001 EDT
Modified files:
/php4/ext/midgard config.m4
Log:
Misplaced if spotted by Sascha
Index: php4/ext/midgard/config.m4
diff -u php4/ext/midgard/config.m4:1.2 php4/ext/midgard/config.m4:1.3
--- php4/ext/midgard/config.m4:1.2 Tue Feb 13 03:58:34 2001
+++ php4/ext/midgard/config.m4 Tue Feb 13 08:13:34 2001
@@ -1,42 +1,42 @@
-dnl dnl $Id: config.m4,v 1.2 2001/02/13 11:58:34 sas Exp $
-dnl dnl config.m4 for extension midgard
-dnl dnl don't forget to call PHP_EXTENSION(midgard)
-dnl
-dnl AC_PROG_YACC
-dnl AC_DECL_YYTEXT
-dnl AC_PROG_LEX
-dnl
-dnl PHP_ARG_WITH(midgard, for midgard support,
-dnl [ --with-midgard Include midgard 1.4 support])
-dnl
-dnl if test "$PHP_MIDGARD" != "no"; then
-dnl if test "$PHP_MIDGARD" != "yes"; then
-dnl AC_ADD_LIBRARY_WITH_PATH(midgard, "$PHP_MIDGARD/lib", MIDGARD_SHARED_LIBADD)
-dnl AC_ADD_INCLUDE("$PHP_MIDGARD/include")
-dnl else
-dnl AC_ADD_LIBRARY(midgard)
-dnl fi
-dnl AC_DEFINE(HAVE_MIDGARD, 1, [ ])
-dnl PHP_EXTENSION(midgard, $ext_shared)
-dnl fi
-dnl
-dnl dnl EEH/TODO: Add checks for apache-static compilation
-dnl AC_PATH_PROG(APXS, apxs)
-dnl if test -z $APXS; then
-dnl AC_MSG_ERROR(apxs not found.)
-dnl fi
-dnl APACHE_INCLUDES=`$APXS -q INCLUDEDIR`
-dnl AC_ADD_INCLUDE($APACHE_INCLUDES)
-dnl
-dnl AC_PATH_PROG(GLIBCONFIG, glib-config)
-dnl dnl Ackackack... why do people do this?
-dnl if test -z $GLIBCONFIG; then
-dnl AC_PATH_PROG(GLIBCONFIG, glib12-config)
-dnl fi
-dnl if test -z $GLIBCONFIG; then
-dnl AC_MSG_ERROR(glib-config not found. Did you install glib?)
-dnl fi
-dnl AC_ADD_LIBRARY_WITH_PATH(`$GLIBCONFIG --libs`)
-dnl LFLAGS="-Pmgd -olex.yy.c"
-dnl
-dnl PHP_SUBST(GLIBCONFIG)
+dnl $Id: config.m4,v 1.3 2001/02/13 16:13:34 emile Exp $
+dnl config.m4 for extension midgard
+dnl don't forget to call PHP_EXTENSION(midgard)
+
+AC_PROG_YACC
+AC_DECL_YYTEXT
+AC_PROG_LEX
+
+PHP_ARG_WITH(midgard, for midgard support,
+[ --with-midgard Include midgard 1.4 support])
+
+if test "$PHP_MIDGARD" != "no"; then
+ if test "$PHP_MIDGARD" != "yes"; then
+AC_ADD_LIBRARY_WITH_PATH(midgard, "$PHP_MIDGARD/lib", MIDGARD_SHARED_LIBADD)
+AC_ADD_INCLUDE("$PHP_MIDGARD/include")
+ 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)
+ if test -z $APXS; then
+AC_MSG_ERROR(apxs not found.)
+ fi
+ APACHE_INCLUDES=`$APXS -q INCLUDEDIR`
+ AC_ADD_INCLUDE($APACHE_INCLUDES)
+
+ AC_PATH_PROG(GLIBCONFIG, glib-config)
+ dnl Ackackack... why do people do this?
+ if test -z $GLIBCONFIG; then
+AC_PATH_PROG(GLIBCONFIG, glib12-config)
+ fi
+ if test -z $GLIBCONFIG; then
+AC_MSG_ERROR(glib-config not found. Did you install glib?)
+ fi
+ AC_ADD_LIBRARY_WITH_PATH(`$GLIBCONFIG --libs`)
+ LFLAGS="-Pmgd -olex.yy.c"
+
+ PHP_SUBST(GLIBCONFIG)
+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]
