Update to match what configure produces.

2007-11-28  Tor Lillqvist  <tml@novell.com>

	* config.h.win32.in: Update to match what configure produces.

svn path=/trunk/; revision=5976

diff --git a/ChangeLog b/ChangeLog
index 84ff713..4b38bec 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2007-11-28  Tor Lillqvist  <tml@novell.com>
+
+       * config.h.win32.in: Update to match what configure produces.
+
 2007-11-28  Alexander Larsson  <alexl@redhat.com>
 
        * glib/gstring.c (g_string_append_uri_escaped):

diff --git a/config.h.win32.in b/config.h.win32.in
index 8f3b721..16ef4f3 100644 (file)
--- a/config.h.win32.in
+++ b/config.h.win32.in
@@ -2,6 +2,12 @@
 /* config.h.  Generated by configure.  */
 /* config.h.in.  Generated from configure.in by autoheader.  */
 
+/* define if asm blocks can use numeric local labels */
+/* #undef ASM_NUMERIC_LABELS */
+
+/* poll doesn't work on devices */
+#define BROKEN_POLL 1
+
 /* 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.
    */
@@ -32,7 +38,7 @@
 #define GLIB_INTERFACE_AGE @GLIB_INTERFACE_AGE@
 
 /* Define the location where the catalogs will be installed */
-#define GLIB_LOCALE_DIR "NONE/lib/locale"
+#define GLIB_LOCALE_DIR "NONE/share/locale"
 
 /* Define to the GLIB major version */
 #define GLIB_MAJOR_VERSION @GLIB_MAJOR_VERSION@
@@ -52,6 +58,9 @@
 /* alpha atomic implementation */
 /* #undef G_ATOMIC_ALPHA */
 
+/* arm atomic implementation */
+/* #undef G_ATOMIC_ARM */
+
 /* i486 atomic implementation */
 #ifndef _MSC_VER
 #define G_ATOMIC_I486 1
@@ -72,9 +81,6 @@
 /* x86_64 atomic implementation */
 /* #undef G_ATOMIC_X86_64 */
 
-/* Whether glib was compiled with debugging enabled */
-#define G_COMPILED_WITH_DEBUGGING "yes"
-
 /* Have inline keyword */
 #ifndef _MSC_VER
 #define G_HAVE_INLINE 1
@@ -115,6 +121,9 @@
 /* Define to 1 if you have the `atexit' function. */
 #define HAVE_ATEXIT 1
 
+/* Define to 1 if you have the <attr/xattr.h> header file. */
+/* #undef HAVE_ATTR_XATTR_H */
+
 /* Define to 1 if you have the `bind_textdomain_codeset' function. */
 #define HAVE_BIND_TEXTDOMAIN_CODESET 1
 
@@ -126,6 +135,12 @@
    specified by the ISO C99 standard. */
 /* #undef HAVE_C99_VSNPRINTF */
 
+/* define to 1 if Carbon is available */
+/* #undef HAVE_CARBON */
+
+/* Define to 1 if you have the `chown' function. */
+/* #undef HAVE_CHOWN */
+
 /* Define to 1 if you have the `clock_gettime' function. */
 /* #undef HAVE_CLOCK_GETTIME */
 
@@ -150,18 +165,45 @@
 /* define for working do while(0) macros */
 #define HAVE_DOWHILE_MACROS 1
 
+/* Define to 1 if you have the `endmntent' function. */
+/* #undef HAVE_ENDMNTENT */
+
+/* Define if we have FAM */
+/* #undef HAVE_FAM */
+
+/* Define to 1 if you have the <fam.h> header file. */
+/* #undef HAVE_FAM_H */
+
+/* Define if we have FAMNoExists in fam */
+/* #undef HAVE_FAM_NO_EXISTS */
+
+/* Define to 1 if you have the `fchmod' function. */
+/* #undef HAVE_FCHMOD */
+
+/* Define to 1 if you have the `fchown' function. */
+/* #undef HAVE_FCHOWN */
+
 /* Define to 1 if you have the `fdwalk' function. */
 /* #undef HAVE_FDWALK */
 
 /* Define to 1 if you have the <float.h> header file. */
 #define HAVE_FLOAT_H 1
 
+/* Define to 1 if you have the <fstab.h> header file. */
+/* #undef HAVE_FSTAB_H */
+
 /* Define to 1 if you have the `getcwd' function. */
 #define HAVE_GETCWD 1
 
 /* Define to 1 if you have the `getc_unlocked' function. */
 /* #undef HAVE_GETC_UNLOCKED */
 
