← Back to branch summary

~kroq-gar78/ubuntu/precise/gnome-control-center/fix-885947

« back to all changes in this revision

Viewing changes to .pc/00_disable-nm.patch/configure.ac

  • Committer: Bazaar Package Importer
  • Author(s): Rodrigo Moya
  • Date: 2011-05-17 10:47:27 UTC
  • mfrom: (0.1.11 experimental) (1.1.45 upstream)
  • Revision ID: james.westby@ubuntu.com-20110517104727-lqel6m8vhfw5jby1
Tags: 1:3.0.1.1-1ubuntu1
* Rebase on Debian, remaining Ubuntu changes:
* debian/control:
  - Build-Depend on hardening-wrapper, dpkg-dev and dh-autoreconf
  - Add dependency on ubuntu-system-service
  - Remove dependency on gnome-icon-theme-symbolic
  - Move dependency on apg, gnome-icon-theme-symbolic and accountsservice to
    be a Recommends: until we get them in main
* debian/rules:
  - Use autoreconf
  - Add binary-post-install rule for gnome-control-center-data
  - Run dh-autoreconf
* debian/gnome-control-center.dirs:
* debian/gnome-control-center.links:
  - Add a link to the control center shell for indicators
* debian/patches/00_disable-nm.patch:
  - Temporary patch to disable building with NetworkManager until we get
    the new one in the archive
* debian/patches/01_git_remove_gettext_calls.patch:
  - Remove calls to AM_GNU_GETTEXT, IT_PROG_INTLTOOL should be enough
* debian/patches/01_git_kill_warning.patch:
  - Kill warning
* debian/patches/50_ubuntu_systemwide_prefs.patch:
  - Ubuntu specific proxy preferences
* debian/patches/51_ubuntu_system_keyboard.patch:
  - Implement the global keyboard spec at https://wiki.ubuntu.com/DefaultKeyboardSettings

Show diffs side-by-side

added added

removed removed

Lines of Context:
.pc/00_disable-nm.patch/configure.ac
 
1
m4_define([gnome_control_center_version], 3.0.1.1)
 
2
AC_INIT([gnome-control-center], [gnome_control_center_version],
 
3
        [http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-control-center])
 
4
 
 
5
AC_CONFIG_SRCDIR([shell])
 
6
AC_CONFIG_HEADERS([config.h])
 
7
AC_CONFIG_MACRO_DIR([m4])
 
8
 
 
9
AM_INIT_AUTOMAKE([1.10 no-dist-gzip dist-bzip2 tar-ustar])
 
10
AM_MAINTAINER_MODE([enable])
 
11
m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
 
12
 
 
13
# Check for programs
 
14
AC_PROG_CC
 
15
AM_PROG_CC_C_O
 
16
AC_HEADER_STDC
 
17
 
 
18
# Initialize libtool
 
19
LT_PREREQ([2.2])
 
20
LT_INIT
 
21
 
 
22
# .so version for libgnome-control-center
 
23
LIBGNOMECONTROLCENTER_CURRENT=1
 
24
LIBGNOMECONTROLCENTER_REVISION=0
 
25
LIBGNOMECONTROLCENTER_AGE=0
 
26
AC_SUBST(LIBGNOMECONTROLCENTER_CURRENT)
 
27
AC_SUBST(LIBGNOMECONTROLCENTER_REVISION)
 
28
AC_SUBST(LIBGNOMECONTROLCENTER_AGE)
 
29
 
 
30
# Use the GNOME documentation framework
 
31
GNOME_DOC_INIT
 
32
 
 
33
# Internationalization support
 
34
 
 
35
IT_PROG_INTLTOOL([0.40.1])
 
36
 
 
37
AM_GNU_GETTEXT_VERSION([0.17])
 
38
AM_GNU_GETTEXT([external])
 
39
 
 
40
GETTEXT_PACKAGE=gnome-control-center-2.0
 
41
AC_SUBST(GETTEXT_PACKAGE)
 
42
AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [Gettext package])
 
