From 77769e2eeb122181371df99cd46949017d23d058 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Tue, 1 Nov 2005 09:48:46 +0000 Subject: [PATCH] Sync with what configure produces. 2005-11-01 Tor Lillqvist * config.h.win32.in: Sync with what configure produces. --- ChangeLog | 2 + ChangeLog.pre-2-10 | 2 + config.h.win32.in | 193 ++++++++++++++++++++------------------------- 3 files changed, 90 insertions(+), 107 deletions(-) diff --git a/ChangeLog b/ChangeLog index f0a80f2dd8..cd837c248c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,7 @@ 2005-11-01 Tor Lillqvist + * config.h.win32.in: Sync with what configure produces. + * configure.in: Don't look for X_PACKAGES unless building for x11. (#313986, John Ehresman) diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index f0a80f2dd8..cd837c248c 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,5 +1,7 @@ 2005-11-01 Tor Lillqvist + * config.h.win32.in: Sync with what configure produces. + * configure.in: Don't look for X_PACKAGES unless building for x11. (#313986, John Ehresman) diff --git a/config.h.win32.in b/config.h.win32.in index 81afc83d78..f5d7ed9c90 100644 --- a/config.h.win32.in +++ b/config.h.win32.in @@ -31,13 +31,15 @@ /* #undef HAVE_STPCPY */ /* #undef HAVE_XSHM_H */ /* #undef HAVE_SHAPE_EXT */ +/* #undef HAVE_SOLARIS_XINERAMA */ /* #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 +/* #undef HAVE_XFREE_XINERAMA */ +/* #undef HAVE_XINERAMA */ #define HAVE_WINTAB 1 /* #undef HAVE_XCONVERTCASE */ /* #undef HAVE_XFT */ @@ -53,9 +55,6 @@ #define USE_MMX 1 #endif -/* Define to use X11R6 additions to XIM */ -/* #undef USE_X11R6_XIM */ - /* Define to use XKB extension */ /* #undef HAVE_XKB */ @@ -86,204 +85,184 @@ 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 */ - /* always defined to indicate that i18n is enabled */ #define ENABLE_NLS 1 -/* Define if you have `alloca', as a function or macro. */ -#define HAVE_ALLOCA 1 +/* Define the location where the catalogs will be installed */ +#define GTK_LOCALEDIR "UNUSED" -/* Define if you have and it should be used (not on Ultrix). */ -/* #undef HAVE_ALLOCA_H */ - -/* Define if you have the header file. */ -/* #undef HAVE_ARGZ_H */ - -/* Define if you have the `bind_textdomain_codeset' function. */ -/* #undef HAVE_BIND_TEXTDOMAIN_CODESET */ +/* Define to 1 if you have the `bind_textdomain_codeset' function. */ +#define HAVE_BIND_TEXTDOMAIN_CODESET 1 /* Is the wctype implementation broken */ /* #undef HAVE_BROKEN_WCTYPE */ -/* Define if you have the `dcgettext' function. */ +/* Define to 1 if you have the `dcgettext' function. */ #define HAVE_DCGETTEXT 1 -/* Define if you have the header file. */ +/* Define to 1 if you have the header file. */ /* #undef HAVE_DLFCN_H */ -/* Define if you have the `getcwd' function. */ -#define HAVE_GETCWD 1 +/* Define to 1 if you have the `flockfile' function. */ +/* #undef HAVE_FLOCKFILE */ -/* Define if you have the `getpagesize' function. */ +/* Define to 1 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. */ +/* Define to 1 if you have the `getresuid' function. */ /* #undef HAVE_GETRESUID */ /* Define if the GNU gettext() function is already present or preinstalled. */ #define HAVE_GETTEXT 1 -/* Define if you have the header file. */ +/* Define to 1 if you have the header file. */ +#ifndef _MSC_VER +#define HAVE_INTTYPES_H 1 +#else /* _MSC_VER */ /* #undef HAVE_INTTYPES_H */ +#endif /* _MSC_VER */ /* Define if your file defines LC_MESSAGES. */ /* #undef HAVE_LC_MESSAGES */ -/* Define if you have the header file. */ -#define HAVE_LIMITS_H 1 - -/* Define if you have the header file. */ +/* Define to 1 if you have the header file. */ #define HAVE_LOCALE_H 1 -/* Define if you have the `lstat' function. */ +/* Define to 1 if you have the `lstat' function. */ /* #undef HAVE_LSTAT */ -/* Define if you have the header file. */ -#define HAVE_MALLOC_H 1 +/* Define to 1 if you have the `mallinfo' function. */ +/* #undef HAVE_MALLINFO */ -/* Define if you have the header file. */ +/* Define to 1 if you have the header file. */ #define HAVE_MEMORY_H 1 -/* Define if you have the `mkstemp' function. */ +/* Define to 1 if you have the `mkstemp' function. */ /* #undef HAVE_MKSTEMP */ -/* Define if you have a working `mmap' system call. */ +/* Define to 1 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 header file. */ -/* #undef HAVE_NL_TYPES_H */ - -/* Define if you have the `putenv' function. */ -#define HAVE_PUTENV 1 - -/* Define if you have the header file. */ +/* Define to 1 if you have the header file. */ /* #undef HAVE_PWD_H */ -/* Define if you have the `setenv' function. */ -/* #undef HAVE_SETENV */ +/* Have the Xrandr extension library */ +/* #undef HAVE_RANDR */ -/* Define if you have the `setlocale' function. */ -#define HAVE_SETLOCALE 1 - -/* Define if you have the header file. */ +/* Define to 1 if you have the 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 header file. */ +/* Define to 1 if you have the header file. */ #define HAVE_STDLIB_H 1 -/* Define if you have the `strcasecmp' function. */ -#ifndef _MSC_VER -#define HAVE_STRCASECMP 1 -#else /* _MSC_VER */ -/* #undef HAVE_STRCASECMP */ -#endif /* _MSC_VER */ - -/* Define if you have the `strchr' function. */ -#define HAVE_STRCHR 1 - -/* Define if you have the `strdup' function. */ -#define HAVE_STRDUP 1 - -/* Define if you have the header file. */ +/* Define to 1 if you have the header file. */ /* #undef HAVE_STRINGS_H */ -/* Define if you have the header file. */ +/* Define to 1 if you have the header file. */ #define HAVE_STRING_H 1 -/* Define if you have the header file. */ -/* #undef HAVE_SYS_PARAM_H */ - -/* Define if you have the header file. */ +/* Define to 1 if you have the header file. */ #define HAVE_SYS_STAT_H 1 -/* Define if you have the header file. */ +/* Define to 1 if you have the 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 header file. */ +/* Define to 1 if you have the header file. */ #define HAVE_SYS_TYPES_H 1 -/* Define if you have that is POSIX.1 compatible. */ +/* Define to 1 if you have that is POSIX.1 compatible. */ /* #undef HAVE_SYS_WAIT_H */ -/* Define if you have the header file. */ +/* Define to 1 if you have the header file. */ #ifndef _MSC_VER #define HAVE_UNISTD_H 1 #else /* _MSC_VER */ /* #undef HAVE_UNISTD_H */ #endif /* _MSC_VER */ +/* Have uxtheme.h include file */ +#define HAVE_UXTHEME_H 1 + /* Have wchar.h include file */ #define HAVE_WCHAR_H 1 /* Have wctype.h include file */ #define HAVE_WCTYPE_H 1 -/* Define if you have the header file. */ -#define HAVE_WINSOCK_H 1 +/* Define if we have X11R6 */ +/* #undef HAVE_X11R6 */ -/* Define if you have the `__argz_count' function. */ -/* #undef HAVE___ARGZ_COUNT */ +/* Define to 1 if you have the `XConvertCase' function. */ +/* #undef HAVE_XCONVERTCASE */ -/* Define if you have the `__argz_next' function. */ -/* #undef HAVE___ARGZ_NEXT */ +/* Have the Xcursor library */ +/* #undef HAVE_XCURSOR */ -/* Define if you have the `__argz_stringify' function. */ -/* #undef HAVE___ARGZ_STRINGIFY */ +/* Have the XFIXES X extension */ +/* #undef HAVE_XFIXES */ + +/* Define to 1 if you have the `XInternAtoms' function. */ +/* #undef HAVE_XINTERNATOMS */ + +/* Have the SYNC extension library */ +/* #undef HAVE_XSYNC */ + +/* Define if _NL_TIME_FIRST_WEEKDAY is available */ +/* #undef HAVE__NL_TIME_FIRST_WEEKDAY */ + +/* Define if needed for xReply */ +/* #undef NEED_XIPROTO_H_FOR_XREPLY */ + +/* Define to the address where bug reports for this package should be sent. */ +#define PACKAGE_BUGREPORT "http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B" + +/* Define to the full name of this package. */ +#define PACKAGE_NAME "gtk+" + +/* Define to the full name and version of this package. */ +#define PACKAGE_STRING "gtk+ 2.9.0" + +/* Define to the one symbol short name of this package. */ +#define PACKAGE_TARNAME "gtk+" + +/* Define to the version of this package. */ +#define PACKAGE_VERSION "@GTK_MAJOR_VERSION@.@GTK_MINOR_VERSION@.@GTK_MICRO_VERSION@" /* Define as the return type of signal handlers (`int' or `void'). */ #define RETSIGTYPE void -/* 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 to 1 if you have the ANSI C header files. */ #define STDC_HEADERS 1 -/* Define if the X Window System is missing or not being used. */ +/* Whether to load modules via .la files rather than directly */ +/* #undef USE_LA_MODULES */ + +/* Define to 1 if the X Window System is missing or not being used. */ /* #undef X_DISPLAY_MISSING */ +/* Number of bits in a file offset, on hosts where this is settable. */ +/* #undef _FILE_OFFSET_BITS */ + +/* Define for large files, on AIX-style hosts. */ +/* #undef _LARGE_FILES */ + /* Define to empty if `const' does not conform to ANSI C. */ /* #undef const */ /* Define to `int' if 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 does not define. */ -/* #undef off_t */ - -/* Define to `unsigned' if does not define. */ -/* #undef size_t */ - /* Define to `int' if doesn't define. */ #define uid_t int