~muktupavels/gnome-panel/fix-for-lp-1310929-and-lp-1222339

« back to all changes in this revision

Viewing changes to .pc/clock_applet_needs_terminal.patch/configure.ac

  • Committer: Package Import Robot
  • Author(s): Jeremy Bicha
  • Date: 2013-06-19 11:49:35 UTC
  • mfrom: (2.1.20 sid)
  • Revision ID: package-import@ubuntu.com-20130619114935-e912mx6nwxecoaib
Tags: 1:3.6.2-0ubuntu7
* Sync with Debian svn (LP: #1185873). Remaining changes:
  - Use epoch
  - Add apport hook
  - debian/control:
    + Recommend indicator-complete
    + Don't depend on nautilus 3.8 yet
  - debian/patches/14_revert_timedate_change.patch:
    + Dropped, we're using timedated
  - debian/patches/40_unset_menuproxy.patch:
    + Make sure gnome-panel and the applets don't pick up menu proxies.
  - debian/patches/41_classic_layout.patch:
    + Change the defaults to be more "classic Ubuntu": Show indicators
      & show desktop, drop GNOME clock & notification area
  - debian/patches/85_disable_shutdown_on_ltsp.patch:
    + Suppress the shutdown option in the panel if LTSP_CLIENT is set.
* debian/patches/50_ubuntu_sessions.patch:
  - Merge patch from gnome-session to split sessions into GNOME Flashback
    (No effects) using Metacity and GNOME Flashback using Compiz
* debian/patches/51_dont_require_nautilus38.patch:
  - Run Flashback without Nautilus 3.8 since it's not in Saucy yet

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
 
AC_INIT([gnome-panel], [3.6.2],
2
 
        [http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-panel])
3
 
AM_CONFIG_HEADER(config.h)
4
 
AM_INIT_AUTOMAKE([1.11 no-dist-gzip dist-xz tar-ustar -Wno-portability])
5
 
m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
6
 
 
7
 
AC_CONFIG_MACRO_DIR([m4])
8
 
 
9
 
# Before making a release, the LT_VERSION string should be modified.
10
 
# The string is of the form C:R:A.
11
 
# - If interfaces have been changed or added, but binary compatibility has
12
 
#   been preserved, change to C+1:0:A+1
13
 
# - If binary compatibility has been broken (eg removed or changed interfaces)
14
 
#   change to C+1:0:0
15
 
# - If the interface is the same as the previous version, change to C:R+1:A
16
 
 
17
 
LIBPANEL_APPLET_API_VERSION=4.0
18
 
AC_SUBST([LIBPANEL_APPLET_API_VERSION],[$LIBPANEL_APPLET_API_VERSION])
19
 
 
20
 
LIB_PANEL_APPLET_LT_VERSION=1:1:1
21
 
AC_SUBST(LIB_PANEL_APPLET_LT_VERSION)
22
 
 
23
 
GNOME_MAINTAINER_MODE_DEFINES
24
 
 
25
 
AC_ARG_ENABLE([documentation],
26
 
        AS_HELP_STRING([--enable-documentation], [enable man pages and HTML]),
27
 
        [], [enable_documentation=yes])
28
 
AM_CONDITIONAL(ENABLE_DOCUMENTATION, test x$enable_documentation = xyes)
29
 
 
30
 
LT_PREREQ([2.2.6])
31
 
LT_INIT([dlopen disable-static])
32
 
 
33
 
IT_PROG_INTLTOOL([0.40.6])
34
 
 
35
 
AC_PROG_CC
36
 
 
37
 
AM_PATH_PYTHON
38
 
AC_PATH_PROG(GLIB_GENMARSHAL, glib-genmarshal)
39
 
AC_PATH_PROG(GLIB_COMPILE_RESOURCES, glib-compile-resources)
40
 
AC_PATH_PROG(GCONFTOOL, gconftool-2)
41
 
 
42
 
GNOME_COMPILE_WARNINGS([maximum])
43
 
 
44
 
# Check for introspection
45
 
GOBJECT_INTROSPECTION_CHECK([0.9.5])
46
 
 
47
 
GLIB_GSETTINGS
48
 
 
49
 
m4_pattern_allow([AM_V_GEN])dnl Make autoconf not complain about the rule below
50
 
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 $< [$]@'
51
 
AC_SUBST([PANEL_INTLTOOL_PANEL_APPLET_RULE])
52
 
 
53
 
AC_ARG_ENABLE(deprecation_flags,
54
 
              [AC_HELP_STRING([--enable-deprecation-flags],
55
 
                              [use *_DISABLE_DEPRECATED flags @<:@default=no@:>@])],,
56
 
              [enable_deprecation_flags=no])
57
 
 
58
 
if test "x$enable_deprecation_flags" = "xyes"; then
59
 
   DISABLE_DEPRECATED_CFLAGS=$DISABLE_DEPRECATED
60
 
   AC_SUBST(DISABLE_DEPRECATED_CFLAGS)
61
 
fi
62
 
 
63
 
AC_CHECK_HEADERS(crt_externs.h)
64
 
AC_CHECK_FUNCS(_NSGetEnviron)
65
 
 
66
 
LIBGNOME_DESKTOP_REQUIRED=2.91.0
67
 
GDK_PIXBUF_REQUIRED=2.25.2
68
 
PANGO_REQUIRED=1.15.4
69
 
GLIB_REQUIRED=2.31.14
70
 
GTK_REQUIRED=3.3.8
71
 
LIBWNCK_REQUIRED=2.91.0
72
 
GCONF_REQUIRED=2.6.1
73
 
LIBGNOME_MENU_REQUIRED=3.1.4
74
 
TELEPATHY_GLIB_REQUIRED=0.14.0
75
 
LIBECAL_REQUIRED=3.5.3
76
 
LIBEDATASERVER_REQUIRED=3.5.3
77
 
CAIRO_REQUIRED=1.0.0
78
 
GWEATHER_REQUIRED=3.5.1
79
 
DBUS_GLIB_REQUIRED=0.80
80
 
DCONF_REQUIRED=0.13.4
81
 
 
82
 
dnl pkg-config dependency checks
83
 
 
84
 
PKG_CHECK_MODULES(EGG_SMCLIENT, ice sm gtk+-3.0)
85
 
 
86
 
PKG_CHECK_MODULES(PANEL, gmodule-2.0 >= $GLIB_REQUIRED
87
 
                         gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED
88
 
                         pango >= $PANGO_REQUIRED
89
 
                         gtk+-3.0 >= $GTK_REQUIRED
90
 
                         cairo-xlib glib-2.0 >= $GLIB_REQUIRED
91
 
                         gmodule-2.0 >= $GLIB_REQUIRED
92
 
                         gio-2.0 >= $GLIB_REQUIRED
93
 
                         gio-unix-2.0 >= $GLIB_REQUIRED
94
 
                         gnome-desktop-3.0 >= $LIBGNOME_DESKTOP_REQUIRED
95
 
                         gconf-2.0 >= $GCONF_REQUIRED
96
 
                         libgnome-menu-3.0 >= $LIBGNOME_MENU_REQUIRED
97
 
                         dconf >= $DCONF_REQUIRED)
98
 
AC_SUBST(PANEL_CFLAGS)
99
 
AC_SUBST(PANEL_LIBS)
100
 
 
101
 
AC_ARG_ENABLE(telepathy_glib, AS_HELP_STRING([--enable-telepathy-glib],[Enable telepathy-glib support (auto)]),enable_telepathy_glib=$enableval,enable_telepathy_glib=auto)
102
 
if test "x$enable_telepathy_glib" = "xno" ; then
103
 
  HAVE_TELEPATHY_GLIB=no
104
 
else
105
 
  PKG_CHECK_MODULES(TELEPATHY_GLIB, telepathy-glib >= $TELEPATHY_GLIB_REQUIRED, HAVE_TELEPATHY_GLIB=yes, HAVE_TELEPATHY_GLIB=no)
106
 
fi
107
 
if test "x$HAVE_TELEPATHY_GLIB" = "xyes" ; then
108
 
    AC_DEFINE(HAVE_TELEPATHY_GLIB, 1, [Defined if telepathy-glib support is enabled])
109
 
fi
110
 
 
111
 
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)
112
 
