fix autogen.sh

If automake-1.11 existed, we would run that but not also aclocal-1.11.
Ensure that we always run matching aclocal and automake.

Also some small fixups:
  - use #!/bin/sh, not bash
  - silence the error in case we can't find 'automake-1.11'.

1 files changed, 6 insertions, 6 deletions

diff --git a/autogen.sh b/autogen.sh
index c0f3bc8..e9eb405 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 
 set -e
 
@@ -8,16 +8,16 @@ if [ "$1" = "clean" ]; then
   exit
 fi
 
-if automake-1.11 --version > /dev/null; then
-  automake=automake-1.11
+if automake-1.11 --version &> /dev/null; then
+  automake_suffix='-1.11'
 else
-  automake=automake
+  automake_suffix=''
 fi
 
 mkdir -p m4 aux
 gtkdocize --docdir docs --flavour no-tmpl
-aclocal ${ACLOCAL_FLAGS}
-${automake} --add-missing --foreign
+aclocal${automake_suffix} ${ACLOCAL_FLAGS}
+automake${automake_suffix} --add-missing --foreign
 autoconf
 
 CFLAGS=${CFLAGS=-ggdb -Werror}