Fix typos in configration scripts.

9 files changed, 83 insertions, 4 deletions

diff --git a/Makefile.in b/Makefile.in
index 3843caab..2f46a05c 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -448,6 +448,7 @@ oa_enable_checking = @oa_enable_checking@
 oa_enable_profiling = @oa_enable_profiling@
 oa_enable_threads = @oa_enable_threads@
 oa_eval_flags = @oa_eval_flags@
+oa_extra_cxxflags = @oa_extra_cxxflags@
 oa_host_has_regex = @oa_host_has_regex@
 oa_keep_files = @oa_keep_files@
 oa_lisp_flavor = @oa_lisp_flavor@
diff --git a/config/open-axiom.m4 b/config/open-axiom.m4
index c7b4250f..2a667836 100644
--- a/config/open-axiom.m4
+++ b/config/open-axiom.m4
@@ -355,8 +355,8 @@ dnl -- OPENAXIOM_CXX_EXTRA_OPTIONS --
 dnl ---------------------------------
 AC_DEFUN([OPENAXIOM_EXTRA_CXX_OPTIONS], [
 oa_extra_cxxflags=
-OPENAXIOM_CXX_GROK_OPTIONS([-Wno-mismatch-tags],[oa_extra_cxxflags])
-OPENAXIOM_CXX_GROK_OPTIONS([-Wno-string-plus-int],[oa_extra_cxxflags])
+OPENAXIOM_CXX_GROK_OPTION([-Wno-mismatch-tags],[oa_extra_cxxflags])
+OPENAXIOM_CXX_GROK_OPTION([-Wno-string-plus-int],[oa_extra_cxxflags])
 
 AC_SUBST(oa_extra_cxxflags)
 ])
diff --git a/configure b/configure
index 02910c2f..3b6023da 100755
--- a/configure
+++ b/configure
@@ -710,6 +710,7 @@ OA_DELAYED_FFI_FALSE
 OA_DELAYED_FFI_TRUE
 OA_BUILD_GCL_FALSE
 OA_BUILD_GCL_TRUE
+oa_extra_cxxflags
 OA_USE_LLVM_FALSE
 OA_USE_LLVM_TRUE
 oa_use_llvm
@@ -6660,7 +6661,79 @@ else
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
-OPENAXIOM_CXX_EXTRA_OPTIONS
+
+oa_extra_cxxflags=
+
+opt=-Wno-mismatch-tags				      # mandatory
+accumulator=oa_extra_cxxflags			      # optional
+if test -z $accumulator; then
+   accumulator=CXXFLAGS
+fi
+current_options=\$${accumulator}
+oa_saved_cxxflags="$CXXFLAGS"
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX supports \"$opt\"" >&5
+$as_echo_n "checking whether $CXX supports \"$opt\"... " >&6; }
+CXXFLAGS="$CXXFLAGS $opt"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_cxx_try_compile "$LINENO"; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+	CXXFLAGS=$oa_saved_cxxflags
+	eval "$accumulator=\"$current_options $opt\""
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+	CXXFLAGS=$oa_saved_cxxflags
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+
+opt=-Wno-string-plus-int				      # mandatory
+accumulator=oa_extra_cxxflags			      # optional
+if test -z $accumulator; then
+   accumulator=CXXFLAGS
+fi
+current_options=\$${accumulator}
+oa_saved_cxxflags="$CXXFLAGS"
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX supports \"$opt\"" >&5
+$as_echo_n "checking whether $CXX supports \"$opt\"... " >&6; }
+CXXFLAGS="$CXXFLAGS $opt"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_cxx_try_compile "$LINENO"; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+	CXXFLAGS=$oa_saved_cxxflags
+	eval "$accumulator=\"$current_options $opt\""
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+	CXXFLAGS=$oa_saved_cxxflags
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+
+
+
  if test x$oa_include_gcl = xyes; then
   OA_BUILD_GCL_TRUE=
   OA_BUILD_GCL_FALSE='#'
