aboutsummaryrefslogtreecommitdiffstats
path: root/configure.ac
diff options
context:
space:
mode:
authorJay Berkenbilt <ejb@ql.org>2021-11-04 21:05:39 +0100
committerJay Berkenbilt <ejb@ql.org>2021-11-04 23:24:54 +0100
commit043779187e8050673078683492dd9cbe33474cb7 (patch)
treef6729bc307ad451a1c5c84d7b87f39b885535974 /configure.ac
parent5eac6c500c131617d251eb22b079614ae0ecdffa (diff)
downloadqpdf-043779187e8050673078683492dd9cbe33474cb7.tar.zst
When specifying pc_*_CFLAGS, use with C++ files as well
Diffstat (limited to 'configure.ac')
-rw-r--r--configure.ac8
1 files changed, 4 insertions, 4 deletions
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