← Back to branch summary

~ubuntu-branches/ubuntu/precise/empathy/precise-proposed-201205180810

« back to all changes in this revision

Viewing changes to .pc/01_lpi.patch/configure.ac

  • Committer: Bazaar Package Importer
  • Author(s): Brian Curtis, Brian Curtis, Ken VanDine
  • Date: 2011-06-01 10:35:24 UTC
  • mfrom: (1.1.70 upstream) (6.3.44 experimental)
  • Revision ID: james.westby@ubuntu.com-20110601103524-wx3wgp71394730jt
Tags: 3.1.1-1ubuntu1
[ Brian Curtis ]
* Merge with Debian experimental, remaining Ubuntu changes:
* debian/control:
  - Drop geoclue/mapping build-depends (they are in Universe)
  - Add Vcz-Bzr link
  - Add Suggests on telepathy-idle
  - Bump telepathy-butterfly, telepathy-haze to recommends
  - Don't recommend the freedesktop sound theme we have an ubuntu one
  - Add build depend for libunity-dev
* debian/rules:
  - Use autoreconf.mk
  - Disable map and location
* debian/empathy.install:
  - Install message indicator configuration
* debian/indicators/empathy:
  - Message indicator configuration
* debian/patches/01_lpi.patch:
  - Add Launchpad integration
* debian/patches/10_use_notify_osd_icons.patch:
  - Use the notify-osd image for new messages
* debian/patches/34_start_raised_execpt_in_session.patch
  - If not started with the session, we should always raise
* debian/patches/36_chat_window_default_size.patch:
  - Make the default chat window size larger
* debian/patches/37_facebook_default.patch:
  - Make facebook the default chat account type
* debian/patches/38_lp_569289.patch
  - Set freenode as default IRC network for new IRC accounts 
* debian/patches/41_unity_launcher_progress.patch
  - Display file transfer progress in the unity launcher

[ Ken VanDine ]
* debian/control
  - build depend on libgcr-3-dev instead of libgcr-dev
  - dropped build depends for libindicate, we will use telepathy-indicator
  - Depend on dconf-gsettings-backend | gsettings-backend
  - Added a Recommends for telepathy-indicator
* +debian/empathy.gsettings-override
  - Added an override for notifications-focus
* debian/patches/series
  - commented out 23_idomessagedialog_for_voip_and_ft.patch, until ido has 
    been ported to gtk3

Show diffs side-by-side

added added

removed removed

Lines of Context:
.pc/01_lpi.patch/configure.ac
1
1
dnl If not 1, append datestamp to the version number
2
2
m4_define(empathy_released, 1)
3
3
 
4
 
m4_define([empathy_major_version], [2])
5
 
m4_define([empathy_minor_version], [34])
6
 
m4_define([empathy_micro_version], [0])
 
4
m4_define([empathy_major_version], [3])
 
5
m4_define([empathy_minor_version], [1])
 
6
m4_define([empathy_micro_version], [1])
7
7
m4_define([empathy_nano_version], [0])
8
8
 
9
9
dnl Display the nano_version only if it's not '0'
32
32
 
33
33
# Hardp deps
34
34
FOLKS_REQUIRED=0.4.0
35
 
GCONF_REQUIRED=1.2.0
36
 
GLIB_REQUIRED=2.27.2
 
35
GLIB_REQUIRED=2.28.0
37
36
GNUTLS_REQUIRED=2.8.5
38
 
GSTREAMER_REQUIRED=0.10.32
39
 
GTK_REQUIRED=2.22.0
 
37
GTK_REQUIRED=3.0.2
40
38
KEYRING_REQUIRED=2.26.0
41
 
LIBCANBERRA_GTK_REQUIRED=0.4
 
39
GCR_REQUIRED=2.91.4
 
40
LIBCANBERRA_GTK_REQUIRED=0.25
42
41
LIBNOTIFY_REQUIRED=0.7.0
43
42
TELEPATHY_FARSIGHT_REQUIRED=0.0.14
44
 
TELEPATHY_GLIB_REQUIRED=0.14.1
 
43
TELEPATHY_GLIB_REQUIRED=0.14.3
45
44
TELEPATHY_LOGGER=0.2.0
46
 
UNIQUE_REQUIRED=1.1.2
47
45
 
48
 
# Optionnal deps
49
 
CLUTTER_GTK_REQUIRED=0.10
 
46
# Optional deps
 