AC_SUBST(LIBPANEL_APPLET_CFLAGS)
113
 
AC_SUBST(LIBPANEL_APPLET_LIBS)
114
 
 
115
 
PKG_CHECK_MODULES(FISH, gtk+-3.0 >= $GTK_REQUIRED cairo >= $CAIRO_REQUIRED)
116
 
AC_SUBST(FISH_CFLAGS)
117
 
AC_SUBST(FISH_LIBS)
118
 
 
119
 
PKG_CHECK_MODULES(NOTIFICATION_AREA, gtk+-3.0 >= $GTK_REQUIRED)
120
 
AC_SUBST(NOTIFICATION_AREA_CFLAGS)
121
 
AC_SUBST(NOTIFICATION_AREA_LIBS)
122
 
 
123
 
PKG_CHECK_MODULES(WNCKLET, gtk+-3.0 >= $GTK_REQUIRED libwnck-3.0 >= $LIBWNCK_REQUIRED)
124
 
AC_SUBST(WNCKLET_CFLAGS)
125
 
AC_SUBST(WNCKLET_LIBS)
126
 
 
127
 
AC_CHECK_HEADERS(langinfo.h)
128
 
AC_CHECK_FUNCS(nl_langinfo)
129
 
 
130
 
PKG_CHECK_MODULES(TZ, gio-2.0 >= $GLIB_REQUIRED)
131
 
