[vinagre] Overhaul configure script

From: David King <davidk src gnome org>
To: commits-list gnome org
Cc:
Subject: [vinagre] Overhaul configure script
Date: Sun, 6 Mar 2011 22:13:31 +0000 (UTC)
commit e7b4f84e57932af768cde94a0faac82bfb7fcea9
Author: David King <amigadave amigadave com>
Date:   Sun Mar 6 22:48:40 2011 +0100

    Overhaul configure script
    
    Rearrange to recommended standard layout. Use M4sh where possible.
    Enable automake warnings, disable defines and disable standard includes.
    Switch all configure arguments that enable support for external
    libraries to use AC_ARG_WITH, and be automatically enabled by default.
    Prefix all defines from AC_DEFINE macros with 'VINO_'. Drop checking for
    Perl to decide whether to rebuild generated files. Drop configure
    summary. Drop several unused checks for functions and headers.
    
    Additionally, make the minimum adjustments necessary in other files to
    enable the build to succeed.

 Makefile.am                      |    2 +-
 configure.ac                     |  511 ++++++++++++++++----------------------
 data/.gitignore                  |   24 +-
 data/Makefile.am                 |   10 +-
 plugins/Makefile.am              |    6 +-
 plugins/dummy/Makefile.am        |    1 +
 plugins/rdp/Makefile.am          |    1 +
 plugins/reverse-vnc/Makefile.am  |    3 +-
 plugins/spice/Makefile.am        |    1 +
 plugins/ssh/Makefile.am          |    1 +
 plugins/ssh/vinagre-ssh-plugin.c |    4 +-
 plugins/vnc/Makefile.am          |    1 +
 vinagre/Makefile.am              |   28 +--
 vinagre/vinagre-applet.c         |    8 +-
 vinagre/vinagre-connect.c        |    8 +-
 vinagre/vinagre-fav.c            |    6 +-
 vinagre/vinagre-main.c           |   20 +-
 vinagre/vinagre-utils.c          |    4 +-
 vinagre/vinagre-window.c         |    6 +-
 19 files changed, 286 insertions(+), 359 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 2bba2f9..eacb8f7 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -38,7 +38,7 @@ MAINTAINERCLEANFILES = 		\
 	`find "$(srcdir)" -type f -name Makefile.in -print`	\
 	`find "$(topdir)/help" -type f -name *.mo -print`
 
-DISTCHECK_CONFIGURE_FLAGS = --disable-scrollkeeper --disable-applet
+DISTCHECK_CONFIGURE_FLAGS = --disable-scrollkeeper --without-panelapplet
 
 # Copy all the spec files. Of cource, only one is actually used.
 dist-hook:
diff --git a/configure.ac b/configure.ac
index 2f5d0c0..1646ade 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,22 +1,114 @@
-# Vinagre autoconf
-
 AC_PREREQ([2.64])
