[rkward-cvs] rkward TODO,1.96,1.97 acinclude.m4,1.6,1.7 aclocal.m4,1.6,1.7 configure,1.29,1.30
Thomas Friedrichsmeier
tfry at users.sourceforge.net
Sun Nov 13 14:31:31 UTC 2005
- Previous 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
- Next message: [rkward-cvs] rkward/rkward/settings rksettingsmoduler.cpp,1.12,1.13 rksettingsmoduler.h,1.6,1.7
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/rkward/rkward
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25526
Modified Files:
TODO acinclude.m4 aclocal.m4 configure
Log Message:
Removing obsolete R_HOME mechanisms
Index: configure
===================================================================
RCS file: /cvsroot/rkward/rkward/configure,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -d -r1.29 -r1.30
*** configure 13 Nov 2005 13:18:41 -0000 1.29
--- configure 13 Nov 2005 14:31:28 -0000 1.30
***************
*** 1071,1074 ****
--- 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
***************
*** 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
--- 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
***************
*** 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`
--- 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`
***************
*** 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
--- 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
***************
*** 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
--- 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
***************
*** 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
--- 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
***************
*** 10785,10789 ****
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
! #line 10787 "configure"
#include "confdefs.h"
--- 10786,10790 ----
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
! #line 10788 "configure"
#include "confdefs.h"
***************
*** 10883,10887 ****
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
! #line 10885 "configure"
#include "confdefs.h"
--- 10884,10888 ----
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
! #line 10886 "configure"
#include "confdefs.h"
***************
*** 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
--- 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
***************
*** 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
--- 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
***************
*** 14416,14420 ****
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
! #line 14418 "configure"
#include "confdefs.h"
--- 14417,14421 ----
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
! #line 14419 "configure"
#include "confdefs.h"
***************
*** 14514,14518 ****
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
! #line 14516 "configure"
#include "confdefs.h"
--- 14515,14519 ----
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
! #line 14517 "configure"
#include "confdefs.h"
***************
*** 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
--- 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
***************
*** 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
--- 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
***************
*** 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
--- 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
***************
*** 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
--- 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
***************
*** 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
--- 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
***************
*** 19763,19767 ****
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
! #line 19765 "configure"
#include "confdefs.h"
--- 19764,19768 ----
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
! #line 19766 "configure"
#include "confdefs.h"
***************
*** 19861,19865 ****
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
! #line 19863 "configure"
#include "confdefs.h"
--- 19862,19866 ----
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
! #line 19864 "configure"
#include "confdefs.h"
***************
*** 27868,27872 ****
for j in jpeglib.h;
do
! echo "configure: 27870: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
--- 27869,27873 ----
for j in jpeglib.h;
do
! echo "configure: 27871: $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
--- 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
***************
*** 28912,28919 ****
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
--- 28913,28925 ----
echo "$as_me:$LINENO: checking whether R_HOME directory exists" >&5
echo $ECHO_N "checking whether R_HOME directory exists... $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/local/lib/R"
!
! fi;
r_home=
if test -d "$use_r_home"; then
***************
*** 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
--- 29047,29051 ----
for j in $kde_check_header;
do
! echo "configure: 29049: $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
--- 29077,29081 ----
for j in $kde_check_lib;
do
! echo "configure: 29079: $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
--- 29095,29099 ----
for j in "kde3/plugins/designer/kdewidgets.la";
do
! echo "configure: 29097: $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
--- 30485,30489 ----
for j in apps/ksgmltools2/customization/kde-chunk.xsl;
do
! echo "configure: 30487: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
***************
*** 32245,32248 ****
--- 32251,32259 ----
{ (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
Index: acinclude.m4
===================================================================
RCS file: /cvsroot/rkward/rkward/acinclude.m4,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** acinclude.m4 13 Nov 2005 13:18:40 -0000 1.6
--- acinclude.m4 13 Nov 2005 14:31:28 -0000 1.7
***************
*** 1867,1871 ****
[
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"
--- 1867,1871 ----
[
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="/usr/local/lib/R"
Index: aclocal.m4
===================================================================
RCS file: /cvsroot/rkward/rkward/aclocal.m4,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** aclocal.m4 13 Nov 2005 13:18:41 -0000 1.6
--- aclocal.m4 13 Nov 2005 14:31:28 -0000 1.7
***************
*** 1879,1883 ****
[
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"
--- 1879,1883 ----
[
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="/usr/local/lib/R"
Index: TODO
===================================================================
RCS file: /cvsroot/rkward/rkward/TODO,v
retrieving revision 1.96
retrieving revision 1.97
diff -C2 -d -r1.96 -r1.97
*** TODO 13 Nov 2005 13:18:40 -0000 1.96
--- TODO 13 Nov 2005 14:31:28 -0000 1.97
***************
*** 17,21 ****
- 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!)
--- 17,20 ----
- Previous 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
- Next message: [rkward-cvs] rkward/rkward/settings rksettingsmoduler.cpp,1.12,1.13 rksettingsmoduler.h,1.6,1.7
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the rkward-tracker
mailing list