From 24ecaf67a8dcf80de05f86dd8ee7b11dad0ead69 Mon Sep 17 00:00:00 2001 From: pdmef Date: Wed, 16 Mar 2005 05:17:34 +0000 Subject: [PATCH] Rocco Rutte: merged in latest mutt changes git-svn-id: svn://svn.berlios.de/mutt-ng/trunk@182 e385b8ad-14ed-0310-8656-cc95a2468c6d --- ChangeLog | 21 ++++++++++++++++++++- configure.in | 9 +++++++-- crypthash.h | 8 -------- doc/Makefile.in | 5 +++-- hcache.c | 3 +++ 5 files changed, 33 insertions(+), 13 deletions(-) diff --git a/ChangeLog b/ChangeLog index 637290b..7ba5847 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,22 @@ +2005-03-16 02:49:33 Brendan Cully (brendan) + + * configure.in, doc/Makefile.in, hcache.c, Makefile.am: Various + cygwin portability fixes + +2005-03-15 04:40:40 Brendan Cully (brendan) + + * crypthash.h: Don't define uint32_t anywhere but in + config.h. Spotted by Alain Bench. + +2005-03-13 16:35:35 roessler (roessler) + + * po/sv.po, po/tr.po, po/uk.po, po/zh_CN.po, po/zh_TW.po, + po/id.po, po/it.po, po/ja.po, po/ko.po, po/lt.po, po/nl.po, + po/pl.po, po/pt_BR.po, po/ru.po, po/sk.po, VERSION, po/bg.po, + po/ca.po, po/cs.po, po/da.po, po/de.po, po/el.po, po/eo.po, + po/es.po, po/et.po, po/fr.po, po/gl.po, po/hu.po, reldate.h: + automatic post-release commit for mutt-1.5.9 + 2005-03-13 16:29:09 Morten Bo Johansen (roessler) * po/da.po: update @@ -330,7 +349,7 @@ 2005-01-29 19:15:07 Thomas Glanzmann (roessler) * hcache.c: - make hcache.c conform to mutt codingstyle - - use $Id: ChangeLog,v 3.406 2005/03/13 16:29:39 roessler Exp $ CVS keyword instead of %K% BitKeeper keyword + - use $Id: ChangeLog,v 3.408 2005/03/16 02:50:44 brendan Exp $ CVS keyword instead of %K% BitKeeper keyword 2005-01-29 19:15:07 Thomas Glanzmann (roessler) diff --git a/configure.in b/configure.in index 29358ec..2d0de78 100644 --- a/configure.in +++ b/configure.in @@ -131,7 +131,7 @@ else if test x$have_pgp != xno ; then AC_DEFINE(CRYPT_BACKEND_CLASSIC_PGP,1, [ Define if you want classic PGP support. ]) - PGPAUX_TARGET="pgpringng pgpewrapng" + PGPAUX_TARGET="pgpringng\$(EXEEXT) pgpewrapng\$(EXEEXT)" MUTT_LIB_OBJECTS="$MUTT_LIB_OBJECTS pgp.o pgpinvoke.o pgpkey.o pgplib.o gnupgparse.o pgpmicalg.o pgppacket.o crypt-mod-pgp-classic.o" fi @@ -835,8 +835,13 @@ AC_ARG_ENABLE(hcache, AC_HELP_STRING([--enable-hcache], [Enable header caching]) AC_TRY_LINK([#include ],[gdbm_open(0,0,0,0,0);],[ac_cv_gdbmopen=yes]) fi done + if test x$ac_cv_gdbmopen = xyes; then + AC_MSG_RESULT(yes) + else + AC_MSG_RESULT(no) + fi fi - + ac_bdb_prefix=yes AC_ARG_WITH(bdb, AC_HELP_STRING([--with-bdb[=DIR]], [Use BerkeleyDB4 if gdbm is not available ]), ac_bdb_prefix=$withval) diff --git a/crypthash.h b/crypthash.h index d8e3a57..0d1eded 100644 --- a/crypthash.h +++ b/crypthash.h @@ -14,12 +14,4 @@ /* POINTER defines a generic pointer type */ typedef unsigned char *POINTER; -# ifndef HAVE_UINT32_T -# if SIZEOF_INT == 4 -typedef unsigned int uint32_t; -# elif SIZEOF_LONG == 4 -typedef unsigned long uint32_t; -# endif -# endif - #endif diff --git a/doc/Makefile.in b/doc/Makefile.in index 689bc10..c391a46 100644 --- a/doc/Makefile.in +++ b/doc/Makefile.in @@ -1,4 +1,4 @@ -# $Id: Makefile.in,v 3.4 2004/04/30 06:49:37 roessler Exp $ +# $Id: Makefile.in,v 3.6 2005/03/16 02:49:33 brendan Exp $ SHELL = /bin/sh @@ -21,6 +21,7 @@ VPATH = @srcdir@ INSTALL = @INSTALL@ CC = @CC@ CPP = @CPP@ +EXEEXT = @EXEEXT@ XCPPFLAGS = -I. @CPPFLAGS@ CFLAGS = @CFLAGS@ $(XCPPFLAGS) LDFLAGS = @LDFLAGS@ @@ -150,7 +151,7 @@ dist distdir: Makefile $(DISTFILES) done ../makedoc: $(top_srcdir)/makedoc.c - (cd .. && $(MAKE) makedoc) + (cd .. && $(MAKE) makedoc$(EXEEXT)) # hack around autoconf mixing up patterns. at = @ diff --git a/hcache.c b/hcache.c index c34efd9..eea6d20 100644 --- a/hcache.c +++ b/hcache.c @@ -40,6 +40,9 @@ #include #include +#if HAVE_SYS_TIME_H +#include +#endif #include "mutt.h" #ifdef USE_IMAP #include "message.h" -- 2.20.1