From 012e65a1137204470c9c2eeb2ecb6e740883f472 Mon Sep 17 00:00:00 2001 From: Dirk Eddelbuettel Date: Sat, 14 Apr 2018 11:22:50 -0500 Subject: [PATCH] make configure more robust against limited shells (closes #216) --- ChangeLog | 8 ++++++++ configure | 36 ++++++++++++++++++++++++------------ configure.ac | 4 ++-- 3 files changed, 34 insertions(+), 14 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8340bd77..4235b535 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,13 @@ +2018-04-14 Dirk Eddelbuettel + + * configure.ac: Comparison across ranges does not work reliably so + explicit;y enumerate alternative accepted g++ versions + * configure: Regenerated + 2018-03-29 Dirk Eddelbuettel + * DESCRIPTION (Version, Date): New minor version 0.8.499.0.2 + * DESCRIPTION (Depends): Require R (>= 3.3.0) 2018-03-29 Keith O'Hara diff --git a/configure b/configure index 0f11d91e..b7b6f448 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for RcppArmadillo 0.8.499.0.1. +# Generated by GNU Autoconf 2.69 for RcppArmadillo 0.8.499.0.2. # # # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. @@ -576,8 +576,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='RcppArmadillo' PACKAGE_TARNAME='rcpparmadillo' -PACKAGE_VERSION='0.8.499.0.1' -PACKAGE_STRING='RcppArmadillo 0.8.499.0.1' +PACKAGE_VERSION='0.8.499.0.2' +PACKAGE_STRING='RcppArmadillo 0.8.499.0.2' PACKAGE_BUGREPORT='' PACKAGE_URL='' @@ -613,6 +613,7 @@ infodir docdir oldincludedir includedir +runstatedir localstatedir sharedstatedir sysconfdir @@ -684,6 +685,7 @@ datadir='${datarootdir}' sysconfdir='${prefix}/etc' sharedstatedir='${prefix}/com' localstatedir='${prefix}/var' +runstatedir='${localstatedir}/run' includedir='${prefix}/include' oldincludedir='/usr/include' docdir='${datarootdir}/doc/${PACKAGE_TARNAME}' @@ -936,6 +938,15 @@ do | -silent | --silent | --silen | --sile | --sil) silent=yes ;; + -runstatedir | --runstatedir | --runstatedi | --runstated \ + | --runstate | --runstat | --runsta | --runst | --runs \ + | --run | --ru | --r) + ac_prev=runstatedir ;; + -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \ + | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \ + | --run=* | --ru=* | --r=*) + runstatedir=$ac_optarg ;; + -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb) ac_prev=sbindir ;; -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ @@ -1073,7 +1084,7 @@ fi for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ datadir sysconfdir sharedstatedir localstatedir includedir \ oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ - libdir localedir mandir + libdir localedir mandir runstatedir do eval ac_val=\$$ac_var # Remove trailing slashes. @@ -1186,7 +1197,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures RcppArmadillo 0.8.499.0.1 to adapt to many kinds of systems. +\`configure' configures RcppArmadillo 0.8.499.0.2 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1226,6 +1237,7 @@ Fine tuning of the installation directories: --sysconfdir=DIR read-only single-machine data [PREFIX/etc] --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] --localstatedir=DIR modifiable single-machine data [PREFIX/var] + --runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run] --libdir=DIR object code libraries [EPREFIX/lib] --includedir=DIR C header files [PREFIX/include] --oldincludedir=DIR C header files for non-gcc [/usr/include] @@ -1247,7 +1259,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of RcppArmadillo 0.8.499.0.1:";; + short | recursive ) echo "Configuration of RcppArmadillo 0.8.499.0.2:";; esac cat <<\_ACEOF @@ -1327,7 +1339,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -RcppArmadillo configure 0.8.499.0.1 +RcppArmadillo configure 0.8.499.0.2 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1419,7 +1431,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by RcppArmadillo $as_me 0.8.499.0.1, which was +It was created by RcppArmadillo $as_me 0.8.499.0.2, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2703,13 +2715,13 @@ $as_echo "no" >&6; } $as_echo "$as_me: WARNING: Only g++ version 4.7.2 or greater can be used with RcppArmadillo." >&2;} as_fn_error $? "Please use a different compiler." "$LINENO" 5 ;; - 4.7.2-9|4.8.*|4.9.*|5.0-3*) + 4.7.*|4.8.*|4.9.*|5.0*|5.1*|5.2*|5.3*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes, but without OpenMP as version ${gxx_version} (Armadillo constraint)" >&5 $as_echo "yes, but without OpenMP as version ${gxx_version} (Armadillo constraint)" >&6; } ## we know this one is bad can_use_openmp="no" ;; - 5.4-9*|6.*|7.*|8.*|9.*) + 5.4*|5.5*|5.6*|5.7*|5.8*|5.9*|6.*|7.*|8.*|9.*|10.*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes, with OpenMP as version ${gxx_version}" >&5 $as_echo "yes, with OpenMP as version ${gxx_version}" >&6; } ## we know this one is good, yay @@ -3345,7 +3357,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by RcppArmadillo $as_me 0.8.499.0.1, which was +This file was extended by RcppArmadillo $as_me 0.8.499.0.2, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -3398,7 +3410,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -RcppArmadillo config.status 0.8.499.0.1 +RcppArmadillo config.status 0.8.499.0.2 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index 37b54dbd..5e4bc238 100644 --- a/configure.ac +++ b/configure.ac @@ -43,12 +43,12 @@ if test "${GXX}" = yes; then AC_MSG_WARN([Only g++ version 4.7.2 or greater can be used with RcppArmadillo.]) AC_MSG_ERROR([Please use a different compiler.]) ;; - 4.7.[2-9]|4.8.*|4.9.*|5.[0-3]*) + 4.7.*|4.8.*|4.9.*|5.0*|5.1*|5.2*|5.3*) AC_MSG_RESULT([yes, but without OpenMP as version ${gxx_version} (Armadillo constraint)]) ## we know this one is bad can_use_openmp="no" ;; - 5.[4-9]*|6.*|7.*|8.*|9.*) + 5.4*|5.5*|5.6*|5.7*|5.8*|5.9*|6.*|7.*|8.*|9.*|10.*) AC_MSG_RESULT([yes, with OpenMP as version ${gxx_version}]) ## we know this one is good, yay can_use_openmp="yes"