-AC_INIT([vinagre],[2.91.9],[https://bugzilla.gnome.org/enter_bug.cgi?product=vinagre],[vinagre],[http://projects.gnome.org/vinagre/])
+AC_INIT([Vinagre],[2.91.9],[https://bugzilla.gnome.org/enter_bug.cgi?product=vinagre],[vinagre],[http://projects.gnome.org/vinagre/])
+AC_CONFIG_AUX_DIR([build-aux])
 AC_CONFIG_SRCDIR([vinagre/vinagre-main.c])
 AC_CONFIG_HEADERS([config.h])
+AC_CONFIG_MACRO_DIR([m4])
+
+AM_INIT_AUTOMAKE([1.10 -Wall check-news no-define nostdinc])
+m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
 
 # Checks for programs.
-AC_PROG_CXX
-AC_PROG_AWK
 AC_PROG_CC
-AC_PROG_CPP
-AC_PROG_INSTALL
-AC_PROG_LN_S
-AC_PROG_MAKE_SET
-AC_PROG_RANLIB
+AM_PROG_CC_C_O
 
-# Checks for header files.
-AC_CHECK_HEADERS([sys/uio.h sys/param.h sys/un.h arpa/inet.h stropts.h fcntl.h limits.h locale.h netinet/in.h stdlib.h string.h sys/ioctl.h sys/socket.h termios.h unistd.h utmp.h])
+GNOME_COMPILE_WARNINGS([maximum])
+GNOME_MAINTAINER_MODE_DEFINES
+
+LT_PREREQ([2.2.6])
+LT_INIT([disable-static])
+
+# TODO: Bump before release with GTK+ 3 support.
+# TODO: Use in name of pkg-config file, plugin path and where appropriate.
+AC_SUBST([VINAGRE_API_VERSION], [1.0])
+
+AC_SUBST([PLUGIN_LIBTOOL_FLAGS], ["-module -avoid-version"])
+AC_SUBST([VINAGRE_PLUGINS_DATA_DIR], ["$datadir/vinagre-1/plugins"])
+AC_SUBST([VINAGRE_PLUGINS_LIBS_DIR], ["$libdir/vinagre-1/plugins"])
+
+GLIB_DEPS="glib-2.0 >= 2.25.11 gio-unix-2.0 >= 2.25.11"
+GTHREAD_DEPS="gthread-2.0 >= 2.0.0"
+GTK_DEPS="gtk+-3.0 >= 2.99.3"
+GTK_VNC_DEPS="gtk-vnc-2.0 >= 0.4.3"
+XML2_DEPS="libxml-2.0 >= 2.6.31"
+PEAS_DEPS="libpeas-1.0 >= 0.7.2 libpeas-gtk-1.0 >= 0.7.2"
+
+# Whether to enable support for SSH.
+SSH_DEPS="vte-2.90 >= 0.20 $XML2_DEPS"
+
+AC_ARG_ENABLE([ssh],
+  [AS_HELP_STRING([--disable-ssh],
+    [Disable Secure Shell (SSH) support])])
+
+AS_IF([test "x$enable_ssh" != "xno"],
+  [PKG_CHECK_EXISTS([SSH],
+    [$SSH_DEPS],
+    [have_ssh=yes],
+    [have_ssh=no])],
+  [have_ssh=no])
+
+AS_IF([test "x$have_ssh" = "xyes"],
+  [AC_DEFINE([VINAGRE_ENABLE_SSH], [], [Build with SSH support])
+    AC_PATH_PROG([SSH_PROGRAM], [ssh], [ssh])],
+  [SSH_DEPS=""
+    AS_IF([test "x$enable_ssh" = "xyes"],
+      [AC_MSG_ERROR([SSH support requested but required dependencies not found])])])
+
+AM_CONDITIONAL([VINAGRE_ENABLE_SSH], [test "x$enable_ssh" = "xyes"])
+
+# Whether to enable support for RDP.
+RDP_DEPS="$XML2_DEPS"
+AC_ARG_ENABLE([rdp],
+  [AS_HELP_STRING([--disable-rdp],
+    [Disable Remote Desktop Protocol (RDP) support])])
+
+AS_IF([test "x$enable_rdp" != "xno"],
+  [PKG_CHECK_EXISTS([RDP],
+    [$RDP_DEPS],
+    [have_rdp=yes],
+    [have_rdp=no])],
+  [have_rdp=no])
+
+AS_IF([test "x$have_rdp" = "xyes"],
+  [AC_DEFINE([VINAGRE_ENABLE_RDP], [], [Build with RDP support])
+    AC_PATH_PROG([RDESKTOP_PROGRAM], [rdesktop], [rdesktop])],
+  [RDP_DEPS=""
+    AS_IF([test "x$enable_rdp" = "xyes"],
+      [AC_MSG_ERROR([RDP support requested by required dependencies not found])])])
+
+AM_CONDITIONAL([VINAGRE_ENABLE_RDP], [test "x$enable_rdp" = "xyes"])
+
+# Check for spice.
+SPICE_DEPS="spice-slient-gtk-3.0 >= 0.5"
+
+AC_ARG_ENABLE([spice],
+  [AS_HELP_STRING([--disable-spice],
+    [Disable SPICE protocol support])])
+
+AS_IF([test "x$enable_spice" != "xno"],
+  [PKG_CHECK_MODULES([SPICE],
+    [$SPICE_DEPS],
+    [have_spice=yes],
+    [have_spice=no])],
+  [have_spice=no])
+
+AS_IF([test "x$have_spice" = "xyes"],
+  [AC_DEFINE([VINAGRE_ENABLE_SPICE], [], [Build with spice support])],
+  [SPICE_DEPS=""
+    AS_IF([test "x$enable_spice" = "xyes"],
+    [AC_MSG_ERROR([spice support requested but not found])])])
+
+AM_CONDITIONAL([VINAGRE_ENABLE_SPICE], [test "x$have_spice" = "xyes"])
+
+# Checks for header files. See vinagre/pyt_open.c for usage.
+AC_CHECK_HEADERS([ifaddrs.h sys/un.h stropts.h termios.h utmp.h])
+
+# Internationalization.
+AM_GNU_GETTEXT([external])
+AM_GNU_GETTEXT_VERSION([0.17])
+AC_SUBST([GETTEXT_PACKAGE], [$PACKAGE_TARNAME])
+AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE], ["$GETTEXT_PACKAGE"], [GETTEXT package name])
+IT_PROG_INTLTOOL([0.40.0])
 
 # Checks for typedefs, structures, and compiler characteristics.
 AC_C_INLINE
@@ -25,291 +117,148 @@ AC_TYPE_SIZE_T
 AC_TYPE_SSIZE_T
 AC_TYPE_UINT64_T
 
-# Checks for library functions.
-AC_FUNC_FORK
-AC_FUNC_MALLOC
-AC_CHECK_FUNCS([dup2 memset putenv select setlocale socket strchr strerror strstr getpt posix_openpt grantpt unlockpt ptsname ptsname_r])
+# Checks for library functions. See vinagre/pty_open.c for usage.
+AC_CHECK_FUNCS([getpt posix_openpt grantpt unlockpt ptsname ptsname_r])
 
-AM_INIT_AUTOMAKE([1.10 -Wno-portability])
-LT_PREREQ([2.2.6])
-AC_CONFIG_MACRO_DIR([m4])
-
-GNOME_COMPILE_WARNINGS([maximum])
-GNOME_MAINTAINER_MODE_DEFINES
+AC_SEARCH_LIBS([strerror], [cposix])
 
-VINAGRE_API_VERSION=1.0
-AC_SUBST(VINAGRE_API_VERSION)
+# Check for Avahi.
+AVAHI_DEPS="avahi-ui-gtk3 >= 0.6.26 avahi-gobject >= 0.6.26"
 
-AM_MAINTAINER_MODE
+AC_ARG_WITH([avahi],
+  [AS_HELP_STRING([--without-avahi],
+    [ignore avahi support and disable it])])
 
-# Use the silent-rules feature when possible.
-m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
+AS_IF([test "x$with_avahi" != "xno"],
+  [PKG_CHECK_EXISTS([AVAHI],
+    [$AVAHI_DEPS],
+    [have_avahi=yes],
+    [have_avahi=no])],
+  [have_avahi=no])
 
-dnl make sure we keep ACLOCAL_FLAGS around for maintainer builds to work
-AC_SUBST(ACLOCAL_AMFLAGS, "\${ACLOCAL_FLAGS}")
+AS_IF([test "x$have_avahi" = "xyes"],
+  [AC_DEFINE([VINAGRE_HAVE_AVAHI], [], [Build with avahi support])],
+  [AVAHI_DEPS=""
+    AS_IF([test "x$with_avahi" = "xyes"],
+    [AC_MSG_ERROR([avahi support requested but not found])])])
 
-AC_SEARCH_LIBS([strerror],[cposix])
-AC_PROG_CC
-AC_HEADER_STDC
+AM_CONDITIONAL([VINAGRE_HAVE_AVAHI], [test "x$have_avahi" = "xyes"])
 
-LT_INIT([disable-static])
-AM_PROG_CC_C_O
+# Check for telepathy-glib.
+TELEPATHY_GLIB_DEPS="telepathy-glib >= 0.11.6"
 
-#*******************************************************************************
-# Internationalization
-#*******************************************************************************
-GETTEXT_PACKAGE=vinagre
-AC_SUBST(GETTEXT_PACKAGE)
-AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [GETTEXT package name])
+AC_ARG_WITH([telepathy],
+  [AS_HELP_STRING([--without-telepathy],
+    [ignore the presence of telepathy and disable it])])
 
-IT_PROG_INTLTOOL([0.40.0])
-AM_GLIB_GNU_GETTEXT
+AS_IF([test "x$with_telepathy" != "xno"],
+  [PKG_CHECK_EXISTS([TELEPATHY_GLIB],
+    [$TELEPATHY_GLIB_DEPS],
+    [have_telepathy=yes],
+    [have_telepathy=no])],
+  [have_telepathy=no])
 
-GNOME_DOC_INIT
+AS_IF([test "x$have_telepathy" = "xyes"],
+  [AC_DEFINE([VINAGRE_HAVE_TELEPATHY_GLIB], [], [Build with telepathy-glib support])],
+  [TELEPATHY_GLIB_DEPS=""
+    AS_IF([test "x$with_telepathy" = "xyes"],
+    [AC_MSG_ERROR([telepathy support requested but not found])])])
 
-#*******************************************************************************
-# Check required GNOME libraries
-#*******************************************************************************
-
-GLIB_REQUIRED=2.25.11
-GTK_REQUIRED=2.99.3
-GTHREAD_REQUIRED=2.0.0
-GTK_VNC_REQUIRED=0.4.3
-SPICE_GTK_REQUIRED=0.5
-AVAHI_REQUIRED=0.6.26
-PANEL_REQUIRED_VERSION=2.91.91
-TELEPATHY_GLIB_REQUIRED=0.11.6
-XML_REQUIRED=2.6.31
-VTE_REQUIRED=0.20
-PEAS_REQUIRED=0.7.2
-
-# Check for avahi
-AC_ARG_ENABLE(avahi,
-              AS_HELP_STRING([--disable-avahi],[Do not use avahi for auto-discover machines [default=no]]),
-              enable_avahi=${enableval},
-              enable_avahi=yes)
-
-if test "x$enable_avahi" = "xyes" ; then
-  PKG_CHECK_MODULES(AVAHI,\
-  avahi-ui-gtk3 >= $AVAHI_REQUIRED\
-  avahi-gobject >= $AVAHI_REQUIRED)
-  AC_SUBST(AVAHI_CFLAGS)
-  AC_SUBST(AVAHI_LIBS)
-  AC_DEFINE([VINAGRE_ENABLE_AVAHI],[1],[We want avahi support])
-fi
-AM_CONDITIONAL(AVAHI, test "x$enable_avahi" = "xyes")
-
-PKG_CHECK_MODULES(VINAGRE, \
-  glib-2.0 >= $GLIB_REQUIRED \
-  gio-2.0 >= $GLIB_REQUIRED \
-  gio-unix-2.0 >= $GLIB_REQUIRED \
-  gtk+-3.0 >= $GTK_REQUIRED \
-  gthread-2.0 >= $GTHREAD_REQUIRED \
-  gnome-keyring-1 \
-  libxml-2.0 >= $XML_REQUIRED \
-  libpeas-1.0 >= $PEAS_REQUIRED \
-  libpeas-gtk-1.0 >= $PEAS_REQUIRED
-)
-AC_SUBST(VINAGRE_CFLAGS)
-AC_SUBST(VINAGRE_LIBS)
-
-PKG_CHECK_MODULES(VNC, \
-  gtk-vnc-2.0 >= $GTK_VNC_REQUIRED \
-  gtk+-3.0 >= $GTK_REQUIRED \
-  libxml-2.0 >= $XML_REQUIRED
-)
-AC_SUBST(VNC_CFLAGS)
-AC_SUBST(VNC_LIBS)
-
-dnl ****************************
-dnl *** Checks for pty stuff ***
-dnl ****************************
+AM_CONDITIONAL([VINAGRE_HAVE_TELEPATHY_GLIB], [test "x$have_telepathy" = "xyes"])
 
-# Pull in the right libraries for various functions which might not be
-# bundled into an exploded libc.
-AC_CHECK_FUNC(socketpair,[have_socketpair=1],AC_CHECK_LIB(socket,socketpair,[have_socketpair=1; LIBS="$LIBS -lsocket"]))
-if test x$have_socketpair = x1 ; then
-	AC_DEFINE(HAVE_SOCKETPAIR,1,[Define if you have the socketpair function.])
-fi
-
-AC_SEARCH_LIBS(login_tty, util, [AC_DEFINE([HAVE_LOGIN_TTY],[],[Whether login_tty is available])])
-
-dnl ****************************
-dnl *** Checks for SSH stuff ***
-dnl ****************************
-
-AC_PATH_PROG(SSH_PROGRAM, ssh, "ssh")
-
-AC_ARG_ENABLE(ssh,
-              AS_HELP_STRING([--enable-ssh],
-                             [Enable SSH plugin (default=no)]),
-              enable_ssh=${enableval},
-              enable_ssh=no)
-
-if test "x$enable_ssh" = "xyes" ; then
-  PKG_CHECK_MODULES(SSH,\
-  vte-2.90 >= $VTE_REQUIRED \
-  libxml-2.0 >= $XML_REQUIRED)
-  AC_SUBST(VTE_CFLAGS)
-  AC_SUBST(VTE_LIBS)
-  AC_DEFINE([VINAGRE_ENABLE_SSH],[1],[We want ssh support])
-fi
-AM_CONDITIONAL(SSH, test "x$enable_ssh" = "xyes")
-
-dnl ****************************
-dnl *** Checks for RDP stuff ***
-dnl ****************************
-
-AC_ARG_ENABLE(rdp,
-              AS_HELP_STRING([--enable-rdp],
-                             [Enable RDP plugin (default=yes)]),
-              enable_rdp=${enableval},
-              enable_rdp=yes)
-
-if test "x$enable_rdp" = "xyes" ; then
-  AC_PATH_PROG(RDESKTOP_PROGRAM, rdesktop, "rdesktop")
-  PKG_CHECK_MODULES(RDP,\
-  libxml-2.0 >= $XML_REQUIRED)
-  AC_SUBST(RDP_CFLAGS)
-  AC_SUBST(RDP_LIBS)
-  AC_DEFINE([VINAGRE_ENABLE_RDP],[1],[We want rdp support])
-fi
-AM_CONDITIONAL(RDP, test "x$enable_rdp" = "xyes")
-
-# Check for telepathy
-AC_ARG_ENABLE(telepathy,
-              AS_HELP_STRING([--enable-telepathy=@<:@no/yes/auto@:>@],
-                             [Enable telepathy checking]), ,
-                             enable_telepathy=auto)
-
-if test "x$enable_telepathy" != "xno"; then
-   PKG_CHECK_MODULES(TELEPATHY,
-   [
-      telepathy-glib >= $TELEPATHY_GLIB_REQUIRED
-   ], have_telepathy="yes", have_telepathy="no")
-   if test "x$have_telepathy" = "xyes"; then
-      AC_SUBST(TELEPATHY_CFLAGS)
-      AC_SUBST(TELEPATHY_LIBS)
-      AC_DEFINE(HAVE_TELEPATHY, [], [Define if you have telepathy])
-   fi
-else
-   have_telepathy=no
-fi
-
-if test "x$enable_telepathy" = "xyes" -a "x$have_telepathy" != "xyes"; then
-   AC_MSG_ERROR([Couldn't find telepathy dependencies.])
-fi
-
-AM_CONDITIONAL(TELEPATHY, test "x$have_telepathy" = "xyes")
-
-# Enable/disable gnome-panel applet
+# Check for panelapplet.
 # TODO: Applet needs porting to GTK+ 3 and libpanelapplet-4.0, and is currently
 # broken. Do not enable applet support unless you are a developer who wants to
 # hack on it.
-AC_ARG_ENABLE(applet,
-              AS_HELP_STRING([--enable-applet], [Build the panel applet @<:@default=disabled@:>@]),
-              enable_applet=$enableval,
-              enable_applet=no)
-
-if test "x$enable_applet" = "xyes";then
-   AC_MSG_WARN([Applet support is currently broken!])
-   PKG_CHECK_MODULES(APPLET, libpanelapplet-4.0 >= $PANEL_REQUIRED_VERSION)
-   AC_SUBST(APPLET_CFLAGS)
-   AC_SUBST(APPLET_LIBS)
-fi
-AM_CONDITIONAL(APPLET, test "x$enable_applet" = "xyes")
-
-# Check for spice
-AC_ARG_ENABLE(spice,
-              AS_HELP_STRING([--enable-spice],
-                             [Enable SPICE plugin (default=no)]),
-              enable_spice=${enableval},
-              enable_spice=no)
-
-if test "x$enable_spice" = "xyes" ; then
-  PKG_CHECK_MODULES(SPICE,\
-  spice-client-gtk-3.0 >= $SPICE_GTK_REQUIRED)
-  AC_SUBST(SPICE_CFLAGS)
-  AC_SUBST(SPICE_LIBS)
-  AC_DEFINE([VINAGRE_ENABLE_SPICE],[1],[We want spice support])
-fi
-AM_CONDITIONAL(SPICE, test "x$enable_spice" = "xyes")
+PANELAPPLET_DEPS="libpanelapplet-4.0 >= 2.91.91"
 
-GLIB_GSETTINGS
+AC_ARG_WITH([panelapplet],
+  [AS_HELP_STRING([--with-panelapplet],
+    [enable libpanelapplet support])],
+  [],
+  [with_panelapplet=no])
 
-dnl Check for bind in libsocket (needed on Solaris)
-AC_CHECK_LIB(socket, bind)
-
-dnl define a MAINT-like variable REBUILD which is set
-dnl if Perl, so autogenerated sources can be rebuilt
-AC_PATH_PROGS(PERL, perl5 perl)
-AC_ARG_ENABLE(rebuilds, [  --disable-rebuilds      disable all source autogeneration rules],,enable_rebuilds=yes)
-REBUILD=\#
-if test "x$enable_rebuilds" = "xyes" && \
-     test -n "$PERL" && \
-     $PERL -e 'exit !($] >= 5.002)' > /dev/null 2>&1 ; then
-  REBUILD=
-fi
-AC_SUBST(REBUILD)
-
-# Plugins
-#*******************************************************************************
-#
-dnl ****************************
-dnl *** Checks for ifaddrs.h ***
-dnl ****************************
-AC_CHECK_HEADER(ifaddrs.h)
-AM_CONDITIONAL(SELF_IFADDRS, test "x$ac_cv_header_ifaddrs_h" != "xyes")
-
-dnl RFC2553 introduce sockaddr_storage as ifa_addr member in ifaddrs structure
-dnl Not all distros follow this.
-if test "x$ac_cv_header_ifaddrs_h" = "xyes"; then
-        AC_DEFINE(HAVE_IFADDRS_H, [1], [Define if we have system ifaddrs.h])
-        AC_TRY_COMPILE([
-          #include <ifaddrs.h>
-          #include <net/if.h>
-          ],[
-          struct ifaddrs *myaddrs;
-          getifaddrs (&myaddrs);
-          if (myaddrs->ifa_addr->ss_family == AF_INET) {
-          }
-        ], have_sockaddr_storage=yes, have_sockaddr_storage=no)
-        if test "x$have_sockaddr_storage" = "xyes"; then
-           AC_DEFINE(RFC2553, [], [Define to if follow RFC2553 ])
-        fi
-fi
-
-
-dnl active plugins for org.gnome.Vinagre.gschema.xml
-ACTIVE_PLUGINS="vnc"
-if test "x$enable_ssh" = "xyes" ; then
-ACTIVE_PLUGINS="$ACTIVE_PLUGINS,ssh"
-fi
-AC_SUBST(ACTIVE_PLUGINS)
+AS_IF([test "x$with_panelapplet" != "xno"],
+  [PKG_CHECK_MODULES([PANELAPPLET],
+    [$PANELAPPLET_DEPS],
+    [have_panelapplet=yes],
+    [have_panelapplet=no])],
+  [have_panelapplet=no])
 
-VINAGRE_IMPLIB="-lvinagre-${VINAGRE_API_VERSION}"
-PLUGIN_LIBTOOL_FLAGS="-module -avoid-version"
+AS_IF([test "x$have_panelapplet" = "xyes"],
+  [AC_MSG_WARN([Applet support is currently broken!])],
+  [PANELAPPLET_DEPS=""
+    AS_IF([test "x$with_panelapplet" = "xyes"],
+      [AC_MSG_ERROR([panelapplet support requested but not found])])])
 
-AC_SUBST(VINAGRE_IMPLIB)
-AC_SUBST(PLUGIN_LIBTOOL_FLAGS)
+AM_CONDITIONAL([VINAGRE_HAVE_PANELAPPLET], [test "x$have_panelapplet" = "xyes"])
 
-VINAGRE_PLUGINS_DATA_DIR="$datadir/vinagre-1/plugins"
-AC_SUBST(VINAGRE_PLUGINS_DATA_DIR)
+# Check required libraries
+PKG_CHECK_MODULES([VINAGRE], [$GLIB_DEPS $GTHREAD_DEPS $GTK_DEPS gnome-keyring-1 $XML2_DEPS $PEAS_DEPS $AVAHI_DEPS $TELEPATHY_GLIB_DEPS])
 
-VINAGRE_PLUGINS_LIBS_DIR="$libdir/vinagre-1/plugins"
-AC_SUBST(VINAGRE_PLUGINS_LIBS_DIR)
+PKG_CHECK_MODULES([VNC], [$GTK_VNC_DEPS $GTK_DEPS $XML2_DEPS])
+
+# *** Checks for pty stuff ***
+# Pull in the right libraries for various functions which might not be
+# bundled into an exploded libc.
+AC_CHECK_FUNC([socketpair],
+  [have_socketpair=yes],
+  [AC_CHECK_LIB([socket],
+    [socketpair],
+    [have_socketpair=yes
+      LIBS="$LIBS -lsocket"])])
+
+AS_IF([test "x$have_socketpair" = "xyes"],
+  [AC_DEFINE([VINAGRE_HAVE_SOCKETPAIR], [], [Define if you have the socketpair function.])])
+
+AC_SEARCH_LIBS([login_tty],
+  [util],
+  [AC_DEFINE([HAVE_LOGIN_TTY], [], [Whether login_tty is available])])
+
+# Check for bind in libsocket (needed on Solaris)
+AC_CHECK_LIB([socket], [bind])
+
+# Check for getifaddrs
+AM_CONDITIONAL([VINAGRE_HAVE_SELF_IFADDRS], [test "x$ac_cv_header_ifaddrs_h" != "xyes"])
+
+# RFC2553 introduce sockaddr_storage as ifa_addr member in ifaddrs structure
+# Not all distros follow this.
+AS_IF([test "x$ac_cv_header_ifaddrs_h" = "xyes"],
+  [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
+    #include <net/if.h>
+    #include <ifaddrs.h>
+    ]], [[
+    struct ifaddrs *myaddrs;
+    getifaddrs (&myaddrs);
+    if (myaddrs->ifa_addr->ss_family == AF_INET) {
+    }
+    ]])],
+    [have_sockaddr_storage=yes],
+    [have_sockaddr_storage=no])],
+  [AS_IF([test "x$have_sockaddr_storage" = "xyes"],
+    [AC_DEFINE([RFC2553], [], [Define if RFC2553 is followed])])])
+
+# Active plugins for org.gnome.Vinagre.gschema.xml
+# TODO: Make this work.
+ACTIVE_PLUGINS="vnc"
+AS_IF([test "x$enable_ssh" = "xyes"],
+  [ACTIVE_PLUGINS="$ACTIVE_PLUGINS,ssh"])
+AC_SUBST([ACTIVE_PLUGINS])
 
 # Introspection
 GOBJECT_INTROSPECTION_CHECK([0.9.3])
 