43
 
 
44
GNOME_DEBUG_CHECK
 
45
GNOME_COMPILE_WARNINGS([maximum])
 
46
GNOME_MAINTAINER_MODE_DEFINES
 
47
 
 
48
AC_PATH_XTRA
 
49
x_libs="$X_PRE_LIBS $X_LIBS -lX11 $X_EXTRA_LIBS"
 
50
 
 
51
AC_PATH_PROG([GLIB_MKENUMS],[glib-mkenums])
 
52
 
 
53
dnl Region panel
 
54
savecppflags=$CPPFLAGS
 
55
CPPFLAGS="$CPPFLAGS $X_CFLAGS"
 
56
AC_CHECK_HEADERS([X11/Xlib.h])
 
57
AC_CHECK_LIB(Xxf86misc, XF86MiscQueryExtension, [
 
58
  AC_CHECK_HEADERS([X11/extensions/xf86misc.h], [XF86MISC_LIBS="-lXxf86misc"],[],
 
59
[#if HAVE_X11_XLIB_H
 
60
#include <X11/Xlib.h>
 
61
#endif
 
62
])])
 
63
AC_SUBST(XF86MISC_LIBS)
 
64
AC_CHECK_HEADERS(X11/extensions/XKB.h)
 
65
CPPFLAGS=$savecppflags
 
66
 
 
67
AC_CHECK_LIB(m, floor)
 
68
 
 
69
dnl ==============================================
 
70
dnl Check that we meet the  dependencies
 
71
dnl ==============================================
 
72
 
 
73
GLIB_REQUIRED_VERSION=2.25.11
 
74
GTK_REQUIRED_VERSION=3.0.2
 
75
DESKTOP_SCHEMAS_REQUIRED_VERSION=0.1.7
 
76
PA_REQUIRED_VERSION=0.9.16
 
77
CANBERRA_REQUIRED_VERSION=0.13
 
78
GDKPIXBUF_REQUIRED_VERSION=2.23.0
 
79
POLKIT_REQUIRED_VERSION=0.97
 
80
GSD_REQUIRED_VERSION=2.91.94
 
81
NETWORK_MANAGER_REQUIRED_VERSION=0.8.992
 
82
 
 
83
COMMON_MODULES="gtk+-3.0 >= $GTK_REQUIRED_VERSION
 
84
 glib-2.0 >= $GLIB_REQUIRED_VERSION
 
85
 gthread-2.0
 
86
 gio-2.0
 
87
 gio-unix-2.0
 
88
 gsettings-desktop-schemas >= $DESKTOP_SCHEMAS_REQUIRED_VERSION"
 
89
 
 
90
PKG_CHECK_MODULES(LIBGNOME_CONTROL_CENTER, $COMMON_MODULES gconf-2.0)
 
91
PKG_CHECK_MODULES(LIBLANGUAGE, $COMMON_MODULES gnome-desktop-3.0)
 
92
PKG_CHECK_MODULES(LIBSHORTCUTS, $COMMON_MODULES x11)
 
93
PKG_CHECK_MODULES(SHELL, $COMMON_MODULES libgnome-menu gio-unix-2.0)
 
94
PKG_CHECK_MODULES(BACKGROUND_PANEL, $COMMON_MODULES libxml-2.0 gnome-desktop-3.0
 
95
                  gdk-pixbuf-2.0 >= $GDKPIXBUF_REQUIRED_VERSION)
 
96
PKG_CHECK_MODULES(DATETIME_PANEL, $COMMON_MODULES dbus-glib-1
 
97
                  polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION
 
98
                  gdk-pixbuf-2.0 >= $GDKPIXBUF_REQUIRED_VERSION)
 
99
PKG_CHECK_MODULES(DISPLAY_PANEL, $COMMON_MODULES dbus-glib-1 gnome-desktop-3.0)
 
100
PKG_CHECK_MODULES(INFO_PANEL, $COMMON_MODULES libgtop-2.0)
 
101
PKG_CHECK_MODULES(KEYBOARD_PANEL, $COMMON_MODULES gconf-2.0 x11)
 
