diff options
author | Peter Breitenlohner <peb@mppmu.mpg.de> | 2009-05-08 13:08:15 +0000 |
---|---|---|
committer | Peter Breitenlohner <peb@mppmu.mpg.de> | 2009-05-08 13:08:15 +0000 |
commit | ab366acfe8bae5433f1370910f352db9b861a648 (patch) | |
tree | 0cd2f44203ce694edaab0b1476e207a33f8ecd8c /Build/source/texk | |
parent | 3bdd1404ffe5d2be044d80526e6224b8e057674e (diff) |
new build system: utils/t1utils/ and utils/xindy/
git-svn-id: svn://tug.org/texlive/trunk@13005 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk')
-rw-r--r-- | Build/source/texk/Makefile.am | 4 | ||||
-rw-r--r-- | Build/source/texk/Makefile.in | 3 | ||||
-rwxr-xr-x | Build/source/texk/configure | 20 | ||||
-rw-r--r-- | Build/source/texk/web2c/ac/web2c.ac | 4 | ||||
-rwxr-xr-x | Build/source/texk/web2c/configure | 4 | ||||
-rw-r--r-- | Build/source/texk/web2c/configure.ac | 2 | ||||
-rw-r--r-- | Build/source/texk/web2c/pdftexdir/ChangeLog | 5 |
7 files changed, 33 insertions, 9 deletions
diff --git a/Build/source/texk/Makefile.am b/Build/source/texk/Makefile.am index b913d3f6c07..efa524ba3df 100644 --- a/Build/source/texk/Makefile.am +++ b/Build/source/texk/Makefile.am @@ -3,7 +3,9 @@ ## Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org> ## You may freely use, modify and/or distribute this file. ## -ACLOCAL_AMFLAGS = -I ../m4 +## Use 'aclocal --force' (for "computed m4_sinclude") +## +ACLOCAL_AMFLAGS = -I ../m4 --force SUBDIRS = dummy . $(SUBTEXK) DIST_SUBDIRS = dummy $(DIST_SUBTEXK) diff --git a/Build/source/texk/Makefile.in b/Build/source/texk/Makefile.in index c4dea25ae0d..ae50a8712f9 100644 --- a/Build/source/texk/Makefile.in +++ b/Build/source/texk/Makefile.in @@ -69,6 +69,7 @@ am__aclocal_m4_deps = $(top_srcdir)/../m4/kpse-common.m4 \ $(top_srcdir)/../utils/t1utils/ac/withenable.ac \ $(top_srcdir)/../utils/tpic2pdftex/ac/withenable.ac \ $(top_srcdir)/../utils/vlna/ac/withenable.ac \ + $(top_srcdir)/../utils/xindy/ac/withenable.ac \ $(top_srcdir)/../texk/ac/withenable.ac \ $(top_srcdir)/../texk/web2c/ac/withenable.ac \ $(top_srcdir)/../texk/web2c/ac/web2c.ac \ @@ -233,7 +234,7 @@ target_alias = @target_alias@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -ACLOCAL_AMFLAGS = -I ../m4 +ACLOCAL_AMFLAGS = -I ../m4 --force SUBDIRS = dummy . $(SUBTEXK) DIST_SUBDIRS = dummy $(DIST_SUBTEXK) SUBTEXK_AUX = subtexkdir-configure subtexkdir-conf.args diff --git a/Build/source/texk/configure b/Build/source/texk/configure index 6ddd3f391e9..45bed7cef18 100755 --- a/Build/source/texk/configure +++ b/Build/source/texk/configure @@ -692,6 +692,7 @@ enable_psutils enable_t1utils enable_tpic2pdftex enable_vlna +enable_xindy enable_web2c with_editor enable_auto_core @@ -1473,12 +1474,12 @@ Optional Features: --disable-t1utils do not build the t1utils package --disable-tpic2pdftex do not build the tpic2pdftex package --disable-vlna do not build the vlna package + --enable-xindy build the xindy package --disable-web2c do not build the web2c (TeX & Co.) package --enable-auto-core cause TeX&MF to dump core, given a certain filename --disable-dump-share make fmt/base/mem files architecture-dependent - --disable-ipc disable TeX's --ipc option, i.e., pipe to a - program + --enable-ipc enable TeX's --ipc option, i.e., pipe to a program --disable-tex do not compile and install TeX --enable-etex compile and install e-TeX --disable-aleph do not compile and install Aleph @@ -2338,6 +2339,21 @@ $as_echo "$as_me: Assuming \`--enable-vlna=$enable_vlna'" >&6;} esac +## utils/xindy/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory utils/xindy/ +## configure options and TL libraries required for xindy +# Check whether --enable-xindy was given. +if test "${enable_xindy+set}" = set; then + enableval=$enable_xindy; +fi +case $enable_xindy in #( + yes|no);; #( + *) enable_xindy=no + { $as_echo "$as_me:$LINENO: Assuming \`--enable-xindy=$enable_xindy'" >&5 +$as_echo "$as_me: Assuming \`--enable-xindy=$enable_xindy'" >&6;} + ac_configure_args="$ac_configure_args '--enable-xindy=$enable_xindy'";; +esac + + ## texk/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/ diff --git a/Build/source/texk/web2c/ac/web2c.ac b/Build/source/texk/web2c/ac/web2c.ac index c387810e650..94ee84f2095 100644 --- a/Build/source/texk/web2c/ac/web2c.ac +++ b/Build/source/texk/web2c/ac/web2c.ac @@ -18,8 +18,8 @@ AC_ARG_ENABLE([dump-share], kpse_indent_26)])[]dnl ## configure options for TeX AC_ARG_ENABLE([ipc], - [AS_HELP_STRING([--disable-ipc], - [disable TeX's --ipc option, i.e., pipe to a program], + [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], []], diff --git a/Build/source/texk/web2c/configure b/Build/source/texk/web2c/configure index 2bd844b3a0c..3544d4fff66 100755 --- a/Build/source/texk/web2c/configure +++ b/Build/source/texk/web2c/configure @@ -1736,7 +1736,7 @@ Optional Features: --enable-cxx-runtime-hack link C++ runtime statically --enable-auto-core cause TeX&MF to dump core, given a certain filename --disable-dump-share make fmt/base/mem files architecture-dependent - --disable-ipc disable TeX's --ipc option, i.e., pipe to a program + --enable-ipc enable TeX's --ipc option, i.e., pipe to a program --disable-tex do not compile and install TeX --enable-etex compile and install e-TeX --disable-aleph do not compile and install Aleph @@ -17728,7 +17728,7 @@ fi case $enable_ipc in yes|no) : ;; - *) enable_ipc=yes ;; + *) enable_ipc=no ;; esac diff --git a/Build/source/texk/web2c/configure.ac b/Build/source/texk/web2c/configure.ac index 2556a517803..fe560ea0419 100644 --- a/Build/source/texk/web2c/configure.ac +++ b/Build/source/texk/web2c/configure.ac @@ -62,7 +62,7 @@ AS_IF([test "x$enable_dump_share" = xno], AS_CASE([$enable_ipc], [yes|no], [], - [enable_ipc=yes]) + [enable_ipc=no]) KPSE_CHECK_WIN32 AM_CONDITIONAL([WIN32], [test "x$kpse_cv_have_win32" != xno]) diff --git a/Build/source/texk/web2c/pdftexdir/ChangeLog b/Build/source/texk/web2c/pdftexdir/ChangeLog index 07175b9784b..d341349299b 100644 --- a/Build/source/texk/web2c/pdftexdir/ChangeLog +++ b/Build/source/texk/web2c/pdftexdir/ChangeLog @@ -1,3 +1,8 @@ +2009-05-07 Norbert Preinig <preining@logic.at> + + * pdftosrc.cc: add warning that poppler version doesn't support + object streams. + 2009-05-05 Peter Breitenlohner <peb@mppmu.mpg.de> * pdftoepdf.cc, pdftosrc.cc, utils.c: adapt for poppler. |