[rkward-cvs] rkward ChangeLog,1.114,1.115 acinclude.m4,1.11,1.12 aclocal.m4,1.11,1.12 configure,1.38,1.39 configure.files,1.12,1.13 configure.in,1.32,1.33 subdirs,1.15,1.16
Thomas Friedrichsmeier
tfry at users.sourceforge.net
Mon Apr 17 14:06:31 UTC 2006
Update of /cvsroot/rkward/rkward
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7433
Modified Files:
ChangeLog acinclude.m4 aclocal.m4 configure configure.files
configure.in subdirs
Log Message:
Simplify wrapper script, remove unneeded --with-r-doc and --with-r-share options
Index: configure
===================================================================
RCS file: /cvsroot/rkward/rkward/configure,v
retrieving revision 1.38
retrieving revision 1.39
diff -C2 -d -r1.38 -r1.39
*** configure 17 Apr 2006 12:13:52 -0000 1.38
--- configure 17 Apr 2006 14:06:27 -0000 1.39
***************
*** 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=''
--- 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=''
***************
*** 1073,1078 ****
--with-r-home=DIR specify location of R_HOME directory
--with-r-includes=DIR specify location of R include files
- --with-r-share=DIR specify location of R_SHARE directory
- --with-r-doc=DIR specify location of R_DOC directory
--without-arts build without aRts default=yes
--- 1073,1076 ----
***************
*** 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
--- 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
***************
*** 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`
--- 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`
***************
*** 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
--- 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
***************
*** 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
--- 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
***************
*** 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
--- 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
***************
*** 10789,10793 ****
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
! #line 10791 "configure"
#include "confdefs.h"
--- 10787,10791 ----
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
! #line 10789 "configure"
#include "confdefs.h"
***************
*** 10887,10891 ****
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
! #line 10889 "configure"
#include "confdefs.h"
--- 10885,10889 ----
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
! #line 10887 "configure"
#include "confdefs.h"
***************
*** 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
--- 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
***************
*** 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
--- 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
***************
*** 14420,14424 ****
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
! #line 14422 "configure"
#include "confdefs.h"
--- 14418,14422 ----
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
! #line 14420 "configure"
#include "confdefs.h"
***************
*** 14518,14522 ****
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
! #line 14520 "configure"
#include "confdefs.h"
--- 14516,14520 ----
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
! #line 14518 "configure"
#include "confdefs.h"
***************
*** 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
--- 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
***************
*** 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
--- 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
***************
*** 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
--- 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
***************
*** 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
--- 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
***************
*** 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
--- 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
***************
*** 19767,19771 ****
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
! #line 19769 "configure"
#include "confdefs.h"
--- 19765,19769 ----
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
! #line 19767 "configure"
#include "confdefs.h"
***************
*** 19865,19869 ****
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
! #line 19867 "configure"
#include "confdefs.h"
--- 19863,19867 ----
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
! #line 19865 "configure"
#include "confdefs.h"
***************
*** 27872,27876 ****
for j in jpeglib.h;
do
! echo "configure: 27874: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
--- 27870,27874 ----
for j in jpeglib.h;
do
! echo "configure: 27872: $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
--- 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
***************
*** 28970,28974 ****
use_r_includes="$withval"
else
! use_r_includes=`R CMD sh -c 'echo $R_INCLUDE_DIR'`
if test "$use_r_includes" == "" ; then use_r_includes="$R_HOMEDIR/include" ; fi
--- 28968,28972 ----
use_r_includes="$withval"
else
! use_r_includes=`$R_HOMEDIR/bin/R CMD sh -c 'echo $R_INCLUDE_DIR'`
if test "$use_r_includes" == "" ; then use_r_includes="$R_HOMEDIR/include" ; fi
***************
*** 28993,29058 ****
- 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'`
- if test "$use_r_share" == "" ; then use_r_share="$R_HOMEDIR/share" ; fi
-
- 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 --with-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 --with-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'`
- if test "$use_r_doc" == "" ; then use_r_doc="$R_HOMEDIR/doc" ; fi
-
- 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 --with-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 --with-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
-
-
--- 28991,28994 ----
***************
*** 29144,29148 ****
for j in $kde_check_header;
do
! echo "configure: 29146: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
--- 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
***************
*** 29174,29178 ****
for j in $kde_check_lib;
do
! echo "configure: 29176: $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
***************
*** 29192,29196 ****
for j in "kde3/plugins/designer/kdewidgets.la";
do
! echo "configure: 29194: $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
***************
*** 29308,29313 ****
-
-
# Check whether --enable-path-check or --disable-path-check was given.
if test "${enable_path_check+set}" = set; then
--- 29244,29247 ----
***************
*** 30585,30589 ****
for j in apps/ksgmltools2/customization/kde-chunk.xsl;
do
! echo "configure: 30587: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
--- 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
***************
*** 30751,30759 ****
- #MIN_CONFIG(3)
-
-
-
-
--- 30685,30688 ----
***************
*** 31624,31629 ****
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
--- 31553,31556 ----
Index: configure.in
===================================================================
RCS file: /cvsroot/rkward/rkward/configure.in,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -d -r1.32 -r1.33
*** configure.in 17 Apr 2006 12:13:52 -0000 1.32
--- configure.in 17 Apr 2006 14:06:29 -0000 1.33
***************
*** 67,81 ****
dnl AC_PROG_YACC dnl __kdevelop__
- #MIN_CONFIG(3)
-
- dnl PACKAGE set before
-
- dnl CXXFLAGS="$NOOPT_CXXFLAGS" dnl __kdevelop[noopt]__
- dnl CFLAGS="$NOOPT_CFLAGS" dnl __kdevelop[noopt]__
- dnl CXXFLAGS="$CXXFLAGS $USE_EXCEPTIONS" dnl __kdevelop[exc]__
-
- dnl KDE_NEED_FLEX dnl __kdevelop__
- dnl AC_PROG_YACC dnl __kdevelop__
-
KDE_CREATE_SUBDIRSLIST
AC_CONFIG_FILES([ Makefile ])
--- 67,70 ----
Index: ChangeLog
===================================================================
RCS file: /cvsroot/rkward/rkward/ChangeLog,v
retrieving revision 1.114
retrieving revision 1.115
diff -C2 -d -r1.114 -r1.115
*** ChangeLog 16 Apr 2006 23:03:15 -0000 1.114
--- ChangeLog 17 Apr 2006 14:06:27 -0000 1.115
***************
*** 1,2 ****
--- 1,4 ----
+ - clean up output of require ()
+ - some fixes for R 2.3.0
- pressing Cancel in readline ("R backend requests information") dialog interrupts the command
- process R X11 events while modal dialogs (such as "R backend requests information") are shown
Index: subdirs
===================================================================
RCS file: /cvsroot/rkward/rkward/subdirs,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** subdirs 17 Apr 2006 12:13:52 -0000 1.15
--- subdirs 17 Apr 2006 14:06:29 -0000 1.16
***************
*** 3,5 ****
po
rkward
- rkward-0.3.5
--- 3,4 ----
Index: acinclude.m4
===================================================================
RCS file: /cvsroot/rkward/rkward/acinclude.m4,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** acinclude.m4 14 Apr 2006 15:52:53 -0000 1.11
--- acinclude.m4 17 Apr 2006 14:06:27 -0000 1.12
***************
*** 1858,1863 ****
AC_REQUIRE([CHECK_LIBRSO])
AC_REQUIRE([CHECK_RINCLUDE])
- AC_REQUIRE([CHECK_RSHARE])
- AC_REQUIRE([CHECK_RDOC])
dnl ############################################ RKWARD specific addition end ###################################
--- 1858,1861 ----
***************
*** 1910,1914 ****
AC_ARG_WITH(r-includes,AC_HELP_STRING([--with-r-includes=DIR],[specify location of R include files]),
use_r_includes="$withval",
! use_r_includes=`R CMD sh -c 'echo $R_INCLUDE_DIR'`
if test "$use_r_includes" == "" ; then use_r_includes="$R_HOMEDIR/include" ; fi
)
--- 1908,1912 ----
AC_ARG_WITH(r-includes,AC_HELP_STRING([--with-r-includes=DIR],[specify location of R include files]),
use_r_includes="$withval",
! use_r_includes=`$R_HOMEDIR/bin/R CMD sh -c 'echo $R_INCLUDE_DIR'`
if test "$use_r_includes" == "" ; then use_r_includes="$R_HOMEDIR/include" ; fi
)
***************
*** 1927,1978 ****
])
-
- 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([--with-r-share=DIR],[specify location of R_SHARE directory]),
- use_r_share="$withval",
- use_r_share=`R CMD sh -c 'echo $R_SHARE_DIR'`
- if test "$use_r_share" == "" ; then use_r_share="$R_HOMEDIR/share" ; fi
- )
-
- 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 --with-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([--with-r-doc=DIR],[specify location of R_DOC directory]),
- use_r_doc="$withval",
- use_r_doc=`R CMD sh -c 'echo $R_DOC_DIR'`
- if test "$use_r_doc" == "" ; then use_r_doc="$R_HOMEDIR/doc" ; fi
- )
-
- 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 --with-r-doc to specify the correct directory.])
- fi
- AC_SUBST(R_DOCDIR)
-
- AC_MSG_RESULT($use_r_doc)
- ])
-
dnl ############################################ RKWARD specific addition end ###################################
--- 1925,1928 ----
Index: aclocal.m4
===================================================================
RCS file: /cvsroot/rkward/rkward/aclocal.m4,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** aclocal.m4 14 Apr 2006 15:52:53 -0000 1.11
--- aclocal.m4 17 Apr 2006 14:06:27 -0000 1.12
***************
*** 1870,1875 ****
AC_REQUIRE([CHECK_LIBRSO])
AC_REQUIRE([CHECK_RINCLUDE])
- AC_REQUIRE([CHECK_RSHARE])
- AC_REQUIRE([CHECK_RDOC])
dnl ############################################ RKWARD specific addition end ###################################
--- 1870,1873 ----
***************
*** 1922,1926 ****
AC_ARG_WITH(r-includes,AC_HELP_STRING([--with-r-includes=DIR],[specify location of R include files]),
use_r_includes="$withval",
! use_r_includes=`R CMD sh -c 'echo $R_INCLUDE_DIR'`
if test "$use_r_includes" == "" ; then use_r_includes="$R_HOMEDIR/include" ; fi
)
--- 1920,1924 ----
AC_ARG_WITH(r-includes,AC_HELP_STRING([--with-r-includes=DIR],[specify location of R include files]),
use_r_includes="$withval",
! use_r_includes=`$R_HOMEDIR/bin/R CMD sh -c 'echo $R_INCLUDE_DIR'`
if test "$use_r_includes" == "" ; then use_r_includes="$R_HOMEDIR/include" ; fi
)
***************
*** 1939,1990 ****
])
-
- 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([--with-r-share=DIR],[specify location of R_SHARE directory]),
- use_r_share="$withval",
- use_r_share=`R CMD sh -c 'echo $R_SHARE_DIR'`
- if test "$use_r_share" == "" ; then use_r_share="$R_HOMEDIR/share" ; fi
- )
-
- 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 --with-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([--with-r-doc=DIR],[specify location of R_DOC directory]),
- use_r_doc="$withval",
- use_r_doc=`R CMD sh -c 'echo $R_DOC_DIR'`
- if test "$use_r_doc" == "" ; then use_r_doc="$R_HOMEDIR/doc" ; fi
- )
-
- 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 --with-r-doc to specify the correct directory.])
- fi
- AC_SUBST(R_DOCDIR)
-
- AC_MSG_RESULT($use_r_doc)
- ])
-
dnl ############################################ RKWARD specific addition end ###################################
--- 1937,1940 ----
Index: configure.files
===================================================================
RCS file: /cvsroot/rkward/rkward/configure.files,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** configure.files 17 Apr 2006 12:13:52 -0000 1.12
--- configure.files 17 Apr 2006 14:06:29 -0000 1.13
***************
*** 1,3 ****
./admin/configure.in.min
configure.in.in
- ./rkward-0.3.5/configure.in.in
--- 1,2 ----
More information about the rkward-tracker
mailing list