diff options
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 71 |
1 files changed, 53 insertions, 18 deletions
diff --git a/configure.ac b/configure.ac index 5aea6ea15c..f9938df788 100644 --- a/configure.ac +++ b/configure.ac @@ -1,7 +1,7 @@ dnl Evolution Versions m4_define([evo_major_version], [2]) -m4_define([evo_minor_version], [30]) -m4_define([evo_micro_version], [2]) +m4_define([evo_minor_version], [31]) +m4_define([evo_micro_version], [3]) m4_define([evo_version], [evo_major_version.evo_minor_version.evo_micro_version]) m4_define([evo_stable_version], @@ -13,8 +13,8 @@ dnl Base Version: This is for API/version tracking for things like dnl Bonobo server files. This should always be the major/minor of dnl the stable version or stable version to be. Note, this is set dnl the way it is so that GETTEXT_PACKAGE will be parsed correctly. -BASE_VERSION=2.30 -m4_define([base_version], [2.30]) +BASE_VERSION=3.0 +m4_define([base_version], [3.0]) dnl Upgrade Revision: This is for triggering migration calls between dnl varying versions. Reset to 0 whenever BASE_VERSION changes. @@ -23,7 +23,7 @@ m4_define([upgrade_revision], [0]) dnl Autoconf / Automake Initialization AC_PREREQ(2.58) AC_INIT([evolution],[evo_version],[http://bugzilla.gnome.org/enter_bug.cgi?product=Evolution]) -AM_INIT_AUTOMAKE([1.9 -Wall -Werror foreign]) +AM_INIT_AUTOMAKE([1.10 -Wall -Werror foreign]) AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_HEADERS(config.h) AC_CONFIG_SRCDIR(README) @@ -36,11 +36,11 @@ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) dnl Required Packages m4_define([glib_minimum_version], [2.22.0]) -m4_define([gtk_minimum_version], [2.18.0]) +m4_define([gtk_minimum_version], [2.20.0]) m4_define([eds_minimum_version], [evo_version]) m4_define([gnome_icon_theme_minimum_version], [2.19.91]) m4_define([gnome_desktop_minimum_version], [2.26.0]) -m4_define([libgtkhtml_minimum_version], [3.29.6]) +m4_define([libgtkhtml_minimum_version], [3.31.2]) m4_define([gconf_minimum_version], [2.0.0]) dnl XXX Just a Guess m4_define([libsoup_minimum_version], [2.4.0]) dnl XXX Just a Guess m4_define([libgnomecanvas_minimum_version], [2.0.0]) dnl XXX Just a Guess @@ -59,6 +59,7 @@ m4_define([libnotify_minimum_version], [0.3.0]) m4_define([gnome_pilot_minimum_version], [2.0.16]) m4_define([gweather_minimum_version], [2.25.3]) m4_define([gtkimageview_minimum_version], [1.6]) +m4_define([gladeui_minimum_version], [3.0.0]) dnl ****************************** dnl Compiler Warning Flags @@ -235,9 +236,8 @@ PKG_CHECK_MODULES([EVOLUTION_DATA_SERVER], libedataserver-1.2 >= eds_minimum_version libedataserverui-1.2 >= eds_minimum_version libegroupwise-1.2 >= eds_minimum_version - libebackend-1.2 >= eds_minimum_version - libgdata-1.2 >= eds_minimum_version - libgdata-google-1.2 >= eds_minimum_version]) + libebackend-1.2 >= eds_minimum_version]) + dnl ****************************** dnl Canberra / Canberra-GTK Sound @@ -898,10 +898,10 @@ if test "x${enable_nss}" = "xyes" || test "x${enable_nss}" = "xstatic"; then [Please specify the path to libnspr4.a] [Example: --with-nspr-libs=/usr/lib]) else - nsprlibs="$DL_LIB $with_nspr_libs/libplc4.a $with_nspr_libs/libplds4.a $with_nspr_libs/libnspr4.a $PTHREAD_LIB" + nsprlibs="$DL_LIB $with_nspr_libs/libplc4.a $with_nspr_libs/libplds4.a $with_nspr_libs/libnspr4.a" fi else - nsprlibs="$DL_LIB -lplc4 -lplds4 -lnspr4 $PTHREAD_LIB" + nsprlibs="$DL_LIB -lplc4 -lplds4 -lnspr4" fi AC_CACHE_CHECK([for Mozilla nspr libraries], [ac_cv_moz_nspr_libs], @@ -1140,7 +1140,6 @@ if test "$enable_nm" = yes; then AC_SUBST(HAVE_NM) AC_SUBST(NM_CFLAGS) fi - AM_CONDITIONAL([ENABLE_NETWORK_MANAGER], [test "$enable_nm" = yes]) dnl ****************************** @@ -1176,6 +1175,25 @@ if test "$enable_sens" = yes; then AC_SUBST(HAVE_SENS) AC_SUBST(SENS_LIBS) fi +AC_MSG_CHECKING([if Windows SENS support is enabled]) +AC_MSG_RESULT([$enable_sens]) +if test "$enable_sens" = yes; then + SENS_LIBS="-lole32 -loleaut32 -luuid -lrpcrt4" + AC_CHECK_HEADER([eventsys.h], + [AC_DEFINE([HAVE_EVENTSYS_H], 1, [Have <eventsys.h>])],, + [[ #if HAVE_EVENTSYS_H + #include <eventsys.h> + #endif + ]]) + AC_CHECK_HEADER([sensevts.h], + [AC_DEFINE([HAVE_SENSEVTS_H], 1, [Have <sensevts.h>])],, + [[ #if HAVE_SENSEVTS_H + #include <sensevts.h> + #endif + ]]) + AC_SUBST(HAVE_SENS) + AC_SUBST(SENS_LIBS) +fi AM_CONDITIONAL([ENABLE_WINDOWS_SENS], [test "$enable_sens" = yes]) dnl ****************************** @@ -1306,7 +1324,11 @@ EVO_SET_COMPILE_FLAGS(LIBSOUP, libsoup-2.4 >= libsoup_minimum_version) AC_SUBST(LIBSOUP_CFLAGS) AC_SUBST(LIBSOUP_LIBS) -EVO_SET_COMPILE_FLAGS(EVOLUTION_CALENDAR, libgtkhtml-3.14 libebook-1.2 libecal-1.2 libedataserverui-1.2 libebackend-1.2 $libnotify gtkhtml-editor libgdata-1.2 libgdata-google-1.2) +EVO_SET_COMPILE_FLAGS(GDATA, libgdata >= 0.4.0) +AC_SUBST(GDATA_CFLAGS) +AC_SUBST(GDATA_LIBS) + +EVO_SET_COMPILE_FLAGS(EVOLUTION_CALENDAR, libgtkhtml-3.14 libebook-1.2 libecal-1.2 libedataserverui-1.2 libebackend-1.2 $libnotify gtkhtml-editor) AC_SUBST(EVOLUTION_CALENDAR_CFLAGS) AC_SUBST(EVOLUTION_CALENDAR_LIBS) @@ -1418,12 +1440,12 @@ plugins_base_always="calendar-file calendar-http itip-formatter plugin-manager d plugins_base="$plugins_base_always $SA_JUNK_PLUGIN $BF_JUNK_PLUGIN" dist_plugins_base="$plugins_base_always calendar-weather sa-junk-plugin bogo-junk-plugin" -plugins_standard_always="bbdb subject-thread save-calendar mail-to-task mailing-list-actions default-mailer prefer-plain mail-notification attachment-reminder backup-restore email-custom-header templates vcard-inline" +plugins_standard_always="bbdb subject-thread save-calendar mail-to-task mailing-list-actions prefer-plain mail-notification attachment-reminder backup-restore email-custom-header templates vcard-inline" plugins_standard="$plugins_standard_always" dist_plugins_standard="$plugins_standard audio-inline image-inline pst-import" -plugins_experimental_always="face external-editor hula-account-setup" +plugins_experimental_always="face external-editor" plugins_experimental="$plugins_experimental_always $TNEF_ATTACHMENTS" dist_plugins_experimental="$plugins_experimental_always profiler tnef-attachments contacts-map" @@ -1632,6 +1654,19 @@ fi AM_CONDITIONAL(HAVE_KDE_APPLNK, test x"$KDE_APPLNK_DIR" != x) AC_SUBST(KDE_APPLNK_DIR) +dnl ******************************************** +dnl Glade 3 catalog files (for maintainers only) +dnl ******************************************** +AC_ARG_WITH([glade-catalog], + [AS_HELP_STRING([--with-glade-catalog], + [Install the catalog files for Glade 3 ] + [(for maintainers only) [default=no]])], + [with_catalog="$withval"], [with_catalog="no"]) +if test "$with_catalog" = "yes"; then + PKG_CHECK_MODULES(GLADEUI, [gladeui-1.0 >= gladeui_minimum_version]) +fi +AM_CONDITIONAL(GLADE_CATALOG, test "x$with_catalog" != "xno") + dnl ****************************** dnl Makefiles dnl ****************************** @@ -1739,10 +1774,12 @@ mail/default/sr@latin/Makefile mail/default/sv/Makefile mail/default/zh_CN/Makefile mail/importers/Makefile +maint/Makefile modules/Makefile modules/addressbook/Makefile modules/calendar/Makefile modules/mail/Makefile +modules/mailto-handler/Makefile modules/network-manager/Makefile modules/connman/Makefile modules/plugin-lib/Makefile @@ -1760,14 +1797,12 @@ plugins/caldav/Makefile plugins/calendar-file/Makefile plugins/calendar-http/Makefile plugins/calendar-weather/Makefile -plugins/default-mailer/Makefile plugins/default-source/Makefile plugins/email-custom-header/Makefile plugins/external-editor/Makefile plugins/face/Makefile plugins/google-account-setup/Makefile plugins/groupwise-features/Makefile -plugins/hula-account-setup/Makefile plugins/image-inline/Makefile plugins/imap-features/Makefile plugins/itip-formatter/Makefile |