X-Git-Url: http://git.openafs.org/?p=openafs.git;a=blobdiff_plain;f=regen.sh;h=3adff88032741126098d9617a79afcbcb9a5f241;hp=f5150fe7563167bb71ac765c94171446ef7dc919;hb=5548f6540557795ded65a52c7066839c5eef468f;hpb=5a57fce90246e380fc530dc3c8ad097852b31712

diff --git a/regen.sh b/regen.sh
index f5150fe..3adff88 100755
--- a/regen.sh
+++ b/regen.sh
@@ -1,11 +1,34 @@
 #!/bin/sh
+
+while getopts "q" flag
+do
+    case "$flag" in
+	q)
+	    skipman=1;
+	    ;;
+	*)
+	    echo "Usage ./regen.sh [-q]"
+	    echo "	-q skips man page generation"
+	    exit
+	    ;;
+    esac
+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
@@ -15,9 +38,14 @@ autoheader
 echo "Deleting autom4te.cache directory"
 rm -r autom4te.cache
 
-# Rebuild the man pages, to not require those building from source to have
-# pod2man available.
-if test -d doc/man-pages ; then
-    echo "Building man pages"
-    (cd doc/man-pages && ./generate-man)
+if [ $skipman ] ; then
+    echo "Skipping man page build"
+else 
+    # Rebuild the man pages, to not require those building from source to have
+    # 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