[rkward-cvs] rkward ChangeLog,1.95,1.96 INSTALL,1.4,1.5 acinclude.m4,1.4,1.5 aclocal.m4,1.4,1.5 configure,1.27,1.28
Thomas Friedrichsmeier
tfry at users.sourceforge.net
Thu Nov 10 21:22:40 UTC 2005
Update of /cvsroot/rkward/rkward
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24860
Modified Files:
ChangeLog INSTALL acinclude.m4 aclocal.m4 configure
Log Message:
Automake adjustments in preparation for using a wrapper script. The binary is now built in rkward.bin
Index: configure
===================================================================
RCS file: /cvsroot/rkward/rkward/configure,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** configure 3 Nov 2005 21:37:10 -0000 1.27
--- configure 10 Nov 2005 21:22:38 -0000 1.28
***************
*** 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 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 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=''
***************
*** 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
***************
*** 28910,28913 ****
--- 28911,28951 ----
+ 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
+
+
+ echo "$as_me:$LINENO: result: $use_r_home" >&5
+ echo "${ECHO_T}$use_r_home" >&6
+
+
+ echo "$as_me:$LINENO: checking for libR.so" >&5
+ 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
+
+
***************
*** 28999,29003 ****
for j in $kde_check_header;
do
! echo "configure: 29001: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
--- 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
***************
*** 29029,29033 ****
for j in $kde_check_lib;
do
! echo "configure: 29031: $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
***************
*** 29047,29051 ****
for j in "kde3/plugins/designer/kdewidgets.la";
do
! echo "configure: 29049: $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
***************
*** 29160,29163 ****
--- 29198,29203 ----
+
+
# Check whether --enable-path-check or --disable-path-check was given.
if test "${enable_path_check+set}" = set; then
***************
*** 30435,30439 ****
for j in apps/ksgmltools2/customization/kde-chunk.xsl;
do
! echo "configure: 30437: $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
***************
*** 31464,31467 ****
--- 31504,31508 ----
s, at all_libraries@,$all_libraries,;t t
s, at AUTODIRS@,$AUTODIRS,;t t
+ s, at R_HOMEDIR@,$R_HOMEDIR,;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.95
retrieving revision 1.96
diff -C2 -d -r1.95 -r1.96
*** ChangeLog 10 Nov 2005 15:59:05 -0000 1.95
--- ChangeLog 10 Nov 2005 21:22:36 -0000 1.96
***************
*** 1,2 ****
--- 1,3 ----
+ - Configure: use single configure option for location of R_HOME, and add check for libR.so
- yet more code cleanups
- keep main window caption up to date
Index: acinclude.m4
===================================================================
RCS file: /cvsroot/rkward/rkward/acinclude.m4,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** acinclude.m4 3 Nov 2005 21:37:10 -0000 1.4
--- acinclude.m4 10 Nov 2005 21:22:37 -0000 1.5
***************
*** 1854,1860 ****
--- 1854,1898 ----
AC_SUBST(AUTODIRS)
+ dnl ############################################ RKWARD specific addition begin #################################
+ AC_REQUIRE([CHECK_RHOME])
+ AC_REQUIRE([CHECK_LIBRSO])
+ dnl ############################################ RKWARD specific addition end ###################################
+
+ ])
+
+ dnl ############################################ RKWARD specific addition begin #################################
+ dnl check for R home dir
+ dnl mostly no idea what I'm doing, but hoping for the best...
+ 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=
+ if test -d "$use_r_home"; then
+ R_HOMEDIR="$use_r_home"
+ else
+ AC_MSG_ERROR("$use_r_home does not exist as a directory!")
+ fi
+ AC_SUBST(R_HOMEDIR)
+ AC_MSG_RESULT($use_r_home)
])
+ dnl check for existence of libR.so
+ AC_DEFUN([CHECK_LIBRSO],
+ [
+ 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
+ ])
+ dnl ############################################ RKWARD specific addition end ###################################
+
+
AC_DEFUN([KDE_CHECK_EXTRA_LIBS],
[
Index: INSTALL
===================================================================
RCS file: /cvsroot/rkward/rkward/INSTALL,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** INSTALL 27 Apr 2005 17:11:26 -0000 1.4
--- INSTALL 10 Nov 2005 21:22:37 -0000 1.5
***************
*** 35,52 ****
! Likely you will need to specify the location of additional header files, especially the R-headers:
! --with-extra-includes=/path/to/those/headers
!
! for debian use --with-extra-includes=/usr/lib/R/include
!
!
! Likewise you'll likely have to specify the location of the R-library (file: libR.so):
! --with-extra-libs=/usr/lib/R/bin/ (or similar)
! for R >= 2.0, the default location seems to be
! --with-extra-libs=/usr/lib/R/lib/
! Personally, I need the following options for configure (debian sid):
! --prefix=/usr --with-extra-libs=/usr/lib/R/lib/ --with-extra-includes=/usr/lib/R/include --enable-debug=full
--- 35,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
***************
*** 54,58 ****
==================
! You _have to_ install RKWard. Otherwise you may be missing important menu-options.
As root run:
# make install
--- 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
Index: aclocal.m4
===================================================================
RCS file: /cvsroot/rkward/rkward/aclocal.m4,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** aclocal.m4 3 Nov 2005 21:37:10 -0000 1.4
--- aclocal.m4 10 Nov 2005 21:22:37 -0000 1.5
***************
*** 1866,1872 ****
--- 1866,1910 ----
AC_SUBST(AUTODIRS)
+ dnl ############################################ RKWARD specific addition begin #################################
+ AC_REQUIRE([CHECK_RHOME])
+ AC_REQUIRE([CHECK_LIBRSO])
+ dnl ############################################ RKWARD specific addition end ###################################
+
+ ])
+
+ dnl ############################################ RKWARD specific addition begin #################################
+ dnl check for R home dir
+ dnl mostly no idea what I'm doing, but hoping for the best...
+ 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=
+ if test -d "$use_r_home"; then
+ R_HOMEDIR="$use_r_home"
+ else
+ AC_MSG_ERROR("$use_r_home does not exist as a directory!")
+ fi
+ AC_SUBST(R_HOMEDIR)
+ AC_MSG_RESULT($use_r_home)
])
+ dnl check for existence of libR.so
+ AC_DEFUN([CHECK_LIBRSO],
+ [
+ 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
+ ])
+ dnl ############################################ RKWARD specific addition end ###################################
+
+
AC_DEFUN([KDE_CHECK_EXTRA_LIBS],
[
More information about the rkward-tracker
mailing list