[Cvs-dev] windows-NT/config.h.in.in changes for CVS FEATURE 1.12.x

[Mark D. Baushke]

"Derek R. Price" <address@hidden> wrote:

> Mark D. Baushke wrote:
> > The windows-NT/config.h.in.in file seems to be missing some of the stuff
> > you recently added...
> > 
> > ../config.h.in line 55 has #undef DEFAULT_SIGN_TEMPLATE not found in 
> > ./config.h.in.in
> > ../config.h.in line 60 has #undef DEFAULT_SIGN_TEXTMODE not found in 
> > ./config.h.in.in
> > ../config.h.in line 67 has #undef DEFAULT_VERIFY_TEMPLATE not found in 
> > ./config.h.in.in
> > ../config.h.in line 121 has #undef FULL_PATH_INTTYPES_H not found in 
> > ./config.h.in.in
> > ../config.h.in line 299 has #undef HAVE_DECL_STRTOIMAX not found in 
> > ./config.h.in.in
> > ../config.h.in line 303 has #undef HAVE_DECL_STRTOLL not found in 
> > ./config.h.in.in
> > ../config.h.in line 307 has #undef HAVE_DECL_STRTOULL not found in 
> > ./config.h.in.in
> > ../config.h.in line 311 has #undef HAVE_DECL_STRTOUMAX not found in 
> > ./config.h.in.in
> > ../config.h.in line 427 has #undef HAVE_INCLUDE_NEXT not found in 
> > ./config.h.in.in
> > ../config.h.in line 565 has #undef HAVE_NETDB_H not found in 
> > ./config.h.in.in
> > ../config.h.in line 576 has #undef HAVE_OPENPGP not found in 
> > ./config.h.in.in
> > ../config.h.in line 707 has #undef HAVE_STRTOIMAX not found in 
> > ./config.h.in.in
> > ../config.h.in line 713 has #undef HAVE_STRTOLL not found in 
> > ./config.h.in.in
> > ../config.h.in line 719 has #undef HAVE_STRTOULL not found in 
> > ./config.h.in.in
> > ../config.h.in line 722 has #undef HAVE_STRTOUMAX not found in 
> > ./config.h.in.in
> > ../config.h.in line 747 has #undef HAVE_SYS_BITYPES_H not found in 
> > ./config.h.in.in
> > ../config.h.in line 779 has #undef HAVE_SYS_SOCKET_H not found in 
> > ./config.h.in.in
> > ../config.h.in line 887 has #undef HAVE_WINSOCK2_H not found in 
> > ./config.h.in.in
> > ../config.h.in line 908 has #undef HAVE_WS2TCPIP_H not found in 
> > ./config.h.in.in
> > 
> > I suspect that building on the windows platform will be easier if
> > those things are properly defined, but I have no ideas as to the
> > correct values for them.
> 
> Yes, but I have no idea about correct values either.  Conrad's dealt
> with it the last few releases.  I believe, based on earlier
> discussions with Conrad, that if Jim installs Perl on Windows he can
> rebuild windows-NT/config.h.in himself and generate the same list of
> warnings to give him some idea of what values he needs to figure out
> how to define..

Opening up the discussion for other folks who might have windows
development experience.

As you know, the windows build of 1.12.x is broken at present. It would
probably be good to get it working again if possible.

I suspect that you will want to have two separate configurations:

  1) Where there is no OpenPGP available to the client.
  2) Where either PGP or GnuPG is installed on the windows box.

Some information that may be useful:

 DEFAULT_SIGN_TEMPLATE         - undef unless OpenPGP exists
 DEFAULT_SIGN_TEXTMODE         - undef unless OpenPGP exists
 DEFAULT_VERIFY_TEMPLATE       - undef unless OpenPGP exists
 FULL_PATH_INTTYPES_H          <inttypes.h> is C99 and not part of Windows C++
 HAVE_DECL_STRTOIMAX
 HAVE_DECL_STRTOLL
 HAVE_DECL_STRTOULL
 HAVE_DECL_STRTOUMAX
 HAVE_INCLUDE_NEXT             - gcc extension not available on Windows
 HAVE_NETDB_H                  - use <winsock.h> for these structures
 HAVE_OPENPGP                  - assume PGP and GPG are not available?
 HAVE_STRTOIMAX
 HAVE_STRTOLL
 HAVE_STRTOULL
 HAVE_STRTOUMAX
 HAVE_SYS_BITYPES_H            - I doubt it exists
 HAVE_SYS_SOCKET_H             - I doubt it exists
 HAVE_WINSOCK2_H               - seems to exist according to microsoft.com
 HAVE_WS2TCPIP_H               - seems to exist according to microsoft.com

