sniper Thu May 24 21:40:41 2007 UTC
Modified files: (Branch: PHP_5_2)
/php-src Makefile.frag acinclude.m4 configure.in
/php-src/ext/standard Makefile.frag
/php-src/ext/tokenizer Makefile.frag
Log:
- Allow build without flex/bison installed (fixes builddir != srcdir build
when using distributed sources which inlude pre-generated bison/flex
output. See bug #38762 for more..)
http://cvs.php.net/viewvc.cgi/php-src/Makefile.frag?r1=1.3.4.1&r2=1.3.4.1.2.1&diff_format=u
Index: php-src/Makefile.frag
diff -u php-src/Makefile.frag:1.3.4.1 php-src/Makefile.frag:1.3.4.1.2.1
--- php-src/Makefile.frag:1.3.4.1 Sun Oct 16 20:41:26 2005
+++ php-src/Makefile.frag Thu May 24 21:40:41 2007
@@ -3,21 +3,21 @@
# Zend
#
-$(builddir)/zend_language_scanner.lo: $(builddir)/zend_language_parser.h
-$(builddir)/zend_ini_scanner.lo: $(builddir)/zend_ini_parser.h
+$(builddir)/zend_language_scanner.lo: $(srcdir)/zend_language_parser.h
+$(builddir)/zend_ini_scanner.lo: $(srcdir)/zend_ini_parser.h
-$(builddir)/zend_language_scanner.c: $(srcdir)/zend_language_scanner.l
+$(srcdir)/zend_language_scanner.c: $(srcdir)/zend_language_scanner.l
@$(LEX) -Pzend -S$(srcdir)/flex.skl -o$@ -i
$(srcdir)/zend_language_scanner.l
-$(builddir)/zend_language_parser.h: $(builddir)/zend_language_parser.c
-$(builddir)/zend_language_parser.c: $(srcdir)/zend_language_parser.y
+$(srcdir)/zend_language_parser.h: $(srcdir)/zend_language_parser.c
+$(srcdir)/zend_language_parser.c: $(srcdir)/zend_language_parser.y
@$(YACC) -p zend -v -d $(srcdir)/zend_language_parser.y -o $@
-$(builddir)/zend_ini_parser.h: $(builddir)/zend_ini_parser.c
-$(builddir)/zend_ini_parser.c: $(srcdir)/zend_ini_parser.y
+$(srcdir)/zend_ini_parser.h: $(srcdir)/zend_ini_parser.c
+$(srcdir)/zend_ini_parser.c: $(srcdir)/zend_ini_parser.y
@$(YACC) -p ini_ -v -d $(srcdir)/zend_ini_parser.y -o $@
-$(builddir)/zend_ini_scanner.c: $(srcdir)/zend_ini_scanner.l
+$(srcdir)/zend_ini_scanner.c: $(srcdir)/zend_ini_scanner.l
@$(LEX) -Pini_ -S$(srcdir)/flex.skl -o$@ -i $(srcdir)/zend_ini_scanner.l
-$(builddir)/zend_indent.lo $(builddir)/zend_highlight.lo
$(builddir)/zend_compile.lo: $(builddir)/zend_language_parser.h
+$(builddir)/zend_indent.lo $(builddir)/zend_highlight.lo
$(builddir)/zend_compile.lo: $(srcdir)/zend_language_parser.h
http://cvs.php.net/viewvc.cgi/php-src/acinclude.m4?r1=1.332.2.14.2.14&r2=1.332.2.14.2.15&diff_format=u
Index: php-src/acinclude.m4
diff -u php-src/acinclude.m4:1.332.2.14.2.14
php-src/acinclude.m4:1.332.2.14.2.15
--- php-src/acinclude.m4:1.332.2.14.2.14 Thu May 24 19:52:03 2007
+++ php-src/acinclude.m4 Thu May 24 21:40:41 2007
@@ -1,5 +1,5 @@
dnl
-dnl $Id: acinclude.m4,v 1.332.2.14.2.14 2007/05/24 19:52:03 sniper Exp $
+dnl $Id: acinclude.m4,v 1.332.2.14.2.15 2007/05/24 21:40:41 sniper Exp $
dnl
dnl This file contains local autoconf functions.
dnl
@@ -2019,7 +2019,7 @@
flex_version_list="2.5.4"
AC_PROG_LEX
- if test -n "$LEX"; then
+ if test "$LEX" = "flex"; then
AC_DECL_YYTEXT
:
fi
@@ -2031,7 +2031,7 @@
LEX_CFLAGS="-DYY_USE_CONST"
fi
- if test "$LEX"; then
+ if test "$LEX" = "flex"; then
AC_CACHE_CHECK([for flex version], php_cv_flex_version, [
flex_version=`$LEX -V -v --version 2>/dev/null | $SED -e 's/^.* //'`
php_cv_flex_version=invalid
http://cvs.php.net/viewvc.cgi/php-src/configure.in?r1=1.579.2.52.2.51&r2=1.579.2.52.2.52&diff_format=u
Index: php-src/configure.in
diff -u php-src/configure.in:1.579.2.52.2.51
php-src/configure.in:1.579.2.52.2.52
--- php-src/configure.in:1.579.2.52.2.51 Mon May 21 08:47:51 2007
+++ php-src/configure.in Thu May 24 21:40:41 2007
@@ -1,4 +1,4 @@
- ## $Id: configure.in,v 1.579.2.52.2.51 2007/05/21 08:47:51 dmitry Exp $ -*-
autoconf -*-
+ ## $Id: configure.in,v 1.579.2.52.2.52 2007/05/24 21:40:41 sniper Exp $ -*-
autoconf -*-
dnl ## Process this file with autoconf to produce a configure script.
divert(1)
@@ -1338,10 +1338,9 @@
;;
esac
-PHP_ADD_SOURCES(/Zend, zend_language_parser.c zend_language_scanner.c \
- zend_ini_parser.c zend_ini_scanner.c)
-
PHP_ADD_SOURCES(Zend, \
+ zend_language_parser.c zend_language_scanner.c \
+ zend_ini_parser.c zend_ini_scanner.c \
zend_alloc.c zend_compile.c zend_constants.c zend_dynamic_array.c \
zend_execute_API.c zend_highlight.c zend_llist.c \
zend_opcode.c zend_operators.c zend_ptr_stack.c zend_stack.c \
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/Makefile.frag?r1=1.8.2.2&r2=1.8.2.2.2.1&diff_format=u
Index: php-src/ext/standard/Makefile.frag
diff -u php-src/ext/standard/Makefile.frag:1.8.2.2
php-src/ext/standard/Makefile.frag:1.8.2.2.2.1
--- php-src/ext/standard/Makefile.frag:1.8.2.2 Thu Dec 1 09:34:18 2005
+++ php-src/ext/standard/Makefile.frag Thu May 24 21:40:41 2007
@@ -7,4 +7,4 @@
$(builddir)/info.lo: $(builddir)/../../main/build-defs.h
-$(builddir)/basic_functions.lo: Zend/zend_language_parser.h
+$(builddir)/basic_functions.lo: $(top_srcdir)/Zend/zend_language_parser.h
http://cvs.php.net/viewvc.cgi/php-src/ext/tokenizer/Makefile.frag?r1=1.3&r2=1.3.6.1&diff_format=u
Index: php-src/ext/tokenizer/Makefile.frag
diff -u php-src/ext/tokenizer/Makefile.frag:1.3
php-src/ext/tokenizer/Makefile.frag:1.3.6.1
--- php-src/ext/tokenizer/Makefile.frag:1.3 Wed Nov 19 00:09:45 2003
+++ php-src/ext/tokenizer/Makefile.frag Thu May 24 21:40:41 2007
@@ -1,2 +1,2 @@
-Zend/zend_language_parser.h:
-$(builddir)/tokenizer.lo: Zend/zend_language_parser.h
+$(top_srcdir)/Zend/zend_language_parser.h:
+$(builddir)/tokenizer.lo: $(top_srcdir)/Zend/zend_language_parser.h
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
