diff options
| -rw-r--r-- | xserver/configure.ac | 49 | ||||
| -rw-r--r-- | xserver/dbe/dbe.c | 2 | ||||
| -rw-r--r-- | xserver/hw/xprint/Makefile.am | 3 | ||||
| -rw-r--r-- | xserver/os/utils.c | 18 |
4 files changed, 26 insertions, 46 deletions
diff --git a/xserver/configure.ac b/xserver/configure.ac index 822f08f92..64a50109c 100644 --- a/xserver/configure.ac +++ b/xserver/configure.ac @@ -24,7 +24,7 @@ dnl Process this file with autoconf to create configure. AC_PREREQ(2.57) dnl This is the not the Xorg version number, it's the server version number. dnl Yes, that's weird. -AC_INIT([xorg-server], 1.1.99.903, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server) +AC_INIT([xorg-server], 1.2.0, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server) AC_CONFIG_SRCDIR([Makefile.am]) AM_INIT_AUTOMAKE([dist-bzip2 foreign]) AM_MAINTAINER_MODE @@ -152,7 +152,7 @@ AC_CACHE_CHECK([for SYSV IPC], [AC_TRY_LINK([ #include <sys/shm.h> ],[ -int main () { +{ int id; id = shmget(IPC_PRIVATE, 512, SHM_W | SHM_R); if (id < 0) return -1; @@ -297,10 +297,10 @@ AC_DEFINE_UNQUOTED(OSNAME, "$OSNAME", DEFAULT_VENDOR_NAME="The X.Org Foundation" DEFAULT_VENDOR_NAME_SHORT="X.Org" DEFAULT_VERSION_MAJOR=7 -DEFAULT_VERSION_MINOR=1 -DEFAULT_VERSION_PATCH=99 -DEFAULT_VERSION_SNAP=903 -DEFAULT_RELEASE_DATE="1 December 2006" +DEFAULT_VERSION_MINOR=2 +DEFAULT_VERSION_PATCH=0 +DEFAULT_VERSION_SNAP=0 +DEFAULT_RELEASE_DATE="22 January 2007" DEFAULT_VENDOR_WEB="http://wiki.x.org" m4_ifdef([AS_HELP_STRING], , [m4_define([AS_HELP_STRING], m4_defn([AC_HELP_STRING]))]) @@ -589,7 +589,7 @@ fi if test "x$GLX" = xyes && ! test "x$MESA_SOURCE" = x; then PKG_CHECK_MODULES([XLIB], [x11]) - PKG_CHECK_MODULES([GL], [glproto >= 1.4.7]) + PKG_CHECK_MODULES([GL], [glproto >= 1.4.8]) AC_SUBST(XLIB_CFLAGS) AC_DEFINE(GLXEXT, 1, [Build GLX extension]) GLX_LIBS='$(top_builddir)/GL/glx/libglx.la $(top_builddir)/GL/mesa/libGLcore.la' @@ -948,7 +948,7 @@ dnl --------------------------------------------------------------------------- dnl DMX DDX AC_MSG_CHECKING([whether to build Xdmx DDX]) -PKG_CHECK_MODULES([DMXMODULES], [xmuu xext x11 xrender xfont xi dmxproto xau $XDMCP_MODULES], [have_dmx=yes], [have_dmx=no]) +PKG_CHECK_MODULES([DMXMODULES], [xmuu xext x11 xrender xfixes xfont xi dmxproto xau $XDMCP_MODULES], [have_dmx=yes], [have_dmx=no]) if test "x$DMX" = xauto; then DMX="$have_dmx" fi @@ -1141,10 +1141,6 @@ dnl has it in libc), or if libdl is needed to get it. # on kernels < 2.5.42 it's called 'rate' instead. AC_TRY_COMPILE([ #include <linux/kd.h> -#ifdef __sparc__ -#include <asm/param.h> -#include <asm/kbio.h> -#endif ],[ int main () { struct kbd_repeat k; @@ -1547,7 +1543,12 @@ if test "$KDRIVE" = yes; then # $MIEXT_SHADOW_LIB $XPSTUBS_LIB" KDRIVE_PURE_LIBS="$FB_LIB $MI_LIB $FIXES_LIB $XEXT_LIB $DBE_LIB $XTRAP_LIB $RECORD_LIB $GLX_LIBS $RENDER_LIB $RANDR_LIB $DAMAGE_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB $XPSTUBS_LIB $OS_LIB" KDRIVE_LIB='$(top_builddir)/hw/kdrive/src/libkdrive.a' - KDRIVE_OS_LIB='$(top_builddir)/hw/kdrive/linux/liblinux.a' + case $host_os in + *linux*) + KDRIVE_OS_LIB='$(top_builddir)/hw/kdrive/linux/liblinux.a' + KDRIVELINUX=yes + ;; + esac KDRIVE_STUB_LIB='$(top_builddir)/hw/kdrive/src/libkdrivestubs.a' KDRIVE_LIBS="$DIX_LIB $KDRIVE_LIB $KDRIVE_OS_LIB $KDRIVE_PURE_LIBS $KDRIVE_STUB_LIB $TSLIB_LIBS" @@ -1565,6 +1566,7 @@ AC_SUBST(KDRIVE_PURE_INCS) AC_SUBST(KDRIVE_CFLAGS) AC_SUBST(KDRIVE_PURE_LIBS) AC_SUBST(KDRIVE_LIBS) +AM_CONDITIONAL(KDRIVELINUX, [test "x$KDRIVELINUX" = xyes]) AM_CONDITIONAL(TSLIB, [test "x$HAVE_TSLIB" = xyes]) AM_CONDITIONAL(H3600_TS, false) AM_CONDITIONAL(KDRIVEVESA, [test x"$ac_cv_header_sys_vm86_h" = xyes]) @@ -1616,20 +1618,13 @@ dnl and the rest of these are generic, so they're in config.h AC_DEFINE(XFreeXDGA, 1, [Build XDGA support]) AC_DEFINE(XResExtension, 1, [Build XRes extension]) -dnl CYGWIN does not define fd_set if _POSIX_SOURCE is defined -dnl _*_SOURCE on Solaris restricts to the standards, and removes non-standard -dnl functions which X uses -case $host_os in - cygwin*) ;; - solaris*) ;; - darwin*) ;; - freebsd*|netbsd*|openbsd*) ;; - *) - AC_DEFINE(_POSIX_SOURCE, 1, [POSIX-compliant source]) - AC_DEFINE(_XOPEN_SOURCE, 500, [X/Open-compliant source]) - AC_DEFINE(_BSD_SOURCE, 1, [BSD-compliant source]) - ;; -esac +AC_TRY_COMPILE([ +#include <features.h> +#ifndef __GLIBC__ +#error not glibc +#endif +], [], [AC_DEFINE(_GNU_SOURCE, 1, + [ Enable GNU and other extensions to the C environment for glibc])]) AC_DEFINE_DIR(PROJECTROOT, prefix, [Overall prefix]) diff --git a/xserver/dbe/dbe.c b/xserver/dbe/dbe.c index 6a2ed6a2d..66f9328e0 100644 --- a/xserver/dbe/dbe.c +++ b/xserver/dbe/dbe.c @@ -39,7 +39,7 @@ #endif #include <string.h> -#if HAVE_STDINT_T +#if HAVE_STDINT_H #include <stdint.h> #elif !defined(UINT32_MAX) #define UINT32_MAX 0xffffffffU diff --git a/xserver/hw/xprint/Makefile.am b/xserver/hw/xprint/Makefile.am index 646d77a2a..ffeb66307 100644 --- a/xserver/hw/xprint/Makefile.am +++ b/xserver/hw/xprint/Makefile.am @@ -5,7 +5,8 @@ bin_PROGRAMS = Xprt Xprt_CFLAGS = @DIX_CFLAGS@ @XPRINT_CFLAGS@ \ -DXPRINT -DPRINT_ONLY_SERVER -D_XP_PRINT_SERVER_ \ -DXPRINTDIR=\"$(datadir)/X11/xserver\" \ - -DXPRASTERDDX -DXPPCLDDX -DXPMONOPCLDDX -DXPPSDDX + -DXPRASTERDDX -DXPPCLDDX -DXPMONOPCLDDX -DXPPSDDX \ + -DXFree86Server Xprt_LDFLAGS = -L$(top_srcdir) Xprt_LDADD = @XPRINT_LIBS@ ps/libps.la raster/libraster.la \ diff --git a/xserver/os/utils.c b/xserver/os/utils.c index 01537af6c..91157e187 100644 --- a/xserver/os/utils.c +++ b/xserver/os/utils.c @@ -53,23 +53,6 @@ OR PERFORMANCE OF THIS SOFTWARE. #include <dix-config.h> #endif -/* The world's most shocking hack, to ensure we get clock_gettime() and - * CLOCK_MONOTONIC. */ -#ifdef sun /* Needed to tell Solaris headers not to restrict to */ -#define __EXTENSIONS__ /* only the functions defined in POSIX 199309. */ -#endif - -#ifdef _POSIX_C_SOURCE -#define _SAVED_POSIX_C_SOURCE _POSIX_C_SOURCE -#undef _POSIX_C_SOURCE -#endif -#define _POSIX_C_SOURCE 199309L -#include <time.h> -#undef _POSIX_C_SOURCE -#ifdef _SAVED_POSIX_C_SOURCE -#define _POSIX_C_SOURCE _SAVED_POSIX_C_SOURCE -#endif - #ifdef __CYGWIN__ #include <stdlib.h> #include <signal.h> @@ -80,6 +63,7 @@ OR PERFORMANCE OF THIS SOFTWARE. #endif #include <X11/Xos.h> #include <stdio.h> +#include <time.h> #include "misc.h" #include <X11/X.h> #define XSERV_t |