102
PKG_CHECK_MODULES(MEDIA_PANEL, $COMMON_MODULES)
 
103
PKG_CHECK_MODULES(MOUSE_PANEL, $COMMON_MODULES xi >= 1.2
 
104
                  gnome-settings-daemon >= $GSD_REQUIRED_VERSION x11)
 
105
PKG_CHECK_MODULES(NETWORK_PANEL, $COMMON_MODULES)
 
106
PKG_CHECK_MODULES(POWER_PANEL, $COMMON_MODULES upower-glib >= 0.9.1)
 
107
PKG_CHECK_MODULES(PRINTERS_PANEL, $COMMON_MODULES dbus-glib-1
 
108
                  polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION)
 
109
PKG_CHECK_MODULES(REGION_PANEL, $COMMON_MODULES libgnomekbd >= 2.91.91
 
110
                  libxklavier >= 5.1 libgnomekbdui >= 2.91.91)
 
111
PKG_CHECK_MODULES(SCREEN_PANEL, $COMMON_MODULES)
 
112
PKG_CHECK_MODULES(SOUND_PANEL, $COMMON_MODULES libxml-2.0
 
113
                  libcanberra-gtk3 >= $CANBERRA_REQUIRED_VERSION
 
114
                  libpulse >= $PA_REQUIRED_VERSION
 
115
                  libpulse-mainloop-glib >= $PA_REQUIRED_VERSION
 
116
                  gconf-2.0)
 
117
PKG_CHECK_MODULES(UNIVERSAL_ACCESS_PANEL, $COMMON_MODULES gconf-2.0)
 
118
PKG_CHECK_MODULES(USER_ACCOUNTS_PANEL, $COMMON_MODULES dbus-glib-1
 
119
                  polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION
 
120
                  gnome-desktop-3.0
 
121
                  gdk-pixbuf-2.0 >= $GDKPIXBUF_REQUIRED_VERSION)
 
122
 
 
123
GDESKTOP_PREFIX=`$PKG_CONFIG --variable prefix gsettings-desktop-schemas`
 
124
AC_SUBST(GDESKTOP_PREFIX)
 
125
 
 
126
# Check for NetworkManager ~0.9
 
127
PKG_CHECK_MODULES(NETWORK_MANAGER, NetworkManager >= $NETWORK_MANAGER_REQUIRED_VERSION
 
128
                  libnm-glib >= $NETWORK_MANAGER_REQUIRED_VERSION
 
129
                  libnm-util >= $NETWORK_MANAGER_REQUIRED_VERSION,
 
130
                  [have_networkmanager=yes], have_networkmanager=no)
 
131
if test "x$have_networkmanager" = xno ; then
 
132
        AC_MSG_WARN(*** Network panel will not be built (NetworkManager ~0.9 or newer not found) ***)
 
133
fi
 
134
AM_CONDITIONAL(BUILD_NETWORK, [test x$have_networkmanager = xyes])
 
135
 
 
136
# Check for CUPS 1.4 or newer
 
137
AC_ARG_ENABLE([cups],
 
138
              AS_HELP_STRING([--disable-cups], [disable CUPS support (default: enabled)]),,
 
139
              [enable_cups=yes])
 
140
 
 
141
if test x"$enable_cups" != x"no" ; then
 
142
  AC_PROG_SED
 
143
 
 
144
  AC_PATH_PROG(CUPS_CONFIG, cups-config,
 
145
               AC_MSG_ERROR([cups-config not found but CUPS support requested]))
 
146
 
 
147
  CUPS_API_VERSION=`$CUPS_CONFIG --api-version`
 
148
  CUPS_API_MAJOR=`echo $ECHO_N $CUPS_API_VERSION | cut -d . -f 1`
 
149
  CUPS_API_MINOR=`echo $ECHO_N $CUPS_API_VERSION | cut -d . -f 2`
 
