← Back to branch summary

~ubuntu-branches/ubuntu/vivid/vino/vivid-proposed

« back to all changes in this revision

Viewing changes to .pc/12_app-indicators-only.patch/configure.ac

  • Committer: Package Import Robot
  • Author(s): Sebastien Bacher
  • Date: 2013-11-18 15:53:41 UTC
  • mfrom: (1.4.8)
  • Revision ID: package-import@ubuntu.com-20131118155341-u7aet62hkfzomvi6
Tags: 3.8.1-0ubuntu1
* New upstream version, drop changes included in the new version
* debian/patches/revert_use_prompt_notification.patch:
  - revert upstream change to use a notification with actions to accept or
    deny clients, since notify-osd doesn't support those, we keep using
    the old standalone dialog instead
* debian/patches/git_tls_read.patch:
  - "Fix reading of TLS data to account for cached data"

Show diffs side-by-side

added added

removed removed

Lines of Context:
.pc/12_app-indicators-only.patch/configure.ac
1
1
AC_PREREQ([2.64])
2
 
AC_INIT([Vino], [3.6.2], [https://bugzilla.gnome.org/enter_bug.cgi?product=vino], [vino], [https://live.gnome.org/Vino])
 
2
AC_INIT([Vino], [3.8.1], [https://bugzilla.gnome.org/enter_bug.cgi?product=vino], [vino], [https://live.gnome.org/Vino])
3
3
AC_CONFIG_AUX_DIR([build-aux])
4
4
AC_CONFIG_SRCDIR([server/vino-fb.c])
5
5
AC_CONFIG_HEADERS([config.h])
71
71
 
72
72
AM_CONDITIONAL([VINO_HAVE_TELEPATHY_GLIB], [test "x$have_telepathy" = "xyes"])
73
73
 
74
 
# Check for libnotify
75
 
LIBNOTIFY_DEPS="libnotify >= 0.4.4"
76
 
LIBNOTIFY_0_7_DEPS="libnotify >= 0.7.0"
77
 
 
78
 
AC_ARG_WITH([libnotify],
79
 
  [AS_HELP_STRING([--without-libnotify],
80
 
    [ignore the presence of libnotify and disable it])])
81
 
 
82
 
AS_IF([test "x$with_libnotify" != "xno"],
83
 
  [PKG_CHECK_EXISTS([$LIBNOTIFY_DEPS],
84
 
    [have_libnotify=yes],
85
 
    [have_libnotify=no])],
86
 
  [have_libnotify=no])
87
 
 
88
 
AS_IF([test "x$have_libnotify" = "xyes"],
89
 
  [AC_DEFINE([VINO_HAVE_LIBNOTIFY], [], [Build with libnotify support])
90
 
    PKG_CHECK_EXISTS([$LIBNOTIFY_0_7_DEPS],
91
 
      [have_libnotify_0_7=yes],
92
 
      [have_libnotify_0_7=no])
93
 
    AS_IF([test "x$have_libnotify_0_7" = "xyes"],
94
 
      [LIBNOTIFY_DEPS="$LIBNOTIFY_0_7_DEPS"
95
 
        AC_DEFINE([VINO_HAVE_LIBNOTIFY_0_7], [], [Build with libnotify 0.7 or greater support])])],
96
 
  [LIBNOTIFY_DEPS=""
97
 
    AS_IF([test "x$have_libnotify" = "xyes"],
98
 
    [AC_MSG_ERROR([libnotify support requested but not found])])])
99
 
 
100
74
# Check for NetworkManager
101
75
NETWORKMANAGER_DEPS="NetworkManager >= 0.7"
102
76
 
335
309
GIO_VERSION=2.26
336
310
SOUP_VERSION=2.24.0
337
311
 
338
 
PKG_CHECK_MODULES([VINO_SERVER], [glib-2.0 >= $GLIB_VERSION gio-unix-2.0 gtk+-x11-3.0 >= $GTK_VERSION $TELEPATHY_GLIB_DEPS $LIBNOTIFY_DEPS $SECRET_DEPS $NETWORKMANAGER_DEPS $GNUTLS_DEPS $AVAHI_DEPS])
 
312
PKG_CHECK_MODULES([VINO_SERVER], [glib-2.0 >= $GLIB_VERSION gio-unix-2.0 gtk+-x11-3.0 >= $GTK_VERSION $TELEPATHY_GLIB_DEPS libnotify >= 0.7.0 $SECRET_DEPS $NETWORKMANAGER_DEPS $GNUTLS_DEPS $AVAHI_DEPS])
339
313
 
340
314
PKG_CHECK_MODULES([VINO_CAPPLET], [glib-2.0 >= $GLIB_VERSION gio-2.0 >= $GIO_VERSION gtk+-3.0 >= $GTK_VERSION libsoup-2.4 >= $SOUP_VERSION $SECRET_DEPS])
341
315