sniper Wed Jan 19 18:03:30 2005 EDT
Modified files:
/php-src buildconf
/php-src/build build2.mk
Log:
Added --debug option to buildconf
http://cvs.php.net/diff.php/php-src/buildconf?r1=1.62&r2=1.63&ty=u
Index: php-src/buildconf
diff -u php-src/buildconf:1.62 php-src/buildconf:1.63
--- php-src/buildconf:1.62 Tue Dec 2 03:00:23 2003
+++ php-src/buildconf Wed Jan 19 18:03:29 2005
@@ -1,5 +1,5 @@
#!/bin/sh
-# $Id: buildconf,v 1.62 2003/12/02 08:00:23 sniper Exp $
+# $Id: buildconf,v 1.63 2005/01/19 23:03:29 sniper Exp $
eval `grep '^EXTRA_VERSION=' configure.in`
case "$EXTRA_VERSION" in
@@ -12,6 +12,7 @@
esac
devok=0
+debug=no
while test $# -gt 0; do
if test "$1" = "--copy"; then
@@ -23,6 +24,10 @@
echo "Forcing buildconf"
fi
+ if test "$1" = "--debug"; then
+ debug=yes
+ fi
+
shift
done
@@ -48,17 +53,17 @@
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"
http://cvs.php.net/diff.php/php-src/build/build2.mk?r1=1.32&r2=1.33&ty=u
Index: php-src/build/build2.mk
diff -u php-src/build/build2.mk:1.32 php-src/build/build2.mk:1.33
--- php-src/build/build2.mk:1.32 Wed Jan 19 17:27:39 2005
+++ php-src/build/build2.mk Wed Jan 19 18:03:29 2005
@@ -14,7 +14,7 @@
# | Author: Sascha Schumann <[EMAIL PROTECTED]> |
# +----------------------------------------------------------------------+
#
-# $Id: build2.mk,v 1.32 2005/01/19 22:27:39 sniper Exp $
+# $Id: build2.mk,v 1.33 2005/01/19 23:03:29 sniper Exp $
#
include generated_lists
@@ -32,6 +32,11 @@
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 @@
@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 @@
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)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
