[xine-cvs] CVS: gnome-xine ChangeLog,1.50.2.3,1.50.2.4 configure.ac,1.31.2.3,1.31.2.4

[Darren S. <ds...@us...>]

Update of /cvsroot/xine/gnome-xine
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21364

Modified Files:
      Tag: gxine-0_4_0-branch
	ChangeLog configure.ac 
Log Message:
Compile-time check for whether GDK uses system malloc.
Require GTK+/GLib 2.2 or later (note: untested).


Index: ChangeLog
===================================================================
RCS file: /cvsroot/xine/gnome-xine/ChangeLog,v
retrieving revision 1.50.2.3
retrieving revision 1.50.2.4
diff -u -r1.50.2.3 -r1.50.2.4
--- ChangeLog	1 Dec 2004 18:44:48 -0000	1.50.2.3
+++ ChangeLog	7 Dec 2004 19:53:19 -0000	1.50.2.4
@@ -1,6 +1,8 @@
 0.4.0:
 	[dsalt]
 	* Hack to update the volume level sliders.
+	* Require at least GTK+ 2.2 and GLib 2.2.
+	  (Note that I've only been able to test against 2.0 and 2.4.)
 
 0.4.0-rc2:
 	[dsalt]

Index: configure.ac
===================================================================
RCS file: /cvsroot/xine/gnome-xine/configure.ac,v
retrieving revision 1.31.2.3
retrieving revision 1.31.2.4
diff -u -r1.31.2.3 -r1.31.2.4
--- configure.ac	2 Dec 2004 19:51:09 -0000	1.31.2.3
+++ configure.ac	7 Dec 2004 19:53:19 -0000	1.31.2.4
@@ -50,9 +50,37 @@
 dnl ---------------------------------------------
 dnl check for gtk 2
 dnl ---------------------------------------------
-PKG_CHECK_MODULES(GLIB2, glib-2.0 >= 2.0.0)
-PKG_CHECK_MODULES(GTK2, gtk+-2.0 >= 2.0.0)
-PKG_CHECK_MODULES(GTHREAD2, gthread-2.0 >= 2.0.0)
+PKG_CHECK_MODULES(GLIB2, glib-2.0 >= 2.2.0)
+PKG_CHECK_MODULES(GTK2, gtk+-2.0 >= 2.2.0)
+PKG_CHECK_MODULES(GTHREAD2, gthread-2.0 >= 2.2.0)
+
+saved_CFLAGS="$CFLAGS"
+saved_LIBS="$LIBS"
+CFLAGS="$CFLAGS $GLIB2_CFLAGS"
+LIBS="$LIBS $GLIB2_LIBS"
+AC_CACHE_CHECK([whether glib uses the system malloc by default],
+  gxine_glib_system_malloc,
+  AC_RUN_IFELSE([
+#include <glib.h>
+int main ()
+{
+  return g_mem_is_system_malloc () ? 0 : 'n';
+}
+],
+    gxine_glib_system_malloc=yes,
+    [if test $? != 110; then
+	AC_MSG_FAILURE([failed to run test])
+     fi
+     gxine_glib_system_malloc=no
+    ],
+    gxine_glib_system_malloc=no),
+)
+if test "$gxine_glib_system_malloc" = "yes"; then
+  AC_DEFINE(GLIB_USES_SYSTEM_MALLOC, 1,
+	    [Define if glib uses the system malloc by default.])
+fi
+CFLAGS="$saved_CFLAGS"
+LIBS="$saved_LIBS"
 
 dnl ---------------------------------------------
 dnl XTest Extension