diff options
| author | marha <marha@users.sourceforge.net> | 2009-12-20 22:23:03 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2009-12-20 22:23:03 +0000 |
| commit | c438f190eedc71ee8dd14e14fec660e98d3dc0bf (patch) | |
| tree | 9f128ed0356e62d09b44a720ac20bdc60566b66e /xorg-server/configure.ac | |
| parent | d842f9ef1c88a7aad04a78613548fc0f0638ac48 (diff) | |
| parent | d8432fdd4f13e9f9d1d44f5482faeb56562661a9 (diff) | |
| download | vcxsrv-c438f190eedc71ee8dd14e14fec660e98d3dc0bf.tar.gz vcxsrv-c438f190eedc71ee8dd14e14fec660e98d3dc0bf.tar.bz2 vcxsrv-c438f190eedc71ee8dd14e14fec660e98d3dc0bf.zip | |
svn merge ^/branches/released
Diffstat (limited to 'xorg-server/configure.ac')
| -rw-r--r-- | xorg-server/configure.ac | 25 |
1 files changed, 21 insertions, 4 deletions
diff --git a/xorg-server/configure.ac b/xorg-server/configure.ac index 55763f5f6..fe28a07cc 100644 --- a/xorg-server/configure.ac +++ b/xorg-server/configure.ac @@ -27,7 +27,7 @@ dnl Process this file with autoconf to create configure. AC_PREREQ(2.57) AC_INIT([xorg-server], 1.7.99.2, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server) -RELEASE_DATE="(unreleased)" +RELEASE_DATE="2009-12-18" AC_CONFIG_SRCDIR([Makefile.am]) AM_INIT_AUTOMAKE([foreign dist-bzip2]) AM_MAINTAINER_MODE @@ -505,7 +505,7 @@ XORG_FONTSUBDIR(FONT100DPIDIR, font100dpidir, 100dpi) dnl Uses --default-font-path if set, otherwise checks for /etc/X11/fontpath.d, dnl otherwise uses standard subdirectories of FONTROOTDIR AC_CHECK_FILE([${sysconfdir}/X11/fontpath.d], - [DEFAULT_FONT_PATH='catalogue:$(sysconfdir)/X11/fontpath.d'], + [DEFAULT_FONT_PATH='catalogue:${sysconfdir}/X11/fontpath.d'], [ DEFAULT_FONT_PATH="${FONTMISCDIR}/,${FONTTTFDIR}/,${FONTOTFDIR}/,${FONTTYPE1DIR}/,${FONT100DPIDIR}/,${FONT75DPIDIR}/" case $host_os in @@ -527,9 +527,9 @@ AC_ARG_WITH(default-xkb-rules, AS_HELP_STRING([--with-default-xkb-rules=RULES], [ XKB_DFLT_RULES="$withval" ], [ XKB_DFLT_RULES="" ]) AC_ARG_WITH(default-xkb-model, AS_HELP_STRING([--with-default-xkb-model=MODEL], - [Keyboard model (default: pc104)]), + [Keyboard model (default: pc105)]), [ XKB_DFLT_MODEL="$withval" ], - [ XKB_DFLT_MODEL="pc104" ]) + [ XKB_DFLT_MODEL="pc105" ]) AC_ARG_WITH(default-xkb-layout, AS_HELP_STRING([--with-default-xkb-layout=LAYOUT], [Keyboard layout (default: us)]), [ XKB_DFLT_LAYOUT="$withval" ], @@ -577,6 +577,9 @@ AC_ARG_ENABLE(null-root-cursor, AS_HELP_STRING([--enable-null-root-cursor], [Use AC_ARG_ENABLE(visibility, AC_HELP_STRING([--enable-visibility], [Enable symbol visibility (default: auto)]), [SYMBOL_VISIBILITY=$enableval], [SYMBOL_VISIBILITY=auto]) +AC_ARG_ENABLE(pc98, AC_HELP_STRING([--enable-pc98], [Enable PC98 support in Xorg (default: auto)]), + [SUPPORT_PC98=$enableval], + [SUPPORT_PC98=auto]) dnl GLX build options AC_ARG_WITH(dri-driver-path, AS_HELP_STRING([--with-dri-driver-path=PATH], [Path to DRI drivers (default: ${libdir}/dri)]), @@ -1652,6 +1655,9 @@ if test "x$XORG" = xyes; then XORG_CFLAGS="${XORG_CFLAGS} "'$(SOLARIS_ASM_CFLAGS)' fi AC_SUBST([SOLARIS_ASM_CFLAGS]) + if test "x$SUPPORT_PC98" = xauto; then + SUPPORT_PC98="no" + fi ;; gnu*) XORG_OS="gnu" @@ -1673,8 +1679,19 @@ if test "x$XORG" = xyes; then sparc*) xorg_bus_sparc="yes" ;; + i*86) + if test "x$SUPPORT_PC98" = xauto; then + SUPPORT_PC98="yes" + fi + ;; esac + if test "x$SUPPORT_PC98" = xauto; then + SUPPORT_PC98="no" + fi + if test "x$SUPPORT_PC98" = xyes; then + AC_DEFINE(SUPPORT_PC98, 1, [Support PC98]) + fi if test "x$XORG_OS_PCI" = x ; then XORG_OS_PCI=$XORG_OS fi |