summaryrefslogtreecommitdiff
path: root/Build/source/utils/xindy
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2010-02-22 12:09:38 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2010-02-22 12:09:38 +0000
commitb287d7f6a13823ea17e0bd415981d3a5953ca703 (patch)
treea420b28a35f7761f064d50bb610dbb2b46c71486 /Build/source/utils/xindy
parent5fd6fd3479fcbbda52ebca7b5e80a5aaa1add69f (diff)
build system: various small fixes for mingw32 cross compilation
still incomplete git-svn-id: svn://tug.org/texlive/trunk@17141 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/utils/xindy')
-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
3 files changed, 14 insertions, 2 deletions
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