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])