diff options
| author | Keith Packard <keithp@neko.keithp.com> | 2006-10-04 14:46:04 -0700 |
|---|---|---|
| committer | Keith Packard <keithp@neko.keithp.com> | 2006-10-04 14:46:04 -0700 |
| commit | b4659faf9b455b44ac8e691cc7a8fc00a967c80b (patch) | |
| tree | c2ae25755860995d619e9d5a6900642babc3c405 /configure.ac | |
| parent | c4f30c63538e1451f15ed1991439869127d9b148 (diff) | |
| parent | 8382234a7f318057de66490299d63807cefb5201 (diff) | |
Merge branch 'master' into randr-1.2
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac index d1afa784e..0b00a3a30 100644 --- a/configure.ac +++ b/configure.ac @@ -426,6 +426,7 @@ AC_ARG_ENABLE(dbe, AS_HELP_STRING([--disable-dbe], [Build DBE extensi AC_ARG_ENABLE(xf86bigfont, AS_HELP_STRING([--disable-xf86bigfont], [Build XF86 Big Font extension (default: enabled)]), [XF86BIGFONT=$enableval], [XF86BIGFONT=yes]) AC_ARG_ENABLE(dpms, AS_HELP_STRING([--disable-dpms], [Build DPMS extension (default: enabled)]), [DPMSExtension=$enableval], [DPMSExtension=yes]) AC_ARG_ENABLE(xinput, AS_HELP_STRING([--disable-xinput], [Build XInput Extension (default: enabled)]), [XINPUT=$enableval], [XINPUT=yes]) +AC_ARG_ENABLE(xfree86-utils, AS_HELP_STRING([--enable-xfree86-utils], [Build xfree86 DDX utilities (default: enabled)]), [XF86UTILS=$enableval], [XF86UTILS=yes]) dnl DDXes. AC_ARG_ENABLE(xorg, AS_HELP_STRING([--enable-xorg], [Build Xorg server (default: auto)]), [XORG=$enableval], [XORG=auto]) @@ -735,6 +736,8 @@ if test "x$XINPUT" = xyes; then XI_INC='-I$(top_srcdir)/Xi' fi +AM_CONDITIONAL(XF86UTILS, test "x$XF86UTILS" = xyes) + AC_DEFINE(SHAPE, 1, [Support SHAPE extension]) AC_DEFINE(XKB, 1, [Build XKB]) |