make it possible to run a special version of automake or autoconf

git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@4826 67ed7778-7388-44ab-90cf-0a291f65f57c

1 files changed, 10 insertions, 10 deletions

diff --git a/autogen.sh b/autogen.sh
index 47dcc6e9e..c8c9b1706 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -10,7 +10,7 @@ test "$srcdir" = "." && srcdir=`pwd`
 
 PROJECT=gphoto2
 
-(autoconf --version) < /dev/null > /dev/null 2>&1 || {
+(autoconf${AUTOCONF_SUFFIX} --version) < /dev/null > /dev/null 2>&1 || {
     echo
     echo "You must have autoconf installed to compile $PROJECT."
     echo "Download the appropriate package for your distribution,"
@@ -26,7 +26,7 @@ PROJECT=gphoto2
     DIE=1
 }
 
-(automake --version) < /dev/null > /dev/null 2>&1 || {
+(automake${AUTOMAKE_SUFFIX} --version) < /dev/null > /dev/null 2>&1 || {
     echo
     echo "You must have automake installed to compile $PROJECT."
     echo "Get ftp://ftp.gnu.org/pub/gnu/automake-1.3.tar.gz"
@@ -74,14 +74,14 @@ do
     fi
     echo "Running libtoolize"
     libtoolize --copy --force
-    echo "Running aclocal $ACLOCAL_FLAGS"
-    aclocal $ACLOCAL_FLAGS
-    echo "Running autoheader"
-    autoheader
-    echo "Running automake --add-missing --gnu $am_opt"
-    automake --add-missing --gnu $am_opt
-    echo "Running autoconf"
-    autoconf
+    echo "Running aclocal${AUTOMAKE_SUFFIX} $ACLOCAL_FLAGS"
+    aclocal${AUTOMAKE_SUFFIX} $ACLOCAL_FLAGS
+    echo "Running autoheader${AUTOCONF_SUFFIX}"
+    autoheader${AUTOCONF_SUFFIX}
+    echo "Running automake${AUTOMAKE_SUFFIX} --add-missing --gnu $am_opt"
+    automake${AUTOMAKE_SUFFIX} --add-missing --gnu $am_opt
+    echo "Running autoconf${AUTOCONF_SUFFIX}"
+    autoconf${AUTOCONF_SUFFIX}
 )
 done