configure: Parse all compiler related flags together.

7 years ago · e6ce1dd0b0
2 changed files with 2 additions and 4 deletions
--- a/3
+++ b/3
@ -5515,9 +5515,8 @@ extract() {
				@@ -5515,9 +5515,8 @@ extract() {
  IFS=$SAVEIFS
 }

-extract $CPPFLAGS
+extract "$CFLAGS $CPPFLAGS $CXXFLAGS"
 QBT_ADD_DEFINES="$QBT_ADD_DEFINES $QBT_CONF_DEFINES"
-QBT_CONF_EXTRA_CFLAGS="$QBT_CONF_EXTRA_CFLAGS $CXXFLAGS"

 # Substitute the values of these vars in conf.pri.in

--- a/configure.ac
+++ b/configure.ac
@ -204,9 +204,8 @@ extract() {
				@@ -204,9 +204,8 @@ extract() {
  IFS=$SAVEIFS
 }

-extract $CPPFLAGS
+extract "$CFLAGS $CPPFLAGS $CXXFLAGS"
 QBT_ADD_DEFINES="$QBT_ADD_DEFINES $QBT_CONF_DEFINES"
-QBT_CONF_EXTRA_CFLAGS="$QBT_CONF_EXTRA_CFLAGS $CXXFLAGS"

 # Substitute the values of these vars in conf.pri.in
 AC_SUBST(QBT_CONF_INCLUDES)