summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--GL/mesa/shader/slang/Makefile.am3
2 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 67f1f1c18..b1337fc79 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-02-14 Eric Anholt <anholt@FreeBSD.org>
+
+ * GL/mesa/shader/slang/Makefile.am:
+ Avoid some more libcwrapper damage that prevented kdrive linking.
+
2006-02-14 Benjamin Herrenschmidt <benh@kernel.crashing.org>
* hw/xfree86/dri/dri.c: (DRIGetSecs):
diff --git a/GL/mesa/shader/slang/Makefile.am b/GL/mesa/shader/slang/Makefile.am
index ae2e88b87..c34b008dd 100644
--- a/GL/mesa/shader/slang/Makefile.am
+++ b/GL/mesa/shader/slang/Makefile.am
@@ -1,6 +1,7 @@
noinst_LTLIBRARIES = libslang.la
-AM_CFLAGS = @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@
+AM_CFLAGS = @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@ \
+ -DNO_LIBCWRAPPER
INCLUDES = -I@MESA_SOURCE@/include \
-I../grammar \