[PATCH] dri: Don't build libdricommon.la if we don't need it
Jon TURNEY
jon.turney at dronecode.org.uk
Fri Jan 27 11:06:28 PST 2012
Refine 80aa78142d12b21dd7d4f0edc786af98a159a80f "dri: make sure to build libdricommon.la"
so we don't build libdricommon if we aren't building a dri driver which needs it (i.e.
if we are just building swrast)
Signed-off-by: Jon TURNEY <jon.turney at dronecode.org.uk>
---
configure.ac | 1 +
src/mesa/drivers/dri/Makefile.am | 6 +++++-
2 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/configure.ac b/configure.ac
index 06d400f..e173bcf 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1289,6 +1289,7 @@ AM_CONDITIONAL(HAVE_NOUVEAU_DRI, test x$HAVE_NOUVEAU_DRI = xyes)
AM_CONDITIONAL(HAVE_R200_DRI, test x$HAVE_R200_DRI = xyes)
AM_CONDITIONAL(HAVE_RADEON_DRI, test x$HAVE_RADEON_DRI = xyes)
AM_CONDITIONAL(HAVE_SWRAST_DRI, test x$HAVE_SWRAST_DRI = xyes)
+AM_CONDITIONAL(HAVE_COMMON_DRI, test x$HAVE_I915_DRI = xyes || test x$HAVE_I965_DRI = xyes || test x$HAVE_NOUVEAU_DRI = xyes || test x$HAVE_R200_DRI = xyes || test x$HAVE_RADEON_DRI = xyes)
dnl
dnl OSMesa configuration
diff --git a/src/mesa/drivers/dri/Makefile.am b/src/mesa/drivers/dri/Makefile.am
index 8b93582..48d3685 100644
--- a/src/mesa/drivers/dri/Makefile.am
+++ b/src/mesa/drivers/dri/Makefile.am
@@ -1,4 +1,8 @@
-SUBDIRS = common
+SUBDIRS =
+
+if HAVE_COMMON_DRI
+SUBDIRS+=common
+endif
if HAVE_I915_DRI
SUBDIRS+=i915
--
1.7.5.1
--------------070607050408000606020103--
More information about the mesa-dev
mailing list