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

[Bastien Nocera <hadess hadess net>]

On Mon, 2004-05-10 at 23:25 -0400, Colin Walters wrote:
> On Sat, 2004-05-08 at 08:04, Bastien Nocera wrote:
> 
> > This patch should fix it for good.
> 
> I still can't get it to work; I get:
> 
> file=./`echo zh_CN | sed 's,.*/,,'`.gmo \
>   && rm -f $file && /usr/bin/msgfmt -o $file zh_CN.po
> if test -r ".././mkinstalldirs"; then \
>   .././mkinstalldirs /build/rb0.9/share; \
> else \
>   /bin/sh ../mkinstalldirs /build/rb0.9/share; \
> fi
> ../mkinstalldirs: ../mkinstalldirs: No such file or directory
> make[1]: *** [install-data-yes] Error 127
> make[1]: Leaving directory `/tmp/rhythmbox--main--0.9/po'
> make: *** [install-recursive] Error 1

Attached the patch from hell. Also fixes a link failure with the new HAL
libraries.

Drop the "automake-1.8-mkinstalldirs.patch" in po/ (will need to be
added to arch/CVS) and it should work automagically. I would also
appreciate if people could try with automake-1.7, just in case.

Cheers

---
Bastien Nocera <hadess hadess net> 
Her face was a perfect oval, like a circle that had its two other sides
gently compressed by a Thigh Master. 

Index: autogen.sh
===================================================================
RCS file: /cvs/gnome/rhythmbox/autogen.sh,v
retrieving revision 1.11
diff -u -r1.11 autogen.sh
--- autogen.sh	14 Jul 2004 03:13:02 -0000	1.11
+++ autogen.sh	14 Jul 2004 14:41:42 -0000
@@ -53,10 +53,10 @@
 	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.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
@@ -69,7 +69,7 @@
 	echo "(or a newer version if it is available)"
 	DIE=1
    fi
-#fi
+fi
 
 if test "$DIE" -eq 1; then
 	exit 1
@@ -109,6 +109,7 @@
 $ACLOCAL -I macros $ACLOCAL_FLAGS
 
 glib-gettextize --force
+(cd po ; patch < automake-1.8-mkinstalldirs.patch ; cd ..)
 intltoolize --force --automake
 libtoolize --automake
 
Index: configure.ac
===================================================================
RCS file: /cvs/gnome/rhythmbox/configure.ac,v
retrieving revision 1.119
diff -u -r1.119 configure.ac
--- configure.ac	14 Jul 2004 03:13:02 -0000	1.119
+++ configure.ac	14 Jul 2004 14:41:42 -0000
@@ -46,7 +46,7 @@
 	USE_HAL=""
 	PKG_CHECK_MODULES(HAL, hal,
 		[ AC_DEFINE([HAVE_HAL], 1, [Use the HAL library]) ]
-		[ USE_HAL="hal >= $HAL_REQUIRED" ], :)
+		[ USE_HAL="dbus-glib-1 hal >= $HAL_REQUIRED" ], :)
 fi
 
 
@@ -433,6 +433,14 @@
 AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [Define to the Gettext package name])
 
 AM_GLIB_GNU_GETTEXT
+
+dnl Workaround for automake 1.8
+AC_SUBST(mkdir_p) if test x"$mkdir_p" = "x"; then
+  MKINSTALLDIRS="mkinstalldirs"
+fi
+AC_SUBST(MKINSTALLDIRS)
+
+
 
 AC_PATH_PROG(GLIB_GENMARSHAL, glib-genmarshal)
 

--- Makefile.in.in	2004-07-14 15:23:37.988747933 +0100
+++ Makefile.in.in.fixed	2004-07-14 15:21:58.534162832 +0100
@@ -31,11 +31,13 @@
 localedir = $(libdir)/locale
 gnulocaledir = $(datadir)/locale
 gettextsrcdir = $(datadir)/glib-2.0/gettext/po
+mkdir_p = @mkdir_p@
 subdir = po
 
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 MKINSTALLDIRS = $(top_srcdir)/@MKINSTALLDIRS@
+mkinstalldirs = `if test ! -z "$(mkdir_p)"; then echo "$(mkdir_p)"; else case "$(MKINSTALLDIRS)" in /*) echo "$(MKINSTALLDIRS)" ;; *) echo "$(top_builddir)/$(MKINSTALLDIRS)" ;; esac; fi`
 
 CC = @CC@
 GENCAT = @GENCAT@
@@ -105,7 +107,7 @@
 	if test -r "$(MKINSTALLDIRS)"; then \
 	  $(MKINSTALLDIRS) $(DESTDIR)$(datadir); \
 	else \
-	  $(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(datadir); \
+	  $(mkinstalldirs) $(DESTDIR)$(datadir); \
 	fi
 	@catalogs='$(CATALOGS)'; \
 	for cat in $$catalogs; do \
@@ -119,7 +121,7 @@
 	  if test -r "$(MKINSTALLDIRS)"; then \
 	    $(MKINSTALLDIRS) $$dir; \
 	  else \
-	    $(SHELL) $(top_srcdir)/mkinstalldirs $$dir; \
+	    $(mkinstalldirs) $$dir; \
 	  fi; \
 	  if test -r $$cat; then \
 	    $(INSTALL_DATA) $$cat $$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT); \
@@ -147,7 +149,7 @@
 	  if test -r "$(MKINSTALLDIRS)"; then \
 	    $(MKINSTALLDIRS) $(DESTDIR)$(gettextsrcdir); \
 	  else \
-	    $(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(gettextsrcdir); \
+	    $(mkinstalldirs) $(DESTDIR)$(gettextsrcdir); \
 	  fi; \
 	  $(INSTALL_DATA) $(srcdir)/Makefile.in.in \
 			  $(DESTDIR)$(gettextsrcdir)/Makefile.in.in; \