On Thu, Jan 29, 2004 at 02:07:28PM +0100, Sascha Schumann wrote:
> On Thu, 29 Jan 2004, Patrick Welche wrote:
>
> > On Fri, Jan 23, 2004 at 08:51:16AM +0100, Sascha Schumann wrote:
> > > If you want to propose modifications to the current build
> > > chain, feel free to post a patch.
> >
> > Enclosed is an even nicer patch. I shouldn't have mentioned the "cat"
> > warning in the previous posting - it has nothing to do with me.
>
> Please use "diff -u" when creating patches for improved
> readability.
Attached.
Patrick
Index: configure.in
===================================================================
RCS file: /repository/php-src/configure.in,v
retrieving revision 1.490
diff -u -r1.490 configure.in
--- configure.in 17 Jan 2004 12:59:11 -0000 1.490
+++ configure.in 29 Jan 2004 17:59:35 -0000
@@ -143,10 +143,13 @@
AC_MSG_RESULT(${1}.${2} (ok))
fi
AC_PROG_LEX
-if test -n "$LEX"; then
- AC_DECL_YYTEXT
- :
-fi
+# The following is redundant as AC_DECL_YYTEXT is now integrated in AC_PROG_LEX
+AC_CACHE_CHECK([yytext declaration (if [AC@&[EMAIL PROTECTED] is old)],
+ ac_cv_prog_lex_yytext_pointer,
+ [if test -n "$LEX"; then
+ AC_DECL_YYTEXT
+ :
+ fi])
dnl ## Make flex scanners use const if they can, even if __STDC__ is not
dnl ## true, for compilers like Sun's that only set __STDC__ true in
dnl ## "limit-to-ANSI-standard" mode, not in "ANSI-compatible" mode
Index: build/build2.mk
===================================================================
RCS file: /repository/php-src/build/build2.mk,v
retrieving revision 1.30
diff -u -r1.30 build2.mk
--- build/build2.mk 8 Jan 2004 17:31:49 -0000 1.30
+++ build/build2.mk 29 Jan 2004 17:59:35 -0000
@@ -30,7 +30,7 @@
acconfig_h_SOURCES = acconfig.h.in $(config_h_files)
-targets = $(TOUCH_FILES) configure $(config_h_in)
+targets = $(TOUCH_FILES) aclocal.m4 configure $(config_h_in)
all: $(targets)
@@ -54,10 +54,32 @@
aclocal.m4: configure.in acinclude.m4
@echo rebuilding $@
@libtoolize=`./build/shtool path glibtoolize libtoolize`; \
- $$libtoolize --copy --automake; \
- ltpath=`dirname $$libtoolize`; \
- ltfile=`cd $$ltpath/../share/aclocal; pwd`/libtool.m4; \
- cat acinclude.m4 $$ltfile > $@
+ $$libtoolize --copy --automake
+# Using AC_CONFIG_MACRO_DIR from post 2003-10-08 autoconf 2.57f
+# avoids the `pwd` guessing.
+ ltfile="`pwd`/libtool.m4"; \
+ ltsugar=""; \
+ if test -f $$ltfile; then \
+ ltsugar="`pwd`/ltsugar.m4"; \
+ if test ! -f $$ltsugar; then \
+ ltsugar=""; \
+ fi; \
+ else \
+ ltpath=`dirname $$libtoolize`; \
+ ltfile=`cd $$ltpath/../share/aclocal; pwd`/libtool.m4; \
+ echo "there: $$ltfile"; \
+ fi; \
+ if test -r "$ltfile"; then \
+ : \
+ else \
+ echo "buildconf: $ltfile does not exist."; \
+ echo " Please reinstall libtool."; \
+ exit 1; \
+ fi; \
+ echo "m4_include([acinclude.m4])" > $@ ; \
+ for _m in $$ltfile $$ltsugar; do \
+ echo "m4_include([$$_m])" >> $@ ; \
+ done
configure: aclocal.m4 configure.in $(config_m4_files)
@echo rebuilding $@
Index: build/buildcheck.sh
===================================================================
RCS file: /repository/php-src/build/buildcheck.sh,v
retrieving revision 1.30
diff -u -r1.30 buildcheck.sh
--- build/buildcheck.sh 8 Jan 2004 17:31:49 -0000 1.30
+++ build/buildcheck.sh 29 Jan 2004 17:59:35 -0000
@@ -50,6 +50,7 @@
stamp=
fi
+
# libtoolize 1.4.3 or newer
# Prefer glibtoolize over libtoolize for Mac OS X compatibility
libtoolize=`./build/shtool path glibtoolize libtoolize 2> /dev/null`
@@ -61,14 +62,33 @@
exit 1
fi
IFS=.; set $lt_pversion; IFS=' '
-
+lt_first=$1
+lt_second=$2
if test "$3" = ""; then
- third=0
+ lt_third=0
else
- third=$3
+ lt_third=$3
+fi
+
+# since 2003-11-26 / 1.5a, libtoolize --version looks like
+# libtoolize (GNU $PACKAGE$TIMESTAMP) $VERSION
+# for example
+# libtoolize (GNU libtool 1.1385 2004/01/22 22:25:42) 1.5a
+set $lt_second
+if test "$1" -gt "1000"; then
+ # last sed to remove 'a' in 1.5a
+ lt_pversion=`$libtoolize --version 2>/dev/null|head -n 1|sed 's/^.*) //'`
+ IFS=.; set $lt_pversion; IFS=' '
+ lt_first=$1
+ lt_second=`echo $2|sed 's/[^0-9.]*$//'`
+ if test "$3" = ""; then
+ lt_third=0
+ else
+ lt_third=$3
+ fi
fi
-if test "$1" -gt "1" || test "$2" -ge "5" || (test "$2" -ge "4" && test "$third" -ge
"3")
+if test "$lt_first" -gt "1" || test "$lt_second" -ge "5" || (test "$lt_second" -ge
"4" && test "$lt_third" -ge "3")
then
echo "buildconf: libtool version $lt_pversion (ok)"
else
@@ -78,16 +98,6 @@
exit 1
fi
-ltpath=`echo $libtoolize | sed -e 's#/[^/]*/[^/]*$##'`
-ltfile="$ltpath/share/aclocal/libtool.m4"
-if test -r "$ltfile"; then
- :
-else
- echo "buildconf: $ltfile does not exist."
- echo " Please reinstall libtool."
- exit 1
-fi
-
test -n "$stamp" && touch $stamp
exit 0
--
PHP Internals - PHP Runtime Development Mailing List
To unsubscribe, visit: http://www.php.net/unsub.php