-if test "$found_introspection" = "yes"; then
-	enable_introspection=yes
-	AC_DEFINE([ENABLE_INTROSPECTION], [1], [Define to enable GObject Introspection])
-else
-	enable_introspection=no
-fi
+AS_IF([test "x$found_introspection" = "xyes"],
+  [enable_introspection=yes
+    AC_DEFINE([VINAGRE_HAVE_INTROSPECTION], [], [Build with GObject Introspection support])],
+  [enable_introspection=no])
+
+AM_CONDITIONAL([VINAGRE_HAVE_INTROSPECTION], [test "x$enable_introspection" = "xyes"])
+
+GNOME_DOC_INIT
+
+GLIB_GSETTINGS
 
-#*******************************************************************************
 AC_CONFIG_FILES([
 Makefile
 data/Makefile
@@ -330,23 +279,3 @@ vinagre/Makefile
 vinagre/view/Makefile
 ])
 AC_OUTPUT
-
-#*******************************************************************************
-
-echo "
-
-This is vinagre version AC_PACKAGE_VERSION
-
-Configure summary:
-
-	Compiler ...................:  ${CC}
-	Compiler Flags .............:  ${CFLAGS}
-	GObject Introspection.......:  $enable_introspection
-
-	Avahi enabled ..............:  ${enable_avahi}
-	GNOME Panel applet..........:  ${enable_applet}
-	Telepathy support ..........:  ${have_telepathy}
-	SSH plugin .................:  ${enable_ssh}
-	RDP plugin .................:  ${enable_rdp}
-	Spice plugin ...............:  ${enable_spice}
-"
diff --git a/data/.gitignore b/data/.gitignore
index cf60c54..30d37ca 100644
--- a/data/.gitignore
+++ b/data/.gitignore
@@ -1,32 +1,32 @@
-/*.bak
-/*.lo
-/*.o
-/*.orig
-/*.rej
-/*.tab.c
 /*~
-/.*.sw[nop]
+/*.bak
 /.deps
 /.gitignore
-/.libs
 /GPATH
 /GRTAGS
 /GSYMS
 /GTAGS
 /ID
+/_libs
+/.libs
+/*.lo
 /Makefile
 /Makefile.in
-/TAGS
-/_libs
+/*.o
 /org.freedesktop.Telepathy.Client.Vinagre.service
 /org.gnome.Vinagre.gschema.valid
 /org.gnome.Vinagre.gschema.xml
+/*.orig
+/*.rej
 /so_locations
+/.*.sw[nop]
+/*.tab.c
 /tags
+/TAGS
 /vinagre-1.0.pc
+/vinagre.desktop
+/vinagre.desktop.in
 /vinagre-file.desktop
 /vinagre-file.desktop.in
 /vinagre-mime.xml
-/vinagre.desktop
-/vinagre.desktop.in
 /vinagre.pc
diff --git a/data/Makefile.am b/data/Makefile.am
index 0e90f5c..7c94144 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -23,11 +23,11 @@ mime_DATA = vinagre-mime.xml
 
 gsettings_in_file = org.gnome.Vinagre.gschema.xml.in
 gsettings_SCHEMAS = $(gsettings_in_file:.xml.in=.xml)
-# @INTLTOOL_XML_NOMERGE_RULE@ # This rule is overriden by the above
-                              # INTLTOOL_XML_RULE macro.
+# @INTLTOOL_XML_NOMERGE_RULE@
+# This rule is overriden by the above INTLTOOL_XML_RULE macro.
 # Here is the workaround. Could break if intltools changes arguments.
 $(gsettings_SCHEMAS): $(gsettings_in_file)
-	$(INTLTOOL_MERGE) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u /tmp $< [$]@
+	$(INTLTOOL_MERGE) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u /tmp $< $@
 
 @GSETTINGS_RULES@
 
@@ -52,8 +52,7 @@ EXTRA_DIST = \
 	Vinagre.client \
 	org.freedesktop.Telepathy.Client.Vinagre.service.in
 
-if TELEPATHY
-
+if VINAGRE_HAVE_TELEPATHY_GLIB
 clientfiledir = $(datarootdir)/telepathy/clients
 clientfile_DATA = Vinagre.client
 
@@ -63,7 +62,6 @@ service_DATA = org.freedesktop.Telepathy.Client.Vinagre.service
 org.freedesktop.Telepathy.Client.Vinagre.service: org.freedesktop.Telepathy.Client.Vinagre.service.in \
 		Makefile
 	$(AM_V_GEN)sed -e "s|[ ]bindir[@]|$(bindir)|" $< > $@
-
 endif
 
 UPDATE_MIME = \
diff --git a/plugins/Makefile.am b/plugins/Makefile.am
index bcf40af..9c03e12 100644
--- a/plugins/Makefile.am
+++ b/plugins/Makefile.am
@@ -15,15 +15,15 @@ SUBDIRS =					\
 	vnc					\
 	$(NULL)
 
-if RDP
+if VINAGRE_ENABLE_RDP
 SUBDIRS += rdp
 endif
 
-if SPICE
+if VINAGRE_ENABLE_SPICE
 SUBDIRS += spice
 endif
 
-if SSH
+if VINAGRE_ENABLE_SSH
 SUBDIRS += ssh
 endif
 
diff --git a/plugins/dummy/Makefile.am b/plugins/dummy/Makefile.am
index 652fd74..8ba3d3c 100644
--- a/plugins/dummy/Makefile.am
+++ b/plugins/dummy/Makefile.am
@@ -3,6 +3,7 @@ plugindir = $(VINAGRE_PLUGINS_LIBS_DIR)
 
 INCLUDES = \
 	-I$(top_srcdir) 				\
+	-I$(top_builddir) \
 	$(VINAGRE_CFLAGS) 				\
 	$(WARN_CFLAGS)					\
 	$(DISABLE_DEPRECATED_CFLAGS)	
diff --git a/plugins/rdp/Makefile.am b/plugins/rdp/Makefile.am
index ea6308c..50e9573 100644
--- a/plugins/rdp/Makefile.am
+++ b/plugins/rdp/Makefile.am
@@ -3,6 +3,7 @@ plugindir = $(VINAGRE_PLUGINS_LIBS_DIR)
 
 INCLUDES = \
 	-I$(top_srcdir) 				\
+	-I$(top_builddir) \
 	$(VINAGRE_CFLAGS) 				\
 	$(WARN_CFLAGS)					\
 	$(DISABLE_DEPRECATED_CFLAGS)	
diff --git a/plugins/reverse-vnc/Makefile.am b/plugins/reverse-vnc/Makefile.am
index c0acc93..e70601b 100644
--- a/plugins/reverse-vnc/Makefile.am
+++ b/plugins/reverse-vnc/Makefile.am
@@ -3,6 +3,7 @@ plugindir = $(VINAGRE_PLUGINS_LIBS_DIR)
 
 INCLUDES = \
 	-DDATADIR=\"$(VINAGRE_PLUGINS_DATA_DIR)/reverse-vnc\"	\
+	-I$(top_builddir) \
 	-I$(top_srcdir) 					\
 	$(VINAGRE_CFLAGS)					\
 	$(WARN_CFLAGS)						\
@@ -15,7 +16,7 @@ libreversevnc_la_SOURCES = 						\
 	vinagre-reverse-vnc-listener.h vinagre-reverse-vnc-listener.c	\
 	vinagre-reverse-vnc-listener-dialog.h vinagre-reverse-vnc-listener-dialog.c
 
-if SELF_IFADDRS
+if VINAGRE_HAVE_SELF_IFADDRS
 libreversevnc_la_SOURCES += if/ifaddrs.h if/getifaddrs.c
 endif
 
diff --git a/plugins/spice/Makefile.am b/plugins/spice/Makefile.am
index 36b3afa..70c483c 100644
--- a/plugins/spice/Makefile.am
+++ b/plugins/spice/Makefile.am
@@ -4,6 +4,7 @@ plugindir = $(VINAGRE_PLUGINS_LIBS_DIR)
 NULL =
 INCLUDES =					\
 	-I$(top_srcdir)				\
+	-I$(top_builddir) \
 	$(DISABLE_DEPRECATED_CFLAGS)		\
 	$(SPICE_CFLAGS)				\
 	$(VINAGRE_CFLAGS)			\
diff --git a/plugins/ssh/Makefile.am b/plugins/ssh/Makefile.am
index a0af68f..e364068 100644
--- a/plugins/ssh/Makefile.am
+++ b/plugins/ssh/Makefile.am
@@ -3,6 +3,7 @@ plugindir = $(VINAGRE_PLUGINS_LIBS_DIR)
 
 INCLUDES = \
 	-I$(top_srcdir)		\
+	-I$(top_builddir) \
 	$(SSH_CFLAGS) 		\
 	$(WARN_CFLAGS)		\
 	$(VINAGRE_CFLAGS)	\
diff --git a/plugins/ssh/vinagre-ssh-plugin.c b/plugins/ssh/vinagre-ssh-plugin.c
index 03084d7..20d8931 100644
--- a/plugins/ssh/vinagre-ssh-plugin.c
+++ b/plugins/ssh/vinagre-ssh-plugin.c
@@ -32,7 +32,7 @@
 #include "vinagre-ssh-connection.h"
 #include "vinagre-ssh-tab.h"
 
-#ifdef VINAGRE_ENABLE_AVAHI
+#ifdef VINAGRE_HAVE_AVAHI
 #include <avahi-ui/avahi-ui.h>
 #include <avahi-common/malloc.h>
 #endif
@@ -135,7 +135,7 @@ ssh_parse_mdns_dialog (VinagreProtocol *plugin,
 		       GtkWidget *connect_widget,
 		       GtkWidget *dialog)
 {
-#ifdef VINAGRE_ENABLE_AVAHI
+#ifdef VINAGRE_HAVE_AVAHI
   const AvahiStringList *txt;
   gchar *u = NULL;
 
diff --git a/plugins/vnc/Makefile.am b/plugins/vnc/Makefile.am
index b026abb..36f763b 100644
--- a/plugins/vnc/Makefile.am
+++ b/plugins/vnc/Makefile.am
@@ -3,6 +3,7 @@ plugindir = $(VINAGRE_PLUGINS_LIBS_DIR)
 
 INCLUDES = \
 	-I$(top_srcdir) 	\
+	-I$(top_builddir) \
 	$(VINAGRE_CFLAGS)	\
 	$(VNC_CFLAGS) 		\
 	$(WARN_CFLAGS)		\
diff --git a/vinagre/Makefile.am b/vinagre/Makefile.am
index d5277fc..c21366e 100644
--- a/vinagre/Makefile.am
+++ b/vinagre/Makefile.am
@@ -3,6 +3,8 @@ SUBDIRS = view
 NULL = 
 
 INCLUDES = 						\
+	-I$(top_builddir) \
+	-I$(top_builddir)/vinagre \
 	-DBINDIR=\"$(bindir)\"			 	\
 	-DDATADIR=\"$(datadir)\"			\
 	-DPREFIX=\""$(prefix)"\" 			\
@@ -12,7 +14,6 @@ INCLUDES = 						\
 	-DPACKAGE_LOCALE_DIR=\""$(datadir)/locale"\"	\
 	-DSSH_PROGRAM=\"$(SSH_PROGRAM)\"		\
 	$(VINAGRE_CFLAGS)				\
-	$(AVAHI_CFLAGS)					\
 	$(INTROSPECTION_CFLAGS)				\
 	$(NULL)
 
@@ -98,7 +99,7 @@ libvinagre_la_SOURCES = \
   $(INST_H_FILES) \
   $(NULL)
 
-if AVAHI
+if VINAGRE_HAVE_AVAHI
 libvinagre_la_SOURCES += vinagre-mdns.h vinagre-mdns.c
 endif
 
@@ -122,14 +123,13 @@ vinagre_SOURCES = \
 vinagre_LDADD = \
 	libvinagre.la \
 	$(VINAGRE_LIBS)		\
-	$(AVAHI_LIBS)		\
 	$(GTKVNC_LIBS)		\
 	$(INTROSPECTION_LIBS)	\
 	$(NULL)
 
 vinagre_LDFLAGS = -export-dynamic -no-undefined -export-symbols-regex "^[[^_]].*"
 
-if APPLET
+if VINAGRE_HAVE_PANELAPPLET
 
 ##############################
 # Bonobo .server
@@ -154,8 +154,7 @@ $(server_in_files): $(server_in_files:.server.in=.server.in.in)
 libexec_PROGRAMS = vinagre-applet
 
 vinagre_applet_CFLAGS =			\
-	$(APPLET_CFLAGS)		\
-	$(AVAHI_CFLAGS)			\
+	$(PANELAPPLET_CFLAGS)		\
 	$(NULL)
 
 vinagre_applet_SOURCES =					\
@@ -186,15 +185,14 @@ vinagre_applet_SOURCES =					\
 	vinagre-plugins-engine.h vinagre-plugins-engine.c \
 	$(NULL)
 
-if AVAHI
+if VINAGRE_HAVE_AVAHI
 vinagre_applet_SOURCES += vinagre-mdns.h vinagre-mdns.c
 endif
 
 vinagre_applet_LDADD =			\
 	view/libview.la			\
-	$(APPLET_LIBS)			\
+	$(PANELAPPLET_LIBS)			\
 	$(VINAGRE_LIBS)			\
-	$(AVAHI_LIBS)			\
 	$(NULL)
 vinagre_applet_LDFLAGS = -export-dynamic -no-undefined -export-symbols-regex "^[[^_]].*"
 
@@ -208,7 +206,7 @@ vinagre_enum_headers = \
 	$(top_srcdir)/vinagre/vinagre-connection.h \
 	$(NULL)
 
-vinagre-enums.c: @REBUILD@ $(vinagre_enum_headers)
+vinagre-enums.c: $(vinagre_enum_headers)
 	$(AM_V_GEN)glib-mkenums    --fhead "#include <glib-object.h>\n" \
 			--fhead "#include \"vinagre-enums.h\"\n\n" \
 			--fprod "\n/* enumerations from \"@filename \" */" \
@@ -223,7 +221,7 @@ vinagre-enums.c: @REBUILD@ $(vinagre_enum_headers)
 			--vtail "  return type;\n}\n\n" \
 		$(vinagre_enum_headers) > $@
 
