summaryrefslogtreecommitdiff
path: root/Build/source/utils
diff options
context:
space:
mode:
Diffstat (limited to 'Build/source/utils')
-rw-r--r--Build/source/utils/psutils/ChangeLog4
-rw-r--r--Build/source/utils/psutils/config.h4
-rw-r--r--Build/source/utils/xindy/ChangeLog.TL4
-rwxr-xr-xBuild/source/utils/xindy/configure5
-rw-r--r--Build/source/utils/xindy/configure.ac7
5 files changed, 20 insertions, 4 deletions
diff --git a/Build/source/utils/psutils/ChangeLog b/Build/source/utils/psutils/ChangeLog
index a55466980a4..a3b8a56b3b9 100644
--- a/Build/source/utils/psutils/ChangeLog
+++ b/Build/source/utils/psutils/ChangeLog
@@ -1,3 +1,7 @@
+2010-02-20 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * config.h: Do not #include <win32lib.h> for MinGW32.
+
2009-08-27 Peter Breitenlohner <peb@mppmu.mpg.de>
Avoid maximal compiler warnings.
diff --git a/Build/source/utils/psutils/config.h b/Build/source/utils/psutils/config.h
index 13562326755..88af01a9027 100644
--- a/Build/source/utils/psutils/config.h
+++ b/Build/source/utils/psutils/config.h
@@ -10,9 +10,9 @@
#define OPEN_WRITE "wb"
#include <fcntl.h>
#include <io.h>
-#ifdef WIN32
+#if defined(WIN32) && !defined(__MINGW32__)
#include <win32lib.h>
-#endif /* WIN32 */
+#endif /* WIN32 && !__MINGW32__ */
#else /* ! MSDOS && ! WINNT && ! WIN32 */
#if defined(OS2)
#define TMPDIR "."
diff --git a/Build/source/utils/xindy/ChangeLog.TL b/Build/source/utils/xindy/ChangeLog.TL
index 1b8304067d3..1885da95e96 100644
--- a/Build/source/utils/xindy/ChangeLog.TL
+++ b/Build/source/utils/xindy/ChangeLog.TL
@@ -1,6 +1,10 @@
ChangeLog.TL: Changes for xindy (teTeX / TeX Live)
======================================================
+2010-02-20 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * configure.ac: Don't fail configure if not building xindy.
+
2009-10-05 Peter Breitenlohner <peb@mppmu.mpg.de>
* user-commands/Makefile.am: Add uninstall-hook.
diff --git a/Build/source/utils/xindy/configure b/Build/source/utils/xindy/configure
index a9465f17115..90a58b58bf7 100755
--- a/Build/source/utils/xindy/configure
+++ b/Build/source/utils/xindy/configure
@@ -4647,7 +4647,12 @@ eval as_val=\$$as_ac_Header
_ACEOF
else
+ if test "x$enable_build" != xno; then :
as_fn_error "required C header file is missing" "$LINENO" 5
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: required C header file is missing" >&5
+$as_echo "$as_me: WARNING: required C header file is missing" >&2;}
+fi
fi
done
diff --git a/Build/source/utils/xindy/configure.ac b/Build/source/utils/xindy/configure.ac
index f7992467584..9799ae9af83 100644
--- a/Build/source/utils/xindy/configure.ac
+++ b/Build/source/utils/xindy/configure.ac
@@ -7,7 +7,7 @@
## Copyright (C) 2008 by Joachim Schrod.
##
## Adapted for TeX Live
-## Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org>
+## Copyright (C) 2009, 2010 Peter Breitenlohner <tex-live@tug.org>
##
## This program is free software; you can redistribute it and/or
## modify it under the terms of the GNU General Public License as
@@ -140,7 +140,10 @@ AC_SUBST(LISP_RUN)
# Checks for header files.
AC_HEADER_STDC
-AC_CHECK_HEADERS([stdlib.h string.h regex.h],[],[AC_MSG_ERROR([required C header file is missing])])
+AC_CHECK_HEADERS([stdlib.h string.h regex.h],[],
+ [AS_IF([test "x$enable_build" != xno],
+ [AC_MSG_ERROR([required C header file is missing])],
+ [AC_MSG_WARN([required C header file is missing])])])
dnl check system type
AC_CANONICAL_HOST