+/* Define to 1 if you have the `getgrgid' function. */
+/* #undef HAVE_GETGRGID */
+
+/* Define to 1 if you have the `getmntinfo' function. */
+/* #undef HAVE_GETMNTINFO */
+
 /* Define to 1 if you have the `getpagesize' function. */
 #if !defined(_MSC_VER) && !defined(__DMC__)
 #define HAVE_GETPAGESIZE 1
@@ -169,12 +211,21 @@
 /* #undef HAVE_GETPAGESIZE */
 #endif
 
+/* Define to 1 if you have the `getpwuid' function. */
+/* #undef HAVE_GETPWUID */
+
 /* Define if the GNU gettext() function is already present or preinstalled. */
 #define HAVE_GETTEXT 1
 
 /* define to use system printf */
 /* #undef HAVE_GOOD_PRINTF */
 
+/* Define to 1 if you have the <grp.h> header file. */
+/* #undef HAVE_GRP_H */
+
+/* Define to 1 if you have the `hasmntopt' function. */
+/* #undef HAVE_HASMNTOPT */
+
 /* define to support printing 64-bit integers with format I64 */
 #define HAVE_INT64_AND_I64 1
 
@@ -206,12 +257,21 @@
 /* Define to 1 if you have the <langinfo.h> header file. */
 /* #undef HAVE_LANGINFO_H */
 
+/* Define to 1 if you have the `lchown' function. */
+/* #undef HAVE_LCHOWN */
+
 /* Define if your <locale.h> file defines LC_MESSAGES. */
 /* #undef HAVE_LC_MESSAGES */
 
 /* Define to 1 if you have the <limits.h> header file. */
 #define HAVE_LIMITS_H 1
 
+/* Define to 1 if you have the `link' function. */
+/* #undef HAVE_LINK */
+
+/* Define to 1 if you have the <linux/inotify.h> header file. */
+/* #undef HAVE_LINUX_INOTIFY_H */
+
 /* Define to 1 if you have the <locale.h> header file. */
 #define HAVE_LOCALE_H 1
 
@@ -249,6 +309,9 @@
 /* Define to 1 if you have a working `mmap' system call. */
 /* #undef HAVE_MMAP */
 
+/* Define to 1 if you have the <mntent.h> header file. */
+/* #undef HAVE_MNTENT_H */
+
 /* Have a monotonic clock */
 /* #undef HAVE_MONOTONIC_CLOCK */
 
@@ -258,6 +321,9 @@
 /* Define to 1 if you have the `nl_langinfo' function. */
 /* #undef HAVE_NL_LANGINFO */
 
+/* Have non-POSIX function getgrgid_r */
+/* #undef HAVE_NONPOSIX_GETGRGID_R */
+
 /* Have non-POSIX function getpwuid_r */
 /* #undef HAVE_NONPOSIX_GETPWUID_R */
 
@@ -270,6 +336,9 @@
 /* Define to 1 if you have the `poll' function. */
 /* #undef HAVE_POLL */
 
+/* Have POSIX function getgrgid_r */
+/* #undef HAVE_POSIX_GETGRGID_R */
+
 /* Have POSIX function getpwuid_r */
 /* #undef HAVE_POSIX_GETPWUID_R */
 
@@ -291,12 +360,21 @@
 /* Define to 1 if you have the <sched.h> header file. */
 /* #undef HAVE_SCHED_H */
 
+/* Define to 1 if libselinux is available */
+/* #undef HAVE_SELINUX */
+
+/* Define to 1 if you have the <selinux/selinux.h> header file. */
+/* #undef HAVE_SELINUX_SELINUX_H */
+
 /* Define to 1 if you have the `setenv' function. */
 /* #undef HAVE_SETENV */
 
 /* Define to 1 if you have the `setlocale' function. */
 #define HAVE_SETLOCALE 1
 
+/* Define to 1 if you have the `setmntent' function. */
+/* #undef HAVE_SETMNTENT */
+
 /* Define to 1 if you have the `snprintf' function. */
 #ifndef _MSC_VER
 #define HAVE_SNPRINTF 1
@@ -307,6 +385,12 @@
 /* #undef HAVE_SNPRINTF */
 #endif /* _MSC_VER */
 
