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

diff --git a/regen.sh b/regen.sh
index 8d04e24..3ada36c 100755
--- a/regen.sh
+++ b/regen.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/sh -e
 
 while getopts "q" flag
 do
@@ -15,12 +15,31 @@ do
 done
 
 echo "Updating configuration..."
+
+echo "Running libtoolize"
+if which libtoolize > /dev/null 2>&1; then
+    libtoolize -c -f -i
+elif which glibtoolize > /dev/null 2>&1; then
+    glibtoolize -c -f -i
+else
+  echo "No libtoolize found on your system (looked for libtoolize & glibtoolize)"
+  exit 1
+fi
+
 echo "Running aclocal"
-aclocal -I src/cf
+if which aclocal > /dev/null 2>&1; then
+  aclocal -I src/cf -I src/external/rra-c-util/m4
+elif which aclocal-1.10 > /dev/null 2>&1; then
+  aclocal-1.10 -I src/cf -I src/external/rra-c-util/m4
+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
@@ -28,7 +47,7 @@ autoheader
 #automake
 
 echo "Deleting autom4te.cache directory"
-rm -r autom4te.cache
+rm -rf autom4te.cache
 
 if [ $skipman ] ; then
     echo "Skipping man page build"
@@ -37,6 +56,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