Changeset: 79d2724432da for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=79d2724432da
Modified Files:
configure.ag
Branch: Apr2011
Log Message:
configure: require GNU bison iso some yacc
Our SQL parser seems to require GNU bison specifics, and our configure
file also seems to assume everywhere it's bison we use. Hence, require
bison.
diffs (39 lines):
diff --git a/configure.ag b/configure.ag
--- a/configure.ag
+++ b/configure.ag
@@ -1577,15 +1577,18 @@
AC_PROG_YACC
AC_DEFINE(YYENABLE_NLS, 0, [Needed to compile bison-generated code.])
AC_DEFINE(YYLTYPE_IS_TRIVIAL, 0, [Needed to compile bison-generated code.])
-if test "x$YACC" = x; then
- if test "x$enable_sql" = xyes; then
- AC_MSG_ERROR([MonetDB/SQL requires YACC or BISON.])
- fi
- enable_sql=no
- if test "x$disable_sql" = x; then
- disable_sql="(MonetDB/SQL requires YACC or BISON.)"
- fi
-fi
+case "$YACC" in
+ bison*) YACC="$YACC" ;;
+ *)
+ if test "x$enable_sql" = xyes; then
+ AC_MSG_ERROR([MonetDB/SQL requires bison])
+ fi
+ enable_sql=no
+ if test "x$disable_sql" = x; then
+ disable_sql="(MonetDB/SQL requires bison)"
+ fi
+ ;;
+esac
AC_CHECK_PROG(TEXI2HTML,texi2html,texi2html)
AC_CHECK_PROG(LATEX2HTML,latex2html,latex2html)
@@ -3216,6 +3219,7 @@
echo " OID size: " ${bits} bits
echo
+dnl give some hints to the user
case "`make -v 2>&1`" in
'GNU Make '*)
;;
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
