X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=configure.ac;h=cf2f673c3f9c58598cf879e5b773bfcaa90d0f4f;hp=64929375857e9a7b3444e26e43e66fa5108ec021;hb=95e01c8b9da1ac88ed37bc7bc09331dbbff42d52;hpb=cdbab669714f015b98fbce83b8e147df6ab27e82

diff --git a/configure.ac b/configure.ac
index 6492937..cf2f673 100644
--- a/configure.ac
+++ b/configure.ac
@@ -38,8 +38,6 @@ MODEST_LOCALE_DIR='$prefix/${DATADIRNAME}/locale'
 AM_GLIB_DEFINE_LOCALEDIR([MODEST_LOCALE_DIR])
 AM_GLIB_GNU_GETTEXT
 
-
-
 if test x$prefix = xNONE; then
    prefix=/usr/local
 fi
@@ -63,6 +61,16 @@ else
         CFLAGS="$CFLAGS -O2 -Wall"
 fi
 
+# Option to enable debugging
+AC_ARG_ENABLE(gcov,
+              [AC_HELP_STRING([--enable-gcov],[Coverage reporting (default=no)])],
+              [with_gcov=yes], [with_gcov=no])
+
+if test "x$with_gcov" == "xyes" ; then
+        CFLAGS="$CFLAGS -fprofile-arcs -ftest-coverage"
+	LDFLAGS="$LDFLAGS -lgcov"
+fi
+
 
 
 dnl -------
@@ -105,19 +113,19 @@ AC_SUBST(MODEST_GSTUFF_LIBS)
 
 modest_save_cflags="$CFLAGS"
 modest_save_libs="$LIBS"
