summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcin BaczyƄski <marbacz@gmail.com>2011-07-13 21:26:49 +0200
committerBrian Paul <brianp@vmware.com>2011-07-14 10:34:02 -0600
commitff2efdf5997d20b41f7a82b77118366e6fbd23bc (patch)
tree36ad3fed5ffb71f16e9ad260eaa4c42c9aa03990
parentfa013419deec41c2771bf4744e0f8a2bca3346d2 (diff)
configure: allow C{,XX}FLAGS override
NOTE: This is a candidate for the 7.11 branch. Signed-off-by: Brian Paul <brianp@vmware.com>
-rw-r--r--configure.ac8
1 files changed, 8 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac
index 949faa4664..7125694444 100644
--- a/configure.ac
+++ b/configure.ac
@@ -17,6 +17,10 @@ AC_INIT([Mesa],[mesa_version],
AC_CONFIG_AUX_DIR([bin])
AC_CANONICAL_HOST
+dnl Save user CFLAGS and CXXFLAGS so one can override the default ones
+USER_CFLAGS="$CFLAGS"
+USER_CXXFLAGS="$CXXFLAGS"
+
dnl Versions for external dependencies
LIBDRM_REQUIRED=2.4.24
LIBDRM_RADEON_REQUIRED=2.4.24
@@ -2022,6 +2026,10 @@ dnl Restore LDFLAGS and CPPFLAGS
LDFLAGS="$_SAVE_LDFLAGS"
CPPFLAGS="$_SAVE_CPPFLAGS"
+dnl Add user CFLAGS and CXXFLAGS
+CFLAGS="$CFLAGS $USER_CFLAGS"
+CXXFLAGS="$CXXFLAGS $USER_CXXFLAGS"
+
dnl Substitute the config
AC_CONFIG_FILES([configs/autoconf])