From 0c5e1ab504b4e8c56974a234bd440e9fa2f1f941 Mon Sep 17 00:00:00 2001
From: marha <marha@users.sourceforge.net>
Date: Mon, 12 Oct 2009 19:11:20 +0000
Subject: Updated to:   font-util-1.1.1   xorg-server-1.7.0.901

---
 xorg-server/os/Makefile.am | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'xorg-server/os/Makefile.am')

diff --git a/xorg-server/os/Makefile.am b/xorg-server/os/Makefile.am
index 9ce8ff274..22ed1946c 100644
--- a/xorg-server/os/Makefile.am
+++ b/xorg-server/os/Makefile.am
@@ -41,8 +41,7 @@ endif
 EXTRA_DIST = $(SECURERPC_SRCS) $(INTERNALMALLOC_SRCS) \
      $(XDMCP_SRCS) $(STRLCAT_SRCS)
 
-if !XQUARTZ
-if XSERVER_DTRACE
+if SPECIAL_DTRACE_OBJECTS
 # Generate dtrace object code for probes in libos & libdix
 dtrace.o: $(top_srcdir)/dix/Xserver.d $(am_libos_la_OBJECTS)
 	$(DTRACE) -G -C -o $@ -s $(top_srcdir)/dix/Xserver.d .libs/*.o ../dix/.libs/*.o
@@ -52,7 +51,6 @@ noinst_PROGRAMS = os.O
 os.O: dtrace.o $(am_libos_la_OBJECTS)
 	ld -r -o $@ dtrace.o .libs/*.o
 endif
-endif
 
 os.c:
 	touch $@
-- 
cgit v1.2.3