Generally bring up-to-date.

[cfd] / mdw-setup

diff --git a/mdw-setup b/mdw-setup
index 276b6da..f3ffe95 100755 (executable)
--- a/mdw-setup
+++ b/mdw-setup
@@ -36,6 +36,9 @@ fi
 ### Link any strange common files we need
 [ -f .links ] && mklinks
 
+### Do any local stuff
+[ -x build-setup ] && ./build-setup start
+
 ### Grind through the Autoconf machinery
 configure=
 for i in configure.ac configure.in; do
@@ -49,11 +52,13 @@ if [ "$configure" ]; then
      m4 Makefile.m4 >Makefile.am.new &&
      mv Makefile.am.new Makefile.am)
   done
-  mkaclocal
+  aclocalargs=
+  for i in config m4; do [ -d $i ] && aclocalargs="$aclocalargs -I $i"; done
+  aclocal $aclocalargs
   autoconf
   grep >/dev/null AM_CONFIG_HEADER $configure && autoheader
   [ -f Makefile.am ] && automake -a
 fi
 
-### Maybe make a build directory
-[ $debian = no ] && [ ! -e build ] && mkdir build
+### Do any local stuff
+[ -x build-setup ] && ./build-setup end