[rkward-cvs] rkward/admin acinclude.m4.in,1.13,1.14

Thomas Friedrichsmeier tfry at users.sourceforge.net
Wed May 17 12:36:16 UTC 2006


Update of /cvsroot/rkward/rkward/admin
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv29172/admin

Modified Files:
	acinclude.m4.in 
Log Message:
Add configuration option for R package library tree location
Do not write to /tmp during build/install, but rather create a tmp-dir in the source tree (avoid sandbox violation)

Index: acinclude.m4.in
===================================================================
RCS file: /cvsroot/rkward/rkward/admin/acinclude.m4.in,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** acinclude.m4.in	7 May 2006 11:53:20 -0000	1.13
--- acinclude.m4.in	17 May 2006 12:36:14 -0000	1.14
***************
*** 1857,1860 ****
--- 1857,1861 ----
  AC_REQUIRE([CHECK_RHOME])
  AC_REQUIRE([CHECK_LIBRSO])
+ AC_REQUIRE([CHECK_RLIBDIR])
  AC_REQUIRE([CHECK_RINCLUDE])
  AC_REQUIRE([CHECK_RLAPACK])
***************
*** 1942,1945 ****
--- 1943,1969 ----
  ])
  
+ dnl find out R (package) library dir
+ AC_DEFUN([CHECK_RLIBDIR],
+ [
+ AC_MSG_CHECKING(for R package library location)
+ AC_ARG_WITH(r-libdir,AC_HELP_STRING([--with-r-libdir=DIR],[specify location of R (packages) library tree to install to]),
+   use_r_libdir="$withval",
+   r_libs=`$R_HOMEDIR/bin/R CMD sh -c 'echo $R_LIBS'`
+   if test -n "$r_libs"; then use_r_libdir=`echo "$r_libs" | cut -f1 -d:` ; else use_r_libdir="$R_HOMEDIR/library" ; fi
+ )
+ 
+ r_libdir=
+ if test -d "$use_r_libdir"; then
+    R_LIBDIR="$use_r_libdir"
+ else
+    AC_MSG_ERROR([
+    $use_r_libdir does not exist!
+    Check your installation of R, and use --with-r-libdir to specify an existing library tree.])
+ fi
+ AC_SUBST(R_LIBDIR)
+ 
+ AC_MSG_RESULT($use_r_libdir)
+ ])
+ 
  dnl ############################################ RKWARD specific addition end ###################################
  





More information about the rkward-tracker mailing list