[rkward-cvs] rkward/admin acinclude.m4.in,1.10,1.11

[Thomas Friedrichsmeier]

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

Modified Files:
	acinclude.m4.in 
Log Message:
Simplify wrapper script, remove unneeded --with-r-doc and --with-r-share options

Index: acinclude.m4.in
===================================================================
RCS file: /cvsroot/rkward/rkward/admin/acinclude.m4.in,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** acinclude.m4.in	14 Apr 2006 15:52:53 -0000	1.10
--- acinclude.m4.in	17 Apr 2006 14:06:29 -0000	1.11
***************
*** 1858,1863 ****
  AC_REQUIRE([CHECK_LIBRSO])
  AC_REQUIRE([CHECK_RINCLUDE])
- AC_REQUIRE([CHECK_RSHARE])
- AC_REQUIRE([CHECK_RDOC])
  dnl ############################################ RKWARD specific addition end ###################################
  
--- 1858,1861 ----
***************
*** 1910,1914 ****
  AC_ARG_WITH(r-includes,AC_HELP_STRING([--with-r-includes=DIR],[specify location of R include files]),
    use_r_includes="$withval",
!   use_r_includes=`R CMD sh -c 'echo $R_INCLUDE_DIR'`
    if test "$use_r_includes" == "" ; then use_r_includes="$R_HOMEDIR/include" ; fi
  )
--- 1908,1912 ----
  AC_ARG_WITH(r-includes,AC_HELP_STRING([--with-r-includes=DIR],[specify location of R include files]),
    use_r_includes="$withval",
!   use_r_includes=`$R_HOMEDIR/bin/R CMD sh -c 'echo $R_INCLUDE_DIR'`
    if test "$use_r_includes" == "" ; then use_r_includes="$R_HOMEDIR/include" ; fi
  )
***************
*** 1927,1978 ****
  ])
  
- 
- dnl find out about R_SHARE_DIR
- AC_DEFUN([CHECK_RSHARE],
- [
- AC_MSG_CHECKING(for R_SHARE directory)
- AC_ARG_WITH(r-share,AC_HELP_STRING([--with-r-share=DIR],[specify location of R_SHARE directory]),
-   use_r_share="$withval",
-   use_r_share=`R CMD sh -c 'echo $R_SHARE_DIR'`
-   if test "$use_r_share" == "" ; then use_r_share="$R_HOMEDIR/share" ; fi
- )
- 
- r_share=
- if test -d "$use_r_share"; then
-    R_SHAREDIR="$use_r_share"
- else
-    AC_MSG_ERROR([
-    $use_r_share does not exist as a directory!
-    Check your installation of R, and use --with-r-share to specify the correct directory.])
- fi
- AC_SUBST(R_SHAREDIR)
- 
- AC_MSG_RESULT($use_r_share)
- ])
- 
- 
- dnl find out about R_DOC_DIR
- AC_DEFUN([CHECK_RDOC],
- [
- AC_MSG_CHECKING(for R_DOC directory)
- AC_ARG_WITH(r-doc,AC_HELP_STRING([--with-r-doc=DIR],[specify location of R_DOC directory]),
-   use_r_doc="$withval",
-   use_r_doc=`R CMD sh -c 'echo $R_DOC_DIR'`
-   if test "$use_r_doc" == "" ; then use_r_doc="$R_HOMEDIR/doc" ; fi
- )
- 
- r_doc=
- if test -d "$use_r_doc"; then
-    R_DOCDIR="$use_r_doc"
- else
-    AC_MSG_ERROR([
-    $use_r_doc does not exist as a directory!
-    Check your installation of R, and use --with-r-doc to specify the correct directory.])
- fi
- AC_SUBST(R_DOCDIR)
- 
- AC_MSG_RESULT($use_r_doc)
- ])
- 
  dnl ############################################ RKWARD specific addition end ###################################
  
--- 1925,1928 ----