Merge branch 'pop-stls'

[nmh] / m4 / cppflags.m4

diff --git a/m4/cppflags.m4 b/m4/cppflags.m4
index 1e2401c..b860ea6 100644 (file)
--- a/m4/cppflags.m4
+++ b/m4/cppflags.m4
@@ -1,4 +1,3 @@
-dnl

 dnl This is intended to be extensible, by just adding candidate C preprocessor
 dnl options to be checked in the for loop.  The first candidate is empty, in
 dnl case none are needed.  Also, the test program can be readily augmented.
 dnl This is intended to be extensible, by just adding candidate C preprocessor
 dnl options to be checked in the for loop.  The first candidate is empty, in
 dnl case none are needed.  Also, the test program can be readily augmented.


@@ -43,9 +42,10 @@ AC_DEFUN([NMH_ADDL_CPPFLAGS],
                   [AC_LANG_PROGRAM([#include <string.h>],
                                    [return strdup("x") == 0])],
                   [AM_CPPFLAGS="${nmh_cv_addl_cppflags}"; break;])])
                   [AC_LANG_PROGRAM([#include <string.h>],
                                    [return strdup("x") == 0])],
                   [AM_CPPFLAGS="${nmh_cv_addl_cppflags}"; break;])])

-    done])
+    done

     CFLAGS="$nmh_saved_cflags"
     CPPFLAGS="$nmh_saved_cppflags"
     CFLAGS="$nmh_saved_cflags"
     CPPFLAGS="$nmh_saved_cppflags"

+    ])

 
     dnl autoconf doesn't currently provide a macro to disable AC_LANG_WERROR,
     dnl so do it this way:
 
     dnl autoconf doesn't currently provide a macro to disable AC_LANG_WERROR,
     dnl so do it this way: