[rkward-cvs] rkward/admin acinclude.m4.in,1.4,1.5

[Thomas Friedrichsmeier]

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

Modified Files:
	acinclude.m4.in 
Log Message:
Automake adjustments in preparation for using a wrapper script. The binary is now built in rkward.bin

Index: acinclude.m4.in
===================================================================
RCS file: /cvsroot/rkward/rkward/admin/acinclude.m4.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** acinclude.m4.in	3 Nov 2005 21:37:10 -0000	1.4
--- acinclude.m4.in	10 Nov 2005 21:22:38 -0000	1.5
***************
*** 1854,1860 ****
--- 1854,1898 ----
  AC_SUBST(AUTODIRS)
  
+ dnl ############################################ RKWARD specific addition begin #################################
+ AC_REQUIRE([CHECK_RHOME])
+ AC_REQUIRE([CHECK_LIBRSO])
+ dnl ############################################ RKWARD specific addition end ###################################
+ 
+ ])
+ 
+ dnl ############################################ RKWARD specific addition begin #################################
+ dnl check for R home dir
+ dnl mostly no idea what I'm doing, but hoping for the best...
+ AC_DEFUN([CHECK_RHOME],
+ [
+ AC_MSG_CHECKING(for R_HOME directory)
+ AC_ARG_WITH(r-home,AC_HELP_STRING([--r-home=DIR],[specify location of R_HOME directory]),
+   use_r_home="$withval",
+   use_r_home="/usr/lib/R"
+ )
+ r_home=
+ if test -d "$use_r_home"; then
+    R_HOMEDIR="$use_r_home"
+ else
+    AC_MSG_ERROR("$use_r_home does not exist as a directory!")
+ fi
+ AC_SUBST(R_HOMEDIR)
  
+ AC_MSG_RESULT($use_r_home)
  ])
  
+ dnl check for existence of libR.so
+ AC_DEFUN([CHECK_LIBRSO],
+ [
+ AC_MSG_CHECKING(for libR.so)
+ if test -f "$R_HOMEDIR/lib/libR.so"; then
+    AC_MSG_RESULT(found)
+ else
+    AC_MSG_ERROR("$R_HOMEDIR/lib/libR.so does not exist. Check whether you have compiled R with shared library")
+ fi
+ ])
+ dnl ############################################ RKWARD specific addition end ###################################
+ 
+ 
  AC_DEFUN([KDE_CHECK_EXTRA_LIBS],
  [