[pan2] remove pgp from menu if not supported

[Heinrich MÃller <henmull src gnome org>]

commit 32d7ef47e955502de77cbb55e89deacab76d3f9f
Author: Heinrich MÃller <henmull src gnome org>
Date:   Mon Jan 9 16:52:43 2012 +0100

    remove pgp from menu if not supported

 README                     |    8 +++++++-
 configure.in               |    5 ++++-
 pan/gui/Makefile.am        |    6 +++---
 pan/gui/pan.cc             |    2 +-
 pan/gui/profiles-dialog.cc |    6 +++++-
 5 files changed, 20 insertions(+), 7 deletions(-)
---
diff --git a/README b/README
index 53a29b0..15088bc 100644
--- a/README
+++ b/README
@@ -34,6 +34,10 @@ REQUIREMENTS
 
     sudo yum install -y <REQUIREMENT>
 
+    On Arch Linux, run the following command to invoke the package manager Pacman:
+
+    sudo pacman -S <REQUIREMENT>
+
 
 THE SALES PITCH
 
@@ -56,6 +60,8 @@ THE SALES PITCH
         * A flexible rules system allows you to delete, hide, download,
           or notify you of, etc. articles that match a subject, or are
           posted by a particular user, and so on.
+        * The same system can be used to define automatic actions on behalf
+          of the user: auto-download, auto-cache, auto-delete etc...
         * Groups can be filtered by regular expression matching
           subscribed/new/all, etc.
 
@@ -76,7 +82,7 @@ THE SALES PITCH
           automatically yEnc-encrypted, threaded and referenced by Pan.
         * Articles can be encrypted and/or signed with a public/private PGP key,
           so your privacy and security are ensured.
-        * Connections can be encrypted with secure TLS 1.0 connections.
+        * Connections can be encrypted with the TLS 1.0 protocol (the successor to SSL 3.0).
 
     The rest of the sales pitch is at <http://pan.rebelbase.com/features/>.
 
diff --git a/configure.in b/configure.in
index 13427ca..f6b321a 100644
--- a/configure.in
+++ b/configure.in
@@ -51,6 +51,7 @@ GMIME26_REQUIRED=2.5.5
 GTK_REQUIRED=2.16.0
 GTK3_REQUIRED=3.0.0
 GTKSPELL_REQUIRED=2.0.7
+ENCHANT_REQUIRED=1.0.6
 GNUTLS_REQUIRED=2.12.10
 LIBNOTIFY_REQUIRED=0.4.1
 LIBGKR_REQUIRED=3.2.2
@@ -101,7 +102,9 @@ AC_ARG_WITH(gtkspell, AC_HELP_STRING([--with-gtkspell], [Enable GtkSpell support
 if test "x$want_gtkspell" = "xyes" ; then
 	PKG_CHECK_MODULES([GTKSPELL], [gtkspell-2.0 >= $GTKSPELL_REQUIRED],
 	                  [gtkspell_msg=yes
-	                  AC_DEFINE(HAVE_GTKSPELL,[1],[Spellcheck Library])],
+	                  AC_DEFINE(HAVE_GTKSPELL,[1],[Spellcheck Library])
+                    PKG_CHECK_MODULES([ENCHANT], [enchant >= $ENCHANT_REQUIRED,[],[])
+	                  ],
 	                  [gtkspell_msg=no
 	                  AC_MSG_RESULT(no)])
 fi
diff --git a/pan/gui/Makefile.am b/pan/gui/Makefile.am
index 9921fc8..0292501 100644
--- a/pan/gui/Makefile.am
+++ b/pan/gui/Makefile.am
@@ -1,4 +1,4 @@
-AM_CPPFLAGS = -I top_srcdir@ @GTKSPELL_CFLAGS@ @GTK_CFLAGS@ @GMIME_CFLAGS@ @GLIB_CFLAGS@ \
+AM_CPPFLAGS = -I top_srcdir@ @GTKSPELL_CFLAGS@ @ENCHANT_CFLAGS@ @GTK_CFLAGS@ @GMIME_CFLAGS@ @GLIB_CFLAGS@ \
 							@GNUTLS_CFLAGS@ @LIBNOTIFY_CFLAGS@ @LIBGNOME_KEYRING_1_CFLAGS@ -DPANLOCALEDIR=\""$(panlocaledir)"\"
 
 noinst_LIBRARIES = libpangui.a
@@ -98,8 +98,8 @@ WINRCOBJ =
 endif
 
 pan_SOURCES = gui.cc pan.cc $(WINRC)
-pan_LDADD = ./libpangui.a $(WINRCOBJ) -lenchant ../data-impl/libpandata.a ../tasks/libtasks.a ../data/libdata.a ../usenet-utils/libusenetutils.a ../general/libgeneralutils.a ../../uulib/libuu.a \
-		@GTKSPELL_LIBS@ @GTK_LIBS@ @GMIME_LIBS@ @GLIB_LIBS@ @GNUTLS_LIBS@ @LIBNOTIFY_LIBS@ @LIBGNOME_KEYRING_1_LIBS@
+pan_LDADD = ./libpangui.a $(WINRCOBJ) ../data-impl/libpandata.a ../tasks/libtasks.a ../data/libdata.a ../usenet-utils/libusenetutils.a ../general/libgeneralutils.a ../../uulib/libuu.a \
+		@GTKSPELL_LIBS@ @ENCHANT_LIBS@ @GTK_LIBS@ @GMIME_LIBS@ @GLIB_LIBS@ @GNUTLS_LIBS@ @LIBNOTIFY_LIBS@ @LIBGNOME_KEYRING_1_LIBS@
 if HAVE_WIN32
 pan_LDFLAGS = -mwindows
 endif
diff --git a/pan/gui/pan.cc b/pan/gui/pan.cc
index ec3c7dc..2ddfcf5 100644
--- a/pan/gui/pan.cc
+++ b/pan/gui/pan.cc
@@ -73,7 +73,7 @@ extern "C" {
   #include <gnome-keyring-1/gnome-keyring-memory.h>
 #endif
 
-//#define DEBUG_LOCALE 1
+#define DEBUG_LOCALE 1
 //#define DEBUG_PARALLEL 1
 
 using namespace pan;
diff --git a/pan/gui/profiles-dialog.cc b/pan/gui/profiles-dialog.cc
index b5df7c2..ec5c348 100644
--- a/pan/gui/profiles-dialog.cc
+++ b/pan/gui/profiles-dialog.cc
@@ -154,7 +154,11 @@ ProfileDialog :: ProfileDialog (const Data         & data,
     HIG :: workarea_add_row (t, &row, _("_Full Name:"), w);
     w = _address_entry = gtk_entry_new ();
     set_entry (w, profile.address);
-    gtk_widget_set_tooltip_text(w, _("Your email address. Note that this has to match your PGP Signature's Address to verify messages correctly."));
+#ifdef HAVE_GMIME_CRYPTO
+    gtk_widget_set_tooltip_text(w, _("Your Email Address.\n"
+                                     "Note that this has to match your PGP Signature's Address\n"
+                                     "if you want to PGP-Sign or Encrypt your messages correctly."));
+#endif
     HIG :: workarea_add_row (t, &row, _("_Email Address:"), w);
     w = _server_combo = make_servers_combo (data, profile.posting_server);
     HIG :: workarea_add_row (t, &row, _("_Post Articles via:"), w);