From 39f2290749824ea6da9f2c8b6937de993ad50d22 Mon Sep 17 00:00:00 2001
From: Mark Wooding <mdw@distorted.org.uk>
Date: Fri, 19 Oct 2012 19:41:10 +0100
Subject: [PATCH] Drag build machinery into the 21st century.

---
 .cvsignore                   |  7 -------
 .gitignore                   |  9 +++++++++
 .links                       |  1 +
 configure.in => configure.ac | 24 ++++++++++++++----------
 setup                        |  8 --------
 5 files changed, 24 insertions(+), 25 deletions(-)
 delete mode 100644 .cvsignore
 create mode 100644 .gitignore
 rename configure.in => configure.ac (71%)
 delete mode 100755 setup

diff --git a/.cvsignore b/.cvsignore
deleted file mode 100644
index 89c5931..0000000
--- a/.cvsignore
+++ /dev/null
@@ -1,7 +0,0 @@
-.deps
-Makefile.in
-aclocal.m4
-configure
-debian.diff
-BASIC2
-build
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..17534b3
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,9 @@
+COPYING
+INSTALL
+Makefile.in
+aclocal.m4
+autom4te.cache
+configure
+config/
+mdwopt.c
+mdwopt.h
diff --git a/.links b/.links
index ed8a3f9..c95b2ff 100644
--- a/.links
+++ b/.links
@@ -2,3 +2,4 @@ COPYING
 INSTALL
 mdwopt.c
 mdwopt.h
+config/auto-version
diff --git a/configure.in b/configure.ac
similarity index 71%
rename from configure.in
rename to configure.ac
index 17f4a72..6008a4e 100644
--- a/configure.in
+++ b/configure.ac
@@ -25,18 +25,22 @@ dnl You should have received a copy of the GNU General Public License
 dnl along with Bascat; if not, write to the Free Software Foundation,
 dnl Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
-AC_INIT(bascat.c)
-AM_INIT_AUTOMAKE(bascat, 1.3)
-
+mdw_AUTO_VERSION
+AC_INIT([bascat], AUTO_VERSION, [mdw@distorted.org.uk])
+AC_CONFIG_SRCDIR([bascat.c])
+AC_CONFIG_AUX_DIR([config])
+AM_INIT_AUTOMAKE([foreign])
 AC_PROG_CC
-AC_PROG_INSTALL
+AX_CFLAGS_WARN_ALL
+
+mdw_SILENT_RULES
 
-mdw_GCC_FLAGS
-mdw_CHECK_MANYLIBS(tgetent, termcap ncurses, [AC_DEFINE(HAVE_LIBTERMCAP, 1)])
-mdw_OPT_NDEBUG
+AC_SEARCH_LIBS([tcgetent], [termcap], [AC_DEFINE(HAVE_LIBTERMCAP, 1)])
 
-AC_ARG_WITH(pager,
-[  --with-pager=PAGER	  set the default pager (default is \`more')],
+AC_ARG_WITH([pager],
+  AS_HELP_STRING([--with-pager=PAGER],
+		 [set the default pager (default is \`more')]),
   [AC_DEFINE(PAGER, "$withval")], [AC_DEFINE(PAGER, "more")])
 
-AC_OUTPUT(Makefile)
+AC_CONFIG_FILES([Makefile])
+AC_OUTPUT
diff --git a/setup b/setup
deleted file mode 100755
index 77f8a03..0000000
--- a/setup
+++ /dev/null
@@ -1,8 +0,0 @@
-#! /bin/sh
-
-set -e
-mklinks
-mkaclocal
-autoconf
-automake -a
-mkdir build
-- 
2.11.0