diff options
| author | Alan Coopersmith <alan.coopersmith@sun.com> | 2009-12-17 18:24:37 -0800 |
|---|---|---|
| committer | Alan Coopersmith <alan.coopersmith@sun.com> | 2009-12-23 16:05:42 -0800 |
| commit | 17a1587d1606351d3f0b9b148e9c3cbfb6026193 (patch) | |
| tree | 45a895d738d99e89465d3e9510fc2adcf0bdb410 /configure.ac | |
| parent | 2d6a8f668342a5190cdf43b5d385f592d10f5900 (diff) | |
Convert checks for PC98 support from platform #ifdefs to configure flag
Default remains the same - on for most OS'es on i386 (except Solaris),
off for everyone else. Can be manually toggled via --enable-pc98 or
--disable-pc98.
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
(cherry picked from commit b63912ed4c69fedd1bea92274d6cae0429a79677)
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac index e501a37a9..635321676 100644 --- a/configure.ac +++ b/configure.ac @@ -560,6 +560,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)]), @@ -1575,6 +1578,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" @@ -1596,8 +1602,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 |