1.1 --- a/maemo-ui/configure.ac	Mon Mar 19 17:11:23 2007 +0000
     1.2 +++ b/maemo-ui/configure.ac	Mon Mar 19 20:08:55 2007 +0000
     1.3 @@ -118,12 +118,12 @@
     1.4  
     1.5  dnl ========== Check for Hildon Libraries
     1.6  PKG_CHECK_MODULES(HILDON,
     1.7 -  hildon-lgpl libosso hildon-status-bar-lib libhildonmenu hildon-base-lib hildon-control-panel hildon-libs,
     1.8 +  libosso,
     1.9    HAVE_HILDON=yes, HAVE_HILDON=no)
    1.10  
    1.11  if test "x$HAVE_HILDON" = "xyes"; then
    1.12 +  HILDON_CFLAGS="$HILDON_CFLAGS -DMAEMO_PLATFORM"
    1.13    AC_DEFINE(MAEMO_PLATFORM, 1, [build with hildon libs])
    1.14 -  HILDON_CFLAGS="$HILDON_CFLAGS -DMAEMO_PLATFORM=1"
    1.15  else
    1.16    AC_MSG_RESULT(no)
    1.17  fi

     2.1 --- a/maemo-ui/src/Makefile.am	Mon Mar 19 17:11:23 2007 +0000
     2.2 +++ b/maemo-ui/src/Makefile.am	Mon Mar 19 20:08:55 2007 +0000
     2.3 @@ -15,6 +15,7 @@
     2.4  		$(GTK_CFLAGS) \
     2.5  		$(GLIB_CFLAGS) \
     2.6  		$(GST_CFLAGS) \
     2.7 +		$(GSTBASE_CFLAGS) \
     2.8  		$(GSTPLUGINSBASE_CFLAGS) \
     2.9  		$(MYSQL_CFLAGS) \
    2.10  		$(LIBGMYTH_CFLAGS) \
    2.11 @@ -24,11 +25,22 @@
    2.12  		-DICON_DIR=\""$(datadir)/pixmaps/"\" \
    2.13  		-g3 -O0
    2.14  
    2.15 +if MAEMO_PLATFORM 
    2.16 +mmyth_CFLAGS+= \
    2.17 +	$(HILDON_CFLAGS)
    2.18 +endif
    2.19 +
    2.20  mmyth_LDADD = 	\
    2.21  		$(LIBGMYTH_LIBS) \
    2.22  		$(GTK_LIBS) \
    2.23 +		$(GLIB_LIBS) \
    2.24  		$(GST_LIBS) \
    2.25  		$(GSTBASE_LIBS) \
    2.26 -		$(HILDON_LIBS)	\
    2.27 +		$(GSTPLUGINSBASE_LIBS) \
    2.28  		$(GSTINTERFACES_LIBS)
    2.29  
    2.30 +if MAEMO_PLATFORM
    2.31 +mmyth_LDADD += 	\
    2.32 +	$(HILDON_LIBS)
    2.33 +endif
    2.34 +