AC_SUBST(TZ_CFLAGS)
132
 
AC_SUBST(TZ_LIBS)
133
 
 
134
 
PKG_CHECK_MODULES(CLOCK, pango >= $PANGO_REQUIRED gtk+-3.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED librsvg-2.0 gweather-3.0 >= $GWEATHER_REQUIRED gnome-desktop-3.0 >= $LIBGNOME_DESKTOP_REQUIRED)
135
 
AC_SUBST(CLOCK_CFLAGS)
136
 
AC_SUBST(CLOCK_LIBS)
137
 
 
138
 
# Check whether to enable e-d-s support for clock applet
139
 
AC_MSG_CHECKING([whether to enable evolution-data-server support])
140
 
AC_ARG_ENABLE([eds],
141
 
    AS_HELP_STRING([--enable-eds], [Whether to enable evolution-data-server support @<:@default=auto@:>@]),
142
 
    [], [enable_eds=auto])
143
 
AC_MSG_RESULT([$enable_eds])
144
 
CLOCK_EDS_ICONDIR=
145
 
if test "$enable_eds" != "no"; then
146
 
    PKG_CHECK_MODULES(CLOCK_EDS,[
147
 
        libecal-1.2 >= $LIBECAL_REQUIRED
148
 
        libedataserver-1.2 >= $LIBEDATASERVER_REQUIRED
149
 
     ], [have_eds=yes], [have_eds=no])
150
 
 
151
 
    if test "$enable_eds" = "yes" -a "$have_eds" = "no"; then
152
 
        AC_MSG_ERROR([evolution-data-server support was requested but required dependencies were not found: $CLOCK_EDS_PKG_ERRORS])
153
 
    elif test "$have_eds" = "yes"; then
154
 
        enable_eds=yes
155
 
        AC_DEFINE([HAVE_EDS], 1, [Define to enable evolution-data-server support])
156
 
        CLOCK_EDS_ICONDIR=`$PKG_CONFIG --variable=datadir evolution-data-server-1.2`/pixmaps/evolution-data-server
157
 
    else
158
 
        enable_eds=no
159
 
    fi
160
 
fi
161
 
 
162
 