-vinagre-enums.h: @REBUILD@ $(vinagre_enum_headers)
+vinagre-enums.h: $(vinagre_enum_headers)
 	$(AM_V_GEN)glib-mkenums    --fhead "#ifndef __VINAGRE_ENUMS_H__\n" \
 			--fhead "#define __VINAGRE_ENUMS_H__ 1\n\n" \
 			--fhead "G_BEGIN_DECLS\n\n" \
@@ -264,21 +262,17 @@ BUILT_SOURCES = \
 # Telepathy stuff
 ##############################
 
-if TELEPATHY
-
-INCLUDES += $(TELEPATHY_CFLAGS)
-vinagre_LDADD += $(TELEPATHY_LIBS)
+if VINAGRE_HAVE_TELEPATHY_GLIB
 handwritten_sources += \
 	vinagre-tubes-manager.c vinagre-tubes-manager.h		\
 	vinagre-tube-handler.c vinagre-tube-handler.h		\
 	$(NULL)
 INTROSPECTION_GIR_INCLUDES += TelepathyGLib-0.12
-
 endif
 
 CLEANFILES =
 
-if HAVE_INTROSPECTION
+if VINAGRE_HAVE_INTROSPECTION
 -include $(INTROSPECTION_MAKEFILE)
 INTROSPECTION_GIRS = Vinagre-3.0.gir
 