If any of the other C99 functions exist, then define them, or let the
GNULIB variant do its job if you do not define them.

        -- Mark

Doing a side-by-side comparison of ccvs/config.h.in and
windows-NT/config.h.in.in, I suspect the following patch is desirable.
If anyone has the ability to test it, that would be great.

Index: config.h.in.in
===================================================================
RCS file: /cvsroot/cvs/ccvs/windows-NT/config.h.in.in,v
retrieving revision 1.43
diff -u -p -u -p -r1.43 config.h.in.in
--- config.h.in.in      1 Jan 2006 00:34:27 -0000       1.43
+++ config.h.in.in      13 May 2006 19:49:41 -0000
@@ -53,6 +53,25 @@
 /* Define to 1 if using `alloca.c'. */
 #undef C_ALLOCA
 
+/* Define to a command line template that will write an OpenPGP signature for
+   the file `%s' to its standard out. `%M' is substituted at run time with an
+   option which flags files as text files, when necessary, and the empty
+   string, otherwise. `%@' is substituted with a list of arguments provided by
+   the user. */
+#undef DEFAULT_SIGN_TEMPLATE
+
+/* Define to the option string that the OpenPGP program used in the
+   DEFAULT_SIGN_TEMPLATE would like to see for text files (substituted at run
+   time in place of `%M' in the DEFAULT_SIGN_TEMPLATE). */
+#undef DEFAULT_SIGN_TEXTMODE
+
+/* Define to a command line template that will read an OpenPGP signature from
+   the file `%s' and use it to verify the integrity of the file `%d'. `%M' is
+   substituted at run time with an option which flags files as text files,
+   when necessary, and the empty string, otherwise. `%@' is substituted with a
+   list of arguments provided by the user. */
+#undef DEFAULT_VERIFY_TEMPLATE
+
 /* Define if there is a member named d_ino in the struct describing directory
    headers. */
 #undef D_INO_IN_DIRENT
@@ -97,6 +116,9 @@
    message to be appended to the temp file when the editor is started. */
 #undef FORCE_USE_EDITOR
 
+/* Define this to the full path to <inttypes.h>. */
+#undef FULL_PATH_INTTYPES_H
+
 /* Define to an alternative value if GSS_C_NT_HOSTBASED_SERVICE isn't defined
    in the gssapi.h header file. MIT Kerberos 1.2.1 requires this. Only
    relevant when using GSSAPI. */
@@ -159,10 +181,6 @@
    you don't. */
 #undef HAVE_DECL_CLEARERR_UNLOCKED
 
-/* Define to 1 if you have the declaration of `__fpending', and to 0 if you
-   don't. */
-#define HAVE_DECL___FPENDING 0
-
 /* Define to 1 if you have the declaration of `feof_unlocked', and to 0 if you
    don't. */
 #undef HAVE_DECL_FEOF_UNLOCKED
@@ -275,6 +293,26 @@
    don't. */
 #undef HAVE_DECL_STRERROR_R
 
+/* Define to 1 if you have the declaration of `strtoimax', and to 0 if you
+   don't. */
+#undef HAVE_DECL_STRTOIMAX
+
+/* Define to 1 if you have the declaration of `strtoll', and to 0 if you
+   don't. */
+#undef HAVE_DECL_STRTOLL
+
+/* Define to 1 if you have the declaration of `strtoull', and to 0 if you
+   don't. */
+#undef HAVE_DECL_STRTOULL
+
+/* Define to 1 if you have the declaration of `strtoumax', and to 0 if you
+   don't. */
+#undef HAVE_DECL_STRTOUMAX
+
+/* Define to 1 if you have the declaration of `__fpending', and to 0 if you
+   don't. */
+#define HAVE_DECL___FPENDING 0
+
 /* Define to 1 if you have the <direct.h> header file. */
 /* Windows has <direct.h> but some functions aren't POSIX compliant */
 #undef HAVE_DIRECT_H
