Add headers. Add section about ActiveIMM.

2001-11-08  Tor Lillqvist  <tml@iki.fi>

	* README.win32: Add headers. Add section about ActiveIMM.

	* configure.in: Add --with-ie55 flag to specify the location of
	the "IE55 libs and headers" package downloadable from Microsoft,
	which contains, among other things, the Active IMM header dimm.h
	and UUID library uuid.lib. Use test -f instead of AC_CHECK_FILE.
	Require GLib 1.3.10.

	* config.h.win32.in: New version, produced by merging two
	configure-generated ones (for gcc and MSVC). Hopefully #defines
	the same flags that the previous, hand-written one, did.

	* gdk/Makefile.am
	* gdk/win32/Makefile.am: Handle the uuid library from the IE55 lib.

	* gdk/win32/gdkevents-win32.c: Conditionalize ActiveIMM
	stuff. Remove unused GdkIOClosure.

	* gdk/win32/surrogate-dimm.h: Remove, use real dimm.h instead (if
	available).

	* gdk/win32/libie55uuid.la: New file, handwritten libtool wrapper
	for uuid.lib. (Does it really have to be this hard to use an
	existing library with libtool? Probably I am missing something.)

1 files changed, 221 insertions, 127 deletions

diff --git a/config.h.win32.in b/config.h.win32.in
index 58aaec2d58..f05267e3d7 100644
--- a/config.h.win32.in
+++ b/config.h.win32.in
@@ -1,203 +1,297 @@
-/* config.h.win32.  Handcrafted for Microsoft C or mingw */
+/* config.h.win32.in. Merged from two versions generated by configure for gcc and MSVC.  */
+/* config.h.in.  Generated from configure.in by autoheader.  */
+/* acconfig.h
+   This file is in the public domain.
 
-#if ! (defined(_MSC_VER) || defined(__GNUC__))
-#error Unrecognized Win32 compiler, edit config.h.win32 by hand
-#endif
+   Descriptive text for the C preprocessor macros that
+   the distributed Autoconf macros can define.
+   No software package will use all of them; autoheader copies the ones
+   your configure.in uses into your configuration header file templates.
 
-/* Define if using alloca.c.  */
-/* #undef C_ALLOCA */
+   The entries are in sort -df order: alphabetical, case insensitive,
+   ignoring punctuation (such as underscores).  Although this order
+   can split up related entries, it makes it easier to check whether
+   a given entry is in the file.
 
-/* Define to empty if the keyword does not work.  */
-/* #undef const */
-
-/* Define to one of _getb67, GETB67, getb67 for Cray-2 and Cray-YMP systems.
-   This function is required for alloca.c support on those systems.  */
-/* #undef CRAY_STACKSEG_END */
-
-/* Define if you have alloca, as a function or macro.  */
-#define HAVE_ALLOCA 1
-#ifndef alloca
-  #ifdef _MSC_VER
-    #define alloca _alloca
-  #elif defined (__GNUC__)
-    #define alloca __builtin_alloca
-  #endif
-#endif
-
-/* Define if you have <alloca.h> and it should be used (not on Ultrix).  */
-/* #undef HAVE_ALLOCA_H */
-
-/* Define if you have a working `mmap' system call.  */
-/* #undef HAVE_MMAP */
-
-/* Define to empty, or __inline if that's what your compiler wants.  */
-#define inline __inline
-
-/* Define to `long' if <sys/types.h> doesn't define.  */
-/* #undef off_t */
-
-/* Define if you need to in order for stat and other things to work.  */
-/* #undef _POSIX_SOURCE*/
-
-/* Define as the return type of signal handlers (int or void).  */
-#define RETSIGTYPE void
-
-/* Define to `unsigned' if <sys/types.h> doesn't define.  */
-/* #undef size_t */
-
-/* If using the C implementation of alloca, define if you know the
-   direction of stack growth for your system; otherwise it will be
-   automatically deduced at run-time.
- STACK_DIRECTION > 0 => grows toward higher addresses
- STACK_DIRECTION < 0 => grows toward lower addresses
- STACK_DIRECTION = 0 => direction of growth unknown
- */
-/* #undef STACK_DIRECTION */
-
-/* Define if you have the ANSI C header files.  */
-#define STDC_HEADERS 1
+   Leave the following blank line there!!  Autoheader needs it.  */
+
 
 /* Other stuff */
 #define ENABLE_NLS 1
-#define GTK_COMPILED_WITH_DEBUGGING "minimum"
+#define GTK_COMPILED_WITH_DEBUGGING "yes"
 
 /* #undef HAVE_CATGETS */