diff --git a/vinagre/vinagre-applet.c b/vinagre/vinagre-applet.c
index a270448..296b4b7 100644
--- a/vinagre/vinagre-applet.c
+++ b/vinagre/vinagre-applet.c
@@ -34,7 +34,7 @@
 
 #include <config.h>
 
-#ifdef VINAGRE_ENABLE_AVAHI
+#ifdef VINAGRE_HAVE_AVAHI
 #include "vinagre-mdns.h"
 #endif
 
@@ -382,7 +382,7 @@ vinagre_applet_click_cb (GtkWidget      *applet,
   all = vinagre_bookmarks_get_all (vinagre_bookmarks_get_default ());
   fill_menu (all, menu);
 
-#ifdef VINAGRE_ENABLE_AVAHI
+#ifdef VINAGRE_HAVE_AVAHI
   all = vinagre_mdns_get_all (vinagre_mdns_get_default ());
   fill_menu (all, menu);
 #endif
@@ -414,7 +414,7 @@ static void
 vinagre_applet_init (VinagreApplet *applet)
 {
   gchar *tmp;
-#ifdef VINAGRE_ENABLE_AVAHI
+#ifdef VINAGRE_HAVE_AVAHI
   VinagreMdns *mdns;
 #endif
 
@@ -457,7 +457,7 @@ vinagre_applet_init (VinagreApplet *applet)
   g_signal_connect (G_OBJECT (applet), "destroy",
 		    G_CALLBACK (vinagre_applet_destroy_cb), NULL);
 
-#ifdef VINAGRE_ENABLE_AVAHI
+#ifdef VINAGRE_HAVE_AVAHI
   mdns = vinagre_mdns_get_default ();
 #endif
 }
diff --git a/vinagre/vinagre-connect.c b/vinagre/vinagre-connect.c
index bfe58c3..5162f88 100644
--- a/vinagre/vinagre-connect.c
+++ b/vinagre/vinagre-connect.c
@@ -27,7 +27,7 @@
 #include <gtk/gtk.h>
 #include <string.h>
 
-#ifdef VINAGRE_ENABLE_AVAHI
+#ifdef VINAGRE_HAVE_AVAHI
 #include <avahi-ui/avahi-ui.h>
 #endif
 
@@ -101,7 +101,7 @@ protocol_combo_changed (GtkComboBox *combo, VinagreConnectDialog *dialog)
   gtk_label_set_label (GTK_LABEL (dialog->protocol_description_label),
 		       description);
 
-#ifdef VINAGRE_ENABLE_AVAHI
+#ifdef VINAGRE_HAVE_AVAHI
   if (service)
     gtk_widget_show (dialog->find_button);
   else
@@ -320,7 +320,7 @@ save_history (GtkWidget *combo) {
   }
 }
 
