diff options
Diffstat (limited to 'build')
| -rw-r--r-- | build/build.mk | 4 | ||||
| -rwxr-xr-x | build/buildcheck.sh | 17 | ||||
| -rw-r--r-- | build/genif.sh | 2 |
3 files changed, 15 insertions, 8 deletions
diff --git a/build/build.mk b/build/build.mk index 51961f66b..841d91c92 100644 --- a/build/build.mk +++ b/build/build.mk @@ -14,7 +14,7 @@ # | Author: Sascha Schumann <sascha@schumann.cx> | # +----------------------------------------------------------------------+ # -# $Id: build.mk 287074 2009-08-11 02:21:09Z dsp $ +# $Id: build.mk 313218 2011-07-13 23:28:48Z fat $ # # # Makefile to generate build tools @@ -68,7 +68,7 @@ cvsclean-work: done svnclean-work: - @for i in `find . -type d -not -path '*/.svn/*' | grep -v '.svn'`; do \ + @for i in `find . -type d ! -path '*/.svn/*' | grep -v '.svn'`; do \ (cd $$i 2>/dev/null && rm -rf `svn propget svn:ignore . | grep -v config.nice` *.o *.a *.lo *.la *.gcno *.gcda .libs || true); \ done diff --git a/build/buildcheck.sh b/build/buildcheck.sh index 4d76bf24d..de1626442 100755 --- a/build/buildcheck.sh +++ b/build/buildcheck.sh @@ -42,14 +42,21 @@ echo "buildconf: autoconf version $ac_version found." echo " You need autoconf version 2.13 or newer installed" echo " to build PHP from SVN." exit 1 +fi + +if test "$1" = "2" -a "$2" -gt "59"; then + echo "buildconf: You need autoconf 2.59 or lower to build this version of PHP." + echo " You are currently trying to use $ac_version" + echo " Most distros have separate autoconf 2.13 or 2.59 packages." + echo " On Debian/Ubuntu both autoconf2.13 and autoconf2.59 packages exist." + echo " Install autoconf2.13 and set the PHP_AUTOCONF env var to " + echo " autoconf2.13 and try again." + exit 1 else -echo "buildconf: autoconf version $ac_version (ok)" + echo "buildconf: autoconf version $ac_version (ok)" fi -if test "$1" = "2" && test "$2" -ge "50"; then - echo "buildconf: Your version of autoconf likely contains buggy cache code." - echo " Running vcsclean for you." - echo " To avoid this, install autoconf-2.13." +if test "$1" = "2" -a "$2" -ge "50"; then ./vcsclean stamp= fi diff --git a/build/genif.sh b/build/genif.sh index 61d1f0045..14e19b7d9 100644 --- a/build/genif.sh +++ b/build/genif.sh @@ -24,7 +24,7 @@ cd $srcdir module_ptrs="$extra_module_ptrs`echo $@ | $awk -f ./build/order_by_dep.awk`" for ext in ${1+"$@"} ; do - header_list="$header_list ext/$ext/*.h" + header_list="$header_list ext/$ext/*.h*" done includes=`$awk -f ./build/print_include.awk $header_list` |