beginnings of php5/bundle support

acinclude.m4

@@ -578,6 +578,23 @@ AC_ARG_ENABLE($1,[$3],$5=[$]enableval,
 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)
+])
+
 AC_DEFUN([PHP_MODULE_PTR],[
   EXTRA_MODULE_PTRS="$EXTRA_MODULE_PTRS $1,"
 ])

build/build.mk

@@ -36,7 +36,7 @@ generated_lists:
 	@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

configure.in

@@ -777,8 +777,15 @@ AC_ARG_ENABLE(all,
   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.