diff options
Diffstat (limited to 'mesalib/configure.ac')
| -rw-r--r-- | mesalib/configure.ac | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/mesalib/configure.ac b/mesalib/configure.ac index 7c50e3c00..f3f5e3e94 100644 --- a/mesalib/configure.ac +++ b/mesalib/configure.ac @@ -18,6 +18,14 @@ AC_CONFIG_AUX_DIR([bin]) AC_CANONICAL_HOST AM_INIT_AUTOMAKE([foreign]) +# Support silent build rules, requires at least automake-1.11. Disable +# by either passing --disable-silent-rules to configure or passing V=1 +# to make +m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) + +LT_PREREQ([2.2]) +LT_INIT([disable-static]) + dnl Save user CFLAGS and CXXFLAGS so one can override the default ones USER_CFLAGS="$CFLAGS" USER_CXXFLAGS="$CXXFLAGS" @@ -1282,9 +1290,18 @@ AC_SUBST([DRI_LIB_DEPS]) case $DRI_DIRS in *i915*|*i965*) PKG_CHECK_MODULES([INTEL], [libdrm_intel >= $LIBDRM_INTEL_REQUIRED]) + + case $DRI_DIRS in + *i965*) + HAVE_I965_DRI=yes; + ;; + esac + ;; esac +AM_CONDITIONAL(HAVE_I965_DRI, test x$HAVE_I965_DRI = xyes) + case $DRI_DIRS in *nouveau*) PKG_CHECK_MODULES([NOUVEAU], [libdrm_nouveau >= $LIBDRM_NOUVEAU_REQUIRED]) @@ -1924,6 +1941,7 @@ CXXFLAGS="$CXXFLAGS $USER_CXXFLAGS" dnl Substitute the config AC_CONFIG_FILES([configs/autoconf + src/mesa/drivers/dri/i965/Makefile tests/Makefile tests/glx/Makefile]) |