Minor syntactical change to make this a little easier to comprehend.

[oota-llvm.git] / autoconf / m4 / cxx_std_iterator.m4

diff --git a/autoconf/m4/cxx_std_iterator.m4 b/autoconf/m4/cxx_std_iterator.m4
index 46665f2867ebd395c3b11fdbab447b7188a51ee5..38a611764c790dd8e19ee7edc01ed7fa7374505e 100644 (file)
--- a/autoconf/m4/cxx_std_iterator.m4
+++ b/autoconf/m4/cxx_std_iterator.m4
@@ -4,20 +4,23 @@ AC_DEFUN([AC_CXX_HAVE_STD_ITERATOR],
 [AC_CACHE_CHECK(whether the compiler has the standard iterator,
 ac_cv_cxx_have_std_iterator,
 [AC_REQUIRE([AC_CXX_NAMESPACES])
-  AC_LANG_SAVE
-  AC_LANG_CPLUSPLUS
-  AC_TRY_COMPILE([#include <iterator>
+  AC_LANG_PUSH([C++])
+  AC_COMPILE_IFELSE([AC_LANG_PROGRAM(
+    [[#include <iterator>
 #ifdef HAVE_NAMESPACES
 using namespace std;
-#endif],[iterator<int,int,int> t; return 0;],
-  ac_cv_cxx_have_std_iterator=yes, ac_cv_cxx_have_std_iterator=no)
-  AC_LANG_RESTORE
+#endif]],
+  [[iterator<int,int,int> t; return 0;]])],
+  ac_cv_cxx_have_std_iterator=yes, 
+  ac_cv_cxx_have_std_iterator=no)
+  AC_LANG_POP([C++])
 ])
-HAVE_STD_ITERATOR=0
 if test "$ac_cv_cxx_have_std_iterator" = yes
 then
-   HAVE_STD_ITERATOR=1
+   AC_DEFINE(HAVE_STD_ITERATOR,1,[Have std namespace iterator])
+else
+   AC_DEFINE(HAVE_STD_ITERATOR,0,[Does not have std namespace iterator])
 fi
-AC_SUBST(HAVE_STD_ITERATOR)])
+])