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 ---
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 ---
[ --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 ---
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 ---