Detect Apple versions of flex/bison

guidotack · guidotack · commit 3fc7f2a912f9 · 2014-08-03T08:09:21.000Z
git-svn-id: file:///Users/tack/GecodeGitMigration/gecode-svn-mirror/gecode/trunk@14186 e85b7adc-8362-4630-8c63-7469d557c915
diff --git a/configure b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.ac Id: configure.ac.in 14068 2013-11-08 08:41:34Z schulte .
+# From configure.ac Id: configure.ac 14084 2013-12-04 04:12:18Z tack .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.68 for GECODE 4.2.2.
 #
@@ -12217,8 +12217,8 @@ $as_echo "no" >&6; }
       HAVE_FLEXBISON="no"
 
    else
-      if flex --version | grep ' 2\.5\.3[3-9]$' >/dev/null 2>&1 ||
-         flex --version | grep ' 2\.5\.4[0-9]$' >/dev/null 2>&1 ||
+      if flex --version | grep ' 2\.5\.3[3-9].*$' >/dev/null 2>&1 ||
+         flex --version | grep ' 2\.5\.4[0-9].*$' >/dev/null 2>&1 ||
          flex --version | grep ' 2\.[6-9]\.[0-9]*$' >/dev/null 2>&1
       then
         { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
@@ -12324,7 +12324,7 @@ $as_echo "no" >&6; }
 
         else
           if bison --version | \
-            grep ' 2\.[3-9]\($\|\.[0-9]$\)' >/dev/null 2>&1
+            grep -e ' 2\.[3-9][0-9]*' >/dev/null 2>&1
           then
             { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
diff --git a/gecode.m4 b/gecode.m4
@@ -1447,8 +1447,8 @@ AC_DEFUN([AC_GECODE_FLEXBISON],
       AC_MSG_RESULT(no)
       AC_SUBST(HAVE_FLEXBISON, "no")
    else
-      if flex --version | grep ' 2\.5\.3[[3-9]]$' >/dev/null 2>&1 ||
-         flex --version | grep ' 2\.5\.4[[0-9]]$' >/dev/null 2>&1 ||
+      if flex --version | grep ' 2\.5\.3[[3-9]].*$' >/dev/null 2>&1 ||
+         flex --version | grep ' 2\.5\.4[[0-9]].*$' >/dev/null 2>&1 ||
          flex --version | grep ' 2\.[[6-9]]\.[[0-9]]*$' >/dev/null 2>&1
       then
         AC_MSG_RESULT(yes)
@@ -1459,7 +1459,7 @@ AC_DEFUN([AC_GECODE_FLEXBISON],
           AC_SUBST(HAVE_FLEXBISON, "no")
         else
           if bison --version | \
-            grep ' 2\.[[3-9]]\($\|\.[[0-9]]$\)' >/dev/null 2>&1
+            grep -e ' 2\.[[3-9]][[0-9]]*' >/dev/null 2>&1
           then
             AC_MSG_RESULT(yes)
             AC_SUBST(HAVE_FLEXBISON, "yes")
