diff -Naur Mesa-4.0.3.orig/demos/Makefile.am Mesa-4.0.3.new/demos/Makefile.am
--- Mesa-4.0.3.orig/demos/Makefile.am	2002-04-17 23:37:41 +0400
+++ Mesa-4.0.3.new/demos/Makefile.am	2003-03-23 15:39:52 +0300
@@ -44,7 +44,7 @@
 	tunnel2 \
 	winpos
 
-#	osdemo \
+#	osdemo 
 
 
 CLEANFILES = test.ppm
diff -Naur Mesa-4.0.3.orig/si-glu/libnurbs/interface/Makefile.am Mesa-4.0.3.new/si-glu/libnurbs/interface/Makefile.am
--- Mesa-4.0.3.orig/si-glu/libnurbs/interface/Makefile.am	2002-01-08 18:58:11 +0300
+++ Mesa-4.0.3.new/si-glu/libnurbs/interface/Makefile.am	2003-03-23 15:51:48 +0300
@@ -8,7 +8,7 @@
 
 # Choose one of STANDALONE, LIBRARYBUILD, and GLBUILD. They are debugging
 # switches. grep LIBRARYBUILD `find .. -name '*.h'` for details.
-CXXFLAGS += -DLIBRARYBUILD -DNDEBUG
+AM_CXXFLAGS = -DLIBRARYBUILD -DNDEBUG
 
 include libNIFac_la_SOURCES
 
diff -Naur Mesa-4.0.3.orig/si-glu/libnurbs/internals/Makefile.am Mesa-4.0.3.new/si-glu/libnurbs/internals/Makefile.am
--- Mesa-4.0.3.orig/si-glu/libnurbs/internals/Makefile.am	2002-01-08 18:58:11 +0300
+++ Mesa-4.0.3.new/si-glu/libnurbs/internals/Makefile.am	2003-03-23 15:54:07 +0300
@@ -8,7 +8,7 @@
 
 # Choose one of STANDALONE, LIBRARYBUILD, and GLBUILD. They are debugging
 # switches. grep LIBRARYBUILD `find .. -name '*.h'` for details.
-CXXFLAGS += -DLIBRARYBUILD -DNDEBUG
+AM_CXXFLAGS = -DLIBRARYBUILD -DNDEBUG
 
 include libNInt_la_SOURCES
 
diff -Naur Mesa-4.0.3.orig/src/GGI/Makefile.am Mesa-4.0.3.new/src/GGI/Makefile.am
--- Mesa-4.0.3.orig/src/GGI/Makefile.am	2002-06-10 19:09:22 +0400
+++ Mesa-4.0.3.new/src/GGI/Makefile.am	2003-03-23 15:47:44 +0300
@@ -7,7 +7,7 @@
 ggimesaconfdatadir = ${sysconfdir}/ggi
 ggimesaconfdata_DATA = ggimesa.conf
 
-INCLUDES += -I$(top_srcdir)/include -I$(top_srcdir)/src/GGI/include \
+INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/src/GGI/include \
 	-I$(top_srcdir)/src $(GGI_CFLAGS)
 
 DEFS += -DGGIMESACONFFILE=\"$(ggimesaconfdatadir)/ggimesa.conf\"
diff -Naur Mesa-4.0.3.orig/src-glut/Makefile.am Mesa-4.0.3.new/src-glut/Makefile.am
--- Mesa-4.0.3.orig/src-glut/Makefile.am	2003-03-23 14:40:06 +0300
+++ Mesa-4.0.3.new/src-glut/Makefile.am	2003-03-23 15:41:32 +0300
@@ -9,7 +9,6 @@
 EXTRA_PROGRAMS = capturexfont
 
 libglut_la_LDFLAGS = -version-info @LIBGLUT_VERSION_INFO@ -L../@GLU_DIR@
-libglut_la_LIBADD = -lGLU
 libglut_la_SOURCES = \
 	glutwin32.h \
 	win32_glx.h \