<<< Date Index >>>     <<< Thread Index >>>

diff to bulid mutt 1.5.9 under cygwin



Changes needed to build mutt 1.5.9 under cygwin.

configure.in:
        Add $(EXEEXT) to PGPAUX_TARGET and DOTLOCK_TARGET, as
        the target under cygwin has the exe extesion.

hcache.c:
        Under cygwin "struct timeval" is defined in <sys/time.h> so
        include it, if it's available.

makedoc.c:
        gcc isn't passing "-DHAVE_CONFIG_H=1" when building this
        file, so config.h isn't being included which leads to
        compile errors.  The corrct fix would be to fix the
        Makefile to pass -DHAVE_CONFIG_H but I took the easy
        fix.
        
        
diff -u mutt-1.5.9/configure.in mutt-1.5.9.new/configure.in
--- mutt-1.5.9/configure.in     2005-03-13 17:36:01.000000000 +0100
+++ mutt-1.5.9.new/configure.in 2005-06-07 13:08:34.597588800 +0200
@@ -129,7 +129,7 @@
         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
 
@@ -453,7 +453,7 @@
         || test "x$mutt_cv_external_dotlock" = "xyes"
 then
         AC_DEFINE(DL_STANDALONE,1,[ Define if you want to use an external 
dotlocking program. ])
-        DOTLOCK_TARGET="mutt_dotlock"
+        DOTLOCK_TARGET='mutt_dotlock$(EXEEXT)'
 else
         MUTT_LIB_OBJECTS="$MUTT_LIB_OBJECTS dotlock.o"
 fi
diff -u mutt-1.5.9/hcache.c mutt-1.5.9.new/hcache.c
--- mutt-1.5.9/hcache.c 2005-02-03 20:46:53.000000000 +0100
+++ mutt-1.5.9.new/hcache.c     2005-06-07 12:59:19.353180000 +0200
@@ -28,6 +28,10 @@
 #include <db.h>
 #endif
 
+#ifdef HAVE_SYS_TIME_H
+# include <sys/time.h>
+#endif
+
 #include <errno.h>
 #include <fcntl.h>
 #include "mutt.h"
diff -u mutt-1.5.9/makedoc.c mutt-1.5.9.new/makedoc.c
--- mutt-1.5.9/makedoc.c        2005-02-03 19:47:53.000000000 +0100
+++ mutt-1.5.9.new/makedoc.c    2005-06-07 13:16:51.331857000 +0200
@@ -27,9 +27,7 @@
  **
  **/
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include "config.h"
 
 #include <stdio.h>
 #include <stdlib.h>

-- 
Software Engineer                                (Work)   +32 2 757 10 15
Mission Critical                                 (Mobile) +32 485 482 559