From f87b81c36d13160b0f2ae9058c548061b4cef6ae Mon Sep 17 00:00:00 2001 From: Peter Breitenlohner Date: Sat, 9 May 2009 14:49:21 +0000 Subject: build system: more utils/xindy/ and general cleanup git-svn-id: svn://tug.org/texlive/trunk@13020 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/Makefile.am | 2 +- Build/source/Makefile.in | 2 + Build/source/configure | 72 +- Build/source/libs/Makefile.am | 2 +- Build/source/libs/Makefile.in | 2 + Build/source/libs/configure | 24 + Build/source/libs/gd/Makefile.am | 2 +- Build/source/libs/gd/Makefile.in | 1 + Build/source/libs/graphite/Makefile.am | 2 +- Build/source/libs/graphite/Makefile.in | 1 + Build/source/libs/icu/Makefile.am | 2 +- Build/source/libs/icu/Makefile.in | 1 + Build/source/libs/libpng/Makefile.am | 2 +- Build/source/libs/libpng/Makefile.in | 1 + Build/source/libs/t1lib/Makefile.am | 2 +- Build/source/libs/t1lib/Makefile.in | 1 + Build/source/libs/teckit/Makefile.am | 2 +- Build/source/libs/teckit/Makefile.in | 1 + Build/source/libs/xpdf/Makefile.am | 2 +- Build/source/libs/xpdf/Makefile.in | 1 + Build/source/libs/xpdf/configure.ac | 12 +- Build/source/libs/zlib/Makefile.am | 2 +- Build/source/libs/zlib/Makefile.in | 1 + Build/source/m4/kpse-freetype2-flags.m4 | 2 + Build/source/m4/kpse-xpdf-flags.m4 | 2 + Build/source/texk/Makefile.am | 2 +- Build/source/texk/Makefile.in | 2 + Build/source/texk/configure | 24 + Build/source/texk/dvipng/configure | 4 + Build/source/texk/lcdf-typetools/configure.ac | 4 +- Build/source/texk/tex4htk/Makefile.am | 4 +- Build/source/texk/tex4htk/Makefile.in | 2 + Build/source/texk/ttf2pk/Makefile.am | 2 +- Build/source/texk/ttf2pk/Makefile.in | 1 + Build/source/texk/ttfdump/Makefile.am | 2 +- Build/source/texk/ttfdump/Makefile.in | 1 + Build/source/texk/web2c/Makefile.am | 6 +- Build/source/texk/web2c/Makefile.in | 3 + Build/source/texk/web2c/ac/web2c.ac | 50 +- Build/source/texk/web2c/configure | 8 + Build/source/texk/xdvipdfmx/Makefile.am | 2 +- Build/source/texk/xdvipdfmx/Makefile.in | 1 + Build/source/texk/xdvipdfmx/configure | 4 + Build/source/utils/Makefile.am | 4 +- Build/source/utils/Makefile.in | 3 +- Build/source/utils/README | 83 +- Build/source/utils/README.orig | 83 - Build/source/utils/configure | 24 + Build/source/utils/dialog/Makefile.am | 2 +- Build/source/utils/dialog/Makefile.in | 1 + Build/source/utils/xindy/ChangeLog.TL | 14 + Build/source/utils/xindy/Makefile.am | 2 +- Build/source/utils/xindy/Makefile.in | 25 +- Build/source/utils/xindy/ac/withenable.ac | 1 + Build/source/utils/xindy/ac/xindy.ac | 18 + Build/source/utils/xindy/aclocal.m4 | 2 +- Build/source/utils/xindy/binaries/Makefile.am | 3 + Build/source/utils/xindy/binaries/Makefile.in | 7 +- Build/source/utils/xindy/config.guess | 1561 ------------------ Build/source/utils/xindy/config.sub | 1686 -------------------- Build/source/utils/xindy/configure | 189 +-- Build/source/utils/xindy/configure.ac | 62 +- Build/source/utils/xindy/depcomp | 589 ------- Build/source/utils/xindy/doc/Makefile.in | 4 +- .../utils/xindy/doc/style-tutorial/Makefile.in | 4 +- Build/source/utils/xindy/install-sh | 520 ------ Build/source/utils/xindy/m4/tl_msg_error.m4 | 23 + Build/source/utils/xindy/make-rules/Makefile.in | 4 +- .../utils/xindy/make-rules/alphabets/Makefile.in | 4 +- .../make-rules/alphabets/albanian/Makefile.in | 4 +- .../make-rules/alphabets/belarusian/Makefile.in | 4 +- .../make-rules/alphabets/bulgarian/Makefile.in | 4 +- .../make-rules/alphabets/croatian/Makefile.in | 4 +- .../xindy/make-rules/alphabets/czech/Makefile.in | 4 +- .../xindy/make-rules/alphabets/danish/Makefile.in | 4 +- .../xindy/make-rules/alphabets/dutch/Makefile.in | 4 +- .../xindy/make-rules/alphabets/english/Makefile.in | 4 +- .../make-rules/alphabets/esperanto/Makefile.in | 4 +- .../make-rules/alphabets/estonian/Makefile.in | 4 +- .../xindy/make-rules/alphabets/finnish/Makefile.in | 4 +- .../xindy/make-rules/alphabets/french/Makefile.in | 4 +- .../xindy/make-rules/alphabets/general/Makefile.in | 4 +- .../make-rules/alphabets/georgian/Makefile.in | 4 +- .../xindy/make-rules/alphabets/german/Makefile.in | 4 +- .../xindy/make-rules/alphabets/greek/Makefile.in | 4 +- .../xindy/make-rules/alphabets/gypsy/Makefile.in | 4 +- .../xindy/make-rules/alphabets/hausa/Makefile.in | 4 +- .../xindy/make-rules/alphabets/hebrew/Makefile.in | 4 +- .../make-rules/alphabets/hungarian/Makefile.in | 4 +- .../make-rules/alphabets/icelandic/Makefile.in | 4 +- .../xindy/make-rules/alphabets/italian/Makefile.in | 4 +- .../xindy/make-rules/alphabets/klingon/Makefile.in | 4 +- .../xindy/make-rules/alphabets/kurdish/Makefile.in | 4 +- .../xindy/make-rules/alphabets/latin/Makefile.in | 4 +- .../xindy/make-rules/alphabets/latvian/Makefile.in | 4 +- .../make-rules/alphabets/lithuanian/Makefile.in | 4 +- .../make-rules/alphabets/lower-sorbian/Makefile.in | 4 +- .../make-rules/alphabets/macedonian/Makefile.in | 4 +- .../make-rules/alphabets/mongolian/Makefile.in | 4 +- .../make-rules/alphabets/norwegian/Makefile.in | 4 +- .../xindy/make-rules/alphabets/polish/Makefile.in | 4 +- .../make-rules/alphabets/portuguese/Makefile.in | 4 +- .../make-rules/alphabets/romanian/Makefile.in | 4 +- .../xindy/make-rules/alphabets/russian/Makefile.in | 4 +- .../xindy/make-rules/alphabets/serbian/Makefile.in | 4 +- .../xindy/make-rules/alphabets/slovak/Makefile.in | 4 +- .../make-rules/alphabets/slovenian/Makefile.in | 4 +- .../xindy/make-rules/alphabets/spanish/Makefile.in | 4 +- .../xindy/make-rules/alphabets/swedish/Makefile.in | 4 +- .../xindy/make-rules/alphabets/test1/Makefile.in | 4 +- .../xindy/make-rules/alphabets/turkish/Makefile.in | 4 +- .../make-rules/alphabets/ukrainian/Makefile.in | 4 +- .../make-rules/alphabets/upper-sorbian/Makefile.in | 4 +- .../make-rules/alphabets/vietnamese/Makefile.in | 4 +- .../utils/xindy/make-rules/inputenc/Makefile.in | 4 +- .../utils/xindy/make-rules/styles/Makefile.in | 4 +- Build/source/utils/xindy/missing | 376 ----- Build/source/utils/xindy/modules/Makefile.in | 4 +- Build/source/utils/xindy/modules/base/Makefile.in | 4 +- Build/source/utils/xindy/modules/class/Makefile.in | 4 +- Build/source/utils/xindy/modules/lang/Makefile.in | 4 +- .../utils/xindy/modules/lang/german/Makefile.in | 4 +- .../utils/xindy/modules/lang/latin/Makefile.in | 4 +- Build/source/utils/xindy/modules/ord/Makefile.in | 4 +- Build/source/utils/xindy/modules/rules/Makefile.in | 4 +- .../source/utils/xindy/modules/styles/Makefile.in | 4 +- Build/source/utils/xindy/rte/Makefile.am | 7 +- Build/source/utils/xindy/rte/Makefile.in | 9 +- Build/source/utils/xindy/rte/ordrules/Makefile.in | 4 +- Build/source/utils/xindy/src/Makefile.in | 4 +- Build/source/utils/xindy/tex2xindy/Makefile.in | 8 +- Build/source/utils/xindy/user-commands/Makefile.in | 4 +- Build/source/utils/xindy/ylwrap | 223 --- 133 files changed, 614 insertions(+), 5429 deletions(-) delete mode 100644 Build/source/utils/README.orig create mode 100644 Build/source/utils/xindy/ac/xindy.ac delete mode 100755 Build/source/utils/xindy/config.guess delete mode 100755 Build/source/utils/xindy/config.sub delete mode 100755 Build/source/utils/xindy/depcomp delete mode 100755 Build/source/utils/xindy/install-sh create mode 100644 Build/source/utils/xindy/m4/tl_msg_error.m4 delete mode 100755 Build/source/utils/xindy/missing delete mode 100755 Build/source/utils/xindy/ylwrap diff --git a/Build/source/Makefile.am b/Build/source/Makefile.am index ec006521d86..5e913ba4215 100644 --- a/Build/source/Makefile.am +++ b/Build/source/Makefile.am @@ -18,7 +18,7 @@ EXTRA_DIST = \ build-aux/README.TL \ m4/README -## just in case a subdirectory has added directories +# just in case a subdirectory has added directories dist-hook: rm -rf `find $(distdir) -name .svn` diff --git a/Build/source/Makefile.in b/Build/source/Makefile.in index b2c9149a3e6..f6d07027cab 100644 --- a/Build/source/Makefile.in +++ b/Build/source/Makefile.in @@ -65,6 +65,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/kpse-common.m4 \ $(top_srcdir)/utils/tpic2pdftex/ac/withenable.ac \ $(top_srcdir)/utils/vlna/ac/withenable.ac \ $(top_srcdir)/utils/xindy/ac/withenable.ac \ + $(top_srcdir)/utils/xindy/ac/xindy.ac \ $(top_srcdir)/texk/ac/withenable.ac \ $(top_srcdir)/texk/web2c/ac/withenable.ac \ $(top_srcdir)/texk/web2c/ac/web2c.ac \ @@ -726,6 +727,7 @@ uninstall-am: tags tags-recursive uninstall uninstall-am +# just in case a subdirectory has added directories dist-hook: rm -rf `find $(distdir) -name .svn` diff --git a/Build/source/configure b/Build/source/configure index 476ecc73cc2..a25e1e36911 100755 --- a/Build/source/configure +++ b/Build/source/configure @@ -928,6 +928,9 @@ enable_t1utils enable_tpic2pdftex enable_vlna enable_xindy +enable_xindy_make_rules +enable_xindy_docs +with_xindy_recode enable_web2c with_editor enable_auto_core @@ -1704,6 +1707,9 @@ Optional Features: --disable-tpic2pdftex do not build the tpic2pdftex package --disable-vlna do not build the vlna package --enable-xindy build the xindy package + --enable-xindy-make-rules build and install make-rules package (default is + YES) + --enable-xindy-docs build and install documentation (default is YES) --disable-web2c do not build the web2c (TeX & Co.) package --enable-auto-core cause TeX&MF to dump core, given a certain filename @@ -1796,6 +1802,8 @@ Optional Features: Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) + --with-xindy-recode For `xindy': use `recode' instead of `iconv' + (default is NO) --with-editor=CMD invoke CMD from the `e' option [vi +%d %s] --without-mf-x-toolkit do not use X toolkit for METAFONT --with-gs=/PATH/TO/gs Hard-wire the location of GhostScript @@ -2611,6 +2619,22 @@ $as_echo "$as_me: Assuming \`--enable-xindy=$enable_xindy'" >&6;} ac_configure_args="$ac_configure_args '--enable-xindy=$enable_xindy'";; esac +## utils/xindy/ac/xindy.ac: configure.ac fragment for the TeX Live subdirectory utils/xindy/ +## configure options for xindy +# Check whether --enable-xindy-make-rules was given. +if test "${enable_xindy_make_rules+set}" = set; then + enableval=$enable_xindy_make_rules; +fi +# Check whether --enable-xindy-docs was given. +if test "${enable_xindy_docs+set}" = set; then + enableval=$enable_xindy_docs; +fi + +# Check whether --with-xindy-recode was given. +if test "${with_xindy_recode+set}" = set; then + withval=$with_xindy_recode; +fi + ## texk/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/ @@ -5974,13 +5998,13 @@ if test "${lt_cv_nm_interface+set}" = set; then else lt_cv_nm_interface="BSD nm" echo "int some_variable = 0;" > conftest.$ac_ext - (eval echo "\"\$as_me:5977: $ac_compile\"" >&5) + (eval echo "\"\$as_me:6001: $ac_compile\"" >&5) (eval "$ac_compile" 2>conftest.err) cat conftest.err >&5 - (eval echo "\"\$as_me:5980: $NM \\\"conftest.$ac_objext\\\"\"" >&5) + (eval echo "\"\$as_me:6004: $NM \\\"conftest.$ac_objext\\\"\"" >&5) (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) cat conftest.err >&5 - (eval echo "\"\$as_me:5983: output\"" >&5) + (eval echo "\"\$as_me:6007: output\"" >&5) cat conftest.out >&5 if $GREP 'External.*some_variable' conftest.out > /dev/null; then lt_cv_nm_interface="MS dumpbin" @@ -7186,7 +7210,7 @@ ia64-*-hpux*) ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 7189 "configure"' > conftest.$ac_ext + echo '#line 7213 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -9233,11 +9257,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:9236: $lt_compile\"" >&5) + (eval echo "\"\$as_me:9260: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:9240: \$? = $ac_status" >&5 + echo "$as_me:9264: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -9572,11 +9596,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:9575: $lt_compile\"" >&5) + (eval echo "\"\$as_me:9599: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:9579: \$? = $ac_status" >&5 + echo "$as_me:9603: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -9677,11 +9701,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:9680: $lt_compile\"" >&5) + (eval echo "\"\$as_me:9704: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:9684: \$? = $ac_status" >&5 + echo "$as_me:9708: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -9732,11 +9756,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:9735: $lt_compile\"" >&5) + (eval echo "\"\$as_me:9759: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:9739: \$? = $ac_status" >&5 + echo "$as_me:9763: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -12532,7 +12556,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12535 "configure" +#line 12559 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12628,7 +12652,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12631 "configure" +#line 12655 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -19024,11 +19048,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:19027: $lt_compile\"" >&5) + (eval echo "\"\$as_me:19051: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:19031: \$? = $ac_status" >&5 + echo "$as_me:19055: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -19123,11 +19147,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:19126: $lt_compile\"" >&5) + (eval echo "\"\$as_me:19150: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:19130: \$? = $ac_status" >&5 + echo "$as_me:19154: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -19175,11 +19199,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:19178: $lt_compile\"" >&5) + (eval echo "\"\$as_me:19202: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:19182: \$? = $ac_status" >&5 + echo "$as_me:19206: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -20303,6 +20327,10 @@ fi if test -n `$FT2_CONFIG --ftversion 2>/dev/null`; then FREETYPE2_INCLUDES=`$FT2_CONFIG --cflags` FREETYPE2_LIBS=`$FT2_CONFIG --libs` +elif test "x$need_freetype2:$with_freetype2_xpdf" = 'xyes:yes'; then + { { $as_echo "$as_me:$LINENO: error: did not find freetype-config required for system freetype2 library" >&5 +$as_echo "$as_me: error: did not find freetype-config required for system freetype2 library" >&2;} + { (exit 1); exit 1; }; } fi if test "x$with_gd_includes" != x && test "x$with_gd_includes" != xyes; then @@ -20409,6 +20437,10 @@ if $PKG_CONFIG poppler --atleast-version=0.10; then POPPLER_VERSION='-DPOPPLER_VERSION=\"'`$PKG_CONFIG poppler --modversion`'\"' XPDF_INCLUDES="$POPPLER_VERSION `$PKG_CONFIG poppler --cflags`" XPDF_LIBS=`$PKG_CONFIG poppler --libs` +elif test "x$need_xpdf:$with_system_xpdf" = 'xyes:yes'; then + { { $as_echo "$as_me:$LINENO: error: did not find poppler-0.10 or better" >&5 +$as_echo "$as_me: error: did not find poppler-0.10 or better" >&2;} + { (exit 1); exit 1; }; } fi if test "x$with_graphite_includes" != x && test "x$with_graphite_includes" != xyes; then diff --git a/Build/source/libs/Makefile.am b/Build/source/libs/Makefile.am index 65dfd053e1c..1192ea05dcd 100644 --- a/Build/source/libs/Makefile.am +++ b/Build/source/libs/Makefile.am @@ -10,7 +10,7 @@ ACLOCAL_AMFLAGS = -I ../m4 --force SUBDIRS = dummy . $(SUBLIBS) DIST_SUBDIRS = dummy $(DIST_SUBLIBS) -## just in case a subdirectory has added directories +# just in case a subdirectory has added directories dist-hook: rm -rf `find $(distdir) -name .svn` diff --git a/Build/source/libs/Makefile.in b/Build/source/libs/Makefile.in index dc0f91eda21..ece65574077 100644 --- a/Build/source/libs/Makefile.in +++ b/Build/source/libs/Makefile.in @@ -70,6 +70,7 @@ am__aclocal_m4_deps = $(top_srcdir)/../m4/kpse-common.m4 \ $(top_srcdir)/../utils/tpic2pdftex/ac/withenable.ac \ $(top_srcdir)/../utils/vlna/ac/withenable.ac \ $(top_srcdir)/../utils/xindy/ac/withenable.ac \ + $(top_srcdir)/../utils/xindy/ac/xindy.ac \ $(top_srcdir)/../texk/ac/withenable.ac \ $(top_srcdir)/../texk/web2c/ac/withenable.ac \ $(top_srcdir)/../texk/web2c/ac/web2c.ac \ @@ -664,6 +665,7 @@ uninstall-am: pdf-am ps ps-am tags tags-recursive uninstall uninstall-am +# just in case a subdirectory has added directories dist-hook: rm -rf `find $(distdir) -name .svn` diff --git a/Build/source/libs/configure b/Build/source/libs/configure index 5470c90c226..fb01ecf76b1 100755 --- a/Build/source/libs/configure +++ b/Build/source/libs/configure @@ -693,6 +693,9 @@ enable_t1utils enable_tpic2pdftex enable_vlna enable_xindy +enable_xindy_make_rules +enable_xindy_docs +with_xindy_recode enable_web2c with_editor enable_auto_core @@ -1456,6 +1459,9 @@ Optional Features: --disable-tpic2pdftex do not build the tpic2pdftex package --disable-vlna do not build the vlna package --enable-xindy build the xindy package + --enable-xindy-make-rules build and install make-rules package (default is + YES) + --enable-xindy-docs build and install documentation (default is YES) --disable-web2c do not build the web2c (TeX & Co.) package --enable-auto-core cause TeX&MF to dump core, given a certain filename @@ -1540,6 +1546,8 @@ Optional Features: Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) + --with-xindy-recode For `xindy': use `recode' instead of `iconv' + (default is NO) --with-editor=CMD invoke CMD from the `e' option [vi +%d %s] --without-mf-x-toolkit do not use X toolkit for METAFONT --with-gs=/PATH/TO/gs Hard-wire the location of GhostScript @@ -2334,6 +2342,22 @@ $as_echo "$as_me: Assuming \`--enable-xindy=$enable_xindy'" >&6;} ac_configure_args="$ac_configure_args '--enable-xindy=$enable_xindy'";; esac +## utils/xindy/ac/xindy.ac: configure.ac fragment for the TeX Live subdirectory utils/xindy/ +## configure options for xindy +# Check whether --enable-xindy-make-rules was given. +if test "${enable_xindy_make_rules+set}" = set; then + enableval=$enable_xindy_make_rules; +fi +# Check whether --enable-xindy-docs was given. +if test "${enable_xindy_docs+set}" = set; then + enableval=$enable_xindy_docs; +fi + +# Check whether --with-xindy-recode was given. +if test "${with_xindy_recode+set}" = set; then + withval=$with_xindy_recode; +fi + ## texk/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/ diff --git a/Build/source/libs/gd/Makefile.am b/Build/source/libs/gd/Makefile.am index 5b043bd13a4..f6d597bc622 100644 --- a/Build/source/libs/gd/Makefile.am +++ b/Build/source/libs/gd/Makefile.am @@ -15,7 +15,7 @@ ACLOCAL_AMFLAGS = -I ../../m4 ## Thus nodist_* for all files in $(GD_TREE). EXTRA_DIST = $(GD_TREE) -## in case of an SVN repository +# in case of an SVN repository dist-hook: rm -rf `find $(distdir)/$(GD_TREE) -name .svn` diff --git a/Build/source/libs/gd/Makefile.in b/Build/source/libs/gd/Makefile.in index f9b9ea79940..13b3c3c4fe3 100644 --- a/Build/source/libs/gd/Makefile.in +++ b/Build/source/libs/gd/Makefile.in @@ -1034,6 +1034,7 @@ uninstall-am: uninstall-am +# in case of an SVN repository dist-hook: rm -rf `find $(distdir)/$(GD_TREE) -name .svn` diff --git a/Build/source/libs/graphite/Makefile.am b/Build/source/libs/graphite/Makefile.am index 6227f6e5b18..e0b04f74115 100644 --- a/Build/source/libs/graphite/Makefile.am +++ b/Build/source/libs/graphite/Makefile.am @@ -47,7 +47,7 @@ EXTRA_DIST = \ test \ uninstalled-top.pc.in -## in case of an SVN repository +# in case of an SVN repository dist-hook: rm -rf `find $(distdir) -name .svn` diff --git a/Build/source/libs/graphite/Makefile.in b/Build/source/libs/graphite/Makefile.in index 5a03fa55921..e48b277315e 100644 --- a/Build/source/libs/graphite/Makefile.in +++ b/Build/source/libs/graphite/Makefile.in @@ -1051,6 +1051,7 @@ uninstall-am: tags uninstall uninstall-am +# in case of an SVN repository dist-hook: rm -rf `find $(distdir) -name .svn` # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/Build/source/libs/icu/Makefile.am b/Build/source/libs/icu/Makefile.am index 1798c7ba48d..9d870eef8e7 100644 --- a/Build/source/libs/icu/Makefile.am +++ b/Build/source/libs/icu/Makefile.am @@ -13,7 +13,7 @@ SUBDIRS = dummy ## We want to re-distribute the whole icu-xetex source tree. EXTRA_DIST = icu-xetex -## in case of an SVN repository +# in case of an SVN repository dist-hook: rm -rf `find $(distdir)/icu-xetex -name .svn` diff --git a/Build/source/libs/icu/Makefile.in b/Build/source/libs/icu/Makefile.in index bae16bceb23..4931a6d39a7 100644 --- a/Build/source/libs/icu/Makefile.in +++ b/Build/source/libs/icu/Makefile.in @@ -578,6 +578,7 @@ uninstall-am: uninstall uninstall-am +# in case of an SVN repository dist-hook: rm -rf `find $(distdir)/icu-xetex -name .svn` diff --git a/Build/source/libs/libpng/Makefile.am b/Build/source/libs/libpng/Makefile.am index e6215891fa6..d795ef6a264 100644 --- a/Build/source/libs/libpng/Makefile.am +++ b/Build/source/libs/libpng/Makefile.am @@ -15,7 +15,7 @@ ACLOCAL_AMFLAGS = -I ../../m4 ## Thus nodist_* for all files in $(LIBPNG_TREE). EXTRA_DIST = $(LIBPNG_TREE) -## in case of an SVN repository +# in case of an SVN repository dist-hook: rm -rf `find $(distdir)/$(LIBPNG_TREE) -name .svn` diff --git a/Build/source/libs/libpng/Makefile.in b/Build/source/libs/libpng/Makefile.in index 1403f5ddbc2..52fc9fe8ca2 100644 --- a/Build/source/libs/libpng/Makefile.in +++ b/Build/source/libs/libpng/Makefile.in @@ -927,6 +927,7 @@ uninstall-am: uninstall-am +# in case of an SVN repository dist-hook: rm -rf `find $(distdir)/$(LIBPNG_TREE) -name .svn` diff --git a/Build/source/libs/t1lib/Makefile.am b/Build/source/libs/t1lib/Makefile.am index 28f158968c8..59202599135 100644 --- a/Build/source/libs/t1lib/Makefile.am +++ b/Build/source/libs/t1lib/Makefile.am @@ -15,7 +15,7 @@ ACLOCAL_AMFLAGS = -I ../../m4 ## Thus nodist_* for all files in $(T1LIB_TREE). EXTRA_DIST = $(T1LIB_TREE) -## in case of an SVN repository +# in case of an SVN repository dist-hook: rm -rf `find $(distdir)/$(T1LIB_TREE) -name .svn` diff --git a/Build/source/libs/t1lib/Makefile.in b/Build/source/libs/t1lib/Makefile.in index 569b9351530..496b390b13e 100644 --- a/Build/source/libs/t1lib/Makefile.in +++ b/Build/source/libs/t1lib/Makefile.in @@ -1177,6 +1177,7 @@ uninstall-am: uninstall-am +# in case of an SVN repository dist-hook: rm -rf `find $(distdir)/$(T1LIB_TREE) -name .svn` # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/Build/source/libs/teckit/Makefile.am b/Build/source/libs/teckit/Makefile.am index 84b1ed618e5..95b12a7206f 100644 --- a/Build/source/libs/teckit/Makefile.am +++ b/Build/source/libs/teckit/Makefile.am @@ -80,7 +80,7 @@ EXTRA_DIST += \ source/version_defs.h \ test -## in case of an SVN repository +# in case of an SVN repository dist-hook: rm -rf `find $(distdir) -name .svn` diff --git a/Build/source/libs/teckit/Makefile.in b/Build/source/libs/teckit/Makefile.in index d12f9c33853..80c96feb85d 100644 --- a/Build/source/libs/teckit/Makefile.in +++ b/Build/source/libs/teckit/Makefile.in @@ -646,6 +646,7 @@ uninstall-am: @ZLIB_RULE@ +# in case of an SVN repository dist-hook: rm -rf `find $(distdir) -name .svn` # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/Build/source/libs/xpdf/Makefile.am b/Build/source/libs/xpdf/Makefile.am index 7374496dcbf..ea12b331bdc 100644 --- a/Build/source/libs/xpdf/Makefile.am +++ b/Build/source/libs/xpdf/Makefile.am @@ -34,7 +34,7 @@ EXTRA_DIST += $(XPDF_TREE)-foolabs ## EXTRA_DIST += $(XPDF_TREE)-PATCHES -## in case of an SVN repository +# in case of an SVN repository dist-hook: rm -rf `find $(distdir)/$(XPDF_TREE) -name .svn` diff --git a/Build/source/libs/xpdf/Makefile.in b/Build/source/libs/xpdf/Makefile.in index c6aa37dcb8b..8fd073a30d4 100644 --- a/Build/source/libs/xpdf/Makefile.in +++ b/Build/source/libs/xpdf/Makefile.in @@ -1454,6 +1454,7 @@ uninstall-am: uninstall uninstall-am +# in case of an SVN repository dist-hook: rm -rf `find $(distdir)/$(XPDF_TREE) -name .svn` # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/Build/source/libs/xpdf/configure.ac b/Build/source/libs/xpdf/configure.ac index 24d82ee2e45..a69e33b4d24 100644 --- a/Build/source/libs/xpdf/configure.ac +++ b/Build/source/libs/xpdf/configure.ac @@ -18,24 +18,24 @@ AM_MAINTAINER_MODE dnl ##### Optional features. AC_ARG_ENABLE([a4-paper], - [AS_HELP_STRING([--enable-a4-paper], - [use A4 paper size instead of Letter for PostScript output])], + AS_HELP_STRING([--enable-a4-paper], + [use A4 paper size instead of Letter for PostScript output]), [if test "x$enableval" = xyes; then AC_DEFINE([A4_PAPER], 1, [Use A4 paper size instead of Letter for PostScript output]) fi ]) AC_ARG_ENABLE([opi], - [AS_HELP_STRING([--enable-opi], - [include support for OPI comments])], + AS_HELP_STRING([--enable-opi], + [include support for OPI comments]), [if test "x$enableval" = xyes; then AC_DEFINE([OPI_SUPPORT], 1, [Include support for OPI comments]) fi ]) AC_ARG_ENABLE([multithreaded], - [AS_HELP_STRING([--enable-multithreaded], - [include support for multithreading])], + AS_HELP_STRING([--enable-multithreaded], + [include support for multithreading]), [if test "x$enableval" = xyes; then AC_DEFINE([MULTITHREADED], 1, [Enable multithreading support]) fi diff --git a/Build/source/libs/zlib/Makefile.am b/Build/source/libs/zlib/Makefile.am index 6f188a23e3d..80dbb8b81a8 100644 --- a/Build/source/libs/zlib/Makefile.am +++ b/Build/source/libs/zlib/Makefile.am @@ -15,7 +15,7 @@ ACLOCAL_AMFLAGS = -I ../../m4 ## Thus nodist_* for all files in $(ZLIB_TREE). EXTRA_DIST = $(ZLIB_TREE) -## in case of an SVN repository +# in case of an SVN repository dist-hook: rm -rf `find $(distdir)/$(ZLIB_TREE) -name .svn` diff --git a/Build/source/libs/zlib/Makefile.in b/Build/source/libs/zlib/Makefile.in index 9e87426ff21..569152b8d20 100644 --- a/Build/source/libs/zlib/Makefile.in +++ b/Build/source/libs/zlib/Makefile.in @@ -903,6 +903,7 @@ uninstall-am: uninstall-am +# in case of an SVN repository dist-hook: rm -rf `find $(distdir)/$(ZLIB_TREE) -name .svn` diff --git a/Build/source/m4/kpse-freetype2-flags.m4 b/Build/source/m4/kpse-freetype2-flags.m4 index 1fd8a0fac53..c3bc661473c 100644 --- a/Build/source/m4/kpse-freetype2-flags.m4 +++ b/Build/source/m4/kpse-freetype2-flags.m4 @@ -40,6 +40,8 @@ AC_DEFUN([KPSE_FREETYPE2_SYSTEM_FLAGS], if test -n `$FT2_CONFIG --ftversion 2>/dev/null`; then FREETYPE2_INCLUDES=`$FT2_CONFIG --cflags` FREETYPE2_LIBS=`$FT2_CONFIG --libs` +elif test "x$need_freetype2:$with_freetype2_xpdf" = 'xyes:yes'; then + AC_MSG_ERROR([did not find freetype-config required for system freetype2 library]) fi ]) # KPSE_FREETYPE2_SYSTEM_FLAGS diff --git a/Build/source/m4/kpse-xpdf-flags.m4 b/Build/source/m4/kpse-xpdf-flags.m4 index 6da80749f2e..c8cfd96f2c0 100644 --- a/Build/source/m4/kpse-xpdf-flags.m4 +++ b/Build/source/m4/kpse-xpdf-flags.m4 @@ -36,6 +36,8 @@ if $PKG_CONFIG poppler --atleast-version=0.10; then POPPLER_VERSION='-DPOPPLER_VERSION=\"'`$PKG_CONFIG poppler --modversion`'\"' XPDF_INCLUDES="$POPPLER_VERSION `$PKG_CONFIG poppler --cflags`" XPDF_LIBS=`$PKG_CONFIG poppler --libs` +elif test "x$need_xpdf:$with_system_xpdf" = 'xyes:yes'; then + AC_MSG_ERROR([did not find poppler-0.10 or better]) fi ]) # KPSE_XPDF_SYSTEM_FLAGS diff --git a/Build/source/texk/Makefile.am b/Build/source/texk/Makefile.am index efa524ba3df..1345991963f 100644 --- a/Build/source/texk/Makefile.am +++ b/Build/source/texk/Makefile.am @@ -10,7 +10,7 @@ ACLOCAL_AMFLAGS = -I ../m4 --force SUBDIRS = dummy . $(SUBTEXK) DIST_SUBDIRS = dummy $(DIST_SUBTEXK) -## just in case a subdirectory has added directories +# just in case a subdirectory has added directories dist-hook: rm -rf `find $(distdir) -name .svn` diff --git a/Build/source/texk/Makefile.in b/Build/source/texk/Makefile.in index ae50a8712f9..869650da7ce 100644 --- a/Build/source/texk/Makefile.in +++ b/Build/source/texk/Makefile.in @@ -70,6 +70,7 @@ am__aclocal_m4_deps = $(top_srcdir)/../m4/kpse-common.m4 \ $(top_srcdir)/../utils/tpic2pdftex/ac/withenable.ac \ $(top_srcdir)/../utils/vlna/ac/withenable.ac \ $(top_srcdir)/../utils/xindy/ac/withenable.ac \ + $(top_srcdir)/../utils/xindy/ac/xindy.ac \ $(top_srcdir)/../texk/ac/withenable.ac \ $(top_srcdir)/../texk/web2c/ac/withenable.ac \ $(top_srcdir)/../texk/web2c/ac/web2c.ac \ @@ -664,6 +665,7 @@ uninstall-am: pdf-am ps ps-am tags tags-recursive uninstall uninstall-am +# just in case a subdirectory has added directories dist-hook: rm -rf `find $(distdir) -name .svn` diff --git a/Build/source/texk/configure b/Build/source/texk/configure index 45bed7cef18..9b24285ab9d 100755 --- a/Build/source/texk/configure +++ b/Build/source/texk/configure @@ -693,6 +693,9 @@ enable_t1utils enable_tpic2pdftex enable_vlna enable_xindy +enable_xindy_make_rules +enable_xindy_docs +with_xindy_recode enable_web2c with_editor enable_auto_core @@ -1475,6 +1478,9 @@ Optional Features: --disable-tpic2pdftex do not build the tpic2pdftex package --disable-vlna do not build the vlna package --enable-xindy build the xindy package + --enable-xindy-make-rules build and install make-rules package (default is + YES) + --enable-xindy-docs build and install documentation (default is YES) --disable-web2c do not build the web2c (TeX & Co.) package --enable-auto-core cause TeX&MF to dump core, given a certain filename @@ -1559,6 +1565,8 @@ Optional Features: Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) + --with-xindy-recode For `xindy': use `recode' instead of `iconv' + (default is NO) --with-editor=CMD invoke CMD from the `e' option [vi +%d %s] --without-mf-x-toolkit do not use X toolkit for METAFONT --with-gs=/PATH/TO/gs Hard-wire the location of GhostScript @@ -2353,6 +2361,22 @@ $as_echo "$as_me: Assuming \`--enable-xindy=$enable_xindy'" >&6;} ac_configure_args="$ac_configure_args '--enable-xindy=$enable_xindy'";; esac +## utils/xindy/ac/xindy.ac: configure.ac fragment for the TeX Live subdirectory utils/xindy/ +## configure options for xindy +# Check whether --enable-xindy-make-rules was given. +if test "${enable_xindy_make_rules+set}" = set; then + enableval=$enable_xindy_make_rules; +fi +# Check whether --enable-xindy-docs was given. +if test "${enable_xindy_docs+set}" = set; then + enableval=$enable_xindy_docs; +fi + +# Check whether --with-xindy-recode was given. +if test "${with_xindy_recode+set}" = set; then + withval=$with_xindy_recode; +fi + ## texk/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/ diff --git a/Build/source/texk/dvipng/configure b/Build/source/texk/dvipng/configure index e7cbc877b46..72be72578e8 100755 --- a/Build/source/texk/dvipng/configure +++ b/Build/source/texk/dvipng/configure @@ -18218,6 +18218,10 @@ if test "x$with_system_freetype2" = xyes; then if test -n `$FT2_CONFIG --ftversion 2>/dev/null`; then FREETYPE2_INCLUDES=`$FT2_CONFIG --cflags` FREETYPE2_LIBS=`$FT2_CONFIG --libs` +elif test "x$need_freetype2:$with_freetype2_xpdf" = 'xyes:yes'; then + { { $as_echo "$as_me:$LINENO: error: did not find freetype-config required for system freetype2 library" >&5 +$as_echo "$as_me: error: did not find freetype-config required for system freetype2 library" >&2;} + { (exit 1); exit 1; }; } fi else FREETYPE2_INCLUDES=`echo 'BLD/libs/freetype2' | sed \ diff --git a/Build/source/texk/lcdf-typetools/configure.ac b/Build/source/texk/lcdf-typetools/configure.ac index d0870155c1d..b2a9c1943d1 100644 --- a/Build/source/texk/lcdf-typetools/configure.ac +++ b/Build/source/texk/lcdf-typetools/configure.ac @@ -55,8 +55,8 @@ test -d $srcdir/../kpathsea && enable_tetex_build=yes AM_CONDITIONAL([tetex_build], [test "x$enable_tetex_build" = xyes]) AC_ARG_WITH([kpathsea], - [AS_HELP_STRING([--without-kpathsea], - [build otftotfm without kpathsea])]) + AS_HELP_STRING([--without-kpathsea], + [build otftotfm without kpathsea])) KPSE_KPATHSEA_FLAGS diff --git a/Build/source/texk/tex4htk/Makefile.am b/Build/source/texk/tex4htk/Makefile.am index b71663fcf50..183a4ca8e02 100644 --- a/Build/source/texk/tex4htk/Makefile.am +++ b/Build/source/texk/tex4htk/Makefile.am @@ -34,7 +34,7 @@ tex4ht_subdir = texmf-dist/scripts/tex4ht tex4htdir = ${prefix}/$(tex4ht_subdir) tex4ht_SCRIPTS = -## We support both multiplatform and non-multiplatform builds. +# We support both multiplatform and non-multiplatform builds. install-data-hook: @for p in $(perl_scripts); do \ echo "$(INSTALL_SCRIPT) $(srcdir)/$$p '$(DESTDIR)$(tex4htdir)/$$p.pl'"; \ @@ -197,7 +197,7 @@ EXTRA_DIST += \ xhxetex \ xv4ht.java -## in case of an SVN repository +# in case of an SVN repository dist-hook: rm -rf `find $(distdir) -name .svn` diff --git a/Build/source/texk/tex4htk/Makefile.in b/Build/source/texk/tex4htk/Makefile.in index 4e868e06f51..781bcee3a54 100644 --- a/Build/source/texk/tex4htk/Makefile.in +++ b/Build/source/texk/tex4htk/Makefile.in @@ -719,6 +719,7 @@ uninstall-am: uninstall-binPROGRAMS uninstall-binSCRIPTS \ @KPATHSEA_RULE@ +# We support both multiplatform and non-multiplatform builds. install-data-hook: @for p in $(perl_scripts); do \ echo "$(INSTALL_SCRIPT) $(srcdir)/$$p '$(DESTDIR)$(tex4htdir)/$$p.pl'"; \ @@ -759,6 +760,7 @@ uninstall-hook: rm -f "$(DESTDIR)$(bindir)/$$p"; \ done +# in case of an SVN repository dist-hook: rm -rf `find $(distdir) -name .svn` # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/Build/source/texk/ttf2pk/Makefile.am b/Build/source/texk/ttf2pk/Makefile.am index 976e0a634a0..77c0d300f22 100644 --- a/Build/source/texk/ttf2pk/Makefile.am +++ b/Build/source/texk/ttf2pk/Makefile.am @@ -89,7 +89,7 @@ EXTRA_DIST = \ emtexdir.h \ ttf2pk.doc -## in case of an SVN repository +# in case of an SVN repository dist-hook: rm -rf `find $(distdir) -name .svn` diff --git a/Build/source/texk/ttf2pk/Makefile.in b/Build/source/texk/ttf2pk/Makefile.in index 79e9ebe8cb8..53637f15c30 100644 --- a/Build/source/texk/ttf2pk/Makefile.in +++ b/Build/source/texk/ttf2pk/Makefile.in @@ -774,6 +774,7 @@ uninstall-man: uninstall-man1 @KPATHSEA_RULE@ @FREETYPE_RULE@ +# in case of an SVN repository dist-hook: rm -rf `find $(distdir) -name .svn` # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/Build/source/texk/ttfdump/Makefile.am b/Build/source/texk/ttfdump/Makefile.am index 1ef783e547d..fe6b13949ca 100644 --- a/Build/source/texk/ttfdump/Makefile.am +++ b/Build/source/texk/ttfdump/Makefile.am @@ -7,7 +7,7 @@ ACLOCAL_AMFLAGS = -I ../../m4 ## DISTFILES contains a directory and files in that directory. EXTRA_DIST = docs include libttf src -## in case of an SVN repository +# in case of an SVN repository dist-hook: rm -rf `find $(distdir) -name .svn` diff --git a/Build/source/texk/ttfdump/Makefile.in b/Build/source/texk/ttfdump/Makefile.in index e9bfcc22d60..d027a5cb0cd 100644 --- a/Build/source/texk/ttfdump/Makefile.in +++ b/Build/source/texk/ttfdump/Makefile.in @@ -1212,6 +1212,7 @@ uninstall-man: uninstall-man1 uninstall-man uninstall-man1 +# in case of an SVN repository dist-hook: rm -rf `find $(distdir) -name .svn` diff --git a/Build/source/texk/web2c/Makefile.am b/Build/source/texk/web2c/Makefile.am index 3e84dbd0bc6..812205a18e9 100644 --- a/Build/source/texk/web2c/Makefile.am +++ b/Build/source/texk/web2c/Makefile.am @@ -31,7 +31,7 @@ EXTRA_DIST = PROJECTS cftests config.h cpascal.h help.h DISTCLEANFILES = $(EXTRA_LIBRARIES) CLEANFILES = -## in case of an SVN repository +# in case of an SVN repository dist-hook: rm -rf `find $(distdir) -name .svn` @@ -58,11 +58,11 @@ LDADD = $(proglib) $(KPATHSEA_LIBS) ## This does not work for the configure substitution $(KPATHSEA_LIBS), ## thus we let $(proglib) artificially depend on $(KPATHSEA_LIBS). -## Rebuild $(proglib) +# Rebuild $(proglib) $(proglib): $(KPATHSEA_DEPEND) ${srcdir}/lib/*.c cd lib && $(MAKE) $(AM_MAKEFLAGS) -## Rebuild Web2C programs +# Rebuild Web2C programs web2c/stamp-fixwrites: $(web2c_common) ${srcdir}/web2c/*.[chly] cd web2c && $(MAKE) $(AM_MAKEFLAGS) stamp-fixwrites web2c/stamp-splitup: $(web2c_common) ${srcdir}/web2c/*.[chly] diff --git a/Build/source/texk/web2c/Makefile.in b/Build/source/texk/web2c/Makefile.in index 8d9f5959f81..70dc2e6245c 100644 --- a/Build/source/texk/web2c/Makefile.in +++ b/Build/source/texk/web2c/Makefile.in @@ -7862,12 +7862,15 @@ uninstall-man: uninstall-man1 uninstall-man5 uninstall-man5 +# in case of an SVN repository dist-hook: rm -rf `find $(distdir) -name .svn` +# Rebuild $(proglib) $(proglib): $(KPATHSEA_DEPEND) ${srcdir}/lib/*.c cd lib && $(MAKE) $(AM_MAKEFLAGS) +# Rebuild Web2C programs web2c/stamp-fixwrites: $(web2c_common) ${srcdir}/web2c/*.[chly] cd web2c && $(MAKE) $(AM_MAKEFLAGS) stamp-fixwrites web2c/stamp-splitup: $(web2c_common) ${srcdir}/web2c/*.[chly] diff --git a/Build/source/texk/web2c/ac/web2c.ac b/Build/source/texk/web2c/ac/web2c.ac index 94ee84f2095..2080c3bce68 100644 --- a/Build/source/texk/web2c/ac/web2c.ac +++ b/Build/source/texk/web2c/ac/web2c.ac @@ -6,21 +6,21 @@ dnl ## configure options for TeX and MF m4_define_default([kpse_indent_26], [26])[]dnl AC_ARG_WITH([editor], - [AS_HELP_STRING([--with-editor=CMD], - [invoke CMD from the `e' option @<:@vi +%d %s@:>@])])[]dnl + AS_HELP_STRING([--with-editor=CMD], + [invoke CMD from the `e' option @<:@vi +%d %s@:>@]))[]dnl AC_ARG_ENABLE([auto-core], - [AS_HELP_STRING([--enable-auto-core], - [cause TeX&MF to dump core, given a certain filename], - kpse_indent_26)])[]dnl + AS_HELP_STRING([--enable-auto-core], + [cause TeX&MF to dump core, given a certain filename], + kpse_indent_26))[]dnl AC_ARG_ENABLE([dump-share], - [AS_HELP_STRING([--disable-dump-share], - [make fmt/base/mem files architecture-dependent], - kpse_indent_26)])[]dnl + AS_HELP_STRING([--disable-dump-share], + [make fmt/base/mem files architecture-dependent], + kpse_indent_26))[]dnl ## configure options for TeX AC_ARG_ENABLE([ipc], - [AS_HELP_STRING([--enable-ipc], - [enable TeX's --ipc option, i.e., pipe to a program], - kpse_indent_26)])[]dnl + AS_HELP_STRING([--enable-ipc], + [enable TeX's --ipc option, i.e., pipe to a program], + kpse_indent_26))[]dnl m4_define([kpse_tex_progs], [dnl [[tex], [yes], [no], [TeX], []], [[etex], [no], [yes], [e-TeX], []], @@ -34,16 +34,16 @@ m4_foreach([Kpse_Prog], [kpse_tex_progs], [KPSE_WITH_XTEX(Kpse_Prog)])])[]dnl ## configure options for MF AC_ARG_ENABLE([mf], - [AS_HELP_STRING([--disable-mf], - [do not build METAFONT], - kpse_indent_26)])[]dnl + AS_HELP_STRING([--disable-mf], + [do not build METAFONT], + kpse_indent_26))[]dnl AC_ARG_ENABLE([mf-nowin], - [AS_HELP_STRING([--disable-mf-nowin], - [do not build a separate non-windows-capable METAFONT], - kpse_indent_26+2)])[]dnl + AS_HELP_STRING([--disable-mf-nowin], + [do not build a separate non-windows-capable METAFONT], + kpse_indent_26+2))[]dnl AC_ARG_WITH([mf-x-toolkit], - [AS_HELP_STRING([--without-mf-x-toolkit], - [do not use X toolkit for METAFONT])])[]dnl + AS_HELP_STRING([--without-mf-x-toolkit], + [do not use X toolkit for METAFONT]))[]dnl m4_define([kpse_mf_win], [dnl [[epsf], [EPSF], [EPSF pseudo]], [[hp2627], [HP2627], [HP 2627]], @@ -59,11 +59,11 @@ m4_foreach([Kpse_Win], [kpse_mf_win], [KPSE_WITH_MFWIN(Kpse_Win)])])[]dnl ## configure options for MP AC_ARG_ENABLE([mp], - [AS_HELP_STRING([--disable-mp], - [do not build METAPOST], - kpse_indent_26)])[]dnl + AS_HELP_STRING([--disable-mp], + [do not build METAPOST], + kpse_indent_26))[]dnl ## configure options for WEB programs AC_ARG_ENABLE([web-progs], - [AS_HELP_STRING([--disable-web-progs], - [do not build WEB programs bibtex ... weave], - kpse_indent_26)])[]dnl + AS_HELP_STRING([--disable-web-progs], + [do not build WEB programs bibtex ... weave], + kpse_indent_26))[]dnl diff --git a/Build/source/texk/web2c/configure b/Build/source/texk/web2c/configure index 3544d4fff66..755e37e5b24 100755 --- a/Build/source/texk/web2c/configure +++ b/Build/source/texk/web2c/configure @@ -23756,6 +23756,10 @@ if test "x$with_system_xpdf" = xyes; then POPPLER_VERSION='-DPOPPLER_VERSION=\"'`$PKG_CONFIG poppler --modversion`'\"' XPDF_INCLUDES="$POPPLER_VERSION `$PKG_CONFIG poppler --cflags`" XPDF_LIBS=`$PKG_CONFIG poppler --libs` +elif test "x$need_xpdf:$with_system_xpdf" = 'xyes:yes'; then + { { $as_echo "$as_me:$LINENO: error: did not find poppler-0.10 or better" >&5 +$as_echo "$as_me: error: did not find poppler-0.10 or better" >&2;} + { (exit 1); exit 1; }; } fi else XPDF_INCLUDES=`echo '-DPDF_PARSER_ONLY -IBLD/libs/xpdf -IBLD/libs/xpdf/goo -IBLD/libs/xpdf/xpdf' | sed \ @@ -23913,6 +23917,10 @@ if test "x$with_system_freetype2" = xyes; then if test -n `$FT2_CONFIG --ftversion 2>/dev/null`; then FREETYPE2_INCLUDES=`$FT2_CONFIG --cflags` FREETYPE2_LIBS=`$FT2_CONFIG --libs` +elif test "x$need_freetype2:$with_freetype2_xpdf" = 'xyes:yes'; then + { { $as_echo "$as_me:$LINENO: error: did not find freetype-config required for system freetype2 library" >&5 +$as_echo "$as_me: error: did not find freetype-config required for system freetype2 library" >&2;} + { (exit 1); exit 1; }; } fi else FREETYPE2_INCLUDES=`echo 'BLD/libs/freetype2' | sed \ diff --git a/Build/source/texk/xdvipdfmx/Makefile.am b/Build/source/texk/xdvipdfmx/Makefile.am index e064309bd63..74acde13f6b 100644 --- a/Build/source/texk/xdvipdfmx/Makefile.am +++ b/Build/source/texk/xdvipdfmx/Makefile.am @@ -17,7 +17,7 @@ EXTRA_DIST = \ style_ie.css \ style_plain.css -## in case of an SVN repository +# in case of an SVN repository dist-hook: rm -rf `find $(distdir) -name .svn` diff --git a/Build/source/texk/xdvipdfmx/Makefile.in b/Build/source/texk/xdvipdfmx/Makefile.in index 8d9f36da05f..2a7471efae6 100644 --- a/Build/source/texk/xdvipdfmx/Makefile.in +++ b/Build/source/texk/xdvipdfmx/Makefile.in @@ -673,6 +673,7 @@ uninstall-am: ps ps-am tags tags-recursive uninstall uninstall-am +# in case of an SVN repository dist-hook: rm -rf `find $(distdir) -name .svn` # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/Build/source/texk/xdvipdfmx/configure b/Build/source/texk/xdvipdfmx/configure index 0e3d1a6c10f..55bf19800d8 100755 --- a/Build/source/texk/xdvipdfmx/configure +++ b/Build/source/texk/xdvipdfmx/configure @@ -17449,6 +17449,10 @@ if test "x$with_system_freetype2" = xyes; then if test -n `$FT2_CONFIG --ftversion 2>/dev/null`; then FREETYPE2_INCLUDES=`$FT2_CONFIG --cflags` FREETYPE2_LIBS=`$FT2_CONFIG --libs` +elif test "x$need_freetype2:$with_freetype2_xpdf" = 'xyes:yes'; then + { { $as_echo "$as_me:$LINENO: error: did not find freetype-config required for system freetype2 library" >&5 +$as_echo "$as_me: error: did not find freetype-config required for system freetype2 library" >&2;} + { (exit 1); exit 1; }; } fi else FREETYPE2_INCLUDES=`echo 'BLD/libs/freetype2' | sed \ diff --git a/Build/source/utils/Makefile.am b/Build/source/utils/Makefile.am index e8f7f432755..7786c13bb99 100644 --- a/Build/source/utils/Makefile.am +++ b/Build/source/utils/Makefile.am @@ -10,9 +10,7 @@ ACLOCAL_AMFLAGS = -I ../m4 --force SUBDIRS = dummy . $(SUBUTILS) DIST_SUBDIRS = dummy $(DIST_SUBUTILS) -EXTRA_DIST = README.orig - -## just in case a subdirectory has added directories +# just in case a subdirectory has added directories dist-hook: rm -rf `find $(distdir) -name .svn` diff --git a/Build/source/utils/Makefile.in b/Build/source/utils/Makefile.in index 5bc495b8557..be6b8bc10e4 100644 --- a/Build/source/utils/Makefile.in +++ b/Build/source/utils/Makefile.in @@ -70,6 +70,7 @@ am__aclocal_m4_deps = $(top_srcdir)/../m4/kpse-common.m4 \ $(top_srcdir)/../utils/tpic2pdftex/ac/withenable.ac \ $(top_srcdir)/../utils/vlna/ac/withenable.ac \ $(top_srcdir)/../utils/xindy/ac/withenable.ac \ + $(top_srcdir)/../utils/xindy/ac/xindy.ac \ $(top_srcdir)/../texk/ac/withenable.ac \ $(top_srcdir)/../texk/web2c/ac/withenable.ac \ $(top_srcdir)/../texk/web2c/ac/web2c.ac \ @@ -237,7 +238,6 @@ top_srcdir = @top_srcdir@ ACLOCAL_AMFLAGS = -I ../m4 --force SUBDIRS = dummy . $(SUBUTILS) DIST_SUBDIRS = dummy $(DIST_SUBUTILS) -EXTRA_DIST = README.orig SUBUTILS_AUX = subutilsdir-configure subutilsdir-conf.args noinst_DATA = $(SUBUTILS_AUX) DISTCLEANFILES = $(noinst_DATA) @@ -665,6 +665,7 @@ uninstall-am: pdf-am ps ps-am tags tags-recursive uninstall uninstall-am +# just in case a subdirectory has added directories dist-hook: rm -rf `find $(distdir) -name .svn` diff --git a/Build/source/utils/README b/Build/source/utils/README index 3721ac0032e..c627d7accba 100644 --- a/Build/source/utils/README +++ b/Build/source/utils/README @@ -1,6 +1,81 @@ -dialog: 1.1-20080819 - ftp://invisible-island.net/dialog/dialog.tar.gz +$Id$ +Copyright 2005, 2006, 2007, 2008, 2009 TeX Users Group. +You may freely use, modify and/or distribute this file. -t1utils: - http://www.lcdf.org/type/t1utils-1.34.tar.gz +Extra utilities we (optionally) compile for TeX Live. +See comments in ../texk/README. +dialog 1.1-20080819 - ok 20mar09 + ftp://invisible-island.net/dialog/dialog.tar.gz + +gzip - (old, not built) only here so we have the sources for the Windows + binaries we distribute. + +lzma 4.32.6 - ok 15may08 + we do not compile/install in normal build, sources are here for installer; + see http://tug.org/texlive/build.html for info. + http://tukaani.org/lzma + +pdfopen 0.5 - ok 26nov06 + (really xpdfopen) + http://tex.aanhet.net/pdfopen + +ps2eps 1.64 - ok 19feb08 + http://www.ipv6.tm.uka.de/~bless/ps2eps + +psutils p17 - ok 25nov06 + (Fabrice made small modifications for Windows, it seems) + http://www.ctan.org/support/psutils/ + +t1utils 1.34 - checked 2mar08 + http://www.lcdf.org/type/ + +tpic2pdftex + http://www.ctan.org/graphics/tpic2pdftex + +vlna 1.2 - ok 26jun08 + ftp://math.feld.cvut.cz/pub/olsak/vlna + + +xindy 2.3 - ok 24mar08 + (with numerous adaptations for TL by Vladimir) + http://www.ctan.org/indexing/xindy/ + +After building clisp as described below, run the TL + Build --enable-xindy CLISP=$clisp_builddir/clisp +to include xindy in the build. It is disabled by default. + +Do NOT use nohup when building clisp; this may cause weird build +problems. Regular redirections of stdout/stderr seem ok. + +mkdir clisp; cd clisp +clisp_basedir=`pwd` +clisp_toolsdir=$clisp_basedir/clisp-tools +clisp_builddir=$clisp_basedir/clisp-build +mkdir $clisp_toolsdir + +cd $clisp_basedir +wget http://ftp.gnu.org/gnu/libsigsegv/libsigsegv-2.6.tar.gz +gzip -dc libsigsegv-2.6.tar.gz | tar xf - +cd libsigsegv-2.6 +./configure --prefix=$clisp_toolsdir && make && make check && make install + +cd $clisp_basedir +wget http://www.haible.de/bruno/gnu/ffcall-1.10.tar.gz +gzip -dc ffcall-1.10.tar.gz | tar xf - +cd ffcall-1.10 +./configure --prefix=$clisp_toolsdir && make && make check && make install + +# you may need this hack on 64-bit systems +# if clisp's configure will not find libsigsegv and/or libffcall: +ln -s lib $clisp_toolsdir/lib64 + +cd $clisp_basedir +wget http://ftp.gnu.org/gnu/clisp/release/2.46/clisp-2.46.tar.gz +gzip -dc clisp-2.46.tar.gz | tar xf - +cd clisp-2.46 +./configure --with-ffcall --with-libffcall-prefix=$clisp_toolsdir \ + --with-libsigsegv-prefix=$clisp_toolsdir --without-readline \ + $clisp_builddir \ +&& cd $clisp_builddir \ +&& make diff --git a/Build/source/utils/README.orig b/Build/source/utils/README.orig deleted file mode 100644 index 8e82eccff53..00000000000 --- a/Build/source/utils/README.orig +++ /dev/null @@ -1,83 +0,0 @@ -$Id$ -Copyright 2005, 2006, 2007, 2008, 2009 TeX Users Group. -You may freely use, modify and/or distribute this file. - -Extra utilities we (optionally) compile for TeX Live. -See comments in ../texk/README. - -dialog - seems to be a v1.0 in debian, asked te 5jun05; he said keep as-is - or else go through testing. - http://hightek.org/dialog/ - http://packages.debian.org/cgi-bin/search_packages.pl?searchon=names&version=all&exact=1&keywords=dialog - -gzip - (old, not built) only here so we have the sources for the Windows - binaries we distribute. - -lzma 4.32.6 - ok 15may08 - we do not compile/install in normal build, sources are here for installer; - see http://tug.org/texlive/build.html for info. - http://tukaani.org/lzma - -pdfopen 0.5 - ok 26nov06 - (really xpdfopen) - http://tex.aanhet.net/pdfopen - -ps2eps 1.64 - ok 19feb08 - http://www.ipv6.tm.uka.de/~bless/ps2eps - -psutils p17 - ok 25nov06 - (Fabrice made small modifications for Windows, it seems) - http://www.ctan.org/support/psutils/ - -t1utils 1.34 - checked 2mar08 - http://www.lcdf.org/type/ - -tpic2pdftex - http://www.ctan.org/graphics/tpic2pdftex - -vlna 1.2 - ok 26jun08 - ftp://math.feld.cvut.cz/pub/olsak/vlna - - -xindy 2.3 - ok 24mar08 - (with numerous adaptations for TL by Vladimir) - http://www.ctan.org/indexing/xindy/ - -After building clisp as described below, run the TL - Build --with-xindy --with-clisp=$clisp_builddir/clisp -to include xindy in the build. It is disabled by default. - -Do NOT use nohup when building clisp; this may cause weird build -problems. Regular redirections of stdout/stderr seem ok. - -mkdir clisp; cd clisp -clisp_basedir=`pwd` -clisp_toolsdir=$clisp_basedir/clisp-tools -clisp_builddir=$clisp_basedir/clisp-build -mkdir $clisp_toolsdir - -cd $clisp_basedir -wget http://ftp.gnu.org/gnu/libsigsegv/libsigsegv-2.6.tar.gz -gzip -dc libsigsegv-2.6.tar.gz | tar xf - -cd libsigsegv-2.6 -./configure --prefix=$clisp_toolsdir && make && make check && make install - -cd $clisp_basedir -wget http://www.haible.de/bruno/gnu/ffcall-1.10.tar.gz -gzip -dc ffcall-1.10.tar.gz | tar xf - -cd ffcall-1.10 -./configure --prefix=$clisp_toolsdir && make && make check && make install - -# you may need this hack on 64-bit systems -# if clisp's configure will not find libsigsegv and/or libffcall: -ln -s lib $clisp_toolsdir/lib64 - -cd $clisp_basedir -wget http://ftp.gnu.org/gnu/clisp/release/2.46/clisp-2.46.tar.gz -gzip -dc clisp-2.46.tar.gz | tar xf - -cd clisp-2.46 -./configure --with-ffcall --with-libffcall-prefix=$clisp_toolsdir \ - --with-libsigsegv-prefix=$clisp_toolsdir --without-readline \ - $clisp_builddir \ -&& cd $clisp_builddir \ -&& make diff --git a/Build/source/utils/configure b/Build/source/utils/configure index 648590966e9..6721948e0d8 100755 --- a/Build/source/utils/configure +++ b/Build/source/utils/configure @@ -693,6 +693,9 @@ enable_t1utils enable_tpic2pdftex enable_vlna enable_xindy +enable_xindy_make_rules +enable_xindy_docs +with_xindy_recode enable_web2c with_editor enable_auto_core @@ -1453,6 +1456,9 @@ Optional Features: --disable-tpic2pdftex do not build the tpic2pdftex package --disable-vlna do not build the vlna package --enable-xindy build the xindy package + --enable-xindy-make-rules build and install make-rules package (default is + YES) + --enable-xindy-docs build and install documentation (default is YES) --disable-web2c do not build the web2c (TeX & Co.) package --enable-auto-core cause TeX&MF to dump core, given a certain filename @@ -1537,6 +1543,8 @@ Optional Features: Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) + --with-xindy-recode For `xindy': use `recode' instead of `iconv' + (default is NO) --with-editor=CMD invoke CMD from the `e' option [vi +%d %s] --without-mf-x-toolkit do not use X toolkit for METAFONT --with-gs=/PATH/TO/gs Hard-wire the location of GhostScript @@ -2331,6 +2339,22 @@ $as_echo "$as_me: Assuming \`--enable-xindy=$enable_xindy'" >&6;} ac_configure_args="$ac_configure_args '--enable-xindy=$enable_xindy'";; esac +## utils/xindy/ac/xindy.ac: configure.ac fragment for the TeX Live subdirectory utils/xindy/ +## configure options for xindy +# Check whether --enable-xindy-make-rules was given. +if test "${enable_xindy_make_rules+set}" = set; then + enableval=$enable_xindy_make_rules; +fi +# Check whether --enable-xindy-docs was given. +if test "${enable_xindy_docs+set}" = set; then + enableval=$enable_xindy_docs; +fi + +# Check whether --with-xindy-recode was given. +if test "${with_xindy_recode+set}" = set; then + withval=$with_xindy_recode; +fi + ## texk/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/ diff --git a/Build/source/utils/dialog/Makefile.am b/Build/source/utils/dialog/Makefile.am index c1d01e5c3ab..efad97e26bf 100644 --- a/Build/source/utils/dialog/Makefile.am +++ b/Build/source/utils/dialog/Makefile.am @@ -24,7 +24,7 @@ program_transform_name = 's,^,tc,' ## Thus nodist_* for all files in $(DIALOG_TREE). EXTRA_DIST = $(DIALOG_TREE) -## in case of an SVN repository +# in case of an SVN repository dist-hook: rm -rf `find $(distdir)/$(DIALOG_TREE) -name .svn` diff --git a/Build/source/utils/dialog/Makefile.in b/Build/source/utils/dialog/Makefile.in index 357d9f2cc85..2e2e9cfdbcb 100644 --- a/Build/source/utils/dialog/Makefile.in +++ b/Build/source/utils/dialog/Makefile.in @@ -522,6 +522,7 @@ uninstall-man: uninstall-man1 uninstall-man1 +# in case of an SVN repository dist-hook: rm -rf `find $(distdir)/$(DIALOG_TREE) -name .svn` diff --git a/Build/source/utils/xindy/ChangeLog.TL b/Build/source/utils/xindy/ChangeLog.TL index 84c3a2a4645..fce65209742 100644 --- a/Build/source/utils/xindy/ChangeLog.TL +++ b/Build/source/utils/xindy/ChangeLog.TL @@ -1,3 +1,17 @@ ChangeLog.TL: Changes for xindy (teTeX / TeX Live) ====================================================== +2009-05-08 Peter Breitenlohner + + Adapt to TL2009 build system. + * configure.ac, Makefile.am: Adapt. + * ac/xindy.ac (new): Configure options also shown at top-level. + * m4/tl_msg_error.m4 (new): Define TL_MSG_ERROR such that + 'configure --disable-build' succeeds without clisp. + + Allow parallel builds: + * binaries/Makefile.am: Add '.NOTPARALLEL:'. + * rte/Makefile.am: Serialize rule that creates two targets. + + * configure.ac: Remove '--with-clisp=...', use 'CLISP=...'. + diff --git a/Build/source/utils/xindy/Makefile.am b/Build/source/utils/xindy/Makefile.am index 5a91a2fc154..2246b8590fb 100644 --- a/Build/source/utils/xindy/Makefile.am +++ b/Build/source/utils/xindy/Makefile.am @@ -24,7 +24,7 @@ ## Global options -ACLOCAL_AMFLAGS = -I m4 -I ../../m4 +ACLOCAL_AMFLAGS = -I m4 # do we build make-rules? if BUILDRULES diff --git a/Build/source/utils/xindy/Makefile.in b/Build/source/utils/xindy/Makefile.in index 533640e5b6b..911cfd4299d 100644 --- a/Build/source/utils/xindy/Makefile.in +++ b/Build/source/utils/xindy/Makefile.in @@ -35,14 +35,21 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ subdir = . -DIST_COMMON = $(am__configure_deps) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in $(top_srcdir)/configure AUTHORS COPYING \ - INSTALL NEWS config.guess config.sub depcomp install-sh \ - missing ylwrap +DIST_COMMON = $(am__configure_deps) \ + $(srcdir)/../../build-aux/config.guess \ + $(srcdir)/../../build-aux/config.sub \ + $(srcdir)/../../build-aux/install-sh \ + $(srcdir)/../../build-aux/missing $(srcdir)/Makefile.am \ + $(srcdir)/Makefile.in $(top_srcdir)/configure \ + ../../build-aux/config.guess ../../build-aux/config.sub \ + ../../build-aux/depcomp ../../build-aux/install-sh \ + ../../build-aux/ltmain.sh ../../build-aux/missing \ + ../../build-aux/texinfo.tex ../../build-aux/ylwrap AUTHORS \ + COPYING INSTALL NEWS ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-common.m4 \ - $(top_srcdir)/m4/ac_prog_latex.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4/ac_prog_latex.m4 \ $(top_srcdir)/m4/ac_prog_pdflatex.m4 \ + $(top_srcdir)/m4/tl_msg_error.m4 $(top_srcdir)/ac/xindy.ac \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) @@ -81,7 +88,7 @@ am__remove_distdir = \ { test ! -d $(distdir) \ || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \ && rm -fr $(distdir); }; } -DIST_ARCHIVES = $(distdir).tar.gz +DIST_ARCHIVES = $(distdir).tar.gz $(distdir).tar.bz2 GZIP_ENV = --best distuninstallcheck_listfiles = find . -type f -print distcleancheck_listfiles = find . -type f -print @@ -188,7 +195,7 @@ target_alias = @target_alias@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -ACLOCAL_AMFLAGS = -I m4 -I ../../m4 +ACLOCAL_AMFLAGS = -I m4 # do we build make-rules? @BUILDRULES_TRUE@MAKE_RULES = make-rules @@ -437,7 +444,6 @@ distdir: $(DISTFILES) dist-gzip: distdir tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz $(am__remove_distdir) - dist-bzip2: distdir tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 $(am__remove_distdir) @@ -461,6 +467,7 @@ dist-zip: distdir dist dist-all: distdir tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz + tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 $(am__remove_distdir) # This target untars the dist file and tries a VPATH configuration. Then diff --git a/Build/source/utils/xindy/ac/withenable.ac b/Build/source/utils/xindy/ac/withenable.ac index f4ef5be3b05..80ba2394ff0 100644 --- a/Build/source/utils/xindy/ac/withenable.ac +++ b/Build/source/utils/xindy/ac/withenable.ac @@ -5,3 +5,4 @@ dnl You may freely use, modify and/or distribute this file. dnl ## configure options and TL libraries required for xindy KPSE_ENABLE_PROG([xindy], , [disable]) +m4_include(kpse_TL[utils/xindy/ac/xindy.ac]) diff --git a/Build/source/utils/xindy/ac/xindy.ac b/Build/source/utils/xindy/ac/xindy.ac new file mode 100644 index 00000000000..137572739a4 --- /dev/null +++ b/Build/source/utils/xindy/ac/xindy.ac @@ -0,0 +1,18 @@ +## utils/xindy/ac/xindy.ac: configure.ac fragment for the TeX Live subdirectory utils/xindy/ +dnl +dnl Copyright (C) 2009 Peter Breitenlohner +dnl You may freely use, modify and/or distribute this file. +dnl +## configure options for xindy +m4_define_default([kpse_indent_26], [26])[]dnl +AC_ARG_ENABLE([xindy-make-rules], + AS_HELP_STRING([--enable-xindy-make-rules], + [build and install make-rules package (default is YES)], + kpse_indent_26))[]dnl +AC_ARG_ENABLE([xindy-docs], + AS_HELP_STRING([--enable-xindy-docs], + [build and install documentation (default is YES)], + kpse_indent_26))[]dnl +AC_ARG_WITH([xindy-recode], + AS_HELP_STRING([--with-xindy-recode], + [For `xindy': use `recode' instead of `iconv' (default is NO)]))[]dnl diff --git a/Build/source/utils/xindy/aclocal.m4 b/Build/source/utils/xindy/aclocal.m4 index 9c6815399c6..77fa274f068 100644 --- a/Build/source/utils/xindy/aclocal.m4 +++ b/Build/source/utils/xindy/aclocal.m4 @@ -925,6 +925,6 @@ AC_SUBST([am__tar]) AC_SUBST([am__untar]) ]) # _AM_PROG_TAR -m4_include([../../m4/kpse-common.m4]) m4_include([m4/ac_prog_latex.m4]) m4_include([m4/ac_prog_pdflatex.m4]) +m4_include([m4/tl_msg_error.m4]) diff --git a/Build/source/utils/xindy/binaries/Makefile.am b/Build/source/utils/xindy/binaries/Makefile.am index 8c6f7a21071..72bafc6d6c1 100644 --- a/Build/source/utils/xindy/binaries/Makefile.am +++ b/Build/source/utils/xindy/binaries/Makefile.am @@ -59,3 +59,6 @@ kernel_SCRIPTS = $(XINDY_RUN) EXTRA_SCRIPTS = xindy.run xindy-lisp.exe CLEANFILES = $(FAS) $(FASLIBS) defaults.xdy base.mem xindy.mem $(XINDY_RUN) + +# Serialize +.NOTPARALLEL: diff --git a/Build/source/utils/xindy/binaries/Makefile.in b/Build/source/utils/xindy/binaries/Makefile.in index 72c312125c2..10d778bd866 100644 --- a/Build/source/utils/xindy/binaries/Makefile.in +++ b/Build/source/utils/xindy/binaries/Makefile.in @@ -36,9 +36,9 @@ host_triplet = @host@ subdir = binaries DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-common.m4 \ - $(top_srcdir)/m4/ac_prog_latex.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4/ac_prog_latex.m4 \ $(top_srcdir)/m4/ac_prog_pdflatex.m4 \ + $(top_srcdir)/m4/tl_msg_error.m4 $(top_srcdir)/ac/xindy.ac \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) @@ -394,6 +394,9 @@ defaults.xdy: %.fas: $(SRCDIR)/%.lsp $(RUN_XINDY) -c $< -o $@ + +# Serialize +.NOTPARALLEL: # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff --git a/Build/source/utils/xindy/config.guess b/Build/source/utils/xindy/config.guess deleted file mode 100755 index da833146088..00000000000 --- a/Build/source/utils/xindy/config.guess +++ /dev/null @@ -1,1561 +0,0 @@ -#! /bin/sh -# Attempt to guess a canonical system name. -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 -# Free Software Foundation, Inc. - -timestamp='2009-04-27' - -# This file is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, 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 -# General Public License for more details. -# -# You should have received a copy of the GNU 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. -# -# As a special exception to the GNU General Public License, if you -# distribute this file as part of a program that contains a -# configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. - - -# Originally written by Per Bothner . -# Please send patches to . Submit a context -# diff and a properly formatted ChangeLog entry. -# -# This script attempts to guess a canonical system name similar to -# config.sub. If it succeeds, it prints the system name on stdout, and -# exits with 0. Otherwise, it exits with 1. -# -# The plan is that this can be called by configure scripts if you -# don't specify an explicit build system type. - -me=`echo "$0" | sed -e 's,.*/,,'` - -usage="\ -Usage: $0 [OPTION] - -Output the configuration name of the system \`$me' is run on. - -Operation modes: - -h, --help print this help, then exit - -t, --time-stamp print date of last modification, then exit - -v, --version print version number, then exit - -Report bugs and patches to ." - -version="\ -GNU config.guess ($timestamp) - -Originally written by Per Bothner. -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, -2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. - -This is free software; see the source for copying conditions. There is NO -warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." - -help=" -Try \`$me --help' for more information." - -# Parse command line -while test $# -gt 0 ; do - case $1 in - --time-stamp | --time* | -t ) - echo "$timestamp" ; exit ;; - --version | -v ) - echo "$version" ; exit ;; - --help | --h* | -h ) - echo "$usage"; exit ;; - -- ) # Stop option processing - shift; break ;; - - ) # Use stdin as input. - break ;; - -* ) - echo "$me: invalid option $1$help" >&2 - exit 1 ;; - * ) - break ;; - esac -done - -if test $# != 0; then - echo "$me: too many arguments$help" >&2 - exit 1 -fi - -trap 'exit 1' 1 2 15 - -# CC_FOR_BUILD -- compiler used by this script. Note that the use of a -# compiler to aid in system detection is discouraged as it requires -# temporary files to be created and, as you can see below, it is a -# headache to deal with in a portable fashion. - -# Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still -# use `HOST_CC' if defined, but it is deprecated. - -# Portable tmp directory creation inspired by the Autoconf team. - -set_cc_for_build=' -trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ; -trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ; -: ${TMPDIR=/tmp} ; - { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || - { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } || - { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } || - { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ; -dummy=$tmp/dummy ; -tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ; -case $CC_FOR_BUILD,$HOST_CC,$CC in - ,,) echo "int x;" > $dummy.c ; - for c in cc gcc c89 c99 ; do - if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then - CC_FOR_BUILD="$c"; break ; - fi ; - done ; - if test x"$CC_FOR_BUILD" = x ; then - CC_FOR_BUILD=no_compiler_found ; - fi - ;; - ,,*) CC_FOR_BUILD=$CC ;; - ,*,*) CC_FOR_BUILD=$HOST_CC ;; -esac ; set_cc_for_build= ;' - -# This is needed to find uname on a Pyramid OSx when run in the BSD universe. -# (ghazi@noc.rutgers.edu 1994-08-24) -if (test -f /.attbin/uname) >/dev/null 2>&1 ; then - PATH=$PATH:/.attbin ; export PATH -fi - -UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown -UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown -UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown -UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown - -# Note: order is significant - the case branches are not exclusive. - -case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in - *:NetBSD:*:*) - # NetBSD (nbsd) targets should (where applicable) match one or - # more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*, - # *-*-netbsdecoff* and *-*-netbsd*. For targets that recently - # switched to ELF, *-*-netbsd* would select the old - # object file format. This provides both forward - # compatibility and a consistent mechanism for selecting the - # object file format. - # - # Note: NetBSD doesn't particularly care about the vendor - # portion of the name. We always set it to "unknown". - sysctl="sysctl -n hw.machine_arch" - UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \ - /usr/sbin/$sysctl 2>/dev/null || echo unknown)` - case "${UNAME_MACHINE_ARCH}" in - armeb) machine=armeb-unknown ;; - arm*) machine=arm-unknown ;; - sh3el) machine=shl-unknown ;; - sh3eb) machine=sh-unknown ;; - sh5el) machine=sh5le-unknown ;; - *) machine=${UNAME_MACHINE_ARCH}-unknown ;; - esac - # The Operating System including object format, if it has switched - # to ELF recently, or will in the future. - case "${UNAME_MACHINE_ARCH}" in - arm*|i386|m68k|ns32k|sh3*|sparc|vax) - eval $set_cc_for_build - if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \ - | grep __ELF__ >/dev/null - then - # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout). - # Return netbsd for either. FIX? - os=netbsd - else - os=netbsdelf - fi - ;; - *) - os=netbsd - ;; - esac - # The OS release - # Debian GNU/NetBSD machines have a different userland, and - # thus, need a distinct triplet. However, they do not need - # kernel version information, so it can be replaced with a - # suitable tag, in the style of linux-gnu. - case "${UNAME_VERSION}" in - Debian*) - release='-gnu' - ;; - *) - release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'` - ;; - esac - # Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM: - # contains redundant information, the shorter form: - # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. - echo "${machine}-${os}${release}" - exit ;; - *:OpenBSD:*:*) - UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'` - echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE} - exit ;; - *:ekkoBSD:*:*) - echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE} - exit ;; - *:SolidBSD:*:*) - echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE} - exit ;; - macppc:MirBSD:*:*) - echo powerpc-unknown-mirbsd${UNAME_RELEASE} - exit ;; - *:MirBSD:*:*) - echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE} - exit ;; - alpha:OSF1:*:*) - case $UNAME_RELEASE in - *4.0) - UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` - ;; - *5.*) - UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` - ;; - esac - # According to Compaq, /usr/sbin/psrinfo has been available on - # OSF/1 and Tru64 systems produced since 1995. I hope that - # covers most systems running today. This code pipes the CPU - # types through head -n 1, so we only detect the type of CPU 0. - ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^ The alpha \(.*\) processor.*$/\1/p' | head -n 1` - case "$ALPHA_CPU_TYPE" in - "EV4 (21064)") - UNAME_MACHINE="alpha" ;; - "EV4.5 (21064)") - UNAME_MACHINE="alpha" ;; - "LCA4 (21066/21068)") - UNAME_MACHINE="alpha" ;; - "EV5 (21164)") - UNAME_MACHINE="alphaev5" ;; - "EV5.6 (21164A)") - UNAME_MACHINE="alphaev56" ;; - "EV5.6 (21164PC)") - UNAME_MACHINE="alphapca56" ;; - "EV5.7 (21164PC)") - UNAME_MACHINE="alphapca57" ;; - "EV6 (21264)") - UNAME_MACHINE="alphaev6" ;; - "EV6.7 (21264A)") - UNAME_MACHINE="alphaev67" ;; - "EV6.8CB (21264C)") - UNAME_MACHINE="alphaev68" ;; - "EV6.8AL (21264B)") - UNAME_MACHINE="alphaev68" ;; - "EV6.8CX (21264D)") - UNAME_MACHINE="alphaev68" ;; - "EV6.9A (21264/EV69A)") - UNAME_MACHINE="alphaev69" ;; - "EV7 (21364)") - UNAME_MACHINE="alphaev7" ;; - "EV7.9 (21364A)") - UNAME_MACHINE="alphaev79" ;; - esac - # A Pn.n version is a patched version. - # A Vn.n version is a released version. - # A Tn.n version is a released field test version. - # A Xn.n version is an unreleased experimental baselevel. - # 1.2 uses "1.2" for uname -r. - echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` - exit ;; - Alpha\ *:Windows_NT*:*) - # How do we know it's Interix rather than the generic POSIX subsystem? - # Should we change UNAME_MACHINE based on the output of uname instead - # of the specific Alpha model? - echo alpha-pc-interix - exit ;; - 21064:Windows_NT:50:3) - echo alpha-dec-winnt3.5 - exit ;; - Amiga*:UNIX_System_V:4.0:*) - echo m68k-unknown-sysv4 - exit ;; - *:[Aa]miga[Oo][Ss]:*:*) - echo ${UNAME_MACHINE}-unknown-amigaos - exit ;; - *:[Mm]orph[Oo][Ss]:*:*) - echo ${UNAME_MACHINE}-unknown-morphos - exit ;; - *:OS/390:*:*) - echo i370-ibm-openedition - exit ;; - *:z/VM:*:*) - echo s390-ibm-zvmoe - exit ;; - *:OS400:*:*) - echo powerpc-ibm-os400 - exit ;; - arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) - echo arm-acorn-riscix${UNAME_RELEASE} - exit ;; - arm:riscos:*:*|arm:RISCOS:*:*) - echo arm-unknown-riscos - exit ;; - SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*) - echo hppa1.1-hitachi-hiuxmpp - exit ;; - Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*) - # akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE. - if test "`(/bin/universe) 2>/dev/null`" = att ; then - echo pyramid-pyramid-sysv3 - else - echo pyramid-pyramid-bsd - fi - exit ;; - NILE*:*:*:dcosx) - echo pyramid-pyramid-svr4 - exit ;; - DRS?6000:unix:4.0:6*) - echo sparc-icl-nx6 - exit ;; - DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*) - case `/usr/bin/uname -p` in - sparc) echo sparc-icl-nx7; exit ;; - esac ;; - s390x:SunOS:*:*) - echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit ;; - sun4H:SunOS:5.*:*) - echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit ;; - sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) - echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit ;; - i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*) - eval $set_cc_for_build - SUN_ARCH="i386" - # If there is a compiler, see if it is configured for 64-bit objects. - # Note that the Sun cc does not turn __LP64__ into 1 like gcc does. - # This test works for both compilers. - if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then - if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \ - (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ - grep IS_64BIT_ARCH >/dev/null - then - SUN_ARCH="x86_64" - fi - fi - echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit ;; - sun4*:SunOS:6*:*) - # According to config.sub, this is the proper way to canonicalize - # SunOS6. Hard to guess exactly what SunOS6 will be like, but - # it's likely to be more like Solaris than SunOS4. - echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit ;; - sun4*:SunOS:*:*) - case "`/usr/bin/arch -k`" in - Series*|S4*) - UNAME_RELEASE=`uname -v` - ;; - esac - # Japanese Language versions have a version number like `4.1.3-JL'. - echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'` - exit ;; - sun3*:SunOS:*:*) - echo m68k-sun-sunos${UNAME_RELEASE} - exit ;; - sun*:*:4.2BSD:*) - UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null` - test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3 - case "`/bin/arch`" in - sun3) - echo m68k-sun-sunos${UNAME_RELEASE} - ;; - sun4) - echo sparc-sun-sunos${UNAME_RELEASE} - ;; - esac - exit ;; - aushp:SunOS:*:*) - echo sparc-auspex-sunos${UNAME_RELEASE} - exit ;; - # The situation for MiNT is a little confusing. The machine name - # can be virtually everything (everything which is not - # "atarist" or "atariste" at least should have a processor - # > m68000). The system name ranges from "MiNT" over "FreeMiNT" - # to the lowercase version "mint" (or "freemint"). Finally - # the system name "TOS" denotes a system which is actually not - # MiNT. But MiNT is downward compatible to TOS, so this should - # be no problem. - atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*) - echo m68k-atari-mint${UNAME_RELEASE} - exit ;; - atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*) - echo m68k-atari-mint${UNAME_RELEASE} - exit ;; - *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*) - echo m68k-atari-mint${UNAME_RELEASE} - exit ;; - milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*) - echo m68k-milan-mint${UNAME_RELEASE} - exit ;; - hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*) - echo m68k-hades-mint${UNAME_RELEASE} - exit ;; - *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) - echo m68k-unknown-mint${UNAME_RELEASE} - exit ;; - m68k:machten:*:*) - echo m68k-apple-machten${UNAME_RELEASE} - exit ;; - powerpc:machten:*:*) - echo powerpc-apple-machten${UNAME_RELEASE} - exit ;; - RISC*:Mach:*:*) - echo mips-dec-mach_bsd4.3 - exit ;; - RISC*:ULTRIX:*:*) - echo mips-dec-ultrix${UNAME_RELEASE} - exit ;; - VAX*:ULTRIX*:*:*) - echo vax-dec-ultrix${UNAME_RELEASE} - exit ;; - 2020:CLIX:*:* | 2430:CLIX:*:*) - echo clipper-intergraph-clix${UNAME_RELEASE} - exit ;; - mips:*:*:UMIPS | mips:*:*:RISCos) - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c -#ifdef __cplusplus -#include /* for printf() prototype */ - int main (int argc, char *argv[]) { -#else - int main (argc, argv) int argc; char *argv[]; { -#endif - #if defined (host_mips) && defined (MIPSEB) - #if defined (SYSTYPE_SYSV) - printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0); - #endif - #if defined (SYSTYPE_SVR4) - printf ("mips-mips-riscos%ssvr4\n", argv[1]); exit (0); - #endif - #if defined (SYSTYPE_BSD43) || defined(SYSTYPE_BSD) - printf ("mips-mips-riscos%sbsd\n", argv[1]); exit (0); - #endif - #endif - exit (-1); - } -EOF - $CC_FOR_BUILD -o $dummy $dummy.c && - dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` && - SYSTEM_NAME=`$dummy $dummyarg` && - { echo "$SYSTEM_NAME"; exit; } - echo mips-mips-riscos${UNAME_RELEASE} - exit ;; - Motorola:PowerMAX_OS:*:*) - echo powerpc-motorola-powermax - exit ;; - Motorola:*:4.3:PL8-*) - echo powerpc-harris-powermax - exit ;; - Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*) - echo powerpc-harris-powermax - exit ;; - Night_Hawk:Power_UNIX:*:*) - echo powerpc-harris-powerunix - exit ;; - m88k:CX/UX:7*:*) - echo m88k-harris-cxux7 - exit ;; - m88k:*:4*:R4*) - echo m88k-motorola-sysv4 - exit ;; - m88k:*:3*:R3*) - echo m88k-motorola-sysv3 - exit ;; - AViiON:dgux:*:*) - # DG/UX returns AViiON for all architectures - UNAME_PROCESSOR=`/usr/bin/uname -p` - if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ] - then - if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \ - [ ${TARGET_BINARY_INTERFACE}x = x ] - then - echo m88k-dg-dgux${UNAME_RELEASE} - else - echo m88k-dg-dguxbcs${UNAME_RELEASE} - fi - else - echo i586-dg-dgux${UNAME_RELEASE} - fi - exit ;; - M88*:DolphinOS:*:*) # DolphinOS (SVR3) - echo m88k-dolphin-sysv3 - exit ;; - M88*:*:R3*:*) - # Delta 88k system running SVR3 - echo m88k-motorola-sysv3 - exit ;; - XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3) - echo m88k-tektronix-sysv3 - exit ;; - Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD) - echo m68k-tektronix-bsd - exit ;; - *:IRIX*:*:*) - echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'` - exit ;; - ????????:AIX?:[12].1:2) # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX. - echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id - exit ;; # Note that: echo "'`uname -s`'" gives 'AIX ' - i*86:AIX:*:*) - echo i386-ibm-aix - exit ;; - ia64:AIX:*:*) - if [ -x /usr/bin/oslevel ] ; then - IBM_REV=`/usr/bin/oslevel` - else - IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} - fi - echo ${UNAME_MACHINE}-ibm-aix${IBM_REV} - exit ;; - *:AIX:2:3) - if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c - #include - - main() - { - if (!__power_pc()) - exit(1); - puts("powerpc-ibm-aix3.2.5"); - exit(0); - } -EOF - if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` - then - echo "$SYSTEM_NAME" - else - echo rs6000-ibm-aix3.2.5 - fi - elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then - echo rs6000-ibm-aix3.2.4 - else - echo rs6000-ibm-aix3.2 - fi - exit ;; - *:AIX:*:[456]) - IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` - if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then - IBM_ARCH=rs6000 - else - IBM_ARCH=powerpc - fi - if [ -x /usr/bin/oslevel ] ; then - IBM_REV=`/usr/bin/oslevel` - else - IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} - fi - echo ${IBM_ARCH}-ibm-aix${IBM_REV} - exit ;; - *:AIX:*:*) - echo rs6000-ibm-aix - exit ;; - ibmrt:4.4BSD:*|romp-ibm:BSD:*) - echo romp-ibm-bsd4.4 - exit ;; - ibmrt:*BSD:*|romp-ibm:BSD:*) # covers RT/PC BSD and - echo romp-ibm-bsd${UNAME_RELEASE} # 4.3 with uname added to - exit ;; # report: romp-ibm BSD 4.3 - *:BOSX:*:*) - echo rs6000-bull-bosx - exit ;; - DPX/2?00:B.O.S.:*:*) - echo m68k-bull-sysv3 - exit ;; - 9000/[34]??:4.3bsd:1.*:*) - echo m68k-hp-bsd - exit ;; - hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*) - echo m68k-hp-bsd4.4 - exit ;; - 9000/[34678]??:HP-UX:*:*) - HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` - case "${UNAME_MACHINE}" in - 9000/31? ) HP_ARCH=m68000 ;; - 9000/[34]?? ) HP_ARCH=m68k ;; - 9000/[678][0-9][0-9]) - if [ -x /usr/bin/getconf ]; then - sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` - sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` - case "${sc_cpu_version}" in - 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 - 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 - 532) # CPU_PA_RISC2_0 - case "${sc_kernel_bits}" in - 32) HP_ARCH="hppa2.0n" ;; - 64) HP_ARCH="hppa2.0w" ;; - '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20 - esac ;; - esac - fi - if [ "${HP_ARCH}" = "" ]; then - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c - - #define _HPUX_SOURCE - #include - #include - - int main () - { - #if defined(_SC_KERNEL_BITS) - long bits = sysconf(_SC_KERNEL_BITS); - #endif - long cpu = sysconf (_SC_CPU_VERSION); - - switch (cpu) - { - case CPU_PA_RISC1_0: puts ("hppa1.0"); break; - case CPU_PA_RISC1_1: puts ("hppa1.1"); break; - case CPU_PA_RISC2_0: - #if defined(_SC_KERNEL_BITS) - switch (bits) - { - case 64: puts ("hppa2.0w"); break; - case 32: puts ("hppa2.0n"); break; - default: puts ("hppa2.0"); break; - } break; - #else /* !defined(_SC_KERNEL_BITS) */ - puts ("hppa2.0"); break; - #endif - default: puts ("hppa1.0"); break; - } - exit (0); - } -EOF - (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy` - test -z "$HP_ARCH" && HP_ARCH=hppa - fi ;; - esac - if [ ${HP_ARCH} = "hppa2.0w" ] - then - eval $set_cc_for_build - - # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating - # 32-bit code. hppa64-hp-hpux* has the same kernel and a compiler - # generating 64-bit code. GNU and HP use different nomenclature: - # - # $ CC_FOR_BUILD=cc ./config.guess - # => hppa2.0w-hp-hpux11.23 - # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess - # => hppa64-hp-hpux11.23 - - if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | - grep __LP64__ >/dev/null - then - HP_ARCH="hppa2.0w" - else - HP_ARCH="hppa64" - fi - fi - echo ${HP_ARCH}-hp-hpux${HPUX_REV} - exit ;; - ia64:HP-UX:*:*) - HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` - echo ia64-hp-hpux${HPUX_REV} - exit ;; - 3050*:HI-UX:*:*) - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c - #include - int - main () - { - long cpu = sysconf (_SC_CPU_VERSION); - /* The order matters, because CPU_IS_HP_MC68K erroneously returns - true for CPU_PA_RISC1_0. CPU_IS_PA_RISC returns correct - results, however. */ - if (CPU_IS_PA_RISC (cpu)) - { - switch (cpu) - { - case CPU_PA_RISC1_0: puts ("hppa1.0-hitachi-hiuxwe2"); break; - case CPU_PA_RISC1_1: puts ("hppa1.1-hitachi-hiuxwe2"); break; - case CPU_PA_RISC2_0: puts ("hppa2.0-hitachi-hiuxwe2"); break; - default: puts ("hppa-hitachi-hiuxwe2"); break; - } - } - else if (CPU_IS_HP_MC68K (cpu)) - puts ("m68k-hitachi-hiuxwe2"); - else puts ("unknown-hitachi-hiuxwe2"); - exit (0); - } -EOF - $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` && - { echo "$SYSTEM_NAME"; exit; } - echo unknown-hitachi-hiuxwe2 - exit ;; - 9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* ) - echo hppa1.1-hp-bsd - exit ;; - 9000/8??:4.3bsd:*:*) - echo hppa1.0-hp-bsd - exit ;; - *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*) - echo hppa1.0-hp-mpeix - exit ;; - hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* ) - echo hppa1.1-hp-osf - exit ;; - hp8??:OSF1:*:*) - echo hppa1.0-hp-osf - exit ;; - i*86:OSF1:*:*) - if [ -x /usr/sbin/sysversion ] ; then - echo ${UNAME_MACHINE}-unknown-osf1mk - else - echo ${UNAME_MACHINE}-unknown-osf1 - fi - exit ;; - parisc*:Lites*:*:*) - echo hppa1.1-hp-lites - exit ;; - C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*) - echo c1-convex-bsd - exit ;; - C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*) - if getsysinfo -f scalar_acc - then echo c32-convex-bsd - else echo c2-convex-bsd - fi - exit ;; - C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*) - echo c34-convex-bsd - exit ;; - C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*) - echo c38-convex-bsd - exit ;; - C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*) - echo c4-convex-bsd - exit ;; - CRAY*Y-MP:*:*:*) - echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit ;; - CRAY*[A-Z]90:*:*:*) - echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \ - | sed -e 's/CRAY.*\([A-Z]90\)/\1/' \ - -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \ - -e 's/\.[^.]*$/.X/' - exit ;; - CRAY*TS:*:*:*) - echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit ;; - CRAY*T3E:*:*:*) - echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit ;; - CRAY*SV1:*:*:*) - echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit ;; - *:UNICOS/mp:*:*) - echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit ;; - F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) - FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` - FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` - FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` - echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" - exit ;; - 5000:UNIX_System_V:4.*:*) - FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` - FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` - echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" - exit ;; - i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) - echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} - exit ;; - sparc*:BSD/OS:*:*) - echo sparc-unknown-bsdi${UNAME_RELEASE} - exit ;; - *:BSD/OS:*:*) - echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} - exit ;; - *:FreeBSD:*:*) - case ${UNAME_MACHINE} in - pc98) - echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; - amd64) - echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; - *) - echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; - esac - exit ;; - i*:CYGWIN*:*) - echo ${UNAME_MACHINE}-pc-cygwin - exit ;; - *:MINGW*:*) - echo ${UNAME_MACHINE}-pc-mingw32 - exit ;; - i*:windows32*:*) - # uname -m includes "-pc" on this system. - echo ${UNAME_MACHINE}-mingw32 - exit ;; - i*:PW*:*) - echo ${UNAME_MACHINE}-pc-pw32 - exit ;; - *:Interix*:[3456]*) - case ${UNAME_MACHINE} in - x86) - echo i586-pc-interix${UNAME_RELEASE} - exit ;; - EM64T | authenticamd | genuineintel) - echo x86_64-unknown-interix${UNAME_RELEASE} - exit ;; - IA64) - echo ia64-unknown-interix${UNAME_RELEASE} - exit ;; - esac ;; - [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) - echo i${UNAME_MACHINE}-pc-mks - exit ;; - i*:Windows_NT*:* | Pentium*:Windows_NT*:*) - # How do we know it's Interix rather than the generic POSIX subsystem? - # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we - # UNAME_MACHINE based on the output of uname instead of i386? - echo i586-pc-interix - exit ;; - i*:UWIN*:*) - echo ${UNAME_MACHINE}-pc-uwin - exit ;; - amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*) - echo x86_64-unknown-cygwin - exit ;; - p*:CYGWIN*:*) - echo powerpcle-unknown-cygwin - exit ;; - prep*:SunOS:5.*:*) - echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit ;; - *:GNU:*:*) - # the GNU system - echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` - exit ;; - *:GNU/*:*:*) - # other systems with GNU libc and userland - echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu - exit ;; - i*86:Minix:*:*) - echo ${UNAME_MACHINE}-pc-minix - exit ;; - arm*:Linux:*:*) - eval $set_cc_for_build - if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ - | grep -q __ARM_EABI__ - then - echo ${UNAME_MACHINE}-unknown-linux-gnu - else - echo ${UNAME_MACHINE}-unknown-linux-gnueabi - fi - exit ;; - avr32*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; - cris:Linux:*:*) - echo cris-axis-linux-gnu - exit ;; - crisv32:Linux:*:*) - echo crisv32-axis-linux-gnu - exit ;; - frv:Linux:*:*) - echo frv-unknown-linux-gnu - exit ;; - ia64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; - m32r*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; - m68*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; - mips:Linux:*:*) - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c - #undef CPU - #undef mips - #undef mipsel - #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) - CPU=mipsel - #else - #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) - CPU=mips - #else - CPU= - #endif - #endif -EOF - eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' - /^CPU/{ - s: ::g - p - }'`" - test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } - ;; - mips64:Linux:*:*) - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c - #undef CPU - #undef mips64 - #undef mips64el - #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) - CPU=mips64el - #else - #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) - CPU=mips64 - #else - CPU= - #endif - #endif -EOF - eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' - /^CPU/{ - s: ::g - p - }'`" - test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } - ;; - or32:Linux:*:*) - echo or32-unknown-linux-gnu - exit ;; - ppc:Linux:*:*) - echo powerpc-unknown-linux-gnu - exit ;; - ppc64:Linux:*:*) - echo powerpc64-unknown-linux-gnu - exit ;; - alpha:Linux:*:*) - case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in - EV5) UNAME_MACHINE=alphaev5 ;; - EV56) UNAME_MACHINE=alphaev56 ;; - PCA56) UNAME_MACHINE=alphapca56 ;; - PCA57) UNAME_MACHINE=alphapca56 ;; - EV6) UNAME_MACHINE=alphaev6 ;; - EV67) UNAME_MACHINE=alphaev67 ;; - EV68*) UNAME_MACHINE=alphaev68 ;; - esac - objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null - if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi - echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} - exit ;; - padre:Linux:*:*) - echo sparc-unknown-linux-gnu - exit ;; - parisc:Linux:*:* | hppa:Linux:*:*) - # Look for CPU level - case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in - PA7*) echo hppa1.1-unknown-linux-gnu ;; - PA8*) echo hppa2.0-unknown-linux-gnu ;; - *) echo hppa-unknown-linux-gnu ;; - esac - exit ;; - parisc64:Linux:*:* | hppa64:Linux:*:*) - echo hppa64-unknown-linux-gnu - exit ;; - s390:Linux:*:* | s390x:Linux:*:*) - echo ${UNAME_MACHINE}-ibm-linux - exit ;; - sh64*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; - sh*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; - sparc:Linux:*:* | sparc64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; - vax:Linux:*:*) - echo ${UNAME_MACHINE}-dec-linux-gnu - exit ;; - x86_64:Linux:*:*) - echo x86_64-unknown-linux-gnu - exit ;; - xtensa*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; - i*86:Linux:*:*) - # The BFD linker knows what the default object file format is, so - # first see if it will tell us. cd to the root directory to prevent - # problems with other programs or directories called `ld' in the path. - # Set LC_ALL=C to ensure ld outputs messages in English. - ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \ - | sed -ne '/supported targets:/!d - s/[ ][ ]*/ /g - s/.*supported targets: *// - s/ .*// - p'` - case "$ld_supported_targets" in - elf32-i386) - TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu" - ;; - a.out-i386-linux) - echo "${UNAME_MACHINE}-pc-linux-gnuaout" - exit ;; - "") - # Either a pre-BFD a.out linker (linux-gnuoldld) or - # one that does not give us useful --help. - echo "${UNAME_MACHINE}-pc-linux-gnuoldld" - exit ;; - esac - # Determine whether the default compiler is a.out or elf - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c - #include - #ifdef __ELF__ - # ifdef __GLIBC__ - # if __GLIBC__ >= 2 - LIBC=gnu - # else - LIBC=gnulibc1 - # endif - # else - LIBC=gnulibc1 - # endif - #else - #if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC) - LIBC=gnu - #else - LIBC=gnuaout - #endif - #endif - #ifdef __dietlibc__ - LIBC=dietlibc - #endif -EOF - eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' - /^LIBC/{ - s: ::g - p - }'`" - test x"${LIBC}" != x && { - echo "${UNAME_MACHINE}-pc-linux-${LIBC}" - exit - } - test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; } - ;; - i*86:DYNIX/ptx:4*:*) - # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. - # earlier versions are messed up and put the nodename in both - # sysname and nodename. - echo i386-sequent-sysv4 - exit ;; - i*86:UNIX_SV:4.2MP:2.*) - # Unixware is an offshoot of SVR4, but it has its own version - # number series starting with 2... - # I am not positive that other SVR4 systems won't match this, - # I just have to hope. -- rms. - # Use sysv4.2uw... so that sysv4* matches it. - echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION} - exit ;; - i*86:OS/2:*:*) - # If we were able to find `uname', then EMX Unix compatibility - # is probably installed. - echo ${UNAME_MACHINE}-pc-os2-emx - exit ;; - i*86:XTS-300:*:STOP) - echo ${UNAME_MACHINE}-unknown-stop - exit ;; - i*86:atheos:*:*) - echo ${UNAME_MACHINE}-unknown-atheos - exit ;; - i*86:syllable:*:*) - echo ${UNAME_MACHINE}-pc-syllable - exit ;; - i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*) - echo i386-unknown-lynxos${UNAME_RELEASE} - exit ;; - i*86:*DOS:*:*) - echo ${UNAME_MACHINE}-pc-msdosdjgpp - exit ;; - i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*) - UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'` - if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then - echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL} - else - echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL} - fi - exit ;; - i*86:*:5:[678]*) - # UnixWare 7.x, OpenUNIX and OpenServer 6. - case `/bin/uname -X | grep "^Machine"` in - *486*) UNAME_MACHINE=i486 ;; - *Pentium) UNAME_MACHINE=i586 ;; - *Pent*|*Celeron) UNAME_MACHINE=i686 ;; - esac - echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION} - exit ;; - i*86:*:3.2:*) - if test -f /usr/options/cb.name; then - UNAME_REL=`sed -n 's/.*Version //p' /dev/null >/dev/null ; then - UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')` - (/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486 - (/bin/uname -X|grep '^Machine.*Pentium' >/dev/null) \ - && UNAME_MACHINE=i586 - (/bin/uname -X|grep '^Machine.*Pent *II' >/dev/null) \ - && UNAME_MACHINE=i686 - (/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \ - && UNAME_MACHINE=i686 - echo ${UNAME_MACHINE}-pc-sco$UNAME_REL - else - echo ${UNAME_MACHINE}-pc-sysv32 - fi - exit ;; - pc:*:*:*) - # Left here for compatibility: - # uname -m prints for DJGPP always 'pc', but it prints nothing about - # the processor, so we play safe by assuming i586. - # Note: whatever this is, it MUST be the same as what config.sub - # prints for the "djgpp" host, or else GDB configury will decide that - # this is a cross-build. - echo i586-pc-msdosdjgpp - exit ;; - Intel:Mach:3*:*) - echo i386-pc-mach3 - exit ;; - paragon:*:*:*) - echo i860-intel-osf1 - exit ;; - i860:*:4.*:*) # i860-SVR4 - if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then - echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4 - else # Add other i860-SVR4 vendors below as they are discovered. - echo i860-unknown-sysv${UNAME_RELEASE} # Unknown i860-SVR4 - fi - exit ;; - mini*:CTIX:SYS*5:*) - # "miniframe" - echo m68010-convergent-sysv - exit ;; - mc68k:UNIX:SYSTEM5:3.51m) - echo m68k-convergent-sysv - exit ;; - M680?0:D-NIX:5.3:*) - echo m68k-diab-dnix - exit ;; - M68*:*:R3V[5678]*:*) - test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;; - 3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0) - OS_REL='' - test -r /etc/.relid \ - && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` - /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ - && { echo i486-ncr-sysv4.3${OS_REL}; exit; } - /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ - && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; - 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*) - /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ - && { echo i486-ncr-sysv4; exit; } ;; - NCR*:*:4.2:* | MPRAS*:*:4.2:*) - OS_REL='.3' - test -r /etc/.relid \ - && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` - /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ - && { echo i486-ncr-sysv4.3${OS_REL}; exit; } - /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ - && { echo i586-ncr-sysv4.3${OS_REL}; exit; } - /bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \ - && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; - m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*) - echo m68k-unknown-lynxos${UNAME_RELEASE} - exit ;; - mc68030:UNIX_System_V:4.*:*) - echo m68k-atari-sysv4 - exit ;; - TSUNAMI:LynxOS:2.*:*) - echo sparc-unknown-lynxos${UNAME_RELEASE} - exit ;; - rs6000:LynxOS:2.*:*) - echo rs6000-unknown-lynxos${UNAME_RELEASE} - exit ;; - PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*) - echo powerpc-unknown-lynxos${UNAME_RELEASE} - exit ;; - SM[BE]S:UNIX_SV:*:*) - echo mips-dde-sysv${UNAME_RELEASE} - exit ;; - RM*:ReliantUNIX-*:*:*) - echo mips-sni-sysv4 - exit ;; - RM*:SINIX-*:*:*) - echo mips-sni-sysv4 - exit ;; - *:SINIX-*:*:*) - if uname -p 2>/dev/null >/dev/null ; then - UNAME_MACHINE=`(uname -p) 2>/dev/null` - echo ${UNAME_MACHINE}-sni-sysv4 - else - echo ns32k-sni-sysv - fi - exit ;; - PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort - # says - echo i586-unisys-sysv4 - exit ;; - *:UNIX_System_V:4*:FTX*) - # From Gerald Hewes . - # How about differentiating between stratus architectures? -djm - echo hppa1.1-stratus-sysv4 - exit ;; - *:*:*:FTX*) - # From seanf@swdc.stratus.com. - echo i860-stratus-sysv4 - exit ;; - i*86:VOS:*:*) - # From Paul.Green@stratus.com. - echo ${UNAME_MACHINE}-stratus-vos - exit ;; - *:VOS:*:*) - # From Paul.Green@stratus.com. - echo hppa1.1-stratus-vos - exit ;; - mc68*:A/UX:*:*) - echo m68k-apple-aux${UNAME_RELEASE} - exit ;; - news*:NEWS-OS:6*:*) - echo mips-sony-newsos6 - exit ;; - R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*) - if [ -d /usr/nec ]; then - echo mips-nec-sysv${UNAME_RELEASE} - else - echo mips-unknown-sysv${UNAME_RELEASE} - fi - exit ;; - BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only. - echo powerpc-be-beos - exit ;; - BeMac:BeOS:*:*) # BeOS running on Mac or Mac clone, PPC only. - echo powerpc-apple-beos - exit ;; - BePC:BeOS:*:*) # BeOS running on Intel PC compatible. - echo i586-pc-beos - exit ;; - BePC:Haiku:*:*) # Haiku running on Intel PC compatible. - echo i586-pc-haiku - exit ;; - SX-4:SUPER-UX:*:*) - echo sx4-nec-superux${UNAME_RELEASE} - exit ;; - SX-5:SUPER-UX:*:*) - echo sx5-nec-superux${UNAME_RELEASE} - exit ;; - SX-6:SUPER-UX:*:*) - echo sx6-nec-superux${UNAME_RELEASE} - exit ;; - SX-7:SUPER-UX:*:*) - echo sx7-nec-superux${UNAME_RELEASE} - exit ;; - SX-8:SUPER-UX:*:*) - echo sx8-nec-superux${UNAME_RELEASE} - exit ;; - SX-8R:SUPER-UX:*:*) - echo sx8r-nec-superux${UNAME_RELEASE} - exit ;; - Power*:Rhapsody:*:*) - echo powerpc-apple-rhapsody${UNAME_RELEASE} - exit ;; - *:Rhapsody:*:*) - echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE} - exit ;; - *:Darwin:*:*) - UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown - case $UNAME_PROCESSOR in - unknown) UNAME_PROCESSOR=powerpc ;; - esac - echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} - exit ;; - *:procnto*:*:* | *:QNX:[0123456789]*:*) - UNAME_PROCESSOR=`uname -p` - if test "$UNAME_PROCESSOR" = "x86"; then - UNAME_PROCESSOR=i386 - UNAME_MACHINE=pc - fi - echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE} - exit ;; - *:QNX:*:4*) - echo i386-pc-qnx - exit ;; - NSE-?:NONSTOP_KERNEL:*:*) - echo nse-tandem-nsk${UNAME_RELEASE} - exit ;; - NSR-?:NONSTOP_KERNEL:*:*) - echo nsr-tandem-nsk${UNAME_RELEASE} - exit ;; - *:NonStop-UX:*:*) - echo mips-compaq-nonstopux - exit ;; - BS2000:POSIX*:*:*) - echo bs2000-siemens-sysv - exit ;; - DS/*:UNIX_System_V:*:*) - echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE} - exit ;; - *:Plan9:*:*) - # "uname -m" is not consistent, so use $cputype instead. 386 - # is converted to i386 for consistency with other x86 - # operating systems. - if test "$cputype" = "386"; then - UNAME_MACHINE=i386 - else - UNAME_MACHINE="$cputype" - fi - echo ${UNAME_MACHINE}-unknown-plan9 - exit ;; - *:TOPS-10:*:*) - echo pdp10-unknown-tops10 - exit ;; - *:TENEX:*:*) - echo pdp10-unknown-tenex - exit ;; - KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*) - echo pdp10-dec-tops20 - exit ;; - XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*) - echo pdp10-xkl-tops20 - exit ;; - *:TOPS-20:*:*) - echo pdp10-unknown-tops20 - exit ;; - *:ITS:*:*) - echo pdp10-unknown-its - exit ;; - SEI:*:*:SEIUX) - echo mips-sei-seiux${UNAME_RELEASE} - exit ;; - *:DragonFly:*:*) - echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` - exit ;; - *:*VMS:*:*) - UNAME_MACHINE=`(uname -p) 2>/dev/null` - case "${UNAME_MACHINE}" in - A*) echo alpha-dec-vms ; exit ;; - I*) echo ia64-dec-vms ; exit ;; - V*) echo vax-dec-vms ; exit ;; - esac ;; - *:XENIX:*:SysV) - echo i386-pc-xenix - exit ;; - i*86:skyos:*:*) - echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//' - exit ;; - i*86:rdos:*:*) - echo ${UNAME_MACHINE}-pc-rdos - exit ;; - i*86:AROS:*:*) - echo ${UNAME_MACHINE}-pc-aros - exit ;; -esac - -#echo '(No uname command or uname output not recognized.)' 1>&2 -#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2 - -eval $set_cc_for_build -cat >$dummy.c < -# include -#endif -main () -{ -#if defined (sony) -#if defined (MIPSEB) - /* BFD wants "bsd" instead of "newsos". Perhaps BFD should be changed, - I don't know.... */ - printf ("mips-sony-bsd\n"); exit (0); -#else -#include - printf ("m68k-sony-newsos%s\n", -#ifdef NEWSOS4 - "4" -#else - "" -#endif - ); exit (0); -#endif -#endif - -#if defined (__arm) && defined (__acorn) && defined (__unix) - printf ("arm-acorn-riscix\n"); exit (0); -#endif - -#if defined (hp300) && !defined (hpux) - printf ("m68k-hp-bsd\n"); exit (0); -#endif - -#if defined (NeXT) -#if !defined (__ARCHITECTURE__) -#define __ARCHITECTURE__ "m68k" -#endif - int version; - version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`; - if (version < 4) - printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version); - else - printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version); - exit (0); -#endif - -#if defined (MULTIMAX) || defined (n16) -#if defined (UMAXV) - printf ("ns32k-encore-sysv\n"); exit (0); -#else -#if defined (CMU) - printf ("ns32k-encore-mach\n"); exit (0); -#else - printf ("ns32k-encore-bsd\n"); exit (0); -#endif -#endif -#endif - -#if defined (__386BSD__) - printf ("i386-pc-bsd\n"); exit (0); -#endif - -#if defined (sequent) -#if defined (i386) - printf ("i386-sequent-dynix\n"); exit (0); -#endif -#if defined (ns32000) - printf ("ns32k-sequent-dynix\n"); exit (0); -#endif -#endif - -#if defined (_SEQUENT_) - struct utsname un; - - uname(&un); - - if (strncmp(un.version, "V2", 2) == 0) { - printf ("i386-sequent-ptx2\n"); exit (0); - } - if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */ - printf ("i386-sequent-ptx1\n"); exit (0); - } - printf ("i386-sequent-ptx\n"); exit (0); - -#endif - -#if defined (vax) -# if !defined (ultrix) -# include -# if defined (BSD) -# if BSD == 43 - printf ("vax-dec-bsd4.3\n"); exit (0); -# else -# if BSD == 199006 - printf ("vax-dec-bsd4.3reno\n"); exit (0); -# else - printf ("vax-dec-bsd\n"); exit (0); -# endif -# endif -# else - printf ("vax-dec-bsd\n"); exit (0); -# endif -# else - printf ("vax-dec-ultrix\n"); exit (0); -# endif -#endif - -#if defined (alliant) && defined (i860) - printf ("i860-alliant-bsd\n"); exit (0); -#endif - - exit (1); -} -EOF - -$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` && - { echo "$SYSTEM_NAME"; exit; } - -# Apollos put the system type in the environment. - -test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; } - -# Convex versions that predate uname can use getsysinfo(1) - -if [ -x /usr/convex/getsysinfo ] -then - case `getsysinfo -f cpu_type` in - c1*) - echo c1-convex-bsd - exit ;; - c2*) - if getsysinfo -f scalar_acc - then echo c32-convex-bsd - else echo c2-convex-bsd - fi - exit ;; - c34*) - echo c34-convex-bsd - exit ;; - c38*) - echo c38-convex-bsd - exit ;; - c4*) - echo c4-convex-bsd - exit ;; - esac -fi - -cat >&2 < in order to provide the needed -information to handle your system. - -config.guess timestamp = $timestamp - -uname -m = `(uname -m) 2>/dev/null || echo unknown` -uname -r = `(uname -r) 2>/dev/null || echo unknown` -uname -s = `(uname -s) 2>/dev/null || echo unknown` -uname -v = `(uname -v) 2>/dev/null || echo unknown` - -/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null` -/bin/uname -X = `(/bin/uname -X) 2>/dev/null` - -hostinfo = `(hostinfo) 2>/dev/null` -/bin/universe = `(/bin/universe) 2>/dev/null` -/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null` -/bin/arch = `(/bin/arch) 2>/dev/null` -/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null` -/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null` - -UNAME_MACHINE = ${UNAME_MACHINE} -UNAME_RELEASE = ${UNAME_RELEASE} -UNAME_SYSTEM = ${UNAME_SYSTEM} -UNAME_VERSION = ${UNAME_VERSION} -EOF - -exit 1 - -# Local variables: -# eval: (add-hook 'write-file-hooks 'time-stamp) -# time-stamp-start: "timestamp='" -# time-stamp-format: "%:y-%02m-%02d" -# time-stamp-end: "'" -# End: diff --git a/Build/source/utils/xindy/config.sub b/Build/source/utils/xindy/config.sub deleted file mode 100755 index a39437d0158..00000000000 --- a/Build/source/utils/xindy/config.sub +++ /dev/null @@ -1,1686 +0,0 @@ -#! /bin/sh -# Configuration validation subroutine script. -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 -# Free Software Foundation, Inc. - -timestamp='2009-04-17' - -# This file is (in principle) common to ALL GNU software. -# The presence of a machine in this file suggests that SOME GNU software -# can handle that machine. It does not imply ALL GNU software can. -# -# This file is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, 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 General Public License for more details. -# -# You should have received a copy of the GNU 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. -# -# As a special exception to the GNU General Public License, if you -# distribute this file as part of a program that contains a -# configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. - - -# Please send patches to . Submit a context -# diff and a properly formatted ChangeLog entry. -# -# Configuration subroutine to validate and canonicalize a configuration type. -# Supply the specified configuration type as an argument. -# If it is invalid, we print an error message on stderr and exit with code 1. -# Otherwise, we print the canonical config type on stdout and succeed. - -# This file is supposed to be the same for all GNU packages -# and recognize all the CPU types, system types and aliases -# that are meaningful with *any* GNU software. -# Each package is responsible for reporting which valid configurations -# it does not support. The user should be able to distinguish -# a failure to support a valid configuration from a meaningless -# configuration. - -# The goal of this file is to map all the various variations of a given -# machine specification into a single specification in the form: -# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM -# or in some cases, the newer four-part form: -# CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM -# It is wrong to echo any other type of specification. - -me=`echo "$0" | sed -e 's,.*/,,'` - -usage="\ -Usage: $0 [OPTION] CPU-MFR-OPSYS - $0 [OPTION] ALIAS - -Canonicalize a configuration name. - -Operation modes: - -h, --help print this help, then exit - -t, --time-stamp print date of last modification, then exit - -v, --version print version number, then exit - -Report bugs and patches to ." - -version="\ -GNU config.sub ($timestamp) - -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, -2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. - -This is free software; see the source for copying conditions. There is NO -warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." - -help=" -Try \`$me --help' for more information." - -# Parse command line -while test $# -gt 0 ; do - case $1 in - --time-stamp | --time* | -t ) - echo "$timestamp" ; exit ;; - --version | -v ) - echo "$version" ; exit ;; - --help | --h* | -h ) - echo "$usage"; exit ;; - -- ) # Stop option processing - shift; break ;; - - ) # Use stdin as input. - break ;; - -* ) - echo "$me: invalid option $1$help" - exit 1 ;; - - *local*) - # First pass through any local machine types. - echo $1 - exit ;; - - * ) - break ;; - esac -done - -case $# in - 0) echo "$me: missing argument$help" >&2 - exit 1;; - 1) ;; - *) echo "$me: too many arguments$help" >&2 - exit 1;; -esac - -# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any). -# Here we must recognize all the valid KERNEL-OS combinations. -maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` -case $maybe_os in - nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \ - uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \ - kopensolaris*-gnu* | \ - storm-chaos* | os2-emx* | rtmk-nova*) - os=-$maybe_os - basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` - ;; - *) - basic_machine=`echo $1 | sed 's/-[^-]*$//'` - if [ $basic_machine != $1 ] - then os=`echo $1 | sed 's/.*-/-/'` - else os=; fi - ;; -esac - -### Let's recognize common machines as not being operating systems so -### that things like config.sub decstation-3100 work. We also -### recognize some manufacturers as not being operating systems, so we -### can provide default operating systems below. -case $os in - -sun*os*) - # Prevent following clause from handling this invalid input. - ;; - -dec* | -mips* | -sequent* | -encore* | -pc532* | -sgi* | -sony* | \ - -att* | -7300* | -3300* | -delta* | -motorola* | -sun[234]* | \ - -unicom* | -ibm* | -next | -hp | -isi* | -apollo | -altos* | \ - -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\ - -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \ - -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \ - -apple | -axis | -knuth | -cray) - os= - basic_machine=$1 - ;; - -sim | -cisco | -oki | -wec | -winbond) - os= - basic_machine=$1 - ;; - -scout) - ;; - -wrs) - os=-vxworks - basic_machine=$1 - ;; - -chorusos*) - os=-chorusos - basic_machine=$1 - ;; - -chorusrdb) - os=-chorusrdb - basic_machine=$1 - ;; - -hiux*) - os=-hiuxwe2 - ;; - -sco6) - os=-sco5v6 - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -sco5) - os=-sco3.2v5 - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -sco4) - os=-sco3.2v4 - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -sco3.2.[4-9]*) - os=`echo $os | sed -e 's/sco3.2./sco3.2v/'` - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -sco3.2v[4-9]*) - # Don't forget version if it is 3.2v4 or newer. - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -sco5v6*) - # Don't forget version if it is 3.2v4 or newer. - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -sco*) - os=-sco3.2v2 - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -udk*) - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -isc) - os=-isc2.2 - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -clix*) - basic_machine=clipper-intergraph - ;; - -isc*) - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -lynx*) - os=-lynxos - ;; - -ptx*) - basic_machine=`echo $1 | sed -e 's/86-.*/86-sequent/'` - ;; - -windowsnt*) - os=`echo $os | sed -e 's/windowsnt/winnt/'` - ;; - -psos*) - os=-psos - ;; - -mint | -mint[0-9]*) - basic_machine=m68k-atari - os=-mint - ;; -esac - -# Decode aliases for certain CPU-COMPANY combinations. -case $basic_machine in - # Recognize the basic CPU types without company name. - # Some are omitted here because they have special meanings below. - 1750a | 580 \ - | a29k \ - | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ - | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ - | am33_2.0 \ - | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \ - | bfin \ - | c4x | clipper \ - | d10v | d30v | dlx | dsp16xx \ - | fido | fr30 | frv \ - | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ - | i370 | i860 | i960 | ia64 \ - | ip2k | iq2000 \ - | lm32 \ - | m32c | m32r | m32rle | m68000 | m68k | m88k \ - | maxq | mb | microblaze | mcore | mep | metag \ - | mips | mipsbe | mipseb | mipsel | mipsle \ - | mips16 \ - | mips64 | mips64el \ - | mips64octeon | mips64octeonel \ - | mips64orion | mips64orionel \ - | mips64r5900 | mips64r5900el \ - | mips64vr | mips64vrel \ - | mips64vr4100 | mips64vr4100el \ - | mips64vr4300 | mips64vr4300el \ - | mips64vr5000 | mips64vr5000el \ - | mips64vr5900 | mips64vr5900el \ - | mipsisa32 | mipsisa32el \ - | mipsisa32r2 | mipsisa32r2el \ - | mipsisa64 | mipsisa64el \ - | mipsisa64r2 | mipsisa64r2el \ - | mipsisa64sb1 | mipsisa64sb1el \ - | mipsisa64sr71k | mipsisa64sr71kel \ - | mipstx39 | mipstx39el \ - | mn10200 | mn10300 \ - | moxie \ - | mt \ - | msp430 \ - | nios | nios2 \ - | ns16k | ns32k \ - | or32 \ - | pdp10 | pdp11 | pj | pjl \ - | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ - | pyramid \ - | score \ - | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ - | sh64 | sh64le \ - | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ - | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ - | spu | strongarm \ - | tahoe | thumb | tic4x | tic80 | tron \ - | v850 | v850e \ - | we32k \ - | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \ - | z8k | z80) - basic_machine=$basic_machine-unknown - ;; - m6811 | m68hc11 | m6812 | m68hc12) - # Motorola 68HC11/12. - basic_machine=$basic_machine-unknown - os=-none - ;; - m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k) - ;; - ms1) - basic_machine=mt-unknown - ;; - - # We use `pc' rather than `unknown' - # because (1) that's what they normally are, and - # (2) the word "unknown" tends to confuse beginning users. - i*86 | x86_64) - basic_machine=$basic_machine-pc - ;; - # Object if more than one company name word. - *-*-*) - echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2 - exit 1 - ;; - # Recognize the basic CPU types with company name. - 580-* \ - | a29k-* \ - | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ - | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ - | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ - | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ - | avr-* | avr32-* \ - | bfin-* | bs2000-* \ - | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \ - | clipper-* | craynv-* | cydra-* \ - | d10v-* | d30v-* | dlx-* \ - | elxsi-* \ - | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ - | h8300-* | h8500-* \ - | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ - | i*86-* | i860-* | i960-* | ia64-* \ - | ip2k-* | iq2000-* \ - | lm32-* \ - | m32c-* | m32r-* | m32rle-* \ - | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ - | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \ - | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ - | mips16-* \ - | mips64-* | mips64el-* \ - | mips64octeon-* | mips64octeonel-* \ - | mips64orion-* | mips64orionel-* \ - | mips64r5900-* | mips64r5900el-* \ - | mips64vr-* | mips64vrel-* \ - | mips64vr4100-* | mips64vr4100el-* \ - | mips64vr4300-* | mips64vr4300el-* \ - | mips64vr5000-* | mips64vr5000el-* \ - | mips64vr5900-* | mips64vr5900el-* \ - | mipsisa32-* | mipsisa32el-* \ - | mipsisa32r2-* | mipsisa32r2el-* \ - | mipsisa64-* | mipsisa64el-* \ - | mipsisa64r2-* | mipsisa64r2el-* \ - | mipsisa64sb1-* | mipsisa64sb1el-* \ - | mipsisa64sr71k-* | mipsisa64sr71kel-* \ - | mipstx39-* | mipstx39el-* \ - | mmix-* \ - | mt-* \ - | msp430-* \ - | nios-* | nios2-* \ - | none-* | np1-* | ns16k-* | ns32k-* \ - | orion-* \ - | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ - | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ - | pyramid-* \ - | romp-* | rs6000-* \ - | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ - | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ - | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ - | sparclite-* \ - | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \ - | tahoe-* | thumb-* \ - | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \ - | tron-* \ - | v850-* | v850e-* | vax-* \ - | we32k-* \ - | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \ - | xstormy16-* | xtensa*-* \ - | ymp-* \ - | z8k-* | z80-*) - ;; - # Recognize the basic CPU types without company name, with glob match. - xtensa*) - basic_machine=$basic_machine-unknown - ;; - # Recognize the various machine names and aliases which stand - # for a CPU type and a company and sometimes even an OS. - 386bsd) - basic_machine=i386-unknown - os=-bsd - ;; - 3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc) - basic_machine=m68000-att - ;; - 3b*) - basic_machine=we32k-att - ;; - a29khif) - basic_machine=a29k-amd - os=-udi - ;; - abacus) - basic_machine=abacus-unknown - ;; - adobe68k) - basic_machine=m68010-adobe - os=-scout - ;; - alliant | fx80) - basic_machine=fx80-alliant - ;; - altos | altos3068) - basic_machine=m68k-altos - ;; - am29k) - basic_machine=a29k-none - os=-bsd - ;; - amd64) - basic_machine=x86_64-pc - ;; - amd64-*) - basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - amdahl) - basic_machine=580-amdahl - os=-sysv - ;; - amiga | amiga-*) - basic_machine=m68k-unknown - ;; - amigaos | amigados) - basic_machine=m68k-unknown - os=-amigaos - ;; - amigaunix | amix) - basic_machine=m68k-unknown - os=-sysv4 - ;; - apollo68) - basic_machine=m68k-apollo - os=-sysv - ;; - apollo68bsd) - basic_machine=m68k-apollo - os=-bsd - ;; - aros) - basic_machine=i386-pc - os=-aros - ;; - aux) - basic_machine=m68k-apple - os=-aux - ;; - balance) - basic_machine=ns32k-sequent - os=-dynix - ;; - blackfin) - basic_machine=bfin-unknown - os=-linux - ;; - blackfin-*) - basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'` - os=-linux - ;; - c90) - basic_machine=c90-cray - os=-unicos - ;; - cegcc) - basic_machine=arm-unknown - os=-cegcc - ;; - convex-c1) - basic_machine=c1-convex - os=-bsd - ;; - convex-c2) - basic_machine=c2-convex - os=-bsd - ;; - convex-c32) - basic_machine=c32-convex - os=-bsd - ;; - convex-c34) - basic_machine=c34-convex - os=-bsd - ;; - convex-c38) - basic_machine=c38-convex - os=-bsd - ;; - cray | j90) - basic_machine=j90-cray - os=-unicos - ;; - craynv) - basic_machine=craynv-cray - os=-unicosmp - ;; - cr16) - basic_machine=cr16-unknown - os=-elf - ;; - crds | unos) - basic_machine=m68k-crds - ;; - crisv32 | crisv32-* | etraxfs*) - basic_machine=crisv32-axis - ;; - cris | cris-* | etrax*) - basic_machine=cris-axis - ;; - crx) - basic_machine=crx-unknown - os=-elf - ;; - da30 | da30-*) - basic_machine=m68k-da30 - ;; - decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn) - basic_machine=mips-dec - ;; - decsystem10* | dec10*) - basic_machine=pdp10-dec - os=-tops10 - ;; - decsystem20* | dec20*) - basic_machine=pdp10-dec - os=-tops20 - ;; - delta | 3300 | motorola-3300 | motorola-delta \ - | 3300-motorola | delta-motorola) - basic_machine=m68k-motorola - ;; - delta88) - basic_machine=m88k-motorola - os=-sysv3 - ;; - dicos) - basic_machine=i686-pc - os=-dicos - ;; - djgpp) - basic_machine=i586-pc - os=-msdosdjgpp - ;; - dpx20 | dpx20-*) - basic_machine=rs6000-bull - os=-bosx - ;; - dpx2* | dpx2*-bull) - basic_machine=m68k-bull - os=-sysv3 - ;; - ebmon29k) - basic_machine=a29k-amd - os=-ebmon - ;; - elxsi) - basic_machine=elxsi-elxsi - os=-bsd - ;; - encore | umax | mmax) - basic_machine=ns32k-encore - ;; - es1800 | OSE68k | ose68k | ose | OSE) - basic_machine=m68k-ericsson - os=-ose - ;; - fx2800) - basic_machine=i860-alliant - ;; - genix) - basic_machine=ns32k-ns - ;; - gmicro) - basic_machine=tron-gmicro - os=-sysv - ;; - go32) - basic_machine=i386-pc - os=-go32 - ;; - h3050r* | hiux*) - basic_machine=hppa1.1-hitachi - os=-hiuxwe2 - ;; - h8300hms) - basic_machine=h8300-hitachi - os=-hms - ;; - h8300xray) - basic_machine=h8300-hitachi - os=-xray - ;; - h8500hms) - basic_machine=h8500-hitachi - os=-hms - ;; - harris) - basic_machine=m88k-harris - os=-sysv3 - ;; - hp300-*) - basic_machine=m68k-hp - ;; - hp300bsd) - basic_machine=m68k-hp - os=-bsd - ;; - hp300hpux) - basic_machine=m68k-hp - os=-hpux - ;; - hp3k9[0-9][0-9] | hp9[0-9][0-9]) - basic_machine=hppa1.0-hp - ;; - hp9k2[0-9][0-9] | hp9k31[0-9]) - basic_machine=m68000-hp - ;; - hp9k3[2-9][0-9]) - basic_machine=m68k-hp - ;; - hp9k6[0-9][0-9] | hp6[0-9][0-9]) - basic_machine=hppa1.0-hp - ;; - hp9k7[0-79][0-9] | hp7[0-79][0-9]) - basic_machine=hppa1.1-hp - ;; - hp9k78[0-9] | hp78[0-9]) - # FIXME: really hppa2.0-hp - basic_machine=hppa1.1-hp - ;; - hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893) - # FIXME: really hppa2.0-hp - basic_machine=hppa1.1-hp - ;; - hp9k8[0-9][13679] | hp8[0-9][13679]) - basic_machine=hppa1.1-hp - ;; - hp9k8[0-9][0-9] | hp8[0-9][0-9]) - basic_machine=hppa1.0-hp - ;; - hppa-next) - os=-nextstep3 - ;; - hppaosf) - basic_machine=hppa1.1-hp - os=-osf - ;; - hppro) - basic_machine=hppa1.1-hp - os=-proelf - ;; - i370-ibm* | ibm*) - basic_machine=i370-ibm - ;; -# I'm not sure what "Sysv32" means. Should this be sysv3.2? - i*86v32) - basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` - os=-sysv32 - ;; - i*86v4*) - basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` - os=-sysv4 - ;; - i*86v) - basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` - os=-sysv - ;; - i*86sol2) - basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` - os=-solaris2 - ;; - i386mach) - basic_machine=i386-mach - os=-mach - ;; - i386-vsta | vsta) - basic_machine=i386-unknown - os=-vsta - ;; - iris | iris4d) - basic_machine=mips-sgi - case $os in - -irix*) - ;; - *) - os=-irix4 - ;; - esac - ;; - isi68 | isi) - basic_machine=m68k-isi - os=-sysv - ;; - m68knommu) - basic_machine=m68k-unknown - os=-linux - ;; - m68knommu-*) - basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'` - os=-linux - ;; - m88k-omron*) - basic_machine=m88k-omron - ;; - magnum | m3230) - basic_machine=mips-mips - os=-sysv - ;; - merlin) - basic_machine=ns32k-utek - os=-sysv - ;; - mingw32) - basic_machine=i386-pc - os=-mingw32 - ;; - mingw32ce) - basic_machine=arm-unknown - os=-mingw32ce - ;; - miniframe) - basic_machine=m68000-convergent - ;; - *mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*) - basic_machine=m68k-atari - os=-mint - ;; - mips3*-*) - basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'` - ;; - mips3*) - basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown - ;; - monitor) - basic_machine=m68k-rom68k - os=-coff - ;; - morphos) - basic_machine=powerpc-unknown - os=-morphos - ;; - msdos) - basic_machine=i386-pc - os=-msdos - ;; - ms1-*) - basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'` - ;; - mvs) - basic_machine=i370-ibm - os=-mvs - ;; - ncr3000) - basic_machine=i486-ncr - os=-sysv4 - ;; - netbsd386) - basic_machine=i386-unknown - os=-netbsd - ;; - netwinder) - basic_machine=armv4l-rebel - os=-linux - ;; - news | news700 | news800 | news900) - basic_machine=m68k-sony - os=-newsos - ;; - news1000) - basic_machine=m68030-sony - os=-newsos - ;; - news-3600 | risc-news) - basic_machine=mips-sony - os=-newsos - ;; - necv70) - basic_machine=v70-nec - os=-sysv - ;; - next | m*-next ) - basic_machine=m68k-next - case $os in - -nextstep* ) - ;; - -ns2*) - os=-nextstep2 - ;; - *) - os=-nextstep3 - ;; - esac - ;; - nh3000) - basic_machine=m68k-harris - os=-cxux - ;; - nh[45]000) - basic_machine=m88k-harris - os=-cxux - ;; - nindy960) - basic_machine=i960-intel - os=-nindy - ;; - mon960) - basic_machine=i960-intel - os=-mon960 - ;; - nonstopux) - basic_machine=mips-compaq - os=-nonstopux - ;; - np1) - basic_machine=np1-gould - ;; - nsr-tandem) - basic_machine=nsr-tandem - ;; - op50n-* | op60c-*) - basic_machine=hppa1.1-oki - os=-proelf - ;; - openrisc | openrisc-*) - basic_machine=or32-unknown - ;; - os400) - basic_machine=powerpc-ibm - os=-os400 - ;; - OSE68000 | ose68000) - basic_machine=m68000-ericsson - os=-ose - ;; - os68k) - basic_machine=m68k-none - os=-os68k - ;; - pa-hitachi) - basic_machine=hppa1.1-hitachi - os=-hiuxwe2 - ;; - paragon) - basic_machine=i860-intel - os=-osf - ;; - parisc) - basic_machine=hppa-unknown - os=-linux - ;; - parisc-*) - basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'` - os=-linux - ;; - pbd) - basic_machine=sparc-tti - ;; - pbb) - basic_machine=m68k-tti - ;; - pc532 | pc532-*) - basic_machine=ns32k-pc532 - ;; - pc98) - basic_machine=i386-pc - ;; - pc98-*) - basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - pentium | p5 | k5 | k6 | nexgen | viac3) - basic_machine=i586-pc - ;; - pentiumpro | p6 | 6x86 | athlon | athlon_*) - basic_machine=i686-pc - ;; - pentiumii | pentium2 | pentiumiii | pentium3) - basic_machine=i686-pc - ;; - pentium4) - basic_machine=i786-pc - ;; - pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*) - basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - pentiumpro-* | p6-* | 6x86-* | athlon-*) - basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*) - basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - pentium4-*) - basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - pn) - basic_machine=pn-gould - ;; - power) basic_machine=power-ibm - ;; - ppc) basic_machine=powerpc-unknown - ;; - ppc-*) basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - ppcle | powerpclittle | ppc-le | powerpc-little) - basic_machine=powerpcle-unknown - ;; - ppcle-* | powerpclittle-*) - basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - ppc64) basic_machine=powerpc64-unknown - ;; - ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - ppc64le | powerpc64little | ppc64-le | powerpc64-little) - basic_machine=powerpc64le-unknown - ;; - ppc64le-* | powerpc64little-*) - basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - ps2) - basic_machine=i386-ibm - ;; - pw32) - basic_machine=i586-unknown - os=-pw32 - ;; - rdos) - basic_machine=i386-pc - os=-rdos - ;; - rom68k) - basic_machine=m68k-rom68k - os=-coff - ;; - rm[46]00) - basic_machine=mips-siemens - ;; - rtpc | rtpc-*) - basic_machine=romp-ibm - ;; - s390 | s390-*) - basic_machine=s390-ibm - ;; - s390x | s390x-*) - basic_machine=s390x-ibm - ;; - sa29200) - basic_machine=a29k-amd - os=-udi - ;; - sb1) - basic_machine=mipsisa64sb1-unknown - ;; - sb1el) - basic_machine=mipsisa64sb1el-unknown - ;; - sde) - basic_machine=mipsisa32-sde - os=-elf - ;; - sei) - basic_machine=mips-sei - os=-seiux - ;; - sequent) - basic_machine=i386-sequent - ;; - sh) - basic_machine=sh-hitachi - os=-hms - ;; - sh5el) - basic_machine=sh5le-unknown - ;; - sh64) - basic_machine=sh64-unknown - ;; - sparclite-wrs | simso-wrs) - basic_machine=sparclite-wrs - os=-vxworks - ;; - sps7) - basic_machine=m68k-bull - os=-sysv2 - ;; - spur) - basic_machine=spur-unknown - ;; - st2000) - basic_machine=m68k-tandem - ;; - stratus) - basic_machine=i860-stratus - os=-sysv4 - ;; - sun2) - basic_machine=m68000-sun - ;; - sun2os3) - basic_machine=m68000-sun - os=-sunos3 - ;; - sun2os4) - basic_machine=m68000-sun - os=-sunos4 - ;; - sun3os3) - basic_machine=m68k-sun - os=-sunos3 - ;; - sun3os4) - basic_machine=m68k-sun - os=-sunos4 - ;; - sun4os3) - basic_machine=sparc-sun - os=-sunos3 - ;; - sun4os4) - basic_machine=sparc-sun - os=-sunos4 - ;; - sun4sol2) - basic_machine=sparc-sun - os=-solaris2 - ;; - sun3 | sun3-*) - basic_machine=m68k-sun - ;; - sun4) - basic_machine=sparc-sun - ;; - sun386 | sun386i | roadrunner) - basic_machine=i386-sun - ;; - sv1) - basic_machine=sv1-cray - os=-unicos - ;; - symmetry) - basic_machine=i386-sequent - os=-dynix - ;; - t3e) - basic_machine=alphaev5-cray - os=-unicos - ;; - t90) - basic_machine=t90-cray - os=-unicos - ;; - tic54x | c54x*) - basic_machine=tic54x-unknown - os=-coff - ;; - tic55x | c55x*) - basic_machine=tic55x-unknown - os=-coff - ;; - tic6x | c6x*) - basic_machine=tic6x-unknown - os=-coff - ;; - tile*) - basic_machine=tile-unknown - os=-linux-gnu - ;; - tx39) - basic_machine=mipstx39-unknown - ;; - tx39el) - basic_machine=mipstx39el-unknown - ;; - toad1) - basic_machine=pdp10-xkl - os=-tops20 - ;; - tower | tower-32) - basic_machine=m68k-ncr - ;; - tpf) - basic_machine=s390x-ibm - os=-tpf - ;; - udi29k) - basic_machine=a29k-amd - os=-udi - ;; - ultra3) - basic_machine=a29k-nyu - os=-sym1 - ;; - v810 | necv810) - basic_machine=v810-nec - os=-none - ;; - vaxv) - basic_machine=vax-dec - os=-sysv - ;; - vms) - basic_machine=vax-dec - os=-vms - ;; - vpp*|vx|vx-*) - basic_machine=f301-fujitsu - ;; - vxworks960) - basic_machine=i960-wrs - os=-vxworks - ;; - vxworks68) - basic_machine=m68k-wrs - os=-vxworks - ;; - vxworks29k) - basic_machine=a29k-wrs - os=-vxworks - ;; - w65*) - basic_machine=w65-wdc - os=-none - ;; - w89k-*) - basic_machine=hppa1.1-winbond - os=-proelf - ;; - xbox) - basic_machine=i686-pc - os=-mingw32 - ;; - xps | xps100) - basic_machine=xps100-honeywell - ;; - ymp) - basic_machine=ymp-cray - os=-unicos - ;; - z8k-*-coff) - basic_machine=z8k-unknown - os=-sim - ;; - z80-*-coff) - basic_machine=z80-unknown - os=-sim - ;; - none) - basic_machine=none-none - os=-none - ;; - -# Here we handle the default manufacturer of certain CPU types. It is in -# some cases the only manufacturer, in others, it is the most popular. - w89k) - basic_machine=hppa1.1-winbond - ;; - op50n) - basic_machine=hppa1.1-oki - ;; - op60c) - basic_machine=hppa1.1-oki - ;; - romp) - basic_machine=romp-ibm - ;; - mmix) - basic_machine=mmix-knuth - ;; - rs6000) - basic_machine=rs6000-ibm - ;; - vax) - basic_machine=vax-dec - ;; - pdp10) - # there are many clones, so DEC is not a safe bet - basic_machine=pdp10-unknown - ;; - pdp11) - basic_machine=pdp11-dec - ;; - we32k) - basic_machine=we32k-att - ;; - sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele) - basic_machine=sh-unknown - ;; - sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v) - basic_machine=sparc-sun - ;; - cydra) - basic_machine=cydra-cydrome - ;; - orion) - basic_machine=orion-highlevel - ;; - orion105) - basic_machine=clipper-highlevel - ;; - mac | mpw | mac-mpw) - basic_machine=m68k-apple - ;; - pmac | pmac-mpw) - basic_machine=powerpc-apple - ;; - *-unknown) - # Make sure to match an already-canonicalized machine name. - ;; - *) - echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2 - exit 1 - ;; -esac - -# Here we canonicalize certain aliases for manufacturers. -case $basic_machine in - *-digital*) - basic_machine=`echo $basic_machine | sed 's/digital.*/dec/'` - ;; - *-commodore*) - basic_machine=`echo $basic_machine | sed 's/commodore.*/cbm/'` - ;; - *) - ;; -esac - -# Decode manufacturer-specific aliases for certain operating systems. - -if [ x"$os" != x"" ] -then -case $os in - # First match some system type aliases - # that might get confused with valid system types. - # -solaris* is a basic system type, with this one exception. - -solaris1 | -solaris1.*) - os=`echo $os | sed -e 's|solaris1|sunos4|'` - ;; - -solaris) - os=-solaris2 - ;; - -svr4*) - os=-sysv4 - ;; - -unixware*) - os=-sysv4.2uw - ;; - -gnu/linux*) - os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'` - ;; - # First accept the basic system types. - # The portable systems comes first. - # Each alternative MUST END IN A *, to match a version number. - # -sysv* is not here because it comes later, after sysvr4. - -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ - | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\ - | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \ - | -kopensolaris* \ - | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ - | -aos* | -aros* \ - | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ - | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ - | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \ - | -openbsd* | -solidbsd* \ - | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \ - | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ - | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ - | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ - | -chorusos* | -chorusrdb* | -cegcc* \ - | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ - | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \ - | -uxpv* | -beos* | -mpeix* | -udk* \ - | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ - | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ - | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \ - | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ - | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ - | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ - | -skyos* | -haiku* | -rdos* | -toppers* | -drops*) - # Remember, each alternative MUST END IN *, to match a version number. - ;; - -qnx*) - case $basic_machine in - x86-* | i*86-*) - ;; - *) - os=-nto$os - ;; - esac - ;; - -nto-qnx*) - ;; - -nto*) - os=`echo $os | sed -e 's|nto|nto-qnx|'` - ;; - -sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \ - | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \ - | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*) - ;; - -mac*) - os=`echo $os | sed -e 's|mac|macos|'` - ;; - -linux-dietlibc) - os=-linux-dietlibc - ;; - -linux*) - os=`echo $os | sed -e 's|linux|linux-gnu|'` - ;; - -sunos5*) - os=`echo $os | sed -e 's|sunos5|solaris2|'` - ;; - -sunos6*) - os=`echo $os | sed -e 's|sunos6|solaris3|'` - ;; - -opened*) - os=-openedition - ;; - -os400*) - os=-os400 - ;; - -wince*) - os=-wince - ;; - -osfrose*) - os=-osfrose - ;; - -osf*) - os=-osf - ;; - -utek*) - os=-bsd - ;; - -dynix*) - os=-bsd - ;; - -acis*) - os=-aos - ;; - -atheos*) - os=-atheos - ;; - -syllable*) - os=-syllable - ;; - -386bsd) - os=-bsd - ;; - -ctix* | -uts*) - os=-sysv - ;; - -nova*) - os=-rtmk-nova - ;; - -ns2 ) - os=-nextstep2 - ;; - -nsk*) - os=-nsk - ;; - # Preserve the version number of sinix5. - -sinix5.*) - os=`echo $os | sed -e 's|sinix|sysv|'` - ;; - -sinix*) - os=-sysv4 - ;; - -tpf*) - os=-tpf - ;; - -triton*) - os=-sysv3 - ;; - -oss*) - os=-sysv3 - ;; - -svr4) - os=-sysv4 - ;; - -svr3) - os=-sysv3 - ;; - -sysvr4) - os=-sysv4 - ;; - # This must come after -sysvr4. - -sysv*) - ;; - -ose*) - os=-ose - ;; - -es1800*) - os=-ose - ;; - -xenix) - os=-xenix - ;; - -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) - os=-mint - ;; - -aros*) - os=-aros - ;; - -kaos*) - os=-kaos - ;; - -zvmoe) - os=-zvmoe - ;; - -dicos*) - os=-dicos - ;; - -none) - ;; - *) - # Get rid of the `-' at the beginning of $os. - os=`echo $os | sed 's/[^-]*-//'` - echo Invalid configuration \`$1\': system \`$os\' not recognized 1>&2 - exit 1 - ;; -esac -else - -# Here we handle the default operating systems that come with various machines. -# The value should be what the vendor currently ships out the door with their -# machine or put another way, the most popular os provided with the machine. - -# Note that if you're going to try to match "-MANUFACTURER" here (say, -# "-sun"), then you have to tell the case statement up towards the top -# that MANUFACTURER isn't an operating system. Otherwise, code above -# will signal an error saying that MANUFACTURER isn't an operating -# system, and we'll never get to this point. - -case $basic_machine in - score-*) - os=-elf - ;; - spu-*) - os=-elf - ;; - *-acorn) - os=-riscix1.2 - ;; - arm*-rebel) - os=-linux - ;; - arm*-semi) - os=-aout - ;; - c4x-* | tic4x-*) - os=-coff - ;; - # This must come before the *-dec entry. - pdp10-*) - os=-tops20 - ;; - pdp11-*) - os=-none - ;; - *-dec | vax-*) - os=-ultrix4.2 - ;; - m68*-apollo) - os=-domain - ;; - i386-sun) - os=-sunos4.0.2 - ;; - m68000-sun) - os=-sunos3 - # This also exists in the configure program, but was not the - # default. - # os=-sunos4 - ;; - m68*-cisco) - os=-aout - ;; - mep-*) - os=-elf - ;; - mips*-cisco) - os=-elf - ;; - mips*-*) - os=-elf - ;; - or32-*) - os=-coff - ;; - *-tti) # must be before sparc entry or we get the wrong os. - os=-sysv3 - ;; - sparc-* | *-sun) - os=-sunos4.1.1 - ;; - *-be) - os=-beos - ;; - *-haiku) - os=-haiku - ;; - *-ibm) - os=-aix - ;; - *-knuth) - os=-mmixware - ;; - *-wec) - os=-proelf - ;; - *-winbond) - os=-proelf - ;; - *-oki) - os=-proelf - ;; - *-hp) - os=-hpux - ;; - *-hitachi) - os=-hiux - ;; - i860-* | *-att | *-ncr | *-altos | *-motorola | *-convergent) - os=-sysv - ;; - *-cbm) - os=-amigaos - ;; - *-dg) - os=-dgux - ;; - *-dolphin) - os=-sysv3 - ;; - m68k-ccur) - os=-rtu - ;; - m88k-omron*) - os=-luna - ;; - *-next ) - os=-nextstep - ;; - *-sequent) - os=-ptx - ;; - *-crds) - os=-unos - ;; - *-ns) - os=-genix - ;; - i370-*) - os=-mvs - ;; - *-next) - os=-nextstep3 - ;; - *-gould) - os=-sysv - ;; - *-highlevel) - os=-bsd - ;; - *-encore) - os=-bsd - ;; - *-sgi) - os=-irix - ;; - *-siemens) - os=-sysv4 - ;; - *-masscomp) - os=-rtu - ;; - f30[01]-fujitsu | f700-fujitsu) - os=-uxpv - ;; - *-rom68k) - os=-coff - ;; - *-*bug) - os=-coff - ;; - *-apple) - os=-macos - ;; - *-atari*) - os=-mint - ;; - *) - os=-none - ;; -esac -fi - -# Here we handle the case where we know the os, and the CPU type, but not the -# manufacturer. We pick the logical manufacturer. -vendor=unknown -case $basic_machine in - *-unknown) - case $os in - -riscix*) - vendor=acorn - ;; - -sunos*) - vendor=sun - ;; - -aix*) - vendor=ibm - ;; - -beos*) - vendor=be - ;; - -hpux*) - vendor=hp - ;; - -mpeix*) - vendor=hp - ;; - -hiux*) - vendor=hitachi - ;; - -unos*) - vendor=crds - ;; - -dgux*) - vendor=dg - ;; - -luna*) - vendor=omron - ;; - -genix*) - vendor=ns - ;; - -mvs* | -opened*) - vendor=ibm - ;; - -os400*) - vendor=ibm - ;; - -ptx*) - vendor=sequent - ;; - -tpf*) - vendor=ibm - ;; - -vxsim* | -vxworks* | -windiss*) - vendor=wrs - ;; - -aux*) - vendor=apple - ;; - -hms*) - vendor=hitachi - ;; - -mpw* | -macos*) - vendor=apple - ;; - -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) - vendor=atari - ;; - -vos*) - vendor=stratus - ;; - esac - basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"` - ;; -esac - -echo $basic_machine$os -exit - -# Local variables: -# eval: (add-hook 'write-file-hooks 'time-stamp) -# time-stamp-start: "timestamp='" -# time-stamp-format: "%:y-%02m-%02d" -# time-stamp-end: "'" -# End: diff --git a/Build/source/utils/xindy/configure b/Build/source/utils/xindy/configure index 72db7eb611d..b765d554fab 100755 --- a/Build/source/utils/xindy/configure +++ b/Build/source/utils/xindy/configure @@ -749,9 +749,8 @@ ac_user_opts=' enable_option_checking enable_maintainer_mode enable_dependency_tracking -enable_make_rules -enable_docs -with_clisp +enable_xindy_make_rules +enable_xindy_docs with_xindy_recode ' ac_precious_vars='build_alias @@ -1397,16 +1396,16 @@ Optional Features: (and sometimes confusing) to the casual installer --disable-dependency-tracking speeds up one-time build --enable-dependency-tracking do not reject slow dependency extractors - --enable-make-rules build and install make-rules package (default is + --enable-xindy-make-rules + build and install make-rules package (default is YES) - --enable-docs build and install documentation (default is YES) + --enable-xindy-docs build and install documentation (default is YES) Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) - --with-clisp=... Use the specified location of the clisp executable - (default is search in PATH) - --with-xindy-recode Use `recode' instead of `iconv' (default is NO) + --with-xindy-recode For `xindy': use `recode' instead of `iconv' + (default is NO) Some influential environment variables: CC C compiler command @@ -1866,11 +1865,8 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $ ac_compiler_gnu=$ac_cv_c_compiler_gnu - -am__api_version='1.10' - ac_aux_dir= -for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do +for ac_dir in ../../build-aux "$srcdir"/../../build-aux; do if test -f "$ac_dir/install-sh"; then ac_aux_dir=$ac_dir ac_install_sh="$ac_aux_dir/install-sh -c" @@ -1886,8 +1882,8 @@ for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do fi done if test -z "$ac_aux_dir"; then - { { $as_echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&5 -$as_echo "$as_me: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&2;} + { { $as_echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in ../../build-aux \"$srcdir\"/../../build-aux" >&5 +$as_echo "$as_me: error: cannot find install-sh or install.sh in ../../build-aux \"$srcdir\"/../../build-aux" >&2;} { (exit 1); exit 1; }; } fi @@ -1900,6 +1896,9 @@ ac_config_sub="$SHELL $ac_aux_dir/config.sub" # Please don't use this var. ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. + +am__api_version='1.10' + # Find a good install program. We prefer a C program (faster), # so one script is as good as another. But avoid the broken or # incompatible versions: @@ -3826,32 +3825,28 @@ $as_echo "no" >&6; } fi -# Check whether --enable-make-rules was given. -if test "${enable_make_rules+set}" = set; then - enableval=$enable_make_rules; +# Include onfigure options that also appear at the top-level of the TL tree. +## utils/xindy/ac/xindy.ac: configure.ac fragment for the TeX Live subdirectory utils/xindy/ +## configure options for xindy +# Check whether --enable-xindy-make-rules was given. +if test "${enable_xindy_make_rules+set}" = set; then + enableval=$enable_xindy_make_rules; fi - -# Check whether --enable-docs was given. -if test "${enable_docs+set}" = set; then - enableval=$enable_docs; -fi - -# This option haqs been renamed --enable-native-texlive-build -# but should only inherited and not specified here -# AC_ARG_ENABLE(tetex-build, AS_HELP_STRING([--enable-tetex-build],[Build as part of a TeX Live installation])) - -# Check whether --with-clisp was given. -if test "${with_clisp+set}" = set; then - withval=$with_clisp; +# Check whether --enable-xindy-docs was given. +if test "${enable_xindy_docs+set}" = set; then + enableval=$enable_xindy_docs; fi - # Check whether --with-xindy-recode was given. if test "${with_xindy_recode+set}" = set; then withval=$with_xindy_recode; fi +# This option haqs been renamed --enable-native-texlive-build +# but should only be inherited and not specified here +# AC_ARG_ENABLE(tetex-build, AS_HELP_STRING([--enable-tetex-build],[Build as part of a TeX Live installation])) + if test "x$with_xindy_recode" != xyes; then CONVERT_FROM_UTF8="iconv -f UTF-8 -t " else @@ -3907,14 +3902,14 @@ $as_echo "$as_me: Using installation layout for TeX Live" >&6;} datadir="$prefix/texmf" docdir="$prefix/texmf/doc/$PACKAGE_NAME" mandir="$prefix/texmf/doc/man" - if test -z "$enable_docs"; then + if test -z "$enable_xindy_docs"; then { $as_echo "$as_me:$LINENO: Disabling docs building" >&5 $as_echo "$as_me: Disabling docs building" >&6;} - enable_docs=no; + enable_xindy_docs=no; fi -# if test -z "$enable_make_rules"; then +# if test -z "$enable_xindy_make_rules"; then # AC_MSG_NOTICE([Disabling make-rules building]) -# enable_make_rules=no; +# enable_xindy_make_rules=no; # fi else enable_native_texlive_build=no @@ -3928,7 +3923,7 @@ else fi -if test "x$enable_make_rules" != xno; then +if test "x$enable_xindy_make_rules" != xno; then for ac_prog in latex elatex lambda do @@ -3984,7 +3979,7 @@ fi fi - if test "x$enable_make_rules" != xno; then + if test "x$enable_xindy_make_rules" != xno; then BUILDRULES_TRUE= BUILDRULES_FALSE='#' else @@ -3993,7 +3988,7 @@ else fi -if test "x$enable_docs" != xno; then +if test "x$enable_xindy_docs" != xno; then for ac_prog in pdflatex do @@ -4049,7 +4044,7 @@ fi fi - if test "x$enable_docs" != xno; then + if test "x$enable_xindy_docs" != xno; then BUILDDOCS_TRUE= BUILDDOCS_FALSE='#' else @@ -4058,28 +4053,26 @@ else fi -CLISP= -if test "x$with_clisp" = xyes; then - # Extract the first word of "clisp", so it can be a program name with args. -set dummy clisp; ac_word=$2 +for ac_prog in clisp +do + # Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; ac_word=$2 { $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_CLISP+set}" = set; then +if test "${ac_cv_prog_CLISP+set}" = set; then $as_echo_n "(cached) " >&6 else - case $CLISP in - [\\/]* | ?:[\\/]*) - ac_cv_path_CLISP="$CLISP" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + if test -n "$CLISP"; then + ac_cv_prog_CLISP="$CLISP" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_path_CLISP="$as_dir/$ac_word$ac_exec_ext" + ac_cv_prog_CLISP="$ac_prog" $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi @@ -4087,10 +4080,9 @@ done done IFS=$as_save_IFS - ;; -esac fi -CLISP=$ac_cv_path_CLISP +fi +CLISP=$ac_cv_prog_CLISP if test -n "$CLISP"; then { $as_echo "$as_me:$LINENO: result: $CLISP" >&5 $as_echo "$CLISP" >&6; } @@ -4100,65 +4092,32 @@ $as_echo "no" >&6; } fi -elif test "x$with_clisp" = xno; then + test -n "$CLISP" && break +done +test -n "$CLISP" || CLISP="no" + +if test "x$CLISP" = xno; then if test "x$enable_build" = xno; then { $as_echo "$as_me:$LINENO: WARNING: building xindy has been disabled and would fail because ---without-clisp specified, but clisp is required" >&5 +clisp is required but not found in PATH. +Please install clisp or specify the clisp executable location +via the CLISP=... configure argument." >&5 $as_echo "$as_me: WARNING: building xindy has been disabled and would fail because ---without-clisp specified, but clisp is required" >&2;} +clisp is required but not found in PATH. +Please install clisp or specify the clisp executable location +via the CLISP=... configure argument." >&2;} else - { { $as_echo "$as_me:$LINENO: error: --without-clisp specified, but clisp is required" >&5 -$as_echo "$as_me: error: --without-clisp specified, but clisp is required" >&2;} + { { $as_echo "$as_me:$LINENO: error: clisp is required but not found in PATH. +Please install clisp or specify the clisp executable location +via the CLISP=... configure argument." >&5 +$as_echo "$as_me: error: clisp is required but not found in PATH. +Please install clisp or specify the clisp executable location +via the CLISP=... configure argument." >&2;} { (exit 1); exit 1; }; } fi -elif test -n "$with_clisp"; then - CLISP="$with_clisp" -else - # Extract the first word of "clisp", so it can be a program name with args. -set dummy clisp; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_CLISP+set}" = set; then - $as_echo_n "(cached) " >&6 -else - case $CLISP in - [\\/]* | ?:[\\/]*) - ac_cv_path_CLISP="$CLISP" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_path_CLISP="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - - ;; -esac -fi -CLISP=$ac_cv_path_CLISP -if test -n "$CLISP"; then - { $as_echo "$as_me:$LINENO: result: $CLISP" >&5 -$as_echo "$CLISP" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } -fi - - -fi - -if test -n "$CLISP"; then test -x "$CLISP" || if test "x$enable_build" = xno; then { $as_echo "$as_me:$LINENO: WARNING: building xindy has been disabled and would fail because clisp is not executable: $CLISP" >&5 @@ -4212,31 +4171,9 @@ $as_echo "$as_me: error: clisp is not usable: expected directory is not found: $ fi -else - if test "x$enable_build" = xno; then - { $as_echo "$as_me:$LINENO: WARNING: building xindy has been disabled and would fail because -clisp is required but not found in PATH. -Please install clisp or specify the clisp executable location -via the --with-clisp=... option." >&5 -$as_echo "$as_me: WARNING: building xindy has been disabled and would fail because -clisp is required but not found in PATH. -Please install clisp or specify the clisp executable location -via the --with-clisp=... option." >&2;} -else - { { $as_echo "$as_me:$LINENO: error: clisp is required but not found in PATH. -Please install clisp or specify the clisp executable location -via the --with-clisp=... option." >&5 -$as_echo "$as_me: error: clisp is required but not found in PATH. -Please install clisp or specify the clisp executable location -via the --with-clisp=... option." >&2;} - { (exit 1); exit 1; }; } fi -fi - - - if test "x$EXEEXT" = "x.exe"; then XINDY_RUN=xindy-lisp.exe diff --git a/Build/source/utils/xindy/configure.ac b/Build/source/utils/xindy/configure.ac index fb658d5dd3e..2f7ae1cbcf8 100644 --- a/Build/source/utils/xindy/configure.ac +++ b/Build/source/utils/xindy/configure.ac @@ -6,6 +6,9 @@ ## Copyright (C) 2004-2005 by Gour. ## Copyright (C) 2008 by Joachim Schrod. ## +## Adapted for TeX Live +## Copyright (C) 2009 Peter Breitenlohner +## ## This program is free software; you can redistribute it and/or ## modify it under the terms of the GNU General Public License as ## published by the Free Software Foundation; either version 2 of the @@ -21,10 +24,11 @@ ## Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ## Boston, MA 02110-1301 USA. -AC_PREREQ(2.60) +AC_PREREQ([2.63]) AC_INIT([xindy], [2.3], [xindy-discuss@lists.sourceforge.net]) +AC_CONFIG_AUX_DIR([../../build-aux]) -AM_INIT_AUTOMAKE([foreign]) +AM_INIT_AUTOMAKE([foreign dist-bzip2]) AM_MAINTAINER_MODE # Checks for programs. @@ -34,13 +38,12 @@ dnl test "x$LEX" != "x:" || AC_MSG_ERROR([flex or lex is required, but not found AC_PROG_INSTALL AC_PROG_MAKE_SET -AC_ARG_ENABLE(make-rules, AS_HELP_STRING([--enable-make-rules],[build and install make-rules package (default is YES)])) -AC_ARG_ENABLE(docs, AS_HELP_STRING([--enable-docs],[build and install documentation (default is YES)])) +# Include onfigure options that also appear at the top-level of the TL tree. +m4_include([ac/xindy.ac]) + # This option haqs been renamed --enable-native-texlive-build -# but should only inherited and not specified here +# but should only be inherited and not specified here # AC_ARG_ENABLE(tetex-build, AS_HELP_STRING([--enable-tetex-build],[Build as part of a TeX Live installation])) -AC_ARG_WITH(clisp, AS_HELP_STRING([--with-clisp=...],[Use the specified location of the clisp executable (default is search in PATH)])) -AC_ARG_WITH(xindy-recode, AS_HELP_STRING([--with-xindy-recode],[Use `recode' instead of `iconv' (default is NO)])) if test "x$with_xindy_recode" != xyes; then CONVERT_FROM_UTF8="iconv -f UTF-8 -t " @@ -58,56 +61,45 @@ if test "x$enable_native_texlive_build" = xyes; then datadir="$prefix/texmf" docdir="$prefix/texmf/doc/$PACKAGE_NAME" mandir="$prefix/texmf/doc/man" - if test -z "$enable_docs"; then + if test -z "$enable_xindy_docs"; then AC_MSG_NOTICE([Disabling docs building]) - enable_docs=no; + enable_xindy_docs=no; fi -# if test -z "$enable_make_rules"; then +# if test -z "$enable_xindy_make_rules"; then # AC_MSG_NOTICE([Disabling make-rules building]) -# enable_make_rules=no; +# enable_xindy_make_rules=no; # fi else enable_native_texlive_build=no fi AM_CONDITIONAL([TETEX_BUILD],[test "x$enable_native_texlive_build" = xyes]) -if test "x$enable_make_rules" != xno; then +if test "x$enable_xindy_make_rules" != xno; then AC_PROG_LATEX fi -AM_CONDITIONAL([BUILDRULES], [test "x$enable_make_rules" != xno]) +AM_CONDITIONAL([BUILDRULES], [test "x$enable_xindy_make_rules" != xno]) -if test "x$enable_docs" != xno; then +if test "x$enable_xindy_docs" != xno; then AC_PROG_PDFLATEX fi -AM_CONDITIONAL([BUILDDOCS], [test "x$enable_docs" != xno]) +AM_CONDITIONAL([BUILDDOCS], [test "x$enable_xindy_docs" != xno]) -CLISP= -if test "x$with_clisp" = xyes; then - AC_PATH_PROG(CLISP, clisp) -elif test "x$with_clisp" = xno; then - KPSE_MSG_ERROR([xindy], [--without-clisp specified, but clisp is required]) -elif test -n "$with_clisp"; then - CLISP="$with_clisp" +AC_CHECK_PROGS([CLISP], [clisp], [no]) +if test "x$CLISP" = xno; then + TL_MSG_ERROR([clisp is required but not found in PATH. +Please install clisp or specify the clisp executable location +via the CLISP=... configure argument.]) else - AC_PATH_PROG(CLISP, clisp) -fi - -if test -n "$CLISP"; then - test -x "$CLISP" || KPSE_MSG_ERROR([xindy], [clisp is not executable: $CLISP]) + test -x "$CLISP" || TL_MSG_ERROR([clisp is not executable: $CLISP]) AC_MSG_CHECKING([for clisp library directory]) CLISP_LIB=`$CLISP -q -norc -x '(progn (princ *lib-directory*) (values))'` AC_MSG_RESULT([$CLISP_LIB]) - test -f "$CLISP_LIB/clisp-link" || KPSE_MSG_ERROR([xindy], [clisp is not usable: expected file is not found: $CLISP_LIB/clisp-link]) - test -d "$CLISP_LIB/full" || KPSE_MSG_ERROR([xindy], [clisp is not usable: expected directory is not found: $CLISP_LIB/full]) - test -d "$CLISP_LIB/linkkit" || KPSE_MSG_ERROR([xindy], [clisp is not usable: expected directory is not found: $CLISP_LIB/linkkit]) -else - KPSE_MSG_ERROR([xindy], [clisp is required but not found in PATH. -Please install clisp or specify the clisp executable location -via the --with-clisp=... option.]) + test -f "$CLISP_LIB/clisp-link" || TL_MSG_ERROR([clisp is not usable: expected file is not found: $CLISP_LIB/clisp-link]) + test -d "$CLISP_LIB/full" || TL_MSG_ERROR([clisp is not usable: expected directory is not found: $CLISP_LIB/full]) + test -d "$CLISP_LIB/linkkit" || TL_MSG_ERROR([clisp is not usable: expected directory is not found: $CLISP_LIB/linkkit]) fi -AC_SUBST(CLISP) AC_SUBST(CLISP_LIB) dnl CLISP_LIB may end with a backslash (on mingw) _AM_SUBST_NOTMAKE(CLISP_LIB) diff --git a/Build/source/utils/xindy/depcomp b/Build/source/utils/xindy/depcomp deleted file mode 100755 index e5f9736c723..00000000000 --- a/Build/source/utils/xindy/depcomp +++ /dev/null @@ -1,589 +0,0 @@ -#! /bin/sh -# depcomp - compile a program generating dependencies as side-effects - -scriptversion=2007-03-29.01 - -# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007 Free Software -# Foundation, Inc. - -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU 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 General Public License for more details. - -# You should have received a copy of the GNU 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. - -# As a special exception to the GNU General Public License, if you -# distribute this file as part of a program that contains a -# configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. - -# Originally written by Alexandre Oliva . - -case $1 in - '') - echo "$0: No command. Try \`$0 --help' for more information." 1>&2 - exit 1; - ;; - -h | --h*) - cat <<\EOF -Usage: depcomp [--help] [--version] PROGRAM [ARGS] - -Run PROGRAMS ARGS to compile a file, generating dependencies -as side-effects. - -Environment variables: - depmode Dependency tracking mode. - source Source file read by `PROGRAMS ARGS'. - object Object file output by `PROGRAMS ARGS'. - DEPDIR directory where to store dependencies. - depfile Dependency file to output. - tmpdepfile Temporary file to use when outputing dependencies. - libtool Whether libtool is used (yes/no). - -Report bugs to . -EOF - exit $? - ;; - -v | --v*) - echo "depcomp $scriptversion" - exit $? - ;; -esac - -if test -z "$depmode" || test -z "$source" || test -z "$object"; then - echo "depcomp: Variables source, object and depmode must be set" 1>&2 - exit 1 -fi - -# Dependencies for sub/bar.o or sub/bar.obj go into sub/.deps/bar.Po. -depfile=${depfile-`echo "$object" | - sed 's|[^\\/]*$|'${DEPDIR-.deps}'/&|;s|\.\([^.]*\)$|.P\1|;s|Pobj$|Po|'`} -tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.\([^.]*\)$/.T\1/'`} - -rm -f "$tmpdepfile" - -# Some modes work just like other modes, but use different flags. We -# parameterize here, but still list the modes in the big case below, -# to make depend.m4 easier to write. Note that we *cannot* use a case -# here, because this file can only contain one case statement. -if test "$depmode" = hp; then - # HP compiler uses -M and no extra arg. - gccflag=-M - depmode=gcc -fi - -if test "$depmode" = dashXmstdout; then - # This is just like dashmstdout with a different argument. - dashmflag=-xM - depmode=dashmstdout -fi - -case "$depmode" in -gcc3) -## gcc 3 implements dependency tracking that does exactly what -## we want. Yay! Note: for some reason libtool 1.4 doesn't like -## it if -MD -MP comes after the -MF stuff. Hmm. -## Unfortunately, FreeBSD c89 acceptance of flags depends upon -## the command line argument order; so add the flags where they -## appear in depend2.am. Note that the slowdown incurred here -## affects only configure: in makefiles, %FASTDEP% shortcuts this. - for arg - do - case $arg in - -c) set fnord "$@" -MT "$object" -MD -MP -MF "$tmpdepfile" "$arg" ;; - *) set fnord "$@" "$arg" ;; - esac - shift # fnord - shift # $arg - done - "$@" - stat=$? - if test $stat -eq 0; then : - else - rm -f "$tmpdepfile" - exit $stat - fi - mv "$tmpdepfile" "$depfile" - ;; - -gcc) -## There are various ways to get dependency output from gcc. Here's -## why we pick this rather obscure method: -## - Don't want to use -MD because we'd like the dependencies to end -## up in a subdir. Having to rename by hand is ugly. -## (We might end up doing this anyway to support other compilers.) -## - The DEPENDENCIES_OUTPUT environment variable makes gcc act like -## -MM, not -M (despite what the docs say). -## - Using -M directly means running the compiler twice (even worse -## than renaming). - if test -z "$gccflag"; then - gccflag=-MD, - fi - "$@" -Wp,"$gccflag$tmpdepfile" - stat=$? - if test $stat -eq 0; then : - else - rm -f "$tmpdepfile" - exit $stat - fi - rm -f "$depfile" - echo "$object : \\" > "$depfile" - alpha=ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz -## The second -e expression handles DOS-style file names with drive letters. - sed -e 's/^[^:]*: / /' \ - -e 's/^['$alpha']:\/[^:]*: / /' < "$tmpdepfile" >> "$depfile" -## This next piece of magic avoids the `deleted header file' problem. -## The problem is that when a header file which appears in a .P file -## is deleted, the dependency causes make to die (because there is -## typically no way to rebuild the header). We avoid this by adding -## dummy dependencies for each header file. Too bad gcc doesn't do -## this for us directly. - tr ' ' ' -' < "$tmpdepfile" | -## Some versions of gcc put a space before the `:'. On the theory -## that the space means something, we add a space to the output as -## well. -## Some versions of the HPUX 10.20 sed can't process this invocation -## correctly. Breaking it into two sed invocations is a workaround. - sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile" - rm -f "$tmpdepfile" - ;; - -hp) - # This case exists only to let depend.m4 do its work. It works by - # looking at the text of this script. This case will never be run, - # since it is checked for above. - exit 1 - ;; - -sgi) - if test "$libtool" = yes; then - "$@" "-Wp,-MDupdate,$tmpdepfile" - else - "$@" -MDupdate "$tmpdepfile" - fi - stat=$? - if test $stat -eq 0; then : - else - rm -f "$tmpdepfile" - exit $stat - fi - rm -f "$depfile" - - if test -f "$tmpdepfile"; then # yes, the sourcefile depend on other files - echo "$object : \\" > "$depfile" - - # Clip off the initial element (the dependent). Don't try to be - # clever and replace this with sed code, as IRIX sed won't handle - # lines with more than a fixed number of characters (4096 in - # IRIX 6.2 sed, 8192 in IRIX 6.5). We also remove comment lines; - # the IRIX cc adds comments like `#:fec' to the end of the - # dependency line. - tr ' ' ' -' < "$tmpdepfile" \ - | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \ - tr ' -' ' ' >> $depfile - echo >> $depfile - - # The second pass generates a dummy entry for each header file. - tr ' ' ' -' < "$tmpdepfile" \ - | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \ - >> $depfile - else - # The sourcefile does not contain any dependencies, so just - # store a dummy comment line, to avoid errors with the Makefile - # "include basename.Plo" scheme. - echo "#dummy" > "$depfile" - fi - rm -f "$tmpdepfile" - ;; - -aix) - # The C for AIX Compiler uses -M and outputs the dependencies - # in a .u file. In older versions, this file always lives in the - # current directory. Also, the AIX compiler puts `$object:' at the - # start of each line; $object doesn't have directory information. - # Version 6 uses the directory in both cases. - dir=`echo "$object" | sed -e 's|/[^/]*$|/|'` - test "x$dir" = "x$object" && dir= - base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'` - if test "$libtool" = yes; then - tmpdepfile1=$dir$base.u - tmpdepfile2=$base.u - tmpdepfile3=$dir.libs/$base.u - "$@" -Wc,-M - else - tmpdepfile1=$dir$base.u - tmpdepfile2=$dir$base.u - tmpdepfile3=$dir$base.u - "$@" -M - fi - stat=$? - - if test $stat -eq 0; then : - else - rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" - exit $stat - fi - - for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" - do - test -f "$tmpdepfile" && break - done - if test -f "$tmpdepfile"; then - # Each line is of the form `foo.o: dependent.h'. - # Do two passes, one to just change these to - # `$object: dependent.h' and one to simply `dependent.h:'. - sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile" - # That's a tab and a space in the []. - sed -e 's,^.*\.[a-z]*:[ ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile" - else - # The sourcefile does not contain any dependencies, so just - # store a dummy comment line, to avoid errors with the Makefile - # "include basename.Plo" scheme. - echo "#dummy" > "$depfile" - fi - rm -f "$tmpdepfile" - ;; - -icc) - # Intel's C compiler understands `-MD -MF file'. However on - # icc -MD -MF foo.d -c -o sub/foo.o sub/foo.c - # ICC 7.0 will fill foo.d with something like - # foo.o: sub/foo.c - # foo.o: sub/foo.h - # which is wrong. We want: - # sub/foo.o: sub/foo.c - # sub/foo.o: sub/foo.h - # sub/foo.c: - # sub/foo.h: - # ICC 7.1 will output - # foo.o: sub/foo.c sub/foo.h - # and will wrap long lines using \ : - # foo.o: sub/foo.c ... \ - # sub/foo.h ... \ - # ... - - "$@" -MD -MF "$tmpdepfile" - stat=$? - if test $stat -eq 0; then : - else - rm -f "$tmpdepfile" - exit $stat - fi - rm -f "$depfile" - # Each line is of the form `foo.o: dependent.h', - # or `foo.o: dep1.h dep2.h \', or ` dep3.h dep4.h \'. - # Do two passes, one to just change these to - # `$object: dependent.h' and one to simply `dependent.h:'. - sed "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile" - # Some versions of the HPUX 10.20 sed can't process this invocation - # correctly. Breaking it into two sed invocations is a workaround. - sed 's,^[^:]*: \(.*\)$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" | - sed -e 's/$/ :/' >> "$depfile" - rm -f "$tmpdepfile" - ;; - -hp2) - # The "hp" stanza above does not work with aCC (C++) and HP's ia64 - # compilers, which have integrated preprocessors. The correct option - # to use with these is +Maked; it writes dependencies to a file named - # 'foo.d', which lands next to the object file, wherever that - # happens to be. - # Much of this is similar to the tru64 case; see comments there. - dir=`echo "$object" | sed -e 's|/[^/]*$|/|'` - test "x$dir" = "x$object" && dir= - base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'` - if test "$libtool" = yes; then - tmpdepfile1=$dir$base.d - tmpdepfile2=$dir.libs/$base.d - "$@" -Wc,+Maked - else - tmpdepfile1=$dir$base.d - tmpdepfile2=$dir$base.d - "$@" +Maked - fi - stat=$? - if test $stat -eq 0; then : - else - rm -f "$tmpdepfile1" "$tmpdepfile2" - exit $stat - fi - - for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" - do - test -f "$tmpdepfile" && break - done - if test -f "$tmpdepfile"; then - sed -e "s,^.*\.[a-z]*:,$object:," "$tmpdepfile" > "$depfile" - # Add `dependent.h:' lines. - sed -ne '2,${; s/^ *//; s/ \\*$//; s/$/:/; p;}' "$tmpdepfile" >> "$depfile" - else - echo "#dummy" > "$depfile" - fi - rm -f "$tmpdepfile" "$tmpdepfile2" - ;; - -tru64) - # The Tru64 compiler uses -MD to generate dependencies as a side - # effect. `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'. - # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put - # dependencies in `foo.d' instead, so we check for that too. - # Subdirectories are respected. - dir=`echo "$object" | sed -e 's|/[^/]*$|/|'` - test "x$dir" = "x$object" && dir= - base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'` - - if test "$libtool" = yes; then - # With Tru64 cc, shared objects can also be used to make a - # static library. This mechanism is used in libtool 1.4 series to - # handle both shared and static libraries in a single compilation. - # With libtool 1.4, dependencies were output in $dir.libs/$base.lo.d. - # - # With libtool 1.5 this exception was removed, and libtool now - # generates 2 separate objects for the 2 libraries. These two - # compilations output dependencies in $dir.libs/$base.o.d and - # in $dir$base.o.d. We have to check for both files, because - # one of the two compilations can be disabled. We should prefer - # $dir$base.o.d over $dir.libs/$base.o.d because the latter is - # automatically cleaned when .libs/ is deleted, while ignoring - # the former would cause a distcleancheck panic. - tmpdepfile1=$dir.libs/$base.lo.d # libtool 1.4 - tmpdepfile2=$dir$base.o.d # libtool 1.5 - tmpdepfile3=$dir.libs/$base.o.d # libtool 1.5 - tmpdepfile4=$dir.libs/$base.d # Compaq CCC V6.2-504 - "$@" -Wc,-MD - else - tmpdepfile1=$dir$base.o.d - tmpdepfile2=$dir$base.d - tmpdepfile3=$dir$base.d - tmpdepfile4=$dir$base.d - "$@" -MD - fi - - stat=$? - if test $stat -eq 0; then : - else - rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4" - exit $stat - fi - - for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4" - do - test -f "$tmpdepfile" && break - done - if test -f "$tmpdepfile"; then - sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile" - # That's a tab and a space in the []. - sed -e 's,^.*\.[a-z]*:[ ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile" - else - echo "#dummy" > "$depfile" - fi - rm -f "$tmpdepfile" - ;; - -#nosideeffect) - # This comment above is used by automake to tell side-effect - # dependency tracking mechanisms from slower ones. - -dashmstdout) - # Important note: in order to support this mode, a compiler *must* - # always write the preprocessed file to stdout, regardless of -o. - "$@" || exit $? - - # Remove the call to Libtool. - if test "$libtool" = yes; then - while test $1 != '--mode=compile'; do - shift - done - shift - fi - - # Remove `-o $object'. - IFS=" " - for arg - do - case $arg in - -o) - shift - ;; - $object) - shift - ;; - *) - set fnord "$@" "$arg" - shift # fnord - shift # $arg - ;; - esac - done - - test -z "$dashmflag" && dashmflag=-M - # Require at least two characters before searching for `:' - # in the target name. This is to cope with DOS-style filenames: - # a dependency such as `c:/foo/bar' could be seen as target `c' otherwise. - "$@" $dashmflag | - sed 's:^[ ]*[^: ][^:][^:]*\:[ ]*:'"$object"'\: :' > "$tmpdepfile" - rm -f "$depfile" - cat < "$tmpdepfile" > "$depfile" - tr ' ' ' -' < "$tmpdepfile" | \ -## Some versions of the HPUX 10.20 sed can't process this invocation -## correctly. Breaking it into two sed invocations is a workaround. - sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile" - rm -f "$tmpdepfile" - ;; - -dashXmstdout) - # This case only exists to satisfy depend.m4. It is never actually - # run, as this mode is specially recognized in the preamble. - exit 1 - ;; - -makedepend) - "$@" || exit $? - # Remove any Libtool call - if test "$libtool" = yes; then - while test $1 != '--mode=compile'; do - shift - done - shift - fi - # X makedepend - shift - cleared=no - for arg in "$@"; do - case $cleared in - no) - set ""; shift - cleared=yes ;; - esac - case "$arg" in - -D*|-I*) - set fnord "$@" "$arg"; shift ;; - # Strip any option that makedepend may not understand. Remove - # the object too, otherwise makedepend will parse it as a source file. - -*|$object) - ;; - *) - set fnord "$@" "$arg"; shift ;; - esac - done - obj_suffix="`echo $object | sed 's/^.*\././'`" - touch "$tmpdepfile" - ${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@" - rm -f "$depfile" - cat < "$tmpdepfile" > "$depfile" - sed '1,2d' "$tmpdepfile" | tr ' ' ' -' | \ -## Some versions of the HPUX 10.20 sed can't process this invocation -## correctly. Breaking it into two sed invocations is a workaround. - sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile" - rm -f "$tmpdepfile" "$tmpdepfile".bak - ;; - -cpp) - # Important note: in order to support this mode, a compiler *must* - # always write the preprocessed file to stdout. - "$@" || exit $? - - # Remove the call to Libtool. - if test "$libtool" = yes; then - while test $1 != '--mode=compile'; do - shift - done - shift - fi - - # Remove `-o $object'. - IFS=" " - for arg - do - case $arg in - -o) - shift - ;; - $object) - shift - ;; - *) - set fnord "$@" "$arg" - shift # fnord - shift # $arg - ;; - esac - done - - "$@" -E | - sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \ - -e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' | - sed '$ s: \\$::' > "$tmpdepfile" - rm -f "$depfile" - echo "$object : \\" > "$depfile" - cat < "$tmpdepfile" >> "$depfile" - sed < "$tmpdepfile" '/^$/d;s/^ //;s/ \\$//;s/$/ :/' >> "$depfile" - rm -f "$tmpdepfile" - ;; - -msvisualcpp) - # Important note: in order to support this mode, a compiler *must* - # always write the preprocessed file to stdout, regardless of -o, - # because we must use -o when running libtool. - "$@" || exit $? - IFS=" " - for arg - do - case "$arg" in - "-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI") - set fnord "$@" - shift - shift - ;; - *) - set fnord "$@" "$arg" - shift - shift - ;; - esac - done - "$@" -E | - sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::echo "`cygpath -u \\"\1\\"`":p' | sort | uniq > "$tmpdepfile" - rm -f "$depfile" - echo "$object : \\" > "$depfile" - . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s:: \1 \\:p' >> "$depfile" - echo " " >> "$depfile" - . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s::\1\::p' >> "$depfile" - rm -f "$tmpdepfile" - ;; - -none) - exec "$@" - ;; - -*) - echo "Unknown depmode $depmode" 1>&2 - exit 1 - ;; -esac - -exit 0 - -# Local Variables: -# mode: shell-script -# sh-indentation: 2 -# eval: (add-hook 'write-file-hooks 'time-stamp) -# time-stamp-start: "scriptversion=" -# time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-end: "$" -# End: diff --git a/Build/source/utils/xindy/doc/Makefile.in b/Build/source/utils/xindy/doc/Makefile.in index 8229e7be40b..1f264bcf9e5 100644 --- a/Build/source/utils/xindy/doc/Makefile.in +++ b/Build/source/utils/xindy/doc/Makefile.in @@ -36,9 +36,9 @@ subdir = doc DIST_COMMON = README $(dist_noinst_DATA) $(srcdir)/Makefile.am \ $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-common.m4 \ - $(top_srcdir)/m4/ac_prog_latex.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4/ac_prog_latex.m4 \ $(top_srcdir)/m4/ac_prog_pdflatex.m4 \ + $(top_srcdir)/m4/tl_msg_error.m4 $(top_srcdir)/ac/xindy.ac \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) diff --git a/Build/source/utils/xindy/doc/style-tutorial/Makefile.in b/Build/source/utils/xindy/doc/style-tutorial/Makefile.in index 4ca9d1d24d4..37c97f4112f 100644 --- a/Build/source/utils/xindy/doc/style-tutorial/Makefile.in +++ b/Build/source/utils/xindy/doc/style-tutorial/Makefile.in @@ -35,9 +35,9 @@ host_triplet = @host@ subdir = doc/style-tutorial DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-common.m4 \ - $(top_srcdir)/m4/ac_prog_latex.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4/ac_prog_latex.m4 \ $(top_srcdir)/m4/ac_prog_pdflatex.m4 \ + $(top_srcdir)/m4/tl_msg_error.m4 $(top_srcdir)/ac/xindy.ac \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) diff --git a/Build/source/utils/xindy/install-sh b/Build/source/utils/xindy/install-sh deleted file mode 100755 index 6781b987bdb..00000000000 --- a/Build/source/utils/xindy/install-sh +++ /dev/null @@ -1,520 +0,0 @@ -#!/bin/sh -# install - install a program, script, or datafile - -scriptversion=2009-04-28.21; # UTC - -# This originates from X11R5 (mit/util/scripts/install.sh), which was -# later released in X11R6 (xc/config/util/install.sh) with the -# following copyright and license. -# -# Copyright (C) 1994 X Consortium -# -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documentation files (the "Software"), to -# deal in the Software without restriction, including without limitation the -# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or -# sell copies of the Software, and to permit persons to whom the Software is -# furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in -# all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN -# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC- -# TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -# -# Except as contained in this notice, the name of the X Consortium shall not -# be used in advertising or otherwise to promote the sale, use or other deal- -# ings in this Software without prior written authorization from the X Consor- -# tium. -# -# -# FSF changes to this file are in the public domain. -# -# Calling this script install-sh is preferred over install.sh, to prevent -# `make' implicit rules from creating a file called install from it -# when there is no Makefile. -# -# This script is compatible with the BSD install script, but was written -# from scratch. - -nl=' -' -IFS=" "" $nl" - -# set DOITPROG to echo to test this script - -# Don't use :- since 4.3BSD and earlier shells don't like it. -doit=${DOITPROG-} -if test -z "$doit"; then - doit_exec=exec -else - doit_exec=$doit -fi - -# Put in absolute file names if you don't have them in your path; -# or use environment vars. - -chgrpprog=${CHGRPPROG-chgrp} -chmodprog=${CHMODPROG-chmod} -chownprog=${CHOWNPROG-chown} -cmpprog=${CMPPROG-cmp} -cpprog=${CPPROG-cp} -mkdirprog=${MKDIRPROG-mkdir} -mvprog=${MVPROG-mv} -rmprog=${RMPROG-rm} -stripprog=${STRIPPROG-strip} - -posix_glob='?' -initialize_posix_glob=' - test "$posix_glob" != "?" || { - if (set -f) 2>/dev/null; then - posix_glob= - else - posix_glob=: - fi - } -' - -posix_mkdir= - -# Desired mode of installed file. -mode=0755 - -chgrpcmd= -chmodcmd=$chmodprog -chowncmd= -mvcmd=$mvprog -rmcmd="$rmprog -f" -stripcmd= - -src= -dst= -dir_arg= -dst_arg= - -copy_on_change=false -no_target_directory= - -usage="\ -Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE - or: $0 [OPTION]... SRCFILES... DIRECTORY - or: $0 [OPTION]... -t DIRECTORY SRCFILES... - or: $0 [OPTION]... -d DIRECTORIES... - -In the 1st form, copy SRCFILE to DSTFILE. -In the 2nd and 3rd, copy all SRCFILES to DIRECTORY. -In the 4th, create DIRECTORIES. - -Options: - --help display this help and exit. - --version display version info and exit. - - -c (ignored) - -C install only if different (preserve the last data modification time) - -d create directories instead of installing files. - -g GROUP $chgrpprog installed files to GROUP. - -m MODE $chmodprog installed files to MODE. - -o USER $chownprog installed files to USER. - -s $stripprog installed files. - -t DIRECTORY install into DIRECTORY. - -T report an error if DSTFILE is a directory. - -Environment variables override the default commands: - CHGRPPROG CHMODPROG CHOWNPROG CMPPROG CPPROG MKDIRPROG MVPROG - RMPROG STRIPPROG -" - -while test $# -ne 0; do - case $1 in - -c) ;; - - -C) copy_on_change=true;; - - -d) dir_arg=true;; - - -g) chgrpcmd="$chgrpprog $2" - shift;; - - --help) echo "$usage"; exit $?;; - - -m) mode=$2 - case $mode in - *' '* | *' '* | *' -'* | *'*'* | *'?'* | *'['*) - echo "$0: invalid mode: $mode" >&2 - exit 1;; - esac - shift;; - - -o) chowncmd="$chownprog $2" - shift;; - - -s) stripcmd=$stripprog;; - - -t) dst_arg=$2 - shift;; - - -T) no_target_directory=true;; - - --version) echo "$0 $scriptversion"; exit $?;; - - --) shift - break;; - - -*) echo "$0: invalid option: $1" >&2 - exit 1;; - - *) break;; - esac - shift -done - -if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then - # When -d is used, all remaining arguments are directories to create. - # When -t is used, the destination is already specified. - # Otherwise, the last argument is the destination. Remove it from $@. - for arg - do - if test -n "$dst_arg"; then - # $@ is not empty: it contains at least $arg. - set fnord "$@" "$dst_arg" - shift # fnord - fi - shift # arg - dst_arg=$arg - done -fi - -if test $# -eq 0; then - if test -z "$dir_arg"; then - echo "$0: no input file specified." >&2 - exit 1 - fi - # It's OK to call `install-sh -d' without argument. - # This can happen when creating conditional directories. - exit 0 -fi - -if test -z "$dir_arg"; then - trap '(exit $?); exit' 1 2 13 15 - - # Set umask so as not to create temps with too-generous modes. - # However, 'strip' requires both read and write access to temps. - case $mode in - # Optimize common cases. - *644) cp_umask=133;; - *755) cp_umask=22;; - - *[0-7]) - if test -z "$stripcmd"; then - u_plus_rw= - else - u_plus_rw='% 200' - fi - cp_umask=`expr '(' 777 - $mode % 1000 ')' $u_plus_rw`;; - *) - if test -z "$stripcmd"; then - u_plus_rw= - else - u_plus_rw=,u+rw - fi - cp_umask=$mode$u_plus_rw;; - esac -fi - -for src -do - # Protect names starting with `-'. - case $src in - -*) src=./$src;; - esac - - if test -n "$dir_arg"; then - dst=$src - dstdir=$dst - test -d "$dstdir" - dstdir_status=$? - else - - # Waiting for this to be detected by the "$cpprog $src $dsttmp" command - # might cause directories to be created, which would be especially bad - # if $src (and thus $dsttmp) contains '*'. - if test ! -f "$src" && test ! -d "$src"; then - echo "$0: $src does not exist." >&2 - exit 1 - fi - - if test -z "$dst_arg"; then - echo "$0: no destination specified." >&2 - exit 1 - fi - - dst=$dst_arg - # Protect names starting with `-'. - case $dst in - -*) dst=./$dst;; - esac - - # If destination is a directory, append the input filename; won't work - # if double slashes aren't ignored. - if test -d "$dst"; then - if test -n "$no_target_directory"; then - echo "$0: $dst_arg: Is a directory" >&2 - exit 1 - fi - dstdir=$dst - dst=$dstdir/`basename "$src"` - dstdir_status=0 - else - # Prefer dirname, but fall back on a substitute if dirname fails. - dstdir=` - (dirname "$dst") 2>/dev/null || - expr X"$dst" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$dst" : 'X\(//\)[^/]' \| \ - X"$dst" : 'X\(//\)$' \| \ - X"$dst" : 'X\(/\)' \| . 2>/dev/null || - echo X"$dst" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ - s//\1/ - q - } - /^X\(\/\/\)[^/].*/{ - s//\1/ - q - } - /^X\(\/\/\)$/{ - s//\1/ - q - } - /^X\(\/\).*/{ - s//\1/ - q - } - s/.*/./; q' - ` - - test -d "$dstdir" - dstdir_status=$? - fi - fi - - obsolete_mkdir_used=false - - if test $dstdir_status != 0; then - case $posix_mkdir in - '') - # Create intermediate dirs using mode 755 as modified by the umask. - # This is like FreeBSD 'install' as of 1997-10-28. - umask=`umask` - case $stripcmd.$umask in - # Optimize common cases. - *[2367][2367]) mkdir_umask=$umask;; - .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;; - - *[0-7]) - mkdir_umask=`expr $umask + 22 \ - - $umask % 100 % 40 + $umask % 20 \ - - $umask % 10 % 4 + $umask % 2 - `;; - *) mkdir_umask=$umask,go-w;; - esac - - # With -d, create the new directory with the user-specified mode. - # Otherwise, rely on $mkdir_umask. - if test -n "$dir_arg"; then - mkdir_mode=-m$mode - else - mkdir_mode= - fi - - posix_mkdir=false - case $umask in - *[123567][0-7][0-7]) - # POSIX mkdir -p sets u+wx bits regardless of umask, which - # is incompatible with FreeBSD 'install' when (umask & 300) != 0. - ;; - *) - tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$ - trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0 - - if (umask $mkdir_umask && - exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1 - then - if test -z "$dir_arg" || { - # Check for POSIX incompatibilities with -m. - # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or - # other-writeable bit of parent directory when it shouldn't. - # FreeBSD 6.1 mkdir -m -p sets mode of existing directory. - ls_ld_tmpdir=`ls -ld "$tmpdir"` - case $ls_ld_tmpdir in - d????-?r-*) different_mode=700;; - d????-?--*) different_mode=755;; - *) false;; - esac && - $mkdirprog -m$different_mode -p -- "$tmpdir" && { - ls_ld_tmpdir_1=`ls -ld "$tmpdir"` - test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1" - } - } - then posix_mkdir=: - fi - rmdir "$tmpdir/d" "$tmpdir" - else - # Remove any dirs left behind by ancient mkdir implementations. - rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null - fi - trap '' 0;; - esac;; - esac - - if - $posix_mkdir && ( - umask $mkdir_umask && - $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir" - ) - then : - else - - # The umask is ridiculous, or mkdir does not conform to POSIX, - # or it failed possibly due to a race condition. Create the - # directory the slow way, step by step, checking for races as we go. - - case $dstdir in - /*) prefix='/';; - -*) prefix='./';; - *) prefix='';; - esac - - eval "$initialize_posix_glob" - - oIFS=$IFS - IFS=/ - $posix_glob set -f - set fnord $dstdir - shift - $posix_glob set +f - IFS=$oIFS - - prefixes= - - for d - do - test -z "$d" && continue - - prefix=$prefix$d - if test -d "$prefix"; then - prefixes= - else - if $posix_mkdir; then - (umask=$mkdir_umask && - $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break - # Don't fail if two instances are running concurrently. - test -d "$prefix" || exit 1 - else - case $prefix in - *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;; - *) qprefix=$prefix;; - esac - prefixes="$prefixes '$qprefix'" - fi - fi - prefix=$prefix/ - done - - if test -n "$prefixes"; then - # Don't fail if two instances are running concurrently. - (umask $mkdir_umask && - eval "\$doit_exec \$mkdirprog $prefixes") || - test -d "$dstdir" || exit 1 - obsolete_mkdir_used=true - fi - fi - fi - - if test -n "$dir_arg"; then - { test -z "$chowncmd" || $doit $chowncmd "$dst"; } && - { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } && - { test "$obsolete_mkdir_used$chowncmd$chgrpcmd" = false || - test -z "$chmodcmd" || $doit $chmodcmd $mode "$dst"; } || exit 1 - else - - # Make a couple of temp file names in the proper directory. - dsttmp=$dstdir/_inst.$$_ - rmtmp=$dstdir/_rm.$$_ - - # Trap to clean up those temp files at exit. - trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0 - - # Copy the file name to the temp name. - (umask $cp_umask && $doit_exec $cpprog "$src" "$dsttmp") && - - # and set any options; do chmod last to preserve setuid bits. - # - # If any of these fail, we abort the whole thing. If we want to - # ignore errors from any of these, just make sure not to ignore - # errors from the above "$doit $cpprog $src $dsttmp" command. - # - { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } && - { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } && - { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } && - { test -z "$chmodcmd" || $doit $chmodcmd $mode "$dsttmp"; } && - - # If -C, don't bother to copy if it wouldn't change the file. - if $copy_on_change && - old=`LC_ALL=C ls -dlL "$dst" 2>/dev/null` && - new=`LC_ALL=C ls -dlL "$dsttmp" 2>/dev/null` && - - eval "$initialize_posix_glob" && - $posix_glob set -f && - set X $old && old=:$2:$4:$5:$6 && - set X $new && new=:$2:$4:$5:$6 && - $posix_glob set +f && - - test "$old" = "$new" && - $cmpprog "$dst" "$dsttmp" >/dev/null 2>&1 - then - rm -f "$dsttmp" - else - # Rename the file to the real destination. - $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null || - - # The rename failed, perhaps because mv can't rename something else - # to itself, or perhaps because mv is so ancient that it does not - # support -f. - { - # Now remove or move aside any old file at destination location. - # We try this two ways since rm can't unlink itself on some - # systems and the destination file might be busy for other - # reasons. In this case, the final cleanup might fail but the new - # file should still install successfully. - { - test ! -f "$dst" || - $doit $rmcmd -f "$dst" 2>/dev/null || - { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null && - { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; } - } || - { echo "$0: cannot unlink or rename $dst" >&2 - (exit 1); exit 1 - } - } && - - # Now rename the file to the real destination. - $doit $mvcmd "$dsttmp" "$dst" - } - fi || exit 1 - - trap '' 0 - fi -done - -# Local variables: -# eval: (add-hook 'write-file-hooks 'time-stamp) -# time-stamp-start: "scriptversion=" -# time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-time-zone: "UTC" -# time-stamp-end: "; # UTC" -# End: diff --git a/Build/source/utils/xindy/m4/tl_msg_error.m4 b/Build/source/utils/xindy/m4/tl_msg_error.m4 new file mode 100644 index 00000000000..da9f31da629 --- /dev/null +++ b/Build/source/utils/xindy/m4/tl_msg_error.m4 @@ -0,0 +1,23 @@ +# Public macros for the TeX Live (TL) subdirectory utils/xindy/. +# Copyright (C) 2009 Peter Breitenlohner +# +# This file is free software; the copyright holders +# give unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# serial 0 + +# TL_MSG_ERROR(ERROR, [EXIT-STATUS = 1]) +# -------------------------------------- +# Same as AC_MSG_ERROR(ERROR, EXIT-STATUS), except when configuring with +# --disable-build (in the TL tree when building xindy has been disabled). +# +# The new (2009) TL build system requires all directories to be configured +# for the benefit of 'dist*' Make targets. When building xindy has been +# disabled, configuring must not fail because, e.g., clisp is missing. +AC_DEFUN([TL_MSG_ERROR], +[AS_IF([test "x$enable_build" = xno], + [AC_MSG_WARN([building xindy has been disabled and would fail because +$1])], + [AC_MSG_ERROR($@)]) +]) # TL_MSG_ERROR diff --git a/Build/source/utils/xindy/make-rules/Makefile.in b/Build/source/utils/xindy/make-rules/Makefile.in index fc9a0e26890..a217dba0311 100644 --- a/Build/source/utils/xindy/make-rules/Makefile.in +++ b/Build/source/utils/xindy/make-rules/Makefile.in @@ -34,9 +34,9 @@ host_triplet = @host@ subdir = make-rules DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-common.m4 \ - $(top_srcdir)/m4/ac_prog_latex.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4/ac_prog_latex.m4 \ $(top_srcdir)/m4/ac_prog_pdflatex.m4 \ + $(top_srcdir)/m4/tl_msg_error.m4 $(top_srcdir)/ac/xindy.ac \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) diff --git a/Build/source/utils/xindy/make-rules/alphabets/Makefile.in b/Build/source/utils/xindy/make-rules/alphabets/Makefile.in index c9f47e34ee4..e3d0f3c71fd 100644 --- a/Build/source/utils/xindy/make-rules/alphabets/Makefile.in +++ b/Build/source/utils/xindy/make-rules/alphabets/Makefile.in @@ -35,9 +35,9 @@ host_triplet = @host@ subdir = make-rules/alphabets DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-common.m4 \ - $(top_srcdir)/m4/ac_prog_latex.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4/ac_prog_latex.m4 \ $(top_srcdir)/m4/ac_prog_pdflatex.m4 \ + $(top_srcdir)/m4/tl_msg_error.m4 $(top_srcdir)/ac/xindy.ac \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) diff --git a/Build/source/utils/xindy/make-rules/alphabets/albanian/Makefile.in b/Build/source/utils/xindy/make-rules/alphabets/albanian/Makefile.in index b2b600cc17b..18690f2e1d2 100644 --- a/Build/source/utils/xindy/make-rules/alphabets/albanian/Makefile.in +++ b/Build/source/utils/xindy/make-rules/alphabets/albanian/Makefile.in @@ -34,9 +34,9 @@ host_triplet = @host@ subdir = make-rules/alphabets/albanian DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-common.m4 \ - $(top_srcdir)/m4/ac_prog_latex.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4/ac_prog_latex.m4 \ $(top_srcdir)/m4/ac_prog_pdflatex.m4 \ + $(top_srcdir)/m4/tl_msg_error.m4 $(top_srcdir)/ac/xindy.ac \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) diff --git a/Build/source/utils/xindy/make-rules/alphabets/belarusian/Makefile.in b/Build/source/utils/xindy/make-rules/alphabets/belarusian/Makefile.in index 1106c47031b..3fdd302fc9e 100644 --- a/Build/source/utils/xindy/make-rules/alphabets/belarusian/Makefile.in +++ b/Build/source/utils/xindy/make-rules/alphabets/belarusian/Makefile.in @@ -34,9 +34,9 @@ host_triplet = @host@ subdir = make-rules/alphabets/belarusian DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-common.m4 \ - $(top_srcdir)/m4/ac_prog_latex.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4/ac_prog_latex.m4 \ $(top_srcdir)/m4/ac_prog_pdflatex.m4 \ + $(top_srcdir)/m4/tl_msg_error.m4 $(top_srcdir)/ac/xindy.ac \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) diff --git a/Build/source/utils/xindy/make-rules/alphabets/bulgarian/Makefile.in b/Build/source/utils/xindy/make-rules/alphabets/bulgarian/Makefile.in index 14972ffa11b..1d1eb9fc65f 100644 --- a/Build/source/utils/xindy/make-rules/alphabets/bulgarian/Makefile.in +++ b/Build/source/utils/xindy/make-rules/alphabets/bulgarian/Makefile.in @@ -34,9 +34,9 @@ host_triplet = @host@ subdir = make-rules/alphabets/bulgarian DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-common.m4 \ - $(top_srcdir)/m4/ac_prog_latex.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4/ac_prog_latex.m4 \ $(top_srcdir)/m4/ac_prog_pdflatex.m4 \ + $(top_srcdir)/m4/tl_msg_error.m4 $(top_srcdir)/ac/xindy.ac \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) diff --git a/Build/source/utils/xindy/make-rules/alphabets/croatian/Makefile.in b/Build/source/utils/xindy/make-rules/alphabets/croatian/Makefile.in index a4b0c84ff1a..4fcd5caedae 100644 --- a/Build/source/utils/xindy/make-rules/alphabets/croatian/Makefile.in +++ b/Build/source/utils/xindy/make-rules/alphabets/croatian/Makefile.in @@ -34,9 +34,9 @@ host_triplet = @host@ subdir = make-rules/alphabets/croatian DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-common.m4 \ - $(top_srcdir)/m4/ac_prog_latex.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4/ac_prog_latex.m4 \ $(top_srcdir)/m4/ac_prog_pdflatex.m4 \ + $(top_srcdir)/m4/tl_msg_error.m4 $(top_srcdir)/ac/xindy.ac \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) diff --git a/Build/source/utils/xindy/make-rules/alphabets/czech/Makefile.in b/Build/source/utils/xindy/make-rules/alphabets/czech/Makefile.in index d02dbdbbfb1..a665dc7ce53 100644 --- a/Build/source/utils/xindy/make-rules/alphabets/czech/Makefile.in +++ b/Build/source/utils/xindy/make-rules/alphabets/czech/Makefile.in @@ -34,9 +34,9 @@ host_triplet = @host@ subdir = make-rules/alphabets/czech DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-common.m4 \ - $(top_srcdir)/m4/ac_prog_latex.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4/ac_prog_latex.m4 \ $(top_srcdir)/m4/ac_prog_pdflatex.m4 \ + $(top_srcdir)/m4/tl_msg_error.m4 $(top_srcdir)/ac/xindy.ac \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) diff --git a/Build/source/utils/xindy/make-rules/alphabets/danish/Makefile.in b/Build/source/utils/xindy/make-rules/alphabets/danish/Makefile.in index 5744d32d219..1e6b0d5b7f2 100644 --- a/Build/source/utils/xindy/make-rules/alphabets/danish/Makefile.in +++ b/Build/source/utils/xindy/make-rules/alphabets/danish/Makefile.in @@ -34,9 +34,9 @@ host_triplet = @host@ subdir = make-rules/alphabets/danish DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-common.m4 \ - $(top_srcdir)/m4/ac_prog_latex.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4/ac_prog_latex.m4 \ $(top_srcdir)/m4/ac_prog_pdflatex.m4 \ + $(top_srcdir)/m4/tl_msg_error.m4 $(top_srcdir)/ac/xindy.ac \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) diff --git a/Build/source/utils/xindy/make-rules/alphabets/dutch/Makefile.in b/Build/source/utils/xindy/make-rules/alphabets/dutch/Makefile.in index a4546c8a0d3..525045ba93c 100644 --- a/Build/source/utils/xindy/make-rules/alphabets/dutch/Makefile.in +++ b/Build/source/utils/xindy/make-rules/alphabets/dutch/Makefile.in @@ -34,9 +34,9 @@ host_triplet = @host@ subdir = make-rules/alphabets/dutch DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-common.m4 \ - $(top_srcdir)/m4/ac_prog_latex.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4/ac_prog_latex.m4 \ $(top_srcdir)/m4/ac_prog_pdflatex.m4 \ + $(top_srcdir)/m4/tl_msg_error.m4 $(top_srcdir)/ac/xindy.ac \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) diff --git a/Build/source/utils/xindy/make-rules/alphabets/english/Makefile.in b/Build/source/utils/xindy/make-rules/alphabets/english/Makefile.in index 3e942be2686..2a0b7600982 100644 --- a/Build/source/utils/xindy/make-rules/alphabets/english/Makefile.in +++ b/Build/source/utils/xindy/make-rules/alphabets/english/Makefile.in @@ -34,9 +34,9 @@ host_triplet = @host@ subdir = make-rules/alphabets/english DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-common.m4 \ - $(top_srcdir)/m4/ac_prog_latex.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4/ac_prog_latex.m4 \ $(top_srcdir)/m4/ac_prog_pdflatex.m4 \ + $(top_srcdir)/m4/tl_msg_error.m4 $(top_srcdir)/ac/xindy.ac \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) diff --git a/Build/source/utils/xindy/make-rules/alphabets/esperanto/Makefile.in b/Build/source/utils/xindy/make-rules/alphabets/esperanto/Makefile.in index 3126da25fc2..3ba68849a2e 100644 --- a/Build/source/utils/xindy/make-rules/alphabets/esperanto/Makefile.in +++ b/Build/source/utils/xindy/make-rules/alphabets/esperanto/Makefile.in @@ -34,9 +34,9 @@ host_triplet = @host@ subdir = make-rules/alphabets/esperanto DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-common.m4 \ - $(top_srcdir)/m4/ac_prog_latex.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4/ac_prog_latex.m4 \ $(top_srcdir)/m4/ac_prog_pdflatex.m4 \ + $(top_srcdir)/m4/tl_msg_error.m4 $(top_srcdir)/ac/xindy.ac \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) diff --git a/Build/source/utils/xindy/make-rules/alphabets/estonian/Makefile.in b/Build/source/utils/xindy/make-rules/alphabets/estonian/Makefile.in index c8d0b355467..79ef6ffec26 100644 --- a/Build/source/utils/xindy/make-rules/alphabets/estonian/Makefile.in +++ b/Build/source/utils/xindy/make-rules/alphabets/estonian/Makefile.in @@ -34,9 +34,9 @@ host_triplet = @host@ subdir = make-rules/alphabets/estonian DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-common.m4 \ - $(top_srcdir)/m4/ac_prog_latex.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4/ac_prog_latex.m4 \ $(top_srcdir)/m4/ac_prog_pdflatex.m4 \ + $(top_srcdir)/m4/tl_msg_error.m4 $(top_srcdir)/ac/xindy.ac \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) diff --git a/Build/source/utils/xindy/make-rules/alphabets/finnish/Makefile.in b/Build/source/utils/xindy/make-rules/alphabets/finnish/Makefile.in index 941229f1cc0..7711406e8c8 100644 --- a/Build/source/utils/xindy/make-rules/alphabets/finnish/Makefile.in +++ b/Build/source/utils/xindy/make-rules/alphabets/finnish/Makefile.in @@ -34,9 +34,9 @@ host_triplet = @host@ subdir = make-rules/alphabets/finnish DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-common.m4 \ - $(top_srcdir)/m4/ac_prog_latex.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4/ac_prog_latex.m4 \ $(top_srcdir)/m4/ac_prog_pdflatex.m4 \ + $(top_srcdir)/m4/tl_msg_error.m4 $(top_srcdir)/ac/xindy.ac \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) diff --git a/Build/source/utils/xindy/make-rules/alphabets/french/Makefile.in b/Build/source/utils/xindy/make-rules/alphabets/french/Makefile.in index 3d2051bbcab..d81c6d05496 100644 --- a/Build/source/utils/xindy/make-rules/alphabets/french/Makefile.in +++ b/Build/source/utils/xindy/make-rules/alphabets/french/Makefile.in @@ -34,9 +34,9 @@ host_triplet = @host@ subdir = make-rules/alphabets/french DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-common.m4 \ - $(top_srcdir)/m4/ac_prog_latex.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4/ac_prog_latex.m4 \ $(top_srcdir)/m4/ac_prog_pdflatex.m4 \ + $(top_srcdir)/m4/tl_msg_error.m4 $(top_srcdir)/ac/xindy.ac \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) diff --git a/Build/source/utils/xindy/make-rules/alphabets/general/Makefile.in b/Build/source/utils/xindy/make-rules/alphabets/general/Makefile.in index 253db5060e8..921ce895049 100644 --- a/Build/source/utils/xindy/make-rules/alphabets/general/Makefile.in +++ b/Build/source/utils/xindy/make-rules/alphabets/general/Makefile.in @@ -34,9 +34,9 @@ host_triplet = @host@ subdir = make-rules/alphabets/general DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-common.m4 \ - $(top_srcdir)/m4/ac_prog_latex.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4/ac_prog_latex.m4 \ $(top_srcdir)/m4/ac_prog_pdflatex.m4 \ + $(top_srcdir)/m4/tl_msg_error.m4 $(top_srcdir)/ac/xindy.ac \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) diff --git a/Build/source/utils/xindy/make-rules/alphabets/georgian/Makefile.in b/Build/source/utils/xindy/make-rules/alphabets/georgian/Makefile.in index a70d574afe3..66cff563adb 100644 --- a/Build/source/utils/xindy/make-rules/alphabets/georgian/Makefile.in +++ b/Build/source/utils/xindy/make-rules/alphabets/georgian/Makefile.in @@ -34,9 +34,9 @@ host_triplet = @host@ subdir = make-rules/alphabets/georgian DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-common.m4 \ - $(top_srcdir)/m4/ac_prog_latex.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4/ac_prog_latex.m4 \ $(top_srcdir)/m4/ac_prog_pdflatex.m4 \ + $(top_srcdir)/m4/tl_msg_error.m4 $(top_srcdir)/ac/xindy.ac \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) diff --git a/Build/source/utils/xindy/make-rules/alphabets/german/Makefile.in b/Build/source/utils/xindy/make-rules/alphabets/german/Makefile.in index 9fc67294e49..a027a48c9d1 100644 --- a/Build/source/utils/xindy/make-rules/alphabets/german/Makefile.in +++ b/Build/source/utils/xindy/make-rules/alphabets/german/Makefile.in @@ -34,9 +34,9 @@ host_triplet = @host@ subdir = make-rules/alphabets/german DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-common.m4 \ - $(top_srcdir)/m4/ac_prog_latex.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4/ac_prog_latex.m4 \ $(top_srcdir)/m4/ac_prog_pdflatex.m4 \ + $(top_srcdir)/m4/tl_msg_error.m4 $(top_srcdir)/ac/xindy.ac \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) diff --git a/Build/source/utils/xindy/make-rules/alphabets/greek/Makefile.in b/Build/source/utils/xindy/make-rules/alphabets/greek/Makefile.in index d45ee2bb3d6..c71b039a59e 100644 --- a/Build/source/utils/xindy/make-rules/alphabets/greek/Makefile.in +++ b/Build/source/utils/xindy/make-rules/alphabets/greek/Makefile.in @@ -34,9 +34,9 @@ host_triplet = @host@ subdir = make-rules/alphabets/greek DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-common.m4 \ - $(top_srcdir)/m4/ac_prog_latex.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4/ac_prog_latex.m4 \ $(top_srcdir)/m4/ac_prog_pdflatex.m4 \ + $(top_srcdir)/m4/tl_msg_error.m4 $(top_srcdir)/ac/xindy.ac \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) diff --git a/Build/source/utils/xindy/make-rules/alphabets/gypsy/Makefile.in b/Build/source/utils/xindy/make-rules/alphabets/gypsy/Makefile.in index f263e25c4d0..2aab2dad444 100644 --- a/Build/source/utils/xindy/make-rules/alphabets/gypsy/Makefile.in +++ b/Build/source/utils/xindy/make-rules/alphabets/gypsy/Makefile.in @@ -34,9 +34,9 @@ host_triplet = @host@ subdir = make-rules/alphabets/gypsy DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-common.m4 \ - $(top_srcdir)/m4/ac_prog_latex.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4/ac_prog_latex.m4 \ $(top_srcdir)/m4/ac_prog_pdflatex.m4 \ + $(top_srcdir)/m4/tl_msg_error.m4 $(top_srcdir)/ac/xindy.ac \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) diff --git a/Build/source/utils/xindy/make-rules/alphabets/hausa/Makefile.in b/Build/source/utils/xindy/make-rules/alphabets/hausa/Makefile.in index fb79dc71f65..38b1381fc89 100644 --- a/Build/source/utils/xindy/make-rules/alphabets/hausa/Makefile.in +++ b/Build/source/utils/xindy/make-rules/alphabets/hausa/Makefile.in @@ -34,9 +34,9 @@ host_triplet = @host@ subdir = make-rules/alphabets/hausa DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-common.m4 \ - $(top_srcdir)/m4/ac_prog_latex.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4/ac_prog_latex.m4 \ $(top_srcdir)/m4/ac_prog_pdflatex.m4 \ + $(top_srcdir)/m4/tl_msg_error.m4 $(top_srcdir)/ac/xindy.ac \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) diff --git a/Build/source/utils/xindy/make-rules/alphabets/hebrew/Makefile.in b/Build/source/utils/xindy/make-rules/alphabets/hebrew/Makefile.in index 7f26c64010a..6abb663f53a 100644 --- a/Build/source/utils/xindy/make-rules/alphabets/hebrew/Makefile.in +++ b/Build/source/utils/xindy/make-rules/alphabets/hebrew/Makefile.in @@ -34,9 +34,9 @@ host_triplet = @host@ subdir = make-rules/alphabets/hebrew DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-common.m4 \ - $(top_srcdir)/m4/ac_prog_latex.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4/ac_prog_latex.m4 \ $(top_srcdir)/m4/ac_prog_pdflatex.m4 \ + $(top_srcdir)/m4/tl_msg_error.m4 $(top_srcdir)/ac/xindy.ac \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) diff --git a/Build/source/utils/xindy/make-rules/alphabets/hungarian/Makefile.in b/Build/source/utils/xindy/make-rules/alphabets/hungarian/Makefile.in index ff5f296c62a..822a41821fc 100644 --- a/Build/source/utils/xindy/make-rules/alphabets/hungarian/Makefile.in +++ b/Build/source/utils/xindy/make-rules/alphabets/hungarian/Makefile.in @@ -34,9 +34,9 @@ host_triplet = @host@ subdir = make-rules/alphabets/hungarian DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-common.m4 \ - $(top_srcdir)/m4/ac_prog_latex.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4/ac_prog_latex.m4 \ $(top_srcdir)/m4/ac_prog_pdflatex.m4 \ + $(top_srcdir)/m4/tl_msg_error.m4 $(top_srcdir)/ac/xindy.ac \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) diff --git a/Build/source/utils/xindy/make-rules/alphabets/icelandic/Makefile.in b/Build/source/utils/xindy/make-rules/alphabets/icelandic/Makefile.in index 90daad9d46e..022287e3cf4 100644 --- a/Build/source/utils/xindy/make-rules/alphabets/icelandic/Makefile.in +++ b/Build/source/utils/xindy/make-rules/alphabets/icelandic/Makefile.in @@ -34,9 +34,9 @@ host_triplet = @host@ subdir = make-rules/alphabets/icelandic DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-common.m4 \ - $(top_srcdir)/m4/ac_prog_latex.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4/ac_prog_latex.m4 \ $(top_srcdir)/m4/ac_prog_pdflatex.m4 \ + $(top_srcdir)/m4/tl_msg_error.m4 $(top_srcdir)/ac/xindy.ac \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) diff --git a/Build/source/utils/xindy/make-rules/alphabets/italian/Makefile.in b/Build/source/utils/xindy/make-rules/alphabets/italian/Makefile.in index cdf3a61eca0..42567fbf8e0 100644 --- a/Build/source/utils/xindy/make-rules/alphabets/italian/Makefile.in +++ b/Build/source/utils/xindy/make-rules/alphabets/italian/Makefile.in @@ -34,9 +34,9 @@ host_triplet = @host@ subdir = make-rules/alphabets/italian DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-common.m4 \ - $(top_srcdir)/m4/ac_prog_latex.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4/ac_prog_latex.m4 \ $(top_srcdir)/m4/ac_prog_pdflatex.m4 \ + $(top_srcdir)/m4/tl_msg_error.m4 $(top_srcdir)/ac/xindy.ac \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) diff --git a/Build/source/utils/xindy/make-rules/alphabets/klingon/Makefile.in b/Build/source/utils/xindy/make-rules/alphabets/klingon/Makefile.in index 1e7ec848cff..c53bc785ecf 100644 --- a/Build/source/utils/xindy/make-rules/alphabets/klingon/Makefile.in +++ b/Build/source/utils/xindy/make-rules/alphabets/klingon/Makefile.in @@ -34,9 +34,9 @@ host_triplet = @host@ subdir = make-rules/alphabets/klingon DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-common.m4 \ - $(top_srcdir)/m4/ac_prog_latex.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4/ac_prog_latex.m4 \ $(top_srcdir)/m4/ac_prog_pdflatex.m4 \ + $(top_srcdir)/m4/tl_msg_error.m4 $(top_srcdir)/ac/xindy.ac \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) diff --git a/Build/source/utils/xindy/make-rules/alphabets/kurdish/Makefile.in b/Build/source/utils/xindy/make-rules/alphabets/kurdish/Makefile.in index ee1b13b47aa..1ebf203afda 100644 --- a/Build/source/utils/xindy/make-rules/alphabets/kurdish/Makefile.in +++ b/Build/source/utils/xindy/make-rules/alphabets/kurdish/Makefile.in @@ -34,9 +34,9 @@ host_triplet = @host@ subdir = make-rules/alphabets/kurdish DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-common.m4 \ - $(top_srcdir)/m4/ac_prog_latex.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4/ac_prog_latex.m4 \ $(top_srcdir)/m4/ac_prog_pdflatex.m4 \ + $(top_srcdir)/m4/tl_msg_error.m4 $(top_srcdir)/ac/xindy.ac \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) diff --git a/Build/source/utils/xindy/make-rules/alphabets/latin/Makefile.in b/Build/source/utils/xindy/make-rules/alphabets/latin/Makefile.in index 3b63a732f89..aca0e37d56d 100644 --- a/Build/source/utils/xindy/make-rules/alphabets/latin/Makefile.in +++ b/Build/source/utils/xindy/make-rules/alphabets/latin/Makefile.in @@ -34,9 +34,9 @@ host_triplet = @host@ subdir = make-rules/alphabets/latin DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-common.m4 \ - $(top_srcdir)/m4/ac_prog_latex.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4/ac_prog_latex.m4 \ $(top_srcdir)/m4/ac_prog_pdflatex.m4 \ + $(top_srcdir)/m4/tl_msg_error.m4 $(top_srcdir)/ac/xindy.ac \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) diff --git a/Build/source/utils/xindy/make-rules/alphabets/latvian/Makefile.in b/Build/source/utils/xindy/make-rules/alphabets/latvian/Makefile.in index b3f1ad13c53..c9bfcd5cdfa 100644 --- a/Build/source/utils/xindy/make-rules/alphabets/latvian/Makefile.in +++ b/Build/source/utils/xindy/make-rules/alphabets/latvian/Makefile.in @@ -34,9 +34,9 @@ host_triplet = @host@ subdir = make-rules/alphabets/latvian DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-common.m4 \ - $(top_srcdir)/m4/ac_prog_latex.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4/ac_prog_latex.m4 \ $(top_srcdir)/m4/ac_prog_pdflatex.m4 \ + $(top_srcdir)/m4/tl_msg_error.m4 $(top_srcdir)/ac/xindy.ac \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) diff --git a/Build/source/utils/xindy/make-rules/alphabets/lithuanian/Makefile.in b/Build/source/utils/xindy/make-rules/alphabets/lithuanian/Makefile.in index 3e79bf5700c..4515876d339 100644 --- a/Build/source/utils/xindy/make-rules/alphabets/lithuanian/Makefile.in +++ b/Build/source/utils/xindy/make-rules/alphabets/lithuanian/Makefile.in @@ -34,9 +34,9 @@ host_triplet = @host@ subdir = make-rules/alphabets/lithuanian DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-common.m4 \ - $(top_srcdir)/m4/ac_prog_latex.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4/ac_prog_latex.m4 \ $(top_srcdir)/m4/ac_prog_pdflatex.m4 \ + $(top_srcdir)/m4/tl_msg_error.m4 $(top_srcdir)/ac/xindy.ac \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) diff --git a/Build/source/utils/xindy/make-rules/alphabets/lower-sorbian/Makefile.in b/Build/source/utils/xindy/make-rules/alphabets/lower-sorbian/Makefile.in index bf1a177500e..aa2269c2e4f 100644 --- a/Build/source/utils/xindy/make-rules/alphabets/lower-sorbian/Makefile.in +++ b/Build/source/utils/xindy/make-rules/alphabets/lower-sorbian/Makefile.in @@ -34,9 +34,9 @@ host_triplet = @host@ subdir = make-rules/alphabets/lower-sorbian DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-common.m4 \ - $(top_srcdir)/m4/ac_prog_latex.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4/ac_prog_latex.m4 \ $(top_srcdir)/m4/ac_prog_pdflatex.m4 \ + $(top_srcdir)/m4/tl_msg_error.m4 $(top_srcdir)/ac/xindy.ac \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) diff --git a/Build/source/utils/xindy/make-rules/alphabets/macedonian/Makefile.in b/Build/source/utils/xindy/make-rules/alphabets/macedonian/Makefile.in index 6a55c3611e6..fcf35faa89e 100644 --- a/Build/source/utils/xindy/make-rules/alphabets/macedonian/Makefile.in +++ b/Build/source/utils/xindy/make-rules/alphabets/macedonian/Makefile.in @@ -34,9 +34,9 @@ host_triplet = @host@ subdir = make-rules/alphabets/macedonian DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-common.m4 \ - $(top_srcdir)/m4/ac_prog_latex.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4/ac_prog_latex.m4 \ $(top_srcdir)/m4/ac_prog_pdflatex.m4 \ + $(top_srcdir)/m4/tl_msg_error.m4 $(top_srcdir)/ac/xindy.ac \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) diff --git a/Build/source/utils/xindy/make-rules/alphabets/mongolian/Makefile.in b/Build/source/utils/xindy/make-rules/alphabets/mongolian/Makefile.in index c89617111e9..89b47812856 100644 --- a/Build/source/utils/xindy/make-rules/alphabets/mongolian/Makefile.in +++ b/Build/source/utils/xindy/make-rules/alphabets/mongolian/Makefile.in @@ -34,9 +34,9 @@ host_triplet = @host@ subdir = make-rules/alphabets/mongolian DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-common.m4 \ - $(top_srcdir)/m4/ac_prog_latex.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4/ac_prog_latex.m4 \ $(top_srcdir)/m4/ac_prog_pdflatex.m4 \ + $(top_srcdir)/m4/tl_msg_error.m4 $(top_srcdir)/ac/xindy.ac \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) diff --git a/Build/source/utils/xindy/make-rules/alphabets/norwegian/Makefile.in b/Build/source/utils/xindy/make-rules/alphabets/norwegian/Makefile.in index 9091a85dcf6..9e178b541f4 100644 --- a/Build/source/utils/xindy/make-rules/alphabets/norwegian/Makefile.in +++ b/Build/source/utils/xindy/make-rules/alphabets/norwegian/Makefile.in @@ -34,9 +34,9 @@ host_triplet = @host@ subdir = make-rules/alphabets/norwegian DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-common.m4 \ - $(top_srcdir)/m4/ac_prog_latex.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4/ac_prog_latex.m4 \ $(top_srcdir)/m4/ac_prog_pdflatex.m4 \ + $(top_srcdir)/m4/tl_msg_error.m4 $(top_srcdir)/ac/xindy.ac \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) diff --git a/Build/source/utils/xindy/make-rules/alphabets/polish/Makefile.in b/Build/source/utils/xindy/make-rules/alphabets/polish/Makefile.in index f47e244bc24..4d048621f04 100644 --- a/Build/source/utils/xindy/make-rules/alphabets/polish/Makefile.in +++ b/Build/source/utils/xindy/make-rules/alphabets/polish/Makefile.in @@ -34,9 +34,9 @@ host_triplet = @host@ subdir = make-rules/alphabets/polish DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-common.m4 \ - $(top_srcdir)/m4/ac_prog_latex.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4/ac_prog_latex.m4 \ $(top_srcdir)/m4/ac_prog_pdflatex.m4 \ + $(top_srcdir)/m4/tl_msg_error.m4 $(top_srcdir)/ac/xindy.ac \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) diff --git a/Build/source/utils/xindy/make-rules/alphabets/portuguese/Makefile.in b/Build/source/utils/xindy/make-rules/alphabets/portuguese/Makefile.in index 176aed9913c..8ece71d3c26 100644 --- a/Build/source/utils/xindy/make-rules/alphabets/portuguese/Makefile.in +++ b/Build/source/utils/xindy/make-rules/alphabets/portuguese/Makefile.in @@ -34,9 +34,9 @@ host_triplet = @host@ subdir = make-rules/alphabets/portuguese DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-common.m4 \ - $(top_srcdir)/m4/ac_prog_latex.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4/ac_prog_latex.m4 \ $(top_srcdir)/m4/ac_prog_pdflatex.m4 \ + $(top_srcdir)/m4/tl_msg_error.m4 $(top_srcdir)/ac/xindy.ac \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) diff --git a/Build/source/utils/xindy/make-rules/alphabets/romanian/Makefile.in b/Build/source/utils/xindy/make-rules/alphabets/romanian/Makefile.in index 6b5ce6e1685..66e40670ef8 100644 --- a/Build/source/utils/xindy/make-rules/alphabets/romanian/Makefile.in +++ b/Build/source/utils/xindy/make-rules/alphabets/romanian/Makefile.in @@ -34,9 +34,9 @@ host_triplet = @host@ subdir = make-rules/alphabets/romanian DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-common.m4 \ - $(top_srcdir)/m4/ac_prog_latex.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4/ac_prog_latex.m4 \ $(top_srcdir)/m4/ac_prog_pdflatex.m4 \ + $(top_srcdir)/m4/tl_msg_error.m4 $(top_srcdir)/ac/xindy.ac \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) diff --git a/Build/source/utils/xindy/make-rules/alphabets/russian/Makefile.in b/Build/source/utils/xindy/make-rules/alphabets/russian/Makefile.in index 9f2b66759ab..26041e43db0 100644 --- a/Build/source/utils/xindy/make-rules/alphabets/russian/Makefile.in +++ b/Build/source/utils/xindy/make-rules/alphabets/russian/Makefile.in @@ -34,9 +34,9 @@ host_triplet = @host@ subdir = make-rules/alphabets/russian DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-common.m4 \ - $(top_srcdir)/m4/ac_prog_latex.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4/ac_prog_latex.m4 \ $(top_srcdir)/m4/ac_prog_pdflatex.m4 \ + $(top_srcdir)/m4/tl_msg_error.m4 $(top_srcdir)/ac/xindy.ac \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) diff --git a/Build/source/utils/xindy/make-rules/alphabets/serbian/Makefile.in b/Build/source/utils/xindy/make-rules/alphabets/serbian/Makefile.in index 71146e14094..56a4ae05121 100644 --- a/Build/source/utils/xindy/make-rules/alphabets/serbian/Makefile.in +++ b/Build/source/utils/xindy/make-rules/alphabets/serbian/Makefile.in @@ -34,9 +34,9 @@ host_triplet = @host@ subdir = make-rules/alphabets/serbian DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-common.m4 \ - $(top_srcdir)/m4/ac_prog_latex.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4/ac_prog_latex.m4 \ $(top_srcdir)/m4/ac_prog_pdflatex.m4 \ + $(top_srcdir)/m4/tl_msg_error.m4 $(top_srcdir)/ac/xindy.ac \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) diff --git a/Build/source/utils/xindy/make-rules/alphabets/slovak/Makefile.in b/Build/source/utils/xindy/make-rules/alphabets/slovak/Makefile.in index 79747d10d6e..5538ee12c99 100644 --- a/Build/source/utils/xindy/make-rules/alphabets/slovak/Makefile.in +++ b/Build/source/utils/xindy/make-rules/alphabets/slovak/Makefile.in @@ -34,9 +34,9 @@ host_triplet = @host@ subdir = make-rules/alphabets/slovak DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-common.m4 \ - $(top_srcdir)/m4/ac_prog_latex.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4/ac_prog_latex.m4 \ $(top_srcdir)/m4/ac_prog_pdflatex.m4 \ + $(top_srcdir)/m4/tl_msg_error.m4 $(top_srcdir)/ac/xindy.ac \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) diff --git a/Build/source/utils/xindy/make-rules/alphabets/slovenian/Makefile.in b/Build/source/utils/xindy/make-rules/alphabets/slovenian/Makefile.in index c6676f53f6f..c315e3a2b10 100644 --- a/Build/source/utils/xindy/make-rules/alphabets/slovenian/Makefile.in +++ b/Build/source/utils/xindy/make-rules/alphabets/slovenian/Makefile.in @@ -34,9 +34,9 @@ host_triplet = @host@ subdir = make-rules/alphabets/slovenian DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-common.m4 \ - $(top_srcdir)/m4/ac_prog_latex.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4/ac_prog_latex.m4 \ $(top_srcdir)/m4/ac_prog_pdflatex.m4 \ + $(top_srcdir)/m4/tl_msg_error.m4 $(top_srcdir)/ac/xindy.ac \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) diff --git a/Build/source/utils/xindy/make-rules/alphabets/spanish/Makefile.in b/Build/source/utils/xindy/make-rules/alphabets/spanish/Makefile.in index 67ec4ee7353..576eaa5fd03 100644 --- a/Build/source/utils/xindy/make-rules/alphabets/spanish/Makefile.in +++ b/Build/source/utils/xindy/make-rules/alphabets/spanish/Makefile.in @@ -34,9 +34,9 @@ host_triplet = @host@ subdir = make-rules/alphabets/spanish DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-common.m4 \ - $(top_srcdir)/m4/ac_prog_latex.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4/ac_prog_latex.m4 \ $(top_srcdir)/m4/ac_prog_pdflatex.m4 \ + $(top_srcdir)/m4/tl_msg_error.m4 $(top_srcdir)/ac/xindy.ac \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) diff --git a/Build/source/utils/xindy/make-rules/alphabets/swedish/Makefile.in b/Build/source/utils/xindy/make-rules/alphabets/swedish/Makefile.in index ac961da78c6..4f223d2c5a8 100644 --- a/Build/source/utils/xindy/make-rules/alphabets/swedish/Makefile.in +++ b/Build/source/utils/xindy/make-rules/alphabets/swedish/Makefile.in @@ -34,9 +34,9 @@ host_triplet = @host@ subdir = make-rules/alphabets/swedish DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-common.m4 \ - $(top_srcdir)/m4/ac_prog_latex.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4/ac_prog_latex.m4 \ $(top_srcdir)/m4/ac_prog_pdflatex.m4 \ + $(top_srcdir)/m4/tl_msg_error.m4 $(top_srcdir)/ac/xindy.ac \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) diff --git a/Build/source/utils/xindy/make-rules/alphabets/test1/Makefile.in b/Build/source/utils/xindy/make-rules/alphabets/test1/Makefile.in index b97d9904846..b953a267c1f 100644 --- a/Build/source/utils/xindy/make-rules/alphabets/test1/Makefile.in +++ b/Build/source/utils/xindy/make-rules/alphabets/test1/Makefile.in @@ -34,9 +34,9 @@ host_triplet = @host@ subdir = make-rules/alphabets/test1 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-common.m4 \ - $(top_srcdir)/m4/ac_prog_latex.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4/ac_prog_latex.m4 \ $(top_srcdir)/m4/ac_prog_pdflatex.m4 \ + $(top_srcdir)/m4/tl_msg_error.m4 $(top_srcdir)/ac/xindy.ac \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) diff --git a/Build/source/utils/xindy/make-rules/alphabets/turkish/Makefile.in b/Build/source/utils/xindy/make-rules/alphabets/turkish/Makefile.in index 7a6ba30320d..960ff6509cd 100644 --- a/Build/source/utils/xindy/make-rules/alphabets/turkish/Makefile.in +++ b/Build/source/utils/xindy/make-rules/alphabets/turkish/Makefile.in @@ -34,9 +34,9 @@ host_triplet = @host@ subdir = make-rules/alphabets/turkish DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-common.m4 \ - $(top_srcdir)/m4/ac_prog_latex.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4/ac_prog_latex.m4 \ $(top_srcdir)/m4/ac_prog_pdflatex.m4 \ + $(top_srcdir)/m4/tl_msg_error.m4 $(top_srcdir)/ac/xindy.ac \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) diff --git a/Build/source/utils/xindy/make-rules/alphabets/ukrainian/Makefile.in b/Build/source/utils/xindy/make-rules/alphabets/ukrainian/Makefile.in index 6f769ee45d9..96a3b1e8674 100644 --- a/Build/source/utils/xindy/make-rules/alphabets/ukrainian/Makefile.in +++ b/Build/source/utils/xindy/make-rules/alphabets/ukrainian/Makefile.in @@ -34,9 +34,9 @@ host_triplet = @host@ subdir = make-rules/alphabets/ukrainian DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-common.m4 \ - $(top_srcdir)/m4/ac_prog_latex.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4/ac_prog_latex.m4 \ $(top_srcdir)/m4/ac_prog_pdflatex.m4 \ + $(top_srcdir)/m4/tl_msg_error.m4 $(top_srcdir)/ac/xindy.ac \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) diff --git a/Build/source/utils/xindy/make-rules/alphabets/upper-sorbian/Makefile.in b/Build/source/utils/xindy/make-rules/alphabets/upper-sorbian/Makefile.in index 116b488397b..8c52cac4e46 100644 --- a/Build/source/utils/xindy/make-rules/alphabets/upper-sorbian/Makefile.in +++ b/Build/source/utils/xindy/make-rules/alphabets/upper-sorbian/Makefile.in @@ -34,9 +34,9 @@ host_triplet = @host@ subdir = make-rules/alphabets/upper-sorbian DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-common.m4 \ - $(top_srcdir)/m4/ac_prog_latex.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4/ac_prog_latex.m4 \ $(top_srcdir)/m4/ac_prog_pdflatex.m4 \ + $(top_srcdir)/m4/tl_msg_error.m4 $(top_srcdir)/ac/xindy.ac \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) diff --git a/Build/source/utils/xindy/make-rules/alphabets/vietnamese/Makefile.in b/Build/source/utils/xindy/make-rules/alphabets/vietnamese/Makefile.in index 380b4766ad5..f0da9f6ba2f 100644 --- a/Build/source/utils/xindy/make-rules/alphabets/vietnamese/Makefile.in +++ b/Build/source/utils/xindy/make-rules/alphabets/vietnamese/Makefile.in @@ -34,9 +34,9 @@ host_triplet = @host@ subdir = make-rules/alphabets/vietnamese DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-common.m4 \ - $(top_srcdir)/m4/ac_prog_latex.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4/ac_prog_latex.m4 \ $(top_srcdir)/m4/ac_prog_pdflatex.m4 \ + $(top_srcdir)/m4/tl_msg_error.m4 $(top_srcdir)/ac/xindy.ac \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) diff --git a/Build/source/utils/xindy/make-rules/inputenc/Makefile.in b/Build/source/utils/xindy/make-rules/inputenc/Makefile.in index 2857fe015d9..b0d5e544580 100644 --- a/Build/source/utils/xindy/make-rules/inputenc/Makefile.in +++ b/Build/source/utils/xindy/make-rules/inputenc/Makefile.in @@ -35,9 +35,9 @@ host_triplet = @host@ subdir = make-rules/inputenc DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-common.m4 \ - $(top_srcdir)/m4/ac_prog_latex.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4/ac_prog_latex.m4 \ $(top_srcdir)/m4/ac_prog_pdflatex.m4 \ + $(top_srcdir)/m4/tl_msg_error.m4 $(top_srcdir)/ac/xindy.ac \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) diff --git a/Build/source/utils/xindy/make-rules/styles/Makefile.in b/Build/source/utils/xindy/make-rules/styles/Makefile.in index d55a59b474a..204a796f707 100644 --- a/Build/source/utils/xindy/make-rules/styles/Makefile.in +++ b/Build/source/utils/xindy/make-rules/styles/Makefile.in @@ -35,9 +35,9 @@ host_triplet = @host@ subdir = make-rules/styles DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-common.m4 \ - $(top_srcdir)/m4/ac_prog_latex.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4/ac_prog_latex.m4 \ $(top_srcdir)/m4/ac_prog_pdflatex.m4 \ + $(top_srcdir)/m4/tl_msg_error.m4 $(top_srcdir)/ac/xindy.ac \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) diff --git a/Build/source/utils/xindy/missing b/Build/source/utils/xindy/missing deleted file mode 100755 index 727cfa0a15e..00000000000 --- a/Build/source/utils/xindy/missing +++ /dev/null @@ -1,376 +0,0 @@ -#! /bin/sh -# Common stub for a few missing GNU programs while installing. - -scriptversion=2009-04-28.21; # UTC - -# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006, -# 2008, 2009 Free Software Foundation, Inc. -# Originally by Fran,cois Pinard , 1996. - -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 3, 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 General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . - -# As a special exception to the GNU General Public License, if you -# distribute this file as part of a program that contains a -# configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. - -if test $# -eq 0; then - echo 1>&2 "Try \`$0 --help' for more information" - exit 1 -fi - -run=: -sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p' -sed_minuso='s/.* -o \([^ ]*\).*/\1/p' - -# In the cases where this matters, `missing' is being run in the -# srcdir already. -if test -f configure.ac; then - configure_ac=configure.ac -else - configure_ac=configure.in -fi - -msg="missing on your system" - -case $1 in ---run) - # Try to run requested program, and just exit if it succeeds. - run= - shift - "$@" && exit 0 - # Exit code 63 means version mismatch. This often happens - # when the user try to use an ancient version of a tool on - # a file that requires a minimum version. In this case we - # we should proceed has if the program had been absent, or - # if --run hadn't been passed. - if test $? = 63; then - run=: - msg="probably too old" - fi - ;; - - -h|--h|--he|--hel|--help) - echo "\ -$0 [OPTION]... PROGRAM [ARGUMENT]... - -Handle \`PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an -error status if there is no known handling for PROGRAM. - -Options: - -h, --help display this help and exit - -v, --version output version information and exit - --run try to run the given command, and emulate it if it fails - -Supported PROGRAM values: - aclocal touch file \`aclocal.m4' - autoconf touch file \`configure' - autoheader touch file \`config.h.in' - autom4te touch the output file, or create a stub one - automake touch all \`Makefile.in' files - bison create \`y.tab.[ch]', if possible, from existing .[ch] - flex create \`lex.yy.c', if possible, from existing .c - help2man touch the output file - lex create \`lex.yy.c', if possible, from existing .c - makeinfo touch the output file - tar try tar, gnutar, gtar, then tar without non-portable flags - yacc create \`y.tab.[ch]', if possible, from existing .[ch] - -Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and -\`g' are ignored when checking the name. - -Send bug reports to ." - exit $? - ;; - - -v|--v|--ve|--ver|--vers|--versi|--versio|--version) - echo "missing $scriptversion (GNU Automake)" - exit $? - ;; - - -*) - echo 1>&2 "$0: Unknown \`$1' option" - echo 1>&2 "Try \`$0 --help' for more information" - exit 1 - ;; - -esac - -# normalize program name to check for. -program=`echo "$1" | sed ' - s/^gnu-//; t - s/^gnu//; t - s/^g//; t'` - -# Now exit if we have it, but it failed. Also exit now if we -# don't have it and --version was passed (most likely to detect -# the program). This is about non-GNU programs, so use $1 not -# $program. -case $1 in - lex*|yacc*) - # Not GNU programs, they don't have --version. - ;; - - tar*) - if test -n "$run"; then - echo 1>&2 "ERROR: \`tar' requires --run" - exit 1 - elif test "x$2" = "x--version" || test "x$2" = "x--help"; then - exit 1 - fi - ;; - - *) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - elif test "x$2" = "x--version" || test "x$2" = "x--help"; then - # Could not run --version or --help. This is probably someone - # running `$TOOL --version' or `$TOOL --help' to check whether - # $TOOL exists and not knowing $TOOL uses missing. - exit 1 - fi - ;; -esac - -# If it does not exist, or fails to run (possibly an outdated version), -# try to emulate it. -case $program in - aclocal*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`acinclude.m4' or \`${configure_ac}'. You might want - to install the \`Automake' and \`Perl' packages. Grab them from - any GNU archive site." - touch aclocal.m4 - ;; - - autoconf*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`${configure_ac}'. You might want to install the - \`Autoconf' and \`GNU m4' packages. Grab them from any GNU - archive site." - touch configure - ;; - - autoheader*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`acconfig.h' or \`${configure_ac}'. You might want - to install the \`Autoconf' and \`GNU m4' packages. Grab them - from any GNU archive site." - files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' ${configure_ac}` - test -z "$files" && files="config.h" - touch_files= - for f in $files; do - case $f in - *:*) touch_files="$touch_files "`echo "$f" | - sed -e 's/^[^:]*://' -e 's/:.*//'`;; - *) touch_files="$touch_files $f.in";; - esac - done - touch $touch_files - ;; - - automake*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'. - You might want to install the \`Automake' and \`Perl' packages. - Grab them from any GNU archive site." - find . -type f -name Makefile.am -print | - sed 's/\.am$/.in/' | - while read f; do touch "$f"; done - ;; - - autom4te*) - echo 1>&2 "\ -WARNING: \`$1' is needed, but is $msg. - You might have modified some files without having the - proper tools for further handling them. - You can get \`$1' as part of \`Autoconf' from any GNU - archive site." - - file=`echo "$*" | sed -n "$sed_output"` - test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` - if test -f "$file"; then - touch $file - else - test -z "$file" || exec >$file - echo "#! /bin/sh" - echo "# Created by GNU Automake missing as a replacement of" - echo "# $ $@" - echo "exit 0" - chmod +x $file - exit 1 - fi - ;; - - bison*|yacc*) - echo 1>&2 "\ -WARNING: \`$1' $msg. You should only need it if - you modified a \`.y' file. You may need the \`Bison' package - in order for those modifications to take effect. You can get - \`Bison' from any GNU archive site." - rm -f y.tab.c y.tab.h - if test $# -ne 1; then - eval LASTARG="\${$#}" - case $LASTARG in - *.y) - SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'` - if test -f "$SRCFILE"; then - cp "$SRCFILE" y.tab.c - fi - SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'` - if test -f "$SRCFILE"; then - cp "$SRCFILE" y.tab.h - fi - ;; - esac - fi - if test ! -f y.tab.h; then - echo >y.tab.h - fi - if test ! -f y.tab.c; then - echo 'main() { return 0; }' >y.tab.c - fi - ;; - - lex*|flex*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified a \`.l' file. You may need the \`Flex' package - in order for those modifications to take effect. You can get - \`Flex' from any GNU archive site." - rm -f lex.yy.c - if test $# -ne 1; then - eval LASTARG="\${$#}" - case $LASTARG in - *.l) - SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'` - if test -f "$SRCFILE"; then - cp "$SRCFILE" lex.yy.c - fi - ;; - esac - fi - if test ! -f lex.yy.c; then - echo 'main() { return 0; }' >lex.yy.c - fi - ;; - - help2man*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified a dependency of a manual page. You may need the - \`Help2man' package in order for those modifications to take - effect. You can get \`Help2man' from any GNU archive site." - - file=`echo "$*" | sed -n "$sed_output"` - test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` - if test -f "$file"; then - touch $file - else - test -z "$file" || exec >$file - echo ".ab help2man is required to generate this page" - exit $? - fi - ;; - - makeinfo*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified a \`.texi' or \`.texinfo' file, or any other file - indirectly affecting the aspect of the manual. The spurious - call might also be the consequence of using a buggy \`make' (AIX, - DU, IRIX). You might want to install the \`Texinfo' package or - the \`GNU make' package. Grab either from any GNU archive site." - # The file to touch is that specified with -o ... - file=`echo "$*" | sed -n "$sed_output"` - test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` - if test -z "$file"; then - # ... or it is the one specified with @setfilename ... - infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'` - file=`sed -n ' - /^@setfilename/{ - s/.* \([^ ]*\) *$/\1/ - p - q - }' $infile` - # ... or it is derived from the source name (dir/f.texi becomes f.info) - test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info - fi - # If the file does not exist, the user really needs makeinfo; - # let's fail without touching anything. - test -f $file || exit 1 - touch $file - ;; - - tar*) - shift - - # We have already tried tar in the generic part. - # Look for gnutar/gtar before invocation to avoid ugly error - # messages. - if (gnutar --version > /dev/null 2>&1); then - gnutar "$@" && exit 0 - fi - if (gtar --version > /dev/null 2>&1); then - gtar "$@" && exit 0 - fi - firstarg="$1" - if shift; then - case $firstarg in - *o*) - firstarg=`echo "$firstarg" | sed s/o//` - tar "$firstarg" "$@" && exit 0 - ;; - esac - case $firstarg in - *h*) - firstarg=`echo "$firstarg" | sed s/h//` - tar "$firstarg" "$@" && exit 0 - ;; - esac - fi - - echo 1>&2 "\ -WARNING: I can't seem to be able to run \`tar' with the given arguments. - You may want to install GNU tar or Free paxutils, or check the - command line arguments." - exit 1 - ;; - - *) - echo 1>&2 "\ -WARNING: \`$1' is needed, and is $msg. - You might have modified some files without having the - proper tools for further handling them. Check the \`README' file, - it often tells you about the needed prerequisites for installing - this package. You may also peek at any GNU archive site, in case - some other package would contain this missing \`$1' program." - exit 1 - ;; -esac - -exit 0 - -# Local variables: -# eval: (add-hook 'write-file-hooks 'time-stamp) -# time-stamp-start: "scriptversion=" -# time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-time-zone: "UTC" -# time-stamp-end: "; # UTC" -# End: diff --git a/Build/source/utils/xindy/modules/Makefile.in b/Build/source/utils/xindy/modules/Makefile.in index b8d8319bab5..380cddb4207 100644 --- a/Build/source/utils/xindy/modules/Makefile.in +++ b/Build/source/utils/xindy/modules/Makefile.in @@ -34,9 +34,9 @@ host_triplet = @host@ subdir = modules DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-common.m4 \ - $(top_srcdir)/m4/ac_prog_latex.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4/ac_prog_latex.m4 \ $(top_srcdir)/m4/ac_prog_pdflatex.m4 \ + $(top_srcdir)/m4/tl_msg_error.m4 $(top_srcdir)/ac/xindy.ac \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) diff --git a/Build/source/utils/xindy/modules/base/Makefile.in b/Build/source/utils/xindy/modules/base/Makefile.in index addc8fcf93d..65556e41350 100644 --- a/Build/source/utils/xindy/modules/base/Makefile.in +++ b/Build/source/utils/xindy/modules/base/Makefile.in @@ -35,9 +35,9 @@ host_triplet = @host@ subdir = modules/base DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-common.m4 \ - $(top_srcdir)/m4/ac_prog_latex.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4/ac_prog_latex.m4 \ $(top_srcdir)/m4/ac_prog_pdflatex.m4 \ + $(top_srcdir)/m4/tl_msg_error.m4 $(top_srcdir)/ac/xindy.ac \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) diff --git a/Build/source/utils/xindy/modules/class/Makefile.in b/Build/source/utils/xindy/modules/class/Makefile.in index 43fa1a7c6d3..57fe0cba31a 100644 --- a/Build/source/utils/xindy/modules/class/Makefile.in +++ b/Build/source/utils/xindy/modules/class/Makefile.in @@ -35,9 +35,9 @@ host_triplet = @host@ subdir = modules/class DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-common.m4 \ - $(top_srcdir)/m4/ac_prog_latex.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4/ac_prog_latex.m4 \ $(top_srcdir)/m4/ac_prog_pdflatex.m4 \ + $(top_srcdir)/m4/tl_msg_error.m4 $(top_srcdir)/ac/xindy.ac \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) diff --git a/Build/source/utils/xindy/modules/lang/Makefile.in b/Build/source/utils/xindy/modules/lang/Makefile.in index 24f21a59b86..f2b0658d396 100644 --- a/Build/source/utils/xindy/modules/lang/Makefile.in +++ b/Build/source/utils/xindy/modules/lang/Makefile.in @@ -34,9 +34,9 @@ host_triplet = @host@ subdir = modules/lang DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-common.m4 \ - $(top_srcdir)/m4/ac_prog_latex.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4/ac_prog_latex.m4 \ $(top_srcdir)/m4/ac_prog_pdflatex.m4 \ + $(top_srcdir)/m4/tl_msg_error.m4 $(top_srcdir)/ac/xindy.ac \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) diff --git a/Build/source/utils/xindy/modules/lang/german/Makefile.in b/Build/source/utils/xindy/modules/lang/german/Makefile.in index 5497f10e4be..2f7f9f9a525 100644 --- a/Build/source/utils/xindy/modules/lang/german/Makefile.in +++ b/Build/source/utils/xindy/modules/lang/german/Makefile.in @@ -35,9 +35,9 @@ host_triplet = @host@ subdir = modules/lang/german DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-common.m4 \ - $(top_srcdir)/m4/ac_prog_latex.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4/ac_prog_latex.m4 \ $(top_srcdir)/m4/ac_prog_pdflatex.m4 \ + $(top_srcdir)/m4/tl_msg_error.m4 $(top_srcdir)/ac/xindy.ac \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) diff --git a/Build/source/utils/xindy/modules/lang/latin/Makefile.in b/Build/source/utils/xindy/modules/lang/latin/Makefile.in index a9e8c969805..6f85f788af6 100644 --- a/Build/source/utils/xindy/modules/lang/latin/Makefile.in +++ b/Build/source/utils/xindy/modules/lang/latin/Makefile.in @@ -35,9 +35,9 @@ host_triplet = @host@ subdir = modules/lang/latin DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-common.m4 \ - $(top_srcdir)/m4/ac_prog_latex.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4/ac_prog_latex.m4 \ $(top_srcdir)/m4/ac_prog_pdflatex.m4 \ + $(top_srcdir)/m4/tl_msg_error.m4 $(top_srcdir)/ac/xindy.ac \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) diff --git a/Build/source/utils/xindy/modules/ord/Makefile.in b/Build/source/utils/xindy/modules/ord/Makefile.in index 5ebce360096..341cfde4a28 100644 --- a/Build/source/utils/xindy/modules/ord/Makefile.in +++ b/Build/source/utils/xindy/modules/ord/Makefile.in @@ -35,9 +35,9 @@ host_triplet = @host@ subdir = modules/ord DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-common.m4 \ - $(top_srcdir)/m4/ac_prog_latex.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4/ac_prog_latex.m4 \ $(top_srcdir)/m4/ac_prog_pdflatex.m4 \ + $(top_srcdir)/m4/tl_msg_error.m4 $(top_srcdir)/ac/xindy.ac \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) diff --git a/Build/source/utils/xindy/modules/rules/Makefile.in b/Build/source/utils/xindy/modules/rules/Makefile.in index f3c920cfb51..381bd5178af 100644 --- a/Build/source/utils/xindy/modules/rules/Makefile.in +++ b/Build/source/utils/xindy/modules/rules/Makefile.in @@ -35,9 +35,9 @@ host_triplet = @host@ subdir = modules/rules DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-common.m4 \ - $(top_srcdir)/m4/ac_prog_latex.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4/ac_prog_latex.m4 \ $(top_srcdir)/m4/ac_prog_pdflatex.m4 \ + $(top_srcdir)/m4/tl_msg_error.m4 $(top_srcdir)/ac/xindy.ac \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) diff --git a/Build/source/utils/xindy/modules/styles/Makefile.in b/Build/source/utils/xindy/modules/styles/Makefile.in index ccbe3512edb..c86efa47dcd 100644 --- a/Build/source/utils/xindy/modules/styles/Makefile.in +++ b/Build/source/utils/xindy/modules/styles/Makefile.in @@ -35,9 +35,9 @@ host_triplet = @host@ subdir = modules/styles DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-common.m4 \ - $(top_srcdir)/m4/ac_prog_latex.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4/ac_prog_latex.m4 \ $(top_srcdir)/m4/ac_prog_pdflatex.m4 \ + $(top_srcdir)/m4/tl_msg_error.m4 $(top_srcdir)/ac/xindy.ac \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) diff --git a/Build/source/utils/xindy/rte/Makefile.am b/Build/source/utils/xindy/rte/Makefile.am index e4c859b3a66..d0fbdd90f25 100644 --- a/Build/source/utils/xindy/rte/Makefile.am +++ b/Build/source/utils/xindy/rte/Makefile.am @@ -29,14 +29,17 @@ binariesdir = ../binaries all-local: $(binariesdir)/$(XINDY_RUN) $(binariesdir)/base.mem -$(binariesdir)/$(XINDY_RUN) $(binariesdir)/base.mem: +## Serialize to allow parallel builds +## +$(binariesdir)/base.mem: $(binariesdir)/$(XINDY_RUN) + cp xindy-build-dir/lispinit.mem $(binariesdir)/base.mem +$(binariesdir)/$(XINDY_RUN): rm -rf xindy-build-dir test -f ordrules/link.sh || for i in $(ORDRULES_FILES); do cp -p $(top_srcdir)/rte/ordrules/$$i ordrules/$$i; done $(MAKE) -C ordrules ordrulei.c env CLISP_LINKKIT='@CLISP_LIB@/linkkit' MAKE="$(MAKE)" \ sh '@CLISP_LIB@/clisp-link' add-module-set ordrules '@CLISP_LIB@/full' xindy-build-dir cp xindy-build-dir/$(LISP_RUN) $(binariesdir)/$(XINDY_RUN) - cp xindy-build-dir/lispinit.mem $(binariesdir)/base.mem clean-local: rm -rf xindy-build-dir diff --git a/Build/source/utils/xindy/rte/Makefile.in b/Build/source/utils/xindy/rte/Makefile.in index 53d156d9d5f..719ad283059 100644 --- a/Build/source/utils/xindy/rte/Makefile.in +++ b/Build/source/utils/xindy/rte/Makefile.in @@ -34,9 +34,9 @@ host_triplet = @host@ subdir = rte DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in NEWS ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-common.m4 \ - $(top_srcdir)/m4/ac_prog_latex.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4/ac_prog_latex.m4 \ $(top_srcdir)/m4/ac_prog_pdflatex.m4 \ + $(top_srcdir)/m4/tl_msg_error.m4 $(top_srcdir)/ac/xindy.ac \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) @@ -472,14 +472,15 @@ uninstall-am: all-local: $(binariesdir)/$(XINDY_RUN) $(binariesdir)/base.mem -$(binariesdir)/$(XINDY_RUN) $(binariesdir)/base.mem: +$(binariesdir)/base.mem: $(binariesdir)/$(XINDY_RUN) + cp xindy-build-dir/lispinit.mem $(binariesdir)/base.mem +$(binariesdir)/$(XINDY_RUN): rm -rf xindy-build-dir test -f ordrules/link.sh || for i in $(ORDRULES_FILES); do cp -p $(top_srcdir)/rte/ordrules/$$i ordrules/$$i; done $(MAKE) -C ordrules ordrulei.c env CLISP_LINKKIT='@CLISP_LIB@/linkkit' MAKE="$(MAKE)" \ sh '@CLISP_LIB@/clisp-link' add-module-set ordrules '@CLISP_LIB@/full' xindy-build-dir cp xindy-build-dir/$(LISP_RUN) $(binariesdir)/$(XINDY_RUN) - cp xindy-build-dir/lispinit.mem $(binariesdir)/base.mem clean-local: rm -rf xindy-build-dir diff --git a/Build/source/utils/xindy/rte/ordrules/Makefile.in b/Build/source/utils/xindy/rte/ordrules/Makefile.in index 3d3f58517b7..d4c765ea85b 100644 --- a/Build/source/utils/xindy/rte/ordrules/Makefile.in +++ b/Build/source/utils/xindy/rte/ordrules/Makefile.in @@ -37,9 +37,9 @@ subdir = rte/ordrules DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ $(srcdir)/version.lisp.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-common.m4 \ - $(top_srcdir)/m4/ac_prog_latex.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4/ac_prog_latex.m4 \ $(top_srcdir)/m4/ac_prog_pdflatex.m4 \ + $(top_srcdir)/m4/tl_msg_error.m4 $(top_srcdir)/ac/xindy.ac \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) diff --git a/Build/source/utils/xindy/src/Makefile.in b/Build/source/utils/xindy/src/Makefile.in index 8b8c9ce56c5..f473309a5e0 100644 --- a/Build/source/utils/xindy/src/Makefile.in +++ b/Build/source/utils/xindy/src/Makefile.in @@ -36,9 +36,9 @@ host_triplet = @host@ subdir = src DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-common.m4 \ - $(top_srcdir)/m4/ac_prog_latex.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4/ac_prog_latex.m4 \ $(top_srcdir)/m4/ac_prog_pdflatex.m4 \ + $(top_srcdir)/m4/tl_msg_error.m4 $(top_srcdir)/ac/xindy.ac \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) diff --git a/Build/source/utils/xindy/tex2xindy/Makefile.in b/Build/source/utils/xindy/tex2xindy/Makefile.in index f03bfc60884..37f5bfab8a9 100644 --- a/Build/source/utils/xindy/tex2xindy/Makefile.in +++ b/Build/source/utils/xindy/tex2xindy/Makefile.in @@ -36,9 +36,9 @@ bin_PROGRAMS = tex2xindy$(EXEEXT) subdir = tex2xindy DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in tex2xindy.c ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-common.m4 \ - $(top_srcdir)/m4/ac_prog_latex.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4/ac_prog_latex.m4 \ $(top_srcdir)/m4/ac_prog_pdflatex.m4 \ + $(top_srcdir)/m4/tl_msg_error.m4 $(top_srcdir)/ac/xindy.ac \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) @@ -51,7 +51,7 @@ am_tex2xindy_OBJECTS = tex2xindy.$(OBJEXT) tex2xindy_OBJECTS = $(am_tex2xindy_OBJECTS) tex2xindy_LDADD = $(LDADD) DEFAULT_INCLUDES = -I.@am__isrc@ -depcomp = $(SHELL) $(top_srcdir)/depcomp +depcomp = $(SHELL) $(top_srcdir)/../../build-aux/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) @@ -59,7 +59,7 @@ CCLD = $(CC) LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ @MAINTAINER_MODE_FALSE@am__skiplex = test -f $@ || LEXCOMPILE = $(LEX) $(LFLAGS) $(AM_LFLAGS) -YLWRAP = $(top_srcdir)/ylwrap +YLWRAP = $(top_srcdir)/../../build-aux/ylwrap SOURCES = $(tex2xindy_SOURCES) DIST_SOURCES = $(tex2xindy_SOURCES) man1dir = $(mandir)/man1 diff --git a/Build/source/utils/xindy/user-commands/Makefile.in b/Build/source/utils/xindy/user-commands/Makefile.in index be85affee44..600a3457349 100644 --- a/Build/source/utils/xindy/user-commands/Makefile.in +++ b/Build/source/utils/xindy/user-commands/Makefile.in @@ -36,9 +36,9 @@ subdir = user-commands DIST_COMMON = $(am__dist_bin_SCRIPTS_DIST) $(dist_noinst_SCRIPTS) \ $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-common.m4 \ - $(top_srcdir)/m4/ac_prog_latex.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4/ac_prog_latex.m4 \ $(top_srcdir)/m4/ac_prog_pdflatex.m4 \ + $(top_srcdir)/m4/tl_msg_error.m4 $(top_srcdir)/ac/xindy.ac \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) diff --git a/Build/source/utils/xindy/ylwrap b/Build/source/utils/xindy/ylwrap deleted file mode 100755 index 7278b6a3573..00000000000 --- a/Build/source/utils/xindy/ylwrap +++ /dev/null @@ -1,223 +0,0 @@ -#! /bin/sh -# ylwrap - wrapper for lex/yacc invocations. - -scriptversion=2007-11-22.22 - -# Copyright (C) 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2004, 2005, -# 2007 Free Software Foundation, Inc. -# -# Written by Tom Tromey . -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU 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 General Public License for more details. -# -# You should have received a copy of the GNU 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. - -# As a special exception to the GNU General Public License, if you -# distribute this file as part of a program that contains a -# configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. - -# This file is maintained in Automake, please report -# bugs to or send patches to -# . - -case "$1" in - '') - echo "$0: No files given. Try \`$0 --help' for more information." 1>&2 - exit 1 - ;; - --basedir) - basedir=$2 - shift 2 - ;; - -h|--h*) - cat <<\EOF -Usage: ylwrap [--help|--version] INPUT [OUTPUT DESIRED]... -- PROGRAM [ARGS]... - -Wrapper for lex/yacc invocations, renaming files as desired. - - INPUT is the input file - OUTPUT is one file PROG generates - DESIRED is the file we actually want instead of OUTPUT - PROGRAM is program to run - ARGS are passed to PROG - -Any number of OUTPUT,DESIRED pairs may be used. - -Report bugs to . -EOF - exit $? - ;; - -v|--v*) - echo "ylwrap $scriptversion" - exit $? - ;; -esac - - -# The input. -input="$1" -shift -case "$input" in - [\\/]* | ?:[\\/]*) - # Absolute path; do nothing. - ;; - *) - # Relative path. Make it absolute. - input="`pwd`/$input" - ;; -esac - -pairlist= -while test "$#" -ne 0; do - if test "$1" = "--"; then - shift - break - fi - pairlist="$pairlist $1" - shift -done - -# The program to run. -prog="$1" -shift -# Make any relative path in $prog absolute. -case "$prog" in - [\\/]* | ?:[\\/]*) ;; - *[\\/]*) prog="`pwd`/$prog" ;; -esac - -# FIXME: add hostname here for parallel makes that run commands on -# other machines. But that might take us over the 14-char limit. -dirname=ylwrap$$ -trap "cd '`pwd`'; rm -rf $dirname > /dev/null 2>&1" 1 2 3 15 -mkdir $dirname || exit 1 - -cd $dirname - -case $# in - 0) "$prog" "$input" ;; - *) "$prog" "$@" "$input" ;; -esac -ret=$? - -if test $ret -eq 0; then - set X $pairlist - shift - first=yes - # Since DOS filename conventions don't allow two dots, - # the DOS version of Bison writes out y_tab.c instead of y.tab.c - # and y_tab.h instead of y.tab.h. Test to see if this is the case. - y_tab_nodot="no" - if test -f y_tab.c || test -f y_tab.h; then - y_tab_nodot="yes" - fi - - # The directory holding the input. - input_dir=`echo "$input" | sed -e 's,\([\\/]\)[^\\/]*$,\1,'` - # Quote $INPUT_DIR so we can use it in a regexp. - # FIXME: really we should care about more than `.' and `\'. - input_rx=`echo "$input_dir" | sed 's,\\\\,\\\\\\\\,g;s,\\.,\\\\.,g'` - - while test "$#" -ne 0; do - from="$1" - # Handle y_tab.c and y_tab.h output by DOS - if test $y_tab_nodot = "yes"; then - if test $from = "y.tab.c"; then - from="y_tab.c" - else - if test $from = "y.tab.h"; then - from="y_tab.h" - fi - fi - fi - if test -f "$from"; then - # If $2 is an absolute path name, then just use that, - # otherwise prepend `../'. - case "$2" in - [\\/]* | ?:[\\/]*) target="$2";; - *) target="../$2";; - esac - - # We do not want to overwrite a header file if it hasn't - # changed. This avoid useless recompilations. However the - # parser itself (the first file) should always be updated, - # because it is the destination of the .y.c rule in the - # Makefile. Divert the output of all other files to a temporary - # file so we can compare them to existing versions. - if test $first = no; then - realtarget="$target" - target="tmp-`echo $target | sed s/.*[\\/]//g`" - fi - # Edit out `#line' or `#' directives. - # - # We don't want the resulting debug information to point at - # an absolute srcdir; it is better for it to just mention the - # .y file with no path. - # - # We want to use the real output file name, not yy.lex.c for - # instance. - # - # We want the include guards to be adjusted too. - FROM=`echo "$from" | sed \ - -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'\ - -e 's/[^ABCDEFGHIJKLMNOPQRSTUVWXYZ]/_/g'` - TARGET=`echo "$2" | sed \ - -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'\ - -e 's/[^ABCDEFGHIJKLMNOPQRSTUVWXYZ]/_/g'` - - sed -e "/^#/!b" -e "s,$input_rx,," -e "s,$from,$2," \ - -e "s,$FROM,$TARGET," "$from" >"$target" || ret=$? - - # Check whether header files must be updated. - if test $first = no; then - if test -f "$realtarget" && cmp -s "$realtarget" "$target"; then - echo "$2" is unchanged - rm -f "$target" - else - echo updating "$2" - mv -f "$target" "$realtarget" - fi - fi - else - # A missing file is only an error for the first file. This - # is a blatant hack to let us support using "yacc -d". If -d - # is not specified, we don't want an error when the header - # file is "missing". - if test $first = yes; then - ret=1 - fi - fi - shift - shift - first=no - done -else - ret=$? -fi - -# Remove the directory. -cd .. -rm -rf $dirname - -exit $ret - -# Local Variables: -# mode: shell-script -# sh-indentation: 2 -# eval: (add-hook 'write-file-hooks 'time-stamp) -# time-stamp-start: "scriptversion=" -# time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-end: "$" -# End: -- cgit v1.2.3