← Back to branch summary

~ubuntu-branches/debian/jessie/gnome-shell/jessie

« back to all changes in this revision

Viewing changes to .pc/10-make-NetworkManager-optional.patch/configure.ac

  • Committer: Package Import Robot
  • Author(s): Michael Biebl
  • Date: 2012-05-30 13:19:38 UTC
  • mfrom: (18.1.24 experimental)
  • Revision ID: package-import@ubuntu.com-20120530131938-i3trc1g1p3is2u6x
Tags: 3.4.1-3
Upload to unstable.

Show diffs side-by-side

added added

removed removed

Lines of Context:
.pc/10-make-NetworkManager-optional.patch/configure.ac
1
1
AC_PREREQ(2.63)
2
 
AC_INIT([gnome-shell],[3.2.2.1],[https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-shell],[gnome-shell])
 
2
AC_INIT([gnome-shell],[3.4.1],[https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-shell],[gnome-shell])
3
3
 
4
4
AC_CONFIG_HEADERS([config.h])
5
5
AC_CONFIG_SRCDIR([src/shell-global.c])
36
36
 
37
37
PKG_PROG_PKG_CONFIG([0.22])
38
38
 
39
 
# GConf stuff
40
 
AC_PATH_PROG(GCONFTOOL, gconftool-2, no)
41
 
AM_GCONF_SOURCE_2
42
 
 
43
39
GLIB_GSETTINGS
44
40
 
45
41
# Get a value to substitute into gnome-shell.in
57
53
   AC_MSG_RESULT(yes)
58
54
   build_recorder=true
59
55
   recorder_modules="gstreamer-0.10 gstreamer-base-0.10 x11"
60
 
   PKG_CHECK_MODULES(TEST_SHELL_RECORDER, $recorder_modules clutter-1.0 xfixes)
 
56
   PKG_CHECK_MODULES(TEST_SHELL_RECORDER, $recorder_modules clutter-1.0 xfixes gl)
61
57
else
62
58
   AC_MSG_RESULT(no)
63
59
fi
64
60
 
65
61
AM_CONDITIONAL(BUILD_RECORDER, $build_recorder)
66
62
 
67
 
CLUTTER_MIN_VERSION=1.7.5
 
63
CLUTTER_MIN_VERSION=1.9.16
68
64
GOBJECT_INTROSPECTION_MIN_VERSION=0.10.1
69
65
GJS_MIN_VERSION=1.29.18
70
 
MUTTER_MIN_VERSION=3.2.1
 
66
MUTTER_MIN_VERSION=3.4.1
71
67
FOLKS_MIN_VERSION=0.5.2
72
 
GTK_MIN_VERSION=3.0.0
73
 
GIO_MIN_VERSION=2.29.10
 
68
GTK_MIN_VERSION=3.3.9
 
69
GIO_MIN_VERSION=2.31.6
74
70
LIBECAL_MIN_VERSION=2.32.0
75
71
LIBEDATASERVER_MIN_VERSION=1.2.0
76
72
LIBEDATASERVERUI_MIN_VERSION=2.91.6
77
 
TELEPATHY_GLIB_MIN_VERSION=0.15.5
 
73
TELEPATHY_GLIB_MIN_VERSION=0.17.5
78
74
TELEPATHY_LOGGER_MIN_VERSION=0.2.4
79
75
POLKIT_MIN_VERSION=0.100
80
76
STARTUP_NOTIFICATION_MIN_VERSION=0.11
 
77
GCR_MIN_VERSION=3.3.90
81
78
 
82
79
# Collect more than 20 libraries for a prize!
83
 
PKG_CHECK_MODULES(GNOME_SHELL, gio-2.0 >= $GIO_MIN_VERSION
84
 
                               gio-unix-2.0 dbus-glib-1 libxml-2.0
 
80
PKG_CHECK_MODULES(GNOME_SHELL, gio-unix-2.0 >= $GIO_MIN_VERSION
 
81
                               libxml-2.0
85
82
                               gtk+-3.0 >= $GTK_MIN_VERSION
86
83
                               folks >= $FOLKS_MIN_VERSION
87
84
                               libmutter >= $MUTTER_MIN_VERSION
88
85
                               gjs-internals-1.0 >= $GJS_MIN_VERSION
89
 
                               libgnome-menu-3.0 $recorder_modules gconf-2.0
 
86
                               libgnome-menu-3.0 $recorder_modules
90
87
                               gdk-x11-3.0 libsoup-2.4
 
88
                               gl
91
89
                               clutter-x11-1.0 >= $CLUTTER_MIN_VERSION
92
90
                               clutter-glx-1.0 >= $CLUTTER_MIN_VERSION
93
91
                               libstartup-notification-1.0 >= $STARTUP_NOTIFICATION_MIN_VERSION
96
94
                               telepathy-glib >= $TELEPATHY_GLIB_MIN_VERSION
97
95
                               telepathy-logger-0.2 >= $TELEPATHY_LOGGER_MIN_VERSION
98
96
                               polkit-agent-1 >= $POLKIT_MIN_VERSION xfixes
99
 
                               libnm-glib libnm-util gnome-keyring-1)
 
97
                               libnm-glib libnm-util gnome-keyring-1
 
98
                               gcr-3 >= $GCR_MIN_VERSION)
100
99
 
101
100
PKG_CHECK_MODULES(SHELL_PERF_HELPER, gtk+-3.0 gio-2.0)
102
101
 
120
119
CFLAGS=$saved_CFLAGS
121
120
LIBS=$saved_LIBS
122
121
 
123
 
