|
Check-in Number:
|
2346 | |
| Date: |
2002-Jul-25 09:54:51 (local)
2002-Jul-25 07:54:51 (UTC) |
| User: | rse |
| Branch: | |
| Comment: |
upgrade to flex-beta 2.5.10 (incompatible, so require it) |
| Tickets: |
|
| Inspections: |
|
| Files: |
|
ossp-pkg/l2/aclocal.m4 1.11 -> 1.12
--- aclocal.m4 2002/03/14 15:29:23 1.11
+++ aclocal.m4 2002/07/25 07:54:51 1.12
@@ -336,3 +336,72 @@
fi
])
+dnl ##
+dnl ## Check for GNU Bison and GNU Flex
+dnl ##
+dnl ## configure.in:
+dnl ## AC_CHECK_BISON(BISON, 1.30, [1.3[0-9]|1.[4-9]])
+dnl ## AC_CHECK_FLEX(FLEX, 2.5.6, [2.5.[6-9]|2.5.1[0-9]|2.[6-9].*])
+dnl ##
+dnl ## Makefile.in:
+dnl ## BISON = @BISON@
+dnl ## FLEX = @FLEX@
+dnl ##
+
+AC_DEFUN(AC_CHECK_BISON,[dnl
+if test ".$enable_maintainer" = .yes; then
+ bison_version=""
+ for prog in bison bison-beta bison-alpha bison-snap; do
+ AC_PATH_PROG($1, $prog, NA)
+ if test ".$$1" != .NA; then
+ bison_version=`($$1 --version | head -1 | sed -e 's;^[[^0-9]]*\([[0-9]][[0-9.]]*\).*;\1;') 2>/dev/null`
+ case "$bison_version" in
+ $3 ) break ;;
+ * ) $1="NA"; unset ac_cv_path_$1 ;;
+ esac
+ else
+ unset ac_cv_path_$1
+ fi
+ done
+ if test ".$$1" = .NA; then
+ if test ".$bison_version" != .; then
+ AC_ERROR([found GNU Bison version $bison_version; require version >= $2])
+ else
+ AC_ERROR([require GNU Bison version >= $2])
+ fi
+ fi
+else
+ dnl # disable the use of the tools, but still allow manual override
+ test ".$$1" = . && $1=true
+ AC_PATH_PROG($1, bison, true)
+fi
+])
+
+AC_DEFUN(AC_CHECK_FLEX,[dnl
+if test ".$enable_maintainer" = .yes; then
+ flex_version=""
+ for prog in flex flex-beta flex-alpha flex-snap; do
+ AC_PATH_PROG($1, $prog, NA)
+ if test ".$$1" != .NA; then
+ flex_version=`($$1 --version | head -1 | sed -e 's;^[[^0-9]]*\([[0-9]][[0-9.]]*\).*;\1;') 2>/dev/null`
+ case "$flex_version" in
+ $3 ) break ;;
+ * ) $1="NA"; unset ac_cv_path_$1 ;;
+ esac
+ else
+ unset ac_cv_path_$1
+ fi
+ done
+ if test ".$$1" = .NA; then
+ if test ".$flex_version" != .; then
+ AC_ERROR([found GNU Flex version $flex_version; require version >= $2])
+ else
+ AC_ERROR([require GNU Flex version >= $2])
+ fi
+ fi
+else
+ test ".$$1" = . && $1=true
+ AC_PATH_PROG($1, flex, true)
+fi
+])
+
|
|
ossp-pkg/l2/configure.ac 1.21 -> 1.22
--- configure.ac 2002/07/01 17:50:15 1.21
+++ configure.ac 2002/07/25 07:54:51 1.22
@@ -44,58 +44,8 @@
AC_CHECK_MAINTAINER
AC_CONFIGURE_LIBTOOL
-dnl # check for developer tools:
-dnl # GNU Bison and GNU Flex
-if test ".$enable_maintainer" = .yes; then
- dnl # check for GNU Bison >= 1.30
- bison_version=""
- for prog in bison bison-beta bison-alpha bison-snap; do
- AC_PATH_PROG(BISON, $prog, NA)
- if test ".$BISON" != .NA; then
- bison_version=`($BISON --version | head -1 | sed -e 's;^[[^0-9]]*\([[0-9]][[0-9.]]*\).*;\1;') 2>/dev/null`
- case "$bison_version" in
- 1.3[[0-9]] | 1.[[4-9]] ) break ;;
- * ) BISON="NA"; unset ac_cv_path_BISON ;;
- esac
- else
- unset ac_cv_path_BISON
- fi
- done
- if test ".$BISON" = .NA; then
- if test ".$bison_version" != .; then
- AC_ERROR([found GNU Bison version $bison_version; require version >= 1.30])
- else
- AC_ERROR([require GNU Bison version >= 1.30])
- fi
- fi
- dnl # check for GNU Flex >= 2.5.6
- flex_version=""
- for prog in flex flex-beta flex-alpha flex-snap; do
- AC_PATH_PROG(FLEX, $prog, NA)
- if test ".$FLEX" != .NA; then
- flex_version=`($FLEX --version | head -1 | sed -e 's;^[[^0-9]]*\([[0-9]][[0-9.]]*\).*;\1;') 2>/dev/null`
- case "$flex_version" in
- 2.5.[[6-9]] | 2.5.1[[0-9]] | 2.[[6-9]].* ) break ;;
- * ) FLEX="NA"; unset ac_cv_path_FLEX ;;
- esac
- else
- unset ac_cv_path_FLEX
- fi
- done
- if test ".$FLEX" = .NA; then
- if test ".$flex_version" != .; then
- AC_ERROR([found GNU Flex version $flex_version; require version >= 2.5.6])
- else
- AC_ERROR([require GNU Flex version >= 2.5.6])
- fi
- fi
-else
- dnl # disable the use of the tools, but still allow manual override
- test ".$BISON" = . && BISON=true
- AC_PATH_PROG(BISON, bison, true)
- test ".$FLEX" = . && FLEX=true
- AC_PATH_PROG(FLEX, flex, true)
-fi
+AC_CHECK_BISON(BISON, 1.30, [1.3[[0-9]]|1.[[4-9]]])
+AC_CHECK_FLEX(FLEX, 2.5.10, [2.5.1[[0-9]]|2.[[6-9]].*])
AC_CHECK_LIB(nsl, gethostname)
if test ".`echo $LIBS | grep nsl`" = . ;then
|
|
ossp-pkg/l2/l2_spec_scan.l 1.7 -> 1.8
--- l2_spec_scan.l 2002/01/02 17:07:38 1.7
+++ l2_spec_scan.l 2002/07/25 07:54:51 1.8
@@ -35,7 +35,7 @@
#include "l2_spec_parse.h" /* for T_XXXX */
/* how to find our own context */
-#define CTX ((l2_spec_ctx_t *)yyget_extra(yy_globals))
+#define CTX ((l2_spec_ctx_t *)yyget_extra(yyscanner))
/* provide own input handling */
#define YY_NO_UNPUT 1
|
|
