From b713fde8a8ddce88cf2ff03ef8ef2a5ea037d3b4 Mon Sep 17 00:00:00 2001
From: Scott Cantor <cantor.2@osu.edu>
Date: Tue, 12 Oct 2010 18:38:00 +0000
Subject: [PATCH] Working scripts

---
 configure.ac    |  4 ++--
 m4/acinclude.m4 | 14 ++++++--------
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/configure.ac b/configure.ac
index 9c714c6..f9b1889 100644
--- a/configure.ac
+++ b/configure.ac
@@ -84,11 +84,11 @@ fi
 
 AC_CHECK_FUNCS([pthread_rwlock_init])
 
-AC_LANG(C++)
+AC_LANG([C++])
 
 # C++ requirements
-AC_CXX_REQUIRE_STL
 AC_CXX_NAMESPACES
+AC_CXX_REQUIRE_STL
 
 # are covariant methods allowed?
 AC_LINK_IFELSE(
diff --git a/m4/acinclude.m4 b/m4/acinclude.m4
index a4410e4..0448519 100644
--- a/m4/acinclude.m4
+++ b/m4/acinclude.m4
@@ -8,14 +8,13 @@ dnl
 AC_DEFUN([AC_CXX_NAMESPACES],
 [AC_CACHE_CHECK(whether the compiler implements namespaces,
 ac_cv_cxx_namespaces,
+[
  AC_LANG_PUSH([C++])
- AC_COMPILE_IFELSE(
-    [AC_LANG_PROGRAM([[namespace Outer { namespace Inner { int i = 0; }}]], [[using namespace Outer::Inner; return i;]])],
-    [ac_cv_cxx_namespaces=yes],[ac_cv_cxx_namespaces=no])
+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[namespace Outer { namespace Inner { int i = 0; }}]], [[using namespace Outer::Inner; return i;]])],[ac_cv_cxx_namespaces=yes],[ac_cv_cxx_namespaces=no])
  AC_LANG_POP([])
 ])
 if test "$ac_cv_cxx_namespaces" = yes; then
-  AC_DEFINE([HAVE_NAMESPACES],[1],[Define if the compiler implements namespaces])
+  AC_DEFINE(HAVE_NAMESPACES,1,[define if the compiler implements namespaces])
 fi
 ])
 
@@ -28,13 +27,12 @@ AC_DEFUN([AC_CXX_REQUIRE_STL],
 ac_cv_cxx_have_stl,
 [AC_REQUIRE([AC_CXX_NAMESPACES])
  AC_LANG_PUSH([C++])
- AC_COMPILE_IFELSE(
-    [AC_LANG_PROGRAM([[#include <list>
+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <list>
 #include <deque>
 #ifdef HAVE_NAMESPACES
 using namespace std;
-#endif]], [[list<int> x; x.push_back(5); list<int>::iterator iter = x.begin(); if (iter != x.end()) ++iter; return 0;]])],
-    [ac_cv_cxx_have_stl=yes],[ac_cv_cxx_have_stl=no])
+#endif]], [[list<int> x; x.push_back(5);
+list<int>::iterator iter = x.begin(); if (iter != x.end()) ++iter; return 0;]])],[ac_cv_cxx_have_stl=yes],[ac_cv_cxx_have_stl=no])
  AC_LANG_POP([])
 ])
 if test "x_$ac_cv_cxx_have_stl" != x_yes; then
-- 
2.1.4