cvs: ZendEngine2(PHP_5_1) / acinclude.m4

sniper          Wed Sep 14 11:53:02 2005 EDT

  Modified files:              (Branch: PHP_5_1)
    /ZendEngine2        acinclude.m4 
  Log:
  MFH
  
http://cvs.php.net/diff.php/ZendEngine2/acinclude.m4?r1=1.15&r2=1.15.2.1&ty=u
Index: ZendEngine2/acinclude.m4
diff -u ZendEngine2/acinclude.m4:1.15 ZendEngine2/acinclude.m4:1.15.2.1
--- ZendEngine2/acinclude.m4:1.15       Tue Jun 14 07:41:48 2005
+++ ZendEngine2/acinclude.m4    Wed Sep 14 11:53:02 2005
@@ -1,4 +1,4 @@
-dnl $Id: acinclude.m4,v 1.15 2005/06/14 11:41:48 sniper Exp $
+dnl $Id: acinclude.m4,v 1.15.2.1 2005/09/14 15:53:02 sniper Exp $
 dnl
 dnl This file contains local autoconf functions.
 
@@ -9,23 +9,26 @@
   # for standalone build of Zend Engine
   test -z "$SED" && SED=sed
 
+  bison_version=none
   if test "$YACC"; then
     AC_CACHE_CHECK([for bison version], php_cv_bison_version, [
-      set `bison --version| grep 'GNU Bison' | cut -d ' ' -f 4 | $SED -e 
's/\./ /'|tr -d a-z`
-      bison_version="${1}.${2}"
+      bison_version_vars=`bison --version 2> /dev/null | grep 'GNU Bison' | 
cut -d ' ' -f 4 | $SED -e 's/\./ /' | tr -d a-z`
       php_cv_bison_version=invalid
-      for bison_check_version in $bison_version_list; do
-        if test "$bison_version" = "$bison_check_version"; then
-          php_cv_bison_version="$bison_check_version (ok)"
-        fi
-      done
+      if test -n "$bison_version_vars"; then
+        set $bison_version_vars
+        bison_version="${1}.${2}"
+        for bison_check_version in $bison_version_list; do
+          if test "$bison_version" = "$bison_check_version"; then
+            php_cv_bison_version="$bison_check_version (ok)"
+            break
+          fi
+        done
+      fi
     ])
-  else
-    bison_version=none
   fi
   case $php_cv_bison_version in
     ""|invalid[)]
-      bison_msg="bison versions supported for regeneration of the Zend/PHP 
parsers: $bison_version_list  (found: $bison_version)."
+      bison_msg="bison versions supported for regeneration of the Zend/PHP 
parsers: $bison_version_list (found: $bison_version)."
       AC_MSG_WARN([$bison_msg])
       YACC="exit 0;"
       ;;

-- 
Zend Engine CVS Mailing List (http://cvs.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php