Remove libogs dependency in fremantle (fixes NB#108071)

[modest] / configure.ac

diff --git a/configure.ac b/configure.ac
index 8b4945f..8fc7f51 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -29,9 +29,24 @@
 AC_INIT([modest],[1.0],[http://maemo.org])
 AC_CONFIG_HEADERS([config.h])
 
+m4_define([modest_api_major_version], [1])
+m4_define([modest_api_minor_version], [0])
+m4_define([modest_api_micro_version], [0])
+m4_define([modest_api_version], [modest_api_major_version.modest_api_minor_version.modest_api_micro_version])
+
+
 AC_CONFIG_SRCDIR(src/modest-main.c)
 AM_INIT_AUTOMAKE([dist-bzip2])
 
+MODEST_API_MAJOR_VERSION=modest_api_major_version
+MODEST_API_MINOR_VERSION=modest_api_minor_version
+MODEST_API_MICRO_VERSION=modest_api_micro_version
+MODEST_API_VERSION=modest_api_version
+AC_SUBST(MODEST_API_MAJOR_VERSION)
+AC_SUBST(MODEST_API_MINOR_VERSION)
+AC_SUBST(MODEST_API_MICRO_VERSION)
+AC_SUBST(MODEST_API_VERSION)
+
 ALL_LINGUAS="en_GB"
 
 MODEST_LOCALE_DIR='$prefix/${DATADIRNAME}/locale'
@@ -148,9 +163,9 @@ if test "$MODEST_PLATFORM" = "detect"; then
 fi
 
 if test "$with_platform" = "maemo"; then
-       MODEST_PLUGIN_DEFINES=" -DMODEST_PLATFORM_MAEMO"
+       MODEST_PLUGIN_DEFINES=" -DMODEST_PLATFORM_MAEMO -DMODEST_API_VERSION=${MODEST_API_VERSION}"
 elif test "$with_platform" = "gnome"; then
-       MODEST_PLUGIN_DEFINES=" -DMODEST_PLATFORM_GNOME"
+       MODEST_PLUGIN_DEFINES=" -DMODEST_PLATFORM_GNOME -DMODEST_API_VERSION=${MODEST_API_VERSION}"
 fi
 AC_SUBST(MODEST_PLUGIN_DEFINES)
 
@@ -358,9 +373,9 @@ fi
 fi
 
 #
-# check hildon-help (only for maemo)
+# check hildon-help (only for maemo AND NOT fremantle)
 #
-if test "x$with_toolkit" != "xgtk"; then  
+if test "x$with_toolkit" == "xhildon1"; then
    PKG_CHECK_MODULES(MODEST_HILDON_HELP,hildon-help,have_hildon_help=true,have_hildon_help=false)
    if test "x$have_hildon_help" == "xfalse"; then
       PKG_CHECK_MODULES(MODEST_HILDON_HELP,libossohelp,have_osso_help=true,have_osso_help=false)       
@@ -371,7 +386,7 @@ if test "x$with_toolkit" != "xgtk"; then
        AC_MSG_ERROR([you need to have either osso-help or hildon-help installed])
       fi
    else
-     helplib="hildon-help"     
+     helplib="hildon-help"
      AC_DEFINE_UNQUOTED(MODEST_HAVE_HILDON_HELP, 1, ["Whether hildon-help is used."])          
    fi
 fi
@@ -615,7 +630,9 @@ if test "x$with_platform" == "xmaemo"; then
    echo "Maemo Launcher   : $maemo_launcher"
    echo "Editor lib       : $wpeditor"
    echo "Addressbook      : $have_abook"
-   echo "Help lib         : $helplib"
+   if test "x$with_toolkit" == "xhildon1"; then
+      echo "Help lib         : $helplib"
+   fi
    echo "libconic support : $have_libconic"
    echo "Alarm            : $have_libalarm"
    echo "MCE              : $have_mce"