Changeset: 0afc6f1b6527 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=0afc6f1b6527
Modified Files:
configure.ag
monetdb5/modules/mal/Makefile.ag
monetdb5/tools/Makefile.ag
Branch: RIntegration
Log Message:
Added configure and Makefile blurbs for R integration.
The flag to use is --enable-rintegration, but the default is auto, so
if you have it, it's used.
diffs (107 lines):
diff --git a/configure.ag b/configure.ag
--- a/configure.ag
+++ b/configure.ag
@@ -241,6 +241,13 @@ AC_ARG_ENABLE(gsl,
enable_gsl=$enableval,
enable_gsl=$dft_gsl)
+dft_rintegration=auto
+AC_ARG_ENABLE(rintegration,
+ AS_HELP_STRING([--enable-rintegration],
+ [enable support for R integration into MonetDB (default=auto)]),
+ enable_rintegration=$enableval,
+ enable_rintegration=$dft_rintegration)
+
dft_odbc=auto
AC_ARG_ENABLE(odbc,
AS_HELP_STRING([--enable-odbc],
@@ -2180,6 +2187,20 @@ AC_SUBST(SPHINXCLIENT_CFLAGS, $SPHINXCLI
AC_SUBST(SPHINXCLIENT_LIBS, $SPHINXCLIENT_LIBS)
AM_CONDITIONAL(HAVE_SPHINXCLIENT, test x"$have_sphinxclient" != xno)
+org_have_libr=no
+have_libr=$org_have_libr
+if test "x$enable_rintegration" != xno; then
+ PKG_CHECK_MODULES([libr], [libR],
+ [AC_DEFINE(HAVE_LIBR, 1, [Define if you have libR installed])
+ have_libr="yes"],
+ [if test "x$enable_rintegration" = xyes; then
AC_MSG_ERROR([libR library required for R integration support]); fi
+ have_libr="no"
+ why_have_libr="(libR library not found)"
+ enable_rintegration=no
+ disable_rintegration="(libR library not found)"])
+fi
+AM_CONDITIONAL(HAVE_LIBR, test x"$have_libr" != xno)
+
# ODBC, only used by ODBC driver
if test "x$enable_odbc" != xno; then
have_unixodbc=auto
@@ -3279,20 +3300,21 @@ done
echo
echo "* Enabled/disabled components:"
for comp in \
- 'gdk ' \
- 'monetdb5 ' \
- 'sql ' \
- 'jaql ' \
- 'jsonstore' \
- 'geom ' \
- 'gsl ' \
- 'fits ' \
- 'rdf ' \
- 'datacell ' \
- 'odbc ' \
- 'jdbc ' \
- 'control ' \
- 'testing ' \
+ 'gdk ' \
+ 'monetdb5 ' \
+ 'sql ' \
+ 'jaql ' \
+ 'jsonstore ' \
+ 'geom ' \
+ 'gsl ' \
+ 'fits ' \
+ 'rdf ' \
+ 'rintegration' \
+ 'datacell ' \
+ 'odbc ' \
+ 'jdbc ' \
+ 'control ' \
+ 'testing ' \
; do
eval "dft=\$dft_$comp"
eval "enable=\$enable_$comp"
@@ -3319,6 +3341,7 @@ for comp in \
'java_control ' \
'java_jdbc ' \
'libmicrohttpd' \
+ 'libr ' \
'liburiparser ' \
'libxml2 ' \
'mseed ' \
diff --git a/monetdb5/modules/mal/Makefile.ag b/monetdb5/modules/mal/Makefile.ag
--- a/monetdb5/modules/mal/Makefile.ag
+++ b/monetdb5/modules/mal/Makefile.ag
@@ -21,7 +21,8 @@ INCLUDES = ../../mal ../atoms ../kernel
../../../common/stream \
../../../common/utils \
../../../gdk \
- $(pcre_CFLAGS) $(zlib_CFLAGS) $(BZIP_INCS) $(MSGCONTROL_FLAGS)
+ $(pcre_CFLAGS) $(zlib_CFLAGS) $(libr_CFLAGS) \
+ $(BZIP_INCS) $(MSGCONTROL_FLAGS)
MTSAFE
diff --git a/monetdb5/tools/Makefile.ag b/monetdb5/tools/Makefile.ag
--- a/monetdb5/tools/Makefile.ag
+++ b/monetdb5/tools/Makefile.ag
@@ -37,7 +37,7 @@ lib_monetdb5 = {
$(UUID_LIBS) $(curl_LIBS) \
$(MATH_LIBS) $(SOCKET_LIBS) $(MALLOC_LIBS) $(PTHREAD_LIBS) \
$(DL_LIBS) $(READLINE_LIBS) $(openssl_LIBS) $(pcre_LIBS) \
- $(LTLIBICONV) $(zlib_LIBS) $(libxml2_LIBS)
+ $(LTLIBICONV) $(zlib_LIBS) $(libxml2_LIBS) $(libr_LIBS)
}
headers_pc = {
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