-/* #undef HAVE_DIRENT_H */
+/* #undef HAVE_DIMM_H */
+#define HAVE_DIRENT_H 1 /* MSVC users: include it from build/win32/dirent */
 #define HAVE_GETTEXT 1
 /* #undef HAVE_IPC_H */
 /* #undef HAVE_LC_MESSAGES */
+#define HAVE_PROGRESSIVE_JPEG 1
 /* #undef HAVE_PWD_H */
 /* #undef HAVE_SHM_H */
 /* #undef HAVE_STPCPY */
 /* #undef HAVE_XSHM_H */
-#define HAVE_SHAPE_EXT 1
+/* #undef HAVE_SHAPE_EXT */
 /* #undef HAVE_SYS_SELECT_H */
+#ifndef _MSC_VER
+#define HAVE_SYS_TIME_H 1
+#else /* _MSC_VER */
 /* #undef HAVE_SYS_TIME_H */
+#endif /* _MSC_VER */
+#define HAVE_WINSOCK_H 1
+#define HAVE_WINTAB 1
 /* #undef HAVE_XCONVERTCASE */
+/* #undef HAVE_XFT */
+
+#define NO_FD_SET 1
+
+/* #undef RESOURCE_BASE */
 
-/* #undef NO_FD_SET */
+#ifndef _MSC_VER
+#define USE_GMODULE 1
+#define USE_MMX 1
+#endif
+
+/* Define to use X11R6 additions to XIM */
+/* #undef USE_X11R6_XIM */
+
+/* Define to use XKB extension */
+/* #undef HAVE_XKB */
+
+/* Define to use shadowfb in the linux-fb port */
+/* #undef ENABLE_SHADOW_FB */
+
+/* Define to use a fb manager in the linux-fb port */
+/* #undef ENABLE_FB_MANAGER */
 
 /* #undef XINPUT_NONE */
 /* #undef XINPUT_GXI */
 /* #undef XINPUT_XFREE */
-#define XINPUT_WIN32 1
 
 /* Define as the return type of signal handlers (int or void).  */
 #define RETSIGTYPE void
 
-/* Define if you have the __argz_count function.  */
-/* #undef HAVE___ARGZ_COUNT */
+/* Most machines will be happy with int or void.  IRIX requires '...' */
+/* #undef SIGNAL_ARG_TYPE */
 
-/* Define if you have the __argz_next function.  */
-/* #undef HAVE___ARGZ_NEXT */
+#define GETTEXT_PACKAGE "@GETTEXT_PACKAGE@"
 
-/* Define if you have the __argz_stringify function.  */
-/* #undef HAVE___ARGZ_STRINGIFY */
+/* #undef PACKAGE */
+/* #undef VERSION */
+
+
+/* Leave that blank line there!!  Autoheader needs it.
+   If you're adding to this file, keep in mind:
+   The entries are in sort -df order: alphabetical, case insensitive,
+   ignoring punctuation (such as underscores).  */
+
+/* Define to one of `_getb67', `GETB67', `getb67' for Cray-2 and Cray-YMP
+   systems. This function is required for `alloca.c' support on those systems.
+   */
+/* #undef CRAY_STACKSEG_END */
+
+/* Define if using `alloca.c'. */
+/* #undef C_ALLOCA */
 
-/* Define if you have the broken_wctype function.  */
+/* Define if you have `alloca', as a function or macro. */
+#define HAVE_ALLOCA 1
+
+/* Define if you have <alloca.h> and it should be used (not on Ultrix). */
+/* #undef HAVE_ALLOCA_H */
+
+/* Define if you have the <argz.h> header file. */
+/* #undef HAVE_ARGZ_H */
+
+/* Define if you have the `bind_textdomain_codeset' function. */
+/* #undef HAVE_BIND_TEXTDOMAIN_CODESET */
+
+/* Is the wctype implementation broken */
 /* #undef HAVE_BROKEN_WCTYPE */
 
-/* Define if you have the dcgettext function.  */
-/* #undef HAVE_DCGETTEXT */
+/* Define if you have the `dcgettext' function. */
+#define HAVE_DCGETTEXT 1
+
+/* Define if you have the <dimm.h> header file. */
+/* #undef HAVE_DIMM_H */
 
-/* Define if you have the getcwd function.  */
+/* Define if you have the <dirent.h> header file, and it defines `DIR'. */
+#define HAVE_DIRENT_H 1
+
+/* Define if you have the <dlfcn.h> header file. */
+/* #undef HAVE_DLFCN_H */
+
+/* Define if you have the `getcwd' function. */
 #define HAVE_GETCWD 1
 
