spock's hddtemp & goto patches

[monky] / autogen.sh

diff --git a/autogen.sh b/autogen.sh
index 2d52bd5..3067c03 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,29 +1,14 @@
 #!/bin/sh
-
-if [ -x aclocal-1.9 ]
-then
-       aclocal-1.9
-else
-       aclocal
-fi
-
-if [ -x autoheader-2.59 ]
-then
-       autoheader-2.59
-else
-       autoheader
-fi
-
-if [ -x automake-1.9 ]
-then
-       automake-1.9 -a
-else
-       automake
-fi
-
-if [ -x autoconf-2.59 ]
-then
-       autoconf-2.59
-else
-       autoconf
-fi
+# $Id$
+
+AUTOCONF=${AUTOCONF:-autoconf}
+AUTOMAKE=${AUTOMAKE:-automake}
+ACLOCAL=${ACLOCAL:-aclocal}
+AUTOHEADER=${AUTOHEADER:-autoheader}
+LIBTOOLIZE=${LIBTOOLIZE:-libtoolize}
+
+$ACLOCAL
+$LIBTOOLIZE --force
+$AUTOHEADER
+$AUTOMAKE -a
+$AUTOCONF