Hi. mesa cvs hasn't been building for me for about two weeks now,
inspiring me to hack together the included patch. This is on an x86
linux system (Debian 2.2pre)

The problem was that it was trying to build the glide and GGI drivers,
even though I don't have the headers (or libraries) for those. This
patch adds conditional compilation of those subdirectories based on what
configure detects as available. I'm not too familiar with automake, so
this may not be the optimal solution, but it was the cleanest I could
come up with.

Cheers,
 -ralph
[EMAIL PROTECTED]



Index: src/Makefile.am
===================================================================
RCS file: /cvs/mesa3d/src/Makefile.am,v
retrieving revision 3.6
diff -u -r3.6 Makefile.am
--- src/Makefile.am     1999/07/17 09:10:29     3.6
+++ src/Makefile.am     1999/07/24 22:31:19
@@ -2,7 +2,33 @@
 
 #AUTOMAKE_OPTIONS = no-dependencies
 
-SUBDIRS = FX GGI OSmesa SVGA X X86
+#SUBDIRS = FX GGI OSmesa SVGA X X86
+if HAVE_FX
+SUBDIR_FX = FX
+endif
+
+if HAVE_GGI
+SUBDIR_GGI = GGI
+endif
+
+if HAVE_OSMESA
+SUBDIR_OSMESA = OSmesa
+endif
+
+if HAVE_SVGA
+SUBDIR_SVGA = SVGA
+endif
+
+if HAVE_X11
+SUBDIR_X = X
+endif
+
+if HAVE_X86
+SUBDIR_X86 = X86
+endif
+
+SUBDIRS = $(SUBDIR_FX) $(SUBDIR_FX) $(SUBDIR_OSMESA) $(SUBDIR_SVGA) \
+       $(SUBDIR_X) $(SUBDIR_X86)
 
 INCLUDES = -I$(top_srcdir)/include
 

Reply via email to