From 4e6400c4bbba2a35c7dc5396c69ca4444682b07f Mon Sep 17 00:00:00 2001
From: Eric Anholt <eric@anholt.net>
Date: Mon, 2 Nov 2009 11:20:23 -0800
Subject: Replace dolt and shave with using current autotools.

---
 configure.ac | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

(limited to 'configure.ac')

diff --git a/configure.ac b/configure.ac
index 1e8bb99f..8af20dbf 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
 
@@ -61,7 +55,9 @@ fi
 
 AC_SUBST([WARN_CFLAGS])
 
-SHAVE_INIT([.], [enable])
+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
 
 AC_OUTPUT([
 	Makefile
-- 
cgit v1.2.3