From: Dirk-Jan C. Binnema Date: Tue, 23 Jan 2007 15:37:30 +0000 (+0000) Subject: * configure.ac, Makefile.am, autogen.sh: X-Git-Tag: git_migration_finished~4175 X-Git-Url: http://git.maemo.org/git/?p=modest;a=commitdiff_plain;h=8304760be43b3afcc8002d7e3588e29fc74ae12e * configure.ac, Makefile.am, autogen.sh: - updates for maemo pmo-trunk-r706 --- diff --git a/Makefile.am b/Makefile.am index ef7cabc..0622cd7 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,7 +1,31 @@ -# -# Makefile.am for modest -# Time-stamp: <2006-12-10 12:55:27 (djcb)> -# +# Copyright (c) 2006,2007 Nokia Corporation +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions are +# met: +# +# * Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# * Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# * Neither the name of the Nokia Corporation nor the names of its +# contributors may be used to endorse or promote products derived from +# this software without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS +# IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED +# TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A +# PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER +# OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, +# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR +# PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF +# LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING +# NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + SUBDIRS= src po if BUILD_TESTS @@ -18,7 +42,11 @@ EXTRA_DIST= \ COPYING \ intltool-extract.in \ intltool-merge.in \ - intltool-update.in + intltool-update.in \ + debian/changelog \ + debian/copyright \ + debian/rules \ + debian/modest.links DISTCLEANFILES = \ intltool-extract.in \ diff --git a/autogen.sh b/autogen.sh index 3bf9c50..32b2bde 100755 --- a/autogen.sh +++ b/autogen.sh @@ -17,4 +17,17 @@ which gnome-autogen.sh || { echo "You need to install gnome-common from GNOME CVS" exit 1 } -USE_GNOME2_MACROS=1 . gnome-autogen.sh +export USE_GNOME2_MACROS=1 + +gnome-autogen.sh || { + echo "gnome autoconf does not work, trying the other way..." + + glib-gettextize --copy --force + libtoolize --automake --copy --force + intltoolize --automake --copy --force + aclocal-1.8 + autoconf --force + autoheader --force + automake-1.8 --add-missing --copy --force-missing --foreign + ./configure $@ +} diff --git a/configure.ac b/configure.ac index a737981..e258e1f 100644 --- a/configure.ac +++ b/configure.ac @@ -1,7 +1,30 @@ -dnl configure.ac for modest -dnl Time-stamp: <2006-12-10 12:52:34 (djcb)> -dnl written by Dirk-Jan C. Binnema - +# Copyright (c) 2006,2007 Nokia Corporation +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions are +# met: +# +# * Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# * Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# * Neither the name of the Nokia Corporation nor the names of its +# contributors may be used to endorse or promote products derived from +# this software without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS +# IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED +# TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A +# PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER +# OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, +# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR +# PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF +# LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING +# NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. AC_INIT([modest],[0.0.1],[http://maemo.org]) AC_CONFIG_HEADERS([config.h]) @@ -10,7 +33,7 @@ AC_CONFIG_SRCDIR(src/modest-main.c) AM_INIT_AUTOMAKE([dist-bzip2]) # Check for gettext support -GETTEXT_PACKAGE=modest +QGETTEXT_PACKAGE=modest AC_SUBST(GETTEXT_PACKAGE) AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", ["Description"]) @@ -32,17 +55,24 @@ AC_HEADER_STDC AC_PROG_LIBTOOL +# Option to enable debugging +AC_ARG_ENABLE(debug, + [AC_HELP_STRING([ --enable-debug],[Debugging (default=no)])], + [with_debug=yes], [with_debug=no]) + +if test "x$with_debug" == "xyes" ; then + CFLAGS="$CFLAGS -ggdb -O0 -DDEBUG -Wall" +else + CFLAGS="$CFLAGS -O2 -Wall" +fi dnl # GLib/Gobject/Gtk/Gconf => mandatory -PKG_CHECK_MODULES(MODEST_GSTUFF,glib-2.0 >= 2.6 gobject-2.0 gtk+-2.0 >= 2.6 gconf-2.0 libgtkhtml-3.8 libglade-2.0 libtinymail-1.0 libtinymail-camel-1.0 libtinymailui-1.0 libtinymailui-gtk-1.0) +PKG_CHECK_MODULES(MODEST_GSTUFF,glib-2.0 >= 2.6 gobject-2.0 gtk+-2.0 >= 2.6 gconf-2.0 libgtkhtml-3.8 libtinymail-1.0 libtinymail-camel-1.0 libtinymailui-1.0 libtinymailui-gtk-1.0) AC_SUBST(MODEST_GSTUFF_CFLAGS) AC_SUBST(MODEST_GSTUFF_LIBS) - - - dnl dnl now, determine what to build AC_MSG_NOTICE([Determining what platform to build]) PKG_CHECK_MODULES(MODEST_LIBTINYMAIL_MAEMO,libosso,[with_platform=maemo],true) @@ -63,7 +93,34 @@ if test "x$with_platform" = "xmaemo"; then PKG_CHECK_MODULES(MODEST_LIBTINYMAIL_MAEMO,libtinymail-maemo-1.0 hildon-libs libosso) AC_SUBST(MODEST_LIBTINYMAIL_MAEMO_CFLAGS) AC_SUBST(MODEST_LIBTINYMAIL_MAEMO_LIBS) - MODEST_PLATFORM_ID=2 + + desktopentrydir=`$PKG_CONFIG osso-af-settings --variable=desktopentrydir` + serviceentrydir=`$PKG_CONFIG dbus-glib-1 --variable=prefix`/share/dbus-1/services + localedir=`$PKG_CONFIG osso-af-settings --variable=localedir` + pixmapdir=`$PKG_CONFIG osso-af-settings --variable=hildonpixmapdir` + icon_26x26dir=$datadir/icons/hicolor/26x26/hildon + icon_34x34dir=$datadir/icons/hicolor/34x34/hildon + icon_40x40dir=$datadir/icons/hicolor/40x40/hildon + icon_50x50dir=$datadir/icons/hicolor/50x50/hildon + icon_scalabledir=$datadir/icons/hicolor/scalable/hildon + pluginlibdir=`$PKG_CONFIG hildon-control-panel --variable=plugindir` + plugindesktopentrydir=`$PKG_CONFIG hildon-control-panel --variable=plugindesktopentrydir` + + # Define as variables in Makefiles + AC_SUBST(desktopentrydir) + AC_SUBST(serviceentrydir) + AC_SUBST(localedir) + AC_SUBST(pixmapdir) + AC_SUBST(icon_26x26dir) + AC_SUBST(icon_34x34dir) + AC_SUBST(icon_40x40dir) + AC_SUBST(icon_50x50dir) + AC_SUBST(icon_scalabledir) + AC_SUBST(pluginlibdir) + AC_SUBST(plugindesktopentrydir) + + MODEST_PLATFORM_ID=2 + else PKG_CHECK_MODULES(MODEST_LIBTINYMAIL_GNOME_DESKTOP,libtinymail-gnome-desktop-1.0 libnm_glib glib-2.0 >= 2.8) AC_SUBST(MODEST_LIBTINYMAIL_GNOME_DESKTOP_CFLAGS) @@ -97,8 +154,6 @@ fi - - dnl ## do we want documentation (gtk-doc) build_docs=false AC_ARG_ENABLE(docs, @@ -115,7 +170,7 @@ dnl ## gtk-doc GTK_DOC_CHECK([1.0]) dnl Intltool utility programs -AC_PROG_INTLTOOL([0.33.0],[no-xml]) +#AC_PROG_INTLTOOL([0.33.0],[no-xml]) AC_OUTPUT([ @@ -128,18 +183,19 @@ src/widgets/Makefile docs/Makefile docs/reference/Makefile tests/Makefile +src/maemo/modest.desktop +src/maemo/modest.service ]) - - echo echo "modest configure results" echo "-----------------------------------" echo "Platform : $with_platform" echo "Build tests : $build_tests" echo "Build docs : $build_docs" +echo "Debug version : $with_debug" echo "" echo "NOTE: you should do a 'make clean' after changing platform (--with-platform=)" echo ""