47
CLUTTER_GTK_REQUIRED=0.90.3
50
48
ENCHANT_REQUIRED=1.2.0
51
49
GEOCLUE_REQUIRED=0.11
52
50
ISO_CODES_REQUIRED=0.35
53
51
LIBCHAMPLAIN_GTK_REQUIRED=0.7.1
54
 
LIBCHAMPLAIN_REQUIRED=0.7.1
55
 
NAUTILUS_SENDTO_REQUIRED=2.31.7
 
52
LIBCHAMPLAIN_REQUIRED=0.9
 
53
NAUTILUS_SENDTO_REQUIRED=2.90.0
56
54
NETWORK_MANAGER_REQUIRED=0.7.0
57
 
WEBKIT_REQUIRED=1.1.15
58
 
GNOME_CONTROL_CENTER_GTK3_REQUIRED=2.31.4
 
55
WEBKIT_REQUIRED=1.3.2
 
56
GNOME_CONTROL_CENTER_REQUIRED=2.31.4
59
57
 
60
 
# telepathy-yell
61
 
prev_top_build_prefix=$ac_top_build_prefix
62
 
AX_CONFIG_DIR([telepathy-yell])
63
 
ac_top_build_prefix=$prev_top_build_prefix
64
 
export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:"$ac_top_build_prefix"telepathy-yell/telepathy-yell
 
58
# Use --enable-maintainer-mode to disable deprecated symbols,
 
59
# disable single include and enable GSEAL. If this is not a released empathy,
 
60
# maintainer mode is forced
 
61
# FIXME: don't disable deprecated symbols until bgo #636654 has been fixed
 
62
#ifelse(empathy_released, 1, [], [enable_maintainer_mode="yes"])
 
63
#GNOME_MAINTAINER_MODE_DEFINES
65
64
 
66
65
AC_CONFIG_MACRO_DIR([m4])
67
66
AC_CONFIG_HEADERS([config.h])
134
133
AS_COMPILER_FLAG(-Wshadow, ERROR_CFLAGS="$ERROR_CFLAGS -Wshadow")
135
134
AS_COMPILER_FLAG(-Wmissing-prototypes, ERROR_CFLAGS="$ERROR_CFLAGS -Wmissing-prototypes")
136
135
AS_COMPILER_FLAG(-Wmissing-declarations, ERROR_CFLAGS="$ERROR_CFLAGS -Wmissing-declarations")
137
 
# Disabled because some GTK+ headers (like gtkitemfactory.h) are bugged :(
138
 
#AS_COMPILER_FLAG(-Wstrict-prototypes, ERROR_CFLAGS="$ERROR_CFLAGS -Wstrict-prototypes")
 
136
AS_COMPILER_FLAG(-Wstrict-prototypes, ERROR_CFLAGS="$ERROR_CFLAGS -Wstrict-prototypes")
139
137
 
140
138
AC_SUBST(ERROR_CFLAGS)
141
139
 
148
146
   dbus-glib-1
149
147
   folks >= $FOLKS_REQUIRED
150
148
   folks-telepathy >= $FOLKS_REQUIRED
151
 
   gconf-2.0 >= $GCONF_REQUIRED
 
149
   glib-2.0 >= $GLIB_REQUIRED
152
150
   gio-2.0 >= $GLIB_REQUIRED
153
151
   gio-unix-2.0 >= $GLIB_REQUIRED
154
152
   gnome-keyring-1 >= $KEYRING_REQUIRED
155
153
   gnutls >= $GNUTLS_REQUIRED
156
154
   gmodule-export-2.0
157
155
   gobject-2.0
158
 
   gstreamer-0.10 >= $GSTREAMER_REQUIRED
 
156
   gsettings-desktop-schemas
 
157
   gstreamer-0.10
159
158
   gstreamer-interfaces-0.10
160
159
   libxml-2.0
161
160
   telepathy-glib >= $TELEPATHY_GLIB_REQUIRED
162
161
   telepathy-logger-0.2 >= $TELEPATHY_LOGGER
163
162
   x11
 
163
   gtk+-3.0 >= $GTK_REQUIRED
 
164
   libcanberra-gtk3 >= $LIBCANBERRA_GTK_REQUIRED
 
165
   libnotify >= $LIBNOTIFY_REQUIRED
 
166
   gcr-3 >= $GCR_REQUIRED
164
167
])
165
168
 
166
 
PKG_CHECK_MODULES(YELL, [telepathy-yell])
167
 
 
168
169
PKG_CHECK_MODULES(EMPATHY_AV,
169
170
[
170
171
   farsight2-0.10
172
173
])
173
174
 
