summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ChangeLog19
-rw-r--r--GL/mesa/X/Makefile.am2
-rw-r--r--GL/mesa/array_cache/Makefile.am3
-rw-r--r--GL/mesa/glapi/Makefile.am3
-rw-r--r--GL/mesa/main/Makefile.am3
-rw-r--r--GL/mesa/math/Makefile.am3
-rw-r--r--GL/mesa/shader/Makefile.am3
-rw-r--r--GL/mesa/shader/grammar/Makefile.am2
-rw-r--r--GL/mesa/shader/slang/Makefile.am3
-rw-r--r--GL/mesa/swrast/Makefile.am3
-rw-r--r--GL/mesa/swrast_setup/Makefile.am3
-rw-r--r--GL/mesa/tnl/Makefile.am3
-rw-r--r--configure.ac1
-rw-r--r--include/dix-config.h.in3
14 files changed, 34 insertions, 20 deletions
diff --git a/ChangeLog b/ChangeLog
index 4a47ebbf9..74fc1773a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,22 @@
+2006-02-15 Eric Anholt <anholt@FreeBSD.org>
+
+ * GL/mesa/X/Makefile.am:
+ * GL/mesa/array_cache/Makefile.am:
+ * GL/mesa/glapi/Makefile.am:
+ * GL/mesa/main/Makefile.am:
+ * GL/mesa/math/Makefile.am:
+ * GL/mesa/shader/Makefile.am:
+ * GL/mesa/shader/grammar/Makefile.am:
+ * GL/mesa/shader/slang/Makefile.am:
+ * GL/mesa/swrast/Makefile.am:
+ * GL/mesa/swrast_setup/Makefile.am:
+ * GL/mesa/tnl/Makefile.am:
+ * configure.ac:
+ * include/dix-config.h.in:
+ Define NO_LIBCWRAPPER in dix-config.h, and rely on Mesa including
+ dix-config.h if DIX_HAVE_CONFIG_H is defined to get it and _XSERVER64,
+ instead of defining things like this per directory.
+
2006-02-15 Adam Jackson <ajax@freedesktop.org>
* mi/miarc.c:
* mi/mibank.c:
diff --git a/GL/mesa/X/Makefile.am b/GL/mesa/X/Makefile.am
index c43262914..e51f9e8f3 100644
--- a/GL/mesa/X/Makefile.am
+++ b/GL/mesa/X/Makefile.am
@@ -19,7 +19,7 @@ INCLUDES = -I@MESA_SOURCE@/include \
# -DXFree86Server is required because the X11 driver in Mesa thinks that
# symbol means "being built in the server"
AM_CFLAGS = $(DIX_CFLAGS) @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@ \
- -DXFree86Server -DNO_LIBCWRAPPER
+ -DXFree86Server
libX_la_SOURCES = xf86glx.c \
xf86glx_util.c \
diff --git a/GL/mesa/array_cache/Makefile.am b/GL/mesa/array_cache/Makefile.am
index 2ae01345c..0f4aec5b2 100644
--- a/GL/mesa/array_cache/Makefile.am
+++ b/GL/mesa/array_cache/Makefile.am
@@ -1,7 +1,6 @@
noinst_LTLIBRARIES = libac.la
-AM_CFLAGS = @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@ \
- -DNO_LIBCWRAPPER
+AM_CFLAGS = $(DIX_CFLAGS) @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@
INCLUDES = -I@MESA_SOURCE@/include \
-I../X \
diff --git a/GL/mesa/glapi/Makefile.am b/GL/mesa/glapi/Makefile.am
index 9f2ccdee1..ae881452c 100644
--- a/GL/mesa/glapi/Makefile.am
+++ b/GL/mesa/glapi/Makefile.am
@@ -1,7 +1,6 @@
noinst_LTLIBRARIES = libglapi.la
-AM_CFLAGS = @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@ \
- -DNO_LIBCWRAPPER
+AM_CFLAGS = $(DIX_CFLAGS) @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@
INCLUDES = -I@MESA_SOURCE@/include \
-I../X \
diff --git a/GL/mesa/main/Makefile.am b/GL/mesa/main/Makefile.am
index 7d98a0cf6..f78a3aad7 100644
--- a/GL/mesa/main/Makefile.am
+++ b/GL/mesa/main/Makefile.am
@@ -1,7 +1,6 @@
noinst_LTLIBRARIES = libmain.la
-AM_CFLAGS = @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@ \
- -DNO_LIBCWRAPPER
+AM_CFLAGS = $(DIX_CFLAGS) @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@
INCLUDES = -I@MESA_SOURCE@/include \
-I../X \
diff --git a/GL/mesa/math/Makefile.am b/GL/mesa/math/Makefile.am
index 86969ac34..119959c6f 100644
--- a/GL/mesa/math/Makefile.am
+++ b/GL/mesa/math/Makefile.am
@@ -1,7 +1,6 @@
noinst_LTLIBRARIES = libmath.la
-AM_CFLAGS = @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@ \
- -DNO_LIBCWRAPPER
+AM_CFLAGS = $(DIX_CFLAGS) @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@
INCLUDES = -I@MESA_SOURCE@/include \
-I../X \
diff --git a/GL/mesa/shader/Makefile.am b/GL/mesa/shader/Makefile.am
index 1a9cc19f1..2449b6cda 100644
--- a/GL/mesa/shader/Makefile.am
+++ b/GL/mesa/shader/Makefile.am
@@ -2,8 +2,7 @@ SUBDIRS = grammar slang
noinst_LTLIBRARIES = libshader.la
-AM_CFLAGS = @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@ \
- -DNO_LIBCWRAPPER
+AM_CFLAGS = $(DIX_CFLAGS) @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@
INCLUDES = -I@MESA_SOURCE@/include \
-I../X \
diff --git a/GL/mesa/shader/grammar/Makefile.am b/GL/mesa/shader/grammar/Makefile.am
index 7edd4f7c9..51ebb8c55 100644
--- a/GL/mesa/shader/grammar/Makefile.am
+++ b/GL/mesa/shader/grammar/Makefile.am
@@ -1,6 +1,6 @@
noinst_LTLIBRARIES = libgrammar.la
-AM_CFLAGS = @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@
+AM_CFLAGS = $(DIX_CFLAGS) @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@
INCLUDES = -I@MESA_SOURCE@/include \
-I../../X \
diff --git a/GL/mesa/shader/slang/Makefile.am b/GL/mesa/shader/slang/Makefile.am
index c34b008dd..500bb9505 100644
--- a/GL/mesa/shader/slang/Makefile.am
+++ b/GL/mesa/shader/slang/Makefile.am
@@ -1,7 +1,6 @@
noinst_LTLIBRARIES = libslang.la
-AM_CFLAGS = @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@ \
- -DNO_LIBCWRAPPER
+AM_CFLAGS = $(DIX_CFLAGS) @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@
INCLUDES = -I@MESA_SOURCE@/include \
-I../grammar \
diff --git a/GL/mesa/swrast/Makefile.am b/GL/mesa/swrast/Makefile.am
index 07f8885e0..d71d40664 100644
--- a/GL/mesa/swrast/Makefile.am
+++ b/GL/mesa/swrast/Makefile.am
@@ -1,7 +1,6 @@
noinst_LTLIBRARIES = libswrast.la
-AM_CFLAGS = @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@ \
- -DNO_LIBCWRAPPER
+AM_CFLAGS = $(DIX_CFLAGS) @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@
INCLUDES = -I@MESA_SOURCE@/include \
-I../X \
diff --git a/GL/mesa/swrast_setup/Makefile.am b/GL/mesa/swrast_setup/Makefile.am
index 113a94526..3d77f8f8a 100644
--- a/GL/mesa/swrast_setup/Makefile.am
+++ b/GL/mesa/swrast_setup/Makefile.am
@@ -1,7 +1,6 @@
noinst_LTLIBRARIES = libss.la
-AM_CFLAGS = @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@ \
- -DNO_LIBCWRAPPER
+AM_CFLAGS = $(DIX_CFLAGS) @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@
INCLUDES = -I@MESA_SOURCE@/include \
-I../X \
diff --git a/GL/mesa/tnl/Makefile.am b/GL/mesa/tnl/Makefile.am
index 6698e9fe4..0f28ceeb5 100644
--- a/GL/mesa/tnl/Makefile.am
+++ b/GL/mesa/tnl/Makefile.am
@@ -1,7 +1,6 @@
noinst_LTLIBRARIES = libtnl.la
-AM_CFLAGS = @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@ \
- -DNO_LIBCWRAPPER
+AM_CFLAGS = $(DIX_CFLAGS) @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@
INCLUDES = -I@MESA_SOURCE@/include \
-I../X \
diff --git a/configure.ac b/configure.ac
index c24deb3d7..2d71f90b1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -758,6 +758,7 @@ AC_SUBST([VENDOR_MAN_VERSION])
AC_DEFINE(DDXOSINIT, 1, [Use OsVendorInit])
AC_DEFINE(SERVER_LOCK, 1, [Use a lock to prevent multiple servers on a display])
AC_DEFINE(SMART_SCHEDULE, 1, [Include time-based scheduler])
+AC_DEFINE(NO_LIBCWRAPPER, 1, [Define to 1 if modules should avoid the libcwrapper])
AM_CONDITIONAL(DEBUG, test "x$DEBUGGING" = xyes)
if ! test "x$DEBUGGING" = xyes; then
diff --git a/include/dix-config.h.in b/include/dix-config.h.in
index 960080e8f..4ee747726 100644
--- a/include/dix-config.h.in
+++ b/include/dix-config.h.in
@@ -424,4 +424,7 @@
/* Define to 1 if `struct sockaddr_in' has a `sin_len' member */
#undef BSD44SOCKETS
+/* Define to 1 if modules should avoid the libcwrapper */
+#undef NO_LIBCWRAPPER
+
#endif /* _DIX_CONFIG_H_ */
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-02 07:03:43 +0000