[gnote] Fix automagic libpanelappletmm dependency. (Closes #584158)

[Hubert Figuière <hub src gnome org>]

commit 981143cfb7a101c4d2d20bab84a5416c505f486e
Author: Gilles Dartiguelongue <eva gentoo org>
Date:   Thu May 7 22:44:41 2009 +0200

    Fix automagic libpanelappletmm dependency. (Closes #584158)
    
    Signed-off-by: Hubert Figuiere <hub figuiere net>
---
 Makefile.am  |    2 +-
 NEWS         |    2 ++
 configure.ac |   56 ++++++++++++++++++++++++++++++++------------------------
 3 files changed, 35 insertions(+), 25 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 82433b4..c163fff 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -13,7 +13,7 @@ DISTCLEANFILES = intltool-extract \
 
 SUBDIRS = data libtomboy src po help
 
-DISTCHECK_CONFIGURE_FLAGS = --disable-schemas-install --disable-scrollkeeper
+DISTCHECK_CONFIGURE_FLAGS = --disable-schemas-install --disable-scrollkeeper --enable-applet
 
 # Ignore scrollkeeper issues for now.  @#*$& scrollkeeper (from Evince)
 distuninstallcheck_listfiles = find . -type f -print | grep -v scrollkeeper | grep -v /share/gnome/help/ | grep -v \.omf
diff --git a/NEWS b/NEWS
index af730f2..b68400d 100644
--- a/NEWS
+++ b/NEWS
@@ -9,6 +9,8 @@ Fixes:
   * Remove libxml++. (Closes #579292) Possibly closes bug #579316.
   * Some code cleanups.
   * Fix a race condition causing a crash (Closes #584183)
+  * Add --{en,dis}able-applet to configure. (Closes #584158) 
+    (Gilles Dartiguelongue)
 
 Translations:
 
diff --git a/configure.ac b/configure.ac
index 93f7d22..bd59cca 100644
--- a/configure.ac
+++ b/configure.ac
@@ -86,30 +86,38 @@ dnl check for the ext2 uuid library. TODO replace it with something more portabl
 AC_CHECK_HEADER(uuid/uuid.h,,[AC_MSG_ERROR("uuid header is missing")])
 AC_CHECK_LIB(uuid,uuid_unparse_lower, ,[AC_MSG_ERROR("libuuid library is missing")])
 
-PKG_CHECK_EXISTS(libpanelappletmm-2.6 >= $LIBPANELAPPLETMM_VERSION,
-    [
-     AC_DEFINE(HAVE_PANELAPPLETMM, 1, [Define to 1 if panelapplet is available])
-     have_panelapplet="yes"
-     PKG_CHECK_MODULES(LIBPANELAPPLETMM, [libpanelappletmm-2.6 >= $LIBPANELAPPLETMM_VERSION])
-    ],
-    [have_panelapplet="no"]
-)
-
-AM_CONDITIONAL(HAVE_PANELAPPLETMM, test $have_panelapplet == "yes")
-
-#
-# If libpanelapplet available, use it to find .server install location.
-#
-if test "x$prefix" = "x$ac_default_prefix"; then
-   PANELAPPLET_LIBDIR=`$PKG_CONFIG --variable=libdir libpanelapplet-2.0`
-fi
-if test "x$PANELAPPLET_LIBDIR" != "x"; then
-   PANELAPPLET_SERVER_DIR="$PANELAPPLET_LIBDIR/bonobo/servers"
-fi
-# Set PANELAPPLET_SERVER_DIR default if it's not already set
-if test "x$PANELAPPLET_SERVER_DIR" = "x" ; then
-        PANELAPPLET_SERVER_DIR="$libdir/bonobo/servers"
+AC_ARG_ENABLE([applet],
+	AS_HELP_STRING([--disable-applet],[Disable panel applet]),
+	[],[enable_applet=yes])
+
+if test $enable_applet = "yes"; then
+	PKG_CHECK_EXISTS(libpanelappletmm-2.6 >= $LIBPANELAPPLETMM_VERSION,
+	  [
+		AC_DEFINE(HAVE_PANELAPPLETMM, 1, [Define to 1 if panelapplet is available])
+		have_panelapplet="yes"
+		PKG_CHECK_MODULES(LIBPANELAPPLETMM, [libpanelappletmm-2.6 >= $LIBPANELAPPLETMM_VERSION])
+	  ], [
+		have_panelapplet="no"]
+	)
+
+	#
+	# If libpanelapplet available, use it to find .server install location.
+	#
+	if test "x$prefix" = "x$ac_default_prefix"; then
+		PANELAPPLET_LIBDIR=`$PKG_CONFIG --variable=libdir libpanelapplet-2.0`
+	fi
+	if test "x$PANELAPPLET_LIBDIR" != "x"; then
+		PANELAPPLET_SERVER_DIR="$PANELAPPLET_LIBDIR/bonobo/servers"
+	fi
+	# Set PANELAPPLET_SERVER_DIR default if it's not already set
+	if test "x$PANELAPPLET_SERVER_DIR" = "x" ; then
+		PANELAPPLET_SERVER_DIR="$libdir/bonobo/servers"
+	fi
+else
+	have_panelapplet="no"
 fi
+
+AM_CONDITIONAL(HAVE_PANELAPPLETMM, test $have_panelapplet = "yes")
 AC_SUBST(PANELAPPLET_SERVER_DIR)
 
 #
@@ -230,4 +238,4 @@ Options:
   Spellchecking support:       ${FIXED_GTKSPELL}
   GNOME Panel Applet support:  ${have_panelapplet}
 
-"
\ No newline at end of file
+"