xserver: Branch 'master'
Adam Jackson
ajax at kemper.freedesktop.org
Mon Mar 24 10:37:58 PDT 2008
Makefile.am | 6 +++++-
hw/xfree86/dixmods/Makefile.am | 6 +++++-
2 files changed, 10 insertions(+), 2 deletions(-)
New commits:
commit 862ff9ac92037e13629329eb6ba50ff6bd2c5f71
Author: Adam Jackson <ajax at redhat.com>
Date: Mon Mar 24 13:37:42 2008 -0400
Bug #11510: Fix build without RECORD.
diff --git a/Makefile.am b/Makefile.am
index e382d58..71ba2c4 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -30,6 +30,10 @@ if DBE
DBE_DIR=dbe
endif
+if RECORD
+RECORD_DIR=record
+endif
+
SUBDIRS = \
doc \
include \
@@ -48,7 +52,7 @@ SUBDIRS = \
$(AFB_DIR) \
$(CFB_DIR) \
$(CFB32_DIR) \
- record \
+ $(RECORD_DIR) \
xfixes \
damageext \
$(XTRAP_DIR) \
diff --git a/hw/xfree86/dixmods/Makefile.am b/hw/xfree86/dixmods/Makefile.am
index efc5f4a..dad2dd3 100644
--- a/hw/xfree86/dixmods/Makefile.am
+++ b/hw/xfree86/dixmods/Makefile.am
@@ -26,6 +26,10 @@ if MFB
MFBMOD = libmfb.la
endif
+if RECORD
+RECORDMOD = librecord.la
+endif
+
module_LTLIBRARIES = $(AFBMOD) \
$(CFBMOD) \
libfb.la \
@@ -34,7 +38,7 @@ module_LTLIBRARIES = $(AFBMOD) \
libshadow.la
extsmoduledir = $(moduledir)/extensions
-extsmodule_LTLIBRARIES = librecord.la \
+extsmodule_LTLIBRARIES = $(RECORDMOD) \
$(DBEMOD) \
$(GLXMODS) \
$(XTRAPMOD)
More information about the xorg-commit
mailing list