Mesa (9.0): build: Don't build libdricore if not building classic drivers
Matt Turner
mattst88 at kemper.freedesktop.org
Wed Oct 3 22:23:10 UTC 2012
Module: Mesa
Branch: 9.0
Commit: ddb9ecca3b0f820feb4dee6bd8901f8b6e3ee0d8
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=ddb9ecca3b0f820feb4dee6bd8901f8b6e3ee0d8
Author: Matt Turner <mattst88 at gmail.com>
Date: Thu Sep 20 15:08:02 2012 -0700
build: Don't build libdricore if not building classic drivers
(cherry picked from commit 523c01524638b3d1bb363f4c0a647b0777840b7a)
---
configure.ac | 1 +
src/mesa/Makefile.am | 6 +++++-
2 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/configure.ac b/configure.ac
index 0ae8da3..1a795ca 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1089,6 +1089,7 @@ if test "x$enable_dri" = xyes; then
DRI_LIB_DEPS="$DRI_LIB_DEPS $SELINUX_LIBS $LIBDRM_LIBS $EXPAT_LIB -lm $PTHREAD_LIBS $DLOPEN_LIBS"
GALLIUM_DRI_LIB_DEPS="$GALLIUM_DRI_LIB_DEPS $SELINUX_LIBS $LIBDRM_LIBS $EXPAT_LIB -lm $PTHREAD_LIBS $DLOPEN_LIBS"
fi
+AM_CONDITIONAL(NEED_LIBDRICORE, test -n "$DRI_DIRS")
AC_SUBST([DRI_DIRS])
AC_SUBST([EXPAT_INCLUDES])
AC_SUBST([DRI_LIB_DEPS])
diff --git a/src/mesa/Makefile.am b/src/mesa/Makefile.am
index a76df8c..feec107 100644
--- a/src/mesa/Makefile.am
+++ b/src/mesa/Makefile.am
@@ -19,7 +19,11 @@
# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
# IN THE SOFTWARE.
-SUBDIRS = x86 x86-64 . libdricore drivers
+if NEED_LIBDRICORE
+DRICORE_SUBDIR = libdricore
+endif
+
+SUBDIRS = x86 x86-64 . $(DRICORE_SUBDIR) drivers
gldir = $(includedir)/GL
gl_HEADERS = $(top_srcdir)/include/GL/*.h
More information about the mesa-commit
mailing list