# HG changeset patch
# User rosfran
# Date 1174334935 0
# Node ID 5c9b6b51eb56ef7efd0602c2dc342565fd9bf14a
# Parent  60a60397ffdf14c4ad6e2d71e7703c703a405d6e
[svn r418] Solves bug [ 1667828 ] /maemo-ui compilation Problem on Ubuntu Feisty (https://sourceforge.net/tracker/?func=detail&aid=1667828&group_id=177106&atid=879914).

diff -r 60a60397ffdf -r 5c9b6b51eb56 maemo-ui/configure.ac
--- a/maemo-ui/configure.ac	Mon Mar 19 17:11:23 2007 +0000
+++ b/maemo-ui/configure.ac	Mon Mar 19 20:08:55 2007 +0000
@@ -118,12 +118,12 @@
 
 dnl ========== Check for Hildon Libraries
 PKG_CHECK_MODULES(HILDON,
-  hildon-lgpl libosso hildon-status-bar-lib libhildonmenu hildon-base-lib hildon-control-panel hildon-libs,
+  libosso,
   HAVE_HILDON=yes, HAVE_HILDON=no)
 
 if test "x$HAVE_HILDON" = "xyes"; then
+  HILDON_CFLAGS="$HILDON_CFLAGS -DMAEMO_PLATFORM"
   AC_DEFINE(MAEMO_PLATFORM, 1, [build with hildon libs])
-  HILDON_CFLAGS="$HILDON_CFLAGS -DMAEMO_PLATFORM=1"
 else
   AC_MSG_RESULT(no)
 fi
diff -r 60a60397ffdf -r 5c9b6b51eb56 maemo-ui/src/Makefile.am
--- a/maemo-ui/src/Makefile.am	Mon Mar 19 17:11:23 2007 +0000
+++ b/maemo-ui/src/Makefile.am	Mon Mar 19 20:08:55 2007 +0000
@@ -15,6 +15,7 @@
 		$(GTK_CFLAGS) \
 		$(GLIB_CFLAGS) \
 		$(GST_CFLAGS) \
+		$(GSTBASE_CFLAGS) \
 		$(GSTPLUGINSBASE_CFLAGS) \
 		$(MYSQL_CFLAGS) \
 		$(LIBGMYTH_CFLAGS) \
@@ -24,11 +25,22 @@
 		-DICON_DIR=\""$(datadir)/pixmaps/"\" \
 		-g3 -O0
 
+if MAEMO_PLATFORM 
+mmyth_CFLAGS+= \
+	$(HILDON_CFLAGS)
+endif
+
 mmyth_LDADD = 	\
 		$(LIBGMYTH_LIBS) \
 		$(GTK_LIBS) \
+		$(GLIB_LIBS) \
 		$(GST_LIBS) \
 		$(GSTBASE_LIBS) \
-		$(HILDON_LIBS)	\
+		$(GSTPLUGINSBASE_LIBS) \
 		$(GSTINTERFACES_LIBS)
 
+if MAEMO_PLATFORM
+mmyth_LDADD += 	\
+	$(HILDON_LIBS)
+endif
+