On Monday, 1999 August 30, Jon Taylor announced:

> In Mesa/src/FX/Makefile.am, the "if HAVE_X86" block should also be
> wrapped in "if HAVE_FX".

This keeps Mesa from building out of the box for me too. I've attached
a patch that does just that, though I'd prefer just to filter the
subdirs at the src level.

Whatever, this works...

 -ralph
Index: src/FX/X86/Makefile.am
===================================================================
RCS file: /cvs/mesa3d/Mesa/src/FX/X86/Makefile.am,v
retrieving revision 1.2
diff -u -r1.2 Makefile.am
--- src/FX/X86/Makefile.am      1999/09/03 15:48:54     1.2
+++ src/FX/X86/Makefile.am      1999/09/05 06:26:35
@@ -4,6 +4,8 @@
 
 INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/src $(FX_CFLAGS)
 
+if HAVE_FX
+
 x3dnow_files = \
        fx_3dnow_fasttmp.h \
        fx_3dnow_fastpath.S
@@ -24,10 +26,13 @@
 fx_3dnow_fastpath.lo: fx_3dnow_fastpath.S fx_regoff.h fx_3dnow_fasttmp.h
 
 noinst_LTLIBRARIES = libMesaFX_X86.la
-
-endif
 
+endif # HAVE_X86
 
 CLEANFILES = fx_regoff.h fx_gen_regoff
 BUILT_SOURCES = fx_regoff.h
 libMesaFX_X86_la_SOURCES =  $(x3dnow_sources)
+
+endif # HAVE_FX
+

Reply via email to