+/* Define to 1 if you have the `statfs' function. */
+/* #undef HAVE_STATFS */
+
+/* Define to 1 if you have the `statvfs' function. */
+/* #undef HAVE_STATVFS */
+
 /* Define to 1 if you have the <stddef.h> header file. */
 #define HAVE_STDDEF_H 1
 
@@ -317,8 +401,8 @@
 /* #undef HAVE_STDINT_H */
 #endif /* _MSC_VER */
 
-/* Define if <stdint.h> exists, doesn't clash with <sys/types.h>, and declares
-   uintmax_t. */
+/* Define if <stdint.h> exists, doesn't clash with <sys/types.h>, and 
+   declares uintmax_t. */
 #ifndef _MSC_VER
 #define HAVE_STDINT_H_WITH_UINTMAX 1
 #else /* _MSC_VER */
@@ -364,9 +448,45 @@
 /* Define to 1 if you have the `strsignal' function. */
 /* #undef HAVE_STRSIGNAL */
 
+/* Define to 1 if `st_atimensec' is member of `struct stat'. */
+/* #undef HAVE_STRUCT_STAT_ST_ATIMENSEC */
+
+/* Define to 1 if `st_atim.tv_nsec' is member of `struct stat'. */
+/* #undef HAVE_STRUCT_STAT_ST_ATIM_TV_NSEC */
+
+/* Define to 1 if `st_blksize' is member of `struct stat'. */
+/* #undef HAVE_STRUCT_STAT_ST_BLKSIZE */
+
+/* Define to 1 if `st_blocks' is member of `struct stat'. */
+/* #undef HAVE_STRUCT_STAT_ST_BLOCKS */
+
+/* Define to 1 if `st_ctimensec' is member of `struct stat'. */
+/* #undef HAVE_STRUCT_STAT_ST_CTIMENSEC */
+
+/* Define to 1 if `st_ctim.tv_nsec' is member of `struct stat'. */
+/* #undef HAVE_STRUCT_STAT_ST_CTIM_TV_NSEC */
+
+/* Define to 1 if `st_mtimensec' is member of `struct stat'. */
+/* #undef HAVE_STRUCT_STAT_ST_MTIMENSEC */
+
+/* Define to 1 if `st_mtim.tv_nsec' is member of `struct stat'. */
+/* #undef HAVE_STRUCT_STAT_ST_MTIM_TV_NSEC */
+
 /* Define to 1 if you have the `symlink' function. */
 /* #undef HAVE_SYMLINK */
 
+/* Define to 1 if you have the <sys/inotify.h> header file. */
+/* #undef HAVE_SYS_INOTIFY_H */
+
+/* Define to 1 if you have the <sys/mntctl.h> header file. */
+/* #undef HAVE_SYS_MNTCTL_H */
+
+/* Define to 1 if you have the <sys/mnttab.h> header file. */
+/* #undef HAVE_SYS_MNTTAB_H */
+
+/* Define to 1 if you have the <sys/mount.h> header file. */
+/* #undef HAVE_SYS_MOUNT_H */
+
 /* Define to 1 if you have the <sys/param.h> header file. */
 #if !defined(_MSC_VER) && !defined(__DMC__)
 #define HAVE_SYS_PARAM_H 1
@@ -377,12 +497,24 @@
 /* Define to 1 if you have the <sys/poll.h> header file. */
 /* #undef HAVE_SYS_POLL_H */
 
+/* Define to 1 if you have the <sys/resource.h> header file. */
+/* #undef HAVE_SYS_RESOURCE_H */
+
 /* found fd_set in sys/select.h */
 /* #undef HAVE_SYS_SELECT_H */
 
+/* Define to 1 if you have the <sys/statfs.h> header file. */
+/* #undef HAVE_SYS_STATFS_H */
+
+/* Define to 1 if you have the <sys/statvfs.h> header file. */
+/* #undef HAVE_SYS_STATVFS_H */
+
 /* Define to 1 if you have the <sys/stat.h> header file. */
 #define HAVE_SYS_STAT_H 1
 
+/* Define to 1 if you have the <sys/sysctl.h> header file. */
+/* #undef HAVE_SYS_SYSCTL_H */
+
 /* Define to 1 if you have the <sys/times.h> header file. */
 /* #undef HAVE_SYS_TIMES_H */
 
@@ -396,9 +528,21 @@
 /* Define to 1 if you have the <sys/types.h> header file. */
 #define HAVE_SYS_TYPES_H 1
 
