← Back to branch summary

~jbicha/ubuntu/oneiric/gnome-shell/oneiric-3.2.2.1

« back to all changes in this revision

Viewing changes to .pc/03_remove-glx-dependency-on-armel.patch/configure.ac

  • Committer: Package Import Robot
  • Author(s): Jeremy Bicha
  • Date: 2011-09-07 09:09:05 UTC
  • mfrom: (1.1.29 upstream)
  • Revision ID: package-import@ubuntu.com-20110907090905-kbo4fewcg12zt99u
Tags: 3.1.90.1-0ubuntu1
* New upstream release.
* debian/control: Bump build-depends on new mutter
* debian/patches/01_favorite_apps.patch: Updated
* debian/patches/03_remove-glx-dependency-on-armel.patch: Refreshed
* debian/patches/04_build-without-caribou.patch
  - Build without caribou since Ubuntu uses onboard and our System 
    Settings doesn't support choosing a different screen keyboard yet

Show diffs side-by-side

added added

removed removed

Lines of Context:
.pc/03_remove-glx-dependency-on-armel.patch/configure.ac
1
1
AC_PREREQ(2.63)
2
 
AC_INIT([gnome-shell],[3.1.4],[https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-shell],[gnome-shell])
 
2
AC_INIT([gnome-shell],[3.1.90.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])
68
68
GOBJECT_INTROSPECTION_MIN_VERSION=0.10.1
69
69
GJS_MIN_VERSION=1.29.15
70
70
MUTTER_MIN_VERSION=3.0.0
 
71
FOLKS_MIN_VERSION=0.5.2
71
72
GTK_MIN_VERSION=3.0.0
72
 
GIO_MIN_VERSION=2.25.9
 
73
GIO_MIN_VERSION=2.29.10
73
74
LIBECAL_MIN_VERSION=2.32.0
74
75
LIBEDATASERVER_MIN_VERSION=1.2.0
75
76
LIBEDATASERVERUI_MIN_VERSION=2.91.6
76
 
TELEPATHY_GLIB_MIN_VERSION=0.15.3
 
77
TELEPATHY_GLIB_MIN_VERSION=0.15.5
77
78
TELEPATHY_LOGGER_MIN_VERSION=0.2.4
78
79
POLKIT_MIN_VERSION=0.100
79
80
STARTUP_NOTIFICATION_MIN_VERSION=0.11
82
83
PKG_CHECK_MODULES(GNOME_SHELL, gio-2.0 >= $GIO_MIN_VERSION
83
84
                               gio-unix-2.0 dbus-glib-1 libxml-2.0
84
85
                               gtk+-3.0 >= $GTK_MIN_VERSION
 
86
                               folks >= $FOLKS_MIN_VERSION
85
87
                               libmutter >= $MUTTER_MIN_VERSION
86
88
                               gjs-internals-1.0 >= $GJS_MIN_VERSION
87
 
                               libgnome-menu $recorder_modules gconf-2.0
 
89
                               libgnome-menu-3.0 $recorder_modules gconf-2.0
88
90
                               gdk-x11-3.0 libsoup-2.4
89
91
                               clutter-x11-1.0 >= $CLUTTER_MIN_VERSION
90
92
                               clutter-glx-1.0 >= $CLUTTER_MIN_VERSION
93
95
                               libcanberra
94
96
                               telepathy-glib >= $TELEPATHY_GLIB_MIN_VERSION
95
97
                               telepathy-logger-0.2 >= $TELEPATHY_LOGGER_MIN_VERSION
96
 
                               polkit-agent-1 >= $POLKIT_MIN_VERSION xfixes)
 
98
                               polkit-agent-1 >= $POLKIT_MIN_VERSION xfixes
 
99
                               libnm-glib libnm-util gnome-keyring-1)
97
100
 
98
101
PKG_CHECK_MODULES(SHELL_PERF_HELPER, gtk+-3.0 gio-2.0)
99
102
 
105
108
 
106
109
GOBJECT_INTROSPECTION_CHECK([$GOBJECT_INTROSPECTION_MIN_VERSION])
107
110
JHBUILD_TYPELIBDIR="$INTROSPECTION_TYPELIBDIR"
108
 
# NM is the only typelib we use that we don't jhbuild
109
 
PKG_CHECK_EXISTS([libnm-glib >= 0.8.999],
110
 
        [NM_TYPELIBDIR=`$PKG_CONFIG --variable=libdir libnm-glib`/girepository-1.0
111
 
         if test "$INTROSPECTION_TYPELIBDIR" != "$NM_TYPELIBDIR"; then
112
 
             JHBUILD_TYPELIBDIR="$JHBUILD_TYPELIBDIR:$NM_TYPELIBDIR"
113
 
         fi])
114
111
AC_SUBST(JHBUILD_TYPELIBDIR)
115
112
 
116
113
saved_CFLAGS=$CFLAGS
156
153
AC_CHECK_FUNCS(mallinfo)
157
154
AC_CHECK_HEADERS([sys/resource.h])
158
155
 
 
156
# _NL_TIME_FIRST_WEEKDAY is an enum and not a define
 
157
AC_MSG_CHECKING([for _NL_TIME_FIRST_WEEKDAY])
 
158
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <langinfo.h>]],
 
159
                                   [[nl_langinfo(_NL_TIME_FIRST_WEEKDAY);]])],
 
160
               [langinfo_ok=yes], [langinfo_ok=no])
 
161
AC_MSG_RESULT($langinfo_ok)
 
162
if test "$langinfo_ok" = "yes"; then
 
163
  AC_DEFINE([HAVE__NL_TIME_FIRST_WEEKDAY], [1],
 
164
            [Define if _NL_TIME_FIRST_WEEKDAY is available])
 
165
fi
 
166
 
159
167
# Sets GLIB_GENMARSHAL and GLIB_MKENUMS
160
168
AM_PATH_GLIB_2_0()
161
169
G_IR_SCANNER=`$PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0`