Added --debug option to buildconf

2 files changed, 16 insertions, 8 deletions

diff --git a/build/build2.mk b/build/build2.mk
index 9b3d538d19..97fd53ee44 100644
--- 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)'||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 95aa69c1ba..ccad6cf135 100755
--- a/buildconf
+++ b/buildconf
@@ -12,6 +12,7 @@ case "$EXTRA_VERSION" in
 esac
 
 devok=0
+debug=no
 
 while test $# -gt 0; do
   if test "$1" = "--copy"; then
@@ -23,6 +24,10 @@ while test $# -gt 0; do
     echo "Forcing buildconf"
   fi
 
+  if test "$1" = "--debug"; then
+    debug=yes
+  fi
+
   shift
 done
 
@@ -48,17 +53,17 @@ if test -z "$ZENDDIR"; then
     fi
   else
     if test -r "Zend/zend_execute_globals.h"; then
-	  :
+      :
     else
       mv Zend ZendEngine2 2>/dev/null
       mv ZendEngine1 Zend
     fi
   fi
-	
+
   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"