Mercurial > octave-nkf

changeset 17879:8b7bbe021d0f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
refuse to attempt to fix stl_algo.h except for g++ 4.8.2 * acinclude.m4 (OCTAVE_CHECK_BROKEN_STL_ALGO_H): Don't set cache variable to yes unless it appears that we are using g++ 4.8.2.
author John W. Eaton <jwe@octave.org>
date Thu, 07 Nov 2013 14:35:05 -0500
parents 0d660785098e
children 51a3b3fa981f
files m4/acinclude.m4
diffstat 1 files changed, 5 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/m4/acinclude.m4	Thu Nov 07 14:03:58 2013 -0500
+++ b/m4/acinclude.m4	Thu Nov 07 14:35:05 2013 -0500
@@ -2118,20 +2118,22 @@
         4.8.2)
         ;;
         *)
-          warn_stl_algo_h="UNEXPECTED: found stl_algo.h broken in $GXX_VERSION"
+          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."
           OCTAVE_CONFIGURE_WARNING([warn_stl_algo_h])
         ;;
       esac
     else
       case "$GXX_VERSION" in
         4.8.2)
-          warn_stl_algo_h="UNEXPECTED: found stl_algo.h working in g++ $GXX_VERSION -- has it been patched on your system?"
+          warn_stl_algo_h="UNEXPECTED: found nth_element working in g++ 4.8.2.  Has it been patched on your system?"
           OCTAVE_CONFIGURE_WARNING([warn_stl_algo_h])
         ;;
       esac
     fi
   else
-    warn_stl_algo_h="UNEXPECTED: nth_element test failed (expected only for g++ 4.8.2)"
+    octave_cv_broken_stl_algo_h=no
+    warn_stl_algo_h="UNEXPECTED: nth_element test failed.  Refusing to fix except for g++ 4.8.2."
     OCTAVE_CONFIGURE_WARNING([warn_stl_algo_h])
   fi
 ])