From 6b90d6085e06758dde6441656b2e779b06446e5c Mon Sep 17 00:00:00 2001
From: Gilbert Ramirez <gram@alumni.rice.edu>
Date: Tue, 19 Apr 2005 22:27:05 +0000
Subject: Allow automake and aclocal to share a common version number suffix,
 since they come from the same package.

svn path=/trunk/; revision=14143
---
 autogen.sh | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'autogen.sh')

diff --git a/autogen.sh b/autogen.sh
index 529aa10a2b..55dcfd63a8 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -7,9 +7,14 @@
 DIE=true
 PROJECT="Ethereal"
 
-ACLOCAL=aclocal
+# If you are going to use the non-default name for automake becase your OS
+# installaion has multiple versions, you need to call both aclocal and automake
+# with that version number, as they come from the same package.
+#AM_VERSION='-1.8'
+
+ACLOCAL=aclocal$AM_VERSION
 AUTOHEADER=autoheader
-AUTOMAKE=automake
+AUTOMAKE=automake$AM_VERSION
 AUTOCONF=autoconf
 
 # Check for python. There's no "--version" option!
-- 
cgit v1.2.1