summaryrefslogtreecommitdiff
path: root/Build
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2008-03-25 00:14:10 +0000
committerKarl Berry <karl@freefriends.org>2008-03-25 00:14:10 +0000
commita36644af38baa33f8891811e1b46a5fdbfe6cc04 (patch)
tree07333320bdfd0423a851ccc3da676447975e07c4 /Build
parente6dde83022737f6d6386f9da7ec134da932012c7 (diff)
enable xindy, document prereqs
git-svn-id: svn://tug.org/texlive/trunk@7137 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build')
-rw-r--r--Build/source/ChangeLog10
-rw-r--r--Build/source/README27
-rwxr-xr-xBuild/source/configure14
-rw-r--r--Build/source/stamp-aclocal2
-rw-r--r--Build/source/stamp-configure2
-rw-r--r--Build/source/utils/README30
-rw-r--r--Build/source/withenable.ac1
7 files changed, 76 insertions, 10 deletions
diff --git a/Build/source/ChangeLog b/Build/source/ChangeLog
index ce147c9bfa5..5e65e76c2f7 100644
--- a/Build/source/ChangeLog
+++ b/Build/source/ChangeLog
@@ -1,3 +1,13 @@
+2008-03-25 Karl Berry <karl@tug.org>
+
+ * withenable.ac: enable xindy; rebuild configure.
+ * README,
+ * utils/README: document clisp & libffcall prerequisites.
+
+2008-03-24 Karl Berry <karl@tug.org>
+
+ * Build: exit with appropriate status
+
2008-03-09 Karl Berry <karl@tug.org>
* Build: exit if no binaries.
diff --git a/Build/source/README b/Build/source/README
index ec736fa13ad..f0a45438ecb 100644
--- a/Build/source/README
+++ b/Build/source/README
@@ -2,19 +2,30 @@ $Id$
Copyright 2004, 2006, 2007, 2008 TeX Users Group.
You may freely use, modify and/or distribute this file.
-To build the source tree, run ./Build.
+To configure and make the source tree, run ./Build.
To build (mostly) without optimization, run ./Build --debug.
+To make without configuring, run TL_CONFIGURE=true ./Build.
+
+(Nearly everything the Build script does can be overridden via
+environment variables; just take a look to see all the names.)
Prerequisites:
-- Bison and Flex are needed for web2c.
-- libfontconfig (development) must be present for XeTeX to build, except
- on MacOSX.
-- A terminal library such as ncurses must be present (both headers
- and library) for Texinfo to build.
-- X11 headers and libraries are required for pdfopen and xdvi to build.
+- GNU clisp and GNU libffcall, must be present for xindy. See more
+ details in utils/README. (Alternative: Build --without-xindy.)
+
+- A terminal library such as ncurses (both headers and library, e.g, a
+ "development" package) must be present for Texinfo.
+ (Alternative: Build --without-texinfo.)
+
+- libfontconfig (again both headers and library) must be present for
+ XeTeX, except on MacOSX. (Alternative: Build --without-xetex.)
+
+- X11 headers and libraries must be present for pdfopen and xdvi.
+
+- Bison and Flex (or maybe equivalents) are needed for web2c.
The binaries will be left in ./inst/bin/<stdplatform>.
-Ignore the other files and directories in ./inst.
+For TeX Live, ignore the other files and directories that end up in ./inst.
The new binaries are not directly usable from that location. Instead,
copy them to Master/bin/<tlplatformname>/.
diff --git a/Build/source/configure b/Build/source/configure
index 6a6be082a35..419276d7a9a 100755
--- a/Build/source/configure
+++ b/Build/source/configure
@@ -765,6 +765,7 @@ utils/psutils
utils/t1utils
utils/texinfo
utils/tpic2pdftex
+utils/xindy
texk'
# Initialize some variables set by options.
@@ -1371,6 +1372,7 @@ Optional Packages:
--without-t1utils do not build the t1utils package
--without-texinfo do not build the texinfo package
--without-tpic2pdftex do not build the tpic2pdftex package
+ --without-xindy do not build the xindy package
--without-afm2pl do not build the afm2pl package
--without-bibtex8 do not build the bibtex8 package
--without-cjkutils do not build the cjkutils package
@@ -5314,6 +5316,7 @@ export with_cxx_runtime_hack
# withenable.ac - Written long ago by Thomas Esser and Sebastian Rahtz.
+# $Id: withenable.ac 7122 2008-03-24 13:49:08Z martin $
# Public domain.
@@ -5367,6 +5370,11 @@ if test "${with_tpic2pdftex+set}" = set; then
withval=$with_tpic2pdftex;
fi
+# Check whether --with-xindy was given.
+if test "${with_xindy+set}" = set; then
+ withval=$with_xindy;
+fi
+
@@ -9354,6 +9362,12 @@ if test -d $srcdir/utils/tpic2pdftex; then
subdirs="$subdirs utils/tpic2pdftex"
fi
fi
+if test -d $srcdir/utils/xindy; then
+ if test "x$with_xindy" != xno; then
+ ESUBDIRS="$ESUBDIRS utils/xindy"
+ subdirs="$subdirs utils/xindy"
+ fi
+fi
diff --git a/Build/source/stamp-aclocal b/Build/source/stamp-aclocal
index 172aa7a902e..76de46aea24 100644
--- a/Build/source/stamp-aclocal
+++ b/Build/source/stamp-aclocal
@@ -1 +1 @@
-Tue Mar 11 01:10:34 CET 2008
+Tue Mar 25 00:53:06 CET 2008
diff --git a/Build/source/stamp-configure b/Build/source/stamp-configure
index b2aecaebdcd..9a1523fbc6a 100644
--- a/Build/source/stamp-configure
+++ b/Build/source/stamp-configure
@@ -1 +1 @@
-Tue Mar 11 01:10:37 CET 2008
+Tue Mar 25 00:53:10 CET 2008
diff --git a/Build/source/utils/README b/Build/source/utils/README
index e245b94893f..f132ae6fc32 100644
--- a/Build/source/utils/README
+++ b/Build/source/utils/README
@@ -35,3 +35,33 @@ vlna - only for Windows
xindy 2.3 - ok 24mar08
(with numerous adaptations for TL by Vladimir)
http://www.ctan.org/tex-archive/indexing/xindy/
+
+ xindy requires GNU clisp and GNU libffcall. If you can find
+ prepackaged versions for your system, go ahead and use them; their
+ precise version shouldn't matter.
+
+ If you need or want to compile them from source, here is what karl did
+ on i386-linux -- but install the latest GNU libtool first:
+
+wget http://www.haible.de/bruno/gnu/ffcall-1.10.tar.gz
+tar xf ffcall-1.10.tar.gz && cd ffcall-1.10
+configure --prefix=/usr/local/gnu --enable-shared \
+&& make && make install # as usual
+
+wget ftp://ftp.gnu.org/pub/gnu/clisp/latest/clisp-2.44.1.tar.gz
+tar xf clisp-2.44.1.tar.gz && cd clisp-2.44.1
+configure --prefix=/usr/local/gnu --ignore-absence-of-libsigsegv \
+ --with-libffcall-prefix=/usr/local/gnu \
+&& cd src && make && make install
+
+ Of course, adjust paths as desired.
+
+ clisp complains about my stack size being too small and I should run
+ ulimit, but I ignored that. (If you actually care about clisp per se,
+ you should probably also install GNU libsigsegv; I didn't.)
+
+ Both tarballs are also available at ftp://tug.org/dist.
+
+ (Failed variation: clisp failed to link against static libffcall,
+ apparently wanting a dynamic library. Not sure if configure
+ --without-dynamic-modules would have solved it.)
diff --git a/Build/source/withenable.ac b/Build/source/withenable.ac
index 63a84a862d4..2aea16019e8 100644
--- a/Build/source/withenable.ac
+++ b/Build/source/withenable.ac
@@ -18,6 +18,7 @@ psutils
t1utils
texinfo
tpic2pdftex
+xindy
])
# Options to avoid/include the packages in utils/.