← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/gnome-panel/oneiric

« back to all changes in this revision

Viewing changes to configure.ac

  • Committer: Bazaar Package Importer
  • Author(s): Sebastien Bacher, Sebastien Bacher, Jeremy Bicha
  • Date: 2011-05-30 11:04:49 UTC
  • mfrom: (1.13.10 upstream) (2.2.5 experimental)
  • Revision ID: james.westby@ubuntu.com-20110530110449-hinl17kxkcefjw6x
Tags: 1:3.0.2-0ubuntu1
[ Sebastien Bacher ]
* New upstream version
* debian/control.in:
  - the new libgweather version is in oneiric, use it
  - drop the python and python-gconf depends, 
    they were added for gnome-panel-add which is still using gconf and buggy
* debian/gnome-panel-data.install:
  - don't install the apport hook, it's only getting gconf datas which 
    doesn't work since gnome-panel uses gsettings
* debian/patches/90_build_fixes.patch:
  - restore build fix from git not applied in the new serie
* debian/patches/01_panel_submenus.patch:
  - don't take that Debian diff, the .menus use the upstream naming in Ubuntu
* debian/patches/06_no_resize_grip.patch:
  - dropped, the issue is fixed in the new version
* debian/patches/50_fix-potfiles.patch:
  - dropped, the issue is fixed in the new version
* debian/watch:
  - track unstable series as well

Drop those delta, since gnome-panel is not the default Ubuntu session now we
can go back to an experience closer to the upstream one: 
* debian/control.in:
  - drop the indicators recommends, unity-2d is the ubuntu fallback session
    so we can get back to use an upstream config for gnome-panel and reduce
    the delta we carry
* debian/patches/04_default_panel_config.patch:
  - don't modify the upstream layout
* debian/patches/05_no_session_delay.patch:
  - no need to tweak the upstream session to optimize it
* debian/patches/16_compiz_workspace_switcher.patch:
  - go back to the upstream switcher behaviour    
* debian/patches/25_dynamic_fusa_detection.patch:
  - not needed since we use the upstream layout, could be ported if someone
    is wanting to do the work though
* debian/patches/30_disable-initial-animation.patch, debian/rules:
  - drop the --disable-initial-animation, that was some login optimization
    but since it's not the default desktop you should go back to the 
    upstream behaviour

[ Jeremy Bicha ]   
* New upstream version
* Merge from Debian experimental, remaining Ubuntu changes:
* debian/control:
  - Recommends gnome-settings-daemon which has the timezone polkit service
* debian/rules:
  - Update translations template.
* debian/gnome-panel-data.install:
  - Install apport hook
  - Install the "About Ubuntu" menu item.
* debian/patches/01_layout.patch:
  - Disabled, Help & About Ubuntu don't fit as well in Gnome Panel 3
* debian/patches/01_panel_submenus.patch.
  - Dropped
* debian/patches/03_dnd_places_link.patch:
  - Disabled, when using Drag'n'Drop from Places menu, install a link launcher
    (.desktop file) instead of copying the entire directory.
* debian/patches/17_about-ubuntu-translation.patch:
  - List ubuntu-about.desktop for translation.
* debian/patches/40_unset_menuproxy.patch:
  - Make sure gnome-panel and the applets don't pick up menu proxies.
* debian/patches/50_fix-potfiles.patch
  - Fix i18n
* debian/patches/85_disable_shutdown_on_ltsp.patch:
  - Suppress the shutdown option in the panel if LTSP_CLIENT is set.
* debian/patches/71_change_bookmark_submenu_limit_value.patch
  - Dropped, picked up by Debian
* debian/patches/18_lockdown_lock_editor.patch:
* debian/patches/90_git_wnck_show_realize.patch:
* debian/patches/90_fix_linking_DSO_link.patch:
* debian/patches/91_gir_annotations.patch
* debian/patches/92_git_calendar_day.patch
* debian/patches/92_git_fix_applets_in_multiscreen.patch:
  - Dropped, applied upstream
* debian/watch:
  - watch unstable versions

