[rkward-cvs] rkward acinclude.m4,1.10,1.11 aclocal.m4,1.10,1.11 configure,1.34,1.35
Thomas Friedrichsmeier
tfry at users.sourceforge.net
Fri Apr 14 15:52:55 UTC 2006
Update of /cvsroot/rkward/rkward
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21669
Modified Files:
acinclude.m4 aclocal.m4 configure
Log Message:
Fix fallback settings for --with-r-...
Index: configure
===================================================================
RCS file: /cvsroot/rkward/rkward/configure,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -d -r1.34 -r1.35
*** configure 10 Apr 2006 21:37:00 -0000 1.34
--- configure 14 Apr 2006 15:52:53 -0000 1.35
***************
*** 28922,28926 ****
use_r_home="$withval"
else
! use_r_home=`R CMD sh -c 'echo $R_HOME' || echo "/usr/local/lib/R"`
fi;
--- 28922,28927 ----
use_r_home="$withval"
else
! use_r_home=`R CMD sh -c 'echo $R_HOME'`
! if test "$use_r_home" == "" ; then use_r_home="/usr/local/lib/R" ; fi
fi;
***************
*** 28969,28973 ****
use_r_includes="$withval"
else
! use_r_includes=`R CMD sh -c 'echo $R_INCLUDE_DIR' || echo "$R_HOMEDIR/include"`
fi;
--- 28970,28975 ----
use_r_includes="$withval"
else
! use_r_includes=`R CMD sh -c 'echo $R_INCLUDE_DIR'`
! if test "$use_r_includes" == "" ; then use_r_includes="$R_HOMEDIR/include" ; fi
fi;
***************
*** 28999,29003 ****
use_r_share="$withval"
else
! use_r_share=`R CMD sh -c 'echo $R_SHARE_DIR' || echo "$R_HOMEDIR/share"`
fi;
--- 29001,29006 ----
use_r_share="$withval"
else
! use_r_share=`R CMD sh -c 'echo $R_SHARE_DIR'`
! if test "$use_r_share" == "" ; then use_r_share="$R_HOMEDIR/share" ; fi
fi;
***************
*** 29029,29033 ****
use_r_doc="$withval"
else
! use_r_doc=`R CMD sh -c 'echo $R_DOC_DIR' || echo "$R_HOMEDIR/doc"`
fi;
--- 29032,29037 ----
use_r_doc="$withval"
else
! use_r_doc=`R CMD sh -c 'echo $R_DOC_DIR'`
! if test "$use_r_doc" == "" ; then use_r_doc="$R_HOMEDIR/doc" ; fi
fi;
***************
*** 29140,29144 ****
for j in $kde_check_header;
do
! echo "configure: 29142: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
--- 29144,29148 ----
for j in $kde_check_header;
do
! echo "configure: 29146: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
***************
*** 29170,29174 ****
for j in $kde_check_lib;
do
! echo "configure: 29172: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
--- 29174,29178 ----
for j in $kde_check_lib;
do
! echo "configure: 29176: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
***************
*** 29188,29192 ****
for j in "kde3/plugins/designer/kdewidgets.la";
do
! echo "configure: 29190: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
--- 29192,29196 ----
for j in "kde3/plugins/designer/kdewidgets.la";
do
! echo "configure: 29194: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
***************
*** 30581,30585 ****
for j in apps/ksgmltools2/customization/kde-chunk.xsl;
do
! echo "configure: 30583: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
--- 30585,30589 ----
for j in apps/ksgmltools2/customization/kde-chunk.xsl;
do
! echo "configure: 30587: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
Index: acinclude.m4
===================================================================
RCS file: /cvsroot/rkward/rkward/acinclude.m4,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** acinclude.m4 10 Apr 2006 21:37:00 -0000 1.10
--- acinclude.m4 14 Apr 2006 15:52:53 -0000 1.11
***************
*** 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
)
Index: aclocal.m4
===================================================================
RCS file: /cvsroot/rkward/rkward/aclocal.m4,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** aclocal.m4 10 Apr 2006 21:37:00 -0000 1.10
--- aclocal.m4 14 Apr 2006 15:52:53 -0000 1.11
***************
*** 1884,1888 ****
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=
--- 1884,1889 ----
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=
***************
*** 1921,1925 ****
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"`
)
--- 1922,1927 ----
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
)
***************
*** 1944,1948 ****
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"`
)
--- 1946,1951 ----
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
)
***************
*** 1967,1971 ****
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"`
)
--- 1970,1975 ----
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
)
More information about the rkward-tracker
mailing list