AM_CONDITIONAL(ENABLE_EDS, test "$enable_eds" = "yes")
163
 
AC_SUBST(CLOCK_EDS_ICONDIR)
164
 
 
165
 
DBUS_REQUIRED=1.1.2
166
 
NETWORK_MANAGER_REQUIRED=0.6
167
 
 
168
 
AC_ARG_ENABLE(network_manager, AS_HELP_STRING([--enable-network-manager],[Enable NetworkManager support (auto)]),enable_network_manager=$enableval,enable_network_manager=auto)
169
 
if test "x$enable_network_manager" = "xno" ; then
170
 
  HAVE_NETWORK_MANAGER=no
171
 
else
172
 
  PKG_CHECK_MODULES(NETWORK_MANAGER, NetworkManager >= $NETWORK_MANAGER_REQUIRED, HAVE_NETWORK_MANAGER=yes, HAVE_NETWORK_MANAGER=no)
173
 
fi
174
 
if test "x$HAVE_NETWORK_MANAGER" = "xyes" ; then
175
 
    AC_DEFINE(HAVE_NETWORK_MANAGER, 1, [Defined if NetworkManager support is enabled])
176
 
fi
177
 
 
178
 
# Make it possible to compile the applets in-process
179
 
PANEL_INPROCESS_NONE=
180
 
PANEL_INPROCESS_ALL=
181
 
PANEL_INPROCESS_APPLETS=
182
 
AC_ARG_WITH(in-process-applets,
183
 
        AC_HELP_STRING([--with-in-process-applets=APPLETS],
184
 
                [comma-separated list of applets to compile in-process (possible values: none, clock, fish, notification-area, wncklet, all) @<:@default=none@:>@]),
185
 
        [for i in `echo $withval | tr , ' '`; do
186
 
                if test $i = "none"; then
187
 
                        PANEL_INPROCESS_NONE=1
188
 
                else if test $i = "all"; then
189
 
                        PANEL_INPROCESS_ALL=1
190
 
                else if test $i = "clock"; then
191
 
                        PANEL_INPROCESS_APPLETS="$PANEL_INPROCESS_APPLETS $i"
192
 
                else if test $i = "fish"; then
193
 
                        PANEL_INPROCESS_APPLETS="$PANEL_INPROCESS_APPLETS $i"
194
 
                else if test $i = "notification-area"; then
195
 
                        PANEL_INPROCESS_APPLETS="$PANEL_INPROCESS_APPLETS $i"
196
 
                else if test $i = "wncklet"; then
197
 
                        PANEL_INPROCESS_APPLETS="$PANEL_INPROCESS_APPLETS $i"
198
 
                else
199
 
                        echo "applet $i not recognized, ignoring..."
200
 
                fi; fi; fi; fi; fi; fi
201
 
        done],
202
 
        [])
203
 
 
204
 
if test -n "$PANEL_INPROCESS_ALL"; then
205
 
        PANEL_INPROCESS_APPLETS="clock fish notification-area wncklet"
206
 
fi
207
 
if test -n "$PANEL_INPROCESS_NONE"; then
208
 
        PANEL_INPROCESS_APPLETS=""
209
 
fi
210
 
for i in $PANEL_INPROCESS_APPLETS; do
211
 
        if test $i = "clock"; then
212
 
                CLOCK_COMPILE_INPROCESS=1
213
 
                AC_DEFINE([CLOCK_INPROCESS], 1,
214
 
                [Defined when compiling the clock applet in-process])
215
 
        else if test $i = "fish"; then
216
 
                FISH_COMPILE_INPROCESS=1
217
 
                AC_DEFINE([FISH_INPROCESS], 1,
218
 
                [Defined when compiling the fish applet in-process])
219
 
        else if test $i = "notification-area"; then
220
 
                NOTIFICATION_AREA_COMPILE_INPROCESS=1
221
 
                AC_DEFINE([NOTIFICATION_AREA_INPROCESS], 1,
222
 
                [Defined when compiling the notification-area applet in-process])