Show diffs side-by-side

added added

removed removed

Lines of Context:
configure.ac
1
 
AC_INIT([gnome-panel], [2.32.1],
 
1
AC_INIT([gnome-panel], [3.0.2],
2
2
        [http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-panel])
3
3
AM_CONFIG_HEADER(config.h)
4
4
AM_INIT_AUTOMAKE([1.9 no-dist-gzip dist-bzip2 tar-ustar -Wno-portability])
15
15
#   change to C+1:0:0
16
16
# - If the interface is the same as the previous version, change to C:R+1:A
17
17
 
18
 
LIB_PANEL_APPLET_LT_VERSION=0:6:0
 
18
LIBPANEL_APPLET_API_VERSION=4.0
 
19
AC_SUBST([LIBPANEL_APPLET_API_VERSION],[$LIBPANEL_APPLET_API_VERSION])
 
20
 
 
21
LIB_PANEL_APPLET_LT_VERSION=0:1:0
19
22
AC_SUBST(LIB_PANEL_APPLET_LT_VERSION)
20
23
 
21
24
AM_MAINTAINER_MODE
38
41
GNOME_COMPILE_WARNINGS(maximum)
39
42
 
40
43
# Check for introspection
41
 
GOBJECT_INTROSPECTION_CHECK([0.6.7])
 
44
GOBJECT_INTROSPECTION_CHECK([0.9.5])
 
45
 
 
46
GLIB_GSETTINGS
42
47
 
43
48
m4_pattern_allow([AM_V_GEN])dnl Make autoconf not complain about the rule below
44
49
PANEL_INTLTOOL_PANEL_APPLET_RULE='%.panel-applet: %.panel-applet.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(AM_V_GEN) LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
57
62
AC_CHECK_HEADERS(crt_externs.h)
58
63
AC_CHECK_FUNCS(_NSGetEnviron)
59
64
 
60
 
LIBGNOME_DESKTOP_REQUIRED=2.24.0
 
65
LIBGNOME_DESKTOP_REQUIRED=2.91.0
61
66
GDK_PIXBUF_REQUIRED=2.7.1
62
67
PANGO_REQUIRED=1.15.4
63
68
GLIB_REQUIRED=2.25.12
64
 
GTK_REQUIRED=2.19.7
65
 
LIBWNCK_REQUIRED=2.19.5
 
69
GTK_REQUIRED=3.0
 
70
LIBWNCK_REQUIRED=2.91.0
66
71
GCONF_REQUIRED=2.6.1
67
72
LIBGNOME_MENU_REQUIRED=2.27.92
68
 
LIBECAL_REQUIRED=1.6.0
69
 
LIBEDATASERVER_REQUIRED=1.2.0
70
 
LIBEDATASERVERUI_REQUIRED=1.2.0
 
73
TELEPATHY_GLIB_REQUIRED=0.14.0
 
74
LIBECAL_REQUIRED=2.91.2
 
75
LIBEDATASERVER_REQUIRED=2.91.2
 
76
LIBEDATASERVERUI_REQUIRED=2.91.2
71
77
CAIRO_REQUIRED=1.0.0
72
 
GWEATHER_REQUIRED=2.27.90
 
78
GWEATHER_REQUIRED=2.91.0
73
79
DBUS_GLIB_REQUIRED=0.80
74
80
 
75
81
dnl pkg-config dependency checks
76
82
 
77
 
PKG_CHECK_MODULES(EGG_SMCLIENT, ice sm gtk+-2.0)
 
83
PKG_CHECK_MODULES(EGG_SMCLIENT, ice sm gtk+-3.0)
78
84
 
79
 
PKG_CHECK_MODULES(PANEL, gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED pango >= $PANGO_REQUIRED gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED gio-unix-2.0 >= $GLIB_REQUIRED gnome-desktop-2.0 >= $LIBGNOME_DESKTOP_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libgnome-menu >= $LIBGNOME_MENU_REQUIRED libcanberra-gtk dbus-glib-1 >= $DBUS_GLIB_REQUIRED)
 
85
PKG_CHECK_MODULES(PANEL, gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED pango >= $PANGO_REQUIRED gtk+-3.0 >= $GTK_REQUIRED cairo-xlib glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED gio-unix-2.0 >= $GLIB_REQUIRED gnome-desktop-3.0 >= $LIBGNOME_DESKTOP_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libgnome-menu >= $LIBGNOME_MENU_REQUIRED dconf)
80
86
AC_SUBST(PANEL_CFLAGS)
81
87
AC_SUBST(PANEL_LIBS)
82
88
 
83
 
PKG_CHECK_MODULES(LIBPANEL_APPLET, gtk+-2.0 >= $GTK_REQUIRED gconf-2.0 >= $GCONF_REQUIRED gio-2.0 >= $GLIB_REQUIRED gio-unix-2.0 >= $GLIB_REQUIRED)
 
89
AC_ARG_ENABLE(telepathy_glib, AS_HELP_STRING([--enable-telepathy-glib],[Enable telepathy-glib support (auto)]),enable_telepathy_glib=$enableval,enable_telepathy_glib=auto)
 
90
if test "x$enable_telepathy_glib" = "xno" ; then
 
91
  HAVE_TELEPATHY_GLIB=no
 
92
else
 
93
  PKG_CHECK_MODULES(TELEPATHY_GLIB, telepathy-glib >= $TELEPATHY_GLIB_REQUIRED, HAVE_TELEPATHY_GLIB=yes, HAVE_TELEPATHY_GLIB=no)
 
94
fi
 
95
if test "x$HAVE_TELEPATHY_GLIB" = "xyes" ; then
 
96
    AC_DEFINE(HAVE_TELEPATHY_GLIB, 1, [Defined if telepathy-glib support is enabled])
 
97
fi
 
98
 
 
99
PKG_CHECK_MODULES(LIBPANEL_APPLET, gtk+-3.0 >= $GTK_REQUIRED cairo-xlib cairo-gobject gconf-2.0 >= $GCONF_REQUIRED gio-2.0 >= $GLIB_REQUIRED gio-unix-2.0 >= $GLIB_REQUIRED)
84
100
AC_SUBST(LIBPANEL_APPLET_CFLAGS)
85
101
AC_SUBST(LIBPANEL_APPLET_LIBS)
86
102
 
87
 
PKG_CHECK_MODULES(FISH, gtk+-2.0 >= $GTK_REQUIRED cairo >= $CAIRO_REQUIRED)
 
103
PKG_CHECK_MODULES(FISH, gtk+-3.0 >= $GTK_REQUIRED cairo >= $CAIRO_REQUIRED)
88
104
AC_SUBST(FISH_CFLAGS)
89
105
AC_SUBST(FISH_LIBS)
90
106
 
91
 
PKG_CHECK_MODULES(NOTIFICATION_AREA, gtk+-2.0 >= $GTK_REQUIRED)
 
107
PKG_CHECK_MODULES(NOTIFICATION_AREA, gtk+-3.0 >= $GTK_REQUIRED)
92
108
AC_SUBST(NOTIFICATION_AREA_CFLAGS)
93
109
AC_SUBST(NOTIFICATION_AREA_LIBS)
94
110
 
95
 
PKG_CHECK_MODULES(WNCKLET, gtk+-2.0 >= $GTK_REQUIRED libwnck-1.0 >= $LIBWNCK_REQUIRED)
 
111
PKG_CHECK_MODULES(WNCKLET, gtk+-3.0 >= $GTK_REQUIRED libwnck-3.0 >= $LIBWNCK_REQUIRED)
96
112
AC_SUBST(WNCKLET_CFLAGS)
97
113
AC_SUBST(WNCKLET_LIBS)
98
114
 
106
122
LIBECAL_REQUIREMENT=
107
123
HAVE_EDS=no
108
124
if test "x$enable_eds" = "xyes"; then
109
 
  LIBECAL_REQUIREMENT="libecal-1.2 >= $LIBECAL_REQUIRED libedataserver-1.2 >= $LIBEDATASERVER_REQUIRED libedataserverui-1.2 >= $LIBEDATASERVERUI_REQUIRED gnome-desktop-2.0 >= $LIBGNOME_DESKTOP_REQUIRED"
 
125
  LIBECAL_REQUIREMENT="libecal-1.2 >= $LIBECAL_REQUIRED libedataserver-1.2 >= $LIBEDATASERVER_REQUIRED libedataserverui-3.0 >= $LIBEDATASERVERUI_REQUIRED gnome-desktop-3.0 >= $LIBGNOME_DESKTOP_REQUIRED"
110
126
  CLOCK_EDS_ICONDIR=`$PKG_CONFIG --variable=datadir evolution-data-server-1.2`/pixmaps/evolution-data-server
111
127
else
112
128
  if test "x$enable_eds" != "xno"; then
113
129
    AC_MSG_CHECKING(for evolution-data-server)
114
 
    if $PKG_CONFIG --exists libecal-1.2 libedataserverui-1.2 evolution-data-server-1.2; then
 
130
    if $PKG_CONFIG --exists libecal-1.2 libedataserverui-3.0 evolution-data-server-1.2; then
115
131
       AC_MSG_RESULT(yes)
116
 
       LIBECAL_REQUIREMENT="libecal-1.2 >= $LIBECAL_REQUIRED libedataserver-1.2 >= $LIBEDATASERVER_REQUIRED libedataserverui-1.2 >= $LIBEDATASERVERUI_REQUIRED gnome-desktop-2.0 >= $LIBGNOME_DESKTOP_REQUIRED"
 
132
       LIBECAL_REQUIREMENT="libecal-1.2 >= $LIBECAL_REQUIRED libedataserver-1.2 >= $LIBEDATASERVER_REQUIRED libedataserverui-3.0 >= $LIBEDATASERVERUI_REQUIRED gnome-desktop-3.0 >= $LIBGNOME_DESKTOP_REQUIRED"
117
133
       CLOCK_EDS_ICONDIR=`$PKG_CONFIG --variable=datadir evolution-data-server-1.2`/pixmaps/evolution-data-server
118
134
       HAVE_EDS=yes
119
135
    else
123
139
fi
124
140
if test -n "$LIBECAL_REQUIREMENT"; then
125
141
  AC_DEFINE([HAVE_LIBECAL], 1,
126
 
            [Defined when evolution-data-server libecal-1.2 and libedataserverui-1.2 are detected])
 
142
            [Defined when evolution-data-server libecal-1.2 and libedataserverui-3.0 are detected])