-#ifdef VINAGRE_ENABLE_AVAHI
+#ifdef VINAGRE_HAVE_AVAHI
 static void
 vinagre_connect_find_button_cb (GtkButton            *button,
 				VinagreConnectDialog *dialog)
@@ -422,7 +422,7 @@ vinagre_connect (VinagreWindow *window)
   gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (dialog.fullscreen_check),
 				vinagre_cache_prefs_get_boolean ("connection", "fullscreen", FALSE));
 
-#ifdef VINAGRE_ENABLE_AVAHI
+#ifdef VINAGRE_HAVE_AVAHI
   g_signal_connect (dialog.find_button,
 		    "clicked",
 		    G_CALLBACK (vinagre_connect_find_button_cb),
diff --git a/vinagre/vinagre-fav.c b/vinagre/vinagre-fav.c
index 0e55246..537259c 100644
--- a/vinagre/vinagre-fav.c
+++ b/vinagre/vinagre-fav.c
@@ -33,7 +33,7 @@
 #include "vinagre-plugins-engine.h"
 #include "vinagre-commands.h"
 
-#ifdef VINAGRE_ENABLE_AVAHI
+#ifdef VINAGRE_HAVE_AVAHI
 #include "vinagre-mdns.h"
 #endif
 
@@ -909,7 +909,7 @@ vinagre_fav_constructed (GObject *object)
                             "changed",
                             G_CALLBACK (vinagre_fav_update_list),
                             fav);
