From: Rob Browning <rlb@defaultvalue.org>
Date: Sat, 9 Jul 2022 17:49:23 +0000 (-0500)
Subject: Capture ./configure CPPFLAGS for future, automatic runs
X-Git-Url: https://arthur.barton.de/gitweb/?p=bup.git;a=commitdiff_plain;h=386a280b06e4d3bf48b8f2f3ddbe2dd678dae50e

Capture ./configure CPPFLAGS for future, automatic runs

The value should now be captured in config/config.cmd alongside the
others.

Thanks to Greg Troxel for reporting the omission.

Signed-off-by: Rob Browning <rlb@defaultvalue.org>
Tested-by: Rob Browning <rlb@defaultvalue.org>
---

diff --git a/config/configure.inc b/config/configure.inc
index 9d105ac..0834263 100644
--- a/config/configure.inc
+++ b/config/configure.inc
@@ -968,6 +968,7 @@ AC_OUTPUT () {
     AC_SUB 'GENERATED_FILES' "$*"
     AC_SUB 'CFLAGS'  "$AC_CFLAGS"
     AC_SUB 'FCFLAGS' "$AC_FCFLAGS"
+    AC_SUB 'CPPFLAGS' "$AC_CPPFLAGS"
     AC_SUB 'CXXFLAGS' "$AC_CXXFLAGS"
     AC_SUB 'LDFLAGS' "$AC_LDFLAGS"
     AC_SUB 'srcdir'  "$AC_SRCDIR"
@@ -990,7 +991,7 @@ AC_OUTPUT () {
 	Q=\'
 	cat - > config.cmd << EOF
 #! /bin/sh
-${CXX:+CXX=${Q}${CXX}${Q}} ${CXXFLAGS:+CXXFLAGS=${Q}${CXXFLAGS}${Q}} ${FC:+FC=${Q}${FC}${Q}} ${FCFLAGS:+FCFLAGS=${Q}${FCFLAGS}${Q}} ${CC:+CC=${Q}${CC}${Q}} ${CFLAGS:+CFLAGS=${Q}${CFLAGS}${Q}} $ac_progname $ac_configure_command
+${CXX:+CXX=${Q}${CXX}${Q}} ${CPPFLAGS:+CPPFLAGS=${Q}${CPPFLAGS}${Q}} ${CXXFLAGS:+CXXFLAGS=${Q}${CXXFLAGS}${Q}} ${FC:+FC=${Q}${FC}${Q}} ${FCFLAGS:+FCFLAGS=${Q}${FCFLAGS}${Q}} ${CC:+CC=${Q}${CC}${Q}} ${CFLAGS:+CFLAGS=${Q}${CFLAGS}${Q}} $ac_progname $ac_configure_command
 EOF
 	chmod +x config.cmd