From 5b719394fe9cc18f114853b6a12e9e1b096f0e45 Mon Sep 17 00:00:00 2001
From: Paul Cornett <paulcor@users.noreply.github.com>
Date: Fri, 18 Sep 2020 10:02:05 -0700
Subject: [PATCH] Add library CFLAGS to CXXFLAGS, not CPPFLAGS

---
 configure    | 8 ++++----
 configure.in | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/configure b/configure
index 67963c7733..8a93a931a5 100755
--- a/configure
+++ b/configure
@@ -37145,7 +37145,7 @@ else
 $as_echo "yes" >&6; }
 
                                     USE_WEBVIEW_WEBKIT2=1
-                                    CPPFLAGS="$CPPFLAGS $WEBKIT_CFLAGS"
+                                    CXXFLAGS="$CXXFLAGS $WEBKIT_CFLAGS"
                                     EXTRALIBS_WEBVIEW="$WEBKIT_LIBS"
 
 fi
@@ -37230,7 +37230,7 @@ else
 $as_echo "yes" >&6; }
 
                                     USE_WEBVIEW_WEBKIT=1
-                                    CPPFLAGS="$CPPFLAGS $WEBKIT_CFLAGS"
+                                    CXXFLAGS="$CXXFLAGS $WEBKIT_CFLAGS"
                                     EXTRALIBS_WEBVIEW="$WEBKIT_LIBS"
 
 fi
@@ -37611,7 +37611,7 @@ $as_echo "$as_me: WARNING: Cairo library is too old and misses cairo_push_group(
 
 
                                     if test "$wxUSE_GTK" != 1; then
-                CPPFLAGS="$CAIRO_CFLAGS $CPPFLAGS"
+                CXXFLAGS="$CXXFLAGS $CAIRO_CFLAGS"
                 GUI_TK_LIBRARY="$GUI_TK_LIBRARY $CAIRO_LIBS"
             fi
         fi
@@ -37953,7 +37953,7 @@ fi
         fi
 
         if test "$wxUSE_GSTREAMER" = "yes"; then
-            CPPFLAGS="$GST_CFLAGS $CPPFLAGS"
+            CXXFLAGS="$CXXFLAGS $GST_CFLAGS"
             EXTRALIBS_MEDIA="$GST_LIBS"
 
             $as_echo "#define wxUSE_GSTREAMER 1" >>confdefs.h
diff --git a/configure.in b/configure.in
index 4168591a29..f8d572bb70 100644
--- a/configure.in
+++ b/configure.in
@@ -7462,7 +7462,7 @@ if test "$wxUSE_WEBVIEW" = "yes"; then
                                   [webkit2gtk-4.0],
                                   [
                                     USE_WEBVIEW_WEBKIT2=1
-                                    CPPFLAGS="$CPPFLAGS $WEBKIT_CFLAGS"
+                                    CXXFLAGS="$CXXFLAGS $WEBKIT_CFLAGS"
                                     EXTRALIBS_WEBVIEW="$WEBKIT_LIBS"
                                   ],
                                   [
@@ -7478,7 +7478,7 @@ if test "$wxUSE_WEBVIEW" = "yes"; then
                                   [$webkitgtk >= 1.3.1],
                                   [
                                     USE_WEBVIEW_WEBKIT=1
-                                    CPPFLAGS="$CPPFLAGS $WEBKIT_CFLAGS"
+                                    CXXFLAGS="$CXXFLAGS $WEBKIT_CFLAGS"
                                     EXTRALIBS_WEBVIEW="$WEBKIT_LIBS"
                                   ],
                                   [
@@ -7748,7 +7748,7 @@ if test "$wxUSE_CAIRO" = "yes" -o "$wx_needs_cairo" = 1; then
             dnl We don't need to do this for wxGTK as we already get Cairo
             dnl flags as part of GTK+ ones.
             if test "$wxUSE_GTK" != 1; then
-                CPPFLAGS="$CAIRO_CFLAGS $CPPFLAGS"
+                CXXFLAGS="$CXXFLAGS $CAIRO_CFLAGS"
                 GUI_TK_LIBRARY="$GUI_TK_LIBRARY $CAIRO_LIBS"
             fi
         fi
@@ -7853,7 +7853,7 @@ if test "$wxUSE_MEDIACTRL" = "yes" -o "$wxUSE_MEDIACTRL" = "auto"; then
         fi
 
         if test "$wxUSE_GSTREAMER" = "yes"; then
-            CPPFLAGS="$GST_CFLAGS $CPPFLAGS"
+            CXXFLAGS="$CXXFLAGS $GST_CFLAGS"
             EXTRALIBS_MEDIA="$GST_LIBS"
 
             AC_DEFINE(wxUSE_GSTREAMER)