Re: cvs: php4 / acinclude.m4 configure.in /build build.mk

I don't see any agreement anywhere about this..why did you commit this crap anyway? You never explained what the possible use of '--disable-bundle-all' might be? (whatta hell does it?) Is it related to MacOSX somehow? As it has *.bundle libs.. --Jani On Fri, 2 May 2003, Sterling Hughes wrote: >sterling Thu May 1 23:14:00 2003 EDT > > Modified files: > /php4 configure.in acinclude.m4 > /php4/build build.mk > Log: > beginnings of php5/bundle support > > >Index: php4/configure.in >diff -u php4/configure.in:1.443 php4/configure.in:1.444 >--- php4/configure.in:1.443 Sun Apr 13 16:09:32 2003 >+++ php4/configure.in Thu May 1 23:14:00 2003 >@@ -1,4 +1,4 @@ >-dnl ## $Id: configure.in,v 1.443 2003/04/13 20:09:32 sas Exp $ -*- sh -*- >+dnl ## $Id: configure.in,v 1.444 2003/05/02 03:14:00 sterling Exp $ -*- sh -*- > dnl ## Process this file with autoconf to produce a configure script. > > divert(1) >@@ -777,8 +777,15 @@ > PHP_ENABLE_ALL=$enableval > ]) > >+AC_ARG_ENABLE(bundle-all, >+[ --disable-bundle-all Disable all bundled libraries by default. >+], [ >+ PHP_BUNDLE_ALL=$enableval >+]) >+ > # reading config stubs > esyscmd(./build/config-stubs ext) >+esyscmd(./build/config-stubs bundle) > > > dnl Other settings. >Index: php4/acinclude.m4 >diff -u php4/acinclude.m4:1.239 php4/acinclude.m4:1.240 >--- php4/acinclude.m4:1.239 Fri Apr 25 04:54:02 2003 >+++ php4/acinclude.m4 Thu May 1 23:14:00 2003 >@@ -1,4 +1,4 @@ >-dnl $Id: acinclude.m4,v 1.239 2003/04/25 08:54:02 sniper Exp $ >+dnl $Id: acinclude.m4,v 1.240 2003/05/02 03:14:00 sterling Exp $ > dnl > dnl This file contains local autoconf functions. > >@@ -573,6 +573,23 @@ > > if test "$PHP_ENABLE_ALL" && test "$6" = "yes"; then > $5=$PHP_ENABLE_ALL >+ fi >+]) >+PHP_ARG_ANALYZE($5,[$2],$6) >+]) >+ >+AC_DEFUN([PHP_ARG_BUNDLE],[ >+PHP_REAL_ARG_BUNDLE([$1],[$2],[$3],[$4],PHP_[]translit($1,a-z-,A-Z_),[ifelse($5,,yes,$5)]) >+]) >+ >+AC_DEFUN([PHP_REAL_ARG_BUNDLE],[ >+ifelse([$2],,,[AC_MSG_CHECKING([$2])]) >+AC_ARG_ENABLE($1,[$3],$5=[$]enableval, >+[ >+ $5=ifelse($4,,no,$4) >+ >+ if test "$PHP_BUNDLE_ALL" && test "$6" = "yes"; then >+ $5=$PHP_BUNDLE_ALL > fi > ]) > PHP_ARG_ANALYZE($5,[$2],$6) >Index: php4/build/build.mk >diff -u php4/build/build.mk:1.18 php4/build/build.mk:1.19 >--- php4/build/build.mk:1.18 Mon Oct 21 11:11:19 2002 >+++ php4/build/build.mk Thu May 1 23:14:00 2003 >@@ -14,7 +14,7 @@ > # | Author: Sascha Schumann <sascha@schumann.cx> | > # +----------------------------------------------------------------------+ > # >-# $Id: build.mk,v 1.18 2002/10/21 15:11:19 hholzgra Exp $ >+# $Id: build.mk,v 1.19 2003/05/02 03:14:00 sterling Exp $ > # > # > # Makefile to generate build tools >@@ -36,7 +36,7 @@ > @echo makefile_am_files = $(ZENDDIR)/Makefile.am \ > TSRM/Makefile.am > $@ > @echo config_h_files = $(ZENDDIR)/acconfig.h TSRM/acconfig.h >> $@ >- @echo config_m4_files = $(ZENDDIR)/Zend.m4 TSRM/tsrm.m4 TSRM/threads.m4 \ >+ @echo config_m4_files = $(ZENDDIR)/Zend.m4 TSRM/tsrm.m4 TSRM/threads.m4 bundle/*/config*.m4 \ > $(ZENDDIR)/acinclude.m4 ext/*/config*.m4 sapi/*/config.m4 >> $@ > > $(STAMP): build/buildcheck.sh > > > > -- <- For Sale! ->