127
143
fi
128
144
AM_CONDITIONAL(HAVE_LIBECAL, test -n "$LIBECAL_REQUIREMENT")
129
145
AC_SUBST(CLOCK_EDS_ICONDIR)
132
148
AC_SUBST(TZ_CFLAGS)
133
149
AC_SUBST(TZ_LIBS)
134
150
 
135
 
PKG_CHECK_MODULES(CLOCK, pango >= $PANGO_REQUIRED gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED $LIBECAL_REQUIREMENT librsvg-2.0 dbus-glib-1 gweather >= $GWEATHER_REQUIRED gnome-desktop-2.0 >= $LIBGNOME_DESKTOP_REQUIRED)
 
151
PKG_CHECK_MODULES(CLOCK, pango >= $PANGO_REQUIRED gtk+-3.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED $LIBECAL_REQUIREMENT librsvg-2.0 gweather-3.0 >= $GWEATHER_REQUIRED gnome-desktop-3.0 >= $LIBGNOME_DESKTOP_REQUIRED)
136
152
AC_SUBST(CLOCK_CFLAGS)
137
153
AC_SUBST(CLOCK_LIBS)
138
154
 
204
220
        PANEL_INPROCESS_APPLETS="(none)"
205
221
fi
206
222
 
207
 
