summaryrefslogtreecommitdiff
path: root/Build/source/texk/makeindexk
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2010-12-20 07:07:04 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2010-12-20 07:07:04 +0000
commit46500586978b361422a73168b912a0e151111885 (patch)
treead91bc81ec6d88ccb8803fefd9f08942cfbdd3e4 /Build/source/texk/makeindexk
parentcbd8755638a860c159a2f1b31037bd769a068090 (diff)
WIN32: check shell scripts
git-svn-id: svn://tug.org/texlive/trunk@20812 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/makeindexk')
-rw-r--r--Build/source/texk/makeindexk/ChangeLog4
-rw-r--r--Build/source/texk/makeindexk/Makefile.am4
-rw-r--r--Build/source/texk/makeindexk/Makefile.in9
-rw-r--r--Build/source/texk/makeindexk/aclocal.m41
-rwxr-xr-xBuild/source/texk/makeindexk/configure61
-rw-r--r--Build/source/texk/makeindexk/configure.ac5
6 files changed, 79 insertions, 5 deletions
diff --git a/Build/source/texk/makeindexk/ChangeLog b/Build/source/texk/makeindexk/ChangeLog
index 8eb102ffb94..de28d43a7be 100644
--- a/Build/source/texk/makeindexk/ChangeLog
+++ b/Build/source/texk/makeindexk/ChangeLog
@@ -1,3 +1,7 @@
+2010-12-19 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * Makefile.am, configure.ac [WIN32]: Skip mkindex shell script.
+
2010-11-02 Taco Hoekwater <taco@elvenkind.com>
* mkind.c (mk_getc): new fn to accept both LF and CRLF.
diff --git a/Build/source/texk/makeindexk/Makefile.am b/Build/source/texk/makeindexk/Makefile.am
index a4344594224..c20b110de79 100644
--- a/Build/source/texk/makeindexk/Makefile.am
+++ b/Build/source/texk/makeindexk/Makefile.am
@@ -1,6 +1,6 @@
## Makefile.am for the TeX Live subdirectory texk/makeindexk/
##
-## Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org>
+## Copyright (C) 2009, 2010 Peter Breitenlohner <tex-live@tug.org>
## You may freely use, modify and/or distribute this file.
##
ACLOCAL_AMFLAGS = -I ../../m4
@@ -9,7 +9,9 @@ INCLUDES = $(KPATHSEA_INCLUDES)
AM_CPPFLAGS = -DUNIX -DKPATHSEA
AM_CFLAGS = $(WARNING_CFLAGS)
+if !WIN32
dist_bin_SCRIPTS = mkindex
+endif !WIN32
bin_PROGRAMS = makeindex
diff --git a/Build/source/texk/makeindexk/Makefile.in b/Build/source/texk/makeindexk/Makefile.in
index e0a87ce261c..ff1aaa445df 100644
--- a/Build/source/texk/makeindexk/Makefile.in
+++ b/Build/source/texk/makeindexk/Makefile.in
@@ -37,8 +37,9 @@ build_triplet = @build@
host_triplet = @host@
bin_PROGRAMS = makeindex$(EXEEXT)
subdir = .
-DIST_COMMON = README $(am__configure_deps) $(dist_bin_SCRIPTS) \
- $(dist_man1_MANS) $(srcdir)/../../build-aux/config.guess \
+DIST_COMMON = README $(am__configure_deps) \
+ $(am__dist_bin_SCRIPTS_DIST) $(dist_man1_MANS) \
+ $(srcdir)/../../build-aux/config.guess \
$(srcdir)/../../build-aux/config.sub \
$(srcdir)/../../build-aux/depcomp \
$(srcdir)/../../build-aux/install-sh \
@@ -54,6 +55,7 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-common.m4 \
$(top_srcdir)/../../m4/kpse-kpathsea-flags.m4 \
$(top_srcdir)/../../m4/kpse-warnings.m4 \
+ $(top_srcdir)/../../m4/kpse-win32.m4 \
$(top_srcdir)/../../m4/libtool.m4 \
$(top_srcdir)/../../m4/ltoptions.m4 \
$(top_srcdir)/../../m4/ltsugar.m4 \
@@ -78,6 +80,7 @@ makeindex_OBJECTS = $(am_makeindex_OBJECTS)
makeindex_LDADD = $(LDADD)
am__DEPENDENCIES_1 =
makeindex_DEPENDENCIES = $(am__DEPENDENCIES_1)
+am__dist_bin_SCRIPTS_DIST = mkindex
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
am__vpath_adj = case $$p in \
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -254,7 +257,7 @@ ACLOCAL_AMFLAGS = -I ../../m4
INCLUDES = $(KPATHSEA_INCLUDES)
AM_CPPFLAGS = -DUNIX -DKPATHSEA
AM_CFLAGS = $(WARNING_CFLAGS)
-dist_bin_SCRIPTS = mkindex
+@WIN32_FALSE@dist_bin_SCRIPTS = mkindex
makeindex_SOURCES = \
genind.c \
genind.h \
diff --git a/Build/source/texk/makeindexk/aclocal.m4 b/Build/source/texk/makeindexk/aclocal.m4
index d77f3a9c0b1..2e8f28004fa 100644
--- a/Build/source/texk/makeindexk/aclocal.m4
+++ b/Build/source/texk/makeindexk/aclocal.m4
@@ -992,6 +992,7 @@ AC_SUBST([am__untar])
m4_include([../../m4/kpse-common.m4])
m4_include([../../m4/kpse-kpathsea-flags.m4])
m4_include([../../m4/kpse-warnings.m4])
+m4_include([../../m4/kpse-win32.m4])
m4_include([../../m4/libtool.m4])
m4_include([../../m4/ltoptions.m4])
m4_include([../../m4/ltsugar.m4])
diff --git a/Build/source/texk/makeindexk/configure b/Build/source/texk/makeindexk/configure
index ae4a8b2846e..00c2f3ee26d 100755
--- a/Build/source/texk/makeindexk/configure
+++ b/Build/source/texk/makeindexk/configure
@@ -616,6 +616,8 @@ ac_subst_vars='am__EXEEXT_FALSE
am__EXEEXT_TRUE
LTLIBOBJS
LIBOBJS
+WIN32_FALSE
+WIN32_TRUE
KPATHSEA_RULE
KPATHSEA_DEPEND
KPATHSEA_LIBS
@@ -14039,6 +14041,61 @@ if test "x$kpse_cv_kpse_debug" != xyes; then :
fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for native WIN32 or MINGW32" >&5
+$as_echo_n "checking for native WIN32 or MINGW32... " >&6; }
+if ${kpse_cv_have_win32+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#ifndef WIN32
+ choke me
+#endif
+int
+main ()
+{
+
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#ifndef __MINGW32__
+ choke me
+#endif
+int
+main ()
+{
+
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ kpse_cv_have_win32=mingw32
+else
+ kpse_cv_have_win32=native
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+else
+ kpse_cv_have_win32=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $kpse_cv_have_win32" >&5
+$as_echo "$kpse_cv_have_win32" >&6; }
+
+ if test "x$kpse_cv_have_win32" != xno; then
+ WIN32_TRUE=
+ WIN32_FALSE='#'
+else
+ WIN32_TRUE='#'
+ WIN32_FALSE=
+fi
+
+
ac_config_files="$ac_config_files Makefile"
@@ -14171,6 +14228,10 @@ if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
as_fn_error $? "conditional \"am__fastdepCC\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
+if test -z "${WIN32_TRUE}" && test -z "${WIN32_FALSE}"; then
+ as_fn_error $? "conditional \"WIN32\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
: "${CONFIG_STATUS=./config.status}"
ac_write_fail=0
diff --git a/Build/source/texk/makeindexk/configure.ac b/Build/source/texk/makeindexk/configure.ac
index f8a2434dd7d..af6ca3f61fe 100644
--- a/Build/source/texk/makeindexk/configure.ac
+++ b/Build/source/texk/makeindexk/configure.ac
@@ -1,6 +1,6 @@
dnl Process this file with autoconf to produce a configure script.
dnl
-dnl Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org>
+dnl Copyright (C) 2009, 2010 Peter Breitenlohner <tex-live@tug.org>
dnl
dnl This file is free software; the copyright holder
dnl gives unlimited permission to copy and/or distribute it,
@@ -26,6 +26,9 @@ AC_CHECK_FUNCS([strchr strrchr setlocale])
KPSE_KPATHSEA_FLAGS
+KPSE_CHECK_WIN32
+AM_CONDITIONAL([WIN32], [test "x$kpse_cv_have_win32" != xno])
+
AC_CONFIG_FILES([Makefile])
AC_OUTPUT