X-Git-Url: https://git.distorted.org.uk/~mdw/cfd/blobdiff_plain/1f79a056146f0b172111b8379ccc344002848e66..6f9cf5797c442bf17bb814743a57a695759842cc:/configure.ac

diff --git a/configure.ac b/configure.ac
index 4f3c066..919d367 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8,32 +8,53 @@ dnl
 dnl----- Licensing notice ---------------------------------------------------
 dnl
 dnl This file is part of the Common Files Distribution (`common')
-dnl 
+dnl
 dnl `Common' is free software; you can redistribute it and/or modify
 dnl it under the terms of the GNU General Public License as published by
 dnl the Free Software Foundation; either version 2 of the License, or
 dnl (at your option) any later version.
-dnl 
+dnl
 dnl `Common' is distributed in the hope that it will be useful,
 dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
 dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 dnl GNU General Public License for more details.
-dnl 
+dnl
 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])
+AC_INIT([Common Files Distribution], AUTO_VERSION,
+	[mdw@distorted.org.uk], [cfd])
 AC_CONFIG_SRCDIR([mdw-setup])
+AC_CONFIG_AUX_DIR([config])
+AM_INIT_AUTOMAKE([foreign])
+mdw_SILENT_RULES
+
+AC_PROG_LN_S
+
+dnl--------------------------------------------------------------------------
+dnl Finding installation directories.
 
-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
-])
+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 --------------------------------------------------