# Make it possible to disable initial slide-in animation
208
 
AC_ARG_ENABLE(initial-animation,
209
 
              AC_HELP_STRING([--disable-initial-animation],
210
 
                             [disable the initial slide-in animation of panels]),
211
 
              [AS_IF([test "x$enable_initial_animation" = xno],
212
 
                     [AC_DEFINE([DISABLE_INITIAL_ANIMATION], [1],
213
 
                                [Define to disable initial animation])])],
214
 
              [])
215
 
 
216
223
AM_CONDITIONAL(CLOCK_INPROCESS, test -n "$CLOCK_COMPILE_INPROCESS")
217
224
AM_CONDITIONAL(FISH_INPROCESS, test -n "$FISH_COMPILE_INPROCESS")
218
225
AM_CONDITIONAL(NOTIFICATION_AREA_INPROCESS, test -n "$NOTIFICATION_AREA_COMPILE_INPROCESS")
257
264
AC_SUBST([modulesdir],"\$(libdir)/gnome-panel/modules")
258
265
 
259
266
dnl Applets dir
260
 
AC_SUBST([appletsdir],"\$(datadir)/gnome-panel/applets")
261
 
 
262
 
dnl
263
 
dnl Temporary bonobo checks here
264
 
dnl
265
 
 
266
 
