Re: Rhythmbox 0.6.2

[Bastien Nocera <hadess hadess net>]

Hey Colin,

On Thu, 2003-12-18 at 05:44, Colin Walters wrote:
> Hi,
> 
> This Rhythmbox release is mostly bugfixes, but I imagine a lot of people
> will like Jeffrey Yasskin's work on Shuffle and Repeat.  Oh, and also
> saving a playlist won't corrupt your library now :)
<snip>
> * Make Xine backend use less memory [Bastien Nocera]

There was a bug in the detection for that patch which will cause RB to
crash on startup. AC_TRY_COMPILE stinks.

Patch attached, please apply to both 0.6 and 0.7 branches.
People using xine-lib-1.0-rc3 aren't affected.

Cheers

---
Bastien Nocera <hadess hadess net> 
The thunder was ominous sounding, much like the sound of a thin sheet of
metal being shaken backstage during the storm scene in a play. 

Index: configure.ac
===================================================================
RCS file: /cvs/gnome/rhythmbox/configure.ac,v
retrieving revision 1.56.2.7
diff -u -r1.56.2.7 configure.ac
--- configure.ac	3 Dec 2003 03:35:20 -0000	1.56.2.7
+++ configure.ac	18 Dec 2003 17:39:15 -0000
@@ -82,26 +82,25 @@
 	CFLAGS="$RHYTHMBOX_CFLAGS"
 	SAVE_LIBS="$LIBS"
 	LIBS="$RHYTHMBOX_LIBS"
+	AC_MSG_CHECKING(if XINE_PARAM_AUDIO_CLOSE_DEVICE is supported)
 	AC_TRY_COMPILE([
 		#include <xine.h>
 		],[
 		int arg = 0, foo;
 		foo = XINE_PARAM_AUDIO_CLOSE_DEVICE;
-		],(AC_DEFINE(HAVE_XINE_CLOSE,1,[Define if you have the audio device close feature in xine-lib])))
+		],[AC_MSG_RESULT(yes)
+		(AC_DEFINE(HAVE_XINE_CLOSE,1,[Define if you have the audio device close feature in xine-lib]))], AC_MSG_RESULT(no))
 	CFLAGS="$SAVE_CFLAGS"
 	LIBS="$SAVE_LIBS"
 
 	dnl Remove when xine-lib is newer than rc2
 	SAVE_CFLAGS="$CFLAGS"
-	CFLAGS="$RHYTHMBOX_CFLAGS"
+	CFLAGS="$RHYTHMBOX_CFLAGS -Werror"
 	SAVE_LIBS="$LIBS"
 	LIBS="$RHYTHMBOX_LIBS"
-	AC_TRY_COMPILE([
-		#include <xine.h>
-		],[
-		int arg = 0;
-		xine_osd_show_unscaled (NULL, 0);
-		],(AC_DEFINE(HAVE_NULL_VIDEO,1,[Define if you have the NULL video feature in xine-lib])))
+	AC_CHECK_LIB(xine, xine_osd_show_unscaled,
+			[AC_CHECK_HEADER(xine.h,
+			  [AC_DEFINE(HAVE_NULL_VIDEO,1,[Define if you have the NULL video feature in xine-lib])])])
 	CFLAGS="$SAVE_CFLAGS"
 	LIBS="$SAVE_LIBS"
 else