build: Bring up-to-date for modern autoconf and friends.

[sw-tools] / configure.in

diff --git a/configure.in b/configure.in
index 7d6fc67..9525b18 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -19,7 +19,7 @@ dnl Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 dnl --- Boring boilerplate ---
 
 AC_INIT(src/sw.c)
-AM_INIT_AUTOMAKE(sw-tools, 1.0.5mdw1)
+AM_INIT_AUTOMAKE(sw-tools, 1.0.5mdw2)
 AM_CONFIG_HEADER(config.h)
 
 dnl --- Work out the architecture name ---
@@ -27,7 +27,7 @@ dnl --- Work out the architecture name ---
 AC_MSG_CHECKING([architecture name])
 arch=`$srcdir/sw.in --archname`
 AC_MSG_RESULT($arch)
-AC_DEFINE_UNQUOTED(ARCH, "$arch")
+AC_DEFINE_UNQUOTED(ARCH, "$arch", [My architecture name.])
 AC_SUBST(arch)
 
 dnl --- Set up the C compiler ---
@@ -46,7 +46,7 @@ AC_ARG_WITH(rsh,
 [  --with-rsh=PROGRAM      use PROGRAM to start remote shells],
 [RSH=$withval])
 AC_PATH_PROGS(RSH, $RSH remsh rsh ssh, rsh)
-AC_DEFINE_UNQUOTED(RSH, "$RSH")
+AC_DEFINE_UNQUOTED(RSH, "$RSH", [Default remote shell program.])
 
 dnl --- Various simple tests ---
 
@@ -63,19 +63,15 @@ mdw_CHECK_MANYLIBS(socketpair, socket)
 
 dnl --- Write in some useful paths ---
 
-mdw_prefix=$prefix mdw_exec_prefix=$exec_prefix
-transform=`echo "$program_transform_name"|sed 's,\\\\\\\\,\\\\,g; s,\\$\\$,$,g'`
-test "$prefix" = "NONE" && prefix=$ac_default_prefix
-test "$exec_prefix" = "NONE" && exec_prefix=$prefix
-SW=`echo sw|sed "$transform"`
-AC_SUBST(SW)
-AC_DEFINE_UNQUOTED(PREFIX, "$mdw_prefix")
-AC_DEFINE_UNQUOTED(BINDIR, "`eval echo $bindir`")
-AC_DEFINE_UNQUOTED(DATADIR, "`eval echo $datadir`")
-AC_DEFINE_UNQUOTED(SW, "$SW")
-pkgdatadir="`eval echo $datadir/sw`"
-AC_SUBST(pkgdatadir)
-prefix=$mdw_prefix exec_prefix=$mdw_exec_prefix
+
+mdw_DEFINE_PATHS([
+  mdw_DEFINE_PATH([PREFIX], [$prefix])
+  mdw_DEFINE_PATH([DATADIR], [$datadir])
+  mdw_DEFINE_PATH([ARCHTAB], [$datadir/archtab])
+  mdw_DEFINE_PROG([PATH_SW], [sw])
+  pkgdatadir=mdw_PATH([$datadir/$PACKAGE]) AC_SUBST(pkgdatadir)
+  SW=mdw_PROG(sw) AC_SUBST(SW)
+])
 
 dnl --- Output the configuration ---