From: Bruno Haible <bruno@clisp.org>
Date: Mon, 31 Mar 2003 20:10:13 +0000 (+0000)
Subject: More support for Woe32.
X-Git-Tag: v0.12~126
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0fbcf3e924cad3983b88783bfd0f8fe80f4464dd;p=thirdparty%2Fgettext.git

More support for Woe32.
---

diff --git a/gettext-tools/ChangeLog b/gettext-tools/ChangeLog
index 63405fe97..6b148f8c2 100644
--- a/gettext-tools/ChangeLog
+++ b/gettext-tools/ChangeLog
@@ -1,14 +1,21 @@
+2003-03-30  Bruno Haible  <bruno@clisp.org>
+
+	* configure.ac: Add checks for <pwd.h> and chown().
+
 2003-03-17  Bruno Haible  <bruno@clisp.org>
 
 	Native Woe32/MSVC support.
 	* Makefile.msvc: New file.
 	* README.woe32: New file.
-	* windows/gettextlib.exp: New file.
+	* windows/gettextlib.def: New file.
 	* windows/gettextlib.rc: New file.
-	* windows/gettextsrc.exp: New file.
+	* windows/gettextsrc.def: New file.
 	* windows/gettextsrc.rc: New file.
-	* Makefile.am (EXTRA_DIST): Add them and config.h.msvc.
-	(config.h.msvc, intl/libgnuintl.h.msvc-shared): New rules.
+	* Makefile.am (EXTRA_DIST): Add them and config.h.msvc,
+	windows/alloca.h, windows/fnmatch.h, windows/stdbool.h.
+	(config.h.msvc, intl/libgnuintl.h.msvc-shared, windows/stdbool.h): New
+	rules.
+	* configure.ac: Invoke AC_TYPE_MODE_T.
 
 2003-02-28  Bruno Haible  <bruno@clisp.org>
 
diff --git a/gettext-tools/Makefile.am b/gettext-tools/Makefile.am
index e2045d138..2c686c7c2 100644
--- a/gettext-tools/Makefile.am
+++ b/gettext-tools/Makefile.am
@@ -46,10 +46,11 @@ html:
 
 # Woe32 support.
 
-config.h.msvc: config.h.in
+config.h.msvc: config.h.in ../version.sh
 	sed -e 's/#undef ENABLE_NLS$$/#define ENABLE_NLS 1/' \
 	    -e 's/#undef ENABLE_RELOCATABLE$$/#define ENABLE_RELOCATABLE 1/' \
 	    -e 's/#undef HAVE_ALLOCA$$/#define HAVE_ALLOCA 1/' \
+	    -e 's/#undef HAVE_DECL_WCWIDTH$$/#define HAVE_DECL_WCWIDTH 0/' \
 	    -e 's/#undef HAVE_ENVIRON_DECL$$/#define HAVE_ENVIRON_DECL 1/' \
 	    -e 's/#undef HAVE_ERRNO_DECL$$/#define HAVE_ERRNO_DECL 1/' \
 	    -e 's/#undef HAVE_FCNTL_H$$/#define HAVE_FCNTL_H 1/' \
@@ -90,10 +91,19 @@ config.h.msvc: config.h.in
 	    -e 's/#undef STDC_HEADERS$$/#define STDC_HEADERS 1/' \
 	    -e 's/#undef fnmatch$$/#define fnmatch rpl_fnmatch/' \
 	    -e 's/#undef getline$$/#define getline rpl_getline/' \
+	    -e 's/#undef inline$$/#define inline/' \
+	    -e 's/#undef mode_t$$/#define mode_t int/' \
 	    -e 's/#undef pid_t$$/#define pid_t int/' \
 	    -e 's/#undef ssize_t$$/#define ssize_t int/' \
 	    -e 's/#undef uintmax_t$$/#define uintmax_t unsigned long/' \
+	    -e 's/#undef PACKAGE$$/#define PACKAGE "gettext-tools"/' \
+	    -e 's/#undef VERSION$$/#define VERSION "$(VERSION)"/' \
 	    -e '/#undef INSTALLPREFIX$$/d' \
 	  < $< > $@
 
-EXTRA_DIST += README.woe32 Makefile.msvc config.h.msvc windows/gettextlib.exp windows/gettextsrc.exp windows/gettextlib.rc windows/gettextsrc.rc
+windows/stdbool.h: lib/stdbool.h.in
+	sed -e 's/@''HAVE__BOOL''@/0/' < $< > $@
+
+all-local : windows/stdbool.h
+
+EXTRA_DIST += README.woe32 Makefile.msvc config.h.msvc windows/alloca.h windows/fnmatch.h windows/stdbool.h windows/gettextlib.def windows/gettextsrc.def windows/gettextlib.rc windows/gettextsrc.rc
diff --git a/gettext-tools/configure.ac b/gettext-tools/configure.ac
index e978beeb3..ca05ed354 100644
--- a/gettext-tools/configure.ac
+++ b/gettext-tools/configure.ac
@@ -78,7 +78,7 @@ dnl Checks for libraries.
 
 dnl Checks for header files.
 AC_HEADER_STDC
-AC_CHECK_HEADERS(limits.h malloc.h string.h unistd.h utime.h values.h)
+AC_CHECK_HEADERS(limits.h malloc.h pwd.h string.h unistd.h utime.h values.h)
 gt_STDBOOL_H
 
 dnl Checks for typedefs, structures, and compiler characteristics.
@@ -90,11 +90,12 @@ AC_CHECK_TYPES(ptrdiff_t)
 jm_AC_TYPE_UINTMAX_T
 gt_TYPE_SSIZE_T
 AC_TYPE_PID_T
+AC_TYPE_MODE_T
 
 dnl Checks for library functions.
 gl_FUNC_ALLOCA
 AC_FUNC_VPRINTF
-AC_CHECK_FUNCS([getcwd posix_spawn putc_unlocked raise select strerror \
+AC_CHECK_FUNCS([chown getcwd posix_spawn putc_unlocked raise select strerror \
 strtoul uname utime utimes])
 AC_REPLACE_FUNCS([memmove memset stpcpy strcspn \
 strcasecmp strncasecmp strpbrk strstr vasprintf])