Re: [Rhythmbox-devel] use automake-1.8 if available

[Bastien Nocera <hadess hadess net>]

On Mon, 2004-04-19 at 18:42 -0400, Colin Walters wrote:
> On Mon, 2004-04-19 at 18:26, Bastien Nocera wrote:
> > 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...
> 
> We still use xmldocs.mak and something else that both use mkinstalldirs,
> which isn't installed by default with automake-1.8. So the build will
> break, and we can't use this now (which is why I commented it out in
> autogen.sh).  A patch to fix those problems would be appreciated :)

This patch should fix it for good.

Cheers

---
Bastien Nocera <hadess hadess net> 
Those of you who think you know everything are annoying to those of us
who do.

Index: autogen.sh
===================================================================
RCS file: /cvs/gnome/rhythmbox/autogen.sh,v
retrieving revision 1.10
diff -u -r1.10 autogen.sh
--- autogen.sh	20 Apr 2004 15:45:10 -0000	1.10
+++ autogen.sh	8 May 2004 11:58:19 -0000
@@ -53,21 +53,19 @@
 	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
+if automake-1.8 --version < /dev/null > /dev/null 2>&1; then
+  AUTOMAKE=automake-1.8
+  ACLOCAL=aclocal-1.8
+elif 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
 
 if test "$DIE" -eq 1; then
 	exit 1
Index: configure.ac
===================================================================
RCS file: /cvs/gnome/rhythmbox/configure.ac,v
retrieving revision 1.111
diff -u -r1.111 configure.ac
--- configure.ac	5 May 2004 23:21:19 -0000	1.111
+++ configure.ac	8 May 2004 11:58:20 -0000
@@ -15,6 +15,7 @@
 AM_PROG_LIBTOOL
 AC_C_BIGENDIAN
 AC_CHECK_SIZEOF(long)
+AC_SUBST(mkdir_p)
 
 ACLOCAL="$ACLOCAL -I macros"