[vinagre] Make the GNOME applet optional, closes #580501.

[Jonh Wendell <jwendell src gnome org>]

commit 550ea4a5423aa8ed4165772859f7daa62f2675b0
Author: Jonh Wendell <jwendell gnome org>
Date:   Sat Aug 1 15:59:06 2009 -0300

    Make the GNOME applet optional, closes #580501.
    
    Based on a patch by Romain Perier.

 configure.ac        |   18 +++++++++++++-----
 vinagre/Makefile.am |    4 ++++
 2 files changed, 17 insertions(+), 5 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 8364004..58e6446 100644
--- a/configure.ac
+++ b/configure.ac
@@ -128,11 +128,18 @@ fi
 
 AM_CONDITIONAL(TELEPATHY, test "x$have_telepathy" = "xyes")
 
-
-PKG_CHECK_MODULES(APPLET, \ 
-  libpanelapplet-2.0 >= $PANEL_REQUIRED_VERSION)
-AC_SUBST(APPLET_CFLAGS)
-AC_SUBST(APPLET_LIBS)
+# Enable/disable gnome-panel applet
+AC_ARG_ENABLE(applet,
+              AS_HELP_STRING([--disable-applet], [Do not build the panel applet @<:@default=enabled@:>@]),
+              enable_applet=$enableval,
+              enable_applet=yes)
+
+if test "x$enable_applet" = "xyes";then
+   PKG_CHECK_MODULES(APPLET, libpanelapplet-2.0 >= $PANEL_REQUIRED_VERSION)
+   AC_SUBST(APPLET_CFLAGS)
+   AC_SUBST(APPLET_LIBS)
+fi
+AM_CONDITIONAL(APPLET, test "x$enable_applet" = "xyes")
 
 dnl ================================================================
 dnl GConf related settings
@@ -209,6 +216,7 @@ Configure summary:
 	Compiler Flags .............:  ${CFLAGS}
 
 	Avahi enabled ..............:  ${enable_avahi}
+	GNOME Panel applet..........:  ${enable_applet}
 	Telepathy support ..........:  ${have_telepathy}
 	SSH plugin .................:  ${enable_ssh}
 "
diff --git a/vinagre/Makefile.am b/vinagre/Makefile.am
index 52d4159..4a4beb9 100644
--- a/vinagre/Makefile.am
+++ b/vinagre/Makefile.am
@@ -122,6 +122,8 @@ vinagre_LDADD = \
 
 vinagre_LDFLAGS = -export-dynamic -no-undefined -export-symbols-regex "^[[^_]].*"
 
+if APPLET
+
 ##############################
 # Bonobo .server
 ##############################
@@ -190,6 +192,8 @@ vinagre_applet_LDADD =			\
 	$(NULL)
 vinagre_applet_LDFLAGS = -export-dynamic -no-undefined -export-symbols-regex "^[[^_]].*"
 
+endif
+
 ##############################
 # Autogenerated stuff
 ##############################