* build the new GtkHTML-based TnyMsgStreamIface
authorDirk-Jan C. Binnema <dirk-jan.binnema@nokia.com>
Wed, 17 May 2006 15:46:19 +0000 (15:46 +0000)
committerDirk-Jan C. Binnema <dirk-jan.binnema@nokia.com>
Wed, 17 May 2006 15:46:19 +0000 (15:46 +0000)
pmo-trunk-r81

configure.ac
src/Makefile.am

index c886d6f..67b5b62 100644 (file)
@@ -1,5 +1,5 @@
 dnl configure.ac for modest 
-dnl Time-stamp: <2006-05-01 19:11:26 (djcb)>
+dnl Time-stamp: <2006-05-17 10:44:04 (djcb)>
 dnl written by Dirk-Jan C. Binnema <dirk-jan.binnema@nokia.com>
 AC_INIT([modest],[0.0.9],[http://maemo.org])
 AC_CONFIG_SRCDIR(src/modest-main.c)
@@ -47,6 +47,11 @@ PKG_CHECK_MODULES(MODEST_GTK,gtk+-2.0 >= 2.6)
 AC_SUBST(MODEST_GTK_CFLAGS)
 AC_SUBST(MODEST_GTK_LIBS)
 
+dnl # GtkHTML => mandatory (for now)
+PKG_CHECK_MODULES(MODEST_GTKHTML,libgtkhtml-3.8)
+AC_SUBST(MODEST_GTKHTML_CFLAGS)
+AC_SUBST(MODEST_GTKHTML_LIBS)
+
 dnl # Glade
 PKG_CHECK_MODULES(MODEST_GLADE,libglade-2.0,glade_support=yes,echo "no";glade_support=no)
 AC_SUBST(MODEST_GLADE_CFLAGS)
index a65d0d2..1e1381d 100644 (file)
@@ -1,6 +1,6 @@
 #
 # Makefile.am
-# Time-stamp: <2006-05-08 21:11:31 (djcb)>
+# Time-stamp: <2006-05-17 10:44:46 (djcb)>
 SUBDIRS=gtk gtk-glade hildon
 
 INCLUDES=\
@@ -8,6 +8,7 @@ INCLUDES=\
        $(MODEST_GCONF_CFLAGS)\
        $(MODEST_GTK_CFLAGS)\
        $(MODEST_TINYMAIL_CFLAGS)\
+       $(MODEST_GTKHTML_CFLAGS)\
        $(MODEST_LIBTINYMAIL_GNOME_DESKTOP_CFLAGS)\
        -DPREFIX=\"@prefix@\"
 
@@ -35,6 +36,8 @@ modest_SOURCES=\
        modest-proto.h\
        modest-proto.c\
        modest-ui.h\
+       modest-tny-stream-gtkhtml.h\
+       modest-tny-stream-gtkhtml.c\
        modest-tny-transport-actions.c\
        modest-tny-transport-actions.h\
        modest-ui.h
@@ -45,5 +48,6 @@ modest_LDADD = \
        $(MODEST_GTK_LIBS)\
        $(MODEST_GLADE_LIBS) \
        $(MODEST_TINYMAIL_LIBS)\
+       $(MODEST_GTKHTML_LIBS)\
        $(MODEST_LIBTINYMAIL_GNOME_DESKTOP_LIBS)\
        $(MODEST_UI_DIR)/libmodest-ui.la