150
 
 
151
  AC_CHECK_HEADERS([cups/cups.h cups/http.h cups/ipp.h],,
 
152
                   AC_MSG_ERROR([CUPS headers not found but CUPS support requested]))
 
153
 
 
154
  if ! test $CUPS_API_MAJOR -gt 1 -o \
 
155
            $CUPS_API_MAJOR -eq 1 -a $CUPS_API_MINOR -ge 4 ; then
 
156
    AC_MSG_ERROR([CUPS 1.4 or newer not found, but CUPS support requested])
 
157
  fi
 
158
 
 
159
  CUPS_CFLAGS=`$CUPS_CONFIG --cflags | $SED -e 's/-O\w*//g' -e 's/-m\w*//g'`
 
160
  CUPS_LIBS=`$CUPS_CONFIG --libs`
 
161
  AC_SUBST(CUPS_CFLAGS)
 
162
  AC_SUBST(CUPS_LIBS)
 
163
fi
 
164
 
 
165
AM_CONDITIONAL(BUILD_PRINTERS, [test x"$enable_cups" = x"yes"])
 
166
 
 
167
# Optional dependency for the user accounts panel
 
168
AC_ARG_WITH([cheese],
 
169
            AS_HELP_STRING([--with-cheese], [enable cheese webcam support]),,
 
170
            with_cheese=auto)
 
171
 
 
172
if test x"$with_cheese" != x"no" ; then
 
173
   PKG_CHECK_MODULES(CHEESE, gstreamer-0.10 cheese-gtk >= 2.91.91.1, [have_cheese=yes], [have_cheese=no])
 
174
   if test x${have_cheese} = xyes; then
 
175
     AC_DEFINE(HAVE_CHEESE, 1, [Define to 1 to enable cheese webcam support])
 
176
   fi
 
177
   if test x${with_cheese} = xyes && test x${have_cheese} = xno; then
 
178
     AC_MSG_ERROR([Cheese configured but not found])
 
179
   fi
 
180
else
 
181
   have_cheese=no
 
182
fi
 
183
AM_CONDITIONAL(BUILD_CHEESE, test x${have_cheese} = xyes)
 
184
 
 
185
# This is a hard-dependency for the region and user-accounts panels
 
186
PKG_CHECK_MODULES(ISOCODES, iso-codes)
 
187
 
 
188
AC_DEFINE_UNQUOTED([ISO_CODES_PREFIX],["`$PKG_CONFIG --variable=prefix iso-codes`"],[ISO codes prefix])
 
189
ISO_CODES=iso-codes
 
190
 
 
191
dnl ==============================================
 
192
dnl End: Check that we meet the  dependencies
 
193
dnl ==============================================
 
194
 
 
195
AC_PATH_PROG(GLIB_GENMARSHAL, glib-genmarshal, no)
 
196
 
 
197
if test x"$GLIB_GENMARSHAL" = xno; then
 
198
  AC_MSG_ERROR([glib-genmarshal executable not found in your path - should be installed with glib])
 
199
fi
 
200
 
 
201
AC_SUBST(GLIB_GENMARSHAL)
 
202
 
 
203
dnl =======================================
 
204
dnl Panels
 
205
dnl =======================================
 
206
 
 
207
PANELS_DIR="${libdir}/control-center-1/panels"
 
208
AC_SUBST(PANELS_DIR)
 
209
 
 
210
PANEL_CFLAGS="-I\$(top_srcdir)/ -DG_LOG_DOMAIN=\"\\\"\$(cappletname)-cc-panel\\\"\""
 
211
AC_SUBST(PANEL_CFLAGS)
 
212
 
 
213
PANEL_LIBS="\$(top_builddir)/libgnome-control-center/libgnome-control-center.la"
 
214
AC_SUBST(PANEL_LIBS)
 
215
 
 
216
PANEL_LDFLAGS="-export_dynamic -avoid-version -module -no-undefined -export-symbols-regex '^g_io_module_(load|unload)'"
 
217
AC_SUBST(PANEL_LDFLAGS)
 
218
 
 
219
dnl ==============================================
 
220
dnl libsocialweb
 
