diff options
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/configure.ac b/configure.ac index 56bee7900..51b634eb7 100644 --- a/configure.ac +++ b/configure.ac @@ -865,11 +865,6 @@ dnl --------------------------------------------------------------------------- dnl DDX section. dnl --------------------------------------------------------------------------- -dnl These are used to define Xorg module, loader and general server defines -MODULE_DEFINES="" -LOADER_DEFINES="" -SERVER_DEFINES="" - dnl DMX DDX AC_MSG_CHECKING([whether to build Xdmx DDX]) @@ -1244,11 +1239,6 @@ int main () { AC_SUBST([XORG_CFLAGS]) AC_SUBST([LD_EXPORT_SYMBOLS_FLAG]) - dnl Module defines are used in the Xorg server and the drivers - MODULE_DEFINES="$MODULE_DEFINES -DIN_MODULE -DXFree86Module" - LOADER_DEFINES="$LOADER_DEFINES -DXFree86LOADER" - SERVER_DEFINES="$SERVER_DEFINES -DXFree86Server" - dnl these only go in xorg-config.h XF86CONFIGFILE="xorg.conf" CONFIGFILE="$sysconfdir/$XF86CONFIGFILE" @@ -1256,6 +1246,7 @@ int main () { AC_DEFINE(XORG_SERVER, 1, [Building Xorg server]) AC_DEFINE(XORGSERVER, 1, [Building Xorg server]) AC_DEFINE(XFree86Server, 1, [Building XFree86 server]) + AC_DEFINE(XFree86LOADER, 1, [Building loadable XFree86 server]) AC_DEFINE_UNQUOTED(XORG_VERSION_CURRENT, [$VENDOR_RELEASE], [Current Xorg version]) AC_DEFINE(NEED_XF86_TYPES, 1, [Need XFree86 typedefs]) AC_DEFINE(NEED_XF86_PROTOTYPES, 1, [Need XFree86 helper functions]) @@ -1593,10 +1584,6 @@ AM_CONDITIONAL(BUILD_KBD_MODE, [test x$BUILD_KBD_MODE = xyes]) AM_CONDITIONAL(BSD_KBD_MODE, [test x$KBD_MODE_TYPE = xbsd]) AM_CONDITIONAL(SUN_KBD_MODE, [test x$KBD_MODE_TYPE = xsun]) -AC_SUBST([MODULE_DEFINES]) -AC_SUBST([LOADER_DEFINES]) -AC_SUBST([SERVER_DEFINES]) - CFLAGS="$XSERVER_CFLAGS $CFLAGS" AC_SUBST([CFLAGS]) |