diff options
| author | Eric Anholt <eric@anholt.net> | 2009-01-30 16:17:58 -0800 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2009-01-30 16:36:45 -0800 |
| commit | dd098501d800571e71d06ffc936635a6c9d44e05 (patch) | |
| tree | b1503e7df4d540c145cf2755087a403e107aedb7 | |
| parent | 6e49fdd2c839b6244c23ce95c3ae76a1a265b986 (diff) | |
Move the apple fat binary hacks back to a header file, and make it apple-only.
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | include/Makefile.am | 2 | ||||
| -rw-r--r-- | include/dix-config-apple-verbatim.h | 8 | ||||
| -rw-r--r-- | include/dix-config.h.in | 7 |
4 files changed, 12 insertions, 9 deletions
diff --git a/configure.ac b/configure.ac index 71d37df60..e27140bcf 100644 --- a/configure.ac +++ b/configure.ac @@ -45,9 +45,7 @@ dnl drivers. 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/). -AC_CONFIG_HEADERS(include/dix-config.h, [mv include/dix-config.h include/dix-config.h.tmp - sed 's|/undef|#undef|' < include/dix-config.h.tmp > include/dix-config.h - rm include/dix-config.h.tmp]) +AC_CONFIG_HEADERS(include/dix-config.h) dnl xorg-config.h covers the Xorg DDX. AC_CONFIG_HEADERS(include/xorg-config.h) dnl xkb-config.h covers XKB for the Xorg and Xnest DDXs. diff --git a/include/Makefile.am b/include/Makefile.am index f6b367090..cb0b2934c 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -62,3 +62,5 @@ endif AM_CFLAGS = $(DIX_CFLAGS) +EXTRA_DIST = \ + dix-config-apple-verbatim.h diff --git a/include/dix-config-apple-verbatim.h b/include/dix-config-apple-verbatim.h new file mode 100644 index 000000000..f429d200e --- /dev/null +++ b/include/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 diff --git a/include/dix-config.h.in b/include/dix-config.h.in index 1af477def..681fb0503 100644 --- a/include/dix-config.h.in +++ b/include/dix-config.h.in @@ -422,12 +422,7 @@ /* Correctly set _XSERVER64 for OSX fat binaries */ #ifdef __APPLE__ -#if defined(__LP64__) && !defined(_XSERVER64) -#define _XSERVER64 1 -#elif !defined(__LP64__) && defined(_XSERVER64) -/* configure mangles #undef, so we fix this in AC_CONFIG_HEADERS post process */ -/undef _XSERVER64 -#endif +#include "dix-config-apple-verbatim.h" #endif #endif /* _DIX_CONFIG_H_ */ |