X-Git-Url: http://git.openafs.org/?p=openafs.git;a=blobdiff_plain;f=regen.sh;h=3ada36c6b88afb6afa3b6c03d615d84938929074;hp=3adff88032741126098d9617a79afcbcb9a5f241;hb=8ecc4976b83a034263b348d1b001dda378b26932;hpb=e90b19e008ec8bc6e9eb308c671d45781b7b5a46

diff --git a/regen.sh b/regen.sh
index 3adff88..3ada36c 100755
--- a/regen.sh
+++ b/regen.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/sh -e
 
 while getopts "q" flag
 do
@@ -15,11 +15,22 @@ 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"
 if which aclocal > /dev/null 2>&1; then
-  aclocal -I src/cf
+  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
+  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
@@ -36,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"