diff --git a/configure.ac b/configure.ac
index 0119fba8..e13fd9d5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -89,7 +89,7 @@ AC_LANG([C++])
 OPENAXIOM_HOST_COMPILERS
 AM_CONDITIONAL([OA_USE_LLVM], [test -n $oa_use_llvm])
 OPENAXIOM_REQUIRE_CXX11
-OPENAXIOM_CXX_EXTRA_OPTIONS
+OPENAXIOM_EXTRA_CXX_OPTIONS
 AM_CONDITIONAL([OA_BUILD_GCL], [test x$oa_include_gcl = xyes])
 AM_CONDITIONAL([OA_ECL_RT], [test x$oa_lisp_flavor = xecl])
 AM_CONDITIONAL([OA_DELAYED_FFI], [test x$oa_delay_ffi = xyes])
diff --git a/src/Makefile.in b/src/Makefile.in
index 88050e03..44d8bf06 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -362,6 +362,7 @@ oa_enable_checking = @oa_enable_checking@
 oa_enable_profiling = @oa_enable_profiling@
 oa_enable_threads = @oa_enable_threads@
 oa_eval_flags = @oa_eval_flags@
+oa_extra_cxxflags = @oa_extra_cxxflags@
 oa_host_has_regex = @oa_host_has_regex@
 oa_keep_files = @oa_keep_files@
 oa_lisp_flavor = @oa_lisp_flavor@
diff --git a/src/algebra/Makefile.in b/src/algebra/Makefile.in
index 569f8c30..86bdffc1 100644
--- a/src/algebra/Makefile.in
+++ b/src/algebra/Makefile.in
@@ -546,6 +546,7 @@ oa_enable_checking = @oa_enable_checking@
 oa_enable_profiling = @oa_enable_profiling@
 oa_enable_threads = @oa_enable_threads@
 oa_eval_flags = @oa_eval_flags@
+oa_extra_cxxflags = @oa_extra_cxxflags@
 oa_host_has_regex = @oa_host_has_regex@
 oa_keep_files = @oa_keep_files@
 oa_lisp_flavor = @oa_lisp_flavor@
diff --git a/src/boot/Makefile.in b/src/boot/Makefile.in
index ecb161d5..67afa9b1 100644
--- a/src/boot/Makefile.in
+++ b/src/boot/Makefile.in
@@ -390,6 +390,7 @@ oa_enable_checking = @oa_enable_checking@
 oa_enable_profiling = @oa_enable_profiling@
 oa_enable_threads = @oa_enable_threads@
 oa_eval_flags = @oa_eval_flags@
+oa_extra_cxxflags = @oa_extra_cxxflags@
 oa_host_has_regex = @oa_host_has_regex@
 oa_keep_files = @oa_keep_files@
 oa_lisp_flavor = @oa_lisp_flavor@
diff --git a/src/rt/Makefile.in b/src/rt/Makefile.in
index 9b7fc403..b5b6e154 100644
--- a/src/rt/Makefile.in
+++ b/src/rt/Makefile.in
@@ -352,6 +352,7 @@ oa_enable_checking = @oa_enable_checking@
 oa_enable_profiling = @oa_enable_profiling@
 oa_enable_threads = @oa_enable_threads@
 oa_eval_flags = @oa_eval_flags@
+oa_extra_cxxflags = @oa_extra_cxxflags@
 oa_host_has_regex = @oa_host_has_regex@
 oa_keep_files = @oa_keep_files@
 oa_lisp_flavor = @oa_lisp_flavor@
diff --git a/src/utils/Makefile.in b/src/utils/Makefile.in
index bfe3f37b..18806e1d 100644
--- a/src/utils/Makefile.in
+++ b/src/utils/Makefile.in
@@ -368,6 +368,7 @@ oa_enable_checking = @oa_enable_checking@
 oa_enable_profiling = @oa_enable_profiling@
 oa_enable_threads = @oa_enable_threads@
 oa_eval_flags = @oa_eval_flags@
+oa_extra_cxxflags = @oa_extra_cxxflags@
 oa_host_has_regex = @oa_host_has_regex@
 oa_keep_files = @oa_keep_files@
 oa_lisp_flavor = @oa_lisp_flavor@