[rkward-cvs] rkward ChangeLog,1.130,1.131 acinclude.m4,1.14,1.15 aclocal.m4,1.14,1.15 configure,1.44,1.45
Thomas Friedrichsmeier
tfry at users.sourceforge.net
Wed May 17 12:36:16 UTC 2006
Update of /cvsroot/rkward/rkward
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv29172
Modified Files:
ChangeLog acinclude.m4 aclocal.m4 configure
Log Message:
Add configuration option for R package library tree location
Do not write to /tmp during build/install, but rather create a tmp-dir in the source tree (avoid sandbox violation)
Index: configure
===================================================================
RCS file: /cvsroot/rkward/rkward/configure,v
retrieving revision 1.44
retrieving revision 1.45
diff -C2 -d -r1.44 -r1.45
*** configure 7 May 2006 11:53:19 -0000 1.44
--- configure 17 May 2006 12:36:13 -0000 1.45
***************
*** 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_LAPACK_FLAG 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_LIBDIR R_INCLUDEDIR R_LAPACK_FLAG 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,1077 ----
--with-qt-libraries=DIR where the Qt library is installed.
--with-r-home=DIR specify location of R_HOME directory
+ --with-r-libdir=DIR specify location of R (packages) library tree to
+ install to
--with-r-includes=DIR specify location of R include files
--without-arts build without aRts default=yes
***************
*** 6717,6721 ****
*-*-irix6*)
# Find out which ABI we are using.
! echo '#line 6719 "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
***************
*** 7358,7362 ****
# Provide some information about the compiler.
! echo "$as_me:7360:" \
"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`
***************
*** 8384,8392 ****
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
! (eval echo "\"\$as_me:8386: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
! echo "$as_me:8390: \$? = $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
***************
*** 8617,8625 ****
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
! (eval echo "\"\$as_me:8619: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
! echo "$as_me:8623: \$? = $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
***************
*** 8684,8692 ****
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
! (eval echo "\"\$as_me:8686: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
! echo "$as_me:8690: \$? = $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
***************
*** 10787,10791 ****
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
! #line 10789 "configure"
#include "confdefs.h"
--- 10789,10793 ----
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
! #line 10791 "configure"
#include "confdefs.h"
***************
*** 10885,10889 ****
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
! #line 10887 "configure"
#include "confdefs.h"
--- 10887,10891 ----
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
! #line 10889 "configure"
#include "confdefs.h"
***************
*** 13022,13030 ****
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
! (eval echo "\"\$as_me:13024: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
! echo "$as_me:13028: \$? = $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
***************
*** 13089,13097 ****
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
! (eval echo "\"\$as_me:13091: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
! echo "$as_me:13095: \$? = $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
***************
*** 14418,14422 ****
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
! #line 14420 "configure"
#include "confdefs.h"
--- 14420,14424 ----
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
! #line 14422 "configure"
#include "confdefs.h"
***************
*** 14516,14520 ****
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
! #line 14518 "configure"
#include "confdefs.h"
--- 14518,14522 ----
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
! #line 14520 "configure"
#include "confdefs.h"
***************
*** 15339,15347 ****
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
! (eval echo "\"\$as_me:15341: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
! echo "$as_me:15345: \$? = $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
***************
*** 15406,15414 ****
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
! (eval echo "\"\$as_me:15408: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
! echo "$as_me:15412: \$? = $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
***************
*** 17362,17370 ****
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
! (eval echo "\"\$as_me:17364: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
! echo "$as_me:17368: \$? = $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
***************
*** 17595,17603 ****
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
! (eval echo "\"\$as_me:17597: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
! echo "$as_me:17601: \$? = $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
***************
*** 17662,17670 ****
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
! (eval echo "\"\$as_me:17664: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
! echo "$as_me:17668: \$? = $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
***************
*** 19765,19769 ****
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
! #line 19767 "configure"
#include "confdefs.h"
--- 19767,19771 ----
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
! #line 19769 "configure"
#include "confdefs.h"
***************
*** 19863,19867 ****
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
! #line 19865 "configure"
#include "confdefs.h"
--- 19865,19869 ----
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
! #line 19867 "configure"
#include "confdefs.h"
***************
*** 27870,27874 ****
for j in jpeglib.h;
do
! echo "configure: 27872: $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
***************
*** 28175,28179 ****
for j in $kde_qt_header;
do
! echo "configure: 28177: $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
***************
*** 28960,28963 ****
--- 28962,28996 ----
+ echo "$as_me:$LINENO: checking for R package library location" >&5
+ echo $ECHO_N "checking for R package library location... $ECHO_C" >&6
+
+ # Check whether --with-r-libdir or --without-r-libdir was given.
+ if test "${with_r_libdir+set}" = set; then
+ withval="$with_r_libdir"
+ use_r_libdir="$withval"
+ else
+ r_libs=`$R_HOMEDIR/bin/R CMD sh -c 'echo $R_LIBS'`
+ if test -n "$r_libs"; then use_r_libdir=`echo "$r_libs" | cut -f1 -d:` ; else use_r_libdir="$R_HOMEDIR/library" ; fi
+
+ fi;
+
+ r_libdir=
+ if test -d "$use_r_libdir"; then
+ R_LIBDIR="$use_r_libdir"
+ else
+ { { echo "$as_me:$LINENO: error:
+ $use_r_libdir does not exist!
+ Check your installation of R, and use --with-r-libdir to specify an existing library tree." >&5
+ echo "$as_me: error:
+ $use_r_libdir does not exist!
+ Check your installation of R, and use --with-r-libdir to specify an existing library tree." >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+
+
+ echo "$as_me:$LINENO: result: $use_r_libdir" >&5
+ echo "${ECHO_T}$use_r_libdir" >&6
+
+
echo "$as_me:$LINENO: checking for R include files" >&5
echo $ECHO_N "checking for R include files... $ECHO_C" >&6
***************
*** 29094,29098 ****
for j in $kde_check_header;
do
! echo "configure: 29096: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
--- 29127,29131 ----
for j in $kde_check_header;
do
! echo "configure: 29129: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
***************
*** 29124,29128 ****
for j in $kde_check_lib;
do
! echo "configure: 29126: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
--- 29157,29161 ----
for j in $kde_check_lib;
do
! echo "configure: 29159: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
***************
*** 29142,29146 ****
for j in "kde3/plugins/designer/kdewidgets.la";
do
! echo "configure: 29144: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
--- 29175,29179 ----
for j in "kde3/plugins/designer/kdewidgets.la";
do
! echo "configure: 29177: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
***************
*** 29259,29262 ****
--- 29292,29296 ----
+
# Check whether --enable-path-check or --disable-path-check was given.
if test "${enable_path_check+set}" = set; then
***************
*** 30534,30538 ****
for j in apps/ksgmltools2/customization/kde-chunk.xsl;
do
! echo "configure: 30536: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
--- 30568,30572 ----
for j in apps/ksgmltools2/customization/kde-chunk.xsl;
do
! echo "configure: 30570: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
***************
*** 31564,31567 ****
--- 31598,31602 ----
s, at AUTODIRS@,$AUTODIRS,;t t
s, at R_HOMEDIR@,$R_HOMEDIR,;t t
+ s, at R_LIBDIR@,$R_LIBDIR,;t t
s, at R_INCLUDEDIR@,$R_INCLUDEDIR,;t t
s, at R_LAPACK_FLAG@,$R_LAPACK_FLAG,;t t
Index: ChangeLog
===================================================================
RCS file: /cvsroot/rkward/rkward/ChangeLog,v
retrieving revision 1.130
retrieving revision 1.131
diff -C2 -d -r1.130 -r1.131
*** ChangeLog 7 May 2006 11:47:50 -0000 1.130
--- ChangeLog 17 May 2006 12:36:13 -0000 1.131
***************
*** 1,2 ****
--- 1,3 ----
+ - honor DESTDIR setting while installing rkward R package, and add configure option --with-r-libdir
- only link against -lRlapack, if that is available
- commands producing lots of output would sometimes be impossible to interrupt. Fixed
Index: acinclude.m4
===================================================================
RCS file: /cvsroot/rkward/rkward/acinclude.m4,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** acinclude.m4 7 May 2006 11:53:19 -0000 1.14
--- acinclude.m4 17 May 2006 12:36:13 -0000 1.15
***************
*** 1857,1860 ****
--- 1857,1861 ----
AC_REQUIRE([CHECK_RHOME])
AC_REQUIRE([CHECK_LIBRSO])
+ AC_REQUIRE([CHECK_RLIBDIR])
AC_REQUIRE([CHECK_RINCLUDE])
AC_REQUIRE([CHECK_RLAPACK])
***************
*** 1942,1945 ****
--- 1943,1969 ----
])
+ dnl find out R (package) library dir
+ AC_DEFUN([CHECK_RLIBDIR],
+ [
+ AC_MSG_CHECKING(for R package library location)
+ AC_ARG_WITH(r-libdir,AC_HELP_STRING([--with-r-libdir=DIR],[specify location of R (packages) library tree to install to]),
+ use_r_libdir="$withval",
+ r_libs=`$R_HOMEDIR/bin/R CMD sh -c 'echo $R_LIBS'`
+ if test -n "$r_libs"; then use_r_libdir=`echo "$r_libs" | cut -f1 -d:` ; else use_r_libdir="$R_HOMEDIR/library" ; fi
+ )
+
+ r_libdir=
+ if test -d "$use_r_libdir"; then
+ R_LIBDIR="$use_r_libdir"
+ else
+ AC_MSG_ERROR([
+ $use_r_libdir does not exist!
+ Check your installation of R, and use --with-r-libdir to specify an existing library tree.])
+ fi
+ AC_SUBST(R_LIBDIR)
+
+ AC_MSG_RESULT($use_r_libdir)
+ ])
+
dnl ############################################ RKWARD specific addition end ###################################
Index: aclocal.m4
===================================================================
RCS file: /cvsroot/rkward/rkward/aclocal.m4,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** aclocal.m4 7 May 2006 11:53:19 -0000 1.14
--- aclocal.m4 17 May 2006 12:36:13 -0000 1.15
***************
*** 1869,1872 ****
--- 1869,1873 ----
AC_REQUIRE([CHECK_RHOME])
AC_REQUIRE([CHECK_LIBRSO])
+ AC_REQUIRE([CHECK_RLIBDIR])
AC_REQUIRE([CHECK_RINCLUDE])
AC_REQUIRE([CHECK_RLAPACK])
***************
*** 1954,1957 ****
--- 1955,1981 ----
])
+ dnl find out R (package) library dir
+ AC_DEFUN([CHECK_RLIBDIR],
+ [
+ AC_MSG_CHECKING(for R package library location)
+ AC_ARG_WITH(r-libdir,AC_HELP_STRING([--with-r-libdir=DIR],[specify location of R (packages) library tree to install to]),
+ use_r_libdir="$withval",
+ r_libs=`$R_HOMEDIR/bin/R CMD sh -c 'echo $R_LIBS'`
+ if test -n "$r_libs"; then use_r_libdir=`echo "$r_libs" | cut -f1 -d:` ; else use_r_libdir="$R_HOMEDIR/library" ; fi
+ )
+
+ r_libdir=
+ if test -d "$use_r_libdir"; then
+ R_LIBDIR="$use_r_libdir"
+ else
+ AC_MSG_ERROR([
+ $use_r_libdir does not exist!
+ Check your installation of R, and use --with-r-libdir to specify an existing library tree.])
+ fi
+ AC_SUBST(R_LIBDIR)
+
+ AC_MSG_RESULT($use_r_libdir)
+ ])
+
dnl ############################################ RKWARD specific addition end ###################################
More information about the rkward-tracker
mailing list