Changeset: 5828109c61ad for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=5828109c61ad
Modified Files:
buildtools/Makefile.am
buildtools/configure.ac
Branch: default
Log Message:
Make compilation/installation of burg optional
diffs (62 lines):
diff -r 9ed203b48642 -r 5828109c61ad buildtools/Makefile.am
--- a/buildtools/Makefile.am Thu Jun 03 13:36:05 2010 +0200
+++ b/buildtools/Makefile.am Thu Jun 03 13:42:59 2010 +0200
@@ -20,7 +20,11 @@
AUTOMAKE_OPTIONS = foreign
if ENABLE_MEL
- OPT_MEL = mel
+OPT_MEL = mel
endif
-SUBDIRS = autogen Mx $(OPT_MEL) burg conf
+if ENABLE_BURG
+OPT_BURG = burg
+endif
+
+SUBDIRS = autogen Mx $(OPT_MEL) $(OPT_BURG) conf
DIST_SUBDIRS = autogen Mx mel burg conf
diff -r 9ed203b48642 -r 5828109c61ad buildtools/configure.ac
--- a/buildtools/configure.ac Thu Jun 03 13:36:05 2010 +0200
+++ b/buildtools/configure.ac Thu Jun 03 13:42:59 2010 +0200
@@ -1,4 +1,5 @@
# -*- Autoconf -*-
+# vim: ft=config :
dnl The contents of this file are subject to the MonetDB Public License
dnl Version 1.1 (the "License"); you may not use this file except in
@@ -33,7 +34,7 @@
[enable_mel=$enableval],[enable_mel="yes"])
case $enable_mel in
-yes)
+yes)
# HACK: because autoconf doesn't want to run configure with "added
# arguments", we just call it ourselves here. Pretty dirty, I know.
@@ -42,6 +43,18 @@
esac
AM_CONDITIONAL([ENABLE_MEL], [test "$enable_mel" = yes])
+AC_ARG_ENABLE(burg,
+ AS_HELP_STRING([--enable-burg],
+ [Burg is only needed for MonetDB/XQuery]),
+ [enable_burg=$enableval],[enable_burg="yes"])
+
+case $enable_burg in
+yes)
+ burg_subdir=burg
+ ;;
+esac
+AM_CONDITIONAL([ENABLE_BURG], [test "$enable_burg" = yes])
+
AC_CONFIG_FILES([Makefile autogen/Makefile conf/Makefile conf/Mbootstrap
conf/buildtools-config])
@@ -49,6 +62,6 @@
AC_SUBST([PYTHON])
-AC_CONFIG_SUBDIRS([Mx burg])
+AC_CONFIG_SUBDIRS([Mx $burg_subdir])
AC_OUTPUT
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
