Mesa-am.patch

   1 --- Mesa-5.0.2/si-glu/libnurbs/interface/Makefile.am.orig       2003-05-15 15:58:16.000000000 +0200
   2 +++ Mesa-5.0.2/si-glu/libnurbs/interface/Makefile.am    2003-10-05 23:46:01.438531760 +0200
   3 @@ -8,7 +8,7 @@
   4
   5  # Choose one of STANDALONE, LIBRARYBUILD, and GLBUILD. They are debugging
   6  # switches. grep LIBRARYBUILD `find .. -name '*.h'` for details.
   7 -CXXFLAGS += -DLIBRARYBUILD -DNDEBUG
   8 +AM_CXXFLAGS = -DLIBRARYBUILD -DNDEBUG
   9
  10  include libNIFac_la_SOURCES
  11
  12 --- Mesa-5.0.2/si-glu/libnurbs/internals/Makefile.am.orig       2003-05-15 15:58:16.000000000 +0200
  13 +++ Mesa-5.0.2/si-glu/libnurbs/internals/Makefile.am    2003-10-05 23:46:20.456640568 +0200
  14 @@ -8,7 +8,7 @@
  15
  16  # Choose one of STANDALONE, LIBRARYBUILD, and GLBUILD. They are debugging
  17  # switches. grep LIBRARYBUILD `find .. -name '*.h'` for details.
  18 -CXXFLAGS += -DLIBRARYBUILD -DNDEBUG
  19 +AM_CXXFLAGS = -DLIBRARYBUILD -DNDEBUG
  20
  21  include libNInt_la_SOURCES
  22
  23 --- Mesa-5.0.2/si-glu/libnurbs/nurbtess/Makefile.am.orig        2003-05-15 15:58:16.000000000 +0200
  24 +++ Mesa-5.0.2/si-glu/libnurbs/nurbtess/Makefile.am     2003-10-05 23:46:29.455272568 +0200
  25 @@ -8,7 +8,7 @@
  26
  27  # Choose one of STANDALONE, LIBRARYBUILD, and GLBUILD. They are debugging
  28  # switches. grep LIBRARYBUILD `find .. -name '*.h'` for details.
  29 -CFLAGS += -DLIBRARYBUILD -DNDEBUG
  30 +AM_CFLAGS = -DLIBRARYBUILD -DNDEBUG
  31
  32  include libNTess_la_SOURCES
  33
  34 --- Mesa-5.0.2/src-glut/Makefile.am.orig        2003-05-15 15:58:20.000000000 +0200
  35 +++ Mesa-5.0.2/src-glut/Makefile.am     2003-10-05 23:47:38.298806760 +0200
  36 @@ -9,7 +9,6 @@
  37  EXTRA_PROGRAMS = capturexfont
  38
  39  libglut_la_LDFLAGS = -version-info @LIBGLUT_VERSION_INFO@ -L../@GLU_DIR@
  40 -libglut_la_LIBADD = -lGLU
  41  libglut_la_SOURCES = \
  42         glutwin32.h \
  43         win32_glx.h \
  44 @@ -67,7 +66,7 @@
  45         layerutil.h \
  46         stroke.h
  47
  48 -libglut_la_LIBADD = $(X_LIBS) $(X_PRE_LIBS) $(X_LIBADD)
  49 +libglut_la_LIBADD = $(X_LIBS) $(X_PRE_LIBS) $(X_LIBADD) -lGLU
  50  capturexfont_LDFLAGS = $(X_LIBS) $(X_PRE_LIBS) $(X_LIBADD)
  51
  52  EXTRA_DIST = descript.mms
  53 --- Mesa-5.0.2/demos/Makefile.am.orig   2003-05-15 15:58:14.000000000 +0200
  54 +++ Mesa-5.0.2/demos/Makefile.am        2003-10-05 23:48:00.977359096 +0200
  55 @@ -44,7 +44,7 @@
  56         tunnel2 \
  57         winpos
  58
  59 -#      osdemo \
  60 +#      osdemo
  61
  62
  63  CLEANFILES = test.ppm
  64 --- Mesa-5.0.2/ggi/ggiglut/Makefile.am.orig     2003-05-15 15:58:14.000000000 +0200
  65 +++ Mesa-5.0.2/ggi/ggiglut/Makefile.am  2003-10-05 23:48:27.849273944 +0200
  66 @@ -3,7 +3,7 @@
  67  if HAVE_GGI
  68    lib_LTLIBRARIES = libglut.la
  69    libglut_la_SOURCES = ggiglut.c debug.h
  70 -  libglut_la_LDFLAGS = -version-info $(LIBGLUT_VERSION)
  71 +  libglut_la_LDFLAGS = -version-info $(LIBGLUT_VERSION_INFO)
  72  endif
  73
  74  ggiincludedir = $(includedir)/ggi
  75 --- Mesa-5.0.2/src/GGI/Makefile.am.orig 2003-05-15 15:58:19.000000000 +0200
  76 +++ Mesa-5.0.2/src/GGI/Makefile.am      2003-10-05 23:51:19.580166880 +0200
  77 @@ -7,7 +7,7 @@
  78  ggimesaconfdatadir = ${sysconfdir}/ggi
  79  ggimesaconfdata_DATA = ggimesa.conf
  80
  81 -INCLUDES += -I$(top_srcdir)/include -I$(top_srcdir)/src/GGI/include \
  82 +INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/src/GGI/include \
  83         -I$(top_srcdir)/src $(GGI_CFLAGS)
  84
  85  DEFS += -DGGIMESACONFFILE=\"$(ggimesaconfdatadir)/ggimesa.conf\"
  86 --- Mesa-5.0.2/configure.in.orig        2003-10-05 23:51:56.000000000 +0200
  87 +++ Mesa-5.0.2/configure.in     2003-10-05 23:54:09.250373088 +0200
  88 @@ -461,6 +461,9 @@
  89
  90    AM_CONDITIONAL(HAVE_GGI_FBDEV, test $build_ggi_fbdev_target = yes)
  91    AM_CONDITIONAL(HAVE_GGI_GENKGI, test $build_ggi_genkgi_driver = yes)
  92 +else
  93 +  AM_CONDITIONAL(HAVE_GGI_FBDEV, false)
  94 +  AM_CONDITIONAL(HAVE_GGI_GENKGI, false)
  95  fi
  96  ggi_confdir=$prefix/etc
  97  ggi_libdir=$prefix/lib
  98 --- Mesa-5.0.2/src/X86/Makefile.am.orig 2003-05-15 15:58:20.000000000 +0200
  99 +++ Mesa-5.0.2/src/X86/Makefile.am      2003-10-06 00:07:21.525928896 +0200
 100 @@ -77,6 +77,7 @@
 101  libMesaX86_la_SOURCES = $(x86_sources) $(mmx_sources) $(x3dnow_sources) $(sse_sources)
 102
 103  INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/src $(CFLAGS_X86) $(CFLAGS_MMX) $(CFLAGS_3DNOW) $(CFLAGS_SSE)
 104 +AM_CCASFLAGS = $(INCLUDES)
 105
 106  EXTRA_DIST = $(x3dnow_files) $(mmx_files) $(sse_files)
 107