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

[Thomas Friedrichsmeier]

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

Modified Files:
	acinclude.m4.in 
Log Message:
Use /usr/local/lib/R as default location for r-home for consistency's sake

Index: acinclude.m4.in
===================================================================
RCS file: /cvsroot/rkward/rkward/admin/acinclude.m4.in,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** acinclude.m4.in	10 Nov 2005 21:22:38 -0000	1.5
--- acinclude.m4.in	13 Nov 2005 13:18:42 -0000	1.6
***************
*** 1866,1873 ****
  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=
--- 1866,1873 ----
  AC_DEFUN([CHECK_RHOME],
  [
! AC_MSG_CHECKING(whether R_HOME directory exists)
  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/local/lib/R"
  )
  r_home=
***************
*** 1875,1879 ****
     R_HOMEDIR="$use_r_home"
  else
!    AC_MSG_ERROR("$use_r_home does not exist as a directory!")
  fi
  AC_SUBST(R_HOMEDIR)
--- 1875,1881 ----
     R_HOMEDIR="$use_r_home"
  else
!    AC_MSG_ERROR([
!    $use_r_home does not exist as a directory!
!    Check your installation of R, and use --with-r-home to specify the correct location.])
  fi
  AC_SUBST(R_HOMEDIR)
***************
*** 1887,1893 ****
  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
  ])
--- 1889,1898 ----
  AC_MSG_CHECKING(for libR.so)
  if test -f "$R_HOMEDIR/lib/libR.so"; then
!    AC_MSG_RESULT($R_HOMEDIR/lib/libR.so)
  else
!    AC_MSG_ERROR([
!    $R_HOMEDIR/lib/libR.so does not exist.
!    Check whether you have compiled R with shared library, 
!    and the --with-r-home setting was detected correctly above.])
  fi
  ])