From 4a6be6ed7ca8f9070491cb95f2addfa1771f29b9 Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Tue, 14 Mar 2006 19:47:10 +0000 Subject: Merge from HEAD: 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. --- ChangeLog | 18 ++++++++++++++++++ GL/mesa/array_cache/Makefile.am | 2 +- GL/mesa/glapi/Makefile.am | 2 +- GL/mesa/main/Makefile.am | 2 +- GL/mesa/math/Makefile.am | 2 +- GL/mesa/shader/Makefile.am | 2 +- GL/mesa/shader/grammar/Makefile.am | 2 +- GL/mesa/shader/slang/Makefile.am | 2 +- GL/mesa/swrast/Makefile.am | 2 +- GL/mesa/swrast_setup/Makefile.am | 2 +- GL/mesa/tnl/Makefile.am | 2 +- configure.ac | 1 + include/dix-config.h.in | 3 +++ 13 files changed, 32 insertions(+), 10 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4b2035113..84e7ff670 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,21 @@ +2006-03-14 Eric Anholt + + * 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: + Merge from HEAD: + 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. + 2006-02-28 Adam Jackson * XpConfig/C/print/models/CANONC3200-PS/fonts/Makefile.am: diff --git a/GL/mesa/array_cache/Makefile.am b/GL/mesa/array_cache/Makefile.am index b341f01dc..0f4aec5b2 100644 --- a/GL/mesa/array_cache/Makefile.am +++ b/GL/mesa/array_cache/Makefile.am @@ -1,6 +1,6 @@ noinst_LTLIBRARIES = libac.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/glapi/Makefile.am b/GL/mesa/glapi/Makefile.am index d8b7a53e2..ae881452c 100644 --- a/GL/mesa/glapi/Makefile.am +++ b/GL/mesa/glapi/Makefile.am @@ -1,6 +1,6 @@ noinst_LTLIBRARIES = libglapi.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/main/Makefile.am b/GL/mesa/main/Makefile.am index 31e5751c6..fc9fd9537 100644 --- a/GL/mesa/main/Makefile.am +++ b/GL/mesa/main/Makefile.am @@ -1,6 +1,6 @@ noinst_LTLIBRARIES = libmain.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/math/Makefile.am b/GL/mesa/math/Makefile.am index 34d53c600..119959c6f 100644 --- a/GL/mesa/math/Makefile.am +++ b/GL/mesa/math/Makefile.am @@ -1,6 +1,6 @@ noinst_LTLIBRARIES = libmath.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/Makefile.am b/GL/mesa/shader/Makefile.am index f3ad3d25e..d286036ab 100644 --- a/GL/mesa/shader/Makefile.am +++ b/GL/mesa/shader/Makefile.am @@ -2,7 +2,7 @@ SUBDIRS = grammar slang noinst_LTLIBRARIES = libshader.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/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 d0f7fec7d..4593ac6c4 100644 --- a/GL/mesa/shader/slang/Makefile.am +++ b/GL/mesa/shader/slang/Makefile.am @@ -1,6 +1,6 @@ noinst_LTLIBRARIES = libslang.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../grammar \ diff --git a/GL/mesa/swrast/Makefile.am b/GL/mesa/swrast/Makefile.am index a67573047..6d05f7f6c 100644 --- a/GL/mesa/swrast/Makefile.am +++ b/GL/mesa/swrast/Makefile.am @@ -1,6 +1,6 @@ noinst_LTLIBRARIES = libswrast.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/swrast_setup/Makefile.am b/GL/mesa/swrast_setup/Makefile.am index d7d39ff64..3d77f8f8a 100644 --- a/GL/mesa/swrast_setup/Makefile.am +++ b/GL/mesa/swrast_setup/Makefile.am @@ -1,6 +1,6 @@ noinst_LTLIBRARIES = libss.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/tnl/Makefile.am b/GL/mesa/tnl/Makefile.am index cb88607ac..ba722be7e 100644 --- a/GL/mesa/tnl/Makefile.am +++ b/GL/mesa/tnl/Makefile.am @@ -1,6 +1,6 @@ noinst_LTLIBRARIES = libtnl.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/configure.ac b/configure.ac index 4a51daaaa..903403c80 100644 --- a/configure.ac +++ b/configure.ac @@ -735,6 +735,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_ */ -- cgit v1.2.3