sniper Thu Feb 3 12:43:04 2005 EDT
Modified files: (Branch: PHP_4_3)
/php-src buildconf
/php-src/build build2.mk
Log:
MFH: Fix buildconf with BSD make
http://cvs.php.net/diff.php/php-src/buildconf?r1=1.57.4.3&r2=1.57.4.4&ty=u
Index: php-src/buildconf
diff -u php-src/buildconf:1.57.4.3 php-src/buildconf:1.57.4.4
--- php-src/buildconf:1.57.4.3 Wed Jan 19 18:04:21 2005
+++ php-src/buildconf Thu Feb 3 12:43:04 2005
@@ -1,5 +1,5 @@
#!/bin/sh
-# $Id: buildconf,v 1.57.4.3 2005/01/19 23:04:21 sniper Exp $
+# $Id: buildconf,v 1.57.4.4 2005/02/03 17:43:04 sniper Exp $
eval `grep '^EXTRA_VERSION=' configure.in`
case "$EXTRA_VERSION" in
@@ -66,4 +66,8 @@
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
http://cvs.php.net/diff.php/php-src/build/build2.mk?r1=1.27.4.7&r2=1.27.4.8&ty=u
Index: php-src/build/build2.mk
diff -u php-src/build/build2.mk:1.27.4.7 php-src/build/build2.mk:1.27.4.8
--- php-src/build/build2.mk:1.27.4.7 Wed Jan 19 20:43:18 2005
+++ php-src/build/build2.mk Thu Feb 3 12:43:04 2005
@@ -14,7 +14,7 @@
# | Author: Sascha Schumann <[EMAIL PROTECTED]> |
# +----------------------------------------------------------------------+
#
-# $Id: build2.mk,v 1.27.4.7 2005/01/20 01:43:18 sniper Exp $
+# $Id: build2.mk,v 1.27.4.8 2005/02/03 17:43:04 sniper Exp $
#
include generated_lists
@@ -32,14 +32,9 @@
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 @@
@echo rebuilding $@
autoconf $(SUPPRESS_WARNINGS)
-debugging:
- @libtoolize=`./build/shtool path glibtoolize libtoolize`; \
- $$libtoolize
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
