X-Git-Url: http://git.openafs.org/?p=openafs.git;a=blobdiff_plain;f=regen.sh;h=3ada36c6b88afb6afa3b6c03d615d84938929074;hp=c6deaf8e024c8454b68d63fad818eaf8a17db400;hb=dc99144da54d12e8a168c3dfb0255e2a40ba321f;hpb=e3dfba8e6c10c296c09e9b0ac0c0355658ce0be7

diff --git a/regen.sh b/regen.sh
index c6deaf8..3ada36c 100755
--- a/regen.sh
+++ b/regen.sh
@@ -1,33 +1,62 @@
+#!/bin/sh -e
+
+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 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
 #echo "Running automake"
 #automake
 
-# Rebuild the man pages, to not require those building from source to have
-# pod2man available.
-echo "Building man pages"
-if test -d doc ; then
-    for f in doc/man-pages/pod1/*.pod ; do
-        pod2man -c 'AFS Command Reference' -r 'OpenAFS' -s 1 \
-            -n `basename "$f" | sed 's/\.pod$//'` "$f" \
-            > `echo "$f" | sed -e 's%pod1/%%' -e 's/\.pod$/.1/'`
-    done
-    for f in doc/man-pages/pod5/*.pod ; do
-        pod2man -c 'AFS File Reference' -r 'OpenAFS' -s 5 \
-            -n `basename "$f" | sed 's/\.pod$//'` "$f" \
-            > `echo "$f" | sed -e 's%pod5/%%' -e 's/\.pod$/.5/'`
-    done
-    for f in doc/man-pages/pod8/*.pod ; do
-        pod2man -c 'AFS Command Reference' -r 'OpenAFS' -s 8 \
-            -n `basename "$f" | sed 's/\.pod$//'` "$f" \
-            > `echo "$f" | sed -e 's%pod8/%%' -e 's/\.pod$/.8/'`
-    done
+echo "Deleting autom4te.cache directory"
+rm -rf autom4te.cache
+
+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