Problems building GPG 1.3.93 on Cygwin

[David Shaw]

On Tue, Dec 14, 2004 at 11:00:07PM +0300, Eugene Kotlyarov wrote:
> Hello
> 
> I have couple of problems when building new gpg on Cygwin.
> They are addressed in the following patches. Besides this is seems to work 
> fine.

> --- srv.h.old	2003-08-29 03:29:32.000000000 +0400
> +++ srv.h	2004-12-14 22:07:11.421875000 +0300
> @@ -26,7 +26,9 @@
>  #else
>  #include <netinet/in.h>
> +#ifndef __CYGWIN32__
>  #include <arpa/nameser.h>
>  #include <resolv.h>
>  #endif
> +#endif

I think I have a slightly more portable fix for this.  Can you try
this patch?

David
-------------- next part --------------
Index: configure.ac
===================================================================
RCS file: /cvs/gnupg/gnupg/configure.ac,v
retrieving revision 1.116
diff -u -r1.116 configure.ac
--- configure.ac	16 Dec 2004 10:53:25 -0000	1.116
+++ configure.ac	16 Dec 2004 18:25:09 -0000
@@ -771,7 +771,7 @@
 
 dnl Checks for header files.
 AC_HEADER_STDC
-AC_CHECK_HEADERS(unistd.h langinfo.h termio.h locale.h getopt.h)
+AC_CHECK_HEADERS([unistd.h langinfo.h termio.h locale.h getopt.h arpa/nameser.h])
 
 # Note that we do not check for iconv here because this is done anyway
 # by the gettext checks and thus it allows us to disable the use of
Index: util/srv.h
===================================================================
RCS file: /cvs/gnupg/gnupg/util/srv.h,v
retrieving revision 1.5
diff -u -r1.5 srv.h
--- util/srv.h	28 Aug 2003 23:29:32 -0000	1.5
+++ util/srv.h	16 Dec 2004 18:25:09 -0000
@@ -1,5 +1,5 @@
 /* srv.h
- * Copyright (C) 2003 Free Software Foundation, Inc.
+ * Copyright (C) 2003, 2004 Free Software Foundation, Inc.
  *
  * This file is part of GNUPG.
  *
@@ -25,9 +25,12 @@
 #include <windows.h>
 #else
 #include <netinet/in.h>
+#ifdef HAVE_ARPA_NAMESER_H
 #include <arpa/nameser.h>
+#endif
 #include <resolv.h>
 #endif
+#include "types.h"
 
 #ifndef MAXDNAME
 #define MAXDNAME 1025