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

[Thomas Friedrichsmeier]

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

Modified Files:
	acinclude.m4.in 
Log Message:
Fix fallback settings for --with-r-...

Index: acinclude.m4.in
===================================================================
RCS file: /cvsroot/rkward/rkward/admin/acinclude.m4.in,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** acinclude.m4.in	10 Apr 2006 21:37:01 -0000	1.9
--- acinclude.m4.in	14 Apr 2006 15:52:53 -0000	1.10
***************
*** 1872,1876 ****
  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"`
  )
  r_home=
--- 1872,1877 ----
  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'`
!   if test "$use_r_home" == "" ; then use_r_home="/usr/local/lib/R" ; fi
  )
  r_home=
***************
*** 1909,1913 ****
  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"`
  )
  
--- 1910,1915 ----
  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
  )
  
***************
*** 1932,1936 ****
  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"`
  )
  
--- 1934,1939 ----
  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
  )
  
***************
*** 1955,1959 ****
  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"`
  )
  
--- 1958,1963 ----
  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
  )