+/* Define to 1 if you have the <sys/vfstab.h> header file. */
+/* #undef HAVE_SYS_VFSTAB_H */
+
+/* Define to 1 if you have the <sys/vfs.h> header file. */
+/* #undef HAVE_SYS_VFS_H */
+
+/* Define to 1 if you have the <sys/vmount.h> header file. */
+/* #undef HAVE_SYS_VMOUNT_H */
+
 /* Define to 1 if you have the <sys/wait.h> header file. */
 /* #undef HAVE_SYS_WAIT_H */
 
+/* Define to 1 if you have the <sys/xattr.h> header file. */
+/* #undef HAVE_SYS_XATTR_H */
+
 /* Define to 1 if you have the `timegm' function. */
 /* #undef HAVE_TIMEGM */
 
@@ -416,6 +560,9 @@
 /* Define to 1 if you have the `unsetenv' function. */
 /* #undef HAVE_UNSETENV */
 
+/* Define to 1 if you have the `utimes' function. */
+/* #undef HAVE_UTIMES */
+
 /* Define to 1 if you have the `valloc' function. */
 /* #undef HAVE_VALLOC */
 
@@ -454,6 +601,9 @@
 /* Have a working bcopy */
 /* #undef HAVE_WORKING_BCOPY */
 
+/* Define to 1 if xattr is available */
+/* #undef HAVE_XATTR */
+
 /* Define to 1 if you have the `_NSGetEnviron' function. */
 /* #undef HAVE__NSGETENVIRON */
 
@@ -463,6 +613,9 @@
 /* didn't find fd_set */
 #define NO_FD_SET 1
 
+/* Define to 1 if your C compiler doesn't accept -c and -o together. */
+/* #undef NO_MINUS_C_MINUS_O */
+
 /* global 'sys_errlist' not found */
 #define NO_SYS_ERRLIST 1
 
@@ -509,50 +662,53 @@
 /* #undef SANE_MALLOC_PROTOS */
 #endif /* _MSC_VER */
 
-/* The size of a `char', as computed by sizeof. */
+/* The size of `char', as computed by sizeof. */
 #define SIZEOF_CHAR 1
 
-/* The size of a `int', as computed by sizeof. */
+/* The size of `int', as computed by sizeof. */
 #define SIZEOF_INT 4
 
-/* The size of a `long', as computed by sizeof. */
+/* The size of `long', as computed by sizeof. */
 #define SIZEOF_LONG 4
 
-/* The size of a `long long', as computed by sizeof. */
+/* The size of `long long', as computed by sizeof. */
 #ifndef _MSC_VER
 #define SIZEOF_LONG_LONG 8
 #else /* _MSC_VER */
 #define SIZEOF_LONG_LONG 0
 #endif /* _MSC_VER */
 
-/* The size of a `short', as computed by sizeof. */
+/* The size of `short', as computed by sizeof. */
 #define SIZEOF_SHORT 2
 
-/* The size of a `size_t', as computed by sizeof. */
+/* The size of `size_t', as computed by sizeof. */
 #define SIZEOF_SIZE_T 4
 
-/* The size of a `void *', as computed by sizeof. */
+/* The size of `void *', as computed by sizeof. */
 #define SIZEOF_VOID_P 4
 
-/* The size of a `__int64', as computed by sizeof. */
+/* The size of `__int64', as computed by sizeof. */
 #define SIZEOF___INT64 8
 
 /* 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 */
+   automatically deduced at runtime.
+       STACK_DIRECTION > 0 => grows toward higher addresses
+       STACK_DIRECTION < 0 => grows toward lower addresses
+       STACK_DIRECTION = 0 => direction of growth unknown */
 /* #undef STACK_DIRECTION */
 
+/* Number of arguments to statfs() */
+/* #undef STATFS_ARGS */
+
 /* Define to 1 if you have the ANSI C header files. */
 #define STDC_HEADERS 1
 
 /* Using GNU libiconv */
-#define USE_LIBICONV_GNU 1
+/* #undef USE_LIBICONV_GNU */
 
 /* Using a native implementation of iconv in a separate library */
-/* #undef USE_LIBICONV_NATIVE */
+#define USE_LIBICONV_NATIVE 1
 
 /* using the system-supplied PCRE library */
 /* #undef USE_SYSTEM_PCRE */
@@ -580,5 +736,5 @@
 /* Define to empty if the C compiler doesn't support this keyword. */
 /* #undef signed */
 
-/* Define to `unsigned' if <sys/types.h> does not define. */
+/* Define to `unsigned int' if <sys/types.h> does not define. */
 /* #undef size_t */