Commit 550ea4a5 authored by Jonh Wendell's avatar Jonh Wendell
Browse files

Make the GNOME applet optional, closes #580501.

Based on a patch by Romain Perier.
parent 53951c50
......@@ -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}
"
......@@ -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
##############################
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment