Moved CPPFLAGS additions to AM_CPPFLAGS.

diff --git a/Makefile.am b/Makefile.am
index cc0f477..f335de6 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -635,7 +635,7 @@ sbr_libmh_a_SOURCES = sbr/addrsbr.c sbr/ambigsw.c sbr/atooi.c sbr/arglist.c \
 
 config/sbr_libmh_a-config.$(OBJEXT) sbr/sbr_libmh_a-mts.$(OBJEXT): Makefile
 
-sbr_libmh_a_CPPFLAGS = -I./sbr \
+sbr_libmh_a_CPPFLAGS = ${AM_CPPFLAGS} -I./sbr \
                -DNMHBINDIR='"$(bindir)"' \
                -DNMHLIBEXECDIR='"$(nmhlibexecdir)"' \
                -DNMHETCDIR='"@nmhetcdirinst@$(nmhetcdir)"' \

diff --git a/configure.ac b/configure.ac
index 921580d..612619a 100755 (executable)
--- a/configure.ac
+++ b/configure.ac
@@ -154,7 +154,7 @@ AC_CACHE_CHECK([whether compiler supports -Wextra], [nmh_cv_has_wextra],
                CFLAGS="$nmh_saved_cflags"])
 test "$nmh_cv_has_wextra" = "yes"  &&  CFLAGS="${CFLAGS:+$CFLAGS }-Wextra"
 
-dnl Check for any platform-specific additional CPPFLAGS.  This depends on
+dnl Check for any platform-specific additional AM_CPPFLAGS.  This depends on
 dnl MULTIBYTE_ENABLED having already been set.
 NMH_ADDL_CPPFLAGS
 
@@ -165,9 +165,9 @@ if test "$GCC" = yes; then
   dnl It shouldn't hurt with earlier versions because it's a cpp macro.
   dnl If the user configures with a CFLAGS that contains a -O flag
   dnl but then removes it a make time, they'll also have to remove
-  dnl -D_FORTIFY_SOURCE from CPPFLAGS because it requires optimization.
+  dnl -D_FORTIFY_SOURCE from AM_CPPFLAGS because it requires optimization.
   AS_CASE([$CFLAGS],
-          [-O*|*' -O'*],[CPPFLAGS="${CPPFLAGS:+$CPPFLAGS }-D_FORTIFY_SOURCE=2"])
+          [-O*|*' -O'*],[AM_CPPFLAGS="${AM_CPPFLAGS:+$AM_CPPFLAGS }-D_FORTIFY_SOURCE=2"])
 fi
 
 dnl FreeBSD needs a bit of magic to bring getline() into scope.
@@ -180,11 +180,11 @@ dnl If /usr/ports is installed, we use its idea of where things are installed,
 dnl otherwise we assume /usr/local.
 
 AS_IF([test `uname` = FreeBSD],
-       [CPPFLAGS="${CPPFLAGS:+$CPPFLAGS }-D_WITH_GETLINE"
+       [AM_CPPFLAGS="${AM_CPPFLAGS:+$AM_CPPFLAGS }-D_WITH_GETLINE"
         nmh_cv_freebsd_localbase=`echo '.include <bsd.port.mk>' \
                | make -k -f /dev/stdin -V LOCALBASE 2>/dev/null | sed 1q`
         test -z "$nmh_cv_freebsd_localbase" && nmh_cv_freebsd_localbase=/usr/local
-        CPPFLAGS="${CPPFLAGS:+$CPPFLAGS }-I$nmh_cv_freebsd_localbase/include"
+        AM_CPPFLAGS="${AM_CPPFLAGS:+$AM_CPPFLAGS }-I$nmh_cv_freebsd_localbase/include"
         LDFLAGS="${LDFLAGS:+$LDFLAGS }-L$nmh_cv_freebsd_localbase/lib"
 ])
 
@@ -587,7 +587,7 @@ host os                    : ${host}
 compiler                   : ${CC}
 compiler flags             : ${CFLAGS}
 linker flags               : ${LDFLAGS}
-preprocessor flags         : ${CPPFLAGS}
+preprocessor flags         : ${AM_CPPFLAGS} ${CPPFLAGS}
 source code location       : ${srcdir}
 binary install path        : ${nmhbin}
 libexec install path       : ${nmhlibexec}/nmh

diff --git a/m4/cppflags.m4 b/m4/cppflags.m4
index 8b5615a..04b7dda 100755 (executable)
--- a/m4/cppflags.m4
+++ b/m4/cppflags.m4
@@ -9,7 +9,7 @@ dnl in config.h, because it must be set before any system header is included
 dnl and there's no portable way to make sure that files generated by lex
 dnl include config.h before system header files.
 dnl
-dnl Setting CPPFLAGS directly is like DEFS, but doesn't get stomped on by
+dnl Setting AM_CPPFLAGS directly is like DEFS, but doesn't get stomped on by
 dnl configure when using config.h.
 dnl
 dnl This is intended to be extensible, by just adding candidate C preprocessor
@@ -21,8 +21,10 @@ AC_DEFUN([NMH_ADDL_CPPFLAGS],
                     [nmh_cv_addl_cppflags], [
     dnl Turn warnings into errors.
     AC_LANG_WERROR
+
+    nmh_saved_cppflags="$CPPFLAGS"
     for nmh_cv_addl_cppflags in "" "-D_GNU_SOURCE"; do
-        nmh_saved_cppflags="$CPPFLAGS"
+        CPPFLAGS="$nmh_saved_cppflags"
         AS_IF([test x"${nmh_cv_addl_cppflags}" != x],
               [CPPFLAGS="${CPPFLAGS:+$CPPFLAGS }$nmh_cv_addl_cppflags"])
         AS_IF([test ${MULTIBYTE_ENABLED} = 1],
@@ -30,15 +32,17 @@ AC_DEFUN([NMH_ADDL_CPPFLAGS],
                   [AC_LANG_PROGRAM([#include <string.h>
                                     #include <wchar.h>],
                                    [return wcwidth(0) + strdup("x") == 0])],
-                  [break;])],
+                  [AM_CPPFLAGS="${nmh_cv_addl_cppflags}"; break;])],
               [AC_COMPILE_IFELSE(
                   [AC_LANG_PROGRAM([#include <string.h>],
                                    [return strdup("x") == 0])],
-                  [break;])])
-        CPPFLAGS="$nmh_saved_cppflags"
+                  [AM_CPPFLAGS="${nmh_cv_addl_cppflags}"; break;])])
     done])
+    CPPFLAGS="$nmh_saved_cppflags"
 
     dnl autoconf doesn't currently provide a macro to disable AC_LANG_WERROR,
     dnl so do it this way:
     ac_c_werror_flag=
+
+    AC_SUBST([AM_CPPFLAGS])
 ])