-/* Define if you have the getpagesize function.  */
+/* Define if you have the `getpagesize' function. */
+#ifndef _MSC_VER
 #define HAVE_GETPAGESIZE 1
+#else /* _MSC_VER */
+/* #undef HAVE_GETPAGESIZE */
+#endif /* _MSC_VER */
+
+/* Define if you have the `getresuid' function. */
+/* #undef HAVE_GETRESUID */
+
+/* Define if you have the <inttypes.h> header file. */
+/* #undef HAVE_INTTYPES_H */
+
+/* Define if your <locale.h> file defines LC_MESSAGES. */
+/* #undef HAVE_LC_MESSAGES */
 
-/* Define if you have the lstat function.  */
+/* Define if you have the <limits.h> header file. */
+#define HAVE_LIMITS_H 1
+
+/* Define if you have the <locale.h> header file. */
+#define HAVE_LOCALE_H 1
+
+/* Define if you have the `lstat' function. */
 /* #undef HAVE_LSTAT */
 
-/* Define if you have the munmap function.  */
+/* Define if you have the <malloc.h> header file. */
+#define HAVE_MALLOC_H 1
+
+/* Define if you have the <memory.h> header file. */
+#define HAVE_MEMORY_H 1
+
+/* Define if you have the `mkstemp' function. */
+/* #undef HAVE_MKSTEMP */
+
+/* Define if you have a working `mmap' system call. */
+/* #undef HAVE_MMAP */
+
+/* Define if you have the `munmap' function. */
 /* #undef HAVE_MUNMAP */
 
-/* Define if you have the putenv function.  */
+/* Define if you have the <ndir.h> header file, and it defines `DIR'. */
+/* #undef HAVE_NDIR_H */
+
+/* Define if you have the <nl_types.h> header file. */
+/* #undef HAVE_NL_TYPES_H */
+
+/* Define if you have the `putenv' function. */
 #define HAVE_PUTENV 1
-#define putenv _putenv
 
-/* Define if you have the setenv function.  */
+/* Define if you have the <pwd.h> header file. */
+/* #undef HAVE_PWD_H */
+
+/* Define if you have the `setenv' function. */
 /* #undef HAVE_SETENV */
 
-/* Define if you have the setlocale function.  */
+/* Define if you have the `setlocale' function. */
 #define HAVE_SETLOCALE 1
 
-/* Define if you have the stpcpy function.  */
-/* #undef HAVE_STPCPY */
+/* Define if you have the `sigsetjmp' function. */
+/* #undef HAVE_SIGSETJMP */
 
-/* Define if you have the strcasecmp function.  */
+/* Define if you have the <stdint.h> header file. */
+#ifndef _MSC_VER
+#define HAVE_STDINT_H 1
+#else /* _MSC_VER */
+/* #undef HAVE_STDINT_H */
+#endif /* _MSC_VER */
+
+/* Define if you have the <stdlib.h> header file. */
+#define HAVE_STDLIB_H 1
+
+/* Define if you have the `strcasecmp' function. */
+#ifndef _MSC_VER
 #define HAVE_STRCASECMP 1
-#define strcasecmp _stricmp
+#else /* _MSC_VER */
+/* #undef HAVE_STRCASECMP */
+#endif /* _MSC_VER */
 
-/* Define if you have the strchr function.  */
+/* Define if you have the `strchr' function. */
 #define HAVE_STRCHR 1
 
-/* Define if you have the strdup function.  */
+/* Define if you have the `strdup' function. */
 #define HAVE_STRDUP 1
 
-/* Define if you have the <argz.h> header file.  */
-/* #undef HAVE_ARGZ_H */
-
-/* Define if you have the <dirent.h> header file.  */
-/* #undef HAVE_DIRENT_H */
+/* Define if you have the <strings.h> header file. */
+/* #undef HAVE_STRINGS_H */
 
-/* Define if you have the <limits.h> header file.  */
-#define HAVE_LIMITS_H 1
+/* Define if you have the <string.h> header file. */
+#define HAVE_STRING_H 1
 
-/* Define if you have the <locale.h> header file.  */
-#define HAVE_LOCALE_H 1
+/* Define if you have the <sys/dir.h> header file, and it defines `DIR'. */
+/* #undef HAVE_SYS_DIR_H */
 
