Changeset: ad098e68593a for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=ad098e68593a
Modified Files:
monetdb5/extras/rapi/rapi.c
Branch: RIntegration
Log Message:
R API: Use RHOME configuration variable
diffs (24 lines):
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
@@ -43,8 +43,6 @@
#include <string.h>
#include <sys/stat.h>
-#define SOME_CONFIG_VAR_FOR_RHOME "/usr/lib64/R"
-
#define BAT_TO_INTSXP(bat,tpe,retsxp) { \
tpe v; size_t j; \
retsxp = PROTECT(NEW_INTEGER(BATcount(bat))); \
@@ -142,9 +140,8 @@ void writeConsole(const char * buf, int
static int RAPIinitialize(void) {
MT_lock_init(&rapiLock, "rapi_lock");
-
- // set R_HOME for packages etc.
- setenv("R_HOME", SOME_CONFIG_VAR_FOR_RHOME, TRUE);
+ // set R_HOME for packages etc. We know this from our configure script.
+ setenv("R_HOME", RHOME, TRUE);
#ifdef _RAPI_DEBUG_
printf("# R libraries installed in %s\n",rlibs);
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
