summaryrefslogtreecommitdiff
path: root/configure.ac
diff options
context:
space:
mode:
authorEric Anholt <eric@anholt.net>2009-10-08 17:34:13 -0700
committerOwain G. Ainsworth <oga@openbsd.org>2010-03-01 15:25:58 +0000
commit375d9b5dccddf34d9addf2689c8eec7b4e86c317 (patch)
treecc287a39068a98d79b028e92822d302fc659fd6d /configure.ac
parent2e4e0f030b542ca0900b5e1944fffce276274702 (diff)
Replace dolt and shave with relying on current autotools.
(cherry picked from commit 1556c62e0336ea2fef866722ee44d2d188e318f3) Signed-off-by: Owain G. Ainsworth <oga@openbsd.org>
Diffstat (limited to 'configure.ac')
-rw-r--r--configure.ac16
1 files changed, 3 insertions, 13 deletions
diff --git a/configure.ac b/configure.ac
index 88f5bcb0..f9979caa 100644
--- a/configure.ac
+++ b/configure.ac
@@ -34,15 +34,9 @@ AM_INIT_AUTOMAKE([dist-bzip2])
AM_MAINTAINER_MODE
-AC_CONFIG_FILES([
- shave
- shave-libtool
-])
-
# Checks for programs.
AC_DISABLE_STATIC
AC_PROG_LIBTOOL
-DOLT
AC_PROG_CC
AM_PROG_CC_C_O
@@ -133,15 +127,11 @@ DRIVER_NAME=intel
AC_SUBST([DRIVER_NAME])
AC_SUBST([moduledir])
-m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.1.3 or later before running autoconf/autogen])])
-XORG_MACROS_VERSION(1.1.3)
-XORG_MANPAGE_SECTIONS
-XORG_RELEASE_VERSION
-
+m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.3 or later before running autoconf/autogen])])
+XORG_MACROS_VERSION(1.3)
+XORG_DEFAULT_OPTIONS
XORG_CHECK_LINUXDOC
-SHAVE_INIT([.], [enable])
-
AC_OUTPUT([
Makefile
uxa/Makefile