diff options
| author | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2006-12-16 20:59:17 +0000 |
|---|---|---|
| committer | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2006-12-16 20:59:17 +0000 |
| commit | 0f89778bb91852ec3345e971c072341ccc662853 (patch) | |
| tree | d36727f30a62a75a023ea805029be8afc5ddd006 /xserver/configure.ac | |
| parent | 3303f04e5d0542a9fb093f27c34331b7693c9ad2 (diff) | |
- merge xserver 1.1.99.903
- regen generated files
Diffstat (limited to 'xserver/configure.ac')
| -rw-r--r-- | xserver/configure.ac | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/xserver/configure.ac b/xserver/configure.ac index df11b78a5..d9407cfd6 100644 --- a/xserver/configure.ac +++ b/xserver/configure.ac @@ -1,4 +1,3 @@ -dnl $Id: configure.ac,v 1.3 2006/11/29 22:28:29 matthieu Exp $ dnl dnl Copyright © 2003-2005 Keith Packard, Daniel Stone dnl @@ -25,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.902, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server) +AC_INIT([xorg-server], 1.1.99.903, [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 @@ -50,7 +49,6 @@ AC_CONFIG_HEADERS(include/xwin-config.h) dnl kdrive-config.h covers the kdrive DDX AC_CONFIG_HEADERS(include/kdrive-config.h) - AC_PROG_CC AM_PROG_AS AC_PROG_INSTALL @@ -300,8 +298,8 @@ DEFAULT_VENDOR_NAME_SHORT="X.Org" DEFAULT_VERSION_MAJOR=7 DEFAULT_VERSION_MINOR=1 DEFAULT_VERSION_PATCH=99 -DEFAULT_VERSION_SNAP=902 -DEFAULT_RELEASE_DATE="13 November 2006" +DEFAULT_VERSION_SNAP=903 +DEFAULT_RELEASE_DATE="1 December 2006" DEFAULT_VENDOR_WEB="http://wiki.x.org" m4_ifdef([AS_HELP_STRING], , [m4_define([AS_HELP_STRING], m4_defn([AC_HELP_STRING]))]) @@ -372,7 +370,7 @@ AC_ARG_WITH(mesa-source, AS_HELP_STRING([--with-mesa-source=MESA_SOURCE], [P AC_ARG_WITH(fontdir, AS_HELP_STRING([--with-fontdir=FONTDIR], [Path to top level dir where fonts are installed (default: ${libdir}/X11/fonts)]), [ FONTDIR="$withval" ], [ FONTDIR="${libdir}/X11/fonts" ]) -DEFAULT_FONT_PATH="${FONTDIR}/misc/,${FONTDIR}/TTF/,${FONTDIR}/OTF,${FONTDIR}/Type1/,${FONTDIR}/CID/,${FONTDIR}/100dpi/,${FONTDIR}/75dpi/" +DEFAULT_FONT_PATH="${FONTDIR}/misc/,${FONTDIR}/TTF/,${FONTDIR}/OTF,${FONTDIR}/Type1/,${FONTDIR}/100dpi/,${FONTDIR}/75dpi/" AC_ARG_WITH(default-font-path, AS_HELP_STRING([--with-default-font-path=PATH], [Comma separated list of font dirs]), [ FONTPATH="$withval" ], [ FONTPATH="${DEFAULT_FONT_PATH}" ]) @@ -627,10 +625,11 @@ AM_CONDITIONAL(DRI, test "x$DRI" = xyes) if test "x$DRI" = xyes; then AC_DEFINE(XF86DRI, 1, [Build DRI extension]) PKG_CHECK_MODULES([DRIPROTO], [xf86driproto]) - PKG_CHECK_MODULES([LIBDRM], [libdrm]) + PKG_CHECK_MODULES([LIBDRM], [libdrm >= 2.3.0]) PKG_CHECK_MODULES([GL], [glproto >= 1.4.1]) AC_SUBST(DRIPROTO_CFLAGS) AC_SUBST(LIBDRM_CFLAGS) + AC_SUBST(LIBDRM_LIBS) AC_SUBST(GL_CFLAGS) fi @@ -1348,6 +1347,7 @@ int main () { AC_DEFINE_DIR(__XCONFIGFILE__, XF86CONFIGFILE, [Name of configuration file]) AC_DEFINE_DIR(XF86CONFIGFILE, XF86CONFIGFILE, [Name of configuration file]) AC_DEFINE_DIR(DEFAULT_MODULE_PATH, moduledir, [Default module search path]) + AC_DEFINE_DIR(DEFAULT_LIBRARY_PATH, libdir, [Default library install path]) AC_DEFINE_DIR(DEFAULT_LOGPREFIX, LOGPREFIX, [Default log location]) AC_DEFINE_UNQUOTED(__VENDORDWEBSUPPORT__, ["$VENDOR_WEB"], [Vendor web address for support]) @@ -1762,7 +1762,6 @@ hw/xfree86/loader/Makefile hw/xfree86/os-support/Makefile hw/xfree86/os-support/bsd/Makefile hw/xfree86/os-support/bus/Makefile -hw/xfree86/os-support/drm/Makefile hw/xfree86/os-support/hurd/Makefile hw/xfree86/os-support/misc/Makefile hw/xfree86/os-support/linux/Makefile |