223
 
        else if test $i = "wncklet"; then
224
 
                WNCKLET_COMPILE_INPROCESS=1
225
 
                AC_DEFINE([WNCKLET_INPROCESS], 1,
226
 
                [Defined when compiling the wncklet applet in-process])
227
 
        fi; fi; fi; fi
228
 
done
229
 
if test "x$PANEL_INPROCESS_APPLETS" = "x"; then
230
 
        PANEL_INPROCESS_APPLETS="(none)"
231
 
fi
232
 
 
233
 
AM_CONDITIONAL(CLOCK_INPROCESS, test -n "$CLOCK_COMPILE_INPROCESS")
234
 
AM_CONDITIONAL(FISH_INPROCESS, test -n "$FISH_COMPILE_INPROCESS")
235
 
AM_CONDITIONAL(NOTIFICATION_AREA_INPROCESS, test -n "$NOTIFICATION_AREA_COMPILE_INPROCESS")
236
 
AM_CONDITIONAL(WNCKLET_INPROCESS, test -n "$WNCKLET_COMPILE_INPROCESS")
237
 
 
238
 
# For the run dialog
239
 
gl_CHECK_TYPE_STRUCT_DIRENT_D_TYPE
240
 
 
241
 
dnl X development libraries check
242
 
 
243
 
PKG_CHECK_MODULES(X, x11 xau, :, [
244
 
  # pkg-config modules not found (only present since X11R7 aka Xorg); use
245
 
  # old-style detection
246
 
  AC_PATH_XTRA()
247
 
  # X not found
248
 
  if test x$no_x = xyes ; then
249
 
    AC_MSG_ERROR([X development libraries not found])
250
 
  fi
251
 
 
252
 
  gp_save_cflags="$CFLAGS"
253
 
  gp_save_libs="$LIBS"
254
 
  CFLAGS="$X_CFLAGS"
255
 
  LIBS="$X_PRE_LIBS $X_LIBS $X_EXTRA_LIBS"
256
 
  AC_CHECK_LIB(X11, XFree,, AC_MSG_ERROR([libX11 not found]))
257
 
  AC_CHECK_LIB(Xau, XauFileName,, AC_MSG_ERROR([libXau not found]))
258
 
  CFLAGS="$gp_save_cflags"
259
 
  LIBS="$gp_save_libs"
260
 
 
261
 
  X_LIBS="$X_PRE_LIBS $X_LIBS -lX11 -lXau $X_EXTRA_LIBS"
262
 
])
263
 
 
264
 
AC_SUBST(X_LIBS)
265
 
 
266
 
dnl X RANDR extension
267
 
 
268
 
PKG_CHECK_MODULES(XRANDR, xrandr >= 1.2.0, have_randr=yes, have_randr=no)
269
 
if test "x$have_randr" = "xyes"; then
270
 
  AC_DEFINE(HAVE_RANDR, 1, [Have the Xrandr extension library])
271
 
fi
272
 
 
273
 
dnl Modules dir
274
 
AC_SUBST([modulesdir],"\$(libdir)/gnome-panel/modules")
275
 
 
276
 
dnl Applets dir
277
 
AC_SUBST([appletsdir],"\$(datadir)/gnome-panel/\$(LIBPANEL_APPLET_API_VERSION)/applets")
278
 
AC_SUBST([appletsdir_pkgconfig],"\${datadir}/gnome-panel/\${libpanel_applet_api_version}/applets")
279
 
 
280
 
dnl  Language Support
281
 
 
282
 
GETTEXT_PACKAGE=gnome-panel-3.0
283
 
AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [Define the gettext package to be used])
284
 
AC_SUBST(GETTEXT_PACKAGE)
285
 
 
286
 
AM_GLIB_GNU_GETTEXT
287
 
 
288
 
dnl gtk-doc stuff
289
 
 
290
 
GTK_DOC_CHECK([1.0])
291
 
 
292
 