221
dnl ==============================================
 
222
 
 
223
AC_MSG_CHECKING([Enable libsocialweb support])
 
224
AC_ARG_WITH([libsocialweb],
 
225
   AS_HELP_STRING([--with-libsocialweb],
 
226
                  [enable libsocialweb support]),,
 
227
   [with_libsocialweb=no])
 
228
AC_MSG_RESULT([$with_libsocialweb])
 
229
 
 
230
if test "x$with_libsocialweb" == "xyes"; then
 
231
  PKG_CHECK_MODULES(SOCIALWEB, libsocialweb-client)
 
232
  AC_DEFINE(HAVE_LIBSOCIALWEB, 1, [Defined if libsocialweb is available])
 
233
fi
 
234
AM_CONDITIONAL(WITH_LIBSOCIALWEB, test "x$with_libsocialweb" = "xyes")
 
235
 
 
236
 
 
237
dnl =======================================
 
238
dnl Update Mime Database
 
239
dnl =======================================
 
240
 
 
241
AC_PATH_PROG(UPDATE_MIME_DATABASE, update-mime-database, no)
 
242
 
 
243
AC_ARG_ENABLE(update-mimedb,
 
244
   AS_HELP_STRING([--disable-update-mimedb],
 
245
                  [do not update mime database after installation]),,
 
246
                   enable_update_mimedb=yes)
 
247
AM_CONDITIONAL(ENABLE_UPDATE_MIMEDB, test x$enable_update_mimedb = xyes)
 
248
 
 
249
CONTROL_CENTER_VERSION=gnome_control_center_version
 
250
AC_SUBST(CONTROL_CENTER_VERSION)
 
251
 
 
252
dnl =======================================
 
253
dnl Finish
 
254
dnl =======================================
 
255
 
 
256
# Turn on the additional warnings last
 
257
 
 
258
AC_ARG_ENABLE(more-warnings,
 
259
              AS_HELP_STRING([--enable-more-warnings],
 
260
                             [Maximum compiler warnings]),
 
261
              set_more_warnings="$enableval",[
 
262
              if test -d $srcdir/.git; then
 
263
                set_more_warnings=yes
 
264
              else
 
265
                set_more_warnings=no
 
266
              fi])
 
267
 
 
268
AC_MSG_CHECKING(for more warnings)
 
269
if test "$GCC" = "yes" -a "$set_more_warnings" != "no"; then
 
270
        AC_MSG_RESULT(yes)
 
271
        CFLAGS="\
 
272
        -Wall -Wclobbered -Wempty-body -Wignored-qualifiers \
 
273
        -Wmissing-field-initializers -Wmissing-parameter-type \
 
274
        -Wold-style-declaration -Woverride-init -Wtype-limits \
 
275
        -Wuninitialized \
 
276
        -Wchar-subscripts -Wmissing-declarations -Wmissing-prototypes \
 
277
        -Wnested-externs -Wpointer-arith \
 
278
        -Wcast-align -Wsign-compare -Wp,-D_FORTIFY_SOURCE=2 \
 
279
        $CFLAGS"
 
280
 
 
281
        for option in -Wno-strict-aliasing -Wno-sign-compare; do
 
282
                SAVE_CFLAGS="$CFLAGS"
 
283
                CFLAGS="$CFLAGS $option"
 
284
                AC_MSG_CHECKING([whether gcc understands $option])
 
285
                AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[]])],
 
286
                                  [has_option=yes],
 
287
                                  [has_option=no])
 
288
                if test $has_option = no; then
 
289
                        CFLAGS="$SAVE_CFLAGS"
 
290
                fi
 
291
                AC_MSG_RESULT($has_option)
 
292
                unset has_option
 
293
                unset SAVE_CFLAGS
 
294
        done
 
295
        unset option
 
296
else
 
297
        AC_MSG_RESULT(no)
 
298
fi
 
