[rkward-cvs] rkward ChangeLog,1.99,1.100 TODO,1.101,1.102 acinclude.m4,1.7,1.8 aclocal.m4,1.7,1.8 configure,1.30,1.31
Thomas Friedrichsmeier
tfry at users.sourceforge.net
Tue Feb 21 13:26:20 UTC 2006
Update of /cvsroot/rkward/rkward
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25052
Modified Files:
ChangeLog TODO acinclude.m4 aclocal.m4 configure
Log Message:
Autodetection of R_HOME, R_SHARE_DIR, etc. during configure. Should fix compilation/run-time issues with recent debian versions of R
Index: configure
===================================================================
RCS file: /cvsroot/rkward/rkward/configure,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -d -r1.30 -r1.31
*** configure 13 Nov 2005 14:31:28 -0000 1.30
--- configure 21 Feb 2006 13:26:18 -0000 1.31
***************
*** 465,469 ****
#endif"
! ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE CONF_FILES CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE WOVERLOADED_VIRTUAL USE_EXCEPTIONS USE_RTTI CXXCPP NOOPT_CXXFLAGS NOOPT_CFLAGS KDE_USE_FINAL_TRUE KDE_USE_FINAL_FALSE KDE_USE_CLOSURE_TRUE KDE_USE_CLOSURE_FALSE KDE_NO_UNDEFINED KDE_USE_NMCHECK_TRUE KDE_USE_NMCHECK_FALSE EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB F77 FFLAGS ac_ct_F77 LIBTOOL KDE_PLUGIN MSGFMT GMSGFMT XGETTEXT LIBUTIL LIBCOMPAT LIBCRYPT LIBRESOLV LIB_POLL FRAMEWORK_COREAUDIO LIBSOCKET X_EXTRA_LIBS LIBUCB LIBDL X_PRE_LIBS LIB_X11 LIB_XRENDER LIBSM X_INCLUDES X_LDFLAGS x_includes x_libraries QTE_NORTTI LIB_XEXT LIBPTHREAD USE_THREADS KDE_MT_LDFLAGS KDE_MT_LIBS USER_INCLUDES USER_LDFLAGS LIBZ LIBPNG LIBJPEG qt_libraries qt_includes QT_INCLUDES QT_LDFLAGS PERL MOC UIC UIC_TR LIB_QT LIB_QPE kde_qtver KDE_EXTRA_RPATH KDE_RPATH X_RPATH kde_libraries kde_includes KDE_LDFLAGS KDE_INCLUDES all_includes all_libraries AUTODIRS R_HOMEDIR include_ARTS_TRUE include_ARTS_FALSE KCONFIG_COMPILER KCFG_DEPENDENCIES DCOPIDLNG DCOPIDL DCOPIDL2CPP DCOP_DEPENDENCIES MCOPIDL ARTSCCONFIG KDECONFIG MEINPROC KDE_XSL_STYLESHEET XMLLINT kde_libs_prefix kde_libs_htmldir kde_htmldir kde_appsdir kde_icondir kde_sounddir kde_datadir kde_locale kde_confdir kde_kcfgdir kde_mimedir kde_wallpaperdir kde_bindir xdg_appsdir xdg_menudir xdg_directorydir kde_templatesdir kde_servicesdir kde_servicetypesdir kde_moduledir kdeinitdir kde_styledir kde_widgetdir LIB_KDECORE LIB_KDEUI LIB_KIO LIB_SMB LIB_KAB LIB_KABC LIB_KHTML LIB_KSPELL LIB_KPARTS LIB_KDEPRINT LIB_KUTILS LIB_KDEPIM LIB_KSYCOCA LIB_KFILE LIB_KFM TOPSUBDIRS LIBOBJS LTLIBOBJS'
ac_subst_files=''
--- 465,469 ----
#endif"
! ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE CONF_FILES CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE WOVERLOADED_VIRTUAL USE_EXCEPTIONS USE_RTTI CXXCPP NOOPT_CXXFLAGS NOOPT_CFLAGS KDE_USE_FINAL_TRUE KDE_USE_FINAL_FALSE KDE_USE_CLOSURE_TRUE KDE_USE_CLOSURE_FALSE KDE_NO_UNDEFINED KDE_USE_NMCHECK_TRUE KDE_USE_NMCHECK_FALSE EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB F77 FFLAGS ac_ct_F77 LIBTOOL KDE_PLUGIN MSGFMT GMSGFMT XGETTEXT LIBUTIL LIBCOMPAT LIBCRYPT LIBRESOLV LIB_POLL FRAMEWORK_COREAUDIO LIBSOCKET X_EXTRA_LIBS LIBUCB LIBDL X_PRE_LIBS LIB_X11 LIB_XRENDER LIBSM X_INCLUDES X_LDFLAGS x_includes x_libraries QTE_NORTTI LIB_XEXT LIBPTHREAD USE_THREADS KDE_MT_LDFLAGS KDE_MT_LIBS USER_INCLUDES USER_LDFLAGS LIBZ LIBPNG LIBJPEG qt_libraries qt_includes QT_INCLUDES QT_LDFLAGS PERL MOC UIC UIC_TR LIB_QT LIB_QPE kde_qtver KDE_EXTRA_RPATH KDE_RPATH X_RPATH kde_libraries kde_includes KDE_LDFLAGS KDE_INCLUDES all_includes all_libraries AUTODIRS R_HOMEDIR R_INCLUDEDIR R_SHAREDIR R_DOCDIR include_ARTS_TRUE include_ARTS_FALSE KCONFIG_COMPILER KCFG_DEPENDENCIES DCOPIDLNG DCOPIDL DCOPIDL2CPP DCOP_DEPENDENCIES MCOPIDL ARTSCCONFIG KDECONFIG MEINPROC KDE_XSL_STYLESHEET XMLLINT kde_libs_prefix kde_libs_htmldir kde_htmldir kde_appsdir kde_icondir kde_sounddir kde_datadir kde_locale kde_confdir kde_kcfgdir kde_mimedir kde_wallpaperdir kde_bindir xdg_appsdir xdg_menudir xdg_directorydir kde_templatesdir kde_servicesdir kde_servicetypesdir kde_moduledir kdeinitdir kde_styledir kde_widgetdir LIB_KDECORE LIB_KDEUI LIB_KIO LIB_SMB LIB_KAB LIB_KABC LIB_KHTML LIB_KSPELL LIB_KPARTS LIB_KDEPRINT LIB_KUTILS LIB_KDEPIM LIB_KSYCOCA LIB_KFILE LIB_KFM TOPSUBDIRS LIBOBJS LTLIBOBJS'
ac_subst_files=''
***************
*** 1072,1075 ****
--- 1072,1078 ----
--with-qt-libraries=DIR where the Qt library is installed.
--r-home=DIR specify location of R_HOME directory
+ --r-includes=DIR specify location of R include files
+ --r-share=DIR specify location of R_SHARE directory
+ --r-doc=DIR specify location of R_DOC directory
--without-arts build without aRts default=yes
***************
*** 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
--- 6719,6723 ----
*-*-irix6*)
# Find out which ABI we are using.
! echo '#line 6721 "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`
--- 7360,7364 ----
# Provide some information about the compiler.
! echo "$as_me:7362:" \
"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
--- 8386,8394 ----
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
! (eval echo "\"\$as_me:8388: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
! echo "$as_me:8392: \$? = $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
--- 8619,8627 ----
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
! (eval echo "\"\$as_me:8621: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
! echo "$as_me:8625: \$? = $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
--- 8686,8694 ----
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
! (eval echo "\"\$as_me:8688: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
! echo "$as_me:8692: \$? = $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"
--- 10789,10793 ----
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
! #line 10791 "configure"
#include "confdefs.h"
***************
*** 10884,10888 ****
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
! #line 10886 "configure"
#include "confdefs.h"
--- 10887,10891 ----
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
! #line 10889 "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
--- 13024,13032 ----
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
! (eval echo "\"\$as_me:13026: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
! echo "$as_me:13030: \$? = $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
--- 13091,13099 ----
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
! (eval echo "\"\$as_me:13093: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
! echo "$as_me:13097: \$? = $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"
--- 14420,14424 ----
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
! #line 14422 "configure"
#include "confdefs.h"
***************
*** 14515,14519 ****
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
! #line 14517 "configure"
#include "confdefs.h"
--- 14518,14522 ----
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
! #line 14520 "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
--- 15341,15349 ----
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
! (eval echo "\"\$as_me:15343: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
! echo "$as_me:15347: \$? = $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
--- 15408,15416 ----
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
! (eval echo "\"\$as_me:15410: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
! echo "$as_me:15414: \$? = $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
--- 17364,17372 ----
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
! (eval echo "\"\$as_me:17366: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
! echo "$as_me:17370: \$? = $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
--- 17597,17605 ----
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
! (eval echo "\"\$as_me:17599: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
! echo "$as_me:17603: \$? = $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
--- 17664,17672 ----
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
! (eval echo "\"\$as_me:17666: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
! echo "$as_me:17670: \$? = $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"
--- 19767,19771 ----
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
! #line 19769 "configure"
#include "confdefs.h"
***************
*** 19862,19866 ****
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
! #line 19864 "configure"
#include "confdefs.h"
--- 19865,19869 ----
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
! #line 19867 "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
--- 27872,27876 ----
for j in jpeglib.h;
do
! echo "configure: 27874: $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
--- 28177,28181 ----
for j in $kde_qt_header;
do
! echo "configure: 28179: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
***************
*** 28919,28923 ****
use_r_home="$withval"
else
! use_r_home="/usr/local/lib/R"
fi;
--- 28922,28926 ----
use_r_home="$withval"
else
! use_r_home=`R CMD sh -c 'echo $R_HOME' || echo "/usr/local/lib/R"`
fi;
***************
*** 28928,28935 ****
{ { 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
--- 28931,28938 ----
{ { echo "$as_me:$LINENO: error:
$use_r_home does not exist as a directory!
! Check your installation of R, and use --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 --r-home to specify the correct location." >&2;}
{ (exit 1); exit 1; }; }
fi
***************
*** 28949,28961 ****
$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
--- 28952,29054 ----
$R_HOMEDIR/lib/libR.so does not exist.
Check whether you have compiled R with shared library,
! and the --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 --r-home setting was detected correctly above." >&2;}
{ (exit 1); exit 1; }; }
fi
+ echo "$as_me:$LINENO: checking for R include files" >&5
+ echo $ECHO_N "checking for R include files... $ECHO_C" >&6
+
+ # Check whether --with-r-includes or --without-r-includes was given.
+ if test "${with_r_includes+set}" = set; then
+ withval="$with_r_includes"
+ use_r_includes="$withval"
+ else
+ use_r_includes=`R CMD sh -c 'echo $R_INCLUDE_DIR' || echo "$R_HOMEDIR/include"`
+
+ fi;
+
+ r_includes=
+ if test -f "$use_r_includes/R.h"; then
+ R_INCLUDEDIR="$use_r_includes"
+ else
+ { { echo "$as_me:$LINENO: error:
+ $use_r_includes/R.h does not exist!
+ Check your installation of R, and use --r-includes to specify the correct directory." >&5
+ echo "$as_me: error:
+ $use_r_includes/R.h does not exist!
+ Check your installation of R, and use --r-includes to specify the correct directory." >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+
+
+ echo "$as_me:$LINENO: result: $use_r_includes" >&5
+ echo "${ECHO_T}$use_r_includes" >&6
+
+
+ echo "$as_me:$LINENO: checking for R_SHARE directory" >&5
+ echo $ECHO_N "checking for R_SHARE directory... $ECHO_C" >&6
+
+ # Check whether --with-r-share or --without-r-share was given.
+ if test "${with_r_share+set}" = set; then
+ withval="$with_r_share"
+ use_r_share="$withval"
+ else
+ use_r_share=`R CMD sh -c 'echo $R_SHARE_DIR' || echo "$R_HOMEDIR/share"`
+
+ fi;
+
+ r_share=
+ if test -d "$use_r_share"; then
+ R_SHAREDIR="$use_r_share"
+ else
+ { { echo "$as_me:$LINENO: error:
+ $use_r_share does not exist as a directory!
+ Check your installation of R, and use --r-share to specify the correct directory." >&5
+ echo "$as_me: error:
+ $use_r_share does not exist as a directory!
+ Check your installation of R, and use --r-share to specify the correct directory." >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+
+
+ echo "$as_me:$LINENO: result: $use_r_share" >&5
+ echo "${ECHO_T}$use_r_share" >&6
+
+
+ echo "$as_me:$LINENO: checking for R_DOC directory" >&5
+ echo $ECHO_N "checking for R_DOC directory... $ECHO_C" >&6
+
+ # Check whether --with-r-doc or --without-r-doc was given.
+ if test "${with_r_doc+set}" = set; then
+ withval="$with_r_doc"
+ use_r_doc="$withval"
+ else
+ use_r_doc=`R CMD sh -c 'echo $R_DOC_DIR' || echo "$R_HOMEDIR/doc"`
+
+ fi;
+
+ r_doc=
+ if test -d "$use_r_doc"; then
+ R_DOCDIR="$use_r_doc"
+ else
+ { { echo "$as_me:$LINENO: error:
+ $use_r_doc does not exist as a directory!
+ Check your installation of R, and use --r-doc to specify the correct directory." >&5
+ echo "$as_me: error:
+ $use_r_doc does not exist as a directory!
+ Check your installation of R, and use --r-doc to specify the correct directory." >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+
+
+ echo "$as_me:$LINENO: result: $use_r_doc" >&5
+ echo "${ECHO_T}$use_r_doc" >&6
+
+
***************
*** 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
--- 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
***************
*** 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
--- 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
***************
*** 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
--- 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
***************
*** 29210,29213 ****
--- 29303,29309 ----
+
+
+
# Check whether --enable-path-check or --disable-path-check was given.
if test "${enable_path_check+set}" = set; then
***************
*** 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
--- 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
***************
*** 31515,31518 ****
--- 31611,31617 ----
s, at AUTODIRS@,$AUTODIRS,;t t
s, at R_HOMEDIR@,$R_HOMEDIR,;t t
+ s, at R_INCLUDEDIR@,$R_INCLUDEDIR,;t t
+ s, at R_SHAREDIR@,$R_SHAREDIR,;t t
+ s, at R_DOCDIR@,$R_DOCDIR,;t t
s, at include_ARTS_TRUE@,$include_ARTS_TRUE,;t t
s, at include_ARTS_FALSE@,$include_ARTS_FALSE,;t t
Index: ChangeLog
===================================================================
RCS file: /cvsroot/rkward/rkward/ChangeLog,v
retrieving revision 1.99
retrieving revision 1.100
diff -C2 -d -r1.99 -r1.100
*** ChangeLog 13 Nov 2005 19:07:39 -0000 1.99
--- ChangeLog 21 Feb 2006 13:26:18 -0000 1.100
***************
*** 1,2 ****
--- 1,3 ----
+ - autodetection of R_HOME and related variables during configure
- fix status bar
- handle non-existing and non-local URLs (links) in help window
Index: acinclude.m4
===================================================================
RCS file: /cvsroot/rkward/rkward/acinclude.m4,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** acinclude.m4 13 Nov 2005 14:31:28 -0000 1.7
--- acinclude.m4 21 Feb 2006 13:26:18 -0000 1.8
***************
*** 1857,1860 ****
--- 1857,1863 ----
AC_REQUIRE([CHECK_RHOME])
AC_REQUIRE([CHECK_LIBRSO])
+ AC_REQUIRE([CHECK_RINCLUDE])
+ AC_REQUIRE([CHECK_RSHARE])
+ AC_REQUIRE([CHECK_RDOC])
dnl ############################################ RKWARD specific addition end ###################################
***************
*** 1869,1873 ****
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"
)
r_home=
--- 1872,1876 ----
AC_ARG_WITH(r-home,AC_HELP_STRING([--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=
***************
*** 1877,1881 ****
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)
--- 1880,1884 ----
AC_MSG_ERROR([
$use_r_home does not exist as a directory!
! Check your installation of R, and use --r-home to specify the correct location.])
fi
AC_SUBST(R_HOMEDIR)
***************
*** 1884,1887 ****
--- 1887,1891 ----
])
+
dnl check for existence of libR.so
AC_DEFUN([CHECK_LIBRSO],
***************
*** 1894,1900 ****
$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
])
dnl ############################################ RKWARD specific addition end ###################################
--- 1898,1974 ----
$R_HOMEDIR/lib/libR.so does not exist.
Check whether you have compiled R with shared library,
! and the --r-home setting was detected correctly above.])
! fi
! ])
!
!
! dnl find out R_INLUCDE_DIR
! AC_DEFUN([CHECK_RINCLUDE],
! [
! AC_MSG_CHECKING(for R include files)
! AC_ARG_WITH(r-includes,AC_HELP_STRING([--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"`
! )
!
! r_includes=
! if test -f "$use_r_includes/R.h"; then
! R_INCLUDEDIR="$use_r_includes"
! else
! AC_MSG_ERROR([
! $use_r_includes/R.h does not exist!
! Check your installation of R, and use --r-includes to specify the correct directory.])
! fi
! AC_SUBST(R_INCLUDEDIR)
!
! AC_MSG_RESULT($use_r_includes)
! ])
!
!
! dnl find out about R_SHARE_DIR
! AC_DEFUN([CHECK_RSHARE],
! [
! AC_MSG_CHECKING(for R_SHARE directory)
! AC_ARG_WITH(r-share,AC_HELP_STRING([--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"`
! )
!
! r_share=
! if test -d "$use_r_share"; then
! R_SHAREDIR="$use_r_share"
! else
! AC_MSG_ERROR([
! $use_r_share does not exist as a directory!
! Check your installation of R, and use --r-share to specify the correct directory.])
! fi
! AC_SUBST(R_SHAREDIR)
!
! AC_MSG_RESULT($use_r_share)
! ])
!
!
! dnl find out about R_DOC_DIR
! AC_DEFUN([CHECK_RDOC],
! [
! AC_MSG_CHECKING(for R_DOC directory)
! AC_ARG_WITH(r-doc,AC_HELP_STRING([--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"`
! )
!
! r_doc=
! if test -d "$use_r_doc"; then
! R_DOCDIR="$use_r_doc"
! else
! AC_MSG_ERROR([
! $use_r_doc does not exist as a directory!
! Check your installation of R, and use --r-doc to specify the correct directory.])
fi
+ AC_SUBST(R_DOCDIR)
+
+ AC_MSG_RESULT($use_r_doc)
])
+
dnl ############################################ RKWARD specific addition end ###################################
Index: aclocal.m4
===================================================================
RCS file: /cvsroot/rkward/rkward/aclocal.m4,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** aclocal.m4 13 Nov 2005 14:31:28 -0000 1.7
--- aclocal.m4 21 Feb 2006 13:26:18 -0000 1.8
***************
*** 1869,1872 ****
--- 1869,1875 ----
AC_REQUIRE([CHECK_RHOME])
AC_REQUIRE([CHECK_LIBRSO])
+ AC_REQUIRE([CHECK_RINCLUDE])
+ AC_REQUIRE([CHECK_RSHARE])
+ AC_REQUIRE([CHECK_RDOC])
dnl ############################################ RKWARD specific addition end ###################################
***************
*** 1881,1885 ****
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"
)
r_home=
--- 1884,1888 ----
AC_ARG_WITH(r-home,AC_HELP_STRING([--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=
***************
*** 1889,1893 ****
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)
--- 1892,1896 ----
AC_MSG_ERROR([
$use_r_home does not exist as a directory!
! Check your installation of R, and use --r-home to specify the correct location.])
fi
AC_SUBST(R_HOMEDIR)
***************
*** 1896,1899 ****
--- 1899,1903 ----
])
+
dnl check for existence of libR.so
AC_DEFUN([CHECK_LIBRSO],
***************
*** 1906,1912 ****
$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
])
dnl ############################################ RKWARD specific addition end ###################################
--- 1910,1986 ----
$R_HOMEDIR/lib/libR.so does not exist.
Check whether you have compiled R with shared library,
! and the --r-home setting was detected correctly above.])
! fi
! ])
!
!
! dnl find out R_INLUCDE_DIR
! AC_DEFUN([CHECK_RINCLUDE],
! [
! AC_MSG_CHECKING(for R include files)
! AC_ARG_WITH(r-includes,AC_HELP_STRING([--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"`
! )
!
! r_includes=
! if test -f "$use_r_includes/R.h"; then
! R_INCLUDEDIR="$use_r_includes"
! else
! AC_MSG_ERROR([
! $use_r_includes/R.h does not exist!
! Check your installation of R, and use --r-includes to specify the correct directory.])
! fi
! AC_SUBST(R_INCLUDEDIR)
!
! AC_MSG_RESULT($use_r_includes)
! ])
!
!
! dnl find out about R_SHARE_DIR
! AC_DEFUN([CHECK_RSHARE],
! [
! AC_MSG_CHECKING(for R_SHARE directory)
! AC_ARG_WITH(r-share,AC_HELP_STRING([--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"`
! )
!
! r_share=
! if test -d "$use_r_share"; then
! R_SHAREDIR="$use_r_share"
! else
! AC_MSG_ERROR([
! $use_r_share does not exist as a directory!
! Check your installation of R, and use --r-share to specify the correct directory.])
! fi
! AC_SUBST(R_SHAREDIR)
!
! AC_MSG_RESULT($use_r_share)
! ])
!
!
! dnl find out about R_DOC_DIR
! AC_DEFUN([CHECK_RDOC],
! [
! AC_MSG_CHECKING(for R_DOC directory)
! AC_ARG_WITH(r-doc,AC_HELP_STRING([--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"`
! )
!
! r_doc=
! if test -d "$use_r_doc"; then
! R_DOCDIR="$use_r_doc"
! else
! AC_MSG_ERROR([
! $use_r_doc does not exist as a directory!
! Check your installation of R, and use --r-doc to specify the correct directory.])
fi
+ AC_SUBST(R_DOCDIR)
+
+ AC_MSG_RESULT($use_r_doc)
])
+
dnl ############################################ RKWARD specific addition end ###################################
Index: TODO
===================================================================
RCS file: /cvsroot/rkward/rkward/TODO,v
retrieving revision 1.101
retrieving revision 1.102
diff -C2 -d -r1.101 -r1.102
*** TODO 24 Nov 2005 12:35:46 -0000 1.101
--- TODO 21 Feb 2006 13:26:18 -0000 1.102
***************
*** 30,33 ****
--- 30,36 ----
- convert to kdoc
+ Plugin/Component-Widgets:
+ - have min / max default to minimum/maximum integer/float, etc. Or does this come automatically with XMLHelper?
+
Configuration options to add:
- additional console options:
More information about the rkward-tracker
mailing list