Mercurial > octave-nkf
changeset 17888:11a6c7445a71
fix m4 quoting in test and improve warning messages for stl_algo.h problem
* acinclude.m4 (OCTAVE_CHECK_BROKEN_STL_ALGO_H): Quote [012] in case
statement. Improve warning messages.
* configure.ac: Also warn if local patched version of bits/stl_algo.h
will be used.
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Fri, 08 Nov 2013 12:28:46 -0500 |
| parents | 3252b366bb5d |
| children | 5740407c25b2 |
| files | configure.ac m4/acinclude.m4 |
| diffstat | 2 files changed, 7 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/configure.ac Fri Nov 08 08:47:09 2013 -0800 +++ b/configure.ac Fri Nov 08 12:28:46 2013 -0500 @@ -381,6 +381,11 @@ AM_CONDITIONAL([AMCOND_HAVE_BROKEN_STL_ALGO_H], [test $octave_cv_broken_stl_algo_h = yes]) +if test $octave_cv_broken_stl_algo_h = yes; then + warn_stl_algo_h="Found nth_element broken in g++ $GXX_VERSION. Attempting to repair by using local patched version of bits/stl_algo.h." + OCTAVE_CONFIGURE_WARNING([warn_stl_algo_h]) +fi + ### Determine the compiler flag necessary to create dependencies ## Assume GCC.
--- a/m4/acinclude.m4 Fri Nov 08 08:47:09 2013 -0800 +++ b/m4/acinclude.m4 Fri Nov 08 12:28:46 2013 -0500 @@ -2115,11 +2115,11 @@ if test "$GXX" = yes; then if test $octave_cv_broken_stl_algo_h = yes; then case "$GXX_VERSION" in - 4.8.[012]) + 4.8.[[012]]) ;; *) octave_cv_broken_stl_algo_h=no - warn_stl_algo_h="UNEXPECTED: found nth_element broken in $GXX_VERSION. Refusing to fix except for g++ 4.8.2." + warn_stl_algo_h="UNEXPECTED: found nth_element broken in g++ $GXX_VERSION. Refusing to fix except for g++ 4.8.0, 4.8.1, or 4.8.2. You appear to have g++ $GXX_VERSION." OCTAVE_CONFIGURE_WARNING([warn_stl_algo_h]) ;; esac