Changeset: 9ab6f3e7d0d6 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=9ab6f3e7d0d6
Modified Files:
Makefile.ag
configure.ag
Branch: headless
Log Message:
Merge with default branch.
diffs (62 lines):
diff --git a/Makefile.ag b/Makefile.ag
--- a/Makefile.ag
+++ b/Makefile.ag
@@ -15,7 +15,9 @@
# Copyright August 2008-2011 MonetDB B.V.
# All Rights Reserved.
-SUBDIRS = buildtools common clients gdk monetdb5 \
+SUBDIRS = buildtools common clients \
+ HAVE_GDK?gdk \
+ HAVE_MONETDB5?monetdb5 \
# HAVE_SQL?sql \
# HAVE_GEOM?geom \
tools \
diff --git a/configure.ag b/configure.ag
--- a/configure.ag
+++ b/configure.ag
@@ -132,12 +132,27 @@
AC_DEFINE(MONETDB_RELEASE, "unreleased", [Release name or "unreleased"])
+dft_gdk=auto
+AC_ARG_ENABLE(gdk,
+ AS_HELP_STRING([--enable-gdk],
+ [enable support for GDK (default=auto)]),
+ enable_gdk=$enableval,
+ enable_gdk=$dft_gdk)
+
dft_monetdb5=auto
AC_ARG_ENABLE(monetdb5,
AS_HELP_STRING([--enable-monetdb5],
[enable support for MonetDB5 (default=auto)]),
enable_monetdb5=$enableval,
enable_monetdb5=$dft_monetdb5)
+case "$enable_gdk-$enable_monetdb5" in
+no-yes)
+ AC_MSG_ERROR([MonetDB5 requires GDK.])
+ ;;
+no-auto)
+ enable_monetdb5=no
+ ;;
+esac
dft_rdf=no
AC_ARG_ENABLE(rdf,
@@ -178,7 +193,7 @@
no-yes)
AC_MSG_ERROR([geom module requires MonetDB5])
;;
-no-no-auto)
+no-auto)
enable_geom=no
;;
esac
@@ -2824,6 +2839,7 @@
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_GEOM, test "x$enable_geom" = xyes -o "x$enable_geom" =
xauto)
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
