From 2f3208b448b1dd28919cd9b859754c5442b9969e Mon Sep 17 00:00:00 2001
From: Cory Fields <cory-nospam-@coryfields.com>
Date: Tue, 15 Nov 2016 16:12:17 -0500
Subject: [PATCH] build: fix qt5.7 build under macOS

OBJCXX's std flags don't get defined by our cxx macro. Rather than hard-coding
to c++11, just force OBJCXX to be the same as CXX unless the user specified
otherwise.
---
 configure.ac | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/configure.ac b/configure.ac
index 9db68a136..88137bee5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -63,6 +63,15 @@ fi
 AC_PROG_OBJCXX
 ])
 
+dnl Unless the user specified OBJCXX, force it to be the same as CXX. This ensures
+dnl that we get the same -std flags for both.
+m4_ifdef([AC_PROG_OBJCXX],[
+if test "x${OBJCXX+set}" = "x"; then
+  OBJCXX="${CXX}"
+fi
+AC_PROG_OBJCXX
+])
+
 dnl Libtool init checks.
 LT_INIT([pic-only])