[rkward-cvs] rkward/admin acinclude.m4.in,1.7,1.8

[Thomas Friedrichsmeier]

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

Modified Files:
	acinclude.m4.in 
Log Message:
Fix configure options

Index: acinclude.m4.in
===================================================================
RCS file: /cvsroot/rkward/rkward/admin/acinclude.m4.in,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** acinclude.m4.in	21 Feb 2006 13:26:18 -0000	1.7
--- acinclude.m4.in	29 Mar 2006 13:25:07 -0000	1.8
***************
*** 1870,1874 ****
  [
  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=`R CMD sh -c 'echo $R_HOME' || echo "/usr/local/lib/R"`
--- 1870,1874 ----
  [
  AC_MSG_CHECKING(whether R_HOME directory exists)
! AC_ARG_WITH(r-home,AC_HELP_STRING([--with-r-home=DIR],[specify location of R_HOME directory]),
    use_r_home="$withval",
    use_r_home=`R CMD sh -c 'echo $R_HOME' || echo "/usr/local/lib/R"`
***************
*** 1880,1884 ****
     AC_MSG_ERROR([
     $use_r_home does not exist as a directory!
!    Check your installation of R, and use --r-home to specify the correct location.])
  fi
  AC_SUBST(R_HOMEDIR)
--- 1880,1884 ----
     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)
***************
*** 1898,1902 ****
     $R_HOMEDIR/lib/libR.so does not exist.
     Check whether you have compiled R with shared library, 
!    and the --r-home setting was detected correctly above.])
  fi
  ])
--- 1898,1902 ----
     $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
  ])
***************
*** 1907,1911 ****
  [
  AC_MSG_CHECKING(for R include files)
! AC_ARG_WITH(r-includes,AC_HELP_STRING([--r-includes=DIR],[specify location of R include files]),
    use_r_includes="$withval",
    use_r_includes=`R CMD sh -c 'echo $R_INCLUDE_DIR' || echo "$R_HOMEDIR/include"`
--- 1907,1911 ----
  [
  AC_MSG_CHECKING(for R include files)
! 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' || echo "$R_HOMEDIR/include"`
***************
*** 1918,1922 ****
     AC_MSG_ERROR([
     $use_r_includes/R.h does not exist!
!    Check your installation of R, and use --r-includes to specify the correct directory.])
  fi
  AC_SUBST(R_INCLUDEDIR)
--- 1918,1922 ----
     AC_MSG_ERROR([
     $use_r_includes/R.h does not exist!
!    Check your installation of R, and use --with-r-includes to specify the correct directory.])
  fi
  AC_SUBST(R_INCLUDEDIR)
***************
*** 1930,1934 ****
  [
  AC_MSG_CHECKING(for R_SHARE directory)
! AC_ARG_WITH(r-share,AC_HELP_STRING([--r-share=DIR],[specify location of R_SHARE directory]),
    use_r_share="$withval",
    use_r_share=`R CMD sh -c 'echo $R_SHARE_DIR' || echo "$R_HOMEDIR/share"`
--- 1930,1934 ----
  [
  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' || echo "$R_HOMEDIR/share"`
***************
*** 1941,1945 ****
     AC_MSG_ERROR([
     $use_r_share does not exist as a directory!
!    Check your installation of R, and use --r-share to specify the correct directory.])
  fi
  AC_SUBST(R_SHAREDIR)
--- 1941,1945 ----
     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)
***************
*** 1953,1957 ****
  [
  AC_MSG_CHECKING(for R_DOC directory)
! AC_ARG_WITH(r-doc,AC_HELP_STRING([--r-doc=DIR],[specify location of R_DOC directory]),
    use_r_doc="$withval",
    use_r_doc=`R CMD sh -c 'echo $R_DOC_DIR' || echo "$R_HOMEDIR/doc"`
--- 1953,1957 ----
  [
  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' || echo "$R_HOMEDIR/doc"`
***************
*** 1964,1968 ****
     AC_MSG_ERROR([
     $use_r_doc does not exist as a directory!
!    Check your installation of R, and use --r-doc to specify the correct directory.])
  fi
  AC_SUBST(R_DOCDIR)
--- 1964,1968 ----
     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)