-#ifdef VINAGRE_ENABLE_AVAHI
+#ifdef VINAGRE_HAVE_AVAHI
   g_signal_connect_swapped (vinagre_mdns_get_default (),
                             "changed",
                             G_CALLBACK (vinagre_fav_update_list),
@@ -1057,7 +1057,7 @@ vinagre_fav_update_list (VinagreFav *fav)
 
   vinagre_fav_fill_bookmarks (store, list, NULL, FALSE);
 
-#ifdef VINAGRE_ENABLE_AVAHI
+#ifdef VINAGRE_HAVE_AVAHI
   list = vinagre_mdns_get_all (vinagre_mdns_get_default ());
   if (!list)
     return FALSE;
diff --git a/vinagre/vinagre-main.c b/vinagre/vinagre-main.c
index acf5650..134a190 100644
--- a/vinagre/vinagre-main.c
+++ b/vinagre/vinagre-main.c
@@ -22,7 +22,7 @@
 #include <config.h>
 #endif
 
-#ifdef ENABLE_INTROSPECTION
+#ifdef VINAGRE_HAVE_INTROSPECTION
 #include <girepository.h>
 #endif
 
@@ -39,11 +39,11 @@
 #include "vinagre-options.h"
 #include "vinagre-plugins-engine.h"
 
-#ifdef HAVE_TELEPATHY
+#ifdef VINAGRE_HAVE_TELEPATHY_GLIB
 #include "vinagre-tubes-manager.h"
 #endif
 
-#ifdef VINAGRE_ENABLE_AVAHI
+#ifdef VINAGRE_HAVE_AVAHI
 #include "vinagre-mdns.h"
 #endif
 
@@ -51,7 +51,7 @@ static gboolean startup_called = FALSE;
 static GtkWindow *window = NULL;
 static GOptionContext *context = NULL;
 
-#ifdef HAVE_TELEPATHY
+#ifdef VINAGRE_HAVE_TELEPATHY_GLIB
 static VinagreTubesManager *vinagre_tubes_manager = NULL;
 #endif
 
@@ -69,7 +69,7 @@ app_init (GtkApplication *app)
 
   vinagre_utils_handle_debug ();
 
-#ifdef HAVE_TELEPATHY
+#ifdef VINAGRE_HAVE_TELEPATHY_GLIB
   vinagre_tubes_manager = vinagre_tubes_manager_new (VINAGRE_WINDOW (window));
 #endif
 
@@ -142,7 +142,7 @@ int main (int argc, char **argv) {
   g_option_context_set_translation_domain(context, GETTEXT_PACKAGE);
   g_option_context_add_group (context, gtk_get_option_group (TRUE));
 
-#ifdef ENABLE_INTROSPECTION
+#ifdef VINAGRE_HAVE_INTROSPECTION
   g_option_context_add_group (context, g_irepository_get_option_group ());
 #endif
 
@@ -174,17 +174,17 @@ int main (int argc, char **argv) {
 
   if (res == 0)
     {
-      #ifdef HAVE_TELEPATHY
+#ifdef VINAGRE_HAVE_TELEPATHY_GLIB
 	g_object_unref (vinagre_tubes_manager);
-      #endif
+#endif
 
       g_object_unref (vinagre_bookmarks_get_default ());
       g_object_unref (vinagre_prefs_get_default ());
       vinagre_cache_prefs_finalize ();
 
-    #ifdef VINAGRE_ENABLE_AVAHI
+#ifdef VINAGRE_HAVE_AVAHI
 	g_object_unref (vinagre_mdns_get_default ());
-    #endif
+#endif
     }
 
   g_object_unref (app);
diff --git a/vinagre/vinagre-utils.c b/vinagre/vinagre-utils.c
index 9f122e7..ff587c5 100644
--- a/vinagre/vinagre-utils.c
+++ b/vinagre/vinagre-utils.c
@@ -314,8 +314,8 @@ vinagre_utils_help_about (GtkWindow *window)
 			 "wrap-license", TRUE,
 			 "logo-icon-name", "vinagre",
 			 "translator-credits", _("translator-credits"),
-			 "version", VERSION,
-			 "website", "http://projects.gnome.org/vinagre/";,
+			 "version", PACKAGE_VERSION,
+			 "website", PACKAGE_URL,
 			 "website-label", _("Vinagre Website"),
 			 NULL);
   g_free (license_trans);
diff --git a/vinagre/vinagre-window.c b/vinagre/vinagre-window.c
index 31fef8a..6615173 100644
--- a/vinagre/vinagre-window.c
+++ b/vinagre/vinagre-window.c
@@ -45,7 +45,7 @@
 #include "vinagre-plugins-engine.h"
 #include "vinagre-dirs.h"
 
-#ifdef VINAGRE_ENABLE_AVAHI
+#ifdef VINAGRE_HAVE_AVAHI
 #include "vinagre-mdns.h"
 #endif
 
@@ -616,7 +616,7 @@ vinagre_window_update_bookmarks_list_menu (VinagreWindow *window)
 
   favs = vinagre_bookmarks_get_all (vinagre_bookmarks_get_default ());
 
-#ifdef VINAGRE_ENABLE_AVAHI
+#ifdef VINAGRE_HAVE_AVAHI
   mdnss = vinagre_mdns_get_all (vinagre_mdns_get_default ());
 #endif
 
@@ -829,7 +829,7 @@ vinagre_window_init (VinagreWindow *window)
                             "changed",
                             G_CALLBACK (vinagre_window_update_bookmarks_list_menu),
                             window);
-#ifdef VINAGRE_ENABLE_AVAHI
+#ifdef VINAGRE_HAVE_AVAHI
   g_signal_connect_swapped (vinagre_mdns_get_default (),
                             "changed",
                             G_CALLBACK (vinagre_window_update_bookmarks_list_menu),
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]