Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

make configure more robust against limited shells (closes #216) #217

Merged
merged 1 commit into from
Apr 14, 2018
Merged

make configure more robust against limited shells (closes #216) #217

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 8 additions & 0 deletions ChangeLog
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,13 @@
2018-04-14 Dirk Eddelbuettel <edd@debian.org>

* configure.ac: Comparison across ranges does not work reliably so
explicit;y enumerate alternative accepted g++ versions
* configure: Regenerated

2018-03-29 Dirk Eddelbuettel <edd@debian.org>

* DESCRIPTION (Version, Date): New minor version 0.8.499.0.2

* DESCRIPTION (Depends): Require R (>= 3.3.0)

2018-03-29 Keith O'Hara <kth.ohr@gmail.com>
Expand Down
36 changes: 24 additions & 12 deletions configure
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.
Expand Down Expand Up @@ -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=''

Expand Down Expand Up @@ -613,6 +613,7 @@ infodir
docdir
oldincludedir
includedir
runstatedir
localstatedir
sharedstatedir
sysconfdir
Expand Down Expand Up @@ -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}'
Expand Down Expand Up @@ -936,6 +938,15 @@ do
| -silent | --silent | --silen | --sile | --sil)
silent=yes ;;

-runstatedir | --runstatedir | --runstatedi | --runstated \
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What parameters are you supplying when running autoconf to generate this portion?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

None. I just say autoconf.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

And it is 2.69 if that matters:

edd@rob:~/git/rcpparmadillo(master)$ autoconf --version
autoconf (GNU Autoconf) 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
License GPLv3+/Autoconf: GNU GPL version 3 or later
<http://gnu.org/licenses/gpl.html>, <http://gnu.org/licenses/exceptions.html>
This is free software: you are free to change and redistribute it.
There is NO WARRANTY, to the extent permitted by law.

Written by David J. MacKenzie and Akim Demaille.
edd@rob:~/git/rcpparmadillo(master)$

| --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=* \
Expand Down Expand Up @@ -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.
Expand Down Expand Up @@ -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]...

Expand Down Expand Up @@ -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]
Expand All @@ -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

Expand Down Expand Up @@ -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.
Expand Down Expand Up @@ -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 $@
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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\\"

Expand Down
4 changes: 2 additions & 2 deletions configure.ac
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down