[rkward-cvs] rkward ChangeLog, 1.138, 1.139 TODO, 1.137, 1.138 acinclude.m4, 1.16, 1.17 aclocal.m4, 1.16, 1.17 configure, 1.47, 1.48
Thomas Friedrichsmeier
tfry at users.sourceforge.net
Thu Sep 14 16:28:04 UTC 2006
Update of /cvsroot/rkward/rkward
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv583
Modified Files:
ChangeLog TODO acinclude.m4 aclocal.m4 configure
Log Message:
Fix compilation for R 2.4.0
Index: configure
===================================================================
RCS file: /cvsroot/rkward/rkward/configure,v
retrieving revision 1.47
retrieving revision 1.48
diff -C2 -d -r1.47 -r1.48
*** configure 13 Sep 2006 12:31:59 -0000 1.47
--- configure 14 Sep 2006 16:28:02 -0000 1.48
***************
*** 935,938 ****
--- 935,939 ----
R_INCLUDEDIR
R_LAPACK_FLAG
+ R_BLAS_FLAG
include_ARTS_TRUE
include_ARTS_FALSE
***************
*** 8853,8857 ****
*-*-irix6*)
# Find out which ABI we are using.
! echo '#line 8855 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
--- 8854,8858 ----
*-*-irix6*)
# Find out which ABI we are using.
! echo '#line 8856 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
***************
*** 10698,10706 ****
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
! (eval echo "\"\$as_me:10700: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
! echo "$as_me:10704: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
--- 10699,10707 ----
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
! (eval echo "\"\$as_me:10701: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
! echo "$as_me:10705: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
***************
*** 10931,10939 ****
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
! (eval echo "\"\$as_me:10933: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
! echo "$as_me:10937: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
--- 10932,10940 ----
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
! (eval echo "\"\$as_me:10934: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
! echo "$as_me:10938: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
***************
*** 10998,11006 ****
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
! (eval echo "\"\$as_me:11000: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
! echo "$as_me:11004: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
--- 10999,11007 ----
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
! (eval echo "\"\$as_me:11001: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
! echo "$as_me:11005: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
***************
*** 13228,13232 ****
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
! #line 13230 "configure"
#include "confdefs.h"
--- 13229,13233 ----
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
! #line 13231 "configure"
#include "confdefs.h"
***************
*** 13326,13330 ****
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
! #line 13328 "configure"
#include "confdefs.h"
--- 13327,13331 ----
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
! #line 13329 "configure"
#include "confdefs.h"
***************
*** 15515,15523 ****
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
! (eval echo "\"\$as_me:15517: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
! echo "$as_me:15521: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
--- 15516,15524 ----
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
! (eval echo "\"\$as_me:15518: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
! echo "$as_me:15522: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
***************
*** 15582,15590 ****
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
! (eval echo "\"\$as_me:15584: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
! echo "$as_me:15588: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
--- 15583,15591 ----
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
! (eval echo "\"\$as_me:15585: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
! echo "$as_me:15589: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
***************
*** 16997,17001 ****
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
! #line 16999 "configure"
#include "confdefs.h"
--- 16998,17002 ----
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
! #line 17000 "configure"
#include "confdefs.h"
***************
*** 17095,17099 ****
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
! #line 17097 "configure"
#include "confdefs.h"
--- 17096,17100 ----
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
! #line 17098 "configure"
#include "confdefs.h"
***************
*** 17918,17926 ****
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
! (eval echo "\"\$as_me:17920: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
! echo "$as_me:17924: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
--- 17919,17927 ----
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
! (eval echo "\"\$as_me:17921: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
! echo "$as_me:17925: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
***************
*** 17985,17993 ****
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
! (eval echo "\"\$as_me:17987: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
! echo "$as_me:17991: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
--- 17986,17994 ----
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
! (eval echo "\"\$as_me:17988: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
! echo "$as_me:17992: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
***************
*** 19981,19989 ****
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
! (eval echo "\"\$as_me:19983: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
! echo "$as_me:19987: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
--- 19982,19990 ----
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
! (eval echo "\"\$as_me:19984: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
! echo "$as_me:19988: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
***************
*** 20214,20222 ****
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
! (eval echo "\"\$as_me:20216: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
! echo "$as_me:20220: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
--- 20215,20223 ----
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
! (eval echo "\"\$as_me:20217: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
! echo "$as_me:20221: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
***************
*** 20281,20289 ****
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
! (eval echo "\"\$as_me:20283: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
! echo "$as_me:20287: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
--- 20282,20290 ----
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
! (eval echo "\"\$as_me:20284: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
! echo "$as_me:20288: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
***************
*** 22511,22515 ****
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
! #line 22513 "configure"
#include "confdefs.h"
--- 22512,22516 ----
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
! #line 22514 "configure"
#include "confdefs.h"
***************
*** 22609,22613 ****
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
! #line 22611 "configure"
#include "confdefs.h"
--- 22610,22614 ----
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
! #line 22612 "configure"
#include "confdefs.h"
***************
*** 32523,32527 ****
for j in jpeglib.h;
do
! echo "configure: 32525: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
--- 32524,32528 ----
for j in jpeglib.h;
do
! echo "configure: 32526: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
***************
*** 32821,32825 ****
for j in $kde_qt_header;
do
! echo "configure: 32823: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
--- 32822,32826 ----
for j in $kde_qt_header;
do
! echo "configure: 32824: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
***************
*** 33699,33702 ****
--- 33700,33717 ----
+ { echo "$as_me:$LINENO: checking whether we should link against libRblas.so" >&5
+ echo $ECHO_N "checking whether we should link against libRblas.so... $ECHO_C" >&6; }
+ if test -f "$R_HOMEDIR/lib/libRblas.so"; then
+ { echo "$as_me:$LINENO: result: yes $R_HOMEDIR/lib/libRblas.so exists" >&5
+ echo "${ECHO_T}yes $R_HOMEDIR/lib/libRblas.so exists" >&6; }
+ R_BLAS_FLAG="-lRblas"
+ else
+ { echo "$as_me:$LINENO: result: no $R_HOMEDIR/lib/libRblas.so does not exist" >&5
+ echo "${ECHO_T}no $R_HOMEDIR/lib/libRblas.so does not exist" >&6; }
+ R_BLAS_FLAG=""
+ fi
+
+
+
***************
*** 33792,33796 ****
for j in $kde_check_header;
do
! echo "configure: 33794: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
--- 33807,33811 ----
for j in $kde_check_header;
do
! echo "configure: 33809: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
***************
*** 33822,33826 ****
for j in $kde_check_lib;
do
! echo "configure: 33824: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
--- 33837,33841 ----
for j in $kde_check_lib;
do
! echo "configure: 33839: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
***************
*** 33840,33844 ****
for j in "kde3/plugins/designer/kdewidgets.la";
do
! echo "configure: 33842: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
--- 33855,33859 ----
for j in "kde3/plugins/designer/kdewidgets.la";
do
! echo "configure: 33857: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
***************
*** 33958,33961 ****
--- 33973,33977 ----
+
# Check whether --enable-path-check was given.
if test "${enable_path_check+set}" = set; then
***************
*** 35290,35294 ****
for j in apps/ksgmltools2/customization/kde-chunk.xsl;
do
! echo "configure: 35292: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
--- 35306,35310 ----
for j in apps/ksgmltools2/customization/kde-chunk.xsl;
do
! echo "configure: 35308: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
***************
*** 36414,36417 ****
--- 36430,36434 ----
R_INCLUDEDIR!$R_INCLUDEDIR$ac_delim
R_LAPACK_FLAG!$R_LAPACK_FLAG$ac_delim
+ R_BLAS_FLAG!$R_BLAS_FLAG$ac_delim
include_ARTS_TRUE!$include_ARTS_TRUE$ac_delim
include_ARTS_FALSE!$include_ARTS_FALSE$ac_delim
***************
*** 36426,36430 ****
ARTSCCONFIG!$ARTSCCONFIG$ac_delim
MEINPROC!$MEINPROC$ac_delim
- KDE_XSL_STYLESHEET!$KDE_XSL_STYLESHEET$ac_delim
_ACEOF
--- 36443,36446 ----
***************
*** 36468,36471 ****
--- 36484,36488 ----
for ac_last_try in false false false false false :; do
cat >conf$$subs.sed <<_ACEOF
+ KDE_XSL_STYLESHEET!$KDE_XSL_STYLESHEET$ac_delim
XMLLINT!$XMLLINT$ac_delim
kde_htmldir!$kde_htmldir$ac_delim
***************
*** 36516,36520 ****
_ACEOF
! if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 46; then
break
elif $ac_last_try; then
--- 36533,36537 ----
_ACEOF
! if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 47; then
break
elif $ac_last_try; then
Index: ChangeLog
===================================================================
RCS file: /cvsroot/rkward/rkward/ChangeLog,v
retrieving revision 1.138
retrieving revision 1.139
diff -C2 -d -r1.138 -r1.139
*** ChangeLog 13 Sep 2006 13:09:48 -0000 1.138
--- ChangeLog 14 Sep 2006 16:28:01 -0000 1.139
***************
*** 1,2 ****
--- 1,3 ----
+ - link against libRblas.so if it is found in the R libs dir (needed for some compiles of R 2.4.0)
- remove whitespace from start and end of plugin generated commands and do not evaluate empty commands
- do not raise the command log more than once for a given command producing continuous output
Index: acinclude.m4
===================================================================
RCS file: /cvsroot/rkward/rkward/acinclude.m4,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** acinclude.m4 13 Sep 2006 12:31:59 -0000 1.16
--- acinclude.m4 14 Sep 2006 16:28:01 -0000 1.17
***************
*** 1915,1918 ****
--- 1915,1919 ----
AC_REQUIRE([CHECK_RINCLUDE])
AC_REQUIRE([CHECK_RLAPACK])
+ AC_REQUIRE([CHECK_RBLAS])
dnl ############################################ RKWARD specific addition end ###################################
***************
*** 1974,1977 ****
--- 1975,1993 ----
])
+ dnl for at least some versions of R, we seem to have to link against -lRblas. Else loading some
+ dnl R packages will fail due to unresolved symbols. However, we can't do this unconditionally,
+ dnl as this is not available in some configurations of R
+ AC_DEFUN([CHECK_RBLAS],
+ [
+ AC_MSG_CHECKING(whether we should link against libRblas.so)
+ if test -f "$R_HOMEDIR/lib/libRblas.so"; then
+ AC_MSG_RESULT(yes $R_HOMEDIR/lib/libRblas.so exists)
+ R_BLAS_FLAG="-lRblas"
+ else
+ AC_MSG_RESULT(no $R_HOMEDIR/lib/libRblas.so does not exist)
+ R_BLAS_FLAG=""
+ fi
+ AC_SUBST(R_BLAS_FLAG)
+ ])
dnl find out R_INLUCDE_DIR
Index: aclocal.m4
===================================================================
RCS file: /cvsroot/rkward/rkward/aclocal.m4,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** aclocal.m4 13 Sep 2006 12:31:59 -0000 1.16
--- aclocal.m4 14 Sep 2006 16:28:01 -0000 1.17
***************
*** 1927,1930 ****
--- 1927,1931 ----
AC_REQUIRE([CHECK_RINCLUDE])
AC_REQUIRE([CHECK_RLAPACK])
+ AC_REQUIRE([CHECK_RBLAS])
dnl ############################################ RKWARD specific addition end ###################################
***************
*** 1986,1989 ****
--- 1987,2005 ----
])
+ dnl for at least some versions of R, we seem to have to link against -lRblas. Else loading some
+ dnl R packages will fail due to unresolved symbols. However, we can't do this unconditionally,
+ dnl as this is not available in some configurations of R
+ AC_DEFUN([CHECK_RBLAS],
+ [
+ AC_MSG_CHECKING(whether we should link against libRblas.so)
+ if test -f "$R_HOMEDIR/lib/libRblas.so"; then
+ AC_MSG_RESULT(yes $R_HOMEDIR/lib/libRblas.so exists)
+ R_BLAS_FLAG="-lRblas"
+ else
+ AC_MSG_RESULT(no $R_HOMEDIR/lib/libRblas.so does not exist)
+ R_BLAS_FLAG=""
+ fi
+ AC_SUBST(R_BLAS_FLAG)
+ ])
dnl find out R_INLUCDE_DIR
Index: TODO
===================================================================
RCS file: /cvsroot/rkward/rkward/TODO,v
retrieving revision 1.137
retrieving revision 1.138
diff -C2 -d -r1.137 -r1.138
*** TODO 13 Sep 2006 12:54:01 -0000 1.137
--- TODO 14 Sep 2006 16:28:01 -0000 1.138
***************
*** 45,49 ****
- allow to pipe scripts to the console (console might have to be made smarter about large pasted commands, first)
- RKConsole / Script editor:
! - syntax tool tips
- highlight only valid function names
- RKHelpDlg:
--- 45,49 ----
- allow to pipe scripts to the console (console might have to be made smarter about large pasted commands, first)
- RKConsole / Script editor:
! - syntax tool tips / code completion
- highlight only valid function names
- RKHelpDlg:
More information about the rkward-tracker
mailing list