Uprate build system again, for new style.

[cfd] / configure.ac

diff --git a/configure.ac b/configure.ac
index 4f3c066..e5a9e88 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -23,17 +23,35 @@ dnl You should have received a copy of the GNU General Public License
 dnl along with `common'; if not, write to the Free Software Foundation,
 dnl Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
+dnl--------------------------------------------------------------------------
+dnl Initialization.
+
 mdw_AUTO_VERSION
 AC_INIT([Common Files Distribution], AUTO_VERSION, 
-        [mdw@distorted.org.uk], [cfd])
-AM_INIT_AUTOMAKE([foreign])
+       [mdw@distorted.org.uk], [cfd])
 AC_CONFIG_SRCDIR([mdw-setup])
+AC_CONFIG_AUX_DIR([config])
+AM_INIT_AUTOMAKE([foreign])
 
-AC_CACHE_CHECK([where to stash Autoconf macros], [aclocaldir], [
-  aclocaldir=`aclocal --print-ac-dir`
-  if test $? -ne 0; then AC_MSG_ERROR([aclocal not installed]); fi
-])
+dnl--------------------------------------------------------------------------
+dnl Finding installation directories.
+
+AC_ARG_WITH(
+  [aclocaldir],
+  AS_HELP_STRING([--with-aclocaldir=DIR],
+                [store autoconf snippets in DIR]),
+  [aclocaldir=$withval],
+  [AC_CACHE_CHECK([where to stash Autoconf macros], [mdw_cv_aclocaldir], [
+     mdw_cv_aclocaldir=$(aclocal --print-ac-dir)
+     if test $? -ne 0; then AC_MSG_ERROR([aclocal not installed]); fi
+   ])
+   aclocaldir=$mdw_cv_aclocaldir])
 AC_SUBST([aclocaldir])
 
-AC_CONFIG_FILES([Makefile mklinks findlinks])
+dnl--------------------------------------------------------------------------
+dnl Output.
+
+AC_CONFIG_FILES([Makefile])
 AC_OUTPUT
+
+dnl----- That's all, folks --------------------------------------------------