rte/Makefile.am, configure.ac: removed support for building clisp

from source integrated into xindy distribution.

the --with-clisp option provides a more powerful way of using any
clisp, either an OS-supplied, or built from source with any
desired configuration (e.g. with statically linked libsigsegv and
libffcall, without readline and/or ncurses, etc; this was not
possible with integrated clisp build)

also made some wording improvements in configure.ac


git-svn-id: svn://tug.org/texlive/trunk@7197 c570f23f-e606-0410-a88d-b1316a301751

2 files changed, 24 insertions, 94 deletions

diff --git a/Build/source/utils/xindy/configure.ac b/Build/source/utils/xindy/configure.ac
index ab53deff116..7789b96e0c1 100644
--- a/Build/source/utils/xindy/configure.ac
+++ b/Build/source/utils/xindy/configure.ac
@@ -24,7 +24,6 @@
 AC_PREREQ(2.60)
 AC_INIT([xindy], [2.3], [xindy-discuss@lists.sourceforge.net])
 
-## make dist doesn't work yet, since configure makes CLISP.
 AM_INIT_AUTOMAKE([foreign])
 AM_MAINTAINER_MODE
 
@@ -35,28 +34,24 @@ dnl test "x$LEX" != "x:" || AC_MSG_ERROR([flex or lex is required, but not found
 AC_PROG_INSTALL
 AC_PROG_MAKE_SET
 
-dnl test for building make-rules
 AC_ARG_ENABLE(make-rules, AS_HELP_STRING([--enable-make-rules],[build and install make-rules package (default is YES)]))
-dnl test for building Documentation
 AC_ARG_ENABLE(docs, AS_HELP_STRING([--enable-docs],[build and install documentation (default is YES)]))
-
-# Building inside TeX Live?
-AC_ARG_ENABLE(tetex-build, AS_HELP_STRING([--enable-tetex-build],[Build as part of a teTeX installation]))
+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)]))
 
 if test "x$enable_tetex_build" = xyes; then
-  if test ! -d $srcdir/../../texk/kpathsea; then
-    AC_MSG_ERROR([
-=========================================
-
-You specified --enable-tetex-build, but I can't find the kpathsea
-directory.  I expected it to be in $srcdir/../../texk/kpathsea.
-
-=========================================])
-  fi
+dnl we don't really care whether $srcdir/../../texk/kpathsea is found, so don't test for it.
+  AC_MSG_NOTICE([Using installation layout for TeX Live])
   docdir="$prefix/texmf/doc/$PACKAGE_NAME"
   mandir="$prefix/texmf/doc/man"
-  if test -z "$enable_docs"; then enable_docs=no; fi
-  if test -z "$enable_make_rules"; then enable_make_rules=no; fi
+  if test -z "$enable_docs"; then
+    AC_MSG_NOTICE([Disabling docs building])
+    enable_docs=no;
+  fi
+  if test -z "$enable_make_rules"; then
+    AC_MSG_NOTICE([Disabling make-rules building])
+    enable_make_rules=no;
+  fi
 fi
 AM_CONDITIONAL([TETEX_BUILD],[test "x$enable_tetex_build" = xyes])
 
@@ -72,45 +67,32 @@ fi
 
 AM_CONDITIONAL([BUILDDOCS], [test "x$enable_docs" != xno])
 
-dnl location of CLISP binary
-AC_ARG_WITH(clisp, AS_HELP_STRING([--with-clisp@<:@=PATH@:>@],[Use the existing CLISP binary instead of re-building CLISP from source in the rte/ directory]))
-
 CLISP=
 if test "x$with_clisp" = xyes; then
   AC_PATH_PROG(CLISP, clisp)
-  if test -z "$CLISP"; then
-    AC_MSG_ERROR([--with-clisp specified, but clisp binary not found in PATH])
-  fi
 elif test "x$with_clisp" = xno; then
-  if test -d "$srcdir/rte/clisp-2.43"; then
-    AC_MSG_NOTICE([Using internal clisp])
-  else
-    AC_MSG_ERROR([--without-clisp specified, but clisp source directory not found at $srcdir/rte/clisp-2.43])
-  fi
+  AC_MSG_ERROR([--without-clisp specified, but clisp is required])
 elif test -n "$with_clisp"; then
   CLISP="$with_clisp"
 else
   AC_PATH_PROG(CLISP, clisp)
-  if test -n "$CLISP"; then
-    :
-  elif test -d "$srcdir/rte/clisp-2.43"; then
-    AC_MSG_NOTICE([Using internal clisp])
-  else
-    AC_MSG_ERROR([clisp binary not found in PATH, nor the clisp source directory at $srcdir/rte/clisp-2.43])
-  fi
 fi
 
 if test -n "$CLISP"; then
