X-Git-Url: http://git.openafs.org/?p=openafs.git;a=blobdiff_plain;f=regen.sh;h=3adff88032741126098d9617a79afcbcb9a5f241;hp=8d04e24ce0e3246cda51915977ffba789bd5bc44;hb=0a98548832472152304410e41306adcc5b91f6a2;hpb=1705bda53e4ca198cf78d70ff424fc7af69b1879

diff --git a/regen.sh b/regen.sh
index 8d04e24..3adff88 100755
--- a/regen.sh
+++ b/regen.sh
@@ -16,11 +16,19 @@ done
 
 echo "Updating configuration..."
 echo "Running aclocal"
-aclocal -I src/cf
+if which aclocal > /dev/null 2>&1; then
+  aclocal -I src/cf
+elif which aclocal-1.10 > /dev/null 2>&1; then
+  aclocal-1.10 -I src/cf
+else
+  echo "No aclocal found on your system (looked for aclocal & aclocal-1.10)"
+  exit 1
+fi
+
 echo "Running autoconf"
 autoconf
 echo "Running autoconf for configure-libafs"
-autoconf configure-libafs.in > configure-libafs
+autoconf configure-libafs.ac > configure-libafs
 chmod +x configure-libafs
 echo "Running autoheader"
 autoheader
@@ -37,6 +45,7 @@ else
     # pod2man available.
     if test -d doc/man-pages ; then
         echo "Building man pages"
+        perl doc/man-pages/merge-pod doc/man-pages/pod*/*.in
         (cd doc/man-pages && ./generate-man)
     fi
 fi