- 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..)

diff --git a/Makefile.frag b/Makefile.frag
index a5da9c3947e1096563beee5568e7f4359e3454d6..81d5428c77b80efb718940db2746d8757336ee2b 100644 (file)
--- a/Makefile.frag
+++ b/Makefile.frag
@@ -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

diff --git a/acinclude.m4 b/acinclude.m4
index 428dfa77fea815c351735b9c6dc3e0cc8f3ba40f..592b0cb1a514b6946a61f4ed9a0e10ae4f906362 100644 (file)
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -2019,7 +2019,7 @@ AC_DEFUN([PHP_PROG_LEX], [
   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 @@ AC_DEFUN([PHP_PROG_LEX], [
     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

diff --git a/configure.in b/configure.in
index 73f6371644393a05a831a895953e144685e2b160..f6162e084e55b3388736a20a9ccd09bf547d6c49 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1338,10 +1338,9 @@ case $host_alias in
   ;;
 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 \

diff --git a/ext/standard/Makefile.frag b/ext/standard/Makefile.frag
index 1d76617505111bbe18e30dd6421e6ae6fb344a9f..4e949621838b602bf3bc7740dc11dec5ded16387 100644 (file)
--- a/ext/standard/Makefile.frag
+++ b/ext/standard/Makefile.frag
@@ -7,4 +7,4 @@ $(srcdir)/url_scanner_ex.c: $(srcdir)/url_scanner_ex.re
 
 $(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

diff --git a/ext/tokenizer/Makefile.frag b/ext/tokenizer/Makefile.frag
index eaca6e7f4f7d953bc73c9f9fe59ebc35882bfa6a..6802d40e9223d0081cf45bd5d602c87c8de3bf8b 100644 (file)
--- a/ext/tokenizer/Makefile.frag
+++ b/ext/tokenizer/Makefile.frag
@@ -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