summaryrefslogtreecommitdiff
path: root/configure.ac
diff options
context:
space:
mode:
authorMarcin Baczyński <marbacz@gmail.com>2011-07-13 21:26:49 +0200
committerMarek Olšák <maraeo@gmail.com>2011-10-02 16:49:56 +0200
commit3fc660e8967cf88ae4338f5c7b77c729a976553f (patch)
treedbff9abcf92da4313e16be45350ab72161310d8a /configure.ac
parent0fbf3562d1d3e890873b8b6b602a8a4b92c5393b (diff)
downloadmesa-3fc660e8967cf88ae4338f5c7b77c729a976553f.tar.gz
configure: allow C{,XX}FLAGS override
NOTE: This is a candidate for the 7.11 branch. Signed-off-by: Brian Paul <brianp@vmware.com> (cherry picked from commit ff2efdf5997d20b41f7a82b77118366e6fbd23bc)
Diffstat (limited to 'configure.ac')
-rw-r--r--configure.ac8
1 files changed, 8 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac
index 227c50f0547..1ca1dcecb4d 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
@@ -1824,6 +1828,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])