Move the apple fat binary hacks back to a header file, and make it apple-only.
This commit is contained in:
parent
6e49fdd2c8
commit
dd098501d8
|
@ -45,9 +45,7 @@ dnl drivers.
|
||||||
AC_CONFIG_HEADERS(include/xorg-server.h)
|
AC_CONFIG_HEADERS(include/xorg-server.h)
|
||||||
dnl dix-config.h covers most of the DIX (i.e. everything but the DDX, not just
|
dnl dix-config.h covers most of the DIX (i.e. everything but the DDX, not just
|
||||||
dnl dix/).
|
dnl dix/).
|
||||||
AC_CONFIG_HEADERS(include/dix-config.h, [mv include/dix-config.h include/dix-config.h.tmp
|
AC_CONFIG_HEADERS(include/dix-config.h)
|
||||||
sed 's|/undef|#undef|' < include/dix-config.h.tmp > include/dix-config.h
|
|
||||||
rm include/dix-config.h.tmp])
|
|
||||||
dnl xorg-config.h covers the Xorg DDX.
|
dnl xorg-config.h covers the Xorg DDX.
|
||||||
AC_CONFIG_HEADERS(include/xorg-config.h)
|
AC_CONFIG_HEADERS(include/xorg-config.h)
|
||||||
dnl xkb-config.h covers XKB for the Xorg and Xnest DDXs.
|
dnl xkb-config.h covers XKB for the Xorg and Xnest DDXs.
|
||||||
|
|
|
@ -62,3 +62,5 @@ endif
|
||||||
|
|
||||||
AM_CFLAGS = $(DIX_CFLAGS)
|
AM_CFLAGS = $(DIX_CFLAGS)
|
||||||
|
|
||||||
|
EXTRA_DIST = \
|
||||||
|
dix-config-apple-verbatim.h
|
||||||
|
|
|
@ -0,0 +1,8 @@
|
||||||
|
/* Do not include this file directly. It is included at the end of <dix-config.h> */
|
||||||
|
|
||||||
|
/* Correctly set _XSERVER64 for OSX fat binaries */
|
||||||
|
#if defined(__LP64__) && !defined(_XSERVER64)
|
||||||
|
#define _XSERVER64 1
|
||||||
|
#elif !defined(__LP64__) && defined(_XSERVER64)
|
||||||
|
#undef _XSERVER64
|
||||||
|
#endif
|
|
@ -422,12 +422,7 @@
|
||||||
|
|
||||||
/* Correctly set _XSERVER64 for OSX fat binaries */
|
/* Correctly set _XSERVER64 for OSX fat binaries */
|
||||||
#ifdef __APPLE__
|
#ifdef __APPLE__
|
||||||
#if defined(__LP64__) && !defined(_XSERVER64)
|
#include "dix-config-apple-verbatim.h"
|
||||||
#define _XSERVER64 1
|
|
||||||
#elif !defined(__LP64__) && defined(_XSERVER64)
|
|
||||||
/* configure mangles #undef, so we fix this in AC_CONFIG_HEADERS post process */
|
|
||||||
/undef _XSERVER64
|
|
||||||
#endif
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#endif /* _DIX_CONFIG_H_ */
|
#endif /* _DIX_CONFIG_H_ */
|
||||||
|
|
Loading…
Reference in New Issue