-  test -x "$CLISP" || AC_MSG_ERROR([clisp binary is not executable: $CLISP])
+  test -x "$CLISP" || AC_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" || AC_MSG_ERROR([expected file is not found: $CLISP_LIB/clisp-link])
-  test -d "$CLISP_LIB/full" || AC_MSG_ERROR([expected directory is not found: $CLISP_LIB/full])
-  test -d "$CLISP_LIB/linkkit" || AC_MSG_ERROR([expected directory is not found: $CLISP_LIB/linkkit])
+  test -f "$CLISP_LIB/clisp-link" || AC_MSG_ERROR([clisp is not usable: expected file is not found: $CLISP_LIB/clisp-link])
+  test -d "$CLISP_LIB/full" || AC_MSG_ERROR([clisp is not usable: expected directory is not found: $CLISP_LIB/full])
+  test -d "$CLISP_LIB/linkkit" || AC_MSG_ERROR([clisp is not usable: expected directory is not found: $CLISP_LIB/linkkit])
+else
+  AC_MSG_ERROR([clisp is required but not found in PATH.
+Please install clisp or specify the clisp executable location
+via the --with-clisp=... option.])
 fi
 AC_SUBST(CLISP)
-AM_CONDITIONAL([EXT_CLISP], [test -n "$CLISP"])
+AC_SUBST(CLISP_LIB)
 
 # Checks for libraries.
 
diff --git a/Build/source/utils/xindy/rte/Makefile.am b/Build/source/utils/xindy/rte/Makefile.am
index 68d540cfa25..11768f178b5 100644
--- a/Build/source/utils/xindy/rte/Makefile.am
+++ b/Build/source/utils/xindy/rte/Makefile.am
@@ -21,77 +21,25 @@
 ## Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
 ## Boston, MA 02110-1301 USA.
 
-clisp_src = clisp-2.43
-
-clisp_builddir = $(shell pwd)/clisp-build-dir
-
-if EXT_CLISP
-    CLISP_LIB = $(shell $(CLISP) -q -norc -x '(progn (princ *lib-directory*) (values))')
-    export CLISP = @CLISP@
-    CLISP_PREREQ =
-else
-    CLISP_LIB = $(clisp_builddir)
-    export CLISP = $(clisp_builddir)/clisp
-    CLISP_PREREQ = $(clisp_link) $(fulldir)
-endif
-
 export CLISP_LINKKIT = $(CLISP_LIB)/linkkit
-fulldir = $(CLISP_LIB)/full
-clisp_link = $(CLISP_LIB)/clisp-link
 
 binariesdir = ../binaries
 
-#clisp_modules=--with-export-syscalls --with-dynamic-ffi --ignore-absence-of-libsigsegv
-clisp_modules := --with-dynamic-ffi --ignore-absence-of-libsigsegv
-
-# testing for MacOS X platform to circumvent faulty 'readline'
-# provided by Maarten Sneep <maarten.sneep@xs4all.nl>
-# FIXME: GNU make ifeq/endif clauses do not work in Automake files.
-# Either determine that case during configure or make them work.
-#ifeq ($(shell uname -s), Darwin)
-#	clisp_modules += --without-readline
-#endif
-
 all-local: xindy-build-dir
 
-if !EXT_CLISP
-$(clisp_builddir): $(clisp_src)
-	cd $(clisp_src) && ./configure $(clisp_builddir) $(clisp_modules)
-	cd $(clisp_builddir) && ./makemake $(clisp_modules) > Makefile
-
-$(CLISP_PREREQ): $(clisp_builddir)
-	$(MAKE) -C $(clisp_builddir)
-
-# Target names that are easy to type, to build CLISP alone during development.
-clisp-configure: $(clisp_builddir)
-clisp: $(CLISP_PREREQ)
-
-check:
-	$(MAKE) -C $(clisp_builddir) check || $(MAKE) -C $(clisp_builddir) check
-endif
-
 ORDRULES_FILES = ordrules.c ordrules.h rxsub.c rxsub.h mkind.h debug.h link.sh
 
-xindy-build-dir: $(CLISP_PREREQ)
+xindy-build-dir:
 	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
-	sh $(clisp_link) add-module-set ordrules $(fulldir) $@
+	sh $(CLISP_LIB)/clisp-link add-module-set ordrules $(CLISP_LIB)/full $@
 	cp $@/lisp.run $(binariesdir)/xindy.run
 	cp $@/lispinit.mem $(binariesdir)/base.mem
 
 clean-local:
 	rm -rf xindy-build-dir
 	test "$(builddir)" = "$(srcdir)" || for i in $(ORDRULES_FILES); do rm -f ordrules/$$i; done
-if !EXT_CLISP
-	if [ -e $(clisp_builddir) ]; then $(MAKE) -C $(clisp_builddir) clean; fi
-endif
-
-if !EXT_CLISP
-# remove some extra files to match pristine clisp source
-distclean-local: clean
-	rm -rf $(clisp_builddir)
-endif
 
 SUBDIRS = ordrules