* lib/autoconf/c.m4 (AC_OPENMP): Simplify use of AC_ARG_ENABLE.

* tests/local.at (AT_CHECK_ENV): Exempt OPENMP_CFLAGS.

diff --git a/ChangeLog b/ChangeLog
index 4335adc84638f3b6e5625301ce0e9434b07b6050..947a725f176144787f4a0728e57cab9723538091 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-05-21  Noah Misch  <noah@cs.caltech.edu>
+
+       * lib/autoconf/c.m4 (AC_OPENMP): Simplify use of AC_ARG_ENABLE. 
+       * tests/local.at (AT_CHECK_ENV): Exempt OPENMP_CFLAGS.
+
 2007-05-21  Bruno Haible  <bruno@clisp.org>
 
        * NEWS: Rename AC_C_OPENMP to AC_OPENMP.

diff --git a/lib/autoconf/c.m4 b/lib/autoconf/c.m4
index 5a1ce18deaa496d7580c8bf8296d1fbc598c3bb0..51d6b50c92baf8c29f8e4821f7c6658a7f64e881 100644 (file)
--- a/lib/autoconf/c.m4
+++ b/lib/autoconf/c.m4
@@ -1889,12 +1889,10 @@ AC_DEFUN([AC_OPENMP],
 [
   AC_MSG_CHECKING([whether to use OpenMP])
   AC_ARG_ENABLE(openmp,
-    [AS_HELP_STRING([--disable-openmp], [do not use OpenMP])],
-    [],
-    [enable_openmp=yes])
+    [AS_HELP_STRING([--disable-openmp], [do not use OpenMP])])
   AC_MSG_RESULT([$enable_openmp])
   OPENMP_[]_AC_LANG_PREFIX[]FLAGS=
-  if test "$enable_openmp" = yes; then
+  if test "$enable_openmp" != no; then
     AC_MSG_CHECKING([for $CC option to support OpenMP])
     AC_CACHE_VAL([ac_cv_prog_[]_AC_LANG_ABBREV[]_openmp], [
       ac_cv_prog_[]_AC_LANG_ABBREV[]_openmp=unsupported

diff --git a/tests/local.at b/tests/local.at
index 6985edc87e961f1beed5c5a9ac5fe47b1a196d98..3673bcd0e959f3fc17dc68ce2adfb3ef9dbb57df 100644 (file)
--- a/tests/local.at
+++ b/tests/local.at
@@ -297,6 +297,7 @@ if test -f state-env.before && test -f state-env.after; then
       [CC|CFLAGS|CPP|GCC|CXX|CXXFLAGS|CXXCPP|GXX|F77|FFLAGS|FLIBS|G77],
       [ERL|ERLC|ERLCFLAGS|ERLANG_PATH_ERL|ERLANG_ROOT_DIR|ERLANG_LIB_DIR],
       [ERLANG_INSTALL_LIB_DIR|OBJC|OBJCPP|OBJCFLAGS],
+      [OPENMP_CFLAGS],
       [LIBS|LIB@&t@OBJS|LTLIBOBJS|LDFLAGS],
       [INSTALL(_(DATA|PROGRAM|SCRIPT))?],
       [CYGWIN|ISC|MINGW32|MINIX|EMXOS2|XENIX|EXEEXT|OBJEXT],