-CFLAGS="$MODEST_GSTUFF_CFLAGS"
-LIBS="$MODEST_GSTUFF_LIBS"
+PKG_CHECK_MODULES(MODEST_GTKHTML,libgtkhtml-${gtk_html_version})
+AC_SUBST(MODEST_GTKHTML_CFLAGS)
+AC_SUBST(MODEST_GTKHTML_LIBS)
+CFLAGS="$MODEST_GTKHTML_CFLAGS"
+LIBS="$MODEST_GTKHTML_LIBS"
 AC_CHECK_DECLS([gtk_widget_tap_and_hold_setup],[],[], [#include <gtk/gtk.h>])
-CFLAGS="$modest_save_cflags"
-LIBS="$modest_save_libs"
-
-__COPY_LIBS="$LIBS"
-LIBS="$LIBS $MODEST_GSTUFF_LIBS"
 AC_CHECK_FUNCS(gtk_html_get_selection_area)
 AC_SUBST(HAVE_GTK_HTML_GET_SELECTION_AREA)
 AC_CHECK_FUNCS(gtk_tree_view_column_get_cell_data_hint)
 AC_SUBST(HAVE_GTK_TREE_VIEW_COLUMN_GET_CELL_DATA_HINT)
-LIBS="$__COPY_LIBS"
+CFLAGS="$modest_save_cflags"
+LIBS="$modest_save_libs"
+
 
 dnl dnl now, determine what to build
 dnl AC_MSG_NOTICE([Determining what platform to build])
@@ -144,6 +152,7 @@ if test "$with_platform" = "maemo"; then
 elif test "$with_platform" = "gnome"; then
 	MODEST_PLUGIN_DEFINES=" -DMODEST_PLATFORM_GNOME"
 fi
+AC_SUBST(MODEST_PLUGIN_DEFINES)
 
 #
 # check the widgets library
@@ -159,10 +168,6 @@ if test "$have_hildon1" = "true"; then
    hildonpkgs="hildon-1 hildon-fm-2"
    detected_toolkit=hildon1
    echo "DETECTED HILDON 1 $have_hildon2."
-   if test "$have_hildon2" = "true"; then
-      echo "DETECTED HILDON 2 $have_hildon2."
-      detected_toolkit=hildon2
-   fi
 else
    hildonpkgs="hildon-libs hildon-fm"
    detected_toolkit=hildon1
@@ -180,6 +185,22 @@ else
    fi
 fi
 
+dnl --------------- HILDON & PLUGIN PKGS -----------
+pluginpkgs=$hildonpkgs
+echo "Plugin Packages $pluginpkgs"
+AC_SUBST(pluginpkgs)
+
+# Plugin packages must not include libcanberra and libprofile
+if test "$have_hildon2" = "true"; then
+   echo "DETECTED HILDON 2 $have_hildon2."
+   detected_toolkit=hildon2
+   hildonpkgs="$hildonpkgs libcanberra profile"
+   echo "HILDON 2 PACKAGES $hildonpkgs"
+   AC_CHECK_HEADER([profiled/keys_nokia.h], [], AC_MSG_ERROR([You have to install package profile-data-dev]))
+fi
+AC_SUBST(hildonpkgs)
+
+dnl --------------- HILDON API ------------
 hildon_api=
 if test "$have_hildon0" = "true"; then
    hildon_api=0
@@ -217,10 +238,6 @@ elif test "$with_toolkit" = "gtk"; then
 	MODEST_PLUGIN_DEFINES="$MODEST_PLUGIN_DEFINES -DMODEST_TOOLKIT_GNOME"
 fi
 
-AC_SUBST(hildonpkgs)
-AC_SUBST(MODEST_PLUGIN_DEFINES)
-
-
 dnl Whether to use maemo-launcher or not
 AC_ARG_ENABLE([maemo-launcher],
 	      [AS_HELP_STRING([--enable-maemo-launcher],
@@ -445,11 +462,18 @@ fi
 #
 if test "x$with_platform" == "xmaemo"; then  
    PKG_CHECK_MODULES(MODEST_ABOOK,osso-addressbook-1.0,have_abook=true,have_abook=false)
+   abook_api=`$PKG_CONFIG --modversion osso-addressbook-1.0 | cut -d. -f1`
    AC_SUBST(MODEST_ABOOK_CFLAGS)
    AC_SUBST(MODEST_ABOOK_LIBS)
 
+   if test "x$have_abook" == "xfalse"; then
+     PKG_CHECK_MODULES(MODEST_ABOOK, libosso-abook-1.0,have_abook=true,have_abook=false)
+     abook_api=`$PKG_CONFIG --modversion libosso-abook-1.0 | cut -d. -f1`
+     AC_SUBST(MODEST_ABOOK_CFLAGS)
+     AC_SUBST(MODEST_ABOOK_LIBE)
+   fi
+
    if test "x$have_abook" == "xtrue"; then
-      abook_api=`$PKG_CONFIG --modversion osso-addressbook-1.0 | cut -d. -f1`
       AC_DEFINE_UNQUOTED(OSSO_ABOOK_ENABLE_DEPRECATED, 1, ["use deprecated addressbook API"])
       AC_DEFINE_UNQUOTED(MODEST_ABOOK_API, $abook_api, ["the API version of osso-addressbook"])
       AC_DEFINE_UNQUOTED(MODEST_HAVE_ABOOK, 1, ["whether we have osso-addressbook"])
@@ -486,6 +510,7 @@ if test "x$with_platform" == "xmaemo"; then
    serviceentrydir=`$PKG_CONFIG dbus-glib-1 --variable=prefix`/share/dbus-1/services
    localedir=`$PKG_CONFIG osso-af-settings --variable=localedir`
    backupsettingsdir=/etc/osso-backup/applications
+   ossocudscriptsdir=/etc/osso-cud-scripts
    pixmapdir=`$PKG_CONFIG osso-af-settings --variable=hildonpixmapdir`
    icon_26x26dir=$datadir/icons/hicolor/26x26/hildon
    icon_34x34dir=$datadir/icons/hicolor/34x34/hildon
@@ -502,6 +527,7 @@ if test "x$with_platform" == "xmaemo"; then
    AC_SUBST(desktopentrydir)
    AC_SUBST(serviceentrydir)
    AC_SUBST(backupsettingsdir)
+   AC_SUBST(ossocudscriptsdir)
    AC_SUBST(localedir)
    AC_SUBST(pixmapdir)
    AC_SUBST(icon_26x26dir)
@@ -593,10 +619,14 @@ if test "x$with_platform" == "xmaemo"; then
    echo "libconic support : $have_libconic"
    echo "Alarm            : $have_libalarm"
    echo "MCE              : $have_mce"
-   echo "Hildon-Notify    : $have_hildon_notify"    
+   echo "Hildon-Notify    : $have_hildon_notify"
    echo "LibOGS support   : $have_ogs_support"
-   echo "MozEmbed support : $use_mozembed"
-fi 
+fi
+
+echo "MozEmbed support : $use_mozembed"
+if [ $gtk_html_found = "true" ]; then
+   echo "GtkHTML version  : $gtk_html_version"
+fi
 
 echo "CFLAGS           : $CFLAGS"
 echo "Debug version    : $with_debug"