LIB_PANEL_APPLET_BONOBO_LT_VERSION=2:73:2
267
 
AC_SUBST(LIB_PANEL_APPLET_BONOBO_LT_VERSION)
268
 
 
269
 
LIBBONOBOUI_REQUIRED=2.1.1
270
 
ORBIT_REQUIRED=2.4.0
271
 
 
272
 
AC_ARG_ENABLE(bonobo,
273
 
              AS_HELP_STRING([--enable-bonobo],[Enable Bonobo compatibility modules (auto)]),
274
 
              enable_bonobo=$enableval,
275
 
              enable_bonobo=auto)
276
 
 
277
 
BONOBO_CFLAGS=
278
 
BONOBO_LIBS=
279
 
LIBPANEL_APPLET_BONOBO_CFLAGS=
280
 
LIBPANEL_APPLET_BONOBO_LIBS=
281
 
ORBIT_IDL=
282
 
BONOBO_IDLDIR=
283
 
BONOBO_ACT_IDLDIR=
284
 
 
285
 
if test "x$enable_bonobo" = "xno" ; then
286
 
  HAVE_BONOBO=no
287
 
else
288
 
  HAVE_BONOBO=no
289
 
  PKG_CHECK_MODULES(BONOBO, ORBit-2.0 >= $ORBIT_REQUIRED libbonoboui-2.0 >= $LIBBONOBOUI_REQUIRED, HAVE_BONOBO=yes, HAVE_BONOBO=no)
290
 
 
291
 
  if test "x$enable_bonobo" = "xyes" -a "x$HAVE_BONOBO" = "xno" ; then
292
 
    AC_MSG_ERROR(Bonobo compatibility modules explicity enabled but not available)
293
 
  fi
294
 
 
295
 
  if test "x$HAVE_BONOBO" = "xyes"; then
296
 
    PKG_CHECK_MODULES(PANEL_MODULE_BONOBO, ORBit-2.0 >= $ORBIT_REQUIRED libbonoboui-2.0 >= $LIBBONOBOUI_REQUIRED)
297
 
    PKG_CHECK_MODULES(LIBPANEL_APPLET_BONOBO, ORBit-2.0 >= $ORBIT_REQUIRED gtk+-2.0 >= $GTK_REQUIRED libbonoboui-2.0 >= $LIBBONOBOUI_REQUIRED gconf-2.0 >= $GCONF_REQUIRED)
298
 
 
299
 
    dnl IDL directories
300
 
    ORBIT_IDL="`$PKG_CONFIG --variable=orbit_idl ORBit-2.0`"
301
 
    BONOBO_IDLDIR="`$PKG_CONFIG --variable=idldir libbonobo-2.0`"
302
 
    BONOBO_ACT_IDLDIR="`$PKG_CONFIG --variable=idldir bonobo-activation-2.0`"
303
 
 
304
 
    AC_PATH_PROG(GIO_QUERYMODULES, gio-querymodules, no)
