commit d5f51b33e1ecb5fd212dc911386b5eb6c2245ba3
author Alex Converse <aconverse@google.com> Tue Oct 11 12:26:24 2016 -0700
committer Nathan Egge <negge@mozilla.com> Thu Mar 09 16:21:32 2017 +0000
tree c9f6e7749edeac7b3d167b05822b71b08d151ed5
parent f4fa01e9a9a95b7d90fb9cb6ef52053f2838cbcb

Auto-detect wxwigets

Change-Id: I9f9140ed187cd82517481df95c5c98eebffa51a0

build/make/configure.sh

diff --git a/build/make/configure.sh b/build/make/configure.sh
index 1fee74b..4ece17a 100644
--- a/build/make/configure.sh
+++ b/build/make/configure.sh
@@ -464,6 +464,8 @@
 EXE_SFX   = ${EXE_SFX}
 VCPROJ_SFX = ${VCPROJ_SFX}
 RTCD_OPTIONS = ${RTCD_OPTIONS}
+WX_CXXFLAGS = ${WX_CXXFLAGS}
+WX_LDFLAGS = ${WX_LDFLAGS}
 EOF
 
   if enabled rvct; then cat >> $1 << EOF

configure

diff --git a/configure b/configure
index 0d986c6..719980d 100755
--- a/configure
+++ b/configure
@@ -241,6 +241,7 @@
     aom_ports
     pthread_h
     unistd_h
+    wxwidgets
 "
 EXPERIMENT_LIST="
     fp_mb_stats
@@ -648,6 +649,14 @@
     check_header unistd.h # for sysconf(3) and friends.
 
     check_header aom/aom_integer.h -I${source_path} && enable_feature aom_ports
+    enabled analyzer && soft_enable wxwidgets
+    if enabled wxwidgets; then
+      if ! wx-config --version > /dev/null; then
+        die "Couldn't find wx-config"
+      fi
+      WX_CXXFLAGS=$(wx-config --cppflags)
+      WX_LDFLAGS=$(wx-config --libs)
+    fi
 }
 
 process_toolchain() {