From 043779187e8050673078683492dd9cbe33474cb7 Mon Sep 17 00:00:00 2001
From: Jay Berkenbilt <ejb@ql.org>
Date: Thu, 4 Nov 2021 16:05:39 -0400
Subject: [PATCH] When specifying pc_*_CFLAGS, use with C++ files as well

---
 autofiles.sums | 2 +-
 configure      | 8 ++++----
 configure.ac   | 8 ++++----
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/autofiles.sums b/autofiles.sums
index 956715ab..ccf1761d 100644
--- a/autofiles.sums
+++ b/autofiles.sums
@@ -1,4 +1,4 @@
-285564a8480dcb79d7b42bf92c1919289b12238865a9d73aa3355277b1f46dc8  configure.ac
+fc6b711799de9683bac96ff6951b2cb55793094652968d33069cbf41014a7808  configure.ac
 d3f9ee6f6f0846888d9a10fd3dad2e4b1258be84205426cf04d7cef02d61dad7  aclocal.m4
 c12d837479fa9a3fa4c278b6dc7d6b449503d663e0f0d294305595a51ff43f70  libqpdf/qpdf/qpdf-config.h.in
 5297971a0ef90bcd5563eb3f7127a032bb76d3ae2af7258bf13479caf8983a60  m4/ax_cxx_compile_stdcxx.m4
diff --git a/configure b/configure
index 3118deed..6e8b7161 100755
--- a/configure
+++ b/configure
@@ -16830,7 +16830,7 @@ else
         { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 	CFLAGS="$CFLAGS $pc_zlib_CFLAGS"
-          CXXFLAGS="$CXXFLAGS $pc_zlib_CXXFLAGS"
+          CXXFLAGS="$CXXFLAGS $pc_zlib_CFLAGS $pc_zlib_CXXFLAGS"
           LIBS="$LIBS $pc_zlib_LIBS"
 
 fi
@@ -16904,7 +16904,7 @@ else
         { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 	CFLAGS="$CFLAGS $pc_libjpeg_CFLAGS"
-          CXXFLAGS="$CXXFLAGS $pc_libjpeg_CXXFLAGS"
+          CXXFLAGS="$CXXFLAGS $pc_libjpeg_CFLAGS $pc_libjpeg_CXXFLAGS"
           LIBS="$LIBS $pc_libjpeg_LIBS"
 
 fi
@@ -18183,7 +18183,7 @@ fi
 
 if test "$USE_CRYPTO_OPENSSL" = "1"; then
   CFLAGS="$CFLAGS $pc_openssl_CFLAGS"
-  CXXFLAGS="$CXXFLAGS $pc_openssl_CXXFLAGS"
+  CXXFLAGS="$CXXFLAGS $pc_openssl_CFLAGS $pc_openssl_CXXFLAGS"
   LIBS="$LIBS $pc_openssl_LIBS"
 
 $as_echo "#define USE_CRYPTO_OPENSSL 1" >>confdefs.h
@@ -18367,7 +18367,7 @@ fi
 
 if test "$USE_CRYPTO_GNUTLS" = "1"; then
   CFLAGS="$CFLAGS $pc_gnutls_CFLAGS"
-  CXXFLAGS="$CXXFLAGS $pc_gnutls_CXXFLAGS"
+  CXXFLAGS="$CXXFLAGS $pc_gnutls_CFLAGS $pc_gnutls_CXXFLAGS"
   LIBS="$LIBS $pc_gnutls_LIBS"
 
 $as_echo "#define USE_CRYPTO_GNUTLS 1" >>confdefs.h
diff --git a/configure.ac b/configure.ac
index 612a049b..76891e07 100644
--- a/configure.ac
+++ b/configure.ac
@@ -186,12 +186,12 @@ if test "$BUILD_INTERNAL_LIBS" = "0"; then
     if test "$PKG_CONFIG" != ""; then
        PKG_CHECK_MODULES([pc_zlib], [zlib],
          [CFLAGS="$CFLAGS $pc_zlib_CFLAGS"
-          CXXFLAGS="$CXXFLAGS $pc_zlib_CXXFLAGS"
+          CXXFLAGS="$CXXFLAGS $pc_zlib_CFLAGS $pc_zlib_CXXFLAGS"
           LIBS="$LIBS $pc_zlib_LIBS"
          ], [:])
        PKG_CHECK_MODULES([pc_libjpeg], [libjpeg],
          [CFLAGS="$CFLAGS $pc_libjpeg_CFLAGS"
-          CXXFLAGS="$CXXFLAGS $pc_libjpeg_CXXFLAGS"
+          CXXFLAGS="$CXXFLAGS $pc_libjpeg_CFLAGS $pc_libjpeg_CXXFLAGS"
           LIBS="$LIBS $pc_libjpeg_LIBS"
          ],[:])
     fi
@@ -677,7 +677,7 @@ fi
 
 if test "$USE_CRYPTO_OPENSSL" = "1"; then
   CFLAGS="$CFLAGS $pc_openssl_CFLAGS"
-  CXXFLAGS="$CXXFLAGS $pc_openssl_CXXFLAGS"
+  CXXFLAGS="$CXXFLAGS $pc_openssl_CFLAGS $pc_openssl_CXXFLAGS"
   LIBS="$LIBS $pc_openssl_LIBS"
   AC_DEFINE([USE_CRYPTO_OPENSSL], 1, [Whether to use the openssl crypto provider])
   DEFAULT_CRYPTO=openssl
@@ -724,7 +724,7 @@ fi
 
 if test "$USE_CRYPTO_GNUTLS" = "1"; then
   CFLAGS="$CFLAGS $pc_gnutls_CFLAGS"
-  CXXFLAGS="$CXXFLAGS $pc_gnutls_CXXFLAGS"
+  CXXFLAGS="$CXXFLAGS $pc_gnutls_CFLAGS $pc_gnutls_CXXFLAGS"
   LIBS="$LIBS $pc_gnutls_LIBS"
   AC_DEFINE([USE_CRYPTO_GNUTLS], 1, [Whether to use the gnutls crypto provider])
   DEFAULT_CRYPTO=gnutls