305
 
  fi
306
 
fi
307
 
 
308
 
AM_CONDITIONAL(HAVE_BONOBO, test "x$HAVE_BONOBO" = "xyes")
309
 
AC_SUBST(BONOBO_CFLAGS)
310
 
AC_SUBST(BONOBO_LIBS)
311
 
AC_SUBST(LIBPANEL_APPLET_BONOBO_CFLAGS)
312
 
AC_SUBST(LIBPANEL_APPLET_BONOBO_LIBS)
313
 
AC_SUBST(ORBIT_IDL)
314
 
AC_SUBST(BONOBO_IDLDIR)
315
 
AC_SUBST(BONOBO_ACT_IDLDIR)
 
267
AC_SUBST([appletsdir],"\$(datadir)/gnome-panel/\$(LIBPANEL_APPLET_API_VERSION)/applets")
 
268
AC_SUBST([appletsdir_pkgconfig],"\${datadir}/gnome-panel/\${libpanel_applet_api_version}/applets")
316
269
 
317
270
dnl  Language Support
318
271
 
319
 
GETTEXT_PACKAGE=gnome-panel-2.0
 
272
GETTEXT_PACKAGE=gnome-panel-3.0
320
273
AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [Define the gettext package to be used])
321
274
AC_SUBST(GETTEXT_PACKAGE)
322
275
 
356
309
fi
357
310
AC_SUBST(REBUILD)
358
311
 
359
 
AC_OUTPUT([
 
312
AC_CONFIG_FILES([
360
313
Makefile
361
 
icons/Makefile
362
 
icons/16x16/Makefile
363
 
icons/22x22/Makefile
364
 
icons/24x24/Makefile
365
 
icons/32x32/Makefile
366
 
icons/48x48/Makefile
367
 
icons/scalable/Makefile
 
314
data/Makefile
 
315
data/16x16/Makefile
 
316
data/22x22/Makefile
 
317
data/24x24/Makefile
 
318
data/32x32/Makefile
 
319
data/48x48/Makefile
 
320
data/scalable/Makefile
368
321
gnome-panel/Makefile
369
322
gnome-panel/libegg/Makefile
370
323
gnome-panel/libpanel-applet-private/Makefile
371
324
gnome-panel/libpanel-util/Makefile
372
325
gnome-panel/gnome-panel.desktop.in
373
 
libpanel-applet/libpanelapplet-3.0.pc
374
 
libpanel-applet/libpanelapplet-3.0-uninstalled.pc
375
326
libpanel-applet/Makefile
 
327
libpanel-applet/libpanelapplet-4.0.pc
 
328
libpanel-applet/libpanelapplet-4.0-uninstalled.pc
376
329
po/Makefile.in
377
330
applets/Makefile
378
331
applets/clock/Makefile
387
340
help/clock/Makefile
388
341
help/fish/Makefile
389
342
man/Makefile
390
 
bonobo/Makefile
391
 
bonobo/idl/Makefile
392
 
bonobo/libpanel-applet/libpanelapplet-2.0.pc
393
 
bonobo/libpanel-applet/libpanelapplet-2.0-uninstalled.pc
394
 
bonobo/libpanel-applet/Makefile
395
 
bonobo/panel-module/Makefile
396
343
])
397
344
 
 
345
AC_OUTPUT
 
346
 
398
347
if echo foo | xgettext --from-code=UTF-8 -LC -o - - 2>/dev/null ; then
399
348
:;
400
349
else
430
379
        Bonobo applets support:        ${HAVE_BONOBO}
431
380
        Applets to build in-process:   ${PANEL_INPROCESS_APPLETS}
432
381
        Evolution-Data-Server support: ${HAVE_EDS}
 
382
        Telepathy-Glib support:        ${HAVE_TELEPATHY_GLIB}
433
383
        NetworkManager support:        ${HAVE_NETWORK_MANAGER}
434
384
        XRandr support:                ${have_randr}
435
385
        Build introspection support:   ${found_introspection}