Changeset: 704e16799455 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=704e16799455
Modified Files:
configure.ag
monetdb5/extras/rapi/rapi.R
monetdb5/extras/rapi/rapi.c
Branch: Jun2016
Log Message:
Make libdir available in C code for rapi.
diffs (45 lines):
diff --git a/configure.ag b/configure.ag
--- a/configure.ag
+++ b/configure.ag
@@ -3275,6 +3275,9 @@ AC_SUBST(Erundir)
Qlibdir="$libdir"
Xlibdir="`$translatepath "$libdir"`"
QXlibdir="`echo "$Xlibdir" | sed 's/\\\\/\\\\\\\\/g'`"
+Elibdir="`echo "$Xlibdir" | sed 's/{exec_prefix}/{prefix}/'`"
+eval "Elibdir=${Elibdir}"
+QElibdir="`echo "$Elibdir" | sed 's/\\\\/\\\\\\\\/g'`"
AC_SUBST(Qlibdir)
AC_SUBST(Xlibdir)
AC_SUBST(QXlibdir)
@@ -3351,6 +3354,7 @@ AC_SUBST(QXSOURCE)
AC_DEFINE_UNQUOTED(LOCALSTATEDIR,"$QElocalstatedir",[modifiable single-machine
data])
AC_DEFINE_UNQUOTED(DATA_DIR,"$QEdatadir",[read-only architecture-independent
data])
AC_DEFINE_UNQUOTED(BINDIR,"$QEbindir",[location where binaries are installed])
+AC_DEFINE_UNQUOTED(LIBDIR,"$QElibdir",[location where libraries are installed])
dnl On Solaris, libxml2 enables threading only when _REENTRANT, __MT__
dnl or _POSIX_C_SOURCE >= 199506L is defined. The latter is only
diff --git a/monetdb5/extras/rapi/rapi.R b/monetdb5/extras/rapi/rapi.R
--- a/monetdb5/extras/rapi/rapi.R
+++ b/monetdb5/extras/rapi/rapi.R
@@ -53,7 +53,7 @@ rewireFunc("q", quit, "base")
rm(rewireFunc)
loopback_query <- function(query) {
- dyn.load(file.path(MONETDB_BINDIR, "..", "lib", "monetdb5",
"lib_rapi.so"))
+ dyn.load(file.path(MONETDB_LIBDIR, "monetdb5", "lib_rapi.so"))
res <- .Call("RAPIloopback", paste0(query, "\n;"), package="lib_rapi")
if (is.character(res)) {
stop(res)
diff --git a/monetdb5/extras/rapi/rapi.c b/monetdb5/extras/rapi/rapi.c
--- a/monetdb5/extras/rapi/rapi.c
+++ b/monetdb5/extras/rapi/rapi.c
@@ -492,7 +492,7 @@ str RAPIprelude(void *ret) {
throw(MAL, "rapi.eval",
"failed to initialise R environment
(%s)", initstatus);
}
- Rf_defineVar(Rf_install("MONETDB_BINDIR"),
ScalarString(RSTR(BINDIR)), R_GlobalEnv);
+ Rf_defineVar(Rf_install("MONETDB_LIBDIR"),
ScalarString(RSTR(LIBDIR)), R_GlobalEnv);
}
MT_lock_unset(&rapiLock);
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