PKG_CHECK_MODULES(ST, clutter-1.0 gtk+-3.0 libcroco-0.6 >= 0.6.2 gnome-desktop-3.0 >= 2.90.0 x11)
124
 
PKG_CHECK_MODULES(GDMUSER, dbus-glib-1 gtk+-3.0)
 
122
PKG_CHECK_MODULES(GNOME_SHELL_JS, gio-2.0 gjs-internals-1.0 >= $GJS_MIN_VERSION)
 
123
PKG_CHECK_MODULES(ST, clutter-1.0 gtk+-3.0 libcroco-0.6 >= 0.6.2 x11)
125
124
PKG_CHECK_MODULES(TRAY, gtk+-3.0)
126
125
PKG_CHECK_MODULES(GVC, libpulse libpulse-mainloop-glib gobject-2.0)
127
126
PKG_CHECK_MODULES(DESKTOP_SCHEMAS, gsettings-desktop-schemas >= 0.1.7)
131
130
        [BLUETOOTH_DIR=`$PKG_CONFIG --variable=applet_libdir gnome-bluetooth-1.0`
132
131
         BLUETOOTH_LIBS=`$PKG_CONFIG --variable=applet_libs gnome-bluetooth-1.0`
133
132
         AC_SUBST([BLUETOOTH_LIBS],["$BLUETOOTH_LIBS"])
 
133
         AC_SUBST([BLUETOOTH_DIR],["$BLUETOOTH_DIR"])
134
134
         AC_DEFINE_UNQUOTED([BLUETOOTH_DIR],["$BLUETOOTH_DIR"],[Path to installed GnomeBluetooth typelib and library])
135
135
         AC_DEFINE([HAVE_BLUETOOTH],[1],[Define if you have libgnome-bluetooth-applet])
136
136
         AC_SUBST([HAVE_BLUETOOTH],[1])
143
143
AC_SUBST(CALENDAR_SERVER_CFLAGS)
144
144
AC_SUBST(CALENDAR_SERVER_LIBS)
145
145
 
 
146
AC_ARG_WITH(systemd,
 
147
            AS_HELP_STRING([--with-systemd],
 
148
                           [Add systemd support]),
 
149
            [with_systemd=$withval], [with_systemd=auto])
 
150
 
 
151
PKG_CHECK_MODULES(SYSTEMD,
 
152
                  [libsystemd-login libsystemd-daemon],
 
153
                  [have_systemd=yes], [have_systemd=no])
 
154
 
 
155
if test "x$with_systemd" = "xauto" ; then
 
156
        if test x$have_systemd = xno ; then
 
157
                use_systemd=no
 
158
        else
 
159
                use_systemd=yes
 
160
        fi
 
161
else
 
162
        use_systemd=$with_systemd
 
163
fi
 
164
 
 
165
if test "x$use_systemd" = "xyes"; then
 
166
        if test "x$have_systemd" = "xno"; then
 
167
                AC_MSG_ERROR([Systemd support explicitly required, but systemd not found])
 
168
        fi
 
169
 
 
170
        AC_DEFINE(WITH_SYSTEMD, 1, [systemd support])
 
171
fi
 
172
 
146
173
MUTTER_GIR_DIR=`$PKG_CONFIG --variable=girdir libmutter`
147
174
MUTTER_TYPELIB_DIR=`$PKG_CONFIG --variable=typelibdir libmutter`
148
175
AC_SUBST(MUTTER_GIR_DIR)
179
206
TYPELIBDIR="$($PKG_CONFIG --variable=typelibdir gobject-introspection-1.0)"
180
207
AC_SUBST(TYPELIBDIR)
181
208
 
 
209
GTK_DOC_CHECK([1.15], [--flavour no-tmpl])
 
210
 
182
211
# Stay command-line compatible with the gnome-common configure option. Here
183
212
# minimum/yes/maximum are the same, however.
184
213
AC_ARG_ENABLE(compile_warnings,
199
228
    if test "$enable_compile_warnings" = error ; then
200
229
      case " $CFLAGS " in
201
230
      *[\ \     ]-Werror[\ \    ]*) ;;
202
 
      *) CFLAGS="$CFLAGS -Werror" ;;
 
231
      *) CFLAGS="$CFLAGS -Werror -Wno-error=deprecated-declarations" ;;
203
232
      esac
204
233
    fi
205
234
  fi
207
236
changequote([,])dnl
208
237
 
209
238
AC_ARG_ENABLE(jhbuild-wrapper-script,
210
 
  AS_HELP_STRING([--jhbuild-wrapper-script=yes],[Make "gnome-shell" script work for jhbuild]),,enable_jhbuild_wrapper_script=no)
 
239
  AS_HELP_STRING([--enable-jhbuild-wrapper-script],[Make "gnome-shell" script work for jhbuild]),,enable_jhbuild_wrapper_script=no)
211
240
AM_CONDITIONAL(USE_JHBUILD_WRAPPER_SCRIPT, test "x$enable_jhbuild_wrapper_script" = xyes)
212
241
 
213
242
AC_MSG_CHECKING([location of system Certificate Authority list])
241
270
AC_CONFIG_FILES([
242
271
  Makefile
243
272
  data/Makefile
 
273
  docs/Makefile
 
274
  docs/reference/Makefile
 
275
  docs/reference/shell/Makefile
 
276
  docs/reference/shell/shell-docs.sgml
 
277
  docs/reference/st/Makefile
 
278
  docs/reference/st/st-docs.sgml
244
279
  js/Makefile
245
 
  js/misc/config.js
246
280
  src/Makefile
247
281
  browser-plugin/Makefile
248
282
  tests/Makefile