summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam Jackson <ajax@redhat.com>2008-03-24 13:37:42 -0400
committerAdam Jackson <ajax@redhat.com>2008-03-24 13:38:01 -0400
commitd6ec5eaded2a645f132f84162b5ab0a9f513e38e (patch)
treeab6acb9d6cfcf2e47224704688b557c0f7a38f51
parentf250352d2e6676af11d734c109f8edb0231f5164 (diff)
Bug #11510: Fix build without RECORD.
(cherry picked from commit 862ff9ac92037e13629329eb6ba50ff6bd2c5f71)
-rw-r--r--Makefile.am6
-rw-r--r--hw/xfree86/dixmods/Makefile.am6
2 files changed, 10 insertions, 2 deletions
diff --git a/Makefile.am b/Makefile.am
index e382d58e7..71ba2c429 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 efc5f4a39..dad2dd36b 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)