Move templates cleanup to phpize and buildconf parts

Author: petk

build/build2.mk

@@ -22,17 +22,20 @@ targets = configure $(config_h_in)
 
 PHP_AUTOCONF ?= 'autoconf'
 PHP_AUTOHEADER ?= 'autoheader'
+SED ?= 'sed'
 
 SUPPRESS_WARNINGS ?= 2>&1 | (egrep -v '(AC_PROG_CXXCPP was called before AC_PROG_CXX|defined in acinclude.m4 but never used)'||true)
 
 all: $(targets)
 
 $(config_h_in): configure
-# explicitly remove target since autoheader does not seem to work
-# correctly otherwise (timestamps are not updated)
+# Explicitly remove target since autoheader does not seem to work correctly
+# otherwise (timestamps are not updated).
+# Also disable PACKAGE_* symbols in php_config.h.in
 	@echo rebuilding $@
 	@rm -f $@
 	$(PHP_AUTOHEADER) $(SUPPRESS_WARNINGS)
+	$(SED) -e 's/^#undef PACKAGE_[^ ]*/\/\* && \*\//g' < $@ > $@.tmp && mv $@.tmp $@
 
 aclocal.m4: configure.ac acinclude.m4
 	@echo rebuilding $@

buildconf

@@ -3,6 +3,7 @@
 # A wrapper around Autoconf that generates files to build PHP on *nix systems.
 
 MAKE=${MAKE:-make}
+SED=${SED:-sed}
 force=0
 debug=0
 

configure.ac

@@ -1727,11 +1727,4 @@ Check '[$]0 --help' for available options
 fi
 ])
 
-AC_CONFIG_COMMANDS_POST([
-  # Disable PACKAGE_* symbols in main/php_config.h.in
-  $SED -e 's/^#undef PACKAGE_[^ ]*/\/\* & \*\//g' < $srcdir/main/php_config.h.in \
-    > $srcdir/main/php_config.h.in.tmp && \
-    mv $srcdir/main/php_config.h.in.tmp $srcdir/main/php_config.h.in
-])
-
 AC_OUTPUT

scripts/phpize.in

@@ -160,6 +160,10 @@ phpize_autotools()
 {
   $PHP_AUTOCONF   || exit 1
   $PHP_AUTOHEADER || exit 1
+
+  # Disable PACKAGE_* symbols in config.h.in
+  $SED -e 's/^#undef PACKAGE_[^ ]*/\/\* & \*\//g' < config.h.in > config.h.in.tmp
+  mv config.h.in.tmp config.h.in
 }
 
 # Main script

scripts/phpize.m4

@@ -205,11 +205,4 @@ test -d modules || $php_shtool mkdir modules
 
 AC_CONFIG_HEADERS([config.h])
 
-AC_CONFIG_COMMANDS_POST([
-  # Disable PACKAGE_* symbols in config.h.in
-  $SED -e 's/^#undef PACKAGE_[^ ]*/\/\* & \*\//g' < $srcdir/config.h.in \
-    > $srcdir/config.h.in.tmp && \
-    mv $srcdir/config.h.in.tmp $srcdir/config.h.in
-])
-
 AC_OUTPUT