dnl yelp-tools stuff
293
 
 
294
 
YELP_HELP_INIT
295
 
 
296
 
AM_GCONF_SOURCE_2
297
 
 
298
 
dnl platform test
299
 
case $host in
300
 
*-*-solaris*)
301
 
        ostype=solaris
302
 
        AC_DEFINE(HAVE_SOLARIS, 1, [Define to 1])
303
 
        ;;
304
 
esac
305
 
 
306
 
AC_CONFIG_FILES([
307
 
Makefile
308
 
data/Makefile
309
 
data/16x16/Makefile
310
 
data/22x22/Makefile
311
 
data/24x24/Makefile
312
 
data/32x32/Makefile
313
 
data/48x48/Makefile
314
 
data/scalable/Makefile
315
 
gnome-panel/Makefile
316
 
gnome-panel/libegg/Makefile
317
 
gnome-panel/libpanel-applet-private/Makefile
318
 
gnome-panel/libpanel-util/Makefile
319
 
gnome-panel/gnome-panel.desktop.in
320
 
libpanel-applet/Makefile
321
 
libpanel-applet/libpanelapplet-4.0.pc
322
 
libpanel-applet/libpanelapplet-4.0-uninstalled.pc
323
 
po/Makefile.in
324
 
applets/Makefile
325
 
applets/clock/Makefile
326
 
applets/clock/pixmaps/Makefile
327
 
applets/fish/Makefile
328
 
applets/notification_area/Makefile
329
 
applets/wncklet/Makefile
330
 
doc/Makefile
331
 
doc/reference/Makefile
332
 
doc/reference/panel-applet/Makefile
333
 
help/Makefile
334
 
help/clock/Makefile
335
 
help/fish/Makefile
336
 
man/Makefile
337
 
])
338
 
 
339
 
AC_OUTPUT
340
 
 
341
 
if echo foo | xgettext --from-code=UTF-8 -LC -o - - 2>/dev/null ; then
342
 
:;
343
 
else
344
 
echo "Warning: Your version of gettext does not support --from-code."
345
 
echo "         This will cause translation of some strings in non US-English"
346
 
echo "         locales to fail. For full support please upgrade to GNU"
347
 
echo "         gettext 0.12 or later."
348
 
echo
349
 
fi
350
 
 
351
 
dnl ---------------------------------------------------------------------------
352
 
dnl - Show summary
353
 
dnl ---------------------------------------------------------------------------
354
 
 
355
 
echo "
356
 
              gnome-panel $VERSION
357
 
              `echo gnome-panel $VERSION | sed "s/./=/g"`
358
 
 
359
 
        prefix:                        ${prefix}
360
 
        exec_prefix:                   ${exec_prefix}
361
 
        libdir:                        ${libdir}
362
 
        bindir:                        ${bindir}
363
 
        sbindir:                       ${sbindir}
364
 
        sysconfdir:                    ${sysconfdir}
365
 
        localstatedir:                 ${localstatedir}
366
 
        datadir:                       ${datadir}
367
 
        source code location:          ${srcdir}
368
 
        compiler:                      ${CC}
369
 
        cflags:                        ${CFLAGS}
370
 
        Maintainer mode:               ${USE_MAINTAINER_MODE}
371
 
        Use *_DISABLE_DEPRECATED:      ${enable_deprecation_flags}
372
 
 
373
 
        Bonobo applets support:        ${HAVE_BONOBO}
374
 
        Applets to build in-process:   ${PANEL_INPROCESS_APPLETS}
375
 
        Evolution-Data-Server support: ${enable_eds}
376
 
        Telepathy-Glib support:        ${HAVE_TELEPATHY_GLIB}
377
 
        NetworkManager support:        ${HAVE_NETWORK_MANAGER}
378
 
        XRandr support:                ${have_randr}
379
 
        Build introspection support:   ${found_introspection}
380
 
        Build gtk-doc documentation:   ${enable_gtk_doc}
381
 
 
382
 
"