From 0dcd530e229b1654e4e7ec7c60bdb268588b02a7 Mon Sep 17 00:00:00 2001
From: Jani Taskinen <jani@php.net>
Date: Thu, 19 Jul 2007 12:35:56 +0000
Subject: [PATCH] - Stop configure if scanner files are not found and
 invalid/no flex is found

---
 acinclude.m4 | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/acinclude.m4 b/acinclude.m4
index e0989d8071c..ebb7baea289 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -2077,8 +2077,17 @@ dnl it should be removed once we drop support of autoconf 2.13 (if ever)
   
   case $php_cv_flex_version in
     ""|invalid[)]
-      flex_msg="flex versions supported for regeneration of the Zend/PHP parsers: $flex_version_list  (found: $flex_version)."
-      AC_MSG_WARN([$flex_msg])
+      if test -f "$abs_srcdir/Zend/zend_language_scanner.c" && test -f "$abs_srcdir/Zend/zend_ini_scanner.c"; then
+        AC_MSG_WARN([flex versions supported for regeneration of the Zend/PHP parsers: $flex_version_list  (found: $flex_version)])
+      else
+        flex_msg="Supported flex versions are: $flex_version_list"
+        if test "$flex_version" = "none"; then
+          flex_msg="flex not found. flex is required to generate the Zend/PHP parsers! $flex_msg"
+        else
+          flex_msg="Found invalid flex version: $flex_version. $flex_msg"
+        fi
+        AC_MSG_ERROR([$flex_msg])
+      fi
       LEX="exit 0;"
       ;;
   esac