cppflags.m4: Don't trample CFLAGS and CPPFLAGS.

[nmh] / configure.ac

diff --git a/configure.ac b/configure.ac
index 1d42bf53bf6a4ba207b88d59da1fdfd9ddea0feb..cb23a22d0e69f148ed53e20dc3535e533f8e4541 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -35,9 +35,9 @@ AS_IF([test x"$with_cyrus_sasl" != x -a x"$with_cyrus_sasl" != xyes -a \
 dnl Do you want client-side support for encryption with TLS?
 AC_ARG_WITH([tls], AS_HELP_STRING([--with-tls], [Enable TLS support]))
 
-dnl Do you want client-side support for using OAuth2 for SMTP authentication?
+dnl Do you want client-side support for using OAuth2 for SMTP & POP auth?
 AC_ARG_WITH([oauth], AS_HELP_STRING([--with-oauth],
-  [Enable OAuth2 support in SMTP auth]))
+  [Enable OAuth2 support in SMTP and POP auth]))
 
 dnl Set the backup prefix
 AC_ARG_WITH([hash-backup],
@@ -161,11 +161,11 @@ 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 AM_CPPFLAGS because it requires optimization.
+  dnl -D_FORTIFY_SOURCE from CPPFLAGS because it requires optimization.
   dnl Use "\ " instead of ' ' or " " for compatiblity with posh.
   AS_CASE([$CFLAGS],
           [-O|*\ -O|-O[[!0]]*|*\ -O[[!0]]*],
-          [AM_CPPFLAGS="${AM_CPPFLAGS:+$AM_CPPFLAGS }-D_FORTIFY_SOURCE=2"])
+          [CPPFLAGS="${CPPFLAGS:+$CPPFLAGS }-D_FORTIFY_SOURCE=2"])
 fi
 
 dnl FreeBSD needs a bit of magic to bring getline() into scope.
@@ -604,7 +604,7 @@ dnl exist.
 dnl
 
 AC_CONFIG_COMMANDS([build-directories],
-[test -d man || AS_MKDIR_P([man])])
+[AS_MKDIR_P([etc]); AS_MKDIR_P([man])])
 
 AC_CONFIG_COMMANDS_POST([