X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=configure.ac;h=410bac226f356323bccd8cc15495efdaec6c06e0;hp=cf443cdc3c0a4f9b0facc4d6921ed1cb3f326840;hb=0fbbf474b218d00f517fae83561a05f6919679e7;hpb=f6d386ff93e929092ba105385a29d760aeba9ff7 diff --git a/configure.ac b/configure.ac index cf443cd..410bac2 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 ------- @@ -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 @@ -211,16 +232,12 @@ fi if test "$with_toolkit" = "hildon1"; then MODEST_PLUGIN_DEFINES="$MODEST_PLUGIN_DEFINES -DMODEST_TOOLKIT_HILDON1" -elif test "$with_platform" = "hildon2"; then +elif test "$with_toolkit" = "hildon2"; then MODEST_PLUGIN_DEFINES="$MODEST_PLUGIN_DEFINES -DMODEST_TOOLKIT_HILDON2" -elif test "$with_platform" = "gtk"; then +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], @@ -247,7 +264,7 @@ else PKG_CHECK_MODULES(MODEST_TOOLKIT,$hildonpkgs) if test "$with_toolkit" = "hildon2"; then AC_DEFINE_UNQUOTED(MODEST_TOOLKIT_HILDON2, 1, ["Whether modest is being build for the hildon2 toolkit."]) - MODEST_TOOLKIT_DIR=maemo + MODEST_TOOLKIT_DIR=hildon2 else AC_DEFINE_UNQUOTED(MODEST_TOOLKIT_HILDON1, 1, ["Whether modest is being build for the hildon2 toolkit."]) MODEST_TOOLKIT_DIR=maemo @@ -296,15 +313,15 @@ fi # check libalarm # if test "x$with_platform" == "xmaemo"; then -PKG_CHECK_MODULES(MODEST_LIBALARM,libalarm,have_libalarm=true,have_libalarm=false) -if test "x$have_libalarm" == "xtrue"; then - libalarm="libalarm" - AC_DEFINE_UNQUOTED(MODEST_HAVE_LIBALARM, 1, ["Whether libalarm is used."]) - AC_SUBST(MODEST_LIBALARM_CFLAGS) - AC_SUBST(MODEST_LIBALARM_LIBS) -else - libalarm="" -fi + PKG_CHECK_MODULES(MODEST_LIBALARM,libalarm,have_libalarm=true,have_libalarm=false) + if test "x$have_libalarm" == "xfalse"; then + PKG_CHECK_MODULES(MODEST_LIBALARM, alarm, have_libalarm=true,have_libalarm=false) + fi + if test "x$have_libalarm" == "xtrue"; then + AC_DEFINE_UNQUOTED(MODEST_HAVE_LIBALARM, 1, ["Whether libalarm is used."]) + AC_SUBST(MODEST_LIBALARM_CFLAGS) + AC_SUBST(MODEST_LIBALARM_LIBS) + fi fi # @@ -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) @@ -560,6 +586,7 @@ src/dbus_api/Makefile src/gnome/Makefile src/maemo/Makefile src/maemo/easysetup/Makefile +src/hildon2/Makefile src/widgets/Makefile docs/Makefile docs/reference/Makefile @@ -567,6 +594,8 @@ tests/Makefile tests/dbus_api/Makefile src/maemo/modest.desktop src/maemo/com.nokia.modest.service +src/hildon2/modest.desktop +src/hildon2/com.nokia.modest.service libmodest-dbus-client/Makefile libmodest-dbus-client/libmodest-dbus-client-1.0.pc ])