Changeset: 8cfe0e878529 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=8cfe0e878529
Modified Files:
configure.ag
sql/backends/monet5/Makefile.ag
sql/backends/monet5/datacell/Makefile.ag
sql/backends/monet5/datacell/actuator.mx
Branch: default
Log Message:
datacell: bits and pieces towards building
made datacell building optional, disabled by default (since it's broken)
changed sensor and actuator from module to binary (since they are
programs), but they can't compile currently, since they rely on libsql,
and need various other symbols that perhaps no longer exist.
diffs (98 lines):
diff --git a/configure.ag b/configure.ag
--- a/configure.ag
+++ b/configure.ag
@@ -166,6 +166,13 @@
enable_rdf=$enableval,
enable_rdf=$dft_rdf)
+dft_datacell=no
+AC_ARG_ENABLE(datacell,
+ AS_HELP_STRING([--enable-datacell],
+ [enable datacell stream components (default=no)]),
+ enable_datacell=$enableval,
+ enable_datacell=$dft_datacell)
+
dft_fits=auto
AC_ARG_ENABLE(fits,
AS_HELP_STRING([--enable-fits],
@@ -2220,6 +2227,8 @@
fi
AM_CONDITIONAL(HAVE_RAPTOR, test x"$have_raptor" != xno)
+AM_CONDITIONAL(ENABLE_DATACELL, test x"$enable_datacell" != xno)
+
PKG_CHECK_MODULES([curl], [libcurl], [have_curl="yes"], [have_curl="no"])
if test x"$have_curl" = x"yes" ; then
AC_DEFINE(HAVE_CURL, 1, [Define if you have the cURL library])
@@ -3223,6 +3232,7 @@
geom \
fits \
rdf \
+ datacell \
odbc \
jdbc \
control \
diff --git a/sql/backends/monet5/Makefile.ag b/sql/backends/monet5/Makefile.ag
--- a/sql/backends/monet5/Makefile.ag
+++ b/sql/backends/monet5/Makefile.ag
@@ -15,7 +15,7 @@
# Copyright August 2008-2011 MonetDB B.V.
# All Rights Reserved.
-SUBDIRS = NOT_WIN32?vaults UDF NOT_WIN32?LSST NOT_WIN32?datacell
+SUBDIRS = NOT_WIN32?vaults UDF NOT_WIN32?LSST ENABLE_DATACELL?datacell
# force sql.o to not depend on .../rdf/rdf.h since it only optionally created
RDF_INC = -I../../../monetdb5/extras/rdf
diff --git a/sql/backends/monet5/datacell/Makefile.ag
b/sql/backends/monet5/datacell/Makefile.ag
--- a/sql/backends/monet5/datacell/Makefile.ag
+++ b/sql/backends/monet5/datacell/Makefile.ag
@@ -47,22 +47,23 @@
../../../../gdk/libbat
}
-lib__actuator = {
- MODULE
- DIR = libdir/monetdb5
- SEP = _
- SOURCES = actuator.mx
- LIBS = ../../../../monetdb5/tools/libmonetdb5 \
- ../../../../gdk/libbat
+bin_actuator = {
+ # FIXME: usec comes from basket.mx, use GDKusec instead?
+ # socket_* comes from dcsocket.mx
+ SOURCES = actuator.mx basket.mx dcsocket.mx
+ LIBS = ../../../../common/stream/libstream \
+ ../../../../common/options/libmoptions \
+ ../../../../gdk/libbat
+
}
-lib__sensor = {
- MODULE
- DIR = libdir/monetdb5
- SEP = _
- SOURCES = sensor.mx
- LIBS = ../../../../monetdb5/tools/libmonetdb5 \
- ../../../../gdk/libbat
+bin_sensor = {
+ # FIXME: usec comes from basket.mx, use GDKusec instead?
+ SOURCES = sensor.mx basket.mx
+ LIBS = ../../../../common/stream/libstream \
+ ../../../../common/options/libmoptions \
+ ../../../../gdk/libbat \
+ ../../../../monetdb5/tools/libmonetdb5
}
scripts_mal = {
diff --git a/sql/backends/monet5/datacell/actuator.mx
b/sql/backends/monet5/datacell/actuator.mx
--- a/sql/backends/monet5/datacell/actuator.mx
+++ b/sql/backends/monet5/datacell/actuator.mx
@@ -341,6 +341,7 @@
#define L(X) (X+strlen(X))
+
/*
lng
estimateOverhead(){
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
