OpenSystemsDevelopment / qpdf

Commit 043779187e8050673078683492dd9cbe33474cb7

Authored by Jay Berkenbilt
1 parent 5eac6c50

When specifying pc_*_CFLAGS, use with C++ files as well

Inline Side-by-side
Showing 3 changed files with 9 additions and 9 deletions
autofiles.sums
  View file @0437791
1 -285564a8480dcb79d7b42bf92c1919289b12238865a9d73aa3355277b1f46dc8 configure.ac 1 +fc6b711799de9683bac96ff6951b2cb55793094652968d33069cbf41014a7808 configure.ac
2 d3f9ee6f6f0846888d9a10fd3dad2e4b1258be84205426cf04d7cef02d61dad7 aclocal.m4 2 d3f9ee6f6f0846888d9a10fd3dad2e4b1258be84205426cf04d7cef02d61dad7 aclocal.m4
3 c12d837479fa9a3fa4c278b6dc7d6b449503d663e0f0d294305595a51ff43f70 libqpdf/qpdf/qpdf-config.h.in 3 c12d837479fa9a3fa4c278b6dc7d6b449503d663e0f0d294305595a51ff43f70 libqpdf/qpdf/qpdf-config.h.in
4 5297971a0ef90bcd5563eb3f7127a032bb76d3ae2af7258bf13479caf8983a60 m4/ax_cxx_compile_stdcxx.m4 4 5297971a0ef90bcd5563eb3f7127a032bb76d3ae2af7258bf13479caf8983a60 m4/ax_cxx_compile_stdcxx.m4
configure
  View file @0437791
@@ -16830,7 +16830,7 @@ else @@ -16830,7 +16830,7 @@ else
16830 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 16830 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
16831 $as_echo "yes" >&6; } 16831 $as_echo "yes" >&6; }
16832 CFLAGS="$CFLAGS $pc_zlib_CFLAGS" 16832 CFLAGS="$CFLAGS $pc_zlib_CFLAGS"
16833 - CXXFLAGS="$CXXFLAGS $pc_zlib_CXXFLAGS" 16833 + CXXFLAGS="$CXXFLAGS $pc_zlib_CFLAGS $pc_zlib_CXXFLAGS"
16834 LIBS="$LIBS $pc_zlib_LIBS" 16834 LIBS="$LIBS $pc_zlib_LIBS"
16835 16835
16836 fi 16836 fi
@@ -16904,7 +16904,7 @@ else @@ -16904,7 +16904,7 @@ else
16904 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 16904 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
16905 $as_echo "yes" >&6; } 16905 $as_echo "yes" >&6; }
16906 CFLAGS="$CFLAGS $pc_libjpeg_CFLAGS" 16906 CFLAGS="$CFLAGS $pc_libjpeg_CFLAGS"
16907 - CXXFLAGS="$CXXFLAGS $pc_libjpeg_CXXFLAGS" 16907 + CXXFLAGS="$CXXFLAGS $pc_libjpeg_CFLAGS $pc_libjpeg_CXXFLAGS"
16908 LIBS="$LIBS $pc_libjpeg_LIBS" 16908 LIBS="$LIBS $pc_libjpeg_LIBS"
16909 16909
16910 fi 16910 fi
@@ -18183,7 +18183,7 @@ fi @@ -18183,7 +18183,7 @@ fi
18183 18183
18184 if test "$USE_CRYPTO_OPENSSL" = "1"; then 18184 if test "$USE_CRYPTO_OPENSSL" = "1"; then
18185 CFLAGS="$CFLAGS $pc_openssl_CFLAGS" 18185 CFLAGS="$CFLAGS $pc_openssl_CFLAGS"
18186 - CXXFLAGS="$CXXFLAGS $pc_openssl_CXXFLAGS" 18186 + CXXFLAGS="$CXXFLAGS $pc_openssl_CFLAGS $pc_openssl_CXXFLAGS"
18187 LIBS="$LIBS $pc_openssl_LIBS" 18187 LIBS="$LIBS $pc_openssl_LIBS"
18188 18188
18189 $as_echo "#define USE_CRYPTO_OPENSSL 1" >>confdefs.h 18189 $as_echo "#define USE_CRYPTO_OPENSSL 1" >>confdefs.h
@@ -18367,7 +18367,7 @@ fi @@ -18367,7 +18367,7 @@ fi
18367 18367
18368 if test "$USE_CRYPTO_GNUTLS" = "1"; then 18368 if test "$USE_CRYPTO_GNUTLS" = "1"; then
18369 CFLAGS="$CFLAGS $pc_gnutls_CFLAGS" 18369 CFLAGS="$CFLAGS $pc_gnutls_CFLAGS"
18370 - CXXFLAGS="$CXXFLAGS $pc_gnutls_CXXFLAGS" 18370 + CXXFLAGS="$CXXFLAGS $pc_gnutls_CFLAGS $pc_gnutls_CXXFLAGS"
18371 LIBS="$LIBS $pc_gnutls_LIBS" 18371 LIBS="$LIBS $pc_gnutls_LIBS"
18372 18372
18373 $as_echo "#define USE_CRYPTO_GNUTLS 1" >>confdefs.h 18373 $as_echo "#define USE_CRYPTO_GNUTLS 1" >>confdefs.h
configure.ac
  View file @0437791
