From: foobar <sniper@php.net>
Date: Thu, 3 Feb 2005 17:42:42 +0000 (+0000)
Subject: - Fix buildconf with BSD make
X-Git-Tag: RELEASE_0_2~92
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=996c9d85d7cee9a9b289d39a96c8af77e0b30821;p=php

- Fix buildconf with BSD make
---

diff --git a/build/build2.mk b/build/build2.mk
index 42e20670b8..c361d0d425 100644
--- a/build/build2.mk
+++ b/build/build2.mk
@@ -32,14 +32,9 @@ 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)
-else
-	debug_target = debugging
-endif
+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)
 
-
-all: $(targets) $(debug_target)
+all: $(targets)
 
 acconfig.h: $(acconfig_h_SOURCES)
 	@echo rebuilding $@
@@ -63,6 +58,3 @@ configure: aclocal.m4 configure.in $(config_m4_files)
 	@echo rebuilding $@
 	autoconf $(SUPPRESS_WARNINGS)
 
-debugging:
-	@libtoolize=`./build/shtool path glibtoolize libtoolize`; \
-	$$libtoolize
diff --git a/buildconf b/buildconf
index ccad6cf135..8b91c3b147 100755
--- a/buildconf
+++ b/buildconf
@@ -66,4 +66,8 @@ fi
  
 rm -f generated_lists
 
-${MAKE:-make} -s -f build/build.mk AMFLAGS="$automake_flags" ZENDDIR="$ZENDDIR" SHOW_WARNINGS="$debug"
+if test "$debug" = "yes"; then
+  ${MAKE:-make} -s -f build/build.mk AMFLAGS="$automake_flags" ZENDDIR="$ZENDDIR" SUPPRESS_WARNINGS=""
+else
+  ${MAKE:-make} -s -f build/build.mk AMFLAGS="$automake_flags" ZENDDIR="$ZENDDIR"
+fi