[Rhythmbox-devel] use automake-1.8 if available

[Bastien Nocera <hadess hadess net>]

Heya,

I'd like to be able to compile RB with automake 1.8, so here's a patch.
It seems it doesn't work completely just, but as I don't have a 1.7
available, it should still try and use 1.8...

Cheers

---
Bastien Nocera <hadess@hadess.net> 
Remember that age and treachery will always triumph over youth and
ability.
Index: autogen.sh
===================================================================
RCS file: /cvs/gnome/rhythmbox/autogen.sh,v
retrieving revision 1.9
diff -u -r1.9 autogen.sh
--- autogen.sh	12 Apr 2004 01:11:11 -0000	1.9
+++ autogen.sh	19 Apr 2004 22:15:41 -0000
@@ -53,21 +53,20 @@
 	DIE=1
 fi
 
-#if automake-1.8 --version < /dev/null > /dev/null 2>&1; then
-#  AUTOMAKE=automake-1.8
-#  ACLOCAL=aclocal-1.8
-#else
-  if automake-1.7 --version < /dev/null > /dev/null 2>&1; then
-    AUTOMAKE=automake-1.7
-    ACLOCAL=aclocal-1.7
-   else
-	echo
-	echo "You must have automake >= 1.7 installed to compile $PROJECT."
-	echo "Get ftp://ftp.gnu.org/pub/gnu/automake/automake-1.8.3.tar.gz";
-	echo "(or a newer version if it is available)"
-	DIE=1
-   fi
-#fi
+# Use automake-1.7 in priority, even if 1.8 is available
+if automake-1.7 --version < /dev/null > /dev/null 2>&1; then
+  AUTOMAKE=automake-1.7
+  ACLOCAL=aclocal-1.7
+elif automake-1.8 --version < /dev/null > /dev/null 2>&1; then
+  AUTOMAKE=automake-1.8
+  ACLOCAL=aclocal-1.8
+else
+  echo
+  echo "You must have automake >= 1.7 installed to compile $PROJECT."
+  echo "Get ftp://ftp.gnu.org/pub/gnu/automake/automake-1.8.3.tar.gz";
+  echo "(or a newer version if it is available)"
+  DIE=1
+fi
 
 if test "$DIE" -eq 1; then
 	exit 1