174
175
# -----------------------------------------------------------
175
 
# Call interface
176
 
# -----------------------------------------------------------
177
 
AC_ARG_WITH(call,
178
 
            AC_HELP_STRING([--enable-call=@<:@no/yes/auto@:>@],
179
 
            [build with Call interface support]),,
180
 
            [with_call=auto])
181
 
if test "x$with_call" != "xno" ; then
182
 
   PKG_CHECK_MODULES(EMPATHY_CALL,
183
 
   [
184
 
      farsight2-0.10
185
 
      telepathy-farstream
186
 
   ], have_farstream="yes", have_farstream="no" )
187
 
 
188
 
   if test "x$have_farstream" = "xyes"; then
189
 
      AC_DEFINE(HAVE_CALL, 1, [Define if you have Call channel support])
190
 
   fi
191
 
else
192
 
  have_farstream=no
193
 
fi
194
 
 
195
 
if test "x$with_call" = "xyes" -a "x$have_farstream" != "xyes"; then
196
 
   AC_MSG_ERROR([Could not find Call handler dependencies.])
197
 
fi
198
 
AM_CONDITIONAL(HAVE_CALL, test "x$have_farstream" = "xyes")
199
 
 
200
 
# -----------------------------------------------------------
201
176
# evolution-data-server (about-me)
202
177
# -----------------------------------------------------------
203
178
AC_ARG_WITH(eds,
209
184
fi
210
185
 
211
186
# -----------------------------------------------------------
212
 
# GTK+
213
 
# -----------------------------------------------------------
214
 
PKG_CHECK_MODULES(GTK, gtk+-2.0 >= $GTK_REQUIRED)
215
 
 
216
 
# GTK2 specific deps
217
 
PKG_CHECK_MODULES(CANBERRA, libcanberra-gtk >= $LIBCANBERRA_GTK_REQUIRED)
218
 
# libnotify 0.7 introduced API changes
219
 
PKG_CHECK_MODULES(LIBNOTIFY,
220
 
    libnotify >= $LIBNOTIFY_REQUIRED)
221
 
PKG_CHECK_MODULES(UNIQUE, unique-1.0 >= $UNIQUE_REQUIRED)
222
 
# gnome-keyring breaks API in 2.91.x
223
 
PKG_CHECK_MODULES(GCR,
224
 
    gcr-0 >= $KEYRING_REQUIRED)
225
 
 
226
 
# Enable GSEAL checks if needed
227
 
if test "x$USE_MAINTAINER_MODE" = "xyes"; then
228
 
  AC_DEFINE(GSEAL_ENABLE, [], [Seal public structs to force usage of accessors])
229
 
fi
230
 
 
231
 
# -----------------------------------------------------------
232
187
# Enable debug
233
188
# -----------------------------------------------------------
234
189
 
251
206
AM_GLIB_GNU_GETTEXT
252
207
 
253
208
# -----------------------------------------------------------
254
 
# Make CA certificates path configurable
255
 
# Stolen from GIO's TLS
256
 
# -----------------------------------------------------------
257
 
AC_MSG_CHECKING([location of system Certificate Authority list])
258
 
AC_ARG_WITH(ca-file,
259
 
            [AC_HELP_STRING([--with-ca-file=@<:@path@:>@],
260
 
                            [path to system Certificate Authority list])])
261
 
if test "$with_ca_file" = "no"; then
262
 
    AC_MSG_RESULT([disabled])
263
 
else
264
 
    if test -z "$with_ca_file"; then
265
 
        for f in /etc/pki/tls/certs/ca-bundle.crt \
266
 
                 /etc/ssl/certs/ca-certificates.crt; do
267
 
            if test -f "$f"; then
268
 
                with_ca_file="$f"
269
 
            fi
270
 
        done
271
 
        if test -z "$with_ca_file"; then
272
 
            AC_MSG_ERROR([could not find. Use --with-ca-file=path to set, or --without-ca-file to disable])
273
 
        fi
274
 
    fi
275
 
 
276
 
    AC_MSG_RESULT($with_ca_file)
277
 
    GTLS_SYSTEM_CA_FILE="$with_ca_file"
278
 
 
279
 
    AC_DEFINE_UNQUOTED([GTLS_SYSTEM_CA_FILE], ["$GTLS_SYSTEM_CA_FILE"], [path to system Certificate Authority list])
280
 
fi
281
 
 
282
 
# -----------------------------------------------------------
283
209
# Connectivity integration
284
210
# -----------------------------------------------------------
285
211
AC_ARG_WITH(connectivity,
336
262
                             enable_webkit=auto)
337
263
 
338
264
if test "x$enable_webkit" != "xno"; then
339
 
 
340
 
   PKG_CHECK_MODULES(WEBKIT, [webkit-1.0 >= $WEBKIT_REQUIRED],
 
265
   PKG_CHECK_MODULES(WEBKIT, [webkitgtk-3.0 >= $WEBKIT_REQUIRED],
341
266
        have_webkit="yes", have_webkit="no")
342
267
 
343
268
   if test "x$have_webkit" = "xyes"; then
402
327
 
403
328
   PKG_CHECK_MODULES(LIBCHAMPLAIN,
404
329
    [
405
 
       champlain-0.8 >= $LIBCHAMPLAIN_REQUIRED,
406
 
       champlain-gtk-0.8 >= $LIBCHAMPLAIN_GTK_REQUIRED
407
 
       clutter-gtk-0.10 >= $CLUTTER_GTK_REQUIRED
 
330
       clutter-gtk-1.0
 
331
       champlain-gtk-0.10
 
332
       champlain-0.10
408
333
    ], have_libchamplain="yes", have_libchamplain="no")
409
334
 
410
335
   if test "x$have_libchamplain" = "xyes"; then
453
378
# meego widgets support
454
379
# -----------------------------------------------------------
455
380
AC_ARG_ENABLE(meego,
456
 
              AS_HELP_STRING([--enable-meego=@<:no/yes@:>@],
 
381
              AS_HELP_STRING([--enable-meego=@<:@no/yes@:>@],
457
382
                             [Enable meego widgets]), ,
458
383
                             enable_meego=no)
459
384
 
461
386
    PKG_CHECK_MODULES(MEEGO,
462
387
    [
463
388
       mx-gtk-1.0
 
389
       gio-unix-2.0
464
390
    ], have_meego="yes", have_meego="no")
465
391
 
466
392
    if test "x$have_meego" = "xyes"; then
487
413
                             enable_nautilus_sendto=auto)
488
414
 
489
415
if test "x$enable_nautilus_sendto" != "xno"; then
490
 
   # Newer NST requires GTK+3 so we can't use it
491
416
   PKG_CHECK_MODULES(NST,
492
 
   [
493
 
      nautilus-sendto >= $NAUTILUS_SENDTO_REQUIRED
494
 
      nautilus-sendto < 2.90.0
495
 
   ], have_nst="yes", have_nst="no")
 
417
    [
 
418
       nautilus-sendto >= $NAUTILUS_SENDTO_REQUIRED
 
419
    ], have_nst="yes", have_nst="no")
496
420
else
497
421
   have_nst=no
498
422
fi
513
437
 
514
438
if test "x$enable_control_center_embedding" != "xno"; then
515
439
 
516
 
   PKG_CHECK_MODULES(CONTROL_CENTER_EMBEDDING, [libgnome-control-center < GNOME_CONTROL_CENTER_GTK3_REQUIRED],
 
440
   PKG_CHECK_MODULES(CONTROL_CENTER_EMBEDDING, [libgnome-control-center >= GNOME_CONTROL_CENTER_REQUIRED],
517
441
        have_control_center_embedding="yes", have_control_center_embedding="no")
518
442
 
519
443
   if test "x$have_control_center_embedding" = "xyes"; then
577
501
        Compiler Flags..............:  ${CFLAGS} ${ERROR_CFLAGS}
578
502
        Prefix......................:  ${prefix}
579
503
        Coding style checks.........:  ${ENABLE_CODING_STYLE_CHECKS}
580
 
        CA Cert Path................:  ${GTLS_SYSTEM_CA_FILE}
581
504
 
582
505
    Features:
583
506
        Spell checking (enchant)....:  ${have_enchant}
584
507
        Display maps (libchamplain).:  ${have_libchamplain}
585
508
        Location awareness (Geoclue):  ${have_geoclue}
586
509
        Adium themes (Webkit).......:  ${have_webkit}
587
 
        Meego widgets...............:  ${have_meego}
 
510
        Meego widgets ..............:  ${have_meego}
588
511
        Control center embedding....:  ${have_control_center_embedding}
589
512
 
590
513
    Connectivity:
594
517
    Extras:
595
518
        Nautilus-sendto plugin......:  ${have_nst}
596
519
        Salut E-D-S support.........:  ${with_eds}
597
 
        Exp. Call channel handler...:  ${have_farstream}
598
520
"