299
 
 
300
 
 
301
AC_CONFIG_FILES([
 
302
Makefile
 
303
help/Makefile
 
304
libgnome-control-center/Makefile
 
305
libgnome-control-center/libgnome-control-center.pc
 
306
panels/Makefile
 
307
panels/common/Makefile
 
308
panels/background/Makefile
 
309
panels/background/gnome-background-panel.desktop.in
 
310
panels/datetime/Makefile
 
311
panels/datetime/gnome-datetime-panel.desktop.in
 
312
panels/datetime/po-timezones/Makefile
 
313
panels/display/Makefile
 
314
panels/display/gnome-display-panel.desktop.in
 
315
panels/keyboard/Makefile
 
316
panels/keyboard/gnome-keyboard-panel.desktop.in
 
317
panels/keyboard/gnome-keybindings.pc
 
318
panels/region/Makefile
 
319
panels/region/gnome-region-panel.desktop.in
 
320
panels/media/Makefile
 
321
panels/media/gnome-media-panel.desktop.in
 
322
panels/mouse/Makefile
 
323
panels/mouse/gnome-mouse-panel.desktop.in
 
324
panels/sound/Makefile
 
325
panels/sound/data/Makefile
 
326
panels/sound/data/gnome-sound-panel.desktop.in
 
327
panels/sound/data/symbolic-icons/Makefile
 
328
panels/sound/data/symbolic-icons/scalable/Makefile
 
329
panels/sound/data/symbolic-icons/scalable/status/Makefile
 
330
panels/sound/data/icons/Makefile
 
331
panels/sound/data/icons/16x16/Makefile
 
332
panels/sound/data/icons/16x16/apps/Makefile
 
333
panels/sound/data/icons/16x16/devices/Makefile
 
334
panels/sound/data/icons/16x16/status/Makefile
 
335
panels/sound/data/icons/22x22/Makefile
 
336
panels/sound/data/icons/22x22/apps/Makefile
 
337
panels/sound/data/icons/22x22/status/Makefile
 
338
panels/sound/data/icons/24x24/Makefile
 
339
panels/sound/data/icons/24x24/apps/Makefile
 
340
panels/sound/data/icons/24x24/devices/Makefile
 
341
panels/sound/data/icons/24x24/status/Makefile
 
342
panels/sound/data/icons/32x32/Makefile
 
343
panels/sound/data/icons/32x32/apps/Makefile
 
344
panels/sound/data/icons/32x32/devices/Makefile
 
345
panels/sound/data/icons/32x32/status/Makefile
 
346
panels/sound/data/icons/48x48/Makefile
 
347
panels/sound/data/icons/48x48/apps/Makefile
 
348
panels/sound/data/icons/48x48/devices/Makefile
 
349
panels/sound/data/icons/scalable/Makefile
 
350
panels/sound/data/icons/scalable/apps/Makefile
 
351
panels/sound/data/icons/scalable/devices/Makefile
 
352
panels/sound/data/sounds/Makefile
 
353
panels/screen/Makefile
 
354
panels/screen/gnome-screen-panel.desktop.in
 
355
panels/info/Makefile
 
356
panels/info/gnome-info-panel.desktop.in
 
357
panels/power/Makefile
 
358
panels/power/gnome-power-panel.desktop.in
 
359
panels/printers/Makefile
 
360
panels/printers/gnome-printers-panel.desktop.in
 
361
panels/network/Makefile
 
362
panels/network/gnome-network-panel.desktop.in
 
363
panels/universal-access/Makefile
 
364
panels/universal-access/gnome-universal-access-panel.desktop.in
 
365
panels/user-accounts/Makefile
 
366
panels/user-accounts/data/Makefile
 
367
panels/user-accounts/data/gnome-user-accounts-panel.desktop.in
 
368
panels/user-accounts/data/faces/Makefile
 
369
panels/user-accounts/data/icons/Makefile
 
370
po/Makefile.in
 
371
shell/Makefile
 
372
shell/gnome-control-center.desktop.in
 
373
])
 
374
 
 
375
dnl due to a bug in intltool we need to expand something from the root last control-center.spec
 
376
AC_OUTPUT