configure.ac: Check for libglade-2.0, for the metadata-editor example.

Original commit message from CVS:
* configure.ac:
Check for libglade-2.0, for the metadata-editor example.
* tests/icles/Makefile.am:
Only try to build the metadata-editor example if we have gtk and
glade (otherwise the build would just fail ...); fix build in
uninstalled setup.
* tests/icles/metadata_editor.c: (on_cell_edited), (ui_add_columns):
Fix compiler warnings (use GLib macros to cast pointer <-> int).

4 files changed, 36 insertions, 10 deletions

diff --git a/ChangeLog b/ChangeLog
index cd642e9e..d7917777 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2008-01-26  Tim-Philipp Müller  <tim at centricular dot net>
+
+	* configure.ac:
+	  Check for libglade-2.0, for the metadata-editor example.
+
+	* tests/icles/Makefile.am:
+	  Only try to build the metadata-editor example if we have gtk and
+	  glade (otherwise the build would just fail ...); fix build in
+	  uninstalled setup.
+
+	* tests/icles/metadata_editor.c: (on_cell_edited), (ui_add_columns):
+	  Fix compiler warnings (use GLib macros to cast pointer <-> int).
+
 2008-01-25  Edgard Lima  <edgard.lima@indt.org.br>
 
 	* ext/metadata/TODO:
diff --git a/configure.ac b/configure.ac
index 58c2c379..66992b06 100644
--- a/configure.ac
+++ b/configure.ac
@@ -245,6 +245,14 @@ AC_SUBST(GTK_CFLAGS)
 AC_SUBST(HAVE_GTK)
 AM_CONDITIONAL(HAVE_GTK, test "x$HAVE_GTK" = "xyes")
 
+dnl libglade is optional and only used in examples
+HAVE_GLADE=NO
+PKG_CHECK_MODULES(GLADE, libglade-2.0 >= 2.6.0, HAVE_GLADE=yes, HAVE_GLADE=no)
+AC_SUBST(GLADE_LIBS)
+AC_SUBST(GLADE_CFLAGS)
+AC_SUBST(HAVE_GLADE)
+AM_CONDITIONAL(HAVE_GLADE, test "x$HAVE_GLADE" = "xyes")
+
 dnl set license and copyright notice
 GST_LICENSE="LGPL"
 AC_DEFINE_UNQUOTED(GST_LICENSE, "$GST_LICENSE", [GStreamer license])
diff --git a/tests/icles/Makefile.am b/tests/icles/Makefile.am
index 26a5453a..b3fba24c 100644
--- a/tests/icles/Makefile.am
+++ b/tests/icles/Makefile.am
@@ -12,18 +12,23 @@ GST_SOUNDTOUCH_TESTS =
 endif
 
 if USE_METADATA
+if HAVE_GLADE
+if HAVE_GTK
 
 GST_METADATA_TESTS = metadata_editor
 
 metadata_editor_SOURCES = metadata_editor.c
-metadata_editor_CFLAGS  = $(GST_CFLAGS) \
-		`pkg-config --cflags gstreamer-0.10 libglade-2.0 gtk+-2.0`
-metadata_editor_LDADD   = $(GST_LIBS)
-metadata_editor_LDFLAGS = $(GST_PLUGIN_LDFLAGS) \
-		-Wl -export-dynamic \
-		-lgstinterfaces-0.10 \
-		`pkg-config --libs gstreamer-0.10 libglade-2.0 gtk+-2.0`
-
+metadata_editor_CFLAGS  = \
+	$(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) $(GLADE_CFLAGS)
+metadata_editor_LDADD   = \
+	$(GST_PLUGINS_BASE_LIBS) -lgstinterfaces-0.10 $(GST_LIBS) $(GLADE_LIBS)
+metadata_editor_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
+else
+GST_METADATA_TESTS =
+endif
+else
+GST_METADATA_TESTS =
+endif
 else
 GST_METADATA_TESTS =
 endif
diff --git a/tests/icles/metadata_editor.c b/tests/icles/metadata_editor.c
index 69d9c29a..7b318761 100644
--- a/tests/icles/metadata_editor.c
+++ b/tests/icles/metadata_editor.c
@@ -398,7 +398,7 @@ on_cell_edited (GtkCellRendererText * renderer, gchar * str_path,
   GtkTreePath *path = NULL;
   GtkTreeIter iter;
   GtkTreeModel *model = NULL;
-  const guint32 col_index = (guint32) user_data;
+  const gint col_index = GPOINTER_TO_INT (user_data);
   const gchar *tag = gtk_entry_get_text (ui_entry_insert_tag);
 
   path = gtk_tree_path_new_from_string (str_path);
@@ -459,7 +459,7 @@ ui_add_columns (GtkTreeView * tree_view, const gchar * title, gint col_index,
   if (editable) {
     g_object_set (renderer, "editable", TRUE, NULL);
     g_signal_connect (G_OBJECT (renderer), "edited",
-        G_CALLBACK (on_cell_edited), (gpointer) col_index);
+        G_CALLBACK (on_cell_edited), GINT_TO_POINTER (col_index));
   }
 
   if ((tree_col = gtk_tree_view_column_new_with_attributes (title, renderer,