@@ -186,12 +186,12 @@ if test "$BUILD_INTERNAL_LIBS" = "0"; then @@ -186,12 +186,12 @@ if test "$BUILD_INTERNAL_LIBS" = "0"; then
186 if test "$PKG_CONFIG" != ""; then 186 if test "$PKG_CONFIG" != ""; then
187 PKG_CHECK_MODULES([pc_zlib], [zlib], 187 PKG_CHECK_MODULES([pc_zlib], [zlib],
188 [CFLAGS="$CFLAGS $pc_zlib_CFLAGS" 188 [CFLAGS="$CFLAGS $pc_zlib_CFLAGS"
189 - CXXFLAGS="$CXXFLAGS $pc_zlib_CXXFLAGS" 189 + CXXFLAGS="$CXXFLAGS $pc_zlib_CFLAGS $pc_zlib_CXXFLAGS"
190 LIBS="$LIBS $pc_zlib_LIBS" 190 LIBS="$LIBS $pc_zlib_LIBS"
191 ], [:]) 191 ], [:])
192 PKG_CHECK_MODULES([pc_libjpeg], [libjpeg], 192 PKG_CHECK_MODULES([pc_libjpeg], [libjpeg],
193 [CFLAGS="$CFLAGS $pc_libjpeg_CFLAGS" 193 [CFLAGS="$CFLAGS $pc_libjpeg_CFLAGS"
194 - CXXFLAGS="$CXXFLAGS $pc_libjpeg_CXXFLAGS" 194 + CXXFLAGS="$CXXFLAGS $pc_libjpeg_CFLAGS $pc_libjpeg_CXXFLAGS"
195 LIBS="$LIBS $pc_libjpeg_LIBS" 195 LIBS="$LIBS $pc_libjpeg_LIBS"
196 ],[:]) 196 ],[:])
197 fi 197 fi
@@ -677,7 +677,7 @@ fi @@ -677,7 +677,7 @@ fi
677 677
678 if test "$USE_CRYPTO_OPENSSL" = "1"; then 678 if test "$USE_CRYPTO_OPENSSL" = "1"; then
679 CFLAGS="$CFLAGS $pc_openssl_CFLAGS" 679 CFLAGS="$CFLAGS $pc_openssl_CFLAGS"
680 - CXXFLAGS="$CXXFLAGS $pc_openssl_CXXFLAGS" 680 + CXXFLAGS="$CXXFLAGS $pc_openssl_CFLAGS $pc_openssl_CXXFLAGS"
681 LIBS="$LIBS $pc_openssl_LIBS" 681 LIBS="$LIBS $pc_openssl_LIBS"
682 AC_DEFINE([USE_CRYPTO_OPENSSL], 1, [Whether to use the openssl crypto provider]) 682 AC_DEFINE([USE_CRYPTO_OPENSSL], 1, [Whether to use the openssl crypto provider])
683 DEFAULT_CRYPTO=openssl 683 DEFAULT_CRYPTO=openssl
@@ -724,7 +724,7 @@ fi @@ -724,7 +724,7 @@ fi
724 724
725 if test "$USE_CRYPTO_GNUTLS" = "1"; then 725 if test "$USE_CRYPTO_GNUTLS" = "1"; then
726 CFLAGS="$CFLAGS $pc_gnutls_CFLAGS" 726 CFLAGS="$CFLAGS $pc_gnutls_CFLAGS"
727 - CXXFLAGS="$CXXFLAGS $pc_gnutls_CXXFLAGS" 727 + CXXFLAGS="$CXXFLAGS $pc_gnutls_CFLAGS $pc_gnutls_CXXFLAGS"
728 LIBS="$LIBS $pc_gnutls_LIBS" 728 LIBS="$LIBS $pc_gnutls_LIBS"
729 AC_DEFINE([USE_CRYPTO_GNUTLS], 1, [Whether to use the gnutls crypto provider]) 729 AC_DEFINE([USE_CRYPTO_GNUTLS], 1, [Whether to use the gnutls crypto provider])
730 DEFAULT_CRYPTO=gnutls 730 DEFAULT_CRYPTO=gnutls