MFH: Added --debug option to buildconf

diff --git a/build/build2.mk b/build/build2.mk
index e0472ad6b918265064bedd2d6d0059c7acc58059..db1a7af01ab42d29f4236833bb56de669a2256ab 100644 (file)
--- a/build/build2.mk
+++ b/build/build2.mk
@@ -32,6 +32,11 @@ acconfig_h_SOURCES = acconfig.h.in $(config_h_files)
 
 targets = $(TOUCH_FILES) configure $(config_h_in)
 
+ifeq ($(SHOW_WARNINGS), no)
+       SUPPRESS_WARNINGS = 2>&1 | (egrep -v '(AC_TRY_RUN called without default to allow cross compiling|AC_PROG_CXXCPP was called before AC_PROG_CXX|defined in acinclude.m4 but never used|AC_PROG_LEX invoked multiple times|AC_DECL_YYTEXT is expanded from...|the top level)'||true)
+       libtoolize_flags = --automake
+endif
+
 
 all: $(targets)
 
@@ -39,14 +44,12 @@ acconfig.h: $(acconfig_h_SOURCES)
        @echo rebuilding $@
        cat $(acconfig_h_SOURCES) > $@
 
-SUPPRESS_WARNINGS = (egrep -v '(AC_TRY_RUN called without default to allow cross compiling|AC_PROG_CXXCPP was called before AC_PROG_CXX|defined in acinclude.m4 but never used|AC_PROG_LEX invoked multiple times|AC_DECL_YYTEXT is expanded from...|the top level)'||true)
-
 $(config_h_in): configure acconfig.h
 # explicitly remove target since autoheader does not seem to work 
 # correctly otherwise (timestamps are not updated)
        @echo rebuilding $@
        @rm -f $@
-       @autoheader 2>&1 | $(SUPPRESS_WARNINGS)
+       @autoheader $(SUPPRESS_WARNINGS)
 
 $(TOUCH_FILES):
        touch $(TOUCH_FILES)
@@ -54,11 +57,11 @@ $(TOUCH_FILES):
 aclocal.m4: configure.in acinclude.m4
        @echo rebuilding $@
        @libtoolize=`./build/shtool path glibtoolize libtoolize`; \
-       $$libtoolize --copy --automake; \
+       $$libtoolize --copy $(libtoolize_flags); \
        ltpath=`dirname $$libtoolize`; \
        ltfile=`cd $$ltpath/../share/aclocal; pwd`/libtool.m4; \
        cat acinclude.m4 $$ltfile > $@
 
 configure: aclocal.m4 configure.in $(config_m4_files)
        @echo rebuilding $@
-       @autoconf 2>&1 | $(SUPPRESS_WARNINGS)
+       @autoconf $(SUPPRESS_WARNINGS)

diff --git a/buildconf b/buildconf
index 41247c133123ad1884ec10c89f4f9f0f6f8e2dda..ccad6cf1353ba6e3c2c64b262dfb231c599a1b13 100755 (executable)
--- a/buildconf
+++ b/buildconf
@@ -3,62 +3,67 @@
 
 eval `grep '^EXTRA_VERSION=' configure.in`
 case "$EXTRA_VERSION" in
-       *-dev)
-               dev=1
-               ;;
-       *)
-               dev=0
-               ;;
+  *-dev)
+    dev=1
+    ;;
+  *)
+    dev=0
+    ;;
 esac
 
 devok=0
+debug=no
 
 while test $# -gt 0; do
-    if test "$1" = "--copy"; then
-        automake_flags=--copy
-    fi
+  if test "$1" = "--copy"; then
+    automake_flags=--copy
+  fi
+
+  if test "$1" = "--force"; then
+    devok=1
+    echo "Forcing buildconf"
+  fi
 
-       if test "$1" = "--force"; then
-               devok=1
-               echo "Forcing buildconf"
-       fi
+  if test "$1" = "--debug"; then
+    debug=yes
+  fi
 
-    shift
+  shift
 done
 
 if test "$dev" = "0" -a "$devok" = "0"; then
-       echo "You should not run buildconf in a release package."
-       echo "use buildconf --force to override this check."
-       exit 1
+  echo "You should not run buildconf in a release package."
+  echo "use buildconf --force to override this check."
+  exit 1
 fi
 
 if test -z "$ZENDDIR"; then
-    if grep "PHP_MAJOR_VERSION 5" main/php_version.h >/dev/null; then
-      v=5
+  if grep "PHP_MAJOR_VERSION 5" main/php_version.h >/dev/null; then
+    v=5
+  else
+    v=4
+  fi
+
+  if test "$v" = "5"; then
+    if test -r "Zend/OBJECTS2_HOWTO"; then
+      :
     else
-      v=4
+      mv Zend ZendEngine1 2>/dev/null
+      mv ZendEngine2 Zend
     fi
-  
-    if test "$v" = "5"; then
-      if test -r "Zend/OBJECTS2_HOWTO"; then
-        :
-      else
-        mv Zend ZendEngine1 2>/dev/null
-        mv ZendEngine2 Zend
-      fi
+  else
+    if test -r "Zend/zend_execute_globals.h"; then
+      :
     else
-      if test -r "Zend/zend_execute_globals.h"; then
-           :
-      else
-        mv Zend ZendEngine2 2>/dev/null
-        mv ZendEngine1 Zend
-      fi
+      mv Zend ZendEngine2 2>/dev/null
+      mv ZendEngine1 Zend
     fi
+  fi
 
-    ZENDDIR=Zend
-    echo "using default Zend directory"
+  ZENDDIR=Zend
+  echo "using default Zend directory"
 fi
  
 rm -f generated_lists
 
-${MAKE:-make} -s -f build/build.mk AMFLAGS="$automake_flags" ZENDDIR="$ZENDDIR"
+${MAKE:-make} -s -f build/build.mk AMFLAGS="$automake_flags" ZENDDIR="$ZENDDIR" SHOW_WARNINGS="$debug"