projects
/
modest
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
* added -Wno-format-extra-args -Werror to the Maemo CFLAGS;
[modest]
/
configure.ac
diff --git
a/configure.ac
b/configure.ac
index
f4a01a3
..
0662937
100644
(file)
--- a/
configure.ac
+++ b/
configure.ac
@@
-33,16
+33,17
@@
AC_CONFIG_SRCDIR(src/modest-main.c)
AM_INIT_AUTOMAKE([dist-bzip2])
# Check for gettext support
AM_INIT_AUTOMAKE([dist-bzip2])
# Check for gettext support
-QGETTEXT_PACKAGE=modest
+GETTEXT_PACKAGE=modest
AC_SUBST(GETTEXT_PACKAGE)
AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", ["Description"])
ALL_LINGUAS="en_GB gl nl"
AC_SUBST(GETTEXT_PACKAGE)
AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", ["Description"])
ALL_LINGUAS="en_GB gl nl"
-#AM_GLIB_DEFINE_LOCALEDIR([MODEST_LOCALE_DIR])
+
+MODEST_LOCALE_DIR='$prefix/${DATADIRNAME}/locale'
+AM_GLIB_DEFINE_LOCALEDIR([MODEST_LOCALE_DIR])
AM_GLIB_GNU_GETTEXT
AM_GLIB_GNU_GETTEXT
-modestlocaledir='$prefix/${DATADIRNAME}/locale'
-AC_SUBST(modestlocaledir)
+
if test x$prefix = xNONE; then
prefix=/usr/local
if test x$prefix = xNONE; then
prefix=/usr/local
@@
-90,6
+91,8
@@
if test "x$with_platform" = "xmaemo"; then
PKG_CHECK_MODULES(MODEST_LIBTINYMAIL_MAEMO,libtinymail-maemo-1.0 hildon-libs libosso libossomime osso-addressbook-1.0 wpeditor)
AC_SUBST(MODEST_LIBTINYMAIL_MAEMO_CFLAGS)
AC_SUBST(MODEST_LIBTINYMAIL_MAEMO_LIBS)
PKG_CHECK_MODULES(MODEST_LIBTINYMAIL_MAEMO,libtinymail-maemo-1.0 hildon-libs libosso libossomime osso-addressbook-1.0 wpeditor)
AC_SUBST(MODEST_LIBTINYMAIL_MAEMO_CFLAGS)
AC_SUBST(MODEST_LIBTINYMAIL_MAEMO_LIBS)
+
+ AC_DEFINE_UNQUOTED(MODEST_PLATFORM_MAEMO, 1, ["Whether modest is being built for the Maemo platform."])
desktopentrydir=`$PKG_CONFIG osso-af-settings --variable=desktopentrydir`
serviceentrydir=`$PKG_CONFIG dbus-glib-1 --variable=prefix`/share/dbus-1/services
desktopentrydir=`$PKG_CONFIG osso-af-settings --variable=desktopentrydir`
serviceentrydir=`$PKG_CONFIG dbus-glib-1 --variable=prefix`/share/dbus-1/services
@@
-117,13
+120,17
@@
if test "x$with_platform" = "xmaemo"; then
AC_SUBST(plugindesktopentrydir)
MODEST_PLATFORM_ID=2
AC_SUBST(plugindesktopentrydir)
MODEST_PLATFORM_ID=2
-
+ # warnings are errors, but don't check format errors, because
+ # it breaks with logical id's
+ CFLAGS="$CFLAGS -Wno-format-extra-args -Werror"
else
# gnome frontend
PKG_CHECK_MODULES(MODEST_LIBTINYMAIL_GNOME_DESKTOP,libtinymail-gnome-desktop-1.0 libnm_glib glib-2.0 >= 2.8 gtk+-2.0 >= 2.10)
AC_SUBST(MODEST_LIBTINYMAIL_GNOME_DESKTOP_CFLAGS)
AC_SUBST(MODEST_LIBTINYMAIL_GNOME_DESKTOP_LIBS)
MODEST_PLATFORM_ID=1
else
# gnome frontend
PKG_CHECK_MODULES(MODEST_LIBTINYMAIL_GNOME_DESKTOP,libtinymail-gnome-desktop-1.0 libnm_glib glib-2.0 >= 2.8 gtk+-2.0 >= 2.10)
AC_SUBST(MODEST_LIBTINYMAIL_GNOME_DESKTOP_CFLAGS)
AC_SUBST(MODEST_LIBTINYMAIL_GNOME_DESKTOP_LIBS)
MODEST_PLATFORM_ID=1
+
+ AC_DEFINE_UNQUOTED(MODEST_PLATFORM_GNOME, 1, ["Whether modest is being built for the GNOME platform."])
fi
dnl 1==>gnome, 2==>maemo
fi
dnl 1==>gnome, 2==>maemo