~ubuntu-branches/ubuntu/oneiric/gnome-control-center/oneiric

« back to all changes in this revision

Viewing changes to configure.ac

  • Committer: Package Import Robot
  • Author(s): Rodrigo Moya
  • Date: 2011-09-19 22:41:30 UTC
  • mfrom: (1.1.52 upstream)
  • Revision ID: package-import@ubuntu.com-20110919224130-k0xyg27e7myleivp
Tags: 1:3.1.92-0ubuntu1
* New upstream release
* debian/patches/01_revert_dependency_on_libnm_gtk.patch:
  - Revert git commit that makes it depend on (unreleased) libnm-gtk
* debian/patches/00git_disable_button_if_gcm_viewer_not_installed.patch:
* debian/patches/00git_fix_gcm_viewer_spawn.patch:
* debian/patches/53_use_ubuntu_help.patch:
* debian/patches/54_set_contrast_theme.patch:
  - Remove upstream patches
* debian/patches/07_make_window_wider.patch:
* debian/patches/50_ubuntu_systemwide_prefs.patch:
  - Rebased

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
 
m4_define([gnome_control_center_version], 3.1.91)
 
1
m4_define([gnome_control_center_version], 3.1.92)
2
2
AC_INIT([gnome-control-center], [gnome_control_center_version],
3
3
        [http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-control-center])
4
4
 
68
68
dnl ==============================================
69
69
 
70
70
GLIB_REQUIRED_VERSION=2.29.14
71
 
GTK_REQUIRED_VERSION=3.1.3
 
71
GTK_REQUIRED_VERSION=3.1.19
72
72
DESKTOP_SCHEMAS_REQUIRED_VERSION=3.0.2
73
73
PA_REQUIRED_VERSION=0.9.16
74
74
CANBERRA_REQUIRED_VERSION=0.13
135
135
                  libnm-util >= $NETWORK_MANAGER_REQUIRED_VERSION,
136
136
                  [have_networkmanager=yes], have_networkmanager=no)
137
137
if test "x$have_networkmanager" = xno ; then
138
 
        AC_MSG_WARN(*** Network panel will not be built (NetworkManager ~0.9 or newer not found) ***)
 
138
        AC_MSG_WARN(*** Network panel will not be built (NetworkManager >= $NETWORK_MANAGER_REQUIRED_VERSION or newer not found) ***)
139
139
fi
140
140
AM_CONDITIONAL(BUILD_NETWORK, [test x$have_networkmanager = xyes])
141
141