-/* Define if you have the <malloc.h> header file.  */
-#define HAVE_MALLOC_H 1
+/* Define if you have the <sys/ndir.h> header file, and it defines `DIR'. */
+/* #undef HAVE_SYS_NDIR_H */
 
-/* Define if you have the <nl_types.h> header file.  */
-/* #undef HAVE_NL_TYPES_H */
+/* Define if you have the <sys/param.h> header file. */
+/* #undef HAVE_SYS_PARAM_H */
 
-/* Define if you have the <pwd.h> header file.  */
-/* #undef HAVE_PWD_H */
+/* Define if you have the <sys/stat.h> header file. */
+#define HAVE_SYS_STAT_H 1
 
-/* Define if you have the <string.h> header file.  */
-#define HAVE_STRING_H 1
+/* Define if you have the <sys/time.h> header file. */
+#ifndef _MSC_VER
+#define HAVE_SYS_TIME_H 1
+#else /* _MSC_VER */
+/* #undef HAVE_SYS_TIME_H */
+#endif /* _MSC_VER */
 
-/* Define if you have the <sys/param.h> header file.  */
-/* #undef HAVE_SYS_PARAM_H */
+/* Define if you have the <sys/types.h> header file. */
+#define HAVE_SYS_TYPES_H 1
 
-/* Define if you have the <sys/time.h> header file.  */
-/* #undef HAVE_SYS_TIME_H */
+/* Define if you have <sys/wait.h> that is POSIX.1 compatible. */
+/* #undef HAVE_SYS_WAIT_H */
 
-/* Define if you have the <unistd.h> header file.  */
+/* Define if you have the <unistd.h> header file. */
+#ifndef _MSC_VER
+#define HAVE_UNISTD_H 1
+#else /* _MSC_VER */
 /* #undef HAVE_UNISTD_H */
+#endif /* _MSC_VER */
 
-/* Define if you have the <wchar.h> header file.  */
+/* Have wchar.h include file */
 #define HAVE_WCHAR_H 1
 
-/* Define if you have the <wctype.h> header file.  */
-#ifdef _MSC_VER
+/* Have wctype.h include file */
 #define HAVE_WCTYPE_H 1
-#endif /* _MSC_VER */
 
-/* Define if you have the i library (-li).  */
-/* #undef HAVE_LIBI */
+/* Define if you have the <winsock.h> header file. */
+#define HAVE_WINSOCK_H 1
 
-/* Define if you have the intl library (-lintl).  */
-#define HAVE_LIBINTL 1
+/* Define if you have the `__argz_count' function. */
+/* #undef HAVE___ARGZ_COUNT */
 
-/* define if compiled symbols have a leading underscore */
-/* #undef WITH_SYMBOL_UNDERSCORE */
+/* Define if you have the `__argz_next' function. */
+/* #undef HAVE___ARGZ_NEXT */
 
-/* Define if you have the Wintab programmer's kit */
-#define HAVE_WINTAB 1
+/* Define if you have the `__argz_stringify' function. */
+/* #undef HAVE___ARGZ_STRINGIFY */
 
-/* Define if you have the <dimm.h> header file
- * (available in the Platform SDK)
-*/
-/* #define HAVE_DIMM_H 1 */
+/* Define as the return type of signal handlers (`int' or `void'). */
+#define RETSIGTYPE void
 
-#ifndef _MSC_VER
-#define USE_GMODULE 1
-#define USE_MMX 1
-#endif
+/* If using the C implementation of alloca, define if you know the
+   direction of stack growth for your system; otherwise it will be
+   automatically deduced at run-time.
+        STACK_DIRECTION > 0 => grows toward higher addresses
+        STACK_DIRECTION < 0 => grows toward lower addresses
+        STACK_DIRECTION = 0 => direction of growth unknown */
+/* #undef STACK_DIRECTION */
 
-/* #undef HAVE_SIGSETJMP */
+/* Define if you have the ANSI C header files. */
+#define STDC_HEADERS 1
 
-#define GETTEXT_PACKAGE "@GETTEXT_PACKAGE@"
+/* Define to empty if `const' does not conform to ANSI C. */
+/* #undef const */
+
+/* Define to `int' if <sys/types.h> doesn't define. */
+#define gid_t int
+
+/* Define as `__inline' if that's what the C compiler calls it, or to nothing
+   if it is not supported. */
+/* #undef inline */
+
+/* Define to `long' if <sys/types.h> does not define. */
+/* #undef off_t */
+
+/* Define to `unsigned' if <sys/types.h> does not define. */
+/* #undef size_t */
+
+/* Define to `int' if <sys/types.h> doesn't define. */
+#define uid_t int