cvs: php-src(PHP_5_2) / acinclude.m4

jani Thu Jul 19 12:36:06 2007 UTC Modified files: (Branch: PHP_5_2) /php-src acinclude.m4 Log: MFH:- Stop configure if scanner files are not found and invalid/no flex is found http://cvs.php.net/viewvc.cgi/php-src/acinclude.m4?r1=1.332.2.14.2.21&r2=1.332.2.14.2.22&diff_format=u Index: php-src/acinclude.m4 diff -u php-src/acinclude.m4:1.332.2.14.2.21 php-src/acinclude.m4:1.332.2.14.2.22 --- php-src/acinclude.m4:1.332.2.14.2.21 Mon Jul 16 10:00:44 2007 +++ php-src/acinclude.m4 Thu Jul 19 12:36:06 2007 @@ -1,5 +1,5 @@ dnl -dnl $Id: acinclude.m4,v 1.332.2.14.2.21 2007/07/16 10:00:44 jani Exp $ +dnl $Id: acinclude.m4,v 1.332.2.14.2.22 2007/07/19 12:36:06 jani Exp $ dnl dnl This file contains local autoconf functions. dnl @@ -2074,8 +2074,17 @@ 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