rsvglibs: crate intl.dll and header file for windows

2 files changed, 2375 insertions, 1 deletions

diff --git a/gettext/gettext-0.18.1.1.patch b/gettext/gettext-0.18.1.1.patch
new file mode 100644
index 000000000000..c0a506332b69
--- /dev/null
+++ b/gettext/gettext-0.18.1.1.patch
@@ -0,0 +1,2365 @@
+--- misc/gettext-0.18.1.1/gettext-runtime/intl/makefile.mk	Wed Aug 20 14:33:55 2008
++++ misc/build/gettext-0.18.1.1/gettext-runtime/intl/makefile.mk	Wed Aug 20 14:26:42 2008
+@@ -1 +1,111 @@
+-dummy
++#*************************************************************************
++#
++# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++# 
++# Copyright 2000, 2010 Oracle and/or its affiliates.
++#
++# OpenOffice.org - a multi-platform office productivity suite
++#
++# This file is part of OpenOffice.org.
++#
++# OpenOffice.org is free software: you can redistribute it and/or modify
++# it under the terms of the GNU Lesser General Public License version 3
++# only, as published by the Free Software Foundation.
++#
++# OpenOffice.org is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++# GNU Lesser General Public License version 3 for more details
++# (a copy is included in the LICENSE file that accompanied this code).
++#
++# You should have received a copy of the GNU Lesser General Public License
++# version 3 along with OpenOffice.org.  If not, see
++# <http://www.openoffice.org/license.html>
++# for a copy of the LGPLv3 License.
++#
++#*************************************************************************
++
++PRJ=..$/..$/..$/..$/..$/..
++PRJINC=..
++PRJNAME=gettext
++TARGET=intl
++
++#ENABLE_EXCEPTIONS=TRUE
++VISIBILITY_HIDDEN=TRUE
++EXTERNAL_WARNINGS_NOT_ERRORS=TRUE
++
++# --- Settings ----------------------------------
++
++.INCLUDE : settings.mk
++
++#.IF "$(GUI)$(CPU)"=="WNTP"

++#CFLAGS+= -I .. -D HAVE_CONFIG_H -D FC_CACHEDIR=\".\" -DBUILDING_LIBINTL -DBUILDING_DLL -DIN_LIBINTL -DENABLE_RELOCATABLE=1 -DIN_LIBRARY -DNO_XMALLOC -Dset_relocation_prefix=libintl_set_relocation_prefix -Drelocate=libintl_relocate -DDEPENDS_ON_LIBICONV=1

++#CFLAGS+= -DLOCALEDIR=\"d:/tools/o_rsvglibs/DEV300/ooo/gettext/./wntmsci12/misc/share/locale\" -DLOCALE_ALIAS_PATH=\"d:/tools/o_rsvglibs/DEV300/ooo/gettext/./wntmsci12/misc/share/locale\" -DLIBDIR=\"d:/tools/o_rsvglibs/DEV300/ooo/gettext/./wntmsci12/misc/lib\"

++#CFLAGS+=-DDLL_EXPORT -DPIC -D_LIBC

++CFLAGS+=-c -DLOCALEDIR=\"d:/tools/o_rsvglibs/DEV300/ooo/gettext/./wntmsci12/misc/share/locale\" -DLOCALE_ALIAS_PATH=\"d:/tools/o_rsvglibs/DEV300/ooo/gettext/./wntmsci12/misc/share/locale\" -DLIBDIR=\"d:/tools/o_rsvglibs/DEV300/ooo/gettext/./wntmsci12/misc/lib\" 

++CFLAGS+=-DBUILDING_LIBINTL -DBUILDING_DLL -DIN_LIBINTL -DENABLE_RELOCATABLE=1 -DIN_LIBRARY -DINSTALLDIR=\"d:/tools/o_rsvglibs/DEV300/ooo/gettext/./wntmsci12/misc/lib\" -DNO_XMALLOC -Dset_relocation_prefix=libintl_set_relocation_prefix -Drelocate=libintl_relocate 

++CFLAGS+=-DDEPENDS_ON_LIBICONV=1 -DHAVE_CONFIG_H -I. -I. -I.. -DDLL_EXPORT -DPIC

++

