← Back to branch summary

~ubuntu-branches/ubuntu/natty/evolution-exchange/natty

« back to all changes in this revision

Viewing changes to configure.ac

  • Committer: Bazaar Package Importer
  • Author(s): Mathieu Trudel-Lapierre, Didier Roche, Mathieu Trudel-Lapierre
  • Date: 2010-11-03 16:17:46 UTC
  • mfrom: (1.1.68 upstream)
  • Revision ID: james.westby@ubuntu.com-20101103161746-rs4gpelhc6hc3yxi
Tags: 2.32.0-0ubuntu1
https://launchpad.net/bugs/660034
https://launchpad.net/bugs/245589
https://launchpad.net/bugs/272414
https://launchpad.net/bugs/115913
https://launchpad.net/bugs/141231
https://launchpad.net/bugs/507972
[ Didier Roche ]
* debian/rules:
  - add debug flag for helping upstream to get more info
    (--with-ek2-debug) (LP: #660034)
* debian/patches/01_try_fixing_duplicate_symbols.patch, debian/rules:
  - disabling stripping -Bsymbolic-functions and set some lib as private lib
    to hopefully avoid duplicate symbols. That needs confirmation by people
    having this setup.

[ Mathieu Trudel-Lapierre ]
* new upstream release 2.32.0
  - Evolution forgets password on any error (LP: #245589, #272414)
  - Appointments don't display in Windows Mobile 5 (LP: #115913, #141231)
  - Properly free unused message infos periodically (LP: #507972)
* debian/patches/90_disable_deprecation_warning.patch: refreshed
* debian/control: bump (Build-)Depends for evolution packages to 2.32.0
* debian/control: bump libgtk2.0-dev Build-Depends to 2.20.0
* debian/patches/92_lresolv_detection.patch: look harder to see whether we
  should link with -lresolv. This fixes build failures on Natty.

Show diffs side-by-side

added added

removed removed

Lines of Context:
configure.ac
1
1
dnl Sets the evolution exchange version.
2
 
m4_define([eex_version], [2.30.3])
 
2
m4_define([eex_version], [2.32.0])
3
3
 
4
4
dnl Initializes automake/autoconf
5
5
AC_PREREQ(2.58)
14
14
 
15
15
dnl Required Package Versions
16
16
m4_define([glib_minimum_version], [2.16.0])
17
 
m4_define([gthread_minimum_version], [2.16.0])
18
 
m4_define([gtk_minimum_version], [2.10.0])
19
17
m4_define([eds_minimum_version], [eex_version])
20
18
m4_define([evo_minimum_version], [eex_version])
21
19
m4_define([gconf_minimum_version], [2.0.0])             dnl XXX Just a Guess
22
20
m4_define([libxml_minimum_version], [2.0.0])            dnl XXX Just a Guess
23
21
m4_define([libsoup_minimum_version], [2.3.0])
24
22
 
 
23
 
 
24
dnl **********************************
 
25
dnl Gtk-3 compatibility
 
26
dnl **********************************
 
27
AC_ARG_ENABLE([gtk3],
 
28
        AS_HELP_STRING([--enable-gtk3],
 
29
        [Attempt to use gtk+-3]),
 
30
        [enable_gtk3=$enableval],[enable_gtk3=no])
 
31
 
 
32
if test "x${enable_gtk3}" = "xyes"; then
 
33
        GTK="gtk+-3.0"
 
34
        gtk_minimum_version="2.90.4"
 
35
 
 
36
        EVOLUTION_PLUGIN_PK="evolution-plugin-3.0"
 
37
        EVOLUTION_MAIL_PK="evolution-mail-3.0"
 
38
        EVOLUTION_SHELL_PK="evolution-shell-3.0"
 
39
        LIBEDATASERVERUI_PK="libedataserverui-3.0"
 
40
else    
 
41
        GTK="gtk+-2.0"
 
42
        gtk_minimum_version="2.20.0"
 
43
 
 
44
        EVOLUTION_PLUGIN_PK="evolution-plugin"
 
45
        EVOLUTION_MAIL_PK="evolution-mail"
 
46
        EVOLUTION_SHELL_PK="evolution-shell"
 
47
        LIBEDATASERVERUI_PK="libedataserverui-1.2"
 
48
fi
 
49
 
25
50
dnl *********************************************************************
26
51
dnl Update these for every new development release of Evolution-Exchange.
27
52
dnl These numbers actually correspond to the next stable release number.
28
53
dnl Note, this is set the way it is so that GETTEXT_PACKAGE will be
29
54
dnl parsed correctly.
30
55
dnl ******************************************************************
31
 
BASE_VERSION=2.30
32
 
m4_define([base_version], [2.30])
 
56
BASE_VERSION=2.32
 
57
m4_define([base_version], [2.32])
33
58
 
34
59
dnl **********************
35
60
dnl Compiler Warning Flags
40
65
        -DGDK_DISABLE_DEPRECATED
41
66
        -DGDK_PIXBUF_DISABLE_DEPRECATED
42
67
        -DGTK_DISABLE_DEPRECATED
 
68
        -DE_BOOK_DISABLE_DEPRECATED
 
69
        -DE_CAL_DISABLE_DEPRECATED
43
70
        -DG_DISABLE_SINGLE_INCLUDES
44
71
        -DGTK_DISABLE_SINGLE_INCLUDES
 
72
        -DGSEAL_ENABLE
45
73
        -Wall -Wextra
46
74
        -Wno-missing-field-initializers
47
75
        -Wno-sign-compare
63
91
dnl     -Wshadow
64
92
dnl     -Wstrict-aliasing=2
65
93
 
66
 
dnl GCC 4.4 got more aggressive in its aliasing optimizations, changing
67
 
dnl behavior that -- according to the C99 standard -- is supposed to be
68
 
dnl undefined.  We may still have aliasing abuses lying around that rely
69
 
dnl on GCC's previous "undefined" behavior, so disable strict-aliasing
70
 
dnl optimization until we can find and fix all the abuses.
71
 
dnl XXX This really belongs in AM_CFLAGS.
72
94
AM_CPPFLAGS="$WARNING_FLAGS -fno-strict-aliasing"
73
95
AC_SUBST(AM_CPPFLAGS)
74
96
 
83
105
AC_PROG_LN_S
84
106
AC_PROG_MAKE_SET
85
107
 
 
108
dnl GCC 4.4 got more aggressive in its aliasing optimizations, changing
 
109
dnl behavior that -- according to the C99 standard -- is supposed to be
 
110
dnl undefined.  We may still have aliasing abuses lying around that rely
 
111
dnl on GCC's previous "undefined" behavior, so disable strict-aliasing
 
112
dnl optimization until we can find and fix all the abuses.
 
113
dnl (AC_PROG_CC must run first to set the GCC variable.)
 
114
dnl XXX This really belongs in AM_CFLAGS.
 
115
if test "x${GCC}" = "xyes"; then
 
116
        CFLAGS="$CFLAGS -fno-strict-aliasing"
 
117
fi
 
118
 
86
119
dnl ******************************
87
120
dnl Check for Win32
88
121
dnl ******************************
127
160
AC_SUBST(GETTEXT_PACKAGE)
128
161
AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [Package name for gettext])
129
162
 
130
 
localedir='$(prefix)/$(DATADIRNAME)/local'
 
163
localedir='$(prefix)/$(DATADIRNAME)/locale'
131
164
AC_SUBST(localedir)
132
165
 
133
166
dnl **********************************
135
168
dnl **********************************
136
169
 
137
170
PKG_CHECK_MODULES(GNOME_PLATFORM,
138
 
        [glib-2.0 >= glib_minimum_version
139
 
        gthread-2.0 >= gthread_minimum_version
140
 
        gtk+-2.0 >= gtk_minimum_version
 
171
        [gio-2.0 >= glib_minimum_version
 
172
        $GTK >= $gtk_minimum_version
141
173
        gconf-2.0 >= gconf_minimum_version
142
174
        libxml-2.0 >= libxml_minimum_version
143
175
        libsoup-2.4 >= libsoup_minimum_version])
146
178
        [libebook-1.2 >= eds_minimum_version
147
179
        libecal-1.2 >= eds_minimum_version
148
180
        libedataserver-1.2 >= eds_minimum_version
149
 
        libedataserverui-1.2 >= eds_minimum_version
 
181
        $LIBEDATASERVERUI_PK >= eds_minimum_version
150
182
        libedata-book-1.2 >= eds_minimum_version
151
183
        libedata-cal-1.2 >= eds_minimum_version
152
184
        libegroupwise-1.2 >= eds_minimum_version
197
229
dnl Check for evo/eds and version setting
198
230
dnl *************************************
199
231
AC_MSG_CHECKING(Evolution version)
200
 
EVOLUTION_VERSION="`$PKG_CONFIG --modversion evolution-shell 2>/dev/null`"
 
232
EVOLUTION_VERSION="`$PKG_CONFIG --modversion $EVOLUTION_SHELL_PK 2>/dev/null`"
201
233
if test -z "$EVOLUTION_VERSION"; then
202
234
        AC_MSG_ERROR(Evolution development libraries not installed)
203
235
fi
206
238
AC_SUBST([BASE_VERSION], [base_version])
207
239
AC_DEFINE_UNQUOTED(BASE_VERSION, "$BASE_VERSION", Connector base version)
208
240
 
209
 
plugindir="`$PKG_CONFIG --variable=plugindir evolution-plugin`"
 
241
plugindir="`$PKG_CONFIG --variable=plugindir $EVOLUTION_PLUGIN_PK`"
210
242
AC_SUBST(plugindir)
211
243
 
212
 
EVOLUTION_PLUGIN_errordir="`$PKG_CONFIG --variable=errordir evolution-plugin`"
 
244
EVOLUTION_PLUGIN_errordir="`$PKG_CONFIG --variable=errordir $EVOLUTION_PLUGIN_PK`"
213
245
AC_SUBST(EVOLUTION_PLUGIN_errordir)
214
246
 
215
247
extensiondir="`$PKG_CONFIG --variable=extensiondir evolution-data-server-1.2`"
216
248
AC_SUBST(extensiondir)
217
249
 
218
 
EVOLUTION_imagesdir="`$PKG_CONFIG --variable=imagesdir evolution-shell`"
 
250
EVOLUTION_imagesdir="`$PKG_CONFIG --variable=imagesdir $EVOLUTION_SHELL_PK`"
219
251
AC_SUBST(EVOLUTION_imagesdir)
220
252
 
221
253
CAMEL_providerdir="`$PKG_CONFIG --variable=camel_providerdir camel-provider-1.2`"
224
256
dnl ***************************
225
257
dnl Check for evolution plugins
226
258
dnl ***************************
227
 
PKG_CHECK_MODULES(EVOLUTION_PLUGIN, evolution-plugin >= evo_minimum_version)
 
259
PKG_CHECK_MODULES(EVOLUTION_PLUGIN, $EVOLUTION_PLUGIN_PK >= evo_minimum_version)
228
260
AC_SUBST(EVOLUTION_PLUGIN_CFLAGS)
229
261
AC_SUBST(EVOLUTION_PLUGIN_LIBS)
230
262
 
231
263
dnl ***************************
232
264
dnl Check for evolution mail
233
265
dnl ***************************
234
 
PKG_CHECK_MODULES(EVOLUTION_MAIL, evolution-mail >= evo_minimum_version)
 
266
PKG_CHECK_MODULES(EVOLUTION_MAIL, $EVOLUTION_MAIL_PK >= evo_minimum_version)
235
267
AC_SUBST(EVOLUTION_MAIL_CFLAGS)
236
268
AC_SUBST(EVOLUTION_MAIL_LIBS)
237
269
 
238
270
dnl ***************************
239
271
dnl Check for evolution shell
240
272
dnl ***************************
241
 
PKG_CHECK_MODULES(EVOLUTION_SHELL, evolution-shell >= evo_minimum_version)
 
273
PKG_CHECK_MODULES(EVOLUTION_SHELL, $EVOLUTION_SHELL_PK >= evo_minimum_version)
242
274
AC_SUBST(EVOLUTION_SHELL_CFLAGS)
243
275
AC_SUBST(EVOLUTION_SHELL_LIBS)
244
276
 
262
294
 
263
295
AC_DEFINE([HANDLE_LIBICAL_MEMORY],[1],[Define it once memory returned by libical is free'ed properly])
264
296
 
265
 
dnl *************
266
 
dnl pthread check
267
 
dnl *************
268
 
EVO_PTHREAD_CHECK
269
 
 
270
297
dnl **************
271
298
dnl libdb checking
272
299
dnl **************
392
419
AC_OUTPUT
393
420
 
394
421
AC_MSG_NOTICE([
 
422
        GTK package     : $GTK
395
423
        Debugging       : $enable_e2kdebug
396
424
        GTK-Doc         : $enable_gtk_doc
397
425
        Kerberos 5      : $msg_krb5