X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=ltt%2Fbranches%2Fpoly%2Fautogen.sh;h=87b034b3933b496f31cac2497a1e7b9aee010f5a;hb=ecef3b84988c6c645ffde2a8296ad5c0d249206c;hp=1b5ca0287aa5d02e3bb88ebc80e7e721f63504a1;hpb=794cea477c3e511a80901a71522030a7a10ce7a6;p=lttv.git

diff --git a/ltt/branches/poly/autogen.sh b/ltt/branches/poly/autogen.sh
index 1b5ca028..87b034b3 100755
--- a/ltt/branches/poly/autogen.sh
+++ b/ltt/branches/poly/autogen.sh
@@ -67,7 +67,7 @@ fi
   }
 }
 
-(automake-1.7 --version) < /dev/null > /dev/null 2>&1 || {
+(automake --version) < /dev/null > /dev/null 2>&1 || {
   echo
   echo "**Error**: You must have \`automake' installed."
   echo "You can get it from: ftp://ftp.gnu.org/pub/gnu/"
@@ -77,7 +77,7 @@ fi
 
 
 # if no automake, don't bother testing for aclocal
-test -n "$NO_AUTOMAKE" || (aclocal-1.7 --version) < /dev/null > /dev/null 2>&1 || {
+test -n "$NO_AUTOMAKE" || (aclocal --version) < /dev/null > /dev/null 2>&1 || {
   echo
   echo "**Error**: Missing \`aclocal'.  The version of \`automake'"
   echo "installed doesn't appear recent enough."
@@ -134,14 +134,14 @@ do
 	  libtoolize --force --copy
 	fi
       fi
-      echo "Running aclocal-1.7 $aclocalinclude ..."
-      aclocal-1.7 $aclocalinclude
+      echo "Running aclocal $aclocalinclude ..."
+      aclocal $aclocalinclude
       if grep "^AM_CONFIG_HEADER" configure.in >/dev/null; then
 	echo "Running autoheader..."
 	autoheader
       fi
-      echo "Running automake-1.7 --gnu $am_opt ..."
-      automake-1.7 --add-missing --gnu $am_opt
+      echo "Running automake --gnu $am_opt ..."
+      automake --add-missing --gnu $am_opt
       echo "Running autoconf ..."
       autoconf
     )