elif test "$with_platform" = "gnome"; then
MODEST_PLUGIN_DEFINES=" -DMODEST_PLATFORM_GNOME"
fi
+AC_SUBST(MODEST_PLUGIN_DEFINES)
#
# check the widgets library
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
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"
+fi
+AC_SUBST(hildonpkgs)
+
+dnl --------------- HILDON API ------------
hildon_api=
if test "$have_hildon0" = "true"; then
hildon_api=0
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],
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
AC_SUBST(desktopentrydir)
AC_SUBST(serviceentrydir)
AC_SUBST(backupsettingsdir)
+ AC_SUBST(ossocudscriptsdir)
AC_SUBST(localedir)
AC_SUBST(pixmapdir)
AC_SUBST(icon_26x26dir)