Changeset: eaba4f1d8996 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=eaba4f1d8996
Modified Files:
configure.ag
monetdb5/extras/Makefile.ag
Branch: jacqueline
Log Message:
jaql: allow to enable/disable MonetDB/JAQL
diffs (102 lines):
diff --git a/configure.ag b/configure.ag
--- a/configure.ag
+++ b/configure.ag
@@ -218,6 +218,22 @@ no-auto)
;;
esac
+dft_jaql=auto
+AC_ARG_ENABLE(jaql,
+ AS_HELP_STRING([--enable-jaql],
+ [enable support for MonetDB/JAQL (default=auto)]),
+ enable_jaql=$enableval,
+ enable_jaql=$dft_sql)
+case "$enable_monetdb5-$enable_jaql" in
+no-yes)
+ AC_MSG_ERROR([MonetDB/JAQL requires MonetDB5.])
+ ;;
+no-auto)
+ enable_jaql=no
+ disable_jaql="(MonetDB/JAQL requires MonetDB5.)"
+ ;;
+esac
+
dft_odbc=auto
AC_ARG_ENABLE(odbc,
AS_HELP_STRING([--enable-odbc],
@@ -1400,10 +1416,29 @@ case "$YACC" in
if test "x$enable_sql" = xyes; then
AC_MSG_ERROR([MonetDB/SQL requires bison])
fi
+ if test "x$enable_jaql" = xyes; then
+ AC_MSG_ERROR([MonetDB/JAQL requires bison])
+ fi
enable_sql=no
+ enable_jaql=no
if test "x$disable_sql" = x; then
disable_sql="(MonetDB/SQL requires bison)"
fi
+ if test "x$disable_jaql" = x; then
+ disable_jaql="(MonetDB/JAQL requires bison)"
+ fi
+ ;;
+esac
+case "$LEX" in
+ flex*) : ;;
+ *)
+ if test "x$enable_jaql" = xyes; then
+ AC_MSG_ERROR([MonetDB/JAQL requires flex])
+ fi
+ enable_jaql=no
+ if test "x$disable_jaql" = x; then
+ disable_jaql="(MonetDB/JAQL requires flex)"
+ fi
;;
esac
@@ -2744,20 +2779,24 @@ AC_SUBST(HWCOUNTERS_LIBS)
AC_SUBST(HWCOUNTERS_INCS)
dnl check dependencies (might need more than just SQL)
-if test x"$enable_sql" = xyes && test x"$enable_monetdb5" = x"no" ; then
- AC_MSG_ERROR([sql needs monetdb5]);
-fi
if test x"$enable_sql" = xauto && test x"$enable_monetdb5" = x"no" ; then
enable_sql=no
if test "x$disable_sql" = x; then
disable_sql="(MonetDB/SQL requires MonetDB5)"
fi
fi
+if test x"$enable_jaql" = xauto && test x"$enable_monetdb5" = x"no" ; then
+ enable_jaql=no
+ if test "x$disable_jaql" = x; then
+ disable_jaql="(MonetDB/JAQL requires MonetDB5)"
+ fi
+fi
dnl output
AM_CONDITIONAL(HAVE_GDK, test "x$enable_gdk" = xyes -o "x$enable_gdk" = xauto)
AM_CONDITIONAL(HAVE_MONETDB5, test "x$enable_monetdb5" = xyes -o
"x$enable_monetdb5" = xauto)
AM_CONDITIONAL(HAVE_SQL, test "x$enable_sql" = xyes -o "x$enable_sql" = xauto)
+AM_CONDITIONAL(HAVE_JAQL, test "x$enable_jaql" = xyes -o "x$enable_jaql" =
xauto)
AM_CONDITIONAL(HAVE_GEOM, test "x$enable_geom" = xyes -o "x$enable_geom" =
xauto)
AM_CONDITIONAL(HAVE_TESTING, test "x$enable_testing" = xyes -o
"x$enable_testing" = xauto)
AM_CONDITIONAL(HAVE_DEVELOPER, test "x$enable_developer" = xyes)
@@ -3080,6 +3119,7 @@ for comp in \
gdk \
monetdb5 \
sql \
+ jaql \
geom \
fits \
rdf \
diff --git a/monetdb5/extras/Makefile.ag b/monetdb5/extras/Makefile.ag
--- a/monetdb5/extras/Makefile.ag
+++ b/monetdb5/extras/Makefile.ag
@@ -15,5 +15,5 @@
# Copyright August 2008-2012 MonetDB B.V.
# All Rights Reserved.
-SUBDIRS = compiler ENABLE_CRACKERS?crackers HAVE_RAPTOR?rdf
HAVE_SPHINXCLIENT?sphinx jaql mal_optimizer_template
+SUBDIRS = compiler ENABLE_CRACKERS?crackers HAVE_RAPTOR?rdf
HAVE_SPHINXCLIENT?sphinx HAVE_JAQL?jaql mal_optimizer_template
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