@@ -385,6 +423,9 @@
 /* Define if you have the iconv() function. */
 #undef HAVE_ICONV
 
+/* Define if your compiler supports the #include_next directive. */
+#undef HAVE_INCLUDE_NEXT
+
 /* Define to 1 if you have the `initgroups' function. */
 #undef HAVE_INITGROUPS
 
@@ -520,12 +561,21 @@
 /* Define to 1 if you have the <ndir.h> header file, and it defines `DIR'. */
 #define HAVE_NDIR_H 1
 
+/* Define to 1 if you have the <netdb.h> header file. */
+/* Use winsock.h as an alternative on Windows. It defines struct hostent. */
+#undef HAVE_NETDB_H
+
 /* Define to 1 if you have the <netinet/in.h> header file. */
 #undef HAVE_NETINET_IN_H
 
 /* Define to 1 if you have the `openat' function. */
 #undef HAVE_OPENAT
 
+/* Define if an OpenPGP capable program is available (and, assumedly, usable
+   command line templates are in the DEFAULT_SIGN_TEMPLATE and
+   DEFAULT_VERIFY_TEMPLATE macros). */
+#undef HAVE_OPENPGP
+
 /* Define to 1 if you have the <OS.h> header file. */
 #undef HAVE_OS_H
 
@@ -654,12 +704,24 @@
 /* Define to 1 if you have the `strncasecmp' function. */
 #undef HAVE_STRNCASECMP
 
+/* Define to 1 if you have the `strtoimax' function. */
+#undef HAVE_STRTOIMAX
+
 /* Define to 1 if you have the `strtol' function. */
 #define HAVE_STRTOL 1
 
+/* Define to 1 if you have the `strtoll' function. */
+#undef HAVE_STRTOLL
+
 /* Define to 1 if you have the `strtoul' function. */
 #define HAVE_STRTOUL 1
 
+/* Define to 1 if you have the `strtoull' function. */
+#undef HAVE_STRTOULL
+
+/* Define to 1 if you have the `strtoumax' function. */
+#undef HAVE_STRTOUMAX
+
 /* Define to 1 if the system has the type `struct addrinfo'. */
 #undef HAVE_STRUCT_ADDRINFO
 
@@ -682,6 +744,9 @@
 /* Define to 1 if you have the <syslog.h> header file. */
 #undef HAVE_SYSLOG_H
 
+/* Define to 1 if you have the <sys/bitypes.h> header file. */
+#undef HAVE_SYS_BITYPES_H
+
 /* Define to 1 if you have the <sys/bsdtypes.h> header file. */
 #undef HAVE_SYS_BSDTYPES_H
 
@@ -711,6 +776,9 @@
 /* Define to 1 if you have the <sys/select.h> header file. */
 #undef HAVE_SYS_SELECT_H
 
+/* Define to 1 if you have the <sys/socket.h> header file. */
+#undef HAVE_SYS_SOCKET_H
+
 /* Define to 1 if you have the <sys/stat.h> header file. */
 #define HAVE_SYS_STAT_H 1
 
@@ -816,6 +884,9 @@
 /* Define to 1 if you have the <wctype.h> header file. */
 #define HAVE_WCTYPE_H 1
 
+/* Define to 1 if you have the <winsock2.h> header file. */
+#define HAVE_WINSOCK2_H 1
+
 /* Define if you have the 'wint_t' type. */
 #define HAVE_WINT_T 1
 
@@ -834,6 +905,9 @@
 /* Define to 1 if `vfork' works. */
 #undef HAVE_WORKING_VFORK
 
+/* Define to 1 if you have the <ws2tcpip.h> header file. */
+#define HAVE_WS2TCPIP_H 1
+
 /* Define to 1 if you have the <zlib.h> header file. */
 #undef HAVE_ZLIB_H
 
@@ -1188,7 +1262,7 @@
 #define inline __inline
 #endif
 
-/* Define to long or long long if <inttypes.h> and <stdint.h> don't define. */
+/* Define to long or long long if <stdint.h> and <inttypes.h> don't define. */
 #undef intmax_t
 
 /* Define to rpl_localtime if the replacement function should be used. */