X-Git-Url: http://git.madism.org/?a=blobdiff_plain;f=main.c;h=9f174a6d643966132acceb47c1e16bb6c073fbae;hb=c8becc4d099cee8c18ebd967720ce7204311d817;hp=090c9135390898c51170f696750911139ebb94d3;hpb=338946f4597bd0f4bc2510a4fef1527f2d526c23;p=apps%2Fmadmutt.git

diff --git a/main.c b/main.c
index 090c913..9f174a6 100644
--- a/main.c
+++ b/main.c
@@ -71,7 +71,7 @@
 #endif
 
 #ifdef CRYPT_BACKEND_GPGME
-#include <gpgme/gpgme.h>
+#include <gpgme.h>
 #endif
 
 static const char *ReachingUs = N_("\
@@ -114,7 +114,7 @@ fixes, and suggestions.\n\
 \n\
     You should have received a copy of the GNU General Public License\n\
     along with this program; if not, write to the Free Software\n\
-    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.\n\
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.\n\
 ");
 
 void mutt_exit (int code)
@@ -322,11 +322,6 @@ static void show_version (void)
 #else
          "-USE_SASL  "
 #endif
-#ifdef USE_SASL2
-         "+USE_SASL2  "
-#else
-         "-USE_SASL2  "
-#endif
 #ifdef USE_LIBESMTP
          "+USE_LIBESMTP  "
 #else
@@ -484,6 +479,7 @@ static void show_version (void)
   printf ("  +SENDMAIL=\"%s\"\n", SENDMAIL);
   printf ("  +MAILPATH=\"%s\"\n", MAILPATH);
   printf ("  +PKGDATADIR=\"%s\"\n", PKGDATADIR);
+  printf ("  +PKGDOCDIR=\"%s\"\n", PKGDOCDIR);
   printf ("  +SYSCONFDIR=\"%s\"\n", SYSCONFDIR);
   printf ("  +EXECSHELL=\"%s\"\n", EXECSHELL);
 #ifdef MIXMASTER