[maemo-commits] [maemo-commits] r8364 - in projects/haf/trunk/maemo-af-desktop: . libhildonmenu

[From: www-data at stage.maemo.org]

Author: jobi
Date: 2006-11-27 18:35:52 +0200 (Mon, 27 Nov 2006)
New Revision: 8364

Modified:
   projects/haf/trunk/maemo-af-desktop/ChangeLog
   projects/haf/trunk/maemo-af-desktop/configure.ac
   projects/haf/trunk/maemo-af-desktop/libhildonmenu/Makefile.am
   projects/haf/trunk/maemo-af-desktop/libhildonmenu/Makefile.in
Log:

2006-11-27  Johan Bilien <johan.bilien at nokia.com>

	* configure.ac: added test on GTK+ for more fine-grained linking
	* libhildonmenu/Makefile.am: Link against GTK+ and libxml2.
	Fixes: NB#48504



Modified: projects/haf/trunk/maemo-af-desktop/ChangeLog
===================================================================
--- projects/haf/trunk/maemo-af-desktop/ChangeLog	2006-11-27 16:07:36 UTC (rev 8363)
+++ projects/haf/trunk/maemo-af-desktop/ChangeLog	2006-11-27 16:35:52 UTC (rev 8364)
@@ -1,5 +1,11 @@
 2006-11-27  Johan Bilien <johan.bilien at nokia.com>
 
+	* configure.ac: added test on GTK+ for more fine-grained linking
+	* libhildonmenu/Makefile.am: Link against GTK+ and libxml2.
+	Fixes: NB#48504
+
+2006-11-27  Johan Bilien <johan.bilien at nokia.com>
+
 	* hildon-home/hildon-home-window.c:
 	- move acting on the select applets dialog from _dialog_run
 	to a _run signal handler

Modified: projects/haf/trunk/maemo-af-desktop/configure.ac
===================================================================
--- projects/haf/trunk/maemo-af-desktop/configure.ac	2006-11-27 16:07:36 UTC (rev 8363)
+++ projects/haf/trunk/maemo-af-desktop/configure.ac	2006-11-27 16:35:52 UTC (rev 8364)
@@ -72,6 +72,10 @@
 AC_SUBST(LIBXML_LIBS)
 AC_SUBST(LIBXML_CFLAGS)
 
+PKG_CHECK_MODULES(GTK, gtk+-2.0)
+AC_SUBST(GTK_LIBS)
+AC_SUBST(GTK_CFLAGS)
+
 PKG_CHECK_MODULES(OSSO,libosso >= 0.9.19 )
 AC_SUBST(OSSO_LIBS)
 AC_SUBST(OSSO_CFLAGS)

Modified: projects/haf/trunk/maemo-af-desktop/libhildonmenu/Makefile.am
===================================================================
--- projects/haf/trunk/maemo-af-desktop/libhildonmenu/Makefile.am	2006-11-27 16:07:36 UTC (rev 8363)
+++ projects/haf/trunk/maemo-af-desktop/libhildonmenu/Makefile.am	2006-11-27 16:35:52 UTC (rev 8364)
@@ -10,7 +10,7 @@
 
 EXTRA_DIST =
 
-libhildonmenu_la_LIBADD = -ldl -lc $(GLIB_LIBS)
+libhildonmenu_la_LIBADD = -ldl -lc $(GLIB_LIBS) $(GTK_LIBS) $(LIBXML_LIBS)
 #libhildonmenu_la_LDFLAGS = -version-info 0:0:1
 
 pkgconfigdir = $(libdir)/pkgconfig

Modified: projects/haf/trunk/maemo-af-desktop/libhildonmenu/Makefile.in
===================================================================
--- projects/haf/trunk/maemo-af-desktop/libhildonmenu/Makefile.in	2006-11-27 16:07:36 UTC (rev 8363)
+++ projects/haf/trunk/maemo-af-desktop/libhildonmenu/Makefile.in	2006-11-27 16:35:52 UTC (rev 8364)
@@ -79,6 +79,8 @@
 GMSGFMT = @GMSGFMT@
 GNOME_VFS_CFLAGS = @GNOME_VFS_CFLAGS@
 GNOME_VFS_LIBS = @GNOME_VFS_LIBS@
+GTK_CFLAGS = @GTK_CFLAGS@
+GTK_LIBS = @GTK_LIBS@
 HILDONBASELIB_CFLAGS = @HILDONBASELIB_CFLAGS@
 HILDONBASELIB_LIBS = @HILDONBASELIB_LIBS@
 HILDON_CFLAGS = @HILDON_CFLAGS@
@@ -200,7 +202,7 @@
 
 EXTRA_DIST = 
 
-libhildonmenu_la_LIBADD = -ldl -lc $(GLIB_LIBS)
+libhildonmenu_la_LIBADD = -ldl -lc $(GLIB_LIBS) $(GTK_LIBS) $(LIBXML_LIBS)
 
 #libhildonmenu_la_LDFLAGS = -version-info 0:0:1
 pkgconfigdir = $(libdir)/pkgconfig