++ #.ENDIF
++
++# --- Files -------------------------------------
++
++SLOFILES=\
++	$(SLO)$/bindtextdom.obj \
++	$(SLO)$/dcgettext.obj \
++	$(SLO)$/dgettext.obj \
++	$(SLO)$/gettext.obj \
++	$(SLO)$/finddomain.obj \
++	$(SLO)$/hash-string.obj \
++	$(SLO)$/loadmsgcat.obj \
++	$(SLO)$/localealias.obj \
++	$(SLO)$/textdomain.obj \
++	$(SLO)$/l10nflist.obj \
++	$(SLO)$/explodename.obj \
++	$(SLO)$/dcigettext.obj \
++	$(SLO)$/dcngettext.obj \
++	$(SLO)$/dngettext.obj \
++	$(SLO)$/ngettext.obj \
++	$(SLO)$/plural.obj \
++	$(SLO)$/plural-exp.obj \
++	$(SLO)$/localcharset.obj \
++	$(SLO)$/threadlib.obj \
++	$(SLO)$/lock.obj \
++	$(SLO)$/relocatable.obj \
++	$(SLO)$/langprefs.obj \
++	$(SLO)$/localename.obj \
++	$(SLO)$/log.obj \
++	$(SLO)$/printf.obj \
++	$(SLO)$/setlocale.obj \
++	$(SLO)$/version.obj \
++	$(SLO)$/osdep.obj \
++	$(SLO)$/intl-compat.obj
++
++# --- Library -----------------------------------
++
++SHL1TARGET=	$(TARGET)
++SHL1OBJS=$(SLOFILES)
++SHL1STDLIBS=\
++	Advapi32.lib
++
++
++SHL1DEPN=
++#SHL1IMPLIB=	i$(TARGET)
++#SHL1USE_EXPORTS=name
++
++SHL1DEF=	$(MISC)$/$(SHL1TARGET).def
++
++DEF1NAME=	$(SHL1TARGET)
++DEF1DEPN=	$(MISC)$/$(SHL1TARGET).flt \
++			$(SLB)$/$(TARGET).lib
++DEFLIB1NAME=$(TARGET)
++
++# --- Targets ----------------------------------
++
++.INCLUDE : target.mk
++
++# --- filter file ------------------------------
++
++$(MISC)$/$(SHL1TARGET).flt: makefile.mk
++    @echo CLEAR_THE_FILE	> $@
++
+--- misc/gettext-0.18.1.1/gettext-runtime/intl/printf-parse.c	2010-06-06 14:49:57.000000000 +0200
++++ misc/build/gettext-0.18.1.1/gettext-runtime/intl/printf-parse.c	2011-03-09 11:51:02.615094200 +0100
+@@ -75,6 +74,9 @@
+ # include "c-ctype.h"
+ #endif
+ 
++typedef __int64 intmax_t;
++
++
+ #ifdef STATIC
+ STATIC
+ #endif
+--- misc/gettext-0.18.1.1/gettext-runtime/config.h	Wed Aug 20 14:33:55 2008
++++ misc/build/gettext-0.18.1.1/gettext-runtime/config.h	Wed Aug 20 14:26:42 2008
+@@ -1 +1,1288 @@
+-dummy
++/* config.h.  Generated from config.h.in by configure.  */
++/* config.h.in.  Generated from configure.ac by autoheader.  */
++
++/* Define if the compiler is building for multiple architectures of Apple
++   platforms at once. */
++/* #undef AA_APPLE_UNIVERSAL_BUILD */
++
++/* Define to the number of bits in type 'ptrdiff_t'. */
++#define BITSIZEOF_PTRDIFF_T 32
++
++/* Define to the number of bits in type 'sig_atomic_t'. */
++#define BITSIZEOF_SIG_ATOMIC_T 32
++
++/* Define to the number of bits in type 'size_t'. */
++#define BITSIZEOF_SIZE_T 32
++
++/* Define to the number of bits in type 'wchar_t'. */
++#define BITSIZEOF_WCHAR_T 16
++
++/* Define to the number of bits in type 'wint_t'. */
++#define BITSIZEOF_WINT_T 16
++
++/* 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 mono is the preferred C# implementation. */
++/* #undef CSHARP_CHOICE_MONO */
++
++/* Define if pnet is the preferred C# implementation. */
++/* #undef CSHARP_CHOICE_PNET */
++
++/* Define to 1 if using `alloca.c'. */
++/* #undef C_ALLOCA */
++
++/* Define to 1 if // is a file system root distinct from /. */
++#define DOUBLE_SLASH_IS_DISTINCT_ROOT 1
++
++/* Define to 1 if translation of program messages to the user's native
++   language is requested. */
++#define ENABLE_NLS 1
++
++/* Define to 1 if the package shall run at any location in the file system. */
++/* #undef ENABLE_RELOCATABLE */
++
++/* Define on systems for which file names may have a so-called `drive letter'
++   prefix, define this to compute the length of that prefix, including the
++   colon. */
++#define FILE_SYSTEM_ACCEPTS_DRIVE_LETTER_PREFIX 1
++
++/* Define if the backslash character may also serve as a file name component
++   separator. */
++#define FILE_SYSTEM_BACKSLASH_IS_FILE_NAME_SEPARATOR 1
++
++/* Define if a drive letter prefix denotes a relative path if it is not
++   followed by a file name component separator. */
++#define FILE_SYSTEM_DRIVE_PREFIX_CAN_BE_RELATIVE 1
++
++/* Define to 1 if realpath() can malloc memory, always gives an absolute path,
++   and handles trailing slash correctly. */
++/* #undef FUNC_REALPATH_WORKS */
++
++/* Define to a C preprocessor expression that evaluates to 1 or 0, depending
++   whether the gnulib module canonicalize-lgpl shall be considered present. */
++#define GNULIB_CANONICALIZE_LGPL 1
++
++/* Define to a C preprocessor expression that evaluates to 1 or 0, depending
++   whether the gnulib module fwriteerror shall be considered present. */
++#define GNULIB_FWRITEERROR 1
++
++/* Define to a C preprocessor expression that evaluates to 1 or 0, depending
++   whether the gnulib module sigpipe shall be considered present. */
++#define GNULIB_SIGPIPE 1
++
++/* Define to 1 when the gnulib module canonicalize_file_name should be tested.
++   */
++#define GNULIB_TEST_CANONICALIZE_FILE_NAME 1
++
++/* Define to 1 when the gnulib module environ should be tested. */
++#define GNULIB_TEST_ENVIRON 1
++
++/* Define to 1 when the gnulib module getopt-gnu should be tested. */
++#define GNULIB_TEST_GETOPT_GNU 1
++
++/* Define to 1 when the gnulib module lstat should be tested. */
++#define GNULIB_TEST_LSTAT 1
++
++/* Define to 1 when the gnulib module malloc-posix should be tested. */
++#define GNULIB_TEST_MALLOC_POSIX 1
++
++/* Define to 1 when the gnulib module mbrtowc should be tested. */
++#define GNULIB_TEST_MBRTOWC 1
++
++/* Define to 1 when the gnulib module mbsinit should be tested. */
++#define GNULIB_TEST_MBSINIT 1
++
++/* Define to 1 when the gnulib module mbslen should be tested. */
++#define GNULIB_TEST_MBSLEN 1
++
++/* Define to 1 when the gnulib module mbsstr should be tested. */
++#define GNULIB_TEST_MBSSTR 1
++
++/* Define to 1 when the gnulib module memchr should be tested. */
++#define GNULIB_TEST_MEMCHR 1
++
++/* Define to 1 when the gnulib module readlink should be tested. */
++#define GNULIB_TEST_READLINK 1
++
++/* Define to 1 when the gnulib module realpath should be tested. */
++#define GNULIB_TEST_REALPATH 1
++
++/* Define to 1 when the gnulib module sigprocmask should be tested. */
++#define GNULIB_TEST_SIGPROCMASK 1
++
++/* Define to 1 when the gnulib module stat should be tested. */
++#define GNULIB_TEST_STAT 1
++
++/* Define to 1 when the gnulib module strerror should be tested. */
++#define GNULIB_TEST_STRERROR 1
++
++/* Define to 1 when the gnulib module strnlen should be tested. */
++#define GNULIB_TEST_STRNLEN 1
++
++/* Define to 1 when the gnulib module wcwidth should be tested. */
++#define GNULIB_TEST_WCWIDTH 1
++
++/* Define to 1 if you have `alloca', as a function or macro. */
++#define HAVE_ALLOCA 1
++
++/* Define to 1 if you have <alloca.h> and it should be used (not on Ultrix).
++   */
++/* #undef HAVE_ALLOCA_H */
++
++/* Define to 1 if you have the `argz_count' function. */
++/* #undef HAVE_ARGZ_COUNT */
++
++/* Define to 1 if you have the <argz.h> header file. */
++/* #undef HAVE_ARGZ_H */
++
++/* Define to 1 if you have the `argz_next' function. */
++/* #undef HAVE_ARGZ_NEXT */
++
++/* Define to 1 if you have the `argz_stringify' function. */
++/* #undef HAVE_ARGZ_STRINGIFY */
++
++/* Define to 1 if you have the `asprintf' function. */
++/* #undef HAVE_ASPRINTF */
++
++/* Define to 1 if you have the `atexit' function. */
++#define HAVE_ATEXIT 1
++
++/* Define to 1 if you have the <bp-sym.h> header file. */
++/* #undef HAVE_BP_SYM_H */
++
++/* Define to 1 if the compiler understands __builtin_expect. */
++/* #undef HAVE_BUILTIN_EXPECT */
++
++/* Define to 1 if you have the `canonicalize_file_name' function. */
++/* #undef HAVE_CANONICALIZE_FILE_NAME */
++
++/* Define to 1 if you have the MacOS X function CFLocaleCopyCurrent in the
++   CoreFoundation framework. */
++/* #undef HAVE_CFLOCALECOPYCURRENT */
++
++/* Define to 1 if you have the MacOS X function CFPreferencesCopyAppValue in
++   the CoreFoundation framework. */
++/* #undef HAVE_CFPREFERENCESCOPYAPPVALUE */
++
++/* Define if the GNU dcgettext() function is already present or preinstalled.
++   */
++/* #undef HAVE_DCGETTEXT */
++
++/* Define to 1 if you have the declaration of `clearerr_unlocked', and to 0 if
++   you don't. */
++#define HAVE_DECL_CLEARERR_UNLOCKED 0
++
++/* Define to 1 if you have the declaration of `feof_unlocked', and to 0 if you
++   don't. */
++#define HAVE_DECL_FEOF_UNLOCKED 0
++
++/* Define to 1 if you have the declaration of `ferror_unlocked', and to 0 if
++   you don't. */
++#define HAVE_DECL_FERROR_UNLOCKED 0
++
++/* Define to 1 if you have the declaration of `fflush_unlocked', and to 0 if
++   you don't. */
++#define HAVE_DECL_FFLUSH_UNLOCKED 0
++
++/* Define to 1 if you have the declaration of `fgets_unlocked', and to 0 if
++   you don't. */
++#define HAVE_DECL_FGETS_UNLOCKED 0
++
++/* Define to 1 if you have the declaration of `fputc_unlocked', and to 0 if
++   you don't. */
++#define HAVE_DECL_FPUTC_UNLOCKED 0
++
++/* Define to 1 if you have the declaration of `fputs_unlocked', and to 0 if
++   you don't. */
++#define HAVE_DECL_FPUTS_UNLOCKED 0
++
++/* Define to 1 if you have the declaration of `fread_unlocked', and to 0 if
++   you don't. */
++#define HAVE_DECL_FREAD_UNLOCKED 0
++
++/* Define to 1 if you have the declaration of `fwrite_unlocked', and to 0 if
++   you don't. */
++#define HAVE_DECL_FWRITE_UNLOCKED 0
++
++/* Define to 1 if you have the declaration of `getchar_unlocked', and to 0 if
++   you don't. */
++#define HAVE_DECL_GETCHAR_UNLOCKED 0
++
++/* Define to 1 if you have the declaration of `getc_unlocked', and to 0 if you
++   don't. */
++#define HAVE_DECL_GETC_UNLOCKED 0
++
++/* Define to 1 if you have the declaration of `getenv', and to 0 if you don't.
++   */
++#define HAVE_DECL_GETENV 1
++
++/* Define to 1 if you have the declaration of `getopt_clip', and to 0 if you
++   don't. */
++/* #undef HAVE_DECL_GETOPT_CLIP */
++
++/* Define to 1 if you have the declaration of `optreset', and to 0 if you
++   don't. */
++/* #undef HAVE_DECL_OPTRESET */
++
++/* Define to 1 if you have the declaration of `program_invocation_name', and
++   to 0 if you don't. */
++#define HAVE_DECL_PROGRAM_INVOCATION_NAME 0
++
++/* Define to 1 if you have the declaration of `program_invocation_short_name',
++   and to 0 if you don't. */
++#define HAVE_DECL_PROGRAM_INVOCATION_SHORT_NAME 0
++
++/* Define to 1 if you have the declaration of `putchar_unlocked', and to 0 if
++   you don't. */
++#define HAVE_DECL_PUTCHAR_UNLOCKED 0
++
++/* Define to 1 if you have the declaration of `putc_unlocked', and to 0 if you
++   don't. */
++#define HAVE_DECL_PUTC_UNLOCKED 0
++
++/* Define to 1 if you have the declaration of `strerror', and to 0 if you
++   don't. */
++#define HAVE_DECL_STRERROR 1
++
++/* Define to 1 if you have the declaration of `strerror_r', and to 0 if you
++   don't. */
++#define HAVE_DECL_STRERROR_R 0
++
++/* Define to 1 if you have the declaration of `strnlen', and to 0 if you
++   don't. */
++#define HAVE_DECL_STRNLEN 1
++
++/* Define to 1 if you have the declaration of `wcwidth', and to 0 if you
++   don't. */
++#define HAVE_DECL_WCWIDTH 0
++
++/* Define to 1 if you have the declaration of `_snprintf', and to 0 if you
++   don't. */
++#define HAVE_DECL__SNPRINTF 1
++
++/* Define to 1 if you have the declaration of `_snwprintf', and to 0 if you
++   don't. */
++#define HAVE_DECL__SNWPRINTF 1
++
++/* Define to 1 if you have the <dlfcn.h> header file. */
++/* #undef HAVE_DLFCN_H */
++
++/* Define if you have the declaration of environ. */
++/* #undef HAVE_ENVIRON_DECL */
++
++/* Define to 1 if you have the <errno.h> header file. */
++#define HAVE_ERRNO_H 1
++
++/* Define to 1 if you have the `fwprintf' function. */
++#define HAVE_FWPRINTF 1
++
++/* Define to 1 if you have the `getcwd' function. */
++#define HAVE_GETCWD 1
++
++/* Define to 1 if you have the `getegid' function. */
++/* #undef HAVE_GETEGID */
++
++/* Define to 1 if you have the `geteuid' function. */
++/* #undef HAVE_GETEUID */
++
++/* Define to 1 if you have the `getgid' function. */
++/* #undef HAVE_GETGID */
++
++/* Define to 1 if you have the <getopt.h> header file. */
++/* #undef HAVE_GETOPT_H */
++
++/* Define to 1 if you have the `getopt_long_only' function. */
++/* #undef HAVE_GETOPT_LONG_ONLY */
++
++/* Define to 1 if you have the `getpagesize' function. */
++/* #undef HAVE_GETPAGESIZE */
++
++/* Define if the GNU gettext() function is already present or preinstalled. */
++/* #undef HAVE_GETTEXT */
++
++/* Define to 1 if you have the `getuid' function. */
++/* #undef HAVE_GETUID */
++
++/* Define if you have the iconv() function and it works. */
++/* #undef HAVE_ICONV */
++
++/* Define to 1 if you have the <iconv.h> header file. */
++/* #undef HAVE_ICONV_H */
++
++/* Define if you have the 'intmax_t' type in <stdint.h> or <inttypes.h>. */
++/* #undef HAVE_INTMAX_T */
++#ifndef _MSC_VER
++#define HAVE_INTMAX_T 1
++#else /* _MSC_VER */
++/* #undef HAVE_INTMAX_T */
++#endif /* _MSC_VER */
++
++
++/* Define to 1 if you have the <inttypes.h> header file. */
++/* #undef HAVE_INTTYPES_H */
++#ifndef _MSC_VER
++#define HAVE_INTTYPES_H 1
++#else /* _MSC_VER */
++/* #undef HAVE_INTTYPES_H */
++#endif /* _MSC_VER */
++
++
++/* Define if <inttypes.h> exists, doesn't clash with <sys/types.h>, and
++   declares uintmax_t. */
++/* #undef HAVE_INTTYPES_H_WITH_UINTMAX */
++#ifndef _MSC_VER
++#define HAVE_INTTYPES_H_WITH_UINTMAX 1
++#else /* _MSC_VER */
++/* #undef HAVE_INTTYPES_H_WITH_UINTMAX */
++#endif /* _MSC_VER */
++
++
++/* Define to 1 if you have the `iswblank' function. */
++/* #undef HAVE_ISWBLANK */
++
++/* Define to 1 if you have the `iswcntrl' function. */
++#define HAVE_ISWCNTRL 1
++
++/* Define if you have <langinfo.h> and nl_langinfo(CODESET). */
++/* #undef HAVE_LANGINFO_CODESET */
++
++/* 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 the system has the type `long long int'. */
++#define HAVE_LONG_LONG_INT 1
++
++/* Define to 1 if you have the `lstat' function. */
++/* #undef HAVE_LSTAT */
++
++/* Define to 1 if you have the <mach-o/dyld.h> header file. */
++/* #undef HAVE_MACH_O_DYLD_H */
++
++/* Define if the 'malloc' function is POSIX compliant. */
++/* #undef HAVE_MALLOC_POSIX */
++
++/* Define to 1 if mmap()'s MAP_ANONYMOUS flag is available after including
++   config.h and <sys/mman.h>. */
++/* #undef HAVE_MAP_ANONYMOUS */
++
++/* Define to 1 if you have the `mbrtowc' function. */
++#define HAVE_MBRTOWC 1
++
++/* Define to 1 if you have the `mbsinit' function. */
++/* #undef HAVE_MBSINIT */
++
++/* Define to 1 if you have the `mbslen' function. */
++/* #undef HAVE_MBSLEN */
++
++/* Define to 1 if <wchar.h> declares mbstate_t. */
++#define HAVE_MBSTATE_T 1
++
++/* Define to 1 if you have the `memchr' function. */
++#define HAVE_MEMCHR 1
++
++/* Define to 1 if you have the `memmove' function. */
++#define HAVE_MEMMOVE 1
++
++/* Define to 1 if you have the <memory.h> header file. */
++#define HAVE_MEMORY_H 1
++
++/* Define to 1 if you have the `mempcpy' function. */
++/* #undef HAVE_MEMPCPY */
++
++/* Define to 1 if you have a working `mmap' system call. */
++/* #undef HAVE_MMAP */
++
++/* Define to 1 if you have the `mprotect' function. */
++/* #undef HAVE_MPROTECT */
++
++/* Define to 1 if you have the `munmap' function. */
++/* #undef HAVE_MUNMAP */
++
++/* Define to 1 if you have the `newlocale' function. */
++/* #undef HAVE_NEWLOCALE */
++
++/* Define to 1 if you have the `pathconf' function. */
++/* #undef HAVE_PATHCONF */
++
++/* Define if your printf() function supports format strings with positions. */
++/* #undef HAVE_POSIX_PRINTF */
++
++/* Define if the <pthread.h> defines PTHREAD_MUTEX_RECURSIVE. */
++/* #undef HAVE_PTHREAD_MUTEX_RECURSIVE */
++
++/* Define if the POSIX multithreading library has read/write locks. */
++/* #undef HAVE_PTHREAD_RWLOCK */
++
++/* Define to 1 if you have the `putenv' function. */
++#define HAVE_PUTENV 1
++
++/* Define to 1 if you have the <random.h> header file. */
++/* #undef HAVE_RANDOM_H */
++
++/* Define to 1 if atoll is declared even after undefining macros. */
++/* #undef HAVE_RAW_DECL_ATOLL */
++
++/* Define to 1 if btowc is declared even after undefining macros. */
++#define HAVE_RAW_DECL_BTOWC 1
++
++/* Define to 1 if canonicalize_file_name is declared even after undefining
++   macros. */
++/* #undef HAVE_RAW_DECL_CANONICALIZE_FILE_NAME */
++
++/* Define to 1 if chown is declared even after undefining macros. */
++/* #undef HAVE_RAW_DECL_CHOWN */
++
++/* Define to 1 if dprintf is declared even after undefining macros. */
++/* #undef HAVE_RAW_DECL_DPRINTF */
++
++/* Define to 1 if dup2 is declared even after undefining macros. */
++#define HAVE_RAW_DECL_DUP2 1
++
++/* Define to 1 if dup3 is declared even after undefining macros. */
++/* #undef HAVE_RAW_DECL_DUP3 */
++
++/* Define to 1 if endusershell is declared even after undefining macros. */
++/* #undef HAVE_RAW_DECL_ENDUSERSHELL */
++
++/* Define to 1 if environ is declared even after undefining macros. */
++/* #undef HAVE_RAW_DECL_ENVIRON */
++
++/* Define to 1 if euidaccess is declared even after undefining macros. */
++/* #undef HAVE_RAW_DECL_EUIDACCESS */
++
++/* Define to 1 if faccessat is declared even after undefining macros. */
++/* #undef HAVE_RAW_DECL_FACCESSAT */
++
++/* Define to 1 if fchdir is declared even after undefining macros. */
++/* #undef HAVE_RAW_DECL_FCHDIR */
++
++/* Define to 1 if fchmodat is declared even after undefining macros. */
++/* #undef HAVE_RAW_DECL_FCHMODAT */
++
++/* Define to 1 if fchownat is declared even after undefining macros. */
++/* #undef HAVE_RAW_DECL_FCHOWNAT */
++
++/* Define to 1 if fpurge is declared even after undefining macros. */
++/* #undef HAVE_RAW_DECL_FPURGE */
++
++/* Define to 1 if fseeko is declared even after undefining macros. */
++/* #undef HAVE_RAW_DECL_FSEEKO */
++
++/* Define to 1 if fstatat is declared even after undefining macros. */
++/* #undef HAVE_RAW_DECL_FSTATAT */
++
++/* Define to 1 if fsync is declared even after undefining macros. */
++/* #undef HAVE_RAW_DECL_FSYNC */
++
++/* Define to 1 if ftello is declared even after undefining macros. */
++/* #undef HAVE_RAW_DECL_FTELLO */
++
++/* Define to 1 if ftruncate is declared even after undefining macros. */
++/* #undef HAVE_RAW_DECL_FTRUNCATE */
++
++/* Define to 1 if futimens is declared even after undefining macros. */
++/* #undef HAVE_RAW_DECL_FUTIMENS */
++
++/* Define to 1 if getcwd is declared even after undefining macros. */
++/* #undef HAVE_RAW_DECL_GETCWD */
++
++/* Define to 1 if getdelim is declared even after undefining macros. */
++/* #undef HAVE_RAW_DECL_GETDELIM */
++
++/* Define to 1 if getdomainname is declared even after undefining macros. */
++/* #undef HAVE_RAW_DECL_GETDOMAINNAME */
++
++/* Define to 1 if getdtablesize is declared even after undefining macros. */
++/* #undef HAVE_RAW_DECL_GETDTABLESIZE */
++
++/* Define to 1 if getgroups is declared even after undefining macros. */
++/* #undef HAVE_RAW_DECL_GETGROUPS */
++
++/* Define to 1 if gethostname is declared even after undefining macros. */
++/* #undef HAVE_RAW_DECL_GETHOSTNAME */
++
++/* Define to 1 if getline is declared even after undefining macros. */
++/* #undef HAVE_RAW_DECL_GETLINE */
++
++/* Define to 1 if getloadavg is declared even after undefining macros. */
++/* #undef HAVE_RAW_DECL_GETLOADAVG */
++
++/* Define to 1 if getlogin is declared even after undefining macros. */
++/* #undef HAVE_RAW_DECL_GETLOGIN */
++
++/* Define to 1 if getlogin_r is declared even after undefining macros. */
++/* #undef HAVE_RAW_DECL_GETLOGIN_R */
++
++/* Define to 1 if getpagesize is declared even after undefining macros. */
++/* #undef HAVE_RAW_DECL_GETPAGESIZE */
++
++/* Define to 1 if getsubopt is declared even after undefining macros. */
++/* #undef HAVE_RAW_DECL_GETSUBOPT */
++
++/* Define to 1 if getusershell is declared even after undefining macros. */
++/* #undef HAVE_RAW_DECL_GETUSERSHELL */
++
++/* Define to 1 if grantpt is declared even after undefining macros. */
++/* #undef HAVE_RAW_DECL_GRANTPT */
++
++/* Define to 1 if initstat_r is declared even after undefining macros. */
++/* #undef HAVE_RAW_DECL_INITSTAT_R */
++
++/* Define to 1 if lchmod is declared even after undefining macros. */
++/* #undef HAVE_RAW_DECL_LCHMOD */
++
++/* Define to 1 if lchown is declared even after undefining macros. */
++/* #undef HAVE_RAW_DECL_LCHOWN */
++
++/* Define to 1 if link is declared even after undefining macros. */
++/* #undef HAVE_RAW_DECL_LINK */
++
++/* Define to 1 if linkat is declared even after undefining macros. */
++/* #undef HAVE_RAW_DECL_LINKAT */
++
++/* Define to 1 if lseek is declared even after undefining macros. */
++#define HAVE_RAW_DECL_LSEEK 1
++
++/* Define to 1 if lstat is declared even after undefining macros. */
++/* #undef HAVE_RAW_DECL_LSTAT */
++
++/* Define to 1 if mbrlen is declared even after undefining macros. */
++#define HAVE_RAW_DECL_MBRLEN 1
++
++/* Define to 1 if mbrtowc is declared even after undefining macros. */
++#define HAVE_RAW_DECL_MBRTOWC 1
++
++/* Define to 1 if mbsinit is declared even after undefining macros. */
++#define HAVE_RAW_DECL_MBSINIT 1
++
++/* Define to 1 if mbsnrtowcs is declared even after undefining macros. */
++/* #undef HAVE_RAW_DECL_MBSNRTOWCS */
++
++/* Define to 1 if mbsrtowcs is declared even after undefining macros. */
++#define HAVE_RAW_DECL_MBSRTOWCS 1
++
++/* Define to 1 if memmem is declared even after undefining macros. */
++/* #undef HAVE_RAW_DECL_MEMMEM */
++
++/* Define to 1 if mempcpy is declared even after undefining macros. */
++/* #undef HAVE_RAW_DECL_MEMPCPY */
++
++/* Define to 1 if memrchr is declared even after undefining macros. */
++/* #undef HAVE_RAW_DECL_MEMRCHR */
++
++/* Define to 1 if mkdirat is declared even after undefining macros. */
++/* #undef HAVE_RAW_DECL_MKDIRAT */
++
++/* Define to 1 if mkdtemp is declared even after undefining macros. */
++/* #undef HAVE_RAW_DECL_MKDTEMP */
++
++/* Define to 1 if mkfifo is declared even after undefining macros. */
++/* #undef HAVE_RAW_DECL_MKFIFO */
++
++/* Define to 1 if mkfifoat is declared even after undefining macros. */
++/* #undef HAVE_RAW_DECL_MKFIFOAT */
++
++/* Define to 1 if mknod is declared even after undefining macros. */
++/* #undef HAVE_RAW_DECL_MKNOD */
++
++/* Define to 1 if mknodat is declared even after undefining macros. */
++/* #undef HAVE_RAW_DECL_MKNODAT */
++
++/* Define to 1 if mkostemp is declared even after undefining macros. */
++/* #undef HAVE_RAW_DECL_MKOSTEMP */
++
++/* Define to 1 if mkostemps is declared even after undefining macros. */
++/* #undef HAVE_RAW_DECL_MKOSTEMPS */
++
++/* Define to 1 if mkstemp is declared even after undefining macros. */
++/* #undef HAVE_RAW_DECL_MKSTEMP */
++
++/* Define to 1 if mkstemps is declared even after undefining macros. */
++/* #undef HAVE_RAW_DECL_MKSTEMPS */
++
++/* Define to 1 if pipe2 is declared even after undefining macros. */
++/* #undef HAVE_RAW_DECL_PIPE2 */
++
++/* Define to 1 if popen is declared even after undefining macros. */
++/* #undef HAVE_RAW_DECL_POPEN */
++
++/* Define to 1 if pread is declared even after undefining macros. */
++/* #undef HAVE_RAW_DECL_PREAD */
++
++/* Define to 1 if ptsname is declared even after undefining macros. */
++/* #undef HAVE_RAW_DECL_PTSNAME */
++
++/* Define to 1 if pwrite is declared even after undefining macros. */
++/* #undef HAVE_RAW_DECL_PWRITE */
++
++/* Define to 1 if random_r is declared even after undefining macros. */
++/* #undef HAVE_RAW_DECL_RANDOM_R */
++
++/* Define to 1 if rawmemchr is declared even after undefining macros. */
++/* #undef HAVE_RAW_DECL_RAWMEMCHR */
++
++/* Define to 1 if readlink is declared even after undefining macros. */
++/* #undef HAVE_RAW_DECL_READLINK */
++
++/* Define to 1 if readlinkat is declared even after undefining macros. */
++/* #undef HAVE_RAW_DECL_READLINKAT */
++
++/* Define to 1 if realpath is declared even after undefining macros. */
++/* #undef HAVE_RAW_DECL_REALPATH */
++
++/* Define to 1 if renameat is declared even after undefining macros. */
++/* #undef HAVE_RAW_DECL_RENAMEAT */
++
++/* Define to 1 if rmdir is declared even after undefining macros. */
++/* #undef HAVE_RAW_DECL_RMDIR */
++
++/* Define to 1 if rpmatch is declared even after undefining macros. */
++/* #undef HAVE_RAW_DECL_RPMATCH */
++
++/* Define to 1 if setenv is declared even after undefining macros. */
++/* #undef HAVE_RAW_DECL_SETENV */
++
++/* Define to 1 if setstate_r is declared even after undefining macros. */
++/* #undef HAVE_RAW_DECL_SETSTATE_R */
++
++/* Define to 1 if setusershell is declared even after undefining macros. */
++/* #undef HAVE_RAW_DECL_SETUSERSHELL */
++
++/* Define to 1 if sigaction is declared even after undefining macros. */
++/* #undef HAVE_RAW_DECL_SIGACTION */
++
++/* Define to 1 if sigaddset is declared even after undefining macros. */
++/* #undef HAVE_RAW_DECL_SIGADDSET */
++
++/* Define to 1 if sigdelset is declared even after undefining macros. */
++/* #undef HAVE_RAW_DECL_SIGDELSET */
++
++/* Define to 1 if sigemptyset is declared even after undefining macros. */
++/* #undef HAVE_RAW_DECL_SIGEMPTYSET */
++
++/* Define to 1 if sigfillset is declared even after undefining macros. */
++/* #undef HAVE_RAW_DECL_SIGFILLSET */
++
++/* Define to 1 if sigismember is declared even after undefining macros. */
++/* #undef HAVE_RAW_DECL_SIGISMEMBER */
++
++/* Define to 1 if sigpending is declared even after undefining macros. */
++/* #undef HAVE_RAW_DECL_SIGPENDING */
++
++/* Define to 1 if sigprocmask is declared even after undefining macros. */
++/* #undef HAVE_RAW_DECL_SIGPROCMASK */
++
++/* Define to 1 if sleep is declared even after undefining macros. */
++/* #undef HAVE_RAW_DECL_SLEEP */
++
++/* Define to 1 if snprintf is declared even after undefining macros. */
++/* #undef HAVE_RAW_DECL_SNPRINTF */
++
++/* Define to 1 if srandom_r is declared even after undefining macros. */
++/* #undef HAVE_RAW_DECL_SRANDOM_R */
++
++/* Define to 1 if stat is declared even after undefining macros. */
++#define HAVE_RAW_DECL_STAT 1
++
++/* Define to 1 if stpcpy is declared even after undefining macros. */
++/* #undef HAVE_RAW_DECL_STPCPY */
++
++/* Define to 1 if stpncpy is declared even after undefining macros. */
++/* #undef HAVE_RAW_DECL_STPNCPY */
++
++/* Define to 1 if strcasestr is declared even after undefining macros. */
++/* #undef HAVE_RAW_DECL_STRCASESTR */
++
++/* Define to 1 if strchrnul is declared even after undefining macros. */
++/* #undef HAVE_RAW_DECL_STRCHRNUL */
++
++/* Define to 1 if strdup is declared even after undefining macros. */
++#define HAVE_RAW_DECL_STRDUP 1
++
++/* Define to 1 if strncat is declared even after undefining macros. */
++#define HAVE_RAW_DECL_STRNCAT 1
++
++/* Define to 1 if strndup is declared even after undefining macros. */
++/* #undef HAVE_RAW_DECL_STRNDUP */
++
++/* Define to 1 if strnlen is declared even after undefining macros. */
++#define HAVE_RAW_DECL_STRNLEN 1
++
++/* Define to 1 if strpbrk is declared even after undefining macros. */
++#define HAVE_RAW_DECL_STRPBRK 1
++
++/* Define to 1 if strsep is declared even after undefining macros. */
++/* #undef HAVE_RAW_DECL_STRSEP */
++
++/* Define to 1 if strsignal is declared even after undefining macros. */
++/* #undef HAVE_RAW_DECL_STRSIGNAL */
++
++/* Define to 1 if strtod is declared even after undefining macros. */
++#define HAVE_RAW_DECL_STRTOD 1
++
++/* Define to 1 if strtok_r is declared even after undefining macros. */
++/* #undef HAVE_RAW_DECL_STRTOK_R */
++
++/* Define to 1 if strtoll is declared even after undefining macros. */
++/* #undef HAVE_RAW_DECL_STRTOLL */
++
++/* Define to 1 if strtoull is declared even after undefining macros. */
++/* #undef HAVE_RAW_DECL_STRTOULL */
++
++/* Define to 1 if strverscmp is declared even after undefining macros. */
++/* #undef HAVE_RAW_DECL_STRVERSCMP */
++
++/* Define to 1 if symlink is declared even after undefining macros. */
++/* #undef HAVE_RAW_DECL_SYMLINK */
++
++/* Define to 1 if symlinkat is declared even after undefining macros. */
++/* #undef HAVE_RAW_DECL_SYMLINKAT */
++
++/* Define to 1 if tmpfile is declared even after undefining macros. */
++#define HAVE_RAW_DECL_TMPFILE 1
++
++/* Define to 1 if ttyname_r is declared even after undefining macros. */
++/* #undef HAVE_RAW_DECL_TTYNAME_R */
++
++/* Define to 1 if unlink is declared even after undefining macros. */
++#define HAVE_RAW_DECL_UNLINK 1
++
++/* Define to 1 if unlinkat is declared even after undefining macros. */
++/* #undef HAVE_RAW_DECL_UNLINKAT */
++
++/* Define to 1 if unlockpt is declared even after undefining macros. */
++/* #undef HAVE_RAW_DECL_UNLOCKPT */
++
++/* Define to 1 if unsetenv is declared even after undefining macros. */
++/* #undef HAVE_RAW_DECL_UNSETENV */
++
++/* Define to 1 if usleep is declared even after undefining macros. */
++/* #undef HAVE_RAW_DECL_USLEEP */
++
++/* Define to 1 if utimensat is declared even after undefining macros. */
++/* #undef HAVE_RAW_DECL_UTIMENSAT */
++
++/* Define to 1 if vdprintf is declared even after undefining macros. */
++/* #undef HAVE_RAW_DECL_VDPRINTF */
++
++/* Define to 1 if vsnprintf is declared even after undefining macros. */
++#define HAVE_RAW_DECL_VSNPRINTF 1
++
++/* Define to 1 if wcrtomb is declared even after undefining macros. */
++#define HAVE_RAW_DECL_WCRTOMB 1
++
++/* Define to 1 if wcsnrtombs is declared even after undefining macros. */
++/* #undef HAVE_RAW_DECL_WCSNRTOMBS */
++
++/* Define to 1 if wcsrtombs is declared even after undefining macros. */
++#define HAVE_RAW_DECL_WCSRTOMBS 1
++
++/* Define to 1 if wctob is declared even after undefining macros. */
++#define HAVE_RAW_DECL_WCTOB 1
++
++/* Define to 1 if wcwidth is declared even after undefining macros. */
++/* #undef HAVE_RAW_DECL_WCWIDTH */
++
++/* Define to 1 if you have the `readlink' function. */
++/* #undef HAVE_READLINK */
++
++/* Define to 1 if you have the `realpath' function. */
++/* #undef HAVE_REALPATH */
++
++/* Define to 1 if you have the <search.h> header file. */
++#define HAVE_SEARCH_H 1
++
++/* 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 <signal.h> header file. */
++#define HAVE_SIGNAL_H 1
++
++/* Define to 1 if 'sig_atomic_t' is a signed integer type. */
++#define HAVE_SIGNED_SIG_ATOMIC_T 1
++
++/* Define to 1 if 'wchar_t' is a signed integer type. */
++/* #undef HAVE_SIGNED_WCHAR_T */
++
++/* Define to 1 if 'wint_t' is a signed integer type. */
++/* #undef HAVE_SIGNED_WINT_T */
++
++/* Define to 1 if the system has the type `sigset_t'. */
++/* #undef HAVE_SIGSET_T */
++
++/* Define to 1 if you have the `snprintf' function. */
++/* #undef HAVE_SNPRINTF */
++
++/* Define to 1 if stdbool.h conforms to C99. */
++/* #undef HAVE_STDBOOL_H */
++
++/* Define to 1 if you have the <stddef.h> header file. */
++#define HAVE_STDDEF_H 1
++
++/* Define to 1 if you have the <stdint.h> header file. */
++/* #undef HAVE_STDINT_H */
++
++/* Define if <stdint.h> exists, doesn't clash with <sys/types.h>, and declares
++   uintmax_t. */
++/* #undef HAVE_STDINT_H_WITH_UINTMAX */
++
++/* Define to 1 if you have the <stdio.h> header file. */
++#define HAVE_STDIO_H 1
++
++/* Define to 1 if you have the <stdlib.h> header file. */
++#define HAVE_STDLIB_H 1
++
++/* Define to 1 if you have the `stpcpy' function. */
++/* #undef HAVE_STPCPY */
++
++/* Define to 1 if you have the `strcasecmp' function. */
++/* #undef HAVE_STRCASECMP */
++
++/* Define to 1 if you have the `strdup' function. */
++#define HAVE_STRDUP 1
++
++/* Define to 1 if you have the `strerror_r' function. */
++/* #undef HAVE_STRERROR_R */
++
++/* Define to 1 if you have the <strings.h> header file. */
++/* #undef HAVE_STRINGS_H */
++
++/* Define to 1 if you have the <string.h> header file. */
++#define HAVE_STRING_H 1
++
++/* Define to 1 if you have the `strnlen' function. */
++#define HAVE_STRNLEN 1
++
++/* Define to 1 if you have the `strtol' function. */
++#define HAVE_STRTOL 1
++
++/* Define to 1 if you have the `strtoul' function. */
++#define HAVE_STRTOUL 1
++
++/* Define to 1 if the system has the type `struct random_data'. */
++/* #undef HAVE_STRUCT_RANDOM_DATA */
++
++/* 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/inttypes.h> header file. */
++/* #undef HAVE_SYS_INTTYPES_H */
++
++/* Define to 1 if you have the <sys/mman.h> header file. */
++/* #undef HAVE_SYS_MMAN_H */
++
++/* Define to 1 if you have the <sys/param.h> header file. */
++/* #undef HAVE_SYS_PARAM_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
++
++/* Define to 1 if you have the <sys/time.h> header file. */
++/* #undef HAVE_SYS_TIME_H */
++
++/* 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 <time.h> header file. */
++#define HAVE_TIME_H 1
++
++/* Define to 1 if you have the `tsearch' function. */
++/* #undef HAVE_TSEARCH */
++
++/* Define if you have the 'uintmax_t' type in <stdint.h> or <inttypes.h>. */
++/* #undef HAVE_UINTMAX_T */
++
++/* Define to 1 if you have the <unistd.h> header file. */
++#define HAVE_UNISTD_H 1
++
++/* Define to 1 if the system has the type `unsigned long long int'. */
++#define HAVE_UNSIGNED_LONG_LONG_INT 1
++
++/* Define to 1 if you have the `uselocale' function. */
++/* #undef HAVE_USELOCALE */
++
++/* Define to 1 or 0, depending whether the compiler supports simple visibility
++   declarations. */
++#define HAVE_VISIBILITY 0
++
++/* Define to 1 if you have the <wchar.h> header file. */
++#define HAVE_WCHAR_H 1
++
++/* Define if you have the 'wchar_t' type. */
++#define HAVE_WCHAR_T 1
++
++/* Define to 1 if you have the `wcrtomb' function. */
++#define HAVE_WCRTOMB 1
++
++/* Define to 1 if you have the `wcslen' function. */
++#define HAVE_WCSLEN 1
++
++/* Define to 1 if you have the `wcsnlen' function. */
++#define HAVE_WCSNLEN 1
++
++/* Define to 1 if you have the <wctype.h> header file. */
++#define HAVE_WCTYPE_H 1
++
++/* Define to 1 if you have the `wcwidth' function. */
++/* #undef HAVE_WCWIDTH */
++
++/* 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
++
++/* Define to 1 if O_NOATIME works. */
++#define HAVE_WORKING_O_NOATIME 0
++
++/* Define to 1 if O_NOFOLLOW works. */
++#define HAVE_WORKING_O_NOFOLLOW 0
++
++/* Define to 1 if the system has the type `_Bool'. */
++/* #undef HAVE__BOOL */
++
++/* Define to 1 if you have the `_NSGetExecutablePath' function. */
++/* #undef HAVE__NSGETEXECUTABLEPATH */
++
++/* Define to 1 if you have the `__fsetlocking' function. */
++/* #undef HAVE___FSETLOCKING */
++
++/* Define as const if the declaration of iconv() needs const. */
++/* #undef ICONV_CONST */
++
++/* Define to a symbolic name denoting the flavor of iconv_open()
++   implementation. */
++/* #undef ICONV_FLAVOR */
++
++/* Define to the value of ${prefix}, as a string. */
++#define INSTALLPREFIX "d:/tools/o_rsvglibs/DEV300/ooo/gettext/./wntmsci12/misc"
++
++/* Define if integer division by zero raises signal SIGFPE. */
++#define INTDIV0_RAISES_SIGFPE 0
++
++#if FILE_SYSTEM_BACKSLASH_IS_FILE_NAME_SEPARATOR
++# define ISSLASH(C) ((C) == '/' || (C) == '\\')
++#else
++# define ISSLASH(C) ((C) == '/')
++#endif
++
++/* Define to 1 if `lstat' dereferences a symlink specified with a trailing
++   slash. */
++/* #undef LSTAT_FOLLOWS_SLASHED_SYMLINK */
++
++/* Define to the sub-directory in which libtool stores uninstalled libraries.
++   */
++#define LT_OBJDIR ".libs/"
++
++/* If malloc(0) is != NULL, define this to 1. Otherwise define this to 0. */
++#define MALLOC_0_IS_NONNULL 1
++
++/* Define to a substitute value for mmap()'s MAP_ANONYMOUS flag. */
++/* #undef MAP_ANONYMOUS */
++
++/* Define if the mbrtowc function has the NULL string argument bug. */
++/* #undef MBRTOWC_NULL_ARG_BUG */
++
++/* Define if the mbrtowc function does not return 0 for a NUL character. */
++/* #undef MBRTOWC_NUL_RETVAL_BUG */
++
++/* Define if the mbrtowc function returns a wrong return value. */
++/* #undef MBRTOWC_RETVAL_BUG */
++
++/* Define to 1 if your C compiler doesn't accept -c and -o together. */
++#define NO_MINUS_C_MINUS_O 1
++
++/* Name of package */
++#define PACKAGE "gettext-runtime"
++
++/* Define to the address where bug reports for this package should be sent. */
++#define PACKAGE_BUGREPORT ""
++
++/* Define to the full name of this package. */
++#define PACKAGE_NAME ""
++
++/* Define to the full name and version of this package. */
++#define PACKAGE_STRING ""
++
++/* Define to the one symbol short name of this package. */
++#define PACKAGE_TARNAME ""
++
++/* Define to the home page for this package. */
++#define PACKAGE_URL ""
++
++/* Define to the version of this package. */
++#define PACKAGE_VERSION ""
++
++/* Define if <inttypes.h> exists and defines unusable PRI* macros. */
++/* #undef PRI_MACROS_BROKEN */
++
++/* Define if the pthread_in_use() detection is hard. */
++/* #undef PTHREAD_IN_USE_DETECTION_HARD */
++
++/* Define to l, ll, u, ul, ull, etc., as suitable for constants of type
++   'ptrdiff_t'. */
++#define PTRDIFF_T_SUFFIX 
++
++/* Define to 1 if readlink fails to recognize a trailing slash. */
++/* #undef READLINK_TRAILING_SLASH_BUG */
++
++/* Define to 1 if stat needs help when passed a directory name with a trailing
++   slash */
++#define REPLACE_FUNC_STAT_DIR 1
++
++/* Define to 1 if stat needs help when passed a file name with a trailing
++   slash */
++/* #undef REPLACE_FUNC_STAT_FILE */
++
++/* Define this to 1 if strerror is broken. */
++#define REPLACE_STRERROR 1
++
++/* Define to l, ll, u, ul, ull, etc., as suitable for constants of type
++   'sig_atomic_t'. */
++#define SIG_ATOMIC_T_SUFFIX 
++
++/* Define as the maximum value of type 'size_t', if the system doesn't define
++   it. */
++#ifndef SIZE_MAX
++/* # undef SIZE_MAX */
++#endif
++
++/* Define to l, ll, u, ul, ull, etc., as suitable for constants of type
++   'size_t'. */
++#define SIZE_T_SUFFIX u
++
++/* 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 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 */
++
++/* Define to 1 if the `S_IS*' macros in <sys/stat.h> do not work properly. */
++/* #undef STAT_MACROS_BROKEN */
++
++/* Define to 1 if you have the ANSI C header files. */
++#define STDC_HEADERS 1
++
++/* Define to 1 if strerror_r returns char *. */
++/* #undef STRERROR_R_CHAR_P */
++
++/* Define to the prefix of C symbols at the assembler and linker level, either
++   an underscore or empty. */
++#define USER_LABEL_PREFIX 
++
++/* Define if the POSIX multithreading library can be used. */
++/* #undef USE_POSIX_THREADS */
++
++/* Define if references to the POSIX multithreading library should be made
++   weak. */
++/* #undef USE_POSIX_THREADS_WEAK */
++
++/* Define if the GNU Pth multithreading library can be used. */
++/* #undef USE_PTH_THREADS */
++
++/* Define if references to the GNU Pth multithreading library should be made
++   weak. */
++/* #undef USE_PTH_THREADS_WEAK */
++
++/* Define if the old Solaris multithreading library can be used. */
++/* #undef USE_SOLARIS_THREADS */
++
++/* Define if references to the old Solaris multithreading library should be
++   made weak. */
++/* #undef USE_SOLARIS_THREADS_WEAK */
++
++/* Define to 1 if you want getc etc. to use unlocked I/O if available.
++   Unlocked I/O can improve performance in unithreaded apps, but it is not
++   safe for multithreaded apps. */
++#define USE_UNLOCKED_IO 1
++
++/* Define if the Win32 multithreading API can be used. */
++/* #undef USE_WIN32_THREADS */
++
++/* Version number of package */
++#define VERSION "0.18.1"
++
++/* Define to l, ll, u, ul, ull, etc., as suitable for constants of type
++   'wchar_t'. */
++#define WCHAR_T_SUFFIX 
++
++/* Define to l, ll, u, ul, ull, etc., as suitable for constants of type
++   'wint_t'. */
++#define WINT_T_SUFFIX 
++
++/* Define to 1 if on MINIX. */
++/* #undef _MINIX */
++
++/* Define to 2 if the system does not provide POSIX.1 features except with
++   this defined. */
++/* #undef _POSIX_1_SOURCE */
++
++/* Define to 1 if you need to in order for `stat' and other things to work. */
++/* #undef _POSIX_SOURCE */
++
++/* Define to 500 only on HP-UX. */
++/* #undef _XOPEN_SOURCE */
++
++/* Enable extensions on AIX 3, Interix.  */
++#ifndef _ALL_SOURCE
++# define _ALL_SOURCE 1
++#endif
++/* Enable GNU extensions on systems that have them.  */
++#ifndef _GNU_SOURCE
++# define _GNU_SOURCE 1
++#endif
++/* Enable threading extensions on Solaris.  */
++#ifndef _POSIX_PTHREAD_SEMANTICS
++# define _POSIX_PTHREAD_SEMANTICS 1
++#endif
++/* Enable extensions on HP NonStop.  */
++#ifndef _TANDEM_SOURCE
++# define _TANDEM_SOURCE 1
++#endif
++/* Enable general extensions on Solaris.  */
++#ifndef __EXTENSIONS__
++# define __EXTENSIONS__ 1
++#endif
++
++
++/* Define to rpl_ if the getopt replacement functions and variables should be
++   used. */
++#define __GETOPT_PREFIX rpl_
++
++/* Define to `int' if <sys/types.h> doesn't define. */
++#define gid_t int
++
++/* Define to `__inline__' or `__inline' if that's what the C compiler
++   calls it, or to nothing if 'inline' is not supported under any name.  */
++#ifndef __cplusplus
++#define inline __inline
++#endif
++
++/* Work around a bug in Apple GCC 4.0.1 build 5465: In C99 mode, it supports
++   the ISO C 99 semantics of 'extern inline' (unlike the GNU C semantics of
++   earlier versions), but does not display it by setting __GNUC_STDC_INLINE__.
++   __APPLE__ && __MACH__ test for MacOS X.
++   __APPLE_CC__ tests for the Apple compiler and its version.
++   __STDC_VERSION__ tests for the C99 mode.  */
++#if defined __APPLE__ && defined __MACH__ && __APPLE_CC__ >= 5465 && !defined __cplusplus && __STDC_VERSION__ >= 199901L && !defined __GNUC_STDC_INLINE__
++# define __GNUC_STDC_INLINE__ 1
++#endif
++
++/* Define to a type if <wchar.h> does not define. */
++/* #undef mbstate_t */
++
++/* Define to the type of st_nlink in struct stat, or a supertype. */
++#define nlink_t int
++
++/* Define as the type of the result of subtracting two pointers, if the system
++   doesn't define it. */
++/* #undef ptrdiff_t */
++
++/* Define to the equivalent of the C99 'restrict' keyword, or to
++   nothing if this is not supported.  Do not define if restrict is
++   supported directly.  */
++#define restrict /**/
++/* Work around a bug in Sun C++: it does not support _Restrict or
++   __restrict__, even though the corresponding Sun C compiler ends up with
++   "#define restrict _Restrict" or "#define restrict __restrict__" in the
++   previous line.  Perhaps some future version of Sun C++ will work with
++   restrict; if so, hopefully it defines __RESTRICT like Sun C does.  */
++#if defined __SUNPRO_CC && !defined __RESTRICT
++# define _Restrict
++# define __restrict__
++#endif
++
++/* Define to `unsigned int' if <sys/types.h> does not define. */
++/* #undef size_t */
++
++/* Define as a signed type of the same size as size_t. */
++#define ssize_t int
++
++/* Define to `int' if <sys/types.h> doesn't define. */
++#define uid_t int
++
++/* Define to unsigned long or unsigned long long if <stdint.h> and
++   <inttypes.h> don't define. */
++#define uintmax_t unsigned long long
++
++/* Define as a marker that can be attached to declarations that might not
++    be used.  This helps to reduce warnings, such as from
++    GCC -Wunused-parameter.  */
++#if __GNUC__ >= 3 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 7)
++# define _GL_UNUSED __attribute__ ((__unused__))
++#else
++# define _GL_UNUSED
++#endif
++/* The name _UNUSED_PARAMETER_ is an earlier spelling, although the name
++   is a misnomer outside of parameter lists.  */
++#define _UNUSED_PARAMETER_ _GL_UNUSED
++
++
++
++#define __libc_lock_t                   gl_lock_t
++#define __libc_lock_define              gl_lock_define
++#define __libc_lock_define_initialized  gl_lock_define_initialized
++#define __libc_lock_init                gl_lock_init
++#define __libc_lock_lock                gl_lock_lock
++#define __libc_lock_unlock              gl_lock_unlock
++#define __libc_lock_recursive_t                   gl_recursive_lock_t
++#define __libc_lock_define_recursive              gl_recursive_lock_define
++#define __libc_lock_define_initialized_recursive  gl_recursive_lock_define_initialized
++#define __libc_lock_init_recursive                gl_recursive_lock_init
++#define __libc_lock_lock_recursive                gl_recursive_lock_lock
++#define __libc_lock_unlock_recursive              gl_recursive_lock_unlock
++#define glthread_in_use  libintl_thread_in_use
++#define glthread_lock_init_func     libintl_lock_init_func
++#define glthread_lock_lock_func     libintl_lock_lock_func
++#define glthread_lock_unlock_func   libintl_lock_unlock_func
++#define glthread_lock_destroy_func  libintl_lock_destroy_func
++#define glthread_rwlock_init_multithreaded     libintl_rwlock_init_multithreaded
++#define glthread_rwlock_init_func              libintl_rwlock_init_func
++#define glthread_rwlock_rdlock_multithreaded   libintl_rwlock_rdlock_multithreaded
++#define glthread_rwlock_rdlock_func            libintl_rwlock_rdlock_func
++#define glthread_rwlock_wrlock_multithreaded   libintl_rwlock_wrlock_multithreaded
++#define glthread_rwlock_wrlock_func            libintl_rwlock_wrlock_func
++#define glthread_rwlock_unlock_multithreaded   libintl_rwlock_unlock_multithreaded
++#define glthread_rwlock_unlock_func            libintl_rwlock_unlock_func
++#define glthread_rwlock_destroy_multithreaded  libintl_rwlock_destroy_multithreaded
++#define glthread_rwlock_destroy_func           libintl_rwlock_destroy_func
++#define glthread_recursive_lock_init_multithreaded     libintl_recursive_lock_init_multithreaded
++#define glthread_recursive_lock_init_func              libintl_recursive_lock_init_func
++#define glthread_recursive_lock_lock_multithreaded     libintl_recursive_lock_lock_multithreaded
++#define glthread_recursive_lock_lock_func              libintl_recursive_lock_lock_func
++#define glthread_recursive_lock_unlock_multithreaded   libintl_recursive_lock_unlock_multithreaded
++#define glthread_recursive_lock_unlock_func            libintl_recursive_lock_unlock_func
++#define glthread_recursive_lock_destroy_multithreaded  libintl_recursive_lock_destroy_multithreaded
++#define glthread_recursive_lock_destroy_func           libintl_recursive_lock_destroy_func
++#define glthread_once_func            libintl_once_func
++#define glthread_once_singlethreaded  libintl_once_singlethreaded
++#define glthread_once_multithreaded   libintl_once_multithreaded
++
++
++
++/* On Windows, variables that may be in a DLL must be marked specially.  */
++#if (defined _MSC_VER && defined _DLL) && !defined IN_RELOCWRAPPER
++# define DLL_VARIABLE __declspec (dllimport)
++#else
++# define DLL_VARIABLE
++#endif
++
++/* Extra OS/2 (emx+gcc) defines.  */
++#ifdef __EMX__
++# include "intl/os2compat.h"
++#endif
++
+--- misc/gettext-0.18.1.1/gettext-runtime/intl/libgnuintl.h	Wed Aug 20 14:33:55 2008
++++ misc/build/gettext-0.18.1.1/gettext-runtime/intl/libgnuintl.h	Wed Aug 20 14:26:42 2008
+@@ -1 +1,473 @@
+-dummy
++/* Message catalogs for internationalization.
++   Copyright (C) 1995-1997, 2000-2010 Free Software Foundation, Inc.
++
++   This program is free software; you can redistribute it and/or modify it
++   under the terms of the GNU Library General Public License as published
++   by the Free Software Foundation; either version 2, or (at your option)
++   any later version.
++
++   This program is distributed in the hope that it will be useful,
++   but WITHOUT ANY WARRANTY; without even the implied warranty of
++   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++   Library General Public License for more details.
++
++   You should have received a copy of the GNU Library General Public
++   License along with this program; if not, write to the Free Software
++   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
++   USA.  */
++
++#ifndef _LIBINTL_H
++#define _LIBINTL_H 1
++
++#if 0 && BUILDING_LIBINTL
++#define LIBINTL_DLL_EXPORTED __attribute__((__visibility__("default")))
++#elif defined _MSC_VER && BUILDING_DLL
++# define LIBINTL_DLL_EXPORTED __declspec(dllexport)
++#else
++#define LIBINTL_DLL_EXPORTED
++#endif
++
++#include <locale.h>
++#if (defined __APPLE__ && defined __MACH__) && 0
++# include <xlocale.h>
++#endif
++
++/* The LC_MESSAGES locale category is the category used by the functions
++   gettext() and dgettext().  It is specified in POSIX, but not in ANSI C.
++   On systems that don't define it, use an arbitrary value instead.
++   On Solaris, <locale.h> defines __LOCALE_H (or _LOCALE_H in Solaris 2.5)
++   then includes <libintl.h> (i.e. this file!) and then only defines
++   LC_MESSAGES.  To avoid a redefinition warning, don't define LC_MESSAGES
++   in this case.  */
++#if !defined LC_MESSAGES && !(defined __LOCALE_H || (defined _LOCALE_H && defined __sun))
++# define LC_MESSAGES 1729
++#endif
++
++/* We define an additional symbol to signal that we use the GNU
++   implementation of gettext.  */
++#define __USE_GNU_GETTEXT 1
++
++/* Provide information about the supported file formats.  Returns the
++   maximum minor revision number supported for a given major revision.  */
++#define __GNU_GETTEXT_SUPPORTED_REVISION(major) \
++  ((major) == 0 || (major) == 1 ? 1 : -1)
++
++/* Resolve a platform specific conflict on DJGPP.  GNU gettext takes
++   precedence over _conio_gettext.  */
++#ifdef __DJGPP__
++# undef gettext
++#endif
++
++#ifdef __cplusplus
++extern "C" {
++#endif
++
++
++/* Version number: (major<<16) + (minor<<8) + subminor */
++#define LIBINTL_VERSION 0x001201
++extern LIBINTL_DLL_EXPORTED __declspec (dllimport) int libintl_version;
++
++
++/* We redirect the functions to those prefixed with "libintl_".  This is
++   necessary, because some systems define gettext/textdomain/... in the C
++   library (namely, Solaris 2.4 and newer, and GNU libc 2.0 and newer).
++   If we used the unprefixed names, there would be cases where the
++   definition in the C library would override the one in the libintl.so
++   shared library.  Recall that on ELF systems, the symbols are looked
++   up in the following order:
++     1. in the executable,
++     2. in the shared libraries specified on the link command line, in order,
++     3. in the dependencies of the shared libraries specified on the link
++        command line,
++     4. in the dlopen()ed shared libraries, in the order in which they were
++        dlopen()ed.
++   The definition in the C library would override the one in libintl.so if
++   either
++     * -lc is given on the link command line and -lintl isn't, or
++     * -lc is given on the link command line before -lintl, or
++     * libintl.so is a dependency of a dlopen()ed shared library but not
++       linked to the executable at link time.
++   Since Solaris gettext() behaves differently than GNU gettext(), this
++   would be unacceptable.
++
++   The redirection happens by default through macros in C, so that &gettext
++   is independent of the compilation unit, but through inline functions in
++   C++, in order not to interfere with the name mangling of class fields or
++   class methods called 'gettext'.  */
++
++/* The user can define _INTL_REDIRECT_INLINE or _INTL_REDIRECT_MACROS.
++   If he doesn't, we choose the method.  A third possible method is
++   _INTL_REDIRECT_ASM, supported only by GCC.  */
++#if !(defined _INTL_REDIRECT_INLINE || defined _INTL_REDIRECT_MACROS)
++# if defined __GNUC__ && __GNUC__ >= 2 && !(defined __APPLE_CC__ && __APPLE_CC__ > 1) && !defined __MINGW32__ && !(__GNUC__ == 2 && defined _AIX) && (defined __STDC__ || defined __cplusplus)
++#  define _INTL_REDIRECT_ASM
++# else
++#  ifdef __cplusplus
++#   define _INTL_REDIRECT_INLINE
++#  else
++#   define _INTL_REDIRECT_MACROS
++#  endif
++# endif
++#endif
++/* Auxiliary macros.  */
++#ifdef _INTL_REDIRECT_ASM
++# define _INTL_ASM(cname) __asm__ (_INTL_ASMNAME (__USER_LABEL_PREFIX__, #cname))
++# define _INTL_ASMNAME(prefix,cnamestring) _INTL_STRINGIFY (prefix) cnamestring
++# define _INTL_STRINGIFY(prefix) #prefix
++#else
++# define _INTL_ASM(cname)
++#endif
++
++/* _INTL_MAY_RETURN_STRING_ARG(n) declares that the given function may return
++   its n-th argument literally.  This enables GCC to warn for example about
++   printf (gettext ("foo %y")).  */
++#if defined __GNUC__ && __GNUC__ >= 3 && !(defined __APPLE_CC__ && __APPLE_CC__ > 1 && defined __cplusplus)
++# define _INTL_MAY_RETURN_STRING_ARG(n) __attribute__ ((__format_arg__ (n)))
++#else
++# define _INTL_MAY_RETURN_STRING_ARG(n)
++#endif
++
++/* Look up MSGID in the current default message catalog for the current
++   LC_MESSAGES locale.  If not found, returns MSGID itself (the default
++   text).  */
++#ifdef _INTL_REDIRECT_INLINE
++extern LIBINTL_DLL_EXPORTED char *libintl_gettext (const char *__msgid)
++       _INTL_MAY_RETURN_STRING_ARG (1);
++static inline char *gettext (const char *__msgid)
++{
++  return libintl_gettext (__msgid);
++}
++#else
++#ifdef _INTL_REDIRECT_MACROS
++# define gettext libintl_gettext
++#endif
++extern LIBINTL_DLL_EXPORTED char *gettext (const char *__msgid)
++       _INTL_ASM (libintl_gettext)
++       _INTL_MAY_RETURN_STRING_ARG (1);
++#endif
++
++/* Look up MSGID in the DOMAINNAME message catalog for the current
++   LC_MESSAGES locale.  */
++#ifdef _INTL_REDIRECT_INLINE
++extern LIBINTL_DLL_EXPORTED char *libintl_dgettext (const char *__domainname, const char *__msgid)
++       _INTL_MAY_RETURN_STRING_ARG (2);
++static inline char *dgettext (const char *__domainname, const char *__msgid)
++{
++  return libintl_dgettext (__domainname, __msgid);
++}
++#else
++#ifdef _INTL_REDIRECT_MACROS
++# define dgettext libintl_dgettext
++#endif
++extern LIBINTL_DLL_EXPORTED char *dgettext (const char *__domainname, const char *__msgid)
++       _INTL_ASM (libintl_dgettext)
++       _INTL_MAY_RETURN_STRING_ARG (2);
++#endif
++
++/* Look up MSGID in the DOMAINNAME message catalog for the current CATEGORY
++   locale.  */
++#ifdef _INTL_REDIRECT_INLINE
++extern LIBINTL_DLL_EXPORTED char *libintl_dcgettext (const char *__domainname, const char *__msgid,
++                                int __category)
++       _INTL_MAY_RETURN_STRING_ARG (2);
++static inline char *dcgettext (const char *__domainname, const char *__msgid,
++                               int __category)
++{
++  return libintl_dcgettext (__domainname, __msgid, __category);
++}
++#else
++#ifdef _INTL_REDIRECT_MACROS
++# define dcgettext libintl_dcgettext
++#endif
++extern LIBINTL_DLL_EXPORTED char *dcgettext (const char *__domainname, const char *__msgid,
++                        int __category)
++       _INTL_ASM (libintl_dcgettext)
++       _INTL_MAY_RETURN_STRING_ARG (2);
++#endif
++
++
++/* Similar to `gettext' but select the plural form corresponding to the
++   number N.  */
++#ifdef _INTL_REDIRECT_INLINE
++extern LIBINTL_DLL_EXPORTED char *libintl_ngettext (const char *__msgid1, const char *__msgid2,
++                               unsigned long int __n)
++       _INTL_MAY_RETURN_STRING_ARG (1) _INTL_MAY_RETURN_STRING_ARG (2);
++static inline char *ngettext (const char *__msgid1, const char *__msgid2,
++                              unsigned long int __n)
++{
++  return libintl_ngettext (__msgid1, __msgid2, __n);
++}
++#else
++#ifdef _INTL_REDIRECT_MACROS
++# define ngettext libintl_ngettext
++#endif
++extern LIBINTL_DLL_EXPORTED char *ngettext (const char *__msgid1, const char *__msgid2,
++                       unsigned long int __n)
++       _INTL_ASM (libintl_ngettext)
++       _INTL_MAY_RETURN_STRING_ARG (1) _INTL_MAY_RETURN_STRING_ARG (2);
++#endif
++
++/* Similar to `dgettext' but select the plural form corresponding to the
++   number N.  */
++#ifdef _INTL_REDIRECT_INLINE
++extern LIBINTL_DLL_EXPORTED char *libintl_dngettext (const char *__domainname, const char *__msgid1,
++                                const char *__msgid2, unsigned long int __n)
++       _INTL_MAY_RETURN_STRING_ARG (2) _INTL_MAY_RETURN_STRING_ARG (3);
++static inline char *dngettext (const char *__domainname, const char *__msgid1,
++                               const char *__msgid2, unsigned long int __n)
++{
++  return libintl_dngettext (__domainname, __msgid1, __msgid2, __n);
++}
++#else
++#ifdef _INTL_REDIRECT_MACROS
++# define dngettext libintl_dngettext
++#endif
++extern LIBINTL_DLL_EXPORTED char *dngettext (const char *__domainname,
++                        const char *__msgid1, const char *__msgid2,
++                        unsigned long int __n)
++       _INTL_ASM (libintl_dngettext)
++       _INTL_MAY_RETURN_STRING_ARG (2) _INTL_MAY_RETURN_STRING_ARG (3);
++#endif
++
++/* Similar to `dcgettext' but select the plural form corresponding to the
++   number N.  */
++#ifdef _INTL_REDIRECT_INLINE
++extern LIBINTL_DLL_EXPORTED char *libintl_dcngettext (const char *__domainname,
++                                 const char *__msgid1, const char *__msgid2,
++                                 unsigned long int __n, int __category)
++       _INTL_MAY_RETURN_STRING_ARG (2) _INTL_MAY_RETURN_STRING_ARG (3);
++static inline char *dcngettext (const char *__domainname,
++                                const char *__msgid1, const char *__msgid2,
++                                unsigned long int __n, int __category)
++{
++  return libintl_dcngettext (__domainname, __msgid1, __msgid2, __n, __category);
++}
++#else
++#ifdef _INTL_REDIRECT_MACROS
++# define dcngettext libintl_dcngettext
++#endif
++extern LIBINTL_DLL_EXPORTED char *dcngettext (const char *__domainname,
++                         const char *__msgid1, const char *__msgid2,
++                         unsigned long int __n, int __category)
++       _INTL_ASM (libintl_dcngettext)
++       _INTL_MAY_RETURN_STRING_ARG (2) _INTL_MAY_RETURN_STRING_ARG (3);
++#endif
++
++
++
++/* Set the current default message catalog to DOMAINNAME.
++   If DOMAINNAME is null, return the current default.
++   If DOMAINNAME is "", reset to the default of "messages".  */
++#ifdef _INTL_REDIRECT_INLINE
++extern LIBINTL_DLL_EXPORTED char *libintl_textdomain (const char *__domainname);
++static inline char *textdomain (const char *__domainname)
++{
++  return libintl_textdomain (__domainname);
++}
++#else
++#ifdef _INTL_REDIRECT_MACROS
++# define textdomain libintl_textdomain
++#endif
++extern LIBINTL_DLL_EXPORTED char *textdomain (const char *__domainname)
++       _INTL_ASM (libintl_textdomain);
++#endif
++
++/* Specify that the DOMAINNAME message catalog will be found
++   in DIRNAME rather than in the system locale data base.  */
++#ifdef _INTL_REDIRECT_INLINE
++extern LIBINTL_DLL_EXPORTED char *libintl_bindtextdomain (const char *__domainname,
++                                     const char *__dirname);
++static inline char *bindtextdomain (const char *__domainname,
++                                    const char *__dirname)
++{
++  return libintl_bindtextdomain (__domainname, __dirname);
++}
++#else
++#ifdef _INTL_REDIRECT_MACROS
++# define bindtextdomain libintl_bindtextdomain
++#endif
++extern LIBINTL_DLL_EXPORTED char *bindtextdomain (const char *__domainname, const char *__dirname)
++       _INTL_ASM (libintl_bindtextdomain);
++#endif
++
++/* Specify the character encoding in which the messages from the
++   DOMAINNAME message catalog will be returned.  */
++#ifdef _INTL_REDIRECT_INLINE
++extern LIBINTL_DLL_EXPORTED char *libintl_bind_textdomain_codeset (const char *__domainname,
++                                              const char *__codeset);
++static inline char *bind_textdomain_codeset (const char *__domainname,
++                                             const char *__codeset)
++{
++  return libintl_bind_textdomain_codeset (__domainname, __codeset);
++}
++#else
++#ifdef _INTL_REDIRECT_MACROS
++# define bind_textdomain_codeset libintl_bind_textdomain_codeset
++#endif
++extern LIBINTL_DLL_EXPORTED char *bind_textdomain_codeset (const char *__domainname,
++                                      const char *__codeset)
++       _INTL_ASM (libintl_bind_textdomain_codeset);
++#endif
++
++
++
++/* Support for format strings with positions in *printf(), following the
++   POSIX/XSI specification.
++   Note: These replacements for the *printf() functions are visible only
++   in source files that #include <libintl.h> or #include "gettext.h".
++   Packages that use *printf() in source files that don't refer to _()
++   or gettext() but for which the format string could be the return value
++   of _() or gettext() need to add this #include.  Oh well.  */
++
++#if !0
++
++#include <stdio.h>
++#include <stddef.h>
++
++/* Get va_list.  */
++#if (defined __STDC__ && __STDC__) || defined __cplusplus || defined _MSC_VER
++# include <stdarg.h>
++#else
++# include <varargs.h>
++#endif
++
++#if !(defined fprintf && defined _GL_STDIO_H) /* don't override gnulib */
++#undef fprintf
++#define fprintf libintl_fprintf
++extern LIBINTL_DLL_EXPORTED int fprintf (FILE *, const char *, ...);
++#endif
++#if !(defined vfprintf && defined _GL_STDIO_H) /* don't override gnulib */
++#undef vfprintf
++#define vfprintf libintl_vfprintf
++extern LIBINTL_DLL_EXPORTED int vfprintf (FILE *, const char *, va_list);
++#endif
++
++#if !(defined printf && defined _GL_STDIO_H) /* don't override gnulib */
++#undef printf
++#if defined __NetBSD__ || defined __BEOS__ || defined __CYGWIN__ || defined __MINGW32__
++/* Don't break __attribute__((format(printf,M,N))).
++   This redefinition is only possible because the libc in NetBSD, Cygwin,
++   mingw does not have a function __printf__.
++   Alternatively, we could have done this redirection only when compiling with
++   __GNUC__, together with a symbol redirection:
++       extern LIBINTL_DLL_EXPORTED int printf (const char *, ...)
++              __asm__ (#__USER_LABEL_PREFIX__ "libintl_printf");
++   But doing it now would introduce a binary incompatibility with already
++   distributed versions of libintl on these systems.  */
++# define libintl_printf __printf__
++#endif
++#define printf libintl_printf
++extern LIBINTL_DLL_EXPORTED int printf (const char *, ...);
++#endif
++#if !(defined vprintf && defined _GL_STDIO_H) /* don't override gnulib */
++#undef vprintf
++#define vprintf libintl_vprintf
++extern LIBINTL_DLL_EXPORTED int vprintf (const char *, va_list);
++#endif
++
++#if !(defined sprintf && defined _GL_STDIO_H) /* don't override gnulib */
++#undef sprintf
++#define sprintf libintl_sprintf
++extern LIBINTL_DLL_EXPORTED int sprintf (char *, const char *, ...);
++#endif
++#if !(defined vsprintf && defined _GL_STDIO_H) /* don't override gnulib */
++#undef vsprintf
++#define vsprintf libintl_vsprintf
++extern LIBINTL_DLL_EXPORTED int vsprintf (char *, const char *, va_list);
++#endif
++
++#if 0
++
++#if !(defined snprintf && defined _GL_STDIO_H) /* don't override gnulib */
++#undef snprintf
++#define snprintf libintl_snprintf
++extern LIBINTL_DLL_EXPORTED int snprintf (char *, size_t, const char *, ...);
++#endif
++#if !(defined vsnprintf && defined _GL_STDIO_H) /* don't override gnulib */
++#undef vsnprintf
++#define vsnprintf libintl_vsnprintf
++extern LIBINTL_DLL_EXPORTED int vsnprintf (char *, size_t, const char *, va_list);
++#endif
++
++#endif
++
++#if 0
++
++#if !(defined asprintf && defined _GL_STDIO_H) /* don't override gnulib */
++#undef asprintf
++#define asprintf libintl_asprintf
++extern LIBINTL_DLL_EXPORTED int asprintf (char **, const char *, ...);
++#endif
++#if !(defined vasprintf && defined _GL_STDIO_H) /* don't override gnulib */
++#undef vasprintf
++#define vasprintf libintl_vasprintf
++extern LIBINTL_DLL_EXPORTED int vasprintf (char **, const char *, va_list);
++#endif
++
++#endif
++
++#if 0
++
++#undef fwprintf
++#define fwprintf libintl_fwprintf
++extern LIBINTL_DLL_EXPORTED int fwprintf (FILE *, const wchar_t *, ...);
++#undef vfwprintf
++#define vfwprintf libintl_vfwprintf
++extern LIBINTL_DLL_EXPORTED int vfwprintf (FILE *, const wchar_t *, va_list);
++
++#undef wprintf
++#define wprintf libintl_wprintf
++extern LIBINTL_DLL_EXPORTED int wprintf (const wchar_t *, ...);
++#undef vwprintf
++#define vwprintf libintl_vwprintf
++extern LIBINTL_DLL_EXPORTED int vwprintf (const wchar_t *, va_list);
++
++#undef swprintf
++#define swprintf libintl_swprintf
++extern LIBINTL_DLL_EXPORTED int swprintf (wchar_t *, size_t, const wchar_t *, ...);
++#undef vswprintf
++#define vswprintf libintl_vswprintf
++extern LIBINTL_DLL_EXPORTED int vswprintf (wchar_t *, size_t, const wchar_t *, va_list);
++
++#endif
++
++#endif
++
++
++/* Support for the locale chosen by the user.  */
++#if (defined __APPLE__ && defined __MACH__) || defined _WIN32 || defined __WIN32__ || defined __CYGWIN__
++
++#undef setlocale
++#define setlocale libintl_setlocale
++extern LIBINTL_DLL_EXPORTED char *setlocale (int, const char *);
++
++#if 0
++
++#undef newlocale
++#define newlocale libintl_newlocale
++extern LIBINTL_DLL_EXPORTED locale_t newlocale (int, const char *, locale_t);
++
++#endif
++
++#endif
++
++
++/* Support for relocatable packages.  */
++
++/* Sets the original and the current installation prefix of the package.
++   Relocation simply replaces a pathname starting with the original prefix
++   by the corresponding pathname with the current prefix instead.  Both
++   prefixes should be directory names without trailing slash (i.e. use ""
++   instead of "/").  */
++#define libintl_set_relocation_prefix libintl_set_relocation_prefix
++extern LIBINTL_DLL_EXPORTED void
++       libintl_set_relocation_prefix (const char *orig_prefix,
++                                      const char *curr_prefix);
++
++
++#ifdef __cplusplus
++}
++#endif
++
++#endif /* libintl.h */
++
+--- misc/gettext-0.18.1.1/gettext-runtime/intl/libintl.h	Wed Aug 20 14:33:55 2008
++++ misc/build/gettext-0.18.1.1/gettext-runtime/intl/libintl.h	Wed Aug 20 14:26:42 2008
+@@ -1 +1,465 @@
+-dummy
++/* Message catalogs for internationalization.
++   Copyright (C) 1995-1997, 2000-2010 Free Software Foundation, Inc.
++
++   This program is free software; you can redistribute it and/or modify it
++   under the terms of the GNU Library General Public License as published
++   by the Free Software Foundation; either version 2, or (at your option)
++   any later version.
++
++   This program is distributed in the hope that it will be useful,
++   but WITHOUT ANY WARRANTY; without even the implied warranty of
++   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++   Library General Public License for more details.
++
++   You should have received a copy of the GNU Library General Public
++   License along with this program; if not, write to the Free Software
++   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
++   USA.  */
++
++#ifndef _LIBINTL_H
++#define _LIBINTL_H 1
++
++#include <locale.h>
++#if (defined __APPLE__ && defined __MACH__) && 0
++# include <xlocale.h>
++#endif
++
++/* The LC_MESSAGES locale category is the category used by the functions
++   gettext() and dgettext().  It is specified in POSIX, but not in ANSI C.
++   On systems that don't define it, use an arbitrary value instead.
++   On Solaris, <locale.h> defines __LOCALE_H (or _LOCALE_H in Solaris 2.5)
++   then includes <libintl.h> (i.e. this file!) and then only defines
++   LC_MESSAGES.  To avoid a redefinition warning, don't define LC_MESSAGES
++   in this case.  */
++#if !defined LC_MESSAGES && !(defined __LOCALE_H || (defined _LOCALE_H && defined __sun))
++# define LC_MESSAGES 1729
++#endif
++
++/* We define an additional symbol to signal that we use the GNU
++   implementation of gettext.  */
++#define __USE_GNU_GETTEXT 1
++
++/* Provide information about the supported file formats.  Returns the
++   maximum minor revision number supported for a given major revision.  */
++#define __GNU_GETTEXT_SUPPORTED_REVISION(major) \
++  ((major) == 0 || (major) == 1 ? 1 : -1)
++
++/* Resolve a platform specific conflict on DJGPP.  GNU gettext takes
++   precedence over _conio_gettext.  */
++#ifdef __DJGPP__
++# undef gettext
++#endif
++
++#ifdef __cplusplus
++extern "C" {
++#endif
++
++
++/* Version number: (major<<16) + (minor<<8) + subminor */
++#define LIBINTL_VERSION 0x001201
++extern int libintl_version;
++
++
++/* We redirect the functions to those prefixed with "libintl_".  This is
++   necessary, because some systems define gettext/textdomain/... in the C
++   library (namely, Solaris 2.4 and newer, and GNU libc 2.0 and newer).
++   If we used the unprefixed names, there would be cases where the
++   definition in the C library would override the one in the libintl.so
++   shared library.  Recall that on ELF systems, the symbols are looked
++   up in the following order:
++     1. in the executable,
++     2. in the shared libraries specified on the link command line, in order,
++     3. in the dependencies of the shared libraries specified on the link
++        command line,
++     4. in the dlopen()ed shared libraries, in the order in which they were
++        dlopen()ed.
++   The definition in the C library would override the one in libintl.so if
++   either
++     * -lc is given on the link command line and -lintl isn't, or
++     * -lc is given on the link command line before -lintl, or
++     * libintl.so is a dependency of a dlopen()ed shared library but not
++       linked to the executable at link time.
++   Since Solaris gettext() behaves differently than GNU gettext(), this
++   would be unacceptable.
++
++   The redirection happens by default through macros in C, so that &gettext
++   is independent of the compilation unit, but through inline functions in
++   C++, in order not to interfere with the name mangling of class fields or
++   class methods called 'gettext'.  */
++
++/* The user can define _INTL_REDIRECT_INLINE or _INTL_REDIRECT_MACROS.
++   If he doesn't, we choose the method.  A third possible method is
++   _INTL_REDIRECT_ASM, supported only by GCC.  */
++#if !(defined _INTL_REDIRECT_INLINE || defined _INTL_REDIRECT_MACROS)
++# if defined __GNUC__ && __GNUC__ >= 2 && !(defined __APPLE_CC__ && __APPLE_CC__ > 1) && !defined __MINGW32__ && !(__GNUC__ == 2 && defined _AIX) && (defined __STDC__ || defined __cplusplus)
++#  define _INTL_REDIRECT_ASM
++# else
++#  ifdef __cplusplus
++#   define _INTL_REDIRECT_INLINE
++#  else
++#   define _INTL_REDIRECT_MACROS
++#  endif
++# endif
++#endif
++/* Auxiliary macros.  */
++#ifdef _INTL_REDIRECT_ASM
++# define _INTL_ASM(cname) __asm__ (_INTL_ASMNAME (__USER_LABEL_PREFIX__, #cname))
++# define _INTL_ASMNAME(prefix,cnamestring) _INTL_STRINGIFY (prefix) cnamestring
++# define _INTL_STRINGIFY(prefix) #prefix
++#else
++# define _INTL_ASM(cname)
++#endif
++
++/* _INTL_MAY_RETURN_STRING_ARG(n) declares that the given function may return
++   its n-th argument literally.  This enables GCC to warn for example about
++   printf (gettext ("foo %y")).  */
++#if defined __GNUC__ && __GNUC__ >= 3 && !(defined __APPLE_CC__ && __APPLE_CC__ > 1 && defined __cplusplus)
++# define _INTL_MAY_RETURN_STRING_ARG(n) __attribute__ ((__format_arg__ (n)))
++#else
++# define _INTL_MAY_RETURN_STRING_ARG(n)
++#endif
++
++/* Look up MSGID in the current default message catalog for the current
++   LC_MESSAGES locale.  If not found, returns MSGID itself (the default
++   text).  */
++#ifdef _INTL_REDIRECT_INLINE
++extern char *libintl_gettext (const char *__msgid)
++       _INTL_MAY_RETURN_STRING_ARG (1);
++static inline char *gettext (const char *__msgid)
++{
++  return libintl_gettext (__msgid);
++}
++#else
++#ifdef _INTL_REDIRECT_MACROS
++# define gettext libintl_gettext
++#endif
++extern char *gettext (const char *__msgid)
++       _INTL_ASM (libintl_gettext)
++       _INTL_MAY_RETURN_STRING_ARG (1);
++#endif
++
++/* Look up MSGID in the DOMAINNAME message catalog for the current
++   LC_MESSAGES locale.  */
++#ifdef _INTL_REDIRECT_INLINE
++extern char *libintl_dgettext (const char *__domainname, const char *__msgid)
++       _INTL_MAY_RETURN_STRING_ARG (2);
++static inline char *dgettext (const char *__domainname, const char *__msgid)
++{
++  return libintl_dgettext (__domainname, __msgid);
++}
++#else
++#ifdef _INTL_REDIRECT_MACROS
++# define dgettext libintl_dgettext
++#endif
++extern char *dgettext (const char *__domainname, const char *__msgid)
++       _INTL_ASM (libintl_dgettext)
++       _INTL_MAY_RETURN_STRING_ARG (2);
++#endif
++
++/* Look up MSGID in the DOMAINNAME message catalog for the current CATEGORY
++   locale.  */
++#ifdef _INTL_REDIRECT_INLINE
++extern char *libintl_dcgettext (const char *__domainname, const char *__msgid,
++                                int __category)
++       _INTL_MAY_RETURN_STRING_ARG (2);
++static inline char *dcgettext (const char *__domainname, const char *__msgid,
++                               int __category)
++{
++  return libintl_dcgettext (__domainname, __msgid, __category);
++}
++#else
++#ifdef _INTL_REDIRECT_MACROS
++# define dcgettext libintl_dcgettext
++#endif
++extern char *dcgettext (const char *__domainname, const char *__msgid,
++                        int __category)
++       _INTL_ASM (libintl_dcgettext)
++       _INTL_MAY_RETURN_STRING_ARG (2);
++#endif
++
++
++/* Similar to `gettext' but select the plural form corresponding to the
++   number N.  */
++#ifdef _INTL_REDIRECT_INLINE
++extern char *libintl_ngettext (const char *__msgid1, const char *__msgid2,
++                               unsigned long int __n)
++       _INTL_MAY_RETURN_STRING_ARG (1) _INTL_MAY_RETURN_STRING_ARG (2);
++static inline char *ngettext (const char *__msgid1, const char *__msgid2,
++                              unsigned long int __n)
++{
++  return libintl_ngettext (__msgid1, __msgid2, __n);
++}
++#else
++#ifdef _INTL_REDIRECT_MACROS
++# define ngettext libintl_ngettext
++#endif
++extern char *ngettext (const char *__msgid1, const char *__msgid2,
++                       unsigned long int __n)
++       _INTL_ASM (libintl_ngettext)
++       _INTL_MAY_RETURN_STRING_ARG (1) _INTL_MAY_RETURN_STRING_ARG (2);
++#endif
++
++/* Similar to `dgettext' but select the plural form corresponding to the
++   number N.  */
++#ifdef _INTL_REDIRECT_INLINE
++extern char *libintl_dngettext (const char *__domainname, const char *__msgid1,
++                                const char *__msgid2, unsigned long int __n)
++       _INTL_MAY_RETURN_STRING_ARG (2) _INTL_MAY_RETURN_STRING_ARG (3);
++static inline char *dngettext (const char *__domainname, const char *__msgid1,
++                               const char *__msgid2, unsigned long int __n)
++{
++  return libintl_dngettext (__domainname, __msgid1, __msgid2, __n);
++}
++#else
++#ifdef _INTL_REDIRECT_MACROS
++# define dngettext libintl_dngettext
++#endif
++extern char *dngettext (const char *__domainname,
++                        const char *__msgid1, const char *__msgid2,
++                        unsigned long int __n)
++       _INTL_ASM (libintl_dngettext)
++       _INTL_MAY_RETURN_STRING_ARG (2) _INTL_MAY_RETURN_STRING_ARG (3);
++#endif
++
++/* Similar to `dcgettext' but select the plural form corresponding to the
++   number N.  */
++#ifdef _INTL_REDIRECT_INLINE
++extern char *libintl_dcngettext (const char *__domainname,
++                                 const char *__msgid1, const char *__msgid2,
++                                 unsigned long int __n, int __category)
++       _INTL_MAY_RETURN_STRING_ARG (2) _INTL_MAY_RETURN_STRING_ARG (3);
++static inline char *dcngettext (const char *__domainname,
++                                const char *__msgid1, const char *__msgid2,
++                                unsigned long int __n, int __category)
++{
++  return libintl_dcngettext (__domainname, __msgid1, __msgid2, __n, __category);
++}
++#else
++#ifdef _INTL_REDIRECT_MACROS
++# define dcngettext libintl_dcngettext
++#endif
++extern char *dcngettext (const char *__domainname,
++                         const char *__msgid1, const char *__msgid2,
++                         unsigned long int __n, int __category)
++       _INTL_ASM (libintl_dcngettext)
++       _INTL_MAY_RETURN_STRING_ARG (2) _INTL_MAY_RETURN_STRING_ARG (3);
++#endif
++
++
++
++/* Set the current default message catalog to DOMAINNAME.
++   If DOMAINNAME is null, return the current default.
++   If DOMAINNAME is "", reset to the default of "messages".  */
++#ifdef _INTL_REDIRECT_INLINE
++extern char *libintl_textdomain (const char *__domainname);
++static inline char *textdomain (const char *__domainname)
++{
++  return libintl_textdomain (__domainname);
++}
++#else
++#ifdef _INTL_REDIRECT_MACROS
++# define textdomain libintl_textdomain
++#endif
++extern char *textdomain (const char *__domainname)
++       _INTL_ASM (libintl_textdomain);
++#endif
++
++/* Specify that the DOMAINNAME message catalog will be found
++   in DIRNAME rather than in the system locale data base.  */
++#ifdef _INTL_REDIRECT_INLINE
++extern char *libintl_bindtextdomain (const char *__domainname,
++                                     const char *__dirname);
++static inline char *bindtextdomain (const char *__domainname,
++                                    const char *__dirname)
++{
++  return libintl_bindtextdomain (__domainname, __dirname);
++}
++#else
++#ifdef _INTL_REDIRECT_MACROS
++# define bindtextdomain libintl_bindtextdomain
++#endif
++extern char *bindtextdomain (const char *__domainname, const char *__dirname)
++       _INTL_ASM (libintl_bindtextdomain);
++#endif
++
++/* Specify the character encoding in which the messages from the
++   DOMAINNAME message catalog will be returned.  */
++#ifdef _INTL_REDIRECT_INLINE
++extern char *libintl_bind_textdomain_codeset (const char *__domainname,
++                                              const char *__codeset);
++static inline char *bind_textdomain_codeset (const char *__domainname,
++                                             const char *__codeset)
++{
++  return libintl_bind_textdomain_codeset (__domainname, __codeset);
++}
++#else
++#ifdef _INTL_REDIRECT_MACROS
++# define bind_textdomain_codeset libintl_bind_textdomain_codeset
++#endif
++extern char *bind_textdomain_codeset (const char *__domainname,
++                                      const char *__codeset)
++       _INTL_ASM (libintl_bind_textdomain_codeset);
++#endif
++
++
++
++/* Support for format strings with positions in *printf(), following the
++   POSIX/XSI specification.
++   Note: These replacements for the *printf() functions are visible only
++   in source files that #include <libintl.h> or #include "gettext.h".
++   Packages that use *printf() in source files that don't refer to _()
++   or gettext() but for which the format string could be the return value
++   of _() or gettext() need to add this #include.  Oh well.  */
++
++#if !0
++
++#include <stdio.h>
++#include <stddef.h>
++
++/* Get va_list.  */
++#if (defined __STDC__ && __STDC__) || defined __cplusplus || defined _MSC_VER
++# include <stdarg.h>
++#else
++# include <varargs.h>
++#endif
++
++#if !(defined fprintf && defined _GL_STDIO_H) /* don't override gnulib */
++#undef fprintf
++#define fprintf libintl_fprintf
++extern int fprintf (FILE *, const char *, ...);
++#endif
++#if !(defined vfprintf && defined _GL_STDIO_H) /* don't override gnulib */
++#undef vfprintf
++#define vfprintf libintl_vfprintf
++extern int vfprintf (FILE *, const char *, va_list);
++#endif
++
++#if !(defined printf && defined _GL_STDIO_H) /* don't override gnulib */
++#undef printf
++#if defined __NetBSD__ || defined __BEOS__ || defined __CYGWIN__ || defined __MINGW32__
++/* Don't break __attribute__((format(printf,M,N))).
++   This redefinition is only possible because the libc in NetBSD, Cygwin,
++   mingw does not have a function __printf__.
++   Alternatively, we could have done this redirection only when compiling with
++   __GNUC__, together with a symbol redirection:
++       extern int printf (const char *, ...)
++              __asm__ (#__USER_LABEL_PREFIX__ "libintl_printf");
++   But doing it now would introduce a binary incompatibility with already
++   distributed versions of libintl on these systems.  */
++# define libintl_printf __printf__
++#endif
++#define printf libintl_printf
++extern int printf (const char *, ...);
++#endif
++#if !(defined vprintf && defined _GL_STDIO_H) /* don't override gnulib */
++#undef vprintf
++#define vprintf libintl_vprintf
++extern int vprintf (const char *, va_list);
++#endif
++
++#if !(defined sprintf && defined _GL_STDIO_H) /* don't override gnulib */
++#undef sprintf
++#define sprintf libintl_sprintf
++extern int sprintf (char *, const char *, ...);
++#endif
++#if !(defined vsprintf && defined _GL_STDIO_H) /* don't override gnulib */
++#undef vsprintf
++#define vsprintf libintl_vsprintf
++extern int vsprintf (char *, const char *, va_list);
++#endif
++
++#if 0
++
++#if !(defined snprintf && defined _GL_STDIO_H) /* don't override gnulib */
++#undef snprintf
++#define snprintf libintl_snprintf
++extern int snprintf (char *, size_t, const char *, ...);
++#endif
++#if !(defined vsnprintf && defined _GL_STDIO_H) /* don't override gnulib */
++#undef vsnprintf
++#define vsnprintf libintl_vsnprintf
++extern int vsnprintf (char *, size_t, const char *, va_list);
++#endif
++
++#endif
++
++#if 0
++
++#if !(defined asprintf && defined _GL_STDIO_H) /* don't override gnulib */
++#undef asprintf
++#define asprintf libintl_asprintf
++extern int asprintf (char **, const char *, ...);
++#endif
++#if !(defined vasprintf && defined _GL_STDIO_H) /* don't override gnulib */
++#undef vasprintf
++#define vasprintf libintl_vasprintf
++extern int vasprintf (char **, const char *, va_list);
++#endif
++
++#endif
++
++#if 0
++
++#undef fwprintf
++#define fwprintf libintl_fwprintf
++extern int fwprintf (FILE *, const wchar_t *, ...);
++#undef vfwprintf
++#define vfwprintf libintl_vfwprintf
++extern int vfwprintf (FILE *, const wchar_t *, va_list);
++
++#undef wprintf
++#define wprintf libintl_wprintf
++extern int wprintf (const wchar_t *, ...);
++#undef vwprintf
++#define vwprintf libintl_vwprintf
++extern int vwprintf (const wchar_t *, va_list);
++
++#undef swprintf
++#define swprintf libintl_swprintf
++extern int swprintf (wchar_t *, size_t, const wchar_t *, ...);
++#undef vswprintf
++#define vswprintf libintl_vswprintf
++extern int vswprintf (wchar_t *, size_t, const wchar_t *, va_list);
++
++#endif
++
++#endif
++
++
++/* Support for the locale chosen by the user.  */
++#if (defined __APPLE__ && defined __MACH__) || defined _WIN32 || defined __WIN32__ || defined __CYGWIN__
++
++#undef setlocale
++#define setlocale libintl_setlocale
++extern char *setlocale (int, const char *);
++
++#if 0
++
++#undef newlocale
++#define newlocale libintl_newlocale
++extern locale_t newlocale (int, const char *, locale_t);
++
++#endif
++
++#endif
++
++
++/* Support for relocatable packages.  */
++
++/* Sets the original and the current installation prefix of the package.
++   Relocation simply replaces a pathname starting with the original prefix
++   by the corresponding pathname with the current prefix instead.  Both
++   prefixes should be directory names without trailing slash (i.e. use ""
++   instead of "/").  */
++#define libintl_set_relocation_prefix libintl_set_relocation_prefix
++extern void
++       libintl_set_relocation_prefix (const char *orig_prefix,
++                                      const char *curr_prefix);
++
++
++#ifdef __cplusplus
++}
++#endif
++
++#endif /* libintl.h */
++
diff --git a/gettext/makefile.mk b/gettext/makefile.mk
index 871bddd25060..965fb4e7e812 100644
--- a/gettext/makefile.mk
+++ b/gettext/makefile.mk
@@ -49,6 +49,8 @@ TARFILE_MD5=3dd55b952826d2b32f51308f2f91aa89
 
 PATCH_FILES=
 
