diff options
| author | marha <marha@users.sourceforge.net> | 2010-02-14 21:52:51 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-02-14 21:52:51 +0000 |
| commit | 00e6751183c1e854ea3eba746b101449b32201a4 (patch) | |
| tree | 3494085d6728e086582f30c8a68846d81840303d /xorg-server/configure.ac | |
| parent | ac637a8cd15f3977f44b701c7ac71a561763c1d8 (diff) | |
| parent | 8d38172d866775594af3185ae3fbd8d750677650 (diff) | |
| download | vcxsrv-00e6751183c1e854ea3eba746b101449b32201a4.tar.gz vcxsrv-00e6751183c1e854ea3eba746b101449b32201a4.tar.bz2 vcxsrv-00e6751183c1e854ea3eba746b101449b32201a4.zip | |
svn merge ^/branches/released
Diffstat (limited to 'xorg-server/configure.ac')
| -rw-r--r-- | xorg-server/configure.ac | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/xorg-server/configure.ac b/xorg-server/configure.ac index a1e8a1c42..de252f323 100644 --- a/xorg-server/configure.ac +++ b/xorg-server/configure.ac @@ -26,8 +26,8 @@ dnl dnl Process this file with autoconf to create configure. AC_PREREQ(2.57) -AC_INIT([xorg-server], 1.7.99.3, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server) -RELEASE_DATE="(unreleased)" +AC_INIT([xorg-server], 1.7.99.901, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server) +RELEASE_DATE="2010-02-12" AC_CONFIG_SRCDIR([Makefile.am]) AM_INIT_AUTOMAKE([foreign dist-bzip2]) AM_MAINTAINER_MODE @@ -427,6 +427,9 @@ case $host_os in darwin*) AC_DEFINE(CSRG_BASED, 1, [System is BSD-like]) ;; + cygwin*) + CFLAGS="$CFLAGS -DFD_SETSIZE=256" + ;; esac dnl augment XORG_RELEASE_VERSION for our snapshot number and to expose the @@ -1829,7 +1832,9 @@ AC_MSG_RESULT([$XWIN]) if test "x$XWIN" = xyes; then PKG_CHECK_EXISTS($WINDOWSWMPROTO, [WINDOWSWM=yes], [WINDOWSWM=no]) + AC_DEFINE_DIR(SYSCONFDIR, sysconfdir, [Location of system.XWinrc]) AC_DEFINE_UNQUOTED(XORG_VERSION_CURRENT, [$VENDOR_RELEASE], [Current Xorg version]) + AC_DEFINE_UNQUOTED(__VENDORDWEBSUPPORT__, ["$VENDOR_WEB"], [Vendor web address for support]) AC_CHECK_TOOL(WINDRES, windres) case $host_os in cygwin*) @@ -1842,8 +1847,6 @@ if test "x$XWIN" = xyes; then AC_DEFINE(ROOTLESS,1,[Build Rootless code]) CFLAGS="$CFLAGS -DROOTLESS_WORKAROUND" fi - - CFLAGS="$CFLAGS -DFD_SETSIZE=256" ;; mingw*) XWIN_SERVER_NAME=Xming |