Various cygwin portability fixes

diff --git a/Makefile.am b/Makefile.am
index 65443079dad0cda8df5ddd01aa173f06925f21e9..dfc8aa155d04221db459cea92c1182ebdc519406 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,7 +2,7 @@
 ## Use aclocal -I m4; automake --foreign
 
 AUTOMAKE_OPTIONS = 1.6 foreign
-EXTRA_PROGRAMS = mutt_dotlock pgpring makedoc
+EXTRA_PROGRAMS = mutt_dotlock pgpring pgpewrap makedoc
 
 if BUILD_IMAP
 IMAP_SUBDIR = imap

diff --git a/configure.in b/configure.in
index 0f36bb57a6fd1542ff14a67cc3f8f47165abe8bd..7b217ddd97d3ef65f110c68ccef95d299501fc12 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -129,7 +129,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="pgpring pgpewrap"
+                PGPAUX_TARGET="pgpring\$(EXEEXT) pgpewrap\$(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
 

diff --git a/doc/Makefile.in b/doc/Makefile.in
index f0edc739f3404c9116be51eefd8f183b4e2f5eee..6a4034e7c91632e27c718bc6551079413c72efeb 100644 (file)
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -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 2ae2d6331cfe04e30f20add8cd872a46d139bdd3..38f44aa99c458f1a5e507fdc79207d5f59587a8f 100644 (file)
--- a/hcache.c
+++ b/hcache.c
@@ -30,6 +30,9 @@
 
 #include <errno.h>
 #include <fcntl.h>
+#if HAVE_SYS_TIME_H
+#include <sys/time.h>
+#endif
 #include "mutt.h"
 #ifdef USE_IMAP
 #include "message.h"