andreacavalli/xserver-multidpi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Define NO_LIBCWRAPPER in dix-config.h, and rely on Mesa including

Browse Source 
dix-config.h if DIX_HAVE_CONFIG_H is defined to get it and _XSERVER64,
    instead of defining things like this per directory.
This commit is contained in:
Eric Anholt 2006-02-15 21:09:14 +00:00
parent 7d7fc927cd
commit 6770f1bdb1
14 changed files with 34 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
ChangeLog
View File

@ -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:

2
GL/mesa/X/Makefile.am
View File

@ -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 \

3
GL/mesa/array_cache/Makefile.am
View File

@ -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 \

3
GL/mesa/glapi/Makefile.am
View File

@ -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 \

3
GL/mesa/main/Makefile.am
View File

@ -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 \

3
GL/mesa/math/Makefile.am
View File

@ -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 \

3
GL/mesa/shader/Makefile.am
View File

@ -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 \

2
GL/mesa/shader/grammar/Makefile.am
View File

@ -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 \

3
GL/mesa/shader/slang/Makefile.am
View File

@ -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 \

3
GL/mesa/swrast/Makefile.am
View File

@ -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 \

3
GL/mesa/swrast_setup/Makefile.am
View File

@ -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 \

3
GL/mesa/tnl/Makefile.am
View File

@ -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 \

1
configure.ac
View File

@ -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

3
include/dix-config.h.in
View File

@ -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_ */