From bf1434377877f1298088bdc7723501a66ea85575 Mon Sep 17 00:00:00 2001 From: ripley Date: Sat, 30 Jul 2011 14:41:10 +0000 Subject: [PATCH] start adding package parallel git-svn-id: https://svn.r-project.org/R/trunk@56557 00db46b3-68df-0310-9c12-caf00c1e9a41 --- Makefile.in | 8 +- configure | 797 ++++++++++---------- configure.ac | 3 + doc/NEWS.Rd | 5 +- share/make/vars.mk | 6 +- src/library/Makefile.in | 2 +- src/library/Makefile.win | 2 +- src/library/base/R/library.R | 4 +- src/library/parallel/DESCRIPTION.in | 8 + src/library/parallel/Makefile.in | 35 + src/library/parallel/Makefile.win | 28 + src/library/parallel/NAMESPACE | 1 + src/library/parallel/R/parlapply.R | 20 + src/library/parallel/R/zzz.R | 20 + src/library/parallel/man/parlapply.Rd | 33 + src/library/parallel/src/Makefile.in | 51 ++ src/library/parallel/vignettes/parallel.Rnw | 31 + src/library/tcltk/Makefile.in | 2 +- 18 files changed, 642 insertions(+), 414 deletions(-) create mode 100644 src/library/parallel/DESCRIPTION.in create mode 100644 src/library/parallel/Makefile.in create mode 100644 src/library/parallel/Makefile.win create mode 100644 src/library/parallel/NAMESPACE create mode 100644 src/library/parallel/R/parlapply.R create mode 100644 src/library/parallel/R/zzz.R create mode 100644 src/library/parallel/man/parlapply.Rd create mode 100644 src/library/parallel/src/Makefile.in create mode 100644 src/library/parallel/vignettes/parallel.Rnw diff --git a/Makefile.in b/Makefile.in index 980527dfdf8..992a5f7a556 100644 --- a/Makefile.in +++ b/Makefile.in @@ -197,10 +197,10 @@ distdir: $(DISTFILES) vignettes | (cd $(distdir); $(TAR) -x -f -)) \ || exit 1; \ done - @mkdir -p $(distdir)/src/library/grid/inst/doc \ - $(distdir)/src/library/utils/inst/doc - @cp library/grid/doc/*.pdf $(distdir)/src/library/grid/inst/doc - @cp library/utils/doc/*.pdf $(distdir)/src/library/utils/inst/doc + @for d in grid parallel utils; do \ + mkdir -p $(distdir)/src/library/$${d}/inst/doc; \ + cp library/$${d}/doc/*.pdf $(distdir)/src/library/$${d}/inst/doc; \ + done @(cd $(distdir); tools/link-recommended) info pdf: diff --git a/configure b/configure index eb6acc3c8f3..e5299c71954 100755 --- a/configure +++ b/configure @@ -1,13 +1,13 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.66 for R 2.14.0. +# Generated by GNU Autoconf 2.65 for R 2.14.0. # # Report bugs to . # # # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, -# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software -# Foundation, Inc. +# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # # # This configure script is free software; the Free Software Foundation @@ -319,7 +319,7 @@ $as_echo X"$as_dir" | test -d "$as_dir" && break done test -z "$as_dirs" || eval "mkdir $as_dirs" - } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir" + } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir" } # as_fn_mkdir_p @@ -359,19 +359,19 @@ else fi # as_fn_arith -# as_fn_error STATUS ERROR [LINENO LOG_FD] -# ---------------------------------------- +# as_fn_error ERROR [LINENO LOG_FD] +# --------------------------------- # Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are # provided, also output the error to LOG_FD, referencing LINENO. Then exit the -# script with STATUS, using 1 if that was 0. +# script with status $?, using 1 if that was 0. as_fn_error () { - as_status=$1; test $as_status -eq 0 && as_status=1 - if test "$4"; then - as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 + as_status=$?; test $as_status -eq 0 && as_status=1 + if test "$3"; then + as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3 fi - $as_echo "$as_me: error: $2" >&2 + $as_echo "$as_me: error: $1" >&2 as_fn_exit $as_status } # as_fn_error @@ -682,7 +682,7 @@ test -n "$DJDIR" || exec 7<&0 &1 # Name of the host. -# hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status, +# hostname on some systems (SVR3.2, Linux) returns a bogus exit status, # so uname gets run too. ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q` @@ -1306,7 +1306,7 @@ do ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error $? "invalid feature name: $ac_useropt" + as_fn_error "invalid feature name: $ac_useropt" ac_useropt_orig=$ac_useropt ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in @@ -1332,7 +1332,7 @@ do ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error $? "invalid feature name: $ac_useropt" + as_fn_error "invalid feature name: $ac_useropt" ac_useropt_orig=$ac_useropt ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in @@ -1536,7 +1536,7 @@ do ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error $? "invalid package name: $ac_useropt" + as_fn_error "invalid package name: $ac_useropt" ac_useropt_orig=$ac_useropt ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in @@ -1552,7 +1552,7 @@ do ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error $? "invalid package name: $ac_useropt" + as_fn_error "invalid package name: $ac_useropt" ac_useropt_orig=$ac_useropt ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in @@ -1582,8 +1582,8 @@ do | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*) x_libraries=$ac_optarg ;; - -*) as_fn_error $? "unrecognized option: \`$ac_option' -Try \`$0 --help' for more information" + -*) as_fn_error "unrecognized option: \`$ac_option' +Try \`$0 --help' for more information." ;; *=*) @@ -1591,7 +1591,7 @@ Try \`$0 --help' for more information" # Reject names that are not valid shell variable names. case $ac_envvar in #( '' | [0-9]* | *[!_$as_cr_alnum]* ) - as_fn_error $? "invalid variable name: \`$ac_envvar'" ;; + as_fn_error "invalid variable name: \`$ac_envvar'" ;; esac eval $ac_envvar=\$ac_optarg export $ac_envvar ;; @@ -1609,13 +1609,13 @@ done if test -n "$ac_prev"; then ac_option=--`echo $ac_prev | sed 's/_/-/g'` - as_fn_error $? "missing argument to $ac_option" + as_fn_error "missing argument to $ac_option" fi if test -n "$ac_unrecognized_opts"; then case $enable_option_checking in no) ;; - fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;; + fatal) as_fn_error "unrecognized options: $ac_unrecognized_opts" ;; *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;; esac fi @@ -1638,7 +1638,7 @@ do [\\/$]* | ?:[\\/]* ) continue;; NONE | '' ) case $ac_var in *prefix ) continue;; esac;; esac - as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val" + as_fn_error "expected an absolute directory name for --$ac_var: $ac_val" done # There might be people who depend on the old broken behavior: `$host' @@ -1652,8 +1652,8 @@ target=$target_alias if test "x$host_alias" != x; then if test "x$build_alias" = x; then cross_compiling=maybe - $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host. - If a cross compiler is detected then cross compile mode will be used" >&2 + $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host. + If a cross compiler is detected then cross compile mode will be used." >&2 elif test "x$build_alias" != "x$host_alias"; then cross_compiling=yes fi @@ -1668,9 +1668,9 @@ test "$silent" = yes && exec 6>/dev/null ac_pwd=`pwd` && test -n "$ac_pwd" && ac_ls_di=`ls -di .` && ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` || - as_fn_error $? "working directory cannot be determined" + as_fn_error "working directory cannot be determined" test "X$ac_ls_di" = "X$ac_pwd_ls_di" || - as_fn_error $? "pwd does not report name of working directory" + as_fn_error "pwd does not report name of working directory" # Find the source files, if location was not specified. @@ -1709,11 +1709,11 @@ else fi if test ! -r "$srcdir/$ac_unique_file"; then test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .." - as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir" + as_fn_error "cannot find sources ($ac_unique_file) in $srcdir" fi ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work" ac_abs_confdir=`( - cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg" + cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error "$ac_msg" pwd)` # When building in place, set srcdir=. if test "$ac_abs_confdir" = "$ac_pwd"; then @@ -1753,7 +1753,7 @@ Configuration: --help=short display options specific to this package --help=recursive display the short help of all the included packages -V, --version display version information and exit - -q, --quiet, --silent do not print \`checking ...' messages + -q, --quiet, --silent do not print \`checking...' messages --cache-file=FILE cache test results in FILE [disabled] -C, --config-cache alias for \`--cache-file=config.cache' -n, --no-create do not create output files @@ -2029,9 +2029,9 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF R configure 2.14.0 -generated by GNU Autoconf 2.66 +generated by GNU Autoconf 2.65 -Copyright (C) 2010 Free Software Foundation, Inc. +Copyright (C) 2009 Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. _ACEOF @@ -2238,10 +2238,10 @@ fi ac_fn_c_check_header_mongrel () { as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - if eval "test \"\${$3+set}\"" = set; then : + if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 $as_echo_n "checking for $2... " >&6; } -if eval "test \"\${$3+set}\"" = set; then : +if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : $as_echo_n "(cached) " >&6 fi eval ac_res=\$$3 @@ -2300,15 +2300,17 @@ $as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;} $as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;} { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5 $as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} -( $as_echo "## ----------------------------------- ## +( cat <<\_ASBOX +## ----------------------------------- ## ## Report this to r-bugs@R-project.org ## -## ----------------------------------- ##" +## ----------------------------------- ## +_ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 ;; esac { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 $as_echo_n "checking for $2... " >&6; } -if eval "test \"\${$3+set}\"" = set; then : +if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : $as_echo_n "(cached) " >&6 else eval "$3=\$ac_header_compiler" @@ -2372,7 +2374,7 @@ ac_fn_c_check_header_compile () as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 $as_echo_n "checking for $2... " >&6; } -if eval "test \"\${$3+set}\"" = set; then : +if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -2486,7 +2488,7 @@ ac_fn_c_check_func () as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 $as_echo_n "checking for $2... " >&6; } -if eval "test \"\${$3+set}\"" = set; then : +if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -2637,18 +2639,15 @@ fi } # ac_fn_f77_try_link -# ac_fn_c_check_decl LINENO SYMBOL VAR INCLUDES -# --------------------------------------------- -# Tests whether SYMBOL is declared in INCLUDES, setting cache variable VAR -# accordingly. +# ac_fn_c_check_decl LINENO SYMBOL VAR +# ------------------------------------ +# Tests whether SYMBOL is declared, setting cache variable VAR accordingly. ac_fn_c_check_decl () { as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - as_decl_name=`echo $2|sed 's/ *(.*//'` - as_decl_use=`echo $2|sed -e 's/(/((/' -e 's/)/) 0&/' -e 's/,/) 0& (/g'` - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $as_decl_name is declared" >&5 -$as_echo_n "checking whether $as_decl_name is declared... " >&6; } -if eval "test \"\${$3+set}\"" = set; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $2 is declared" >&5 +$as_echo_n "checking whether $2 is declared... " >&6; } +if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -2657,12 +2656,8 @@ $4 int main () { -#ifndef $as_decl_name -#ifdef __cplusplus - (void) $as_decl_use; -#else - (void) $as_decl_name; -#endif +#ifndef $2 + (void) $2; #endif ; @@ -2692,7 +2687,7 @@ ac_fn_c_check_type () as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 $as_echo_n "checking for $2... " >&6; } -if eval "test \"\${$3+set}\"" = set; then : +if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : $as_echo_n "(cached) " >&6 else eval "$3=no" @@ -2970,7 +2965,7 @@ ac_fn_c_check_member () as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2.$3" >&5 $as_echo_n "checking for $2.$3... " >&6; } -if eval "test \"\${$4+set}\"" = set; then : +if { as_var=$4; eval "test \"\${$as_var+set}\" = set"; }; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -3122,7 +3117,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. It was created by R $as_me 2.14.0, which was -generated by GNU Autoconf 2.66. Invocation command line was +generated by GNU Autoconf 2.65. Invocation command line was $ $0 $@ @@ -3232,9 +3227,11 @@ trap 'exit_status=$? { echo - $as_echo "## ---------------- ## + cat <<\_ASBOX +## ---------------- ## ## Cache variables. ## -## ---------------- ##" +## ---------------- ## +_ASBOX echo # The following way of writing the cache mishandles newlines in values, ( @@ -3268,9 +3265,11 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; ) echo - $as_echo "## ----------------- ## + cat <<\_ASBOX +## ----------------- ## ## Output variables. ## -## ----------------- ##" +## ----------------- ## +_ASBOX echo for ac_var in $ac_subst_vars do @@ -3283,9 +3282,11 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; echo if test -n "$ac_subst_files"; then - $as_echo "## ------------------- ## + cat <<\_ASBOX +## ------------------- ## ## File substitutions. ## -## ------------------- ##" +## ------------------- ## +_ASBOX echo for ac_var in $ac_subst_files do @@ -3299,9 +3300,11 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; fi if test -s confdefs.h; then - $as_echo "## ----------- ## + cat <<\_ASBOX +## ----------- ## ## confdefs.h. ## -## ----------- ##" +## ----------- ## +_ASBOX echo cat confdefs.h echo @@ -3356,12 +3359,7 @@ _ACEOF ac_site_file1=NONE ac_site_file2=NONE if test -n "$CONFIG_SITE"; then - # We do not want a PATH search for config.site. - case $CONFIG_SITE in #(( - -*) ac_site_file1=./$CONFIG_SITE;; - */*) ac_site_file1=$CONFIG_SITE;; - *) ac_site_file1=./$CONFIG_SITE;; - esac + ac_site_file1=$CONFIG_SITE elif test "x$prefix" != xNONE; then ac_site_file1=$prefix/share/config.site ac_site_file2=$prefix/etc/config.site @@ -3376,11 +3374,7 @@ do { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5 $as_echo "$as_me: loading site script $ac_site_file" >&6;} sed 's/^/| /' "$ac_site_file" >&5 - . "$ac_site_file" \ - || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "failed to load site script $ac_site_file -See \`config.log' for more details" "$LINENO" 5; } + . "$ac_site_file" fi done @@ -3461,7 +3455,7 @@ if $ac_cache_corrupted; then $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5 $as_echo "$as_me: error: changes in the environment can compromise the build" >&2;} - as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5 + as_fn_error "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5 fi ## -------------------- ## ## Main body of script. ## @@ -3477,22 +3471,16 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu ac_aux_dir= for ac_dir in tools "$srcdir"/tools; do - if test -f "$ac_dir/install-sh"; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/install-sh -c" - break - elif test -f "$ac_dir/install.sh"; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/install.sh -c" - break - elif test -f "$ac_dir/shtool"; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/shtool install -c" - break - fi + for ac_t in install-sh install.sh shtool; do + if test -f "$ac_dir/$ac_t"; then + ac_aux_dir=$ac_dir + ac_install_sh="$ac_aux_dir/$ac_t -c" + break 2 + fi + done done if test -z "$ac_aux_dir"; then - as_fn_error $? "cannot find install-sh, install.sh, or shtool in tools \"$srcdir\"/tools" "$LINENO" 5 + as_fn_error "cannot find install-sh, install.sh, or shtool in tools \"$srcdir\"/tools" "$LINENO" 5 fi # These three variables are undocumented and unsupported, @@ -3537,7 +3525,7 @@ MAJ_MIN_VERSION=`echo ${VERSION} | sed 's/\.[0-9]$//'` # Make sure we can run config.sub. $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || - as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5 + as_fn_error "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5 { $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5 $as_echo_n "checking build system type... " >&6; } @@ -3548,16 +3536,16 @@ else test "x$ac_build_alias" = x && ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"` test "x$ac_build_alias" = x && - as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5 + as_fn_error "cannot guess build type; you must specify one" "$LINENO" 5 ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` || - as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5 + as_fn_error "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5 fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5 $as_echo "$ac_cv_build" >&6; } case $ac_cv_build in *-*-*) ;; -*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;; +*) as_fn_error "invalid value of canonical build" "$LINENO" 5;; esac build=$ac_cv_build ac_save_IFS=$IFS; IFS='-' @@ -3582,7 +3570,7 @@ else ac_cv_host=$ac_cv_build else ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` || - as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5 + as_fn_error "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5 fi fi @@ -3590,7 +3578,7 @@ fi $as_echo "$ac_cv_host" >&6; } case $ac_cv_host in *-*-*) ;; -*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;; +*) as_fn_error "invalid value of canonical host" "$LINENO" 5;; esac host=$ac_cv_host ac_save_IFS=$IFS; IFS='-' @@ -3633,14 +3621,14 @@ case "${host_os}" in ## with 11 being 10.7. We no longer support < 10.4 (Tiger) ## http://en.wikipedia.org/wiki/Darwin_OS darwin1.*) - as_fn_error $? "The earliest supported MacOS X is 10.4. + as_fn_error "The earliest supported MacOS X is 10.4. ;; darwin567*" "$LINENO" 5 - as_fn_error $? "The earliest supported MacOS X is 10.4. + as_fn_error "The earliest supported MacOS X is 10.4. ;; aix123*|aix4.01*" "$LINENO" 5 ## These need a form of linking we no longer support - as_fn_error $? "AIX prior to 4.2 is not supported" "$LINENO" 5 + as_fn_error "AIX prior to 4.2 is not supported" "$LINENO" 5 ;; esac @@ -5918,8 +5906,8 @@ fi test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "no acceptable C compiler found in \$PATH -See \`config.log' for more details" "$LINENO" 5; } +as_fn_error "no acceptable C compiler found in \$PATH +See \`config.log' for more details." "$LINENO" 5; } # Provide some information about the compiler. $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 @@ -6033,8 +6021,9 @@ sed 's/^/| /' conftest.$ac_ext >&5 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error 77 "C compiler cannot create executables -See \`config.log' for more details" "$LINENO" 5; } +{ as_fn_set_status 77 +as_fn_error "C compiler cannot create executables +See \`config.log' for more details." "$LINENO" 5; }; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } @@ -6076,8 +6065,8 @@ done else { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "cannot compute suffix of executables: cannot compile and link -See \`config.log' for more details" "$LINENO" 5; } +as_fn_error "cannot compute suffix of executables: cannot compile and link +See \`config.log' for more details." "$LINENO" 5; } fi rm -f conftest conftest$ac_cv_exeext { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5 @@ -6134,9 +6123,9 @@ $as_echo "$ac_try_echo"; } >&5 else { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "cannot run C compiled programs. +as_fn_error "cannot run C compiled programs. If you meant to cross compile, use \`--host'. -See \`config.log' for more details" "$LINENO" 5; } +See \`config.log' for more details." "$LINENO" 5; } fi fi fi @@ -6187,8 +6176,8 @@ sed 's/^/| /' conftest.$ac_ext >&5 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "cannot compute suffix of object files: cannot compile -See \`config.log' for more details" "$LINENO" 5; } +as_fn_error "cannot compute suffix of object files: cannot compile +See \`config.log' for more details." "$LINENO" 5; } fi rm -f conftest.$ac_cv_objext conftest.$ac_ext fi @@ -6537,8 +6526,8 @@ if $ac_preproc_ok; then : else { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "C preprocessor \"$CPP\" fails sanity check -See \`config.log' for more details" "$LINENO" 5; } +as_fn_error "C preprocessor \"$CPP\" fails sanity check +See \`config.log' for more details." "$LINENO" 5; } fi ac_ext=c @@ -6599,7 +6588,7 @@ esac done IFS=$as_save_IFS if test -z "$ac_cv_path_GREP"; then - as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 + as_fn_error "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 fi else ac_cv_path_GREP=$GREP @@ -6665,7 +6654,7 @@ esac done IFS=$as_save_IFS if test -z "$ac_cv_path_EGREP"; then - as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 + as_fn_error "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 fi else ac_cv_path_EGREP=$EGREP @@ -6847,8 +6836,8 @@ if $ac_preproc_ok; then : else { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "C preprocessor \"$CPP\" fails sanity check -See \`config.log' for more details" "$LINENO" 5; } +as_fn_error "C preprocessor \"$CPP\" fails sanity check +See \`config.log' for more details." "$LINENO" 5; } fi ac_ext=c @@ -6972,7 +6961,7 @@ ac_compile='$F77 -c $FFLAGS conftest.$ac_ext >&5' ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_f77_compiler_gnu if test -n "$ac_tool_prefix"; then - for ac_prog in g77 xlf f77 frt pgf77 cf77 fort77 fl32 af77 xlf90 f90 pgf90 pghpf epcf90 gfortran g95 xlf95 f95 fort ifort ifc efc pgfortran pgf95 lf95 ftn + for ac_prog in g77 xlf f77 frt pgf77 cf77 fort77 fl32 af77 xlf90 f90 pgf90 pghpf epcf90 gfortran g95 xlf95 f95 fort ifort ifc efc pgf95 lf95 ftn do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. set dummy $ac_tool_prefix$ac_prog; ac_word=$2 @@ -7016,7 +7005,7 @@ fi fi if test -z "$F77"; then ac_ct_F77=$F77 - for ac_prog in g77 xlf f77 frt pgf77 cf77 fort77 fl32 af77 xlf90 f90 pgf90 pghpf epcf90 gfortran g95 xlf95 f95 fort ifort ifc efc pgfortran pgf95 lf95 ftn + for ac_prog in g77 xlf f77 frt pgf77 cf77 fort77 fl32 af77 xlf90 f90 pgf90 pghpf epcf90 gfortran g95 xlf95 f95 fort ifort ifc efc pgf95 lf95 ftn do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 @@ -7179,7 +7168,7 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $ ac_compiler_gnu=$ac_cv_c_compiler_gnu else - as_fn_error $? "No F77 compiler found" "$LINENO" 5 + as_fn_error "No F77 compiler found" "$LINENO" 5 fi ac_ext=cpp @@ -7562,8 +7551,8 @@ if $ac_preproc_ok; then : else { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "C++ preprocessor \"$CXXCPP\" fails sanity check -See \`config.log' for more details" "$LINENO" 5; } +as_fn_error "C++ preprocessor \"$CXXCPP\" fails sanity check +See \`config.log' for more details." "$LINENO" 5; } fi ac_ext=c @@ -7807,7 +7796,8 @@ do : as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default " -if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : +eval as_val=\$$as_ac_Header + if test "x$as_val" = x""yes; then : cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF @@ -8422,7 +8412,7 @@ esac done IFS=$as_save_IFS if test -z "$ac_cv_path_SED"; then - as_fn_error $? "no acceptable sed could be found in \$PATH" "$LINENO" 5 + as_fn_error "no acceptable sed could be found in \$PATH" "$LINENO" 5 fi else ac_cv_path_SED=$SED @@ -8501,7 +8491,7 @@ esac done IFS=$as_save_IFS if test -z "$ac_cv_path_FGREP"; then - as_fn_error $? "no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 + as_fn_error "no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 fi else ac_cv_path_FGREP=$FGREP @@ -8610,7 +8600,7 @@ else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi -test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5 +test -z "$LD" && as_fn_error "no acceptable ld found in \$PATH" "$LINENO" 5 { $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5 $as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; } if test "${lt_cv_prog_gnu_ld+set}" = set; then : @@ -8812,13 +8802,13 @@ if test "${lt_cv_nm_interface+set}" = set; then : else lt_cv_nm_interface="BSD nm" echo "int some_variable = 0;" > conftest.$ac_ext - (eval echo "\"\$as_me:8815: $ac_compile\"" >&5) + (eval echo "\"\$as_me:8805: $ac_compile\"" >&5) (eval "$ac_compile" 2>conftest.err) cat conftest.err >&5 - (eval echo "\"\$as_me:8818: $NM \\\"conftest.$ac_objext\\\"\"" >&5) + (eval echo "\"\$as_me:8808: $NM \\\"conftest.$ac_objext\\\"\"" >&5) (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) cat conftest.err >&5 - (eval echo "\"\$as_me:8821: output\"" >&5) + (eval echo "\"\$as_me:8811: output\"" >&5) cat conftest.out >&5 if $GREP 'External.*some_variable' conftest.out > /dev/null; then lt_cv_nm_interface="MS dumpbin" @@ -10986,7 +10976,7 @@ ac_compile='$F77 -c $FFLAGS conftest.$ac_ext >&5' ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_f77_compiler_gnu if test -n "$ac_tool_prefix"; then - for ac_prog in g77 xlf f77 frt pgf77 cf77 fort77 fl32 af77 xlf90 f90 pgf90 pghpf epcf90 gfortran g95 xlf95 f95 fort ifort ifc efc pgfortran pgf95 lf95 ftn + for ac_prog in g77 xlf f77 frt pgf77 cf77 fort77 fl32 af77 xlf90 f90 pgf90 pghpf epcf90 gfortran g95 xlf95 f95 fort ifort ifc efc pgf95 lf95 ftn do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. set dummy $ac_tool_prefix$ac_prog; ac_word=$2 @@ -11030,7 +11020,7 @@ fi fi if test -z "$F77"; then ac_ct_F77=$F77 - for ac_prog in g77 xlf f77 frt pgf77 cf77 fort77 fl32 af77 xlf90 f90 pgf90 pghpf epcf90 gfortran g95 xlf95 f95 fort ifort ifc efc pgfortran pgf95 lf95 ftn + for ac_prog in g77 xlf f77 frt pgf77 cf77 fort77 fl32 af77 xlf90 f90 pgf90 pghpf epcf90 gfortran g95 xlf95 f95 fort ifort ifc efc pgf95 lf95 ftn do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 @@ -11666,11 +11656,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:11669: $lt_compile\"" >&5) + (eval echo "\"\$as_me:11659: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:11673: \$? = $ac_status" >&5 + echo "$as_me:11663: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -12005,11 +11995,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:12008: $lt_compile\"" >&5) + (eval echo "\"\$as_me:11998: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:12012: \$? = $ac_status" >&5 + echo "$as_me:12002: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -12110,11 +12100,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:12113: $lt_compile\"" >&5) + (eval echo "\"\$as_me:12103: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:12117: \$? = $ac_status" >&5 + echo "$as_me:12107: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -12165,11 +12155,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:12168: $lt_compile\"" >&5) + (eval echo "\"\$as_me:12158: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:12172: \$? = $ac_status" >&5 + echo "$as_me:12162: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -14532,7 +14522,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 14535 "configure" +#line 14525 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -14628,7 +14618,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 14631 "configure" +#line 14621 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -15036,7 +15026,7 @@ else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi -test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5 +test -z "$LD" && as_fn_error "no acceptable ld found in \$PATH" "$LINENO" 5 { $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5 $as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; } if test "${lt_cv_prog_gnu_ld+set}" = set; then : @@ -16577,11 +16567,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:16580: $lt_compile\"" >&5) + (eval echo "\"\$as_me:16570: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:16584: \$? = $ac_status" >&5 + echo "$as_me:16574: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -16676,11 +16666,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:16679: $lt_compile\"" >&5) + (eval echo "\"\$as_me:16669: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:16683: \$? = $ac_status" >&5 + echo "$as_me:16673: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -16728,11 +16718,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:16731: $lt_compile\"" >&5) + (eval echo "\"\$as_me:16721: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:16735: \$? = $ac_status" >&5 + echo "$as_me:16725: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -18108,11 +18098,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:18111: $lt_compile\"" >&5) + (eval echo "\"\$as_me:18101: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:18115: \$? = $ac_status" >&5 + echo "$as_me:18105: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -18207,11 +18197,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:18210: $lt_compile\"" >&5) + (eval echo "\"\$as_me:18200: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:18214: \$? = $ac_status" >&5 + echo "$as_me:18204: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -18259,11 +18249,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:18262: $lt_compile\"" >&5) + (eval echo "\"\$as_me:18252: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:18266: \$? = $ac_status" >&5 + echo "$as_me:18256: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -20166,7 +20156,7 @@ $as_echo_n "checking for build C compiler... " >&6; } if test "${build_cc_works}" = no; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: none" >&5 $as_echo "none" >&6; } - as_fn_error $? "Build C compiler doesn't work. Set BUILD_CC to a compiler capable of creating a binary native to the build machine." "$LINENO" 5 + as_fn_error "Build C compiler doesn't work. Set BUILD_CC to a compiler capable of creating a binary native to the build machine." "$LINENO" 5 fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${BUILD_CC}" >&5 $as_echo "${BUILD_CC}" >&6; } @@ -20179,7 +20169,7 @@ $as_echo "${BUILD_R}" >&6; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: none" >&5 $as_echo "none" >&6; } - as_fn_error $? "Build R doesn't work. Set BUILD_R to a native build of the same R version that you want to cross-compile." "$LINENO" 5 + as_fn_error "Build R doesn't work. Set BUILD_R to a native build of the same R version that you want to cross-compile." "$LINENO" 5 fi fi @@ -20491,7 +20481,7 @@ if test "$ac_res" != no; then : test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" else - as_fn_error $? "Your OS X is too old." "$LINENO" 5 + as_fn_error "Your OS X is too old." "$LINENO" 5 fi ## SI says we want '-lcc_dynamic' on Darwin, although currently @@ -20598,7 +20588,8 @@ if test "${use_readline}" = yes; then do : as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" -if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : +eval as_val=\$$as_ac_Header + if test "x$as_val" = x""yes; then : cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF @@ -20839,14 +20830,14 @@ fi done if test "${use_readline}" = no; then - as_fn_error $? "--with-readline=yes (default) and headers/libs are not available" "$LINENO" 5 + as_fn_error "--with-readline=yes (default) and headers/libs are not available" "$LINENO" 5 else for ac_func in rl_completion_matches do as_ac_Symbol=`$as_echo "ac_cv_have_decl_$ac_func" | $as_tr_sh` { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $ac_func exists and is declared" >&5 $as_echo_n "checking whether $ac_func exists and is declared... " >&6; } -if eval "test \"\${$as_ac_Symbol+set}\"" = set; then : +if { as_var=$as_ac_Symbol; eval "test \"\${$as_var+set}\" = set"; }; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -21010,7 +21001,7 @@ for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do as_ac_Header=`$as_echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh` { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_hdr that defines DIR" >&5 $as_echo_n "checking for $ac_hdr that defines DIR... " >&6; } -if eval "test \"\${$as_ac_Header+set}\"" = set; then : +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -21037,7 +21028,8 @@ fi eval ac_res=\$$as_ac_Header { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 $as_echo "$ac_res" >&6; } -if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : +eval as_val=\$$as_ac_Header + if test "x$as_val" = x""yes; then : cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_hdr" | $as_tr_cpp` 1 _ACEOF @@ -21165,7 +21157,7 @@ fi ## we also assume readdir and closedir if test "${ac_cv_search_opendir}" = "no"; then - as_fn_error $? "Building R requires the 'opendir' system call" "$LINENO" 5 + as_fn_error "Building R requires the 'opendir' system call" "$LINENO" 5 fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sys/wait.h that is POSIX.1 compatible" >&5 $as_echo_n "checking for sys/wait.h that is POSIX.1 compatible... " >&6; } @@ -21227,7 +21219,8 @@ for ac_header in arpa/inet.h dl.h dlfcn.h elf.h fcntl.h floatingpoint.h \ do : as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" -if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : +eval as_val=\$$as_ac_Header + if test "x$as_val" = x""yes; then : cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF @@ -21245,7 +21238,8 @@ for ac_header in errno.h inttypes.h limits.h locale.h stdarg.h stdbool.h \ do : as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" -if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : +eval as_val=\$$as_ac_Header + if test "x$as_val" = x""yes; then : cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF @@ -21704,7 +21698,7 @@ $as_echo "#define WORDS_BIGENDIAN 1" >>confdefs.h no) ;; *) - as_fn_error $? "unknown endianness + as_fn_error "unknown endianness presetting ac_cv_c_bigendian=no (or yes) will help" "$LINENO" 5 ;; esac @@ -22130,8 +22124,9 @@ else if test "$ac_cv_type_int" = yes; then { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error 77 "cannot compute sizeof (int) -See \`config.log' for more details" "$LINENO" 5; } +{ as_fn_set_status 77 +as_fn_error "cannot compute sizeof (int) +See \`config.log' for more details." "$LINENO" 5; }; } else ac_cv_sizeof_int=0 fi @@ -22171,8 +22166,9 @@ else if test "$ac_cv_type_long" = yes; then { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error 77 "cannot compute sizeof (long) -See \`config.log' for more details" "$LINENO" 5; } +{ as_fn_set_status 77 +as_fn_error "cannot compute sizeof (long) +See \`config.log' for more details." "$LINENO" 5; }; } else ac_cv_sizeof_long=0 fi @@ -22204,8 +22200,9 @@ else if test "$ac_cv_type_long_long" = yes; then { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error 77 "cannot compute sizeof (long long) -See \`config.log' for more details" "$LINENO" 5; } +{ as_fn_set_status 77 +as_fn_error "cannot compute sizeof (long long) +See \`config.log' for more details." "$LINENO" 5; }; } else ac_cv_sizeof_long_long=0 fi @@ -22237,8 +22234,9 @@ else if test "$ac_cv_type_double" = yes; then { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error 77 "cannot compute sizeof (double) -See \`config.log' for more details" "$LINENO" 5; } +{ as_fn_set_status 77 +as_fn_error "cannot compute sizeof (double) +See \`config.log' for more details." "$LINENO" 5; }; } else ac_cv_sizeof_double=0 fi @@ -22270,8 +22268,9 @@ else if test "$ac_cv_type_long_double" = yes; then { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error 77 "cannot compute sizeof (long double) -See \`config.log' for more details" "$LINENO" 5; } +{ as_fn_set_status 77 +as_fn_error "cannot compute sizeof (long double) +See \`config.log' for more details." "$LINENO" 5; }; } else ac_cv_sizeof_long_double=0 fi @@ -22303,8 +22302,9 @@ else if test "$ac_cv_type_size_t" = yes; then { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error 77 "cannot compute sizeof (size_t) -See \`config.log' for more details" "$LINENO" 5; } +{ as_fn_set_status 77 +as_fn_error "cannot compute sizeof (size_t) +See \`config.log' for more details." "$LINENO" 5; }; } else ac_cv_sizeof_size_t=0 fi @@ -23261,8 +23261,8 @@ fi else { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "linking to Fortran libraries from C fails -See \`config.log' for more details" "$LINENO" 5; } +as_fn_error "linking to Fortran libraries from C fails +See \`config.log' for more details." "$LINENO" 5; } fi ac_ext=c @@ -23423,8 +23423,8 @@ ac_compiler_gnu=$ac_cv_f77_compiler_gnu else { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "cannot compile a simple Fortran program -See \`config.log' for more details" "$LINENO" 5; } +as_fn_error "cannot compile a simple Fortran program +See \`config.log' for more details." "$LINENO" 5; } fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext @@ -23500,7 +23500,7 @@ case "${ac_cv_f77_mangling}" in "upper "*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Fortran compiler uses uppercase external names" >&5 $as_echo "$as_me: WARNING: Fortran compiler uses uppercase external names" >&2;} - as_fn_error $? "cannot use Fortran" "$LINENO" 5 + as_fn_error "cannot use Fortran" "$LINENO" 5 ;; esac { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${F77} appends underscores to external names" >&5 @@ -23524,7 +23524,7 @@ $as_echo "${r_cv_prog_f77_append_underscore}" >&6; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: unknown" >&5 $as_echo "unknown" >&6; } - as_fn_error $? "cannot use Fortran" "$LINENO" 5 + as_fn_error "cannot use Fortran" "$LINENO" 5 fi if test "${r_cv_prog_f77_append_underscore}" = yes; then @@ -23552,7 +23552,7 @@ $as_echo "${r_cv_prog_f77_append_second_underscore}" >&6; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: unknown" >&5 $as_echo "unknown" >&6; } - as_fn_error $? "cannot use Fortran" "$LINENO" 5 + as_fn_error "cannot use Fortran" "$LINENO" 5 fi if test "${r_cv_prog_f77_append_second_underscore}" = yes; then @@ -23627,7 +23627,7 @@ $as_echo "don't know (cross-compiling)" >&6; } else { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cannot run mixed C/Fortran code" >&5 $as_echo "$as_me: WARNING: cannot run mixed C/Fortran code" >&2;} - as_fn_error $? "Maybe check LDFLAGS for paths to Fortran libraries?" "$LINENO" 5 + as_fn_error "Maybe check LDFLAGS for paths to Fortran libraries?" "$LINENO" 5 fi fi @@ -23718,7 +23718,7 @@ $as_echo "don't know (cross-compiling)" >&6; } else { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: ${F77} and ${CC} disagree on int and double" >&5 $as_echo "$as_me: WARNING: ${F77} and ${CC} disagree on int and double" >&2;} - as_fn_error $? "Maybe change CFLAGS or FFLAGS?" "$LINENO" 5 + as_fn_error "Maybe change CFLAGS or FFLAGS?" "$LINENO" 5 fi fi @@ -24221,7 +24221,7 @@ ac_safe=_fobjc_exceptions else { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${OBJC} accepts -fobjc-exceptions" >&5 $as_echo_n "checking whether ${OBJC} accepts -fobjc-exceptions... " >&6; } - if eval "test \"\${r_cv_prog_objc_flag_${ac_safe}+set}\"" = set; then : + if { as_var=r_cv_prog_objc_flag_${ac_safe}; eval "test \"\${$as_var+set}\" = set"; }; then : $as_echo_n "(cached) " >&6 else ac_ext=m @@ -24678,7 +24678,7 @@ fi ac_safe=_mieee_with_inexact { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${CC} accepts -mieee-with-inexact" >&5 $as_echo_n "checking whether ${CC} accepts -mieee-with-inexact... " >&6; } -if eval "test \"\${r_cv_prog_cc_flag_${ac_safe}+set}\"" = set; then : +if { as_var=r_cv_prog_cc_flag_${ac_safe}; eval "test \"\${$as_var+set}\" = set"; }; then : $as_echo_n "(cached) " >&6 else ac_ext=c @@ -24744,7 +24744,7 @@ fi ac_safe=_ieee_with_inexact { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${CC} accepts -ieee_with_inexact" >&5 $as_echo_n "checking whether ${CC} accepts -ieee_with_inexact... " >&6; } -if eval "test \"\${r_cv_prog_cc_flag_${ac_safe}+set}\"" = set; then : +if { as_var=r_cv_prog_cc_flag_${ac_safe}; eval "test \"\${$as_var+set}\" = set"; }; then : $as_echo_n "(cached) " >&6 else ac_ext=c @@ -24811,7 +24811,7 @@ fi ac_safe=_mieee { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${F77} accepts -mieee" >&5 $as_echo_n "checking whether ${F77} accepts -mieee... " >&6; } -if eval "test \"\${r_cv_prog_f77_flag_${ac_safe}+set}\"" = set; then : +if { as_var=r_cv_prog_f77_flag_${ac_safe}; eval "test \"\${$as_var+set}\" = set"; }; then : $as_echo_n "(cached) " >&6 else ac_ext=f @@ -24862,7 +24862,7 @@ fi ac_safe=_fpe3 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${F77} accepts -fpe3" >&5 $as_echo_n "checking whether ${F77} accepts -fpe3... " >&6; } -if eval "test \"\${r_cv_prog_f77_flag_${ac_safe}+set}\"" = set; then : +if { as_var=r_cv_prog_f77_flag_${ac_safe}; eval "test \"\${$as_var+set}\" = set"; }; then : $as_echo_n "(cached) " >&6 else ac_ext=f @@ -24914,7 +24914,7 @@ fi ac_safe=_mieee { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${CXX-c++} accepts -mieee" >&5 $as_echo_n "checking whether ${CXX-c++} accepts -mieee... " >&6; } -if eval "test \"\${r_cv_prog_cxx_flag_${ac_safe}+set}\"" = set; then : +if { as_var=r_cv_prog_cxx_flag_${ac_safe}; eval "test \"\${$as_var+set}\" = set"; }; then : $as_echo_n "(cached) " >&6 else ac_ext=cpp @@ -24980,7 +24980,7 @@ fi ac_safe=_ieee { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${CXX-c++} accepts -ieee" >&5 $as_echo_n "checking whether ${CXX-c++} accepts -ieee... " >&6; } -if eval "test \"\${r_cv_prog_cxx_flag_${ac_safe}+set}\"" = set; then : +if { as_var=r_cv_prog_cxx_flag_${ac_safe}; eval "test \"\${$as_var+set}\" = set"; }; then : $as_echo_n "(cached) " >&6 else ac_ext=cpp @@ -25058,7 +25058,7 @@ case "${host_os}" in ac_safe=_mminimal_toc { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${CC} accepts -mminimal-toc" >&5 $as_echo_n "checking whether ${CC} accepts -mminimal-toc... " >&6; } -if eval "test \"\${r_cv_prog_cc_flag_${ac_safe}+set}\"" = set; then : +if { as_var=r_cv_prog_cc_flag_${ac_safe}; eval "test \"\${$as_var+set}\" = set"; }; then : $as_echo_n "(cached) " >&6 else ac_ext=c @@ -25124,7 +25124,7 @@ fi ac_safe=_mno_fp_in_toc { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${CC} accepts -mno-fp-in-toc" >&5 $as_echo_n "checking whether ${CC} accepts -mno-fp-in-toc... " >&6; } -if eval "test \"\${r_cv_prog_cc_flag_${ac_safe}+set}\"" = set; then : +if { as_var=r_cv_prog_cc_flag_${ac_safe}; eval "test \"\${$as_var+set}\" = set"; }; then : $as_echo_n "(cached) " >&6 else ac_ext=c @@ -25312,10 +25312,10 @@ fi ## compilers *need* '-OPT:IEEE_NaN_inf=ON'. Currently, all we do is ## check whether the non-GNU tools *accept* the flag. if test "${G77}" != yes; then - ac_safe=`$as_echo "-OPT:IEEE_NaN_inf=ON" | $as_tr_sh` + ac_safe=_OPT_IEEE_NaN_inf_ON { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${F77} accepts -OPT:IEEE_NaN_inf=ON" >&5 $as_echo_n "checking whether ${F77} accepts -OPT:IEEE_NaN_inf=ON... " >&6; } -if eval "test \"\${r_cv_prog_f77_flag_${ac_safe}+set}\"" = set; then : +if { as_var=r_cv_prog_f77_flag_${ac_safe}; eval "test \"\${$as_var+set}\" = set"; }; then : $as_echo_n "(cached) " >&6 else ac_ext=f @@ -25364,10 +25364,10 @@ fi fi if test "${GXX}" != yes; then - ac_safe=`$as_echo "-OPT:IEEE_NaN_inf=ON" | $as_tr_sh` + ac_safe=_OPT_IEEE_NaN_inf_ON { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${CXX-c++} accepts -OPT:IEEE_NaN_inf=ON" >&5 $as_echo_n "checking whether ${CXX-c++} accepts -OPT:IEEE_NaN_inf=ON... " >&6; } -if eval "test \"\${r_cv_prog_cxx_flag_${ac_safe}+set}\"" = set; then : +if { as_var=r_cv_prog_cxx_flag_${ac_safe}; eval "test \"\${$as_var+set}\" = set"; }; then : $as_echo_n "(cached) " >&6 else ac_ext=cpp @@ -26040,7 +26040,7 @@ if test -z "${CPICFLAGS}"; then *) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: I could not determine CPICFLAGS." >&5 $as_echo "$as_me: WARNING: I could not determine CPICFLAGS." >&2;} - as_fn_error $? "See the file doc/html/R-admin.html for more information." "$LINENO" 5 + as_fn_error "See the file doc/html/R-admin.html for more information." "$LINENO" 5 ;; esac fi @@ -26053,7 +26053,7 @@ if test -z "${FPICFLAGS}"; then *) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: I could not determine FPICFLAGS." >&5 $as_echo "$as_me: WARNING: I could not determine FPICFLAGS." >&2;} - as_fn_error $? "See the file doc/html/R-admin.html for more information." "$LINENO" 5 + as_fn_error "See the file doc/html/R-admin.html for more information." "$LINENO" 5 ;; esac fi @@ -26085,7 +26085,7 @@ fi if test -z "${SHLIB_LDFLAGS}"; then { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: I could not determine SHLIB_LDFLAGS." >&5 $as_echo "$as_me: WARNING: I could not determine SHLIB_LDFLAGS." >&2;} - as_fn_error $? "See the file doc/html/R-admin.html for more information." "$LINENO" 5 + as_fn_error "See the file doc/html/R-admin.html for more information." "$LINENO" 5 fi if test -z "${SHLIB_CXXLD}"; then @@ -26459,7 +26459,8 @@ if test $ac_cv_os_cray = yes; then for ac_func in _getb67 GETB67 getb67; do as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" -if eval test \"x\$"$as_ac_var"\" = x"yes"; then : +eval as_val=\$$as_ac_var + if test "x$as_val" = x""yes; then : cat >>confdefs.h <<_ACEOF #define CRAY_STACKSEG_END $ac_func @@ -26549,7 +26550,7 @@ do as_ac_Symbol=`$as_echo "ac_cv_have_decl_$ac_func" | $as_tr_sh` { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $ac_func exists and is declared" >&5 $as_echo_n "checking whether $ac_func exists and is declared... " >&6; } -if eval "test \"\${$as_ac_Symbol+set}\"" = set; then : +if { as_var=$as_ac_Symbol; eval "test \"\${$as_var+set}\" = set"; }; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -26600,7 +26601,7 @@ do as_ac_Symbol=`$as_echo "ac_cv_have_decl_$ac_func" | $as_tr_sh` { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $ac_func exists and is declared" >&5 $as_echo_n "checking whether $ac_func exists and is declared... " >&6; } -if eval "test \"\${$as_ac_Symbol+set}\"" = set; then : +if { as_var=$as_ac_Symbol; eval "test \"\${$as_var+set}\" = set"; }; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -26646,7 +26647,7 @@ fi done if test "${ac_cv_have_decl_va_copy}" = "no"; then - as_fn_error $? "Building R requires the 'va_copy' system call" "$LINENO" 5 + as_fn_error "Building R requires the 'va_copy' system call" "$LINENO" 5 fi ## isblank should be a macro according to C99. It was missing on Solaris 8 for ac_func in isblank @@ -26667,7 +26668,8 @@ for ac_func in fseeko ftello matherr do : as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" -if eval test \"x\$"$as_ac_var"\" = x"yes"; then : +eval as_val=\$$as_ac_var + if test "x$as_val" = x""yes; then : cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 _ACEOF @@ -26682,7 +26684,7 @@ do as_ac_Symbol=`$as_echo "ac_cv_have_decl_$ac_func" | $as_tr_sh` { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $ac_func exists and is declared" >&5 $as_echo_n "checking whether $ac_func exists and is declared... " >&6; } -if eval "test \"\${$as_ac_Symbol+set}\"" = set; then : +if { as_var=$as_ac_Symbol; eval "test \"\${$as_var+set}\" = set"; }; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -26732,7 +26734,7 @@ do as_ac_Symbol=`$as_echo "ac_cv_have_decl_$ac_func" | $as_tr_sh` { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $ac_func exists and is declared" >&5 $as_echo_n "checking whether $ac_func exists and is declared... " >&6; } -if eval "test \"\${$as_ac_Symbol+set}\"" = set; then : +if { as_var=$as_ac_Symbol; eval "test \"\${$as_var+set}\" = set"; }; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -26782,7 +26784,7 @@ do as_ac_Symbol=`$as_echo "ac_cv_have_decl_$ac_func" | $as_tr_sh` { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $ac_func exists and is declared" >&5 $as_echo_n "checking whether $ac_func exists and is declared... " >&6; } -if eval "test \"\${$as_ac_Symbol+set}\"" = set; then : +if { as_var=$as_ac_Symbol; eval "test \"\${$as_var+set}\" = set"; }; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -26832,7 +26834,7 @@ do as_ac_Symbol=`$as_echo "ac_cv_have_decl_$ac_func" | $as_tr_sh` { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $ac_func exists and is declared" >&5 $as_echo_n "checking whether $ac_func exists and is declared... " >&6; } -if eval "test \"\${$as_ac_Symbol+set}\"" = set; then : +if { as_var=$as_ac_Symbol; eval "test \"\${$as_var+set}\" = set"; }; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -26882,7 +26884,7 @@ do as_ac_Symbol=`$as_echo "ac_cv_have_decl_$ac_func" | $as_tr_sh` { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $ac_func exists and is declared" >&5 $as_echo_n "checking whether $ac_func exists and is declared... " >&6; } -if eval "test \"\${$as_ac_Symbol+set}\"" = set; then : +if { as_var=$as_ac_Symbol; eval "test \"\${$as_var+set}\" = set"; }; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -26928,7 +26930,7 @@ fi done if test "${ac_cv_have_decl_popen}" = "no"; then - as_fn_error $? "Building R requires the 'popen' system call" "$LINENO" 5 + as_fn_error "Building R requires the 'popen' system call" "$LINENO" 5 fi ## Windows has neither setenv nor unsetenv for ac_func in setenv unsetenv @@ -26936,7 +26938,7 @@ do as_ac_Symbol=`$as_echo "ac_cv_have_decl_$ac_func" | $as_tr_sh` { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $ac_func exists and is declared" >&5 $as_echo_n "checking whether $ac_func exists and is declared... " >&6; } -if eval "test \"\${$as_ac_Symbol+set}\"" = set; then : +if { as_var=$as_ac_Symbol; eval "test \"\${$as_var+set}\" = set"; }; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -26986,7 +26988,7 @@ do as_ac_Symbol=`$as_echo "ac_cv_have_decl_$ac_func" | $as_tr_sh` { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $ac_func exists and is declared" >&5 $as_echo_n "checking whether $ac_func exists and is declared... " >&6; } -if eval "test \"\${$as_ac_Symbol+set}\"" = set; then : +if { as_var=$as_ac_Symbol; eval "test \"\${$as_var+set}\" = set"; }; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -27036,7 +27038,7 @@ do as_ac_Symbol=`$as_echo "ac_cv_have_decl_$ac_func" | $as_tr_sh` { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $ac_func exists and is declared" >&5 $as_echo_n "checking whether $ac_func exists and is declared... " >&6; } -if eval "test \"\${$as_ac_Symbol+set}\"" = set; then : +if { as_var=$as_ac_Symbol; eval "test \"\${$as_var+set}\" = set"; }; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -27082,14 +27084,14 @@ fi done if test "${ac_cv_have_decl_stat}" = "no"; then - as_fn_error $? "Building R requires the 'stat' system call" "$LINENO" 5 + as_fn_error "Building R requires the 'stat' system call" "$LINENO" 5 fi for ac_func in gettimeofday utimes do as_ac_Symbol=`$as_echo "ac_cv_have_decl_$ac_func" | $as_tr_sh` { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $ac_func exists and is declared" >&5 $as_echo_n "checking whether $ac_func exists and is declared... " >&6; } -if eval "test \"\${$as_ac_Symbol+set}\"" = set; then : +if { as_var=$as_ac_Symbol; eval "test \"\${$as_var+set}\" = set"; }; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -27139,7 +27141,7 @@ do as_ac_Symbol=`$as_echo "ac_cv_have_decl_$ac_func" | $as_tr_sh` { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $ac_func exists and is declared" >&5 $as_echo_n "checking whether $ac_func exists and is declared... " >&6; } -if eval "test \"\${$as_ac_Symbol+set}\"" = set; then : +if { as_var=$as_ac_Symbol; eval "test \"\${$as_var+set}\" = set"; }; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -27189,7 +27191,7 @@ do as_ac_Symbol=`$as_echo "ac_cv_have_decl_$ac_func" | $as_tr_sh` { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $ac_func exists and is declared" >&5 $as_echo_n "checking whether $ac_func exists and is declared... " >&6; } -if eval "test \"\${$as_ac_Symbol+set}\"" = set; then : +if { as_var=$as_ac_Symbol; eval "test \"\${$as_var+set}\" = set"; }; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -27242,7 +27244,7 @@ do as_ac_Symbol=`$as_echo "ac_cv_have_decl_$ac_func" | $as_tr_sh` { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $ac_func exists and is declared" >&5 $as_echo_n "checking whether $ac_func exists and is declared... " >&6; } -if eval "test \"\${$as_ac_Symbol+set}\"" = set; then : +if { as_var=$as_ac_Symbol; eval "test \"\${$as_var+set}\" = set"; }; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -27295,7 +27297,7 @@ do as_ac_Symbol=`$as_echo "ac_cv_have_decl_$ac_func" | $as_tr_sh` { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $ac_func exists and is declared" >&5 $as_echo_n "checking whether $ac_func exists and is declared... " >&6; } -if eval "test \"\${$as_ac_Symbol+set}\"" = set; then : +if { as_var=$as_ac_Symbol; eval "test \"\${$as_var+set}\" = set"; }; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -27492,7 +27494,7 @@ do as_ac_Symbol=`$as_echo "ac_cv_have_decl_$ac_func" | $as_tr_sh` { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $ac_func exists and is declared" >&5 $as_echo_n "checking whether $ac_func exists and is declared... " >&6; } -if eval "test \"\${$as_ac_Symbol+set}\"" = set; then : +if { as_var=$as_ac_Symbol; eval "test \"\${$as_var+set}\" = set"; }; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -27548,19 +27550,19 @@ case "${host_os}" in ;; *) if test "${ac_cv_search_glob}" = "no"; then - as_fn_error $? "Building R requires the 'glob' system call" "$LINENO" 5 + as_fn_error "Building R requires the 'glob' system call" "$LINENO" 5 fi if test "${ac_cv_search_access}" = "no"; then - as_fn_error $? "Building R requires the 'access' system call" "$LINENO" 5 + as_fn_error "Building R requires the 'access' system call" "$LINENO" 5 fi if test "${ac_cv_search_getcwd}" = "no"; then - as_fn_error $? "Building R requires the 'getcwd' system call" "$LINENO" 5 + as_fn_error "Building R requires the 'getcwd' system call" "$LINENO" 5 fi if test "${ac_cv_search_chdir}" = "no"; then - as_fn_error $? "Building R requires the 'chdir' system call" "$LINENO" 5 + as_fn_error "Building R requires the 'chdir' system call" "$LINENO" 5 fi if test "${ac_cv_search_times}" = "no"; then - as_fn_error $? "Building R requires the 'times' system call" "$LINENO" 5 + as_fn_error "Building R requires the 'times' system call" "$LINENO" 5 fi ;; esac @@ -27632,7 +27634,7 @@ if test "${r_cv_ieee_754}" = yes; then $as_echo "#define IEEE_754 1" >>confdefs.h else - as_fn_error $? "IEEE 754 floating-point arithmetic is required" "$LINENO" 5 + as_fn_error "IEEE 754 floating-point arithmetic is required" "$LINENO" 5 fi @@ -27813,44 +27815,25 @@ fi ## Do we need substitutes? ## mkdtemp is not on Solaris, added in POSIX 2008 ## strdup strncasecmp were first required in POSIX 2008. -ac_fn_c_check_func "$LINENO" "mkdtemp" "ac_cv_func_mkdtemp" -if test "x$ac_cv_func_mkdtemp" = x""yes; then : - $as_echo "#define HAVE_MKDTEMP 1" >>confdefs.h - -else - case " $LIBOBJS " in - *" mkdtemp.$ac_objext "* ) ;; - *) LIBOBJS="$LIBOBJS mkdtemp.$ac_objext" - ;; -esac - -fi - -ac_fn_c_check_func "$LINENO" "strdup" "ac_cv_func_strdup" -if test "x$ac_cv_func_strdup" = x""yes; then : - $as_echo "#define HAVE_STRDUP 1" >>confdefs.h - -else - case " $LIBOBJS " in - *" strdup.$ac_objext "* ) ;; - *) LIBOBJS="$LIBOBJS strdup.$ac_objext" - ;; -esac - -fi - -ac_fn_c_check_func "$LINENO" "strncasecmp" "ac_cv_func_strncasecmp" -if test "x$ac_cv_func_strncasecmp" = x""yes; then : - $as_echo "#define HAVE_STRNCASECMP 1" >>confdefs.h +for ac_func in mkdtemp strdup strncasecmp +do : + as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` +ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" +eval as_val=\$$as_ac_var + if test "x$as_val" = x""yes; then : + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 +_ACEOF else case " $LIBOBJS " in - *" strncasecmp.$ac_objext "* ) ;; - *) LIBOBJS="$LIBOBJS strncasecmp.$ac_objext" + *" $ac_func.$ac_objext "* ) ;; + *) LIBOBJS="$LIBOBJS $ac_func.$ac_objext" ;; esac fi +done ## Enable declarations in Defn.h? @@ -28435,7 +28418,7 @@ fi fi if test "${r_cv_c99_complex}" = "no"; then - as_fn_error $? "Support for C99 double complex type is required." "$LINENO" 5 + as_fn_error "Support for C99 double complex type is required." "$LINENO" 5 fi fi @@ -28447,7 +28430,7 @@ do as_ac_Symbol=`$as_echo "ac_cv_have_decl_$ac_func" | $as_tr_sh` { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $ac_func exists and is declared" >&5 $as_echo_n "checking whether $ac_func exists and is declared... " >&6; } -if eval "test \"\${$as_ac_Symbol+set}\"" = set; then : +if { as_var=$as_ac_Symbol; eval "test \"\${$as_var+set}\" = set"; }; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -28627,7 +28610,8 @@ fi if test "${acx_blas_ok}" = no; then as_ac_var=`$as_echo "ac_cv_func_${dgemm}" | $as_tr_sh` ac_fn_c_check_func "$LINENO" "${dgemm}" "$as_ac_var" -if eval test \"x\$"$as_ac_var"\" = x"yes"; then : +eval as_val=\$$as_ac_var + if test "x$as_val" = x""yes; then : acx_blas_ok=yes fi @@ -28682,7 +28666,7 @@ if test "x$ac_cv_lib_atlas_ATL_xerbla" = x""yes; then : as_ac_Lib=`$as_echo "ac_cv_lib_f77blas_${dgemm}" | $as_tr_sh` { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${dgemm} in -lf77blas" >&5 $as_echo_n "checking for ${dgemm} in -lf77blas... " >&6; } -if eval "test \"\${$as_ac_Lib+set}\"" = set; then : +if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -28725,7 +28709,8 @@ fi eval ac_res=\$$as_ac_Lib { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 $as_echo "$ac_res" >&6; } -if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : +eval as_val=\$$as_ac_Lib + if test "x$as_val" = x""yes; then : acx_blas_ok=yes BLAS_LIBS="-lf77blas -latlas" fi @@ -28738,7 +28723,7 @@ if test "${acx_blas_ok}" = no; then as_ac_Lib=`$as_echo "ac_cv_lib_blas_${dgemm}" | $as_tr_sh` { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${dgemm} in -lblas" >&5 $as_echo_n "checking for ${dgemm} in -lblas... " >&6; } -if eval "test \"\${$as_ac_Lib+set}\"" = set; then : +if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -28781,11 +28766,12 @@ fi eval ac_res=\$$as_ac_Lib { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 $as_echo "$ac_res" >&6; } -if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : +eval as_val=\$$as_ac_Lib + if test "x$as_val" = x""yes; then : as_ac_Lib=`$as_echo "ac_cv_lib_dgemm_$dgemm" | $as_tr_sh` { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $dgemm in -ldgemm" >&5 $as_echo_n "checking for $dgemm in -ldgemm... " >&6; } -if eval "test \"\${$as_ac_Lib+set}\"" = set; then : +if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -28828,11 +28814,12 @@ fi eval ac_res=\$$as_ac_Lib { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 $as_echo "$ac_res" >&6; } -if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : +eval as_val=\$$as_ac_Lib + if test "x$as_val" = x""yes; then : as_ac_Lib=`$as_echo "ac_cv_lib_sgemm_${sgemm}" | $as_tr_sh` { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${sgemm} in -lsgemm" >&5 $as_echo_n "checking for ${sgemm} in -lsgemm... " >&6; } -if eval "test \"\${$as_ac_Lib+set}\"" = set; then : +if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -28875,7 +28862,8 @@ fi eval ac_res=\$$as_ac_Lib { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 $as_echo "$ac_res" >&6; } -if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : +eval as_val=\$$as_ac_Lib + if test "x$as_val" = x""yes; then : acx_blas_ok=yes BLAS_LIBS="-lsgemm -ldgemm -lblas" fi @@ -28943,7 +28931,7 @@ if test "${acx_blas_ok}" = no; then as_ac_Lib=`$as_echo "ac_cv_lib_blas_${dgemm}" | $as_tr_sh` { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${dgemm} in -lblas" >&5 $as_echo_n "checking for ${dgemm} in -lblas... " >&6; } -if eval "test \"\${$as_ac_Lib+set}\"" = set; then : +if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -28986,11 +28974,12 @@ fi eval ac_res=\$$as_ac_Lib { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 $as_echo "$ac_res" >&6; } -if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : +eval as_val=\$$as_ac_Lib + if test "x$as_val" = x""yes; then : as_ac_Lib=`$as_echo "ac_cv_lib_essl_${dgemm}" | $as_tr_sh` { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${dgemm} in -lessl" >&5 $as_echo_n "checking for ${dgemm} in -lessl... " >&6; } -if eval "test \"\${$as_ac_Lib+set}\"" = set; then : +if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -29033,7 +29022,8 @@ fi eval ac_res=\$$as_ac_Lib { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 $as_echo "$ac_res" >&6; } -if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : +eval as_val=\$$as_ac_Lib + if test "x$as_val" = x""yes; then : acx_blas_ok=yes BLAS_LIBS="-lessl -lblas" fi @@ -29046,7 +29036,7 @@ if test "${acx_blas_ok}" = no; then as_ac_Lib=`$as_echo "ac_cv_lib_blas_${dgemm}" | $as_tr_sh` { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${dgemm} in -lblas" >&5 $as_echo_n "checking for ${dgemm} in -lblas... " >&6; } -if eval "test \"\${$as_ac_Lib+set}\"" = set; then : +if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -29089,7 +29079,8 @@ fi eval ac_res=\$$as_ac_Lib { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 $as_echo "$ac_res" >&6; } -if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : +eval as_val=\$$as_ac_Lib + if test "x$as_val" = x""yes; then : acx_blas_ok=yes; BLAS_LIBS="-lblas" fi @@ -29441,7 +29432,7 @@ BLAS_LIBS0="${BLAS_LIBS} ${ac_test_BLAS_LIBS}" else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } -as_fn_error $? "Cannot build Rblas shared library such that it makes external BLAS visible. +as_fn_error "Cannot build Rblas shared library such that it makes external BLAS visible. An alternative is to use internal BLAS instead and replace libRblas.dylib with the external BLAS library after R is built." "$LINENO" 5 fi @@ -29509,7 +29500,8 @@ LIBS="${BLAS_LIBS} ${FLIBS} ${LIBS}" if test "${acx_lapack_ok}" = no; then as_ac_var=`$as_echo "ac_cv_func_${zgeev}" | $as_tr_sh` ac_fn_c_check_func "$LINENO" "${zgeev}" "$as_ac_var" -if eval test \"x\$"$as_ac_var"\" = x"yes"; then : +eval as_val=\$$as_ac_var + if test "x$as_val" = x""yes; then : acx_lapack_ok=yes fi @@ -29564,7 +29556,7 @@ if test "${acx_lapack_ok}" = no; then as_ac_Lib=`$as_echo "ac_cv_lib_lapack_${zgeev}" | $as_tr_sh` { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${zgeev} in -llapack" >&5 $as_echo_n "checking for ${zgeev} in -llapack... " >&6; } -if eval "test \"\${$as_ac_Lib+set}\"" = set; then : +if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -29607,7 +29599,8 @@ fi eval ac_res=\$$as_ac_Lib { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 $as_echo "$ac_res" >&6; } -if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : +eval as_val=\$$as_ac_Lib + if test "x$as_val" = x""yes; then : acx_lapack_ok=yes; LAPACK_LIBS="-llapack" fi @@ -29816,7 +29809,7 @@ $as_echo "$r_cv_iconv_latin1" >&6; } ;; esac if test "$r_cv_iconv_latin1" != yes; then - as_fn_error $? "a suitable iconv is essential" "$LINENO" 5 + as_fn_error "a suitable iconv is essential" "$LINENO" 5 fi fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for iconvlist" >&5 @@ -30050,7 +30043,8 @@ for ac_header in wchar.h wctype.h do : as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" -if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : +eval as_val=\$$as_ac_Header + if test "x$as_val" = x""yes; then : cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF @@ -30072,7 +30066,7 @@ do as_ac_Symbol=`$as_echo "ac_cv_have_decl_$ac_func" | $as_tr_sh` { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $ac_func exists and is declared" >&5 $as_echo_n "checking whether $ac_func exists and is declared... " >&6; } -if eval "test \"\${$as_ac_Symbol+set}\"" = set; then : +if { as_var=$as_ac_Symbol; eval "test \"\${$as_var+set}\" = set"; }; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -30122,7 +30116,7 @@ do as_ac_Symbol=`$as_echo "ac_cv_have_decl_$ac_func" | $as_tr_sh` { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $ac_func exists and is declared" >&5 $as_echo_n "checking whether $ac_func exists and is declared... " >&6; } -if eval "test \"\${$as_ac_Symbol+set}\"" = set; then : +if { as_var=$as_ac_Symbol; eval "test \"\${$as_var+set}\" = set"; }; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -30172,7 +30166,7 @@ do as_ac_Symbol=`$as_echo "ac_cv_have_decl_$ac_func" | $as_tr_sh` { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $ac_func exists and is declared" >&5 $as_echo_n "checking whether $ac_func exists and is declared... " >&6; } -if eval "test \"\${$as_ac_Symbol+set}\"" = set; then : +if { as_var=$as_ac_Symbol; eval "test \"\${$as_var+set}\" = set"; }; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -30260,7 +30254,7 @@ fi fi fi if test "x${want_mbcs_support}" != xyes; then -as_fn_error $? "Support for MBCS locales is required." "$LINENO" 5 +as_fn_error "Support for MBCS locales is required." "$LINENO" 5 fi @@ -30380,7 +30374,7 @@ _ACEOF LIBS="-licucore $LIBS" else - as_fn_error $? "library 'icucore' is required for ICU" "$LINENO" 5 + as_fn_error "library 'icucore' is required for ICU" "$LINENO" 5 fi @@ -30413,7 +30407,7 @@ if test "x$with_x" = xno; then have_x=disabled else case $x_includes,$x_libraries in #( - *\'*) as_fn_error $? "cannot use X directory names containing '" "$LINENO" 5;; #( + *\'*) as_fn_error "cannot use X directory names containing '" "$LINENO" 5;; #( *,NONE | NONE,*) if test "${ac_cv_have_x+set}" = set; then : $as_echo_n "(cached) " >&6 else @@ -30431,7 +30425,7 @@ libdir: @echo libdir='${LIBDIR}' _ACEOF if (export CC; ${XMKMF-xmkmf}) >/dev/null 2>/dev/null && test -f Makefile; then - # GNU make sometimes prints "make[1]: Entering ...", which would confuse us. + # GNU make sometimes prints "make[1]: Entering...", which would confuse us. for ac_var in incroot usrlibdir libdir; do eval "ac_im_$ac_var=\`\${MAKE-make} $ac_var 2>/dev/null | sed -n 's/^$ac_var=//p'\`" done @@ -31252,7 +31246,7 @@ $as_echo "#define HAVE_X11 1" >>confdefs.h X_LIBS="${X_LIBS} -lX11 -lXt" else if test "x${with_x}" != "xno"; then - as_fn_error $? "--with-x=yes (default) and X11 headers/libs are not available" "$LINENO" 5 + as_fn_error "--with-x=yes (default) and X11 headers/libs are not available" "$LINENO" 5 fi fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: using X11 ... ${use_X11}" >&5 @@ -31924,7 +31918,8 @@ fi ${TCL_PREFIX}/include; do as_ac_Header=`$as_echo "ac_cv_header_${dir}/tcl.h" | $as_tr_sh` ac_fn_c_check_header_mongrel "$LINENO" "${dir}/tcl.h" "$as_ac_Header" "$ac_includes_default" -if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : +eval as_val=\$$as_ac_Header + if test "x$as_val" = x""yes; then : TCLTK_CPPFLAGS="-I${dir}" found_tcl_h=yes break @@ -32010,7 +32005,8 @@ fi ${TK_PREFIX}/include; do as_ac_Header=`$as_echo "ac_cv_header_${dir}/tk.h" | $as_tr_sh` ac_fn_c_check_header_mongrel "$LINENO" "${dir}/tk.h" "$as_ac_Header" "$ac_includes_default" -if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : +eval as_val=\$$as_ac_Header + if test "x$as_val" = x""yes; then : TCLTK_CPPFLAGS="${TCLTK_CPPFLAGS} -I${dir}" found_tk_h=yes break @@ -33259,7 +33255,8 @@ fi do : as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" -if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : +eval as_val=\$$as_ac_Header + if test "x$as_val" = x""yes; then : cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF @@ -33443,7 +33440,8 @@ do : as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default " -if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : +eval as_val=\$$as_ac_Header + if test "x$as_val" = x""yes; then : cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF @@ -34591,7 +34589,7 @@ else if test "${acx_java_uses_custom_flags}" = yes; then r_cv_jni=no - as_fn_error $? "Failed to compile a JNI program with custom JAVA_LIBS/JAVA_CPPFLAGS. + as_fn_error "Failed to compile a JNI program with custom JAVA_LIBS/JAVA_CPPFLAGS. See config.log for details. Do NOT set JAVA_LIBS/JAVA_CPPFLAGS unless you are sure they are correct! Java/JNI support is optional unless you set either JAVA_LIBS or JAVA_CPPFLAGS." "$LINENO" 5 @@ -34673,7 +34671,7 @@ ac_compile='$FC -c $FCFLAGS $ac_fcflags_srcext conftest.$ac_ext >&5' ac_link='$FC -o conftest$ac_exeext $FCFLAGS $LDFLAGS $ac_fcflags_srcext conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_fc_compiler_gnu if test -n "$ac_tool_prefix"; then - for ac_prog in gfortran g95 xlf95 f95 fort ifort ifc efc pgfortran pgf95 lf95 ftn xlf90 f90 pgf90 pghpf epcf90 g77 xlf f77 frt pgf77 cf77 fort77 fl32 af77 + for ac_prog in gfortran g95 xlf95 f95 fort ifort ifc efc pgf95 lf95 ftn xlf90 f90 pgf90 pghpf epcf90 g77 xlf f77 frt pgf77 cf77 fort77 fl32 af77 do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. set dummy $ac_tool_prefix$ac_prog; ac_word=$2 @@ -34717,7 +34715,7 @@ fi fi if test -z "$FC"; then ac_ct_FC=$FC - for ac_prog in gfortran g95 xlf95 f95 fort ifort ifc efc pgfortran pgf95 lf95 ftn xlf90 f90 pgf90 pghpf epcf90 g77 xlf f77 frt pgf77 cf77 fort77 fl32 af77 + for ac_prog in gfortran g95 xlf95 f95 fort ifort ifc efc pgf95 lf95 ftn xlf90 f90 pgf90 pghpf epcf90 g77 xlf f77 frt pgf77 cf77 fort77 fl32 af77 do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 @@ -34880,7 +34878,7 @@ ac_compile='$FC -c $FCFLAGS $ac_fcflags_srcext conftest.$ac_ext >&5' ac_link='$FC -o conftest$ac_exeext $FCFLAGS $LDFLAGS $ac_fcflags_srcext conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_fc_compiler_gnu if test -n "$ac_tool_prefix"; then - for ac_prog in gfortran g95 xlf95 f95 fort ifort ifc efc pgfortran pgf95 lf95 ftn xlf90 f90 pgf90 pghpf epcf90 g77 xlf f77 frt pgf77 cf77 fort77 fl32 af77 + for ac_prog in gfortran g95 xlf95 f95 fort ifort ifc efc pgf95 lf95 ftn xlf90 f90 pgf90 pghpf epcf90 g77 xlf f77 frt pgf77 cf77 fort77 fl32 af77 do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. set dummy $ac_tool_prefix$ac_prog; ac_word=$2 @@ -34924,7 +34922,7 @@ fi fi if test -z "$FC"; then ac_ct_FC=$FC - for ac_prog in gfortran g95 xlf95 f95 fort ifort ifc efc pgfortran pgf95 lf95 ftn xlf90 f90 pgf90 pghpf epcf90 g77 xlf f77 frt pgf77 cf77 fort77 fl32 af77 + for ac_prog in gfortran g95 xlf95 f95 fort ifort ifc efc pgf95 lf95 ftn xlf90 f90 pgf90 pghpf epcf90 g77 xlf f77 frt pgf77 cf77 fort77 fl32 af77 do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 @@ -35660,11 +35658,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:35663: $lt_compile\"" >&5) + (eval echo "\"\$as_me:35661: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:35667: \$? = $ac_status" >&5 + echo "$as_me:35665: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -35759,11 +35757,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:35762: $lt_compile\"" >&5) + (eval echo "\"\$as_me:35760: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:35766: \$? = $ac_status" >&5 + echo "$as_me:35764: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -35811,11 +35809,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:35814: $lt_compile\"" >&5) + (eval echo "\"\$as_me:35812: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:35818: \$? = $ac_status" >&5 + echo "$as_me:35816: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -38095,7 +38093,7 @@ fi $as_echo "$r_cv_misc_recommended_packages" >&6; } use_recommended_packages=${r_cv_misc_recommended_packages} if test "x${r_cv_misc_recommended_packages}" = xno; then - as_fn_error $? "Some of the recommended packages are missing + as_fn_error "Some of the recommended packages are missing Use --without-recommended-packages if this was intentional" "$LINENO" 5 fi @@ -38133,7 +38131,7 @@ if test "${USE_NLS}" = "yes"; then $as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; } set x ${MAKE-make} ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` -if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\"" = set; then : +if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then : $as_echo_n "(cached) " >&6 else cat >conftest.make <<\_ACEOF @@ -38141,7 +38139,7 @@ SHELL = /bin/sh all: @echo '@@@%%%=$(MAKE)=@@@%%%' _ACEOF -# GNU make sometimes prints "make[1]: Entering ...", which would confuse us. +# GNU make sometimes prints "make[1]: Entering...", which would confuse us. case `${MAKE-make} -f conftest.make 2>/dev/null` in *@@@%%%=?*=@@@%%%*) eval ac_cv_prog_make_${ac_make}_set=yes;; @@ -38813,7 +38811,6 @@ int main () { char *data, *data2, *data3; - const char *cdata2; int i, pagesize; int fd, fd2; @@ -38838,10 +38835,10 @@ main () fd2 = open ("conftest.txt", O_RDWR | O_CREAT | O_TRUNC, 0600); if (fd2 < 0) return 4; - cdata2 = ""; - if (write (fd2, cdata2, 1) != 1) + data2 = ""; + if (write (fd2, data2, 1) != 1) return 5; - data2 = (char *) mmap (0, pagesize, PROT_READ | PROT_WRITE, MAP_SHARED, fd2, 0L); + data2 = mmap (0, pagesize, PROT_READ | PROT_WRITE, MAP_SHARED, fd2, 0L); if (data2 == MAP_FAILED) return 6; for (i = 0; i < pagesize; ++i) @@ -40122,7 +40119,8 @@ rm -f core conftest.err conftest.$ac_objext \ do : as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" -if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : +eval as_val=\$$as_ac_Header + if test "x$as_val" = x""yes; then : cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF @@ -40137,7 +40135,8 @@ done do : as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" -if eval test \"x\$"$as_ac_var"\" = x"yes"; then : +eval as_val=\$$as_ac_var + if test "x$as_val" = x""yes; then : cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 _ACEOF @@ -41087,7 +41086,8 @@ fi do : as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" -if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : +eval as_val=\$$as_ac_Header + if test "x$as_val" = x""yes; then : cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF @@ -41100,7 +41100,8 @@ done do : as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" -if eval test \"x\$"$as_ac_var"\" = x"yes"; then : +eval as_val=\$$as_ac_var + if test "x$as_val" = x""yes; then : cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 _ACEOF @@ -41573,7 +41574,7 @@ typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1]; { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU gettext in libc" >&5 $as_echo_n "checking for GNU gettext in libc... " >&6; } -if eval "test \"\${$gt_func_gnugettext_libc+set}\"" = set; then : +if { as_var=$gt_func_gnugettext_libc; eval "test \"\${$as_var+set}\" = set"; }; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -41993,7 +41994,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU gettext in libintl" >&5 $as_echo_n "checking for GNU gettext in libintl... " >&6; } -if eval "test \"\${$gt_func_gnugettext_libintl+set}\"" = set; then : +if { as_var=$gt_func_gnugettext_libintl; eval "test \"\${$as_var+set}\" = set"; }; then : $as_echo_n "(cached) " >&6 else gt_save_CPPFLAGS="$CPPFLAGS" @@ -42330,7 +42331,7 @@ esac ac_config_headers="$ac_config_headers src/include/config.h" -ac_config_files="$ac_config_files Makeconf Makefile doc/Makefile doc/html/Makefile doc/manual/Makefile etc/Makefile etc/Makeconf etc/Renviron etc/ldpaths m4/Makefile po/Makefile.in share/Makefile src/Makefile src/appl/Makefile src/extra/Makefile src/extra/blas/Makefile src/extra/bzip2/Makefile src/extra/intl/Makefile src/extra/pcre/Makefile src/extra/tre/Makefile src/extra/xdr/Makefile src/extra/xz/Makefile src/extra/zlib/Makefile src/include/Makefile src/include/Rmath.h0 src/include/R_ext/Makefile src/library/Recommended/Makefile src/library/Makefile src/library/base/DESCRIPTION src/library/base/Makefile src/library/compiler/DESCRIPTION src/library/compiler/Makefile src/library/datasets/DESCRIPTION src/library/datasets/Makefile src/library/graphics/DESCRIPTION src/library/graphics/Makefile src/library/grDevices/DESCRIPTION src/library/grDevices/Makefile src/library/grDevices/src/Makefile src/library/grDevices/src/cairo/Makefile src/library/grid/DESCRIPTION src/library/grid/Makefile src/library/grid/src/Makefile src/library/methods/DESCRIPTION src/library/methods/Makefile src/library/methods/src/Makefile src/library/profile/Makefile src/library/stats/DESCRIPTION src/library/stats/Makefile src/library/stats/src/Makefile src/library/stats4/DESCRIPTION src/library/stats4/Makefile src/library/splines/DESCRIPTION src/library/splines/Makefile src/library/splines/src/Makefile src/library/tcltk/DESCRIPTION src/library/tcltk/Makefile src/library/tcltk/src/Makefile src/library/tools/DESCRIPTION src/library/tools/Makefile src/library/tools/src/Makefile src/library/utils/DESCRIPTION src/library/utils/Makefile src/main/Makefile src/modules/Makefile src/modules/X11/Makefile src/modules/internet/Makefile src/modules/lapack/Makefile src/modules/vfonts/Makefile src/nmath/Makefile src/nmath/standalone/Makefile src/scripts/Makefile src/scripts/R.sh src/scripts/Rcmd src/scripts/f77_f2c src/scripts/mkinstalldirs src/scripts/pager src/unix/Makefile tests/Makefile tests/Embedding/Makefile tests/Examples/Makefile tests/Native/Makefile tools/Makefile" +ac_config_files="$ac_config_files Makeconf Makefile doc/Makefile doc/html/Makefile doc/manual/Makefile etc/Makefile etc/Makeconf etc/Renviron etc/ldpaths m4/Makefile po/Makefile.in share/Makefile src/Makefile src/appl/Makefile src/extra/Makefile src/extra/blas/Makefile src/extra/bzip2/Makefile src/extra/intl/Makefile src/extra/pcre/Makefile src/extra/tre/Makefile src/extra/xdr/Makefile src/extra/xz/Makefile src/extra/zlib/Makefile src/include/Makefile src/include/Rmath.h0 src/include/R_ext/Makefile src/library/Recommended/Makefile src/library/Makefile src/library/base/DESCRIPTION src/library/base/Makefile src/library/compiler/DESCRIPTION src/library/compiler/Makefile src/library/datasets/DESCRIPTION src/library/datasets/Makefile src/library/graphics/DESCRIPTION src/library/graphics/Makefile src/library/grDevices/DESCRIPTION src/library/grDevices/Makefile src/library/grDevices/src/Makefile src/library/grDevices/src/cairo/Makefile src/library/grid/DESCRIPTION src/library/grid/Makefile src/library/grid/src/Makefile src/library/methods/DESCRIPTION src/library/methods/Makefile src/library/methods/src/Makefile src/library/parallel/DESCRIPTION src/library/parallel/Makefile src/library/parallel/src/Makefile src/library/profile/Makefile src/library/stats/DESCRIPTION src/library/stats/Makefile src/library/stats/src/Makefile src/library/stats4/DESCRIPTION src/library/stats4/Makefile src/library/splines/DESCRIPTION src/library/splines/Makefile src/library/splines/src/Makefile src/library/tcltk/DESCRIPTION src/library/tcltk/Makefile src/library/tcltk/src/Makefile src/library/tools/DESCRIPTION src/library/tools/Makefile src/library/tools/src/Makefile src/library/utils/DESCRIPTION src/library/utils/Makefile src/main/Makefile src/modules/Makefile src/modules/X11/Makefile src/modules/internet/Makefile src/modules/lapack/Makefile src/modules/vfonts/Makefile src/nmath/Makefile src/nmath/standalone/Makefile src/scripts/Makefile src/scripts/R.sh src/scripts/Rcmd src/scripts/f77_f2c src/scripts/mkinstalldirs src/scripts/pager src/unix/Makefile tests/Makefile tests/Embedding/Makefile tests/Examples/Makefile tests/Native/Makefile tools/Makefile" ac_config_commands="$ac_config_commands stamp-h" @@ -42425,7 +42426,6 @@ DEFS=-DHAVE_CONFIG_H ac_libobjs= ac_ltlibobjs= -U= for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue # 1. Remove the extension, and $U if already installed. ac_script='s/\$U\././;s/\.o$//;s/\.obj$//' @@ -42441,115 +42441,115 @@ LTLIBOBJS=$ac_ltlibobjs if test -z "${WANT_R_FRAMEWORK_TRUE}" && test -z "${WANT_R_FRAMEWORK_FALSE}"; then - as_fn_error $? "conditional \"WANT_R_FRAMEWORK\" was never defined. + as_fn_error "conditional \"WANT_R_FRAMEWORK\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${WANT_R_SHLIB_TRUE}" && test -z "${WANT_R_SHLIB_FALSE}"; then - as_fn_error $? "conditional \"WANT_R_SHLIB\" was never defined. + as_fn_error "conditional \"WANT_R_SHLIB\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${WANT_R_STATIC_TRUE}" && test -z "${WANT_R_STATIC_FALSE}"; then - as_fn_error $? "conditional \"WANT_R_STATIC\" was never defined. + as_fn_error "conditional \"WANT_R_STATIC\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then - as_fn_error $? "conditional \"MAINTAINER_MODE\" was never defined. + as_fn_error "conditional \"MAINTAINER_MODE\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${BUILD_HTML_TRUE}" && test -z "${BUILD_HTML_FALSE}"; then - as_fn_error $? "conditional \"BUILD_HTML\" was never defined. + as_fn_error "conditional \"BUILD_HTML\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${BYTE_COMPILE_PACKAGES_TRUE}" && test -z "${BYTE_COMPILE_PACKAGES_FALSE}"; then - as_fn_error $? "conditional \"BYTE_COMPILE_PACKAGES\" was never defined. + as_fn_error "conditional \"BYTE_COMPILE_PACKAGES\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${CROSS_COMPILING_TRUE}" && test -z "${CROSS_COMPILING_FALSE}"; then - as_fn_error $? "conditional \"CROSS_COMPILING\" was never defined. + as_fn_error "conditional \"CROSS_COMPILING\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${COMPILE_FORTRAN_DOUBLE_COMPLEX_TRUE}" && test -z "${COMPILE_FORTRAN_DOUBLE_COMPLEX_FALSE}"; then - as_fn_error $? "conditional \"COMPILE_FORTRAN_DOUBLE_COMPLEX\" was never defined. + as_fn_error "conditional \"COMPILE_FORTRAN_DOUBLE_COMPLEX\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${DYLIB_UNDEFINED_ALLOWED_TRUE}" && test -z "${DYLIB_UNDEFINED_ALLOWED_FALSE}"; then - as_fn_error $? "conditional \"DYLIB_UNDEFINED_ALLOWED\" was never defined. + as_fn_error "conditional \"DYLIB_UNDEFINED_ALLOWED\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${BUILD_CYGWIN_TRUE}" && test -z "${BUILD_CYGWIN_FALSE}"; then - as_fn_error $? "conditional \"BUILD_CYGWIN\" was never defined. + as_fn_error "conditional \"BUILD_CYGWIN\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${USE_EXPORTFILES_TRUE}" && test -z "${USE_EXPORTFILES_FALSE}"; then - as_fn_error $? "conditional \"USE_EXPORTFILES\" was never defined. + as_fn_error "conditional \"USE_EXPORTFILES\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${BLAS_SHLIB_TRUE}" && test -z "${BLAS_SHLIB_FALSE}"; then - as_fn_error $? "conditional \"BLAS_SHLIB\" was never defined. + as_fn_error "conditional \"BLAS_SHLIB\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${USE_VECLIB_G95FIX_TRUE}" && test -z "${USE_VECLIB_G95FIX_FALSE}"; then - as_fn_error $? "conditional \"USE_VECLIB_G95FIX\" was never defined. + as_fn_error "conditional \"USE_VECLIB_G95FIX\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${USE_EXTERNAL_BLAS_TRUE}" && test -z "${USE_EXTERNAL_BLAS_FALSE}"; then - as_fn_error $? "conditional \"USE_EXTERNAL_BLAS\" was never defined. + as_fn_error "conditional \"USE_EXTERNAL_BLAS\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${USE_EXTERNAL_LAPACK_TRUE}" && test -z "${USE_EXTERNAL_LAPACK_FALSE}"; then - as_fn_error $? "conditional \"USE_EXTERNAL_LAPACK\" was never defined. + as_fn_error "conditional \"USE_EXTERNAL_LAPACK\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${BUILD_X11_TRUE}" && test -z "${BUILD_X11_FALSE}"; then - as_fn_error $? "conditional \"BUILD_X11\" was never defined. + as_fn_error "conditional \"BUILD_X11\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${BUILD_DEVCAIRO_TRUE}" && test -z "${BUILD_DEVCAIRO_FALSE}"; then - as_fn_error $? "conditional \"BUILD_DEVCAIRO\" was never defined. + as_fn_error "conditional \"BUILD_DEVCAIRO\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${BUILD_AQUA_TRUE}" && test -z "${BUILD_AQUA_FALSE}"; then - as_fn_error $? "conditional \"BUILD_AQUA\" was never defined. + as_fn_error "conditional \"BUILD_AQUA\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${BUILD_XDR_TRUE}" && test -z "${BUILD_XDR_FALSE}"; then - as_fn_error $? "conditional \"BUILD_XDR\" was never defined. + as_fn_error "conditional \"BUILD_XDR\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${BUILD_ZLIB_TRUE}" && test -z "${BUILD_ZLIB_FALSE}"; then - as_fn_error $? "conditional \"BUILD_ZLIB\" was never defined. + as_fn_error "conditional \"BUILD_ZLIB\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${USE_MMAP_ZLIB_TRUE}" && test -z "${USE_MMAP_ZLIB_FALSE}"; then - as_fn_error $? "conditional \"USE_MMAP_ZLIB\" was never defined. + as_fn_error "conditional \"USE_MMAP_ZLIB\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${BUILD_BZLIB_TRUE}" && test -z "${BUILD_BZLIB_FALSE}"; then - as_fn_error $? "conditional \"BUILD_BZLIB\" was never defined. + as_fn_error "conditional \"BUILD_BZLIB\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${BUILD_XZ_TRUE}" && test -z "${BUILD_XZ_FALSE}"; then - as_fn_error $? "conditional \"BUILD_XZ\" was never defined. + as_fn_error "conditional \"BUILD_XZ\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${BUILD_PCRE_TRUE}" && test -z "${BUILD_PCRE_FALSE}"; then - as_fn_error $? "conditional \"BUILD_PCRE\" was never defined. + as_fn_error "conditional \"BUILD_PCRE\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${BUILD_JAVA14_TRUE}" && test -z "${BUILD_JAVA14_FALSE}"; then - as_fn_error $? "conditional \"BUILD_JAVA14\" was never defined. + as_fn_error "conditional \"BUILD_JAVA14\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${USE_RECOMMENDED_PACKAGES_TRUE}" && test -z "${USE_RECOMMENDED_PACKAGES_FALSE}"; then - as_fn_error $? "conditional \"USE_RECOMMENDED_PACKAGES\" was never defined. + as_fn_error "conditional \"USE_RECOMMENDED_PACKAGES\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${USE_NLS_TRUE}" && test -z "${USE_NLS_FALSE}"; then - as_fn_error $? "conditional \"USE_NLS\" was never defined. + as_fn_error "conditional \"USE_NLS\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${BUILD_LIBINTL_TRUE}" && test -z "${BUILD_LIBINTL_FALSE}"; then - as_fn_error $? "conditional \"BUILD_LIBINTL\" was never defined. + as_fn_error "conditional \"BUILD_LIBINTL\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi @@ -42699,19 +42699,19 @@ export LANGUAGE (unset CDPATH) >/dev/null 2>&1 && unset CDPATH -# as_fn_error STATUS ERROR [LINENO LOG_FD] -# ---------------------------------------- +# as_fn_error ERROR [LINENO LOG_FD] +# --------------------------------- # Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are # provided, also output the error to LOG_FD, referencing LINENO. Then exit the -# script with STATUS, using 1 if that was 0. +# script with status $?, using 1 if that was 0. as_fn_error () { - as_status=$1; test $as_status -eq 0 && as_status=1 - if test "$4"; then - as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 + as_status=$?; test $as_status -eq 0 && as_status=1 + if test "$3"; then + as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3 fi - $as_echo "$as_me: error: $2" >&2 + $as_echo "$as_me: error: $1" >&2 as_fn_exit $as_status } # as_fn_error @@ -42907,7 +42907,7 @@ $as_echo X"$as_dir" | test -d "$as_dir" && break done test -z "$as_dirs" || eval "mkdir $as_dirs" - } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir" + } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir" } # as_fn_mkdir_p @@ -42961,7 +42961,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # values after options handling. ac_log=" This file was extended by R $as_me 2.14.0, which was -generated by GNU Autoconf 2.66. Invocation command line was +generated by GNU Autoconf 2.65. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS @@ -43027,10 +43027,10 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ R config.status 2.14.0 -configured by $0, generated by GNU Autoconf 2.66, +configured by $0, generated by GNU Autoconf 2.65, with options \\"\$ac_cs_config\\" -Copyright (C) 2010 Free Software Foundation, Inc. +Copyright (C) 2009 Free Software Foundation, Inc. This config.status script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it." @@ -43086,7 +43086,7 @@ do ac_need_defaults=false;; --he | --h) # Conflict between --help and --header - as_fn_error $? "ambiguous option: \`$1' + as_fn_error "ambiguous option: \`$1' Try \`$0 --help' for more information.";; --help | --hel | -h ) $as_echo "$ac_cs_usage"; exit ;; @@ -43095,7 +43095,7 @@ Try \`$0 --help' for more information.";; ac_cs_silent=: ;; # This is an error. - -*) as_fn_error $? "unrecognized option: \`$1' + -*) as_fn_error "unrecognized option: \`$1' Try \`$0 --help' for more information." ;; *) as_fn_append ac_config_targets " $1" @@ -43723,6 +43723,9 @@ do "src/library/methods/DESCRIPTION") CONFIG_FILES="$CONFIG_FILES src/library/methods/DESCRIPTION" ;; "src/library/methods/Makefile") CONFIG_FILES="$CONFIG_FILES src/library/methods/Makefile" ;; "src/library/methods/src/Makefile") CONFIG_FILES="$CONFIG_FILES src/library/methods/src/Makefile" ;; + "src/library/parallel/DESCRIPTION") CONFIG_FILES="$CONFIG_FILES src/library/parallel/DESCRIPTION" ;; + "src/library/parallel/Makefile") CONFIG_FILES="$CONFIG_FILES src/library/parallel/Makefile" ;; + "src/library/parallel/src/Makefile") CONFIG_FILES="$CONFIG_FILES src/library/parallel/src/Makefile" ;; "src/library/profile/Makefile") CONFIG_FILES="$CONFIG_FILES src/library/profile/Makefile" ;; "src/library/stats/DESCRIPTION") CONFIG_FILES="$CONFIG_FILES src/library/stats/DESCRIPTION" ;; "src/library/stats/Makefile") CONFIG_FILES="$CONFIG_FILES src/library/stats/Makefile" ;; @@ -43762,7 +43765,7 @@ do "tools/Makefile") CONFIG_FILES="$CONFIG_FILES tools/Makefile" ;; "stamp-h") CONFIG_COMMANDS="$CONFIG_COMMANDS stamp-h" ;; - *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; + *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;; esac done @@ -43800,7 +43803,7 @@ $debug || { tmp=./conf$$-$RANDOM (umask 077 && mkdir "$tmp") -} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5 +} || as_fn_error "cannot create a temporary directory in ." "$LINENO" 5 # Set up the scripts for CONFIG_FILES section. # No need to generate them if there are no CONFIG_FILES. @@ -43834,7 +43837,7 @@ if test "x$ac_cr" = x; then fi ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' /dev/null` if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then - ac_cs_awk_cr='\\r' + ac_cs_awk_cr='\r' else ac_cs_awk_cr=$ac_cr fi @@ -43851,7 +43854,7 @@ _ACEOF echo "_ACEOF" } >conf$$files.sh && . ./conf$$files.sh || - as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 + as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5 rm -f conf$$files.sh { @@ -43859,18 +43862,18 @@ rm -f conf$$files.sh echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' && echo "_ACEOF" } >conf$$subs.sh || - as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 -ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'` + as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5 +ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'` ac_delim='%!_!# ' for ac_last_try in false false false false false :; do . ./conf$$subs.sh || - as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 + as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5 ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X` if test $ac_delim_n = $ac_delim_num; then break elif $ac_last_try; then - as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 + as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5 else ac_delim="$ac_delim!$ac_delim _$ac_delim!! " fi @@ -43965,28 +43968,20 @@ if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then else cat fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \ - || as_fn_error $? "could not setup config files machinery" "$LINENO" 5 + || as_fn_error "could not setup config files machinery" "$LINENO" 5 _ACEOF -# VPATH may cause trouble with some makes, so we remove sole $(srcdir), -# ${srcdir} and @srcdir@ entries from VPATH if srcdir is ".", strip leading and +# VPATH may cause trouble with some makes, so we remove $(srcdir), +# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and # trailing colons and then remove the whole line if VPATH becomes empty # (actually we leave an empty line to preserve line numbers). if test "x$srcdir" = x.; then - ac_vpsub='/^[ ]*VPATH[ ]*=[ ]*/{ -h -s/// -s/^/:/ -s/[ ]*$/:/ -s/:\$(srcdir):/:/g -s/:\${srcdir}:/:/g -s/:@srcdir@:/:/g -s/^:*// + ac_vpsub='/^[ ]*VPATH[ ]*=/{ +s/:*\$(srcdir):*/:/ +s/:*\${srcdir}:*/:/ +s/:*@srcdir@:*/:/ +s/^\([^=]*=[ ]*\):*/\1/ s/:*$// -x -s/\(=[ ]*\).*/\1/ -G -s/\n// s/^[^=]*=[ ]*$// }' fi @@ -44014,7 +44009,7 @@ for ac_last_try in false false :; do if test -z "$ac_t"; then break elif $ac_last_try; then - as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5 + as_fn_error "could not make $CONFIG_HEADERS" "$LINENO" 5 else ac_delim="$ac_delim!$ac_delim _$ac_delim!! " fi @@ -44099,7 +44094,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 _ACAWK _ACEOF cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 - as_fn_error $? "could not setup config headers machinery" "$LINENO" 5 + as_fn_error "could not setup config headers machinery" "$LINENO" 5 fi # test -n "$CONFIG_HEADERS" @@ -44112,7 +44107,7 @@ do esac case $ac_mode$ac_tag in :[FHL]*:*);; - :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;; + :L* | :C*:*) as_fn_error "invalid tag \`$ac_tag'" "$LINENO" 5;; :[FH]-) ac_tag=-:-;; :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; esac @@ -44140,7 +44135,7 @@ do [\\/$]*) false;; *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; esac || - as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;; + as_fn_error "cannot find input file: \`$ac_f'" "$LINENO" 5;; esac case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac as_fn_append ac_file_inputs " '$ac_f'" @@ -44167,7 +44162,7 @@ $as_echo "$as_me: creating $ac_file" >&6;} case $ac_tag in *:-:* | *:-) cat >"$tmp/stdin" \ - || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; + || as_fn_error "could not create $ac_file" "$LINENO" 5 ;; esac ;; esac @@ -44309,22 +44304,22 @@ if $ac_cs_awk_getline; then else $AWK -f "$tmp/subs.awk" | $SHELL fi >$tmp/out \ - || as_fn_error $? "could not create $ac_file" "$LINENO" 5 + || as_fn_error "could not create $ac_file" "$LINENO" 5 test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } && { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } && { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir' -which seems to be undefined. Please make sure it is defined" >&5 +which seems to be undefined. Please make sure it is defined." >&5 $as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' -which seems to be undefined. Please make sure it is defined" >&2;} +which seems to be undefined. Please make sure it is defined." >&2;} rm -f "$tmp/stdin" case $ac_file in -) cat "$tmp/out" && rm -f "$tmp/out";; *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";; esac \ - || as_fn_error $? "could not create $ac_file" "$LINENO" 5 + || as_fn_error "could not create $ac_file" "$LINENO" 5 ;; :H) # @@ -44335,19 +44330,19 @@ which seems to be undefined. Please make sure it is defined" >&2;} $as_echo "/* $configure_input */" \ && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" } >"$tmp/config.h" \ - || as_fn_error $? "could not create $ac_file" "$LINENO" 5 + || as_fn_error "could not create $ac_file" "$LINENO" 5 if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5 $as_echo "$as_me: $ac_file is unchanged" >&6;} else rm -f "$ac_file" mv "$tmp/config.h" "$ac_file" \ - || as_fn_error $? "could not create $ac_file" "$LINENO" 5 + || as_fn_error "could not create $ac_file" "$LINENO" 5 fi else $as_echo "/* $configure_input */" \ && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \ - || as_fn_error $? "could not create -" "$LINENO" 5 + || as_fn_error "could not create -" "$LINENO" 5 fi ;; @@ -45590,7 +45585,7 @@ _ACEOF ac_clean_files=$ac_clean_files_save test $ac_write_fail = 0 || - as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5 + as_fn_error "write failure creating $CONFIG_STATUS" "$LINENO" 5 # configure is writing to config.log, and then calls config.status. @@ -45611,7 +45606,7 @@ if test "$no_create" != yes; then exec 5>>config.log # Use ||, not &&, to avoid exiting from the if with $? = 1, which # would make configure fail if this is the last instruction. - $ac_cs_success || as_fn_exit 1 + $ac_cs_success || as_fn_exit $? fi if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5 diff --git a/configure.ac b/configure.ac index 8daad2d567f..f3567211f0b 100644 --- a/configure.ac +++ b/configure.ac @@ -2540,6 +2540,9 @@ AC_CONFIG_FILES( src/library/methods/DESCRIPTION src/library/methods/Makefile src/library/methods/src/Makefile + src/library/parallel/DESCRIPTION + src/library/parallel/Makefile + src/library/parallel/src/Makefile src/library/profile/Makefile src/library/stats/DESCRIPTION src/library/stats/Makefile diff --git a/doc/NEWS.Rd b/doc/NEWS.Rd index 4565722e388..693a0d4607d 100644 --- a/doc/NEWS.Rd +++ b/doc/NEWS.Rd @@ -25,7 +25,7 @@ allows the y-line bias of the graphics device to be tweaked, including to reproduce output from earlier versions of \R. - \item Labeling of p-values in various anova tables has been + \item Labeling of the p-values in various anova tables has been rationalized to be either \code{"Pr(>F)"} or \code{"Pr(>Chi)"} (i.e. the \code{"Pr(F)"}, \code{"Pr(Chi)"} and \code{"P(>|Chi|)"} variants have been eliminated). Code which extracts the p value @@ -35,6 +35,9 @@ lazy-loading in packages with namespaces (which makes it consistent with its use for data-only packages without namespaces in earlier versions of \R). + + \item There is a new package \pkg{parallel}.\cr + [Currently a stub.] } } diff --git a/share/make/vars.mk b/share/make/vars.mk index abce713802e..ff7a1ee7c63 100644 --- a/share/make/vars.mk +++ b/share/make/vars.mk @@ -1,11 +1,11 @@ ## Static (i.e., not determined by configure) Make variables to be ## shared *and* grepped from m4/R.m4 and tools/*-recommended. -R_PKGS_BASE = base tools utils grDevices graphics stats datasets methods grid splines stats4 tcltk compiler +R_PKGS_BASE = base tools utils grDevices graphics stats datasets methods grid splines stats4 tcltk compiler parallel ## Those which can be installed initially compiled (not base tools) -R_PKGS_BASE1 = utils grDevices graphics stats datasets methods grid splines stats4 tcltk +R_PKGS_BASE1 = utils grDevices graphics stats datasets methods grid splines stats4 tcltk parallel ## Those with standard R directories (not datasets, methods) -R_PKGS_BASE2 = base tools utils grDevices graphics stats grid splines stats4 tcltk compiler +R_PKGS_BASE2 = base tools utils grDevices graphics stats grid splines stats4 tcltk compiler parallel R_PKGS_RECOMMENDED = MASS lattice Matrix nlme survival boot cluster codetools foreign KernSmooth rpart class nnet spatial mgcv # there are dependencies in src/library/Recommended/Makefile* diff --git a/src/library/Makefile.in b/src/library/Makefile.in index f9eedc7c967..e7b37685bd3 100644 --- a/src/library/Makefile.in +++ b/src/library/Makefile.in @@ -102,7 +102,7 @@ vignettes: @if test -z "$(PDFLATEX)"; then \ $(ECHO) "'pdflatex' is needed to make vignettes but is missing on your system."; \ else \ - for pkg in grid utils; do \ + for pkg in grid parallel utils; do \ $(ECHO) "building/updating vignettes for package '$${pkg}' ..."; \ ($(ECHO) "tools:::.install_package_vignettes(\"$(srcdir)/$${pkg}\", \"$(top_builddir)/library/$${pkg}\")") | \ R_DEFAULT_PACKAGES="utils,tools" LC_ALL=C \ diff --git a/src/library/Makefile.win b/src/library/Makefile.win index 7f16454ffc7..8fca1f56863 100644 --- a/src/library/Makefile.win +++ b/src/library/Makefile.win @@ -94,7 +94,7 @@ Rdfiles: done vignettes: - @for pkg in grid utils; do \ + @for pkg in grid parallel utils; do \ $(ECHO) "building/updating vignettes for package '$${pkg}' ..."; \ ($(ECHO) "tools:::.install_package_vignettes(\"$(srcdir)/$${pkg}\", \"$(top_builddir)/library/$${pkg}\")") | \ R_DEFAULT_PACKAGES="utils,tools" LC_ALL=C \ diff --git a/src/library/base/R/library.R b/src/library/base/R/library.R index 3bb63c83b7d..8a0067366f1 100644 --- a/src/library/base/R/library.R +++ b/src/library/base/R/library.R @@ -711,8 +711,8 @@ find.package <- ## time with 1000+ packages installed. if(length(package) == 1L && package %in% c("base", "tools", "utils", "grDevices", "graphics", - "stats", "datasets", "methods", "grid", "splines", - "stats4", "tcltk")) + "stats", "datasets", "methods", "grid", "parallel", + "splines", "stats4", "tcltk")) return(file.path(.Library, package)) use_attached <- FALSE diff --git a/src/library/parallel/DESCRIPTION.in b/src/library/parallel/DESCRIPTION.in new file mode 100644 index 00000000000..4e4d7e38aaf --- /dev/null +++ b/src/library/parallel/DESCRIPTION.in @@ -0,0 +1,8 @@ +Package: parallel +Version: @VERSION@ +Priority: base +Title: Support for Parallel computation in R +Author: R Core Team +Maintainer: R Core Team +Description: Support for parallel computation on multicore computer systems. +License: Part of R @VERSION@ diff --git a/src/library/parallel/Makefile.in b/src/library/parallel/Makefile.in new file mode 100644 index 00000000000..c59afa9aae8 --- /dev/null +++ b/src/library/parallel/Makefile.in @@ -0,0 +1,35 @@ +# +# ${R_HOME}/src/library/parallel/Makefile + +VPATH = @srcdir@ +srcdir = @srcdir@ +top_srcdir = @top_srcdir@ + +top_builddir = ../../.. +subdir = src/library/parallel + +include $(top_builddir)/Makeconf + +distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir) +DISTFILES = DESCRIPTION.in Makefile.in Makefile.win NAMESPACE + +pkg = parallel + +RSRC = `LC_COLLATE=C ls $(srcdir)/R/*.R` +INSTDIRS = doc + +R_EXE = $(top_builddir)/bin/R --vanilla --slave +DEFPKGS = NULL + +all: Makefile DESCRIPTION + @$(ECHO) "building package '$(pkg)'" + @$(MKINSTALLDIRS) $(top_builddir)/library/$(pkg) + @$(MKINSTALLDIRS) $(top_builddir)/library/$(pkg)/doc + @$(MAKE) mkR1 mkdesc instdirs mkpo +@BYTE_COMPILE_PACKAGES_FALSE@ @$(MAKE) mklazy +@BYTE_COMPILE_PACKAGES_TRUE@ @$(MAKE) mklazycomp + +mkR: mkR1 + +include $(top_srcdir)/share/make/basepkg.mk +include $(top_srcdir)/share/make/lazycomp.mk diff --git a/src/library/parallel/Makefile.win b/src/library/parallel/Makefile.win new file mode 100644 index 00000000000..b88a7052715 --- /dev/null +++ b/src/library/parallel/Makefile.win @@ -0,0 +1,28 @@ +#-*- Makefile -*- +# +# ${R_HOME}/src/library/parallel/Makefile.win + +srcdir = . +top_srcdir = ../../.. + +top_builddir = ../../.. + +include $(top_builddir)/Makeconf + +pkg = parallel + +RSRC = `LC_COLLATE=C ls $(srcdir)/R/*.R` +INSTDIRS = doc +DEFPKGS = NULL + +all: + @$(ECHO) "building package '$(pkg)'" + @$(MKINSTALLDIRS) $(top_builddir)/library/$(pkg) + @$(MKINSTALLDIRS) $(top_builddir)/library/$(pkg)/doc + @$(MAKE) -f Makefile.win mkR1 mkdesc instdirs mkpo + @$(MAKE) -f Makefile.win mklazycomp + +mkR: mkR1 + +include $(top_srcdir)/share/make/basepkg.mk +include $(top_srcdir)/share/make/lazycomp.mk diff --git a/src/library/parallel/NAMESPACE b/src/library/parallel/NAMESPACE new file mode 100644 index 00000000000..761b1729a29 --- /dev/null +++ b/src/library/parallel/NAMESPACE @@ -0,0 +1 @@ +## Namespace for package 'parallel' diff --git a/src/library/parallel/R/parlapply.R b/src/library/parallel/R/parlapply.R new file mode 100644 index 00000000000..bc6c6501092 --- /dev/null +++ b/src/library/parallel/R/parlapply.R @@ -0,0 +1,20 @@ +# File src/library/parallel/R/parlapply.R +# Part of the R package, http://www.R-project.org +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# A copy of the GNU General Public License is available at +# http://www.r-project.org/Licenses/ + +parlapply <- function(X, FUN, ..., Ncpus) +{ + message("package parallel is just a stub") +} diff --git a/src/library/parallel/R/zzz.R b/src/library/parallel/R/zzz.R new file mode 100644 index 00000000000..f3ecac2c53f --- /dev/null +++ b/src/library/parallel/R/zzz.R @@ -0,0 +1,20 @@ +# File src/library/parallel/R/zzz.R +# Part of the R package, http://www.R-project.org +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# A copy of the GNU General Public License is available at +# http://www.r-project.org/Licenses/ + +.noGenerics <- TRUE + +.onAttach <- function(...) + packageStartupMessage("Package 'parallel' does nothing as yet") diff --git a/src/library/parallel/man/parlapply.Rd b/src/library/parallel/man/parlapply.Rd new file mode 100644 index 00000000000..8ce943e2a80 --- /dev/null +++ b/src/library/parallel/man/parlapply.Rd @@ -0,0 +1,33 @@ +% File src/library/parallel/man/parlapply.Rd +% Part of the R package, http://www.R-project.org +% Copyright 2011 R Core Development Team +% Distributed under GPL 2 or later + +\name{parlapply} +\alias{parlapply} +\title{ + A Parallel Version of \code{lapply} +} +\description{ + A parallel version of \code{\link{lapply}}. +} +\usage{ +parlapply(X, FUN, ..., Ncpus) +} +\arguments{ + \item{X}{a vector (atomic or list) or an \code{\link{expression}} + object. Other objects (including classed objects) will be coerced + by \code{base::\link{as.list}}.} + \item{FUN}{the function to be applied to each element of \code{X}: + see \sQuote{Details}. In the case of functions like + \code{+}, \code{\%*\%}, the function name must be backquoted or quoted.} + \item{\dots}{optional arguments to \code{FUN}.} + \item{Ncpus}{The number of CPUs to use.} +} +\details{ + More to come +} +\value{ + A list of the same length as \code{X}. +} +\keyword{iteration} diff --git a/src/library/parallel/src/Makefile.in b/src/library/parallel/src/Makefile.in new file mode 100644 index 00000000000..61b8ac4eb6f --- /dev/null +++ b/src/library/parallel/src/Makefile.in @@ -0,0 +1,51 @@ +# +# ${R_HOME}/src/library/parallel/src/Makefile + +pkg = parallel + +VPATH = @srcdir@ +srcdir = @srcdir@ +top_srcdir = @top_srcdir@ + +top_builddir = ../../../.. +subdir = src/library/$(pkg)/src +R_HOME = $(top_builddir) +R_SHARE_DIR = $(R_HOME)/share +R_INCLUDE_DIR = $(R_HOME)/include + +SOURCES_C = + +DEPENDS = $(SOURCES_C:.c=.d) +OBJECTS = $(SOURCES_C:.c=.o) + +SHLIB = $(pkg)@SHLIB_EXT@ + +all: Makefile Makedeps + @$(MAKE) Makedeps +# @$(MAKE) shlib + +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ + +Makedeps: Makefile $(DEPENDS) + @cat $(DEPENDS) >> Makefile + @touch $@ + +shlib: $(SHLIB) + @$(MKINSTALLDIRS) \ + $(top_builddir)/library/$(pkg)/libs@R_ARCH@ + @$(SHELL) $(top_srcdir)/tools/copy-if-change $(SHLIB) \ + $(top_builddir)/library/$(pkg)/libs@R_ARCH@/$(SHLIB) + +include $(R_HOME)/etc${R_ARCH}/Makeconf +include $(top_srcdir)/share/make/shlib.mk + +mostlyclean: clean +clean: + @-rm -rf .libs _libs + @-rm -f Makedeps *.d *.o *$(SHLIB_EXT) +distclean: clean + @-rm -f Makefile +maintainer-clean: distclean + +## Automagically generated dependencies: diff --git a/src/library/parallel/vignettes/parallel.Rnw b/src/library/parallel/vignettes/parallel.Rnw new file mode 100644 index 00000000000..849d7dd37cf --- /dev/null +++ b/src/library/parallel/vignettes/parallel.Rnw @@ -0,0 +1,31 @@ +\documentclass[a4paper]{article} + +\usepackage{Rd} + +%\VignetteIndexEntry{Package 'parallel'} +%\VignettePackage{parallel} + + +\title{Package `parallel'} +\author{R-core} + + +\begin{document} + +\maketitle + +\section{Introduction} + +It is planned to added a package \pkg{parallel} in \R{} 2.14.0. + +<<>>= +library(parallel) +@ + + +\end{document} + +%%% Local Variables: +%%% mode: latex +%%% TeX-master: t +%%% End: diff --git a/src/library/tcltk/Makefile.in b/src/library/tcltk/Makefile.in index 24b0ebff1e4..220db02bf8a 100644 --- a/src/library/tcltk/Makefile.in +++ b/src/library/tcltk/Makefile.in @@ -35,7 +35,7 @@ all: Makefile DESCRIPTION $(top_builddir)/library/$(pkg)/R/$(pkg) ; \ fi) @$(INSTALL_DATA) $(srcdir)/NAMESPACE $(top_builddir)/library/$(pkg) - rm -f $(top_builddir)/library/$(pkg)/Meta/nsInfo.rds + @rm -f $(top_builddir)/library/$(pkg)/Meta/nsInfo.rds @$(MAKE) mkdesc mkexec mkdemos mkpo @if test -d src -a @use_tcltk@ = yes; then \ (cd src && $(MAKE)) || exit 1; \