+
+.IF "$(OS)"=="MACOSX"
 CONFIGURE_DIR=
 CONFIGURE_ACTION=.$/configure --prefix=$(SRC_ROOT)$/$(PRJNAME)$/$(MISC) CFLAGS="$(ARCH_FLAGS) $(EXTRA_CFLAGS)"
 CONFIGURE_FLAGS=$(eq,$(OS),MACOSX CPPFLAGS="$(EXTRA_CDEFS)" $(NULL)) --disable-curses --without-emacs --without-git --disable-java
@@ -56,7 +58,6 @@ CONFIGURE_FLAGS=$(eq,$(OS),MACOSX CPPFLAGS="$(EXTRA_CDEFS)" $(NULL)) --disable-c
 BUILD_ACTION=$(GNUMAKE)
 BUILD_DIR=$(CONFIGURE_DIR)
 
-.IF "$(OS)"=="MACOSX"
 EXTRPATH=LOADER
 OUT2LIB+=gettext-tools$/intl$/.libs$/libintl.*.dylib
 OUT2LIB+=gettext-runtime$/libasprintf$/.libs$/libasprintf.*.dylib
@@ -85,6 +86,14 @@ OUT2BIN+=gettext-tools$/src$/.libs$/msguniq
 OUT2BIN+=gettext-tools$/src$/.libs$/urlget
 OUT2BIN+=gettext-tools$/src$/.libs$/xgettext
 .ELIF "$(OS)"=="WNT"
+BUILD_DIR=gettext-runtime$/intl
+PATCH_FILES=gettext-0.18.1.1.patch
+ADDITIONAL_FILES=\
+    gettext-runtime/intl/makefile.mk \
+    gettext-runtime/intl/libgnuintl.h \
+    gettext-runtime/intl/libintl.h \
+    gettext-runtime/config.h
+OUT2INC+=gettext-runtime$/intl$/libintl.h
 .ELSE
 .ENDIF