Build System: Use CFLAGS instead of CPPFLAGS for pkg-config things

It only ever ends up setting a CPPFLAG in practice anyway (-Ifoo),
but it is named FOO_CFLAGS, so modify CFLAGS with it instead. The
practical consequence of this is nothing, but it is consistent,
especially since we're also modifying LIBS instead of LDFLAGS.
Basically, it's an autotools-ism.

diff --git a/configure b/configure
index bd5b6d0b2d843b2589ae323cda71d3c814dde4e7..6da83f8c0fc8d7b286c708cebaf552917fcf9eb1 100755 (executable)
--- a/configure
+++ b/configure
@@ -9796,7 +9796,7 @@ fi
                        ;;
        esac
 
-       CPPFLAGS_SAVED="${CPPFLAGS}"
+       CFLAGS_SAVED="${CFLAGS}"
        LIBS_SAVED="${LIBS}"
 
        if test "${with_argon2}" != "no"; then :
@@ -9931,7 +9931,7 @@ fi
 
        if test "${LIBARGON2}" = "Yes"; then :
 
-               CPPFLAGS="${LIBARGON2_CFLAGS} ${CPPFLAGS}"
+               CFLAGS="${LIBARGON2_CFLAGS} ${CFLAGS}"
                LIBS="${LIBARGON2_LIBS} ${LIBS}"
 
                { $as_echo "$as_me:${as_lineno-$LINENO}: checking if libargon2 appears to be usable" >&5
@@ -10011,7 +10011,7 @@ rm -f core conftest.err conftest.$ac_objext \
 
 fi
 
-       CPPFLAGS="${CPPFLAGS_SAVED}"
+       CFLAGS="${CFLAGS_SAVED}"
        LIBS="${LIBS_SAVED}"
 
        if test "${LIBARGON2}" = "No"; then :
@@ -10046,7 +10046,7 @@ fi
                        ;;
        esac
 
-       CPPFLAGS_SAVED="${CPPFLAGS}"
+       CFLAGS_SAVED="${CFLAGS}"
        LIBS_SAVED="${LIBS}"
 
        if test "${with_cracklib}" != "no"; then :
@@ -10180,7 +10180,7 @@ else
 
 fi
 
-       CPPFLAGS="${CPPFLAGS_SAVED}"
+       CFLAGS="${CFLAGS_SAVED}"
        LIBS="${LIBS_SAVED}"
 
 
@@ -10384,7 +10384,7 @@ fi
                        ;;
        esac
 
-       CPPFLAGS_SAVED="${CPPFLAGS}"
+       CFLAGS_SAVED="${CFLAGS}"
        LIBS_SAVED="${LIBS}"
 
        if test "${with_openssl}" != "no"; then :
@@ -10519,7 +10519,7 @@ fi
 
        if test "${LIBCRYPTO}" = "Yes"; then :
 
-               CPPFLAGS="${LIBCRYPTO_CFLAGS} ${CPPFLAGS}"
+               CFLAGS="${LIBCRYPTO_CFLAGS} ${CFLAGS}"
                LIBS="${LIBCRYPTO_LIBS} ${LIBS}"
 
                { $as_echo "$as_me:${as_lineno-$LINENO}: checking if libcrypto has usable MD5/SHA1/SHA2/HMAC/PBKDF2 functions" >&5
@@ -10862,7 +10862,7 @@ fi
 
 fi
 
-       CPPFLAGS="${CPPFLAGS_SAVED}"
+       CFLAGS="${CFLAGS_SAVED}"
        LIBS="${LIBS_SAVED}"
 
        if test "${LIBCRYPTO}" = "No"; then :
@@ -10901,7 +10901,7 @@ fi
                        ;;
        esac
 
-       CPPFLAGS_SAVED="${CPPFLAGS}"
+       CFLAGS_SAVED="${CFLAGS}"
        LIBS_SAVED="${LIBS}"
 
        if test "${with_idn}" != "no"; then :
@@ -11036,7 +11036,7 @@ fi
 
        if test "${LIBIDN}" = "Yes"; then :
 
-               CPPFLAGS="${LIBIDN_CFLAGS} ${CPPFLAGS}"
+               CFLAGS="${LIBIDN_CFLAGS} ${CFLAGS}"
                LIBS="${LIBIDN_LIBS} ${LIBS}"
 
                { $as_echo "$as_me:${as_lineno-$LINENO}: checking if GNU libidn appears to be usable" >&5
@@ -11088,7 +11088,7 @@ rm -f core conftest.err conftest.$ac_objext \
 
 fi
 
-       CPPFLAGS="${CPPFLAGS_SAVED}"
+       CFLAGS="${CFLAGS_SAVED}"
        LIBS="${LIBS_SAVED}"
 
        if test "${LIBIDN}" = "No"; then :
@@ -11123,7 +11123,7 @@ fi
                        ;;
        esac
 
-       CPPFLAGS_SAVED="${CPPFLAGS}"
+       CFLAGS_SAVED="${CFLAGS}"
        LIBS_SAVED="${LIBS}"
 
        if test "${with_ldap}" != "no"; then :
@@ -11257,7 +11257,7 @@ else
 
 fi
 
-       CPPFLAGS="${CPPFLAGS_SAVED}"
+       CFLAGS="${CFLAGS_SAVED}"
        LIBS="${LIBS_SAVED}"
 
 
@@ -11285,7 +11285,7 @@ fi
                        ;;
        esac
 
-       CPPFLAGS_SAVED="${CPPFLAGS}"
+       CFLAGS_SAVED="${CFLAGS}"
        LIBS_SAVED="${LIBS}"
 
        if test "${with_mbedtls}" != "no"; then :
@@ -11760,7 +11760,7 @@ fi
 
 fi
 
-       CPPFLAGS="${CPPFLAGS_SAVED}"
+       CFLAGS="${CFLAGS_SAVED}"
        LIBS="${LIBS_SAVED}"
 
 
@@ -11791,7 +11791,7 @@ fi
                        ;;
        esac
 
-       CPPFLAGS_SAVED="${CPPFLAGS}"
+       CFLAGS_SAVED="${CFLAGS}"
        LIBS_SAVED="${LIBS}"
 
        if test "${with_nettle}" != "no"; then :
@@ -11926,7 +11926,7 @@ fi
 
        if test "${LIBNETTLE}" = "Yes"; then :
 
-               CPPFLAGS="${LIBNETTLE_CFLAGS} ${CPPFLAGS}"
+               CFLAGS="${LIBNETTLE_CFLAGS} ${CFLAGS}"
                LIBS="${LIBNETTLE_LIBS} ${LIBS}"
 
                { $as_echo "$as_me:${as_lineno-$LINENO}: checking if GNU Nettle has usable MD5/SHA1/SHA2 functions" >&5
@@ -12112,7 +12112,7 @@ fi
 
 fi
 
-       CPPFLAGS="${CPPFLAGS_SAVED}"
+       CFLAGS="${CFLAGS_SAVED}"
        LIBS="${LIBS_SAVED}"
 
        if test "${LIBNETTLE}" = "No"; then :
@@ -12147,7 +12147,7 @@ fi
                        ;;
        esac
 
-       CPPFLAGS_SAVED="${CPPFLAGS}"
+       CFLAGS_SAVED="${CFLAGS}"
        LIBS_SAVED="${LIBS}"
 
        if test "${with_passwdqc}" != "no"; then :
@@ -12287,7 +12287,7 @@ else
 
 fi
 
-       CPPFLAGS="${CPPFLAGS_SAVED}"
+       CFLAGS="${CFLAGS_SAVED}"
        LIBS="${LIBS_SAVED}"
 
 
@@ -12316,7 +12316,7 @@ fi
                        ;;
        esac
 
-       CPPFLAGS_SAVED="${CPPFLAGS}"
+       CFLAGS_SAVED="${CFLAGS}"
        LIBS_SAVED="${LIBS}"
 
        if test "${with_pcre}" != "no"; then :
@@ -12451,7 +12451,7 @@ fi
 
        if test "${LIBPCRE}" = "Yes"; then :
 
-               CPPFLAGS="${LIBPCRE_CFLAGS} ${CPPFLAGS}"
+               CFLAGS="${LIBPCRE_CFLAGS} ${CFLAGS}"
                LIBS="${LIBPCRE_LIBS} ${LIBS}"
 
                { $as_echo "$as_me:${as_lineno-$LINENO}: checking if libpcre appears to be usable" >&5
@@ -12507,7 +12507,7 @@ rm -f core conftest.err conftest.$ac_objext \
 
 fi
 
-       CPPFLAGS="${CPPFLAGS_SAVED}"
+       CFLAGS="${CFLAGS_SAVED}"
        LIBS="${LIBS_SAVED}"
 
        if test "${LIBPCRE}" = "No"; then :
@@ -12546,7 +12546,7 @@ fi
                        ;;
        esac
 
-       CPPFLAGS_SAVED="${CPPFLAGS}"
+       CFLAGS_SAVED="${CFLAGS}"
        LIBS_SAVED="${LIBS}"
 
        if test "${with_qrencode}" != "no"; then :
@@ -12681,7 +12681,7 @@ fi
 
        if test "${LIBQRENCODE}" = "Yes"; then :
 
-               CPPFLAGS="${LIBQRENCODE_CFLAGS} ${CPPFLAGS}"
+               CFLAGS="${LIBQRENCODE_CFLAGS} ${CFLAGS}"
                LIBS="${LIBQRENCODE_LIBS} ${LIBS}"
 
                { $as_echo "$as_me:${as_lineno-$LINENO}: checking if libqrencode appears to be usable" >&5
@@ -12741,7 +12741,7 @@ rm -f core conftest.err conftest.$ac_objext \
 
 fi
 
-       CPPFLAGS="${CPPFLAGS_SAVED}"
+       CFLAGS="${CFLAGS_SAVED}"
        LIBS="${LIBS_SAVED}"
 
        if test "${LIBQRENCODE}" = "No"; then :
@@ -12783,7 +12783,7 @@ fi
                        ;;
        esac
 
-       CPPFLAGS_SAVED="${CPPFLAGS}"
+       CFLAGS_SAVED="${CFLAGS}"
        LIBS_SAVED="${LIBS}"
 
        if test "${with_sodium}" != "no"; then :
@@ -12918,7 +12918,7 @@ fi
 
        if test "${LIBSODIUM}" = "Yes"; then :
 
-               CPPFLAGS="${LIBSODIUM_CFLAGS} ${CPPFLAGS}"
+               CFLAGS="${LIBSODIUM_CFLAGS} ${CFLAGS}"
                LIBS="${LIBSODIUM_LIBS} ${LIBS}"
 
                { $as_echo "$as_me:${as_lineno-$LINENO}: checking if libsodium appears to be usable" >&5
@@ -13255,7 +13255,7 @@ fi
 
 fi
 
-       CPPFLAGS="${CPPFLAGS_SAVED}"
+       CFLAGS="${CFLAGS_SAVED}"
        LIBS="${LIBS_SAVED}"
 
        if test "${LIBSODIUM}" = "No"; then :
@@ -18535,7 +18535,7 @@ fi
        if test "x${with_libmowgli}" = "xyes"; then :
 
                MOWGLI_SOURCE="System"
-               CPPFLAGS="${CPPFLAGS} ${MOWGLI_CFLAGS}"
+               CFLAGS="${CFLAGS} ${MOWGLI_CFLAGS}"
                LIBS="${LIBS} ${MOWGLI_LIBS}"
 
 elif test "x${with_libmowgli}" = "xno"; then :

diff --git a/m4/atheme-libtest-argon2.m4 b/m4/atheme-libtest-argon2.m4
index ab2522b5c647a0686b687371138a5834de19f0f7..2b9c32852bcaacc8325f2e8d548f098f1b20ef90 100644 (file)
--- a/m4/atheme-libtest-argon2.m4
+++ b/m4/atheme-libtest-argon2.m4
@@ -19,7 +19,7 @@ AC_DEFUN([ATHEME_LIBTEST_ARGON2], [
                        ;;
        esac
 
-       CPPFLAGS_SAVED="${CPPFLAGS}"
+       CFLAGS_SAVED="${CFLAGS}"
        LIBS_SAVED="${LIBS}"
 
        AS_IF([test "${with_argon2}" != "no"], [
@@ -47,7 +47,7 @@ AC_DEFUN([ATHEME_LIBTEST_ARGON2], [
        ])
 
        AS_IF([test "${LIBARGON2}" = "Yes"], [
-               CPPFLAGS="${LIBARGON2_CFLAGS} ${CPPFLAGS}"
+               CFLAGS="${LIBARGON2_CFLAGS} ${CFLAGS}"
                LIBS="${LIBARGON2_LIBS} ${LIBS}"
 
                AC_MSG_CHECKING([if libargon2 appears to be usable])
@@ -99,7 +99,7 @@ AC_DEFUN([ATHEME_LIBTEST_ARGON2], [
                ])
        ])
 
-       CPPFLAGS="${CPPFLAGS_SAVED}"
+       CFLAGS="${CFLAGS_SAVED}"
        LIBS="${LIBS_SAVED}"
 
        AS_IF([test "${LIBARGON2}" = "No"], [

diff --git a/m4/atheme-libtest-crack.m4 b/m4/atheme-libtest-crack.m4
index 25b711febb98b73bb1c1c9471e4eb3ae900a2538..9ffbc9a7574d4c4d40bffe6878b5ad9a2fbf21bb 100644 (file)
--- a/m4/atheme-libtest-crack.m4
+++ b/m4/atheme-libtest-crack.m4
@@ -15,7 +15,7 @@ AC_DEFUN([ATHEME_LIBTEST_CRACK], [
                        ;;
        esac
 
-       CPPFLAGS_SAVED="${CPPFLAGS}"
+       CFLAGS_SAVED="${CFLAGS}"
        LIBS_SAVED="${LIBS}"
 
        AS_IF([test "${with_cracklib}" != "no"], [
@@ -57,6 +57,6 @@ AC_DEFUN([ATHEME_LIBTEST_CRACK], [
                LIBCRACK="No"
        ])
 
-       CPPFLAGS="${CPPFLAGS_SAVED}"
+       CFLAGS="${CFLAGS_SAVED}"
        LIBS="${LIBS_SAVED}"
 ])

diff --git a/m4/atheme-libtest-crypto.m4 b/m4/atheme-libtest-crypto.m4
index e91bf326308e367f99912ac52899def003c10f5d..cdd96c007e63ab26d75ef4babee49d11d7c93c3e 100644 (file)
--- a/m4/atheme-libtest-crypto.m4
+++ b/m4/atheme-libtest-crypto.m4
@@ -23,7 +23,7 @@ AC_DEFUN([ATHEME_LIBTEST_CRYPTO], [
                        ;;
        esac
 
-       CPPFLAGS_SAVED="${CPPFLAGS}"
+       CFLAGS_SAVED="${CFLAGS}"
        LIBS_SAVED="${LIBS}"
 
        AS_IF([test "${with_openssl}" != "no"], [
@@ -51,7 +51,7 @@ AC_DEFUN([ATHEME_LIBTEST_CRYPTO], [
        ])
 
        AS_IF([test "${LIBCRYPTO}" = "Yes"], [
-               CPPFLAGS="${LIBCRYPTO_CFLAGS} ${CPPFLAGS}"
+               CFLAGS="${LIBCRYPTO_CFLAGS} ${CFLAGS}"
                LIBS="${LIBCRYPTO_LIBS} ${LIBS}"
 
                AC_MSG_CHECKING([if libcrypto has usable MD5/SHA1/SHA2/HMAC/PBKDF2 functions])
@@ -223,7 +223,7 @@ AC_DEFUN([ATHEME_LIBTEST_CRYPTO], [
                ])
        ])
 
-       CPPFLAGS="${CPPFLAGS_SAVED}"
+       CFLAGS="${CFLAGS_SAVED}"
        LIBS="${LIBS_SAVED}"
 
        AS_IF([test "${LIBCRYPTO}" = "No"], [

diff --git a/m4/atheme-libtest-idn.m4 b/m4/atheme-libtest-idn.m4
index 8507877e7e20cbde2a066ec7045394cc206022b1..f8095c29828b069fd5c26093f910ab3d7a47dd10 100644 (file)
--- a/m4/atheme-libtest-idn.m4
+++ b/m4/atheme-libtest-idn.m4
@@ -19,7 +19,7 @@ AC_DEFUN([ATHEME_LIBTEST_IDN], [
                        ;;
        esac
 
-       CPPFLAGS_SAVED="${CPPFLAGS}"
+       CFLAGS_SAVED="${CFLAGS}"
        LIBS_SAVED="${LIBS}"
 
        AS_IF([test "${with_idn}" != "no"], [
@@ -47,7 +47,7 @@ AC_DEFUN([ATHEME_LIBTEST_IDN], [
        ])
 
        AS_IF([test "${LIBIDN}" = "Yes"], [
-               CPPFLAGS="${LIBIDN_CFLAGS} ${CPPFLAGS}"
+               CFLAGS="${LIBIDN_CFLAGS} ${CFLAGS}"
                LIBS="${LIBIDN_LIBS} ${LIBS}"
 
                AC_MSG_CHECKING([if GNU libidn appears to be usable])
@@ -74,7 +74,7 @@ AC_DEFUN([ATHEME_LIBTEST_IDN], [
                ])
        ])
 
-       CPPFLAGS="${CPPFLAGS_SAVED}"
+       CFLAGS="${CFLAGS_SAVED}"
        LIBS="${LIBS_SAVED}"
 
        AS_IF([test "${LIBIDN}" = "No"], [

diff --git a/m4/atheme-libtest-ldap.m4 b/m4/atheme-libtest-ldap.m4
index aecbc548c3c96a75066657959c8968fa256328e7..20b09a165cd7d3f77f1e8e3bf33026e737f0d5f5 100644 (file)
--- a/m4/atheme-libtest-ldap.m4
+++ b/m4/atheme-libtest-ldap.m4
@@ -15,7 +15,7 @@ AC_DEFUN([ATHEME_LIBTEST_LDAP], [
                        ;;
        esac
 
-       CPPFLAGS_SAVED="${CPPFLAGS}"
+       CFLAGS_SAVED="${CFLAGS}"
        LIBS_SAVED="${LIBS}"
 
        AS_IF([test "${with_ldap}" != "no"], [
@@ -59,6 +59,6 @@ AC_DEFUN([ATHEME_LIBTEST_LDAP], [
                LIBLDAP="No"
        ])
 
-       CPPFLAGS="${CPPFLAGS_SAVED}"
+       CFLAGS="${CFLAGS_SAVED}"
        LIBS="${LIBS_SAVED}"
 ])

diff --git a/m4/atheme-libtest-mbedcrypto.m4 b/m4/atheme-libtest-mbedcrypto.m4
index 97bba6aaeca2345221aa6a8041c3df0e9b438923..70ba7ec75b203100684afd3c42cf9448f2d779ea 100644 (file)
--- a/m4/atheme-libtest-mbedcrypto.m4
+++ b/m4/atheme-libtest-mbedcrypto.m4
@@ -18,7 +18,7 @@ AC_DEFUN([ATHEME_LIBTEST_MBEDCRYPTO], [
                        ;;
        esac
 
-       CPPFLAGS_SAVED="${CPPFLAGS}"
+       CFLAGS_SAVED="${CFLAGS}"
        LIBS_SAVED="${LIBS}"
 
        AS_IF([test "${with_mbedtls}" != "no"], [
@@ -277,6 +277,6 @@ AC_DEFUN([ATHEME_LIBTEST_MBEDCRYPTO], [
                ])
        ])
 
-       CPPFLAGS="${CPPFLAGS_SAVED}"
+       CFLAGS="${CFLAGS_SAVED}"
        LIBS="${LIBS_SAVED}"
 ])

diff --git a/m4/atheme-libtest-mowgli.m4 b/m4/atheme-libtest-mowgli.m4
index e8f68a3fb5262a8f60941f9d936e74adedc4903d..263033faa0e1e9c9463174f28c756d15ba5d57f0 100644 (file)
--- a/m4/atheme-libtest-mowgli.m4
+++ b/m4/atheme-libtest-mowgli.m4
@@ -26,7 +26,7 @@ AC_DEFUN([ATHEME_LIBTEST_MOWGLI], [
 
        AS_IF([test "x${with_libmowgli}" = "xyes"], [
                MOWGLI_SOURCE="System"
-               CPPFLAGS="${CPPFLAGS} ${MOWGLI_CFLAGS}"
+               CFLAGS="${CFLAGS} ${MOWGLI_CFLAGS}"
                LIBS="${LIBS} ${MOWGLI_LIBS}"
        ], [test "x${with_libmowgli}" = "xno"], [
                MOWGLI_SOURCE="Internal"

diff --git a/m4/atheme-libtest-nettle.m4 b/m4/atheme-libtest-nettle.m4
index d4798f1dd5b3901d656b5a60095871771eb3dd9b..09a28e8e8c733d965877db8cf99748530d5fb6e0 100644 (file)
--- a/m4/atheme-libtest-nettle.m4
+++ b/m4/atheme-libtest-nettle.m4
@@ -21,7 +21,7 @@ AC_DEFUN([ATHEME_LIBTEST_NETTLE], [
                        ;;
        esac
 
-       CPPFLAGS_SAVED="${CPPFLAGS}"
+       CFLAGS_SAVED="${CFLAGS}"
        LIBS_SAVED="${LIBS}"
 
        AS_IF([test "${with_nettle}" != "no"], [
@@ -49,7 +49,7 @@ AC_DEFUN([ATHEME_LIBTEST_NETTLE], [
        ])
 
        AS_IF([test "${LIBNETTLE}" = "Yes"], [
-               CPPFLAGS="${LIBNETTLE_CFLAGS} ${CPPFLAGS}"
+               CFLAGS="${LIBNETTLE_CFLAGS} ${CFLAGS}"
                LIBS="${LIBNETTLE_LIBS} ${LIBS}"
 
                AC_MSG_CHECKING([if GNU Nettle has usable MD5/SHA1/SHA2 functions])
@@ -140,7 +140,7 @@ AC_DEFUN([ATHEME_LIBTEST_NETTLE], [
                ])
        ])
 
-       CPPFLAGS="${CPPFLAGS_SAVED}"
+       CFLAGS="${CFLAGS_SAVED}"
        LIBS="${LIBS_SAVED}"
 
        AS_IF([test "${LIBNETTLE}" = "No"], [

diff --git a/m4/atheme-libtest-passwdqc.m4 b/m4/atheme-libtest-passwdqc.m4
index dfa5f7e1eb8d8261720cfb96e2abb1ebe782445f..a8f4e03dcbc66d03a750a595f103704f505c1c97 100644 (file)
--- a/m4/atheme-libtest-passwdqc.m4
+++ b/m4/atheme-libtest-passwdqc.m4
@@ -15,7 +15,7 @@ AC_DEFUN([ATHEME_LIBTEST_PASSWDQC], [
                        ;;
        esac
 
-       CPPFLAGS_SAVED="${CPPFLAGS}"
+       CFLAGS_SAVED="${CFLAGS}"
        LIBS_SAVED="${LIBS}"
 
        AS_IF([test "${with_passwdqc}" != "no"], [
@@ -63,6 +63,6 @@ AC_DEFUN([ATHEME_LIBTEST_PASSWDQC], [
                LIBPASSWDQC="No"
        ])
 
-       CPPFLAGS="${CPPFLAGS_SAVED}"
+       CFLAGS="${CFLAGS_SAVED}"
        LIBS="${LIBS_SAVED}"
 ])

diff --git a/m4/atheme-libtest-pcre.m4 b/m4/atheme-libtest-pcre.m4
index a0ffd12967d0868a5dac3b915be4afdc0eddb174..7f29695f32543619bdd768bf12a4af65ee81a4d5 100644 (file)
--- a/m4/atheme-libtest-pcre.m4
+++ b/m4/atheme-libtest-pcre.m4
@@ -19,7 +19,7 @@ AC_DEFUN([ATHEME_LIBTEST_PCRE], [
                        ;;
        esac
 
-       CPPFLAGS_SAVED="${CPPFLAGS}"
+       CFLAGS_SAVED="${CFLAGS}"
        LIBS_SAVED="${LIBS}"
 
        AS_IF([test "${with_pcre}" != "no"], [
@@ -47,7 +47,7 @@ AC_DEFUN([ATHEME_LIBTEST_PCRE], [
        ])
 
        AS_IF([test "${LIBPCRE}" = "Yes"], [
-               CPPFLAGS="${LIBPCRE_CFLAGS} ${CPPFLAGS}"
+               CFLAGS="${LIBPCRE_CFLAGS} ${CFLAGS}"
                LIBS="${LIBPCRE_LIBS} ${LIBS}"
 
                AC_MSG_CHECKING([if libpcre appears to be usable])
@@ -75,7 +75,7 @@ AC_DEFUN([ATHEME_LIBTEST_PCRE], [
                ])
        ])
 
-       CPPFLAGS="${CPPFLAGS_SAVED}"
+       CFLAGS="${CFLAGS_SAVED}"
        LIBS="${LIBS_SAVED}"
 
        AS_IF([test "${LIBPCRE}" = "No"], [

diff --git a/m4/atheme-libtest-qrencode.m4 b/m4/atheme-libtest-qrencode.m4
index 6b48204325a2af1776c13918c7583258f0a17ba2..468ceb78206fa714d7859ee255c48c0d3cf48379 100644 (file)
--- a/m4/atheme-libtest-qrencode.m4
+++ b/m4/atheme-libtest-qrencode.m4
@@ -19,7 +19,7 @@ AC_DEFUN([ATHEME_LIBTEST_QRENCODE], [
                        ;;
        esac
 
-       CPPFLAGS_SAVED="${CPPFLAGS}"
+       CFLAGS_SAVED="${CFLAGS}"
        LIBS_SAVED="${LIBS}"
 
        AS_IF([test "${with_qrencode}" != "no"], [
@@ -47,7 +47,7 @@ AC_DEFUN([ATHEME_LIBTEST_QRENCODE], [
        ])
 
        AS_IF([test "${LIBQRENCODE}" = "Yes"], [
-               CPPFLAGS="${LIBQRENCODE_CFLAGS} ${CPPFLAGS}"
+               CFLAGS="${LIBQRENCODE_CFLAGS} ${CFLAGS}"
                LIBS="${LIBQRENCODE_LIBS} ${LIBS}"
 
                AC_MSG_CHECKING([if libqrencode appears to be usable])
@@ -75,7 +75,7 @@ AC_DEFUN([ATHEME_LIBTEST_QRENCODE], [
                ])
        ])
 
-       CPPFLAGS="${CPPFLAGS_SAVED}"
+       CFLAGS="${CFLAGS_SAVED}"
        LIBS="${LIBS_SAVED}"
 
        AS_IF([test "${LIBQRENCODE}" = "No"], [

diff --git a/m4/atheme-libtest-sodium.m4 b/m4/atheme-libtest-sodium.m4
index 6a825ea6d65ce4ad8f28882ed5f9781cb41b76e1..b1bbaee0325e4e3e23234a86bc208db326552870 100644 (file)
--- a/m4/atheme-libtest-sodium.m4
+++ b/m4/atheme-libtest-sodium.m4
@@ -22,7 +22,7 @@ AC_DEFUN([ATHEME_LIBTEST_SODIUM], [
                        ;;
        esac
 
-       CPPFLAGS_SAVED="${CPPFLAGS}"
+       CFLAGS_SAVED="${CFLAGS}"
        LIBS_SAVED="${LIBS}"
 
        AS_IF([test "${with_sodium}" != "no"], [
@@ -50,7 +50,7 @@ AC_DEFUN([ATHEME_LIBTEST_SODIUM], [
        ])
 
        AS_IF([test "${LIBSODIUM}" = "Yes"], [
-               CPPFLAGS="${LIBSODIUM_CFLAGS} ${CPPFLAGS}"
+               CFLAGS="${LIBSODIUM_CFLAGS} ${CFLAGS}"
                LIBS="${LIBSODIUM_LIBS} ${LIBS}"
 
                AC_MSG_CHECKING([if libsodium appears to be usable])
@@ -212,7 +212,7 @@ AC_DEFUN([ATHEME_LIBTEST_SODIUM], [
                ])
        ])
 
-       CPPFLAGS="${CPPFLAGS_SAVED}"
+       CFLAGS="${CFLAGS_SAVED}"
        LIBS="${LIBS_SAVED}"
 
        AS_IF([test "${LIBSODIUM}" = "No"], [