[rkward-cvs] rkward INSTALL,1.5,1.6 TODO,1.95,1.96 acinclude.m4,1.5,1.6 aclocal.m4,1.5,1.6 configure,1.28,1.29
Thomas Friedrichsmeier
tfry at users.sourceforge.net
Sun Nov 13 13:18:44 UTC 2005
- Previous message: [rkward-cvs] rkward/admin acinclude.m4.in,1.5,1.6
- Next message: [rkward-cvs] rkward/rkward/rbackend rembedinternal.cpp,1.31,1.32 rembedinternal.h,1.17,1.18 rinterface.cpp,1.40,1.41 rthread.cpp,1.29,1.30
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/rkward/rkward
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11310
Modified Files:
INSTALL TODO acinclude.m4 aclocal.m4 configure
Log Message:
Use /usr/local/lib/R as default location for r-home for consistency's sake
Index: configure
===================================================================
RCS file: /cvsroot/rkward/rkward/configure,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -d -r1.28 -r1.29
*** configure 10 Nov 2005 21:22:38 -0000 1.28
--- configure 13 Nov 2005 13:18:41 -0000 1.29
***************
*** 1071,1075 ****
--with-qt-includes=DIR where the Qt includes are.
--with-qt-libraries=DIR where the Qt library is installed.
- --r-home=DIR specify location of R_HOME directory
--without-arts build without aRts default=yes
--- 1071,1074 ----
***************
*** 6716,6720 ****
*-*-irix6*)
# Find out which ABI we are using.
! echo '#line 6718 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
--- 6715,6719 ----
*-*-irix6*)
# Find out which ABI we are using.
! echo '#line 6717 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
***************
*** 7357,7361 ****
# Provide some information about the compiler.
! echo "$as_me:7359:" \
"checking for Fortran 77 compiler version" >&5
ac_compiler=`set X $ac_compile; echo $2`
--- 7356,7360 ----
# Provide some information about the compiler.
! echo "$as_me:7358:" \
"checking for Fortran 77 compiler version" >&5
ac_compiler=`set X $ac_compile; echo $2`
***************
*** 8383,8391 ****
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
! (eval echo "\"\$as_me:8385: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
! echo "$as_me:8389: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
--- 8382,8390 ----
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
! (eval echo "\"\$as_me:8384: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
! echo "$as_me:8388: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
***************
*** 8616,8624 ****
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
! (eval echo "\"\$as_me:8618: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
! echo "$as_me:8622: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
--- 8615,8623 ----
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
! (eval echo "\"\$as_me:8617: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
! echo "$as_me:8621: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
***************
*** 8683,8691 ****
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
! (eval echo "\"\$as_me:8685: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
! echo "$as_me:8689: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
--- 8682,8690 ----
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
! (eval echo "\"\$as_me:8684: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
! echo "$as_me:8688: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
***************
*** 10786,10790 ****
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
! #line 10788 "configure"
#include "confdefs.h"
--- 10785,10789 ----
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
! #line 10787 "configure"
#include "confdefs.h"
***************
*** 10884,10888 ****
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
! #line 10886 "configure"
#include "confdefs.h"
--- 10883,10887 ----
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
! #line 10885 "configure"
#include "confdefs.h"
***************
*** 13021,13029 ****
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
! (eval echo "\"\$as_me:13023: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
! echo "$as_me:13027: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
--- 13020,13028 ----
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
! (eval echo "\"\$as_me:13022: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
! echo "$as_me:13026: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
***************
*** 13088,13096 ****
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
! (eval echo "\"\$as_me:13090: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
! echo "$as_me:13094: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
--- 13087,13095 ----
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
! (eval echo "\"\$as_me:13089: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
! echo "$as_me:13093: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
***************
*** 14417,14421 ****
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
! #line 14419 "configure"
#include "confdefs.h"
--- 14416,14420 ----
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
! #line 14418 "configure"
#include "confdefs.h"
***************
*** 14515,14519 ****
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
! #line 14517 "configure"
#include "confdefs.h"
--- 14514,14518 ----
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
! #line 14516 "configure"
#include "confdefs.h"
***************
*** 15338,15346 ****
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
! (eval echo "\"\$as_me:15340: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
! echo "$as_me:15344: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
--- 15337,15345 ----
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
! (eval echo "\"\$as_me:15339: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
! echo "$as_me:15343: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
***************
*** 15405,15413 ****
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
! (eval echo "\"\$as_me:15407: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
! echo "$as_me:15411: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
--- 15404,15412 ----
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
! (eval echo "\"\$as_me:15406: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
! echo "$as_me:15410: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
***************
*** 17361,17369 ****
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
! (eval echo "\"\$as_me:17363: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
! echo "$as_me:17367: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
--- 17360,17368 ----
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
! (eval echo "\"\$as_me:17362: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
! echo "$as_me:17366: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
***************
*** 17594,17602 ****
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
! (eval echo "\"\$as_me:17596: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
! echo "$as_me:17600: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
--- 17593,17601 ----
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
! (eval echo "\"\$as_me:17595: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
! echo "$as_me:17599: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
***************
*** 17661,17669 ****
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
! (eval echo "\"\$as_me:17663: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
! echo "$as_me:17667: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
--- 17660,17668 ----
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
! (eval echo "\"\$as_me:17662: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
! echo "$as_me:17666: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
***************
*** 19764,19768 ****
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
! #line 19766 "configure"
#include "confdefs.h"
--- 19763,19767 ----
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
! #line 19765 "configure"
#include "confdefs.h"
***************
*** 19862,19866 ****
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
! #line 19864 "configure"
#include "confdefs.h"
--- 19861,19865 ----
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
! #line 19863 "configure"
#include "confdefs.h"
***************
*** 27869,27873 ****
for j in jpeglib.h;
do
! echo "configure: 27871: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
--- 27868,27872 ----
for j in jpeglib.h;
do
! echo "configure: 27870: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
***************
*** 28174,28178 ****
for j in $kde_qt_header;
do
! echo "configure: 28176: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
--- 28173,28177 ----
for j in $kde_qt_header;
do
! echo "configure: 28175: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
***************
*** 28911,28931 ****
! echo "$as_me:$LINENO: checking for R_HOME directory" >&5
! echo $ECHO_N "checking for R_HOME directory... $ECHO_C" >&6
!
! # Check whether --with-r-home or --without-r-home was given.
! if test "${with_r_home+set}" = set; then
! withval="$with_r_home"
! use_r_home="$withval"
! else
! use_r_home="/usr/lib/R"
!
! fi;
r_home=
if test -d "$use_r_home"; then
R_HOMEDIR="$use_r_home"
else
! { { echo "$as_me:$LINENO: error: \"$use_r_home does not exist as a directory!\"" >&5
! echo "$as_me: error: \"$use_r_home does not exist as a directory!\"" >&2;}
{ (exit 1); exit 1; }; }
fi
--- 28910,28929 ----
! echo "$as_me:$LINENO: checking whether R_HOME directory exists" >&5
! echo $ECHO_N "checking whether R_HOME directory exists... $ECHO_C" >&6
! AC_ARG(r-home, --r-home=DIR specify location of R_HOME directory,
! use_r_home="$withval",
! use_r_home="/usr/local/lib/R"
! )
r_home=
if test -d "$use_r_home"; then
R_HOMEDIR="$use_r_home"
else
! { { echo "$as_me:$LINENO: 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." >&5
! echo "$as_me: 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." >&2;}
{ (exit 1); exit 1; }; }
fi
***************
*** 28939,28947 ****
echo $ECHO_N "checking for libR.so... $ECHO_C" >&6
if test -f "$R_HOMEDIR/lib/libR.so"; then
! echo "$as_me:$LINENO: result: found" >&5
! echo "${ECHO_T}found" >&6
else
! { { echo "$as_me:$LINENO: error: \"$R_HOMEDIR/lib/libR.so does not exist. Check whether you have compiled R with shared library\"" >&5
! echo "$as_me: error: \"$R_HOMEDIR/lib/libR.so does not exist. Check whether you have compiled R with shared library\"" >&2;}
{ (exit 1); exit 1; }; }
fi
--- 28937,28951 ----
echo $ECHO_N "checking for libR.so... $ECHO_C" >&6
if test -f "$R_HOMEDIR/lib/libR.so"; then
! echo "$as_me:$LINENO: result: $R_HOMEDIR/lib/libR.so" >&5
! echo "${ECHO_T}$R_HOMEDIR/lib/libR.so" >&6
else
! { { echo "$as_me:$LINENO: 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." >&5
! echo "$as_me: 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." >&2;}
{ (exit 1); exit 1; }; }
fi
***************
*** 29037,29041 ****
for j in $kde_check_header;
do
! echo "configure: 29039: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
--- 29041,29045 ----
for j in $kde_check_header;
do
! echo "configure: 29043: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
***************
*** 29067,29071 ****
for j in $kde_check_lib;
do
! echo "configure: 29069: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
--- 29071,29075 ----
for j in $kde_check_lib;
do
! echo "configure: 29073: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
***************
*** 29085,29089 ****
for j in "kde3/plugins/designer/kdewidgets.la";
do
! echo "configure: 29087: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
--- 29089,29093 ----
for j in "kde3/plugins/designer/kdewidgets.la";
do
! echo "configure: 29091: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
***************
*** 30475,30479 ****
for j in apps/ksgmltools2/customization/kde-chunk.xsl;
do
! echo "configure: 30477: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
--- 30479,30483 ----
for j in apps/ksgmltools2/customization/kde-chunk.xsl;
do
! echo "configure: 30481: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
***************
*** 32241,32249 ****
{ (exit 0); exit 0; }
_ACEOF
- if test "x$with_fast_perl" = "xyes"; then
- perl -i.bak $ac_aux_dir/conf.change.pl $CONFIG_STATUS \
- || mv $CONFIG_STATUS.bak $CONFIG_STATUS
- rm -f $CONFIG_STATUS.bak
- fi
chmod +x $CONFIG_STATUS
ac_clean_files=$ac_clean_files_save
--- 32245,32248 ----
Index: acinclude.m4
===================================================================
RCS file: /cvsroot/rkward/rkward/acinclude.m4,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** acinclude.m4 10 Nov 2005 21:22:37 -0000 1.5
--- acinclude.m4 13 Nov 2005 13:18:40 -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(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
])
Index: INSTALL
===================================================================
RCS file: /cvsroot/rkward/rkward/INSTALL,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** INSTALL 10 Nov 2005 21:22:37 -0000 1.5
--- INSTALL 13 Nov 2005 13:18:40 -0000 1.6
***************
*** 36,48 ****
Likely you will need to specify the location of the R home directory:
! --with-r-home=/path/to/R/home
If you have the standalone version of R installed, you can determine this directory by running:
# R RHOME
! for debian use --with-r-home=/usr/lib/R (default, so you do can omit this parameter)
You will need to have the R shared library installed. The makefiles assumes it to be in $R_HOME/lib/libR.so
! Personally, I need only the following option for configure (debian sid):
! --prefix=/usr
--- 36,48 ----
Likely you will need to specify the location of the R home directory:
! --with-r-home=/path/to/R/home (default is /usr/local/lib/R)
If you have the standalone version of R installed, you can determine this directory by running:
# R RHOME
! for debian use --with-r-home=/usr/lib/R
You will need to have the R shared library installed. The makefiles assumes it to be in $R_HOME/lib/libR.so
! Personally, I need the following options for configure (debian sid):
! --prefix=/usr --with-r-home=/usr/lib/R
***************
*** 50,54 ****
==================
! You _have to_ install RKWard. Otherwise RKWard will be missing important menu-options, or may not run at all.
As root run:
# make install
--- 50,54 ----
==================
! You _have to_ install RKWard. Otherwise RKWard will be missing important menu-options, may behave strangely, or may not run at all.
As root run:
# make install
Index: aclocal.m4
===================================================================
RCS file: /cvsroot/rkward/rkward/aclocal.m4,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** aclocal.m4 10 Nov 2005 21:22:37 -0000 1.5
--- aclocal.m4 13 Nov 2005 13:18:41 -0000 1.6
***************
*** 1878,1885 ****
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=
--- 1878,1885 ----
AC_DEFUN([CHECK_RHOME],
[
! AC_MSG_CHECKING(whether R_HOME directory exists)
! AC_ARG(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=
***************
*** 1887,1891 ****
R_HOMEDIR="$use_r_home"
else
! AC_MSG_ERROR("$use_r_home does not exist as a directory!")
fi
AC_SUBST(R_HOMEDIR)
--- 1887,1893 ----
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)
***************
*** 1899,1905 ****
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
])
--- 1901,1910 ----
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
])
Index: TODO
===================================================================
RCS file: /cvsroot/rkward/rkward/TODO,v
retrieving revision 1.95
retrieving revision 1.96
diff -C2 -d -r1.95 -r1.96
*** TODO 10 Nov 2005 23:04:30 -0000 1.95
--- TODO 13 Nov 2005 13:18:40 -0000 1.96
***************
*** 17,23 ****
--- 17,33 ----
- on viewDeactivated, it may not be safe to call setCaption and there activeWindow (). Apparently, the pointer may be invalid:
- start rkward with empty table. open command editor. switch back to table. Edit some stuff in the table. Ctrl+W. Crash
+ - remove obsolete R_HOME config, detection, warnings
+ - HTMLWindow
+ - if invoking an invalid HTML url, there's bad and buggy behavior (esp., back/forward are enabled!)
+ - there should be a notice when following an invalid link fails
+ - offer to spawn external browser when trying to open non-local url
+
+ - fix status bar:
+ - r status indication sould be made "permanent"
+ - when a message is shown (esp. internally from the HTMLWindow), it may have to be regexped to replace < and > (why, oh why?)
- Plugin Documentation:
- Labels are now attached to components instead of menu-entries. Update documentation.
+ - convert to kdoc
Configuration options to add:
***************
*** 50,54 ****
- static members should be moved to the respective classes. Much cleaner!
! stuff to do before 0.3.5 release
- plugins (general)
- add import-filter plugins
--- 60,64 ----
- static members should be moved to the respective classes. Much cleaner!
! stuff to do before 0.4.0 release
- plugins (general)
- add import-filter plugins
***************
*** 92,96 ****
- cleanup label-mess for plugin-widgets
- setEnabled (), setVisible ()-API (trivial, once the plugin-widgets are QWidgets)
! - add XML-parsing helper functions and error-checking
- formula-widget:
- use smart sorting, esp. of generated string
--- 102,106 ----
- cleanup label-mess for plugin-widgets
- setEnabled (), setVisible ()-API (trivial, once the plugin-widgets are QWidgets)
! - use XMLHelper
- formula-widget:
- use smart sorting, esp. of generated string
- Previous message: [rkward-cvs] rkward/admin acinclude.m4.in,1.5,1.6
- Next message: [rkward-cvs] rkward/rkward/rbackend rembedinternal.cpp,1.31,1.32 rembedinternal.h,1.17,1.18 rinterface.cpp,1.40,1.41 rthread.cpp,1.29,1.30
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the rkward-tracker
mailing list