[rkward-cvs] rkward ChangeLog,1.129,1.130 acinclude.m4,1.12,1.13 aclocal.m4,1.12,1.13 configure,1.42,1.43
Thomas Friedrichsmeier
tfry at users.sourceforge.net
Sun May 7 11:47:54 UTC 2006
Update of /cvsroot/rkward/rkward
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5314
Modified Files:
ChangeLog acinclude.m4 aclocal.m4 configure
Log Message:
only link against -lRlapack, if that is available
Index: configure
===================================================================
RCS file: /cvsroot/rkward/rkward/configure,v
retrieving revision 1.42
retrieving revision 1.43
diff -C2 -d -r1.42 -r1.43
*** configure 21 Apr 2006 12:55:16 -0000 1.42
--- configure 7 May 2006 11:47:50 -0000 1.43
***************
*** 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 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_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=''
***************
*** 28991,28994 ****
--- 28991,29006 ----
+ echo "$as_me:$LINENO: checking whether we should link against libRlapack.so" >&5
+ echo $ECHO_N "checking whether we should link against libRlapack.so... $ECHO_C" >&6
+ if test -f "$R_HOMEDIR/lib/libRlapack.so"; then
+ echo "$as_me:$LINENO: result: $R_HOMEDIR/lib/libRlapack.so exists" >&5
+ echo "${ECHO_T}$R_HOMEDIR/lib/libRlapack.so exists" >&6
+ R_LAPACK_FLAG="-lRlapack"
+ else
+ R_LAPACK_FLAG=""
+ fi
+
+
+
***************
*** 29080,29084 ****
for j in $kde_check_header;
do
! echo "configure: 29082: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
--- 29092,29096 ----
for j in $kde_check_header;
do
! echo "configure: 29094: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
***************
*** 29110,29114 ****
for j in $kde_check_lib;
do
! echo "configure: 29112: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
--- 29122,29126 ----
for j in $kde_check_lib;
do
! echo "configure: 29124: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
***************
*** 29128,29132 ****
for j in "kde3/plugins/designer/kdewidgets.la";
do
! echo "configure: 29130: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
--- 29140,29144 ----
for j in "kde3/plugins/designer/kdewidgets.la";
do
! echo "configure: 29142: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
***************
*** 29244,29247 ****
--- 29256,29260 ----
+
# Check whether --enable-path-check or --disable-path-check was given.
if test "${enable_path_check+set}" = set; then
***************
*** 30519,30523 ****
for j in apps/ksgmltools2/customization/kde-chunk.xsl;
do
! echo "configure: 30521: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
--- 30532,30536 ----
for j in apps/ksgmltools2/customization/kde-chunk.xsl;
do
! echo "configure: 30534: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
***************
*** 31550,31553 ****
--- 31563,31567 ----
s, at R_HOMEDIR@,$R_HOMEDIR,;t t
s, at R_INCLUDEDIR@,$R_INCLUDEDIR,;t t
+ s, at R_LAPACK_FLAG@,$R_LAPACK_FLAG,;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.129
retrieving revision 1.130
diff -C2 -d -r1.129 -r1.130
*** ChangeLog 5 May 2006 13:18:05 -0000 1.129
--- ChangeLog 7 May 2006 11:47:50 -0000 1.130
***************
*** 1,2 ****
--- 1,3 ----
+ - only link against -lRlapack, if that is available
- commands producing lots of output would sometimes be impossible to interrupt. Fixed
- show command output immediately in command log
Index: acinclude.m4
===================================================================
RCS file: /cvsroot/rkward/rkward/acinclude.m4,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** acinclude.m4 17 Apr 2006 14:06:27 -0000 1.12
--- acinclude.m4 7 May 2006 11:47:50 -0000 1.13
***************
*** 1858,1861 ****
--- 1858,1862 ----
AC_REQUIRE([CHECK_LIBRSO])
AC_REQUIRE([CHECK_RINCLUDE])
+ AC_REQUIRE([CHECK_RLAPACK])
dnl ############################################ RKWARD specific addition end ###################################
***************
*** 1901,1904 ****
--- 1902,1920 ----
])
+ dnl for at least some versions of R, we seem to have to link against -lRlapack. 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_RLAPACK],
+ [
+ AC_MSG_CHECKING(whether we should link against libRlapack.so)
+ if test -f "$R_HOMEDIR/lib/libRlapack.so"; then
+ AC_MSG_RESULT($R_HOMEDIR/lib/libRlapack.so exists, so we'll link against it)
+ R_LAPACK_FLAG="-lRlapack"
+ else
+ R_LAPACK_FLAG=""
+ fi
+ AC_SUBST(R_LAPACK_FLAG)
+ ])
+
dnl find out R_INLUCDE_DIR
Index: aclocal.m4
===================================================================
RCS file: /cvsroot/rkward/rkward/aclocal.m4,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** aclocal.m4 17 Apr 2006 14:06:27 -0000 1.12
--- aclocal.m4 7 May 2006 11:47:50 -0000 1.13
***************
*** 1870,1873 ****
--- 1870,1874 ----
AC_REQUIRE([CHECK_LIBRSO])
AC_REQUIRE([CHECK_RINCLUDE])
+ AC_REQUIRE([CHECK_RLAPACK])
dnl ############################################ RKWARD specific addition end ###################################
***************
*** 1913,1916 ****
--- 1914,1932 ----
])
+ dnl for at least some versions of R, we seem to have to link against -lRlapack. 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_RLAPACK],
+ [
+ AC_MSG_CHECKING(whether we should link against libRlapack.so)
+ if test -f "$R_HOMEDIR/lib/libRlapack.so"; then
+ AC_MSG_RESULT($R_HOMEDIR/lib/libRlapack.so exists, so we'll link against it)
+ R_LAPACK_FLAG="-lRlapack"
+ else
+ R_LAPACK_FLAG=""
+ fi
+ AC_SUBST(R_LAPACK_FLAG)
+ ])
+
dnl find out R_INLUCDE_DIR
More information about the rkward-tracker
mailing list