Changeset: 16c4b97ae56a for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=16c4b97ae56a
Modified Files:
configure.ag
tools/Makefile.ag
tools/embeddedpy/setup.py
Branch: pyapi
Log Message:
Only build MonetDBLite when enable-embedded is explicityenabled.
diffs (46 lines):
diff --git a/configure.ag b/configure.ag
--- a/configure.ag
+++ b/configure.ag
@@ -195,6 +195,21 @@ no-auto)
;;
esac
+dft_embedded=no
+AC_ARG_ENABLE(embedded,
+ AS_HELP_STRING([--enable-embedded],
+ [enable support for running MonetDB as a library (default=no)]),
+ enable_embedded=$enableval,
+ enable_embedded=$dft_embedded)
+AM_CONDITIONAL(HAVE_EMBEDDED, test x$enable_embedded != xno)
+
+if test "x$enable_embedded" != xno; then
+ AC_DEFINE(HAVE_EMBEDDED, 1, [Support for MonetDB as a library])
+fi
+AM_CONDITIONAL(HAVE_EMBEDDED, test x"$enable_embedded" != xno)
+
+
+
dft_jsonstore=no
AC_ARG_ENABLE(jsonstore,
AS_HELP_STRING([--enable-jsonstore],
diff --git a/tools/Makefile.ag b/tools/Makefile.ag
--- a/tools/Makefile.ag
+++ b/tools/Makefile.ag
@@ -4,4 +4,4 @@
#
# Copyright 2008-2015 MonetDB B.V.
-SUBDIRS = HAVE_MONETDB5?mserver NOT_WIN32?merovingian HAVE_LIBPY?embeddedpy
+SUBDIRS = HAVE_MONETDB5?mserver NOT_WIN32?merovingian HAVE_EMBEDDED?embeddedpy
diff --git a/tools/embeddedpy/setup.py b/tools/embeddedpy/setup.py
--- a/tools/embeddedpy/setup.py
+++ b/tools/embeddedpy/setup.py
@@ -40,7 +40,7 @@ os.chdir(base_dir)
if os.system('./bootstrap') != 0:
print("Failed bootstrapping MonetDB.")
exit(1)
-if os.system('./configure --prefix=' + output_directory + ' --disable-fits
--disable-geom --disable-rintegration --disable-gsl --disable-netcdf
--disable-jdbc --disable-merocontrol --disable-odbc --disable-console
--disable-microhttpd --without-perl --without-python2 --without-python3
--without-rubygem --without-unixodbc --without-samtools --without-sphinxclient
--without-geos --without-samtools --without-readline --enable-silent-rules') !=
0:
+if os.system('./configure --prefix=' + output_directory + '
--enable-embedded=true --disable-fits --disable-geom --disable-rintegration
--disable-gsl --disable-netcdf --disable-jdbc --disable-merocontrol
--disable-odbc --disable-console --disable-microhttpd --without-perl
--without-python2 --without-python3 --without-rubygem --without-unixodbc
--without-samtools --without-sphinxclient --without-geos --without-samtools
--without-readline --enable-silent-rules') != 0:
print("Failed configuring MonetDB.")
exit(1)
os.system('printf \'#ifndef _EMBEDDED_MONETDB_MONETDB_LIB_\n#define
_EMBEDDED_MONETDB_MONETDB_LIB_ "%s"\n#endif\n\' | cat - monetdb_config.h >
temp.h && mv temp.h monetdb_config.h' % os.path.join(output_directory,
'lib/libmonetdb5.so'))
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
