X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/303e8387acecca26329e939f228f78ca805b7a15..b7b980a9e051e6999799eda5a81c5a6d8061e0eb:/configure.ac

diff --git a/configure.ac b/configure.ac
index 921580de..492adfda 100755
--- 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.
@@ -524,16 +524,16 @@ AS_IF([test "x$with_oauth" = xyes && test "x$HAVE_CURL_H" = x],
 dnl ----------------
 dnl CHECK FLEX FIXUP
 dnl ----------------
-dnl Use LFLAGS make variable setting to work around bugs in flex
+dnl Use AM_LFLAGS make variable setting to work around bugs in flex
 dnl 2.5.36-37 that cause signed/unsigned mismatch,
 dnl http://sourceforge.net/p/flex/bugs/140/
 AS_IF([test "$LEX" = flex],
       [AS_CASE([`$LEX -V`],
-               [flex\ 2.5.35], [LFLAGS=\
+               [flex\ 2.5.35], [AM_LFLAGS=\
 '; sed "s/	int n;/	size_t n;/" $@ >$@.tmp && mv -f $@.tmp $@'],
-               [flex\ 2.5.3[[67]]], [LFLAGS=\
+               [flex\ 2.5.3[[67]]], [AM_LFLAGS=\
 '; sed "s/\(	\)int i;/\1yy_size_t i;/" $@ >$@.tmp && mv -f $@.tmp $@'])
-       AC_SUBST([LFLAGS])])
+       AC_SUBST([AM_LFLAGS])])
 
 dnl ------------------
 dnl FOR INTERNAL USE by the NMH test suite
@@ -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