--- configure.orig	2014-10-21 12:07:23.000000000 -0700
+++ configure	2016-11-25 13:44:03.000000000 -0700
@@ -6770,7 +6770,8 @@
 eval expanded_datadir=$expanded_datadir
 
 
-COPTIONS="$optflags"
+COPTIONS="$optflags $CFLAGS"
+CXXOPTIONS="$CXXFLAGS"