reorganize xindy-2.4 build system (part 2)

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

1 files changed, 70 insertions, 73 deletions

diff --git a/Build/source/utils/xindy/configure.ac b/Build/source/utils/xindy/configure.ac
index 958ebc9e3e2..afb3d2bb059 100644
--- a/Build/source/utils/xindy/configure.ac
+++ b/Build/source/utils/xindy/configure.ac
@@ -1,6 +1,6 @@
 dnl Process this file with autoconf to produce a configure script.
 dnl
-dnl   Copyright (C) 2009, 2010 Peter Breitenlohner <tex-live@tug.org>
+dnl   Copyright (C) 2009 - 2011 Peter Breitenlohner <tex-live@tug.org>
 dnl
 dnl   This file is free software; the copyright holder
 dnl   gives unlimited permission to copy and/or distribute it,
@@ -14,15 +14,10 @@ dnl  Copyright (C) 2008,2009 by Joachim Schrod.
 dnl
 dnl *********************************************************************
 dnl
-AC_PREREQ([2.65])
-dnl Get version string from file; need to discard training newline
-dnl Note: patsubst() or translit() don't work here, it's not possible
-dnl to specify substitution of \n, so we use substr. This won't work
-dnl if file VERSION is missing its trailing newline...
-m4_define([VERSION_NL], m4_include([xindy/VERSION]))
-m4_define([xindy_version], m4_substr(VERSION_NL, 0, m4_eval(m4_len(VERSION_NL)-1)))
+m4_define([xindy_version], [2.4])[]dnl using unmodified xindy source tree
 AC_INIT([xindy for TeX Live], xindy_version, [tex-k@tug.org])
-AC_CONFIG_SRCDIR([xindy/ChangeLog.Gour])
+AC_PREREQ([2.65])
+AC_CONFIG_SRCDIR([xindy-]xindy_version[/ChangeLog.Gour])
 AC_CONFIG_AUX_DIR([../../build-aux])
 AC_CONFIG_MACRO_DIR([../../m4])
 
@@ -134,75 +129,77 @@ AC_CHECK_FUNCS([strtoul], [],
 echo timestamp >config.force
 fi
 
+AC_SUBST([XINDY_TREE], [xindy-]xindy_version)
+
 AM_CONDITIONAL([CLISP_RUNTIME], [test "x$with_clisp_runtime" != xsystem])
 AM_CONDITIONAL([BUILDRULES], [test "x$enable_xindy_rules" = xyes])
 AM_CONDITIONAL([BUILDDOCS], [test "x$enable_xindy_docs" = xyes])
 
 AC_CONFIG_FILES([Makefile \
-		xindy/Makefile \
-		xindy/src/Makefile \
-		xindy/tex2xindy/Makefile \
-		xindy/modules/Makefile \
-		xindy/modules/base/Makefile \
-		xindy/modules/class/Makefile \
-		xindy/modules/lang/Makefile \
-		xindy/modules/lang/german/Makefile \
-		xindy/modules/lang/latin/Makefile \
-		xindy/modules/ord/Makefile \
-		xindy/modules/rules/Makefile \
-		xindy/modules/styles/Makefile \
-		xindy/user-commands/Makefile \
-		xindy/make-rules/Makefile \
-		xindy/make-rules/alphabets/Makefile \
-		xindy/make-rules/alphabets/albanian/Makefile \
-		xindy/make-rules/alphabets/belarusian/Makefile \
-		xindy/make-rules/alphabets/bulgarian/Makefile \
-		xindy/make-rules/alphabets/croatian/Makefile \
-		xindy/make-rules/alphabets/czech/Makefile \
-		xindy/make-rules/alphabets/danish/Makefile \
-		xindy/make-rules/alphabets/dutch/Makefile \
-		xindy/make-rules/alphabets/english/Makefile \
-		xindy/make-rules/alphabets/esperanto/Makefile \
-		xindy/make-rules/alphabets/estonian/Makefile \
-		xindy/make-rules/alphabets/finnish/Makefile \
-		xindy/make-rules/alphabets/french/Makefile \
-		xindy/make-rules/alphabets/general/Makefile \
-		xindy/make-rules/alphabets/georgian/Makefile \
-		xindy/make-rules/alphabets/german/Makefile \
-		xindy/make-rules/alphabets/greek/Makefile \
-		xindy/make-rules/alphabets/gypsy/Makefile \
-		xindy/make-rules/alphabets/hausa/Makefile \
-		xindy/make-rules/alphabets/hebrew/Makefile \
-		xindy/make-rules/alphabets/hungarian/Makefile \
-		xindy/make-rules/alphabets/icelandic/Makefile \
-		xindy/make-rules/alphabets/italian/Makefile \
-		xindy/make-rules/alphabets/klingon/Makefile \
-		xindy/make-rules/alphabets/kurdish/Makefile \
-		xindy/make-rules/alphabets/latin/Makefile \
-		xindy/make-rules/alphabets/latvian/Makefile \
-		xindy/make-rules/alphabets/lithuanian/Makefile \
-		xindy/make-rules/alphabets/lower-sorbian/Makefile \
-		xindy/make-rules/alphabets/macedonian/Makefile \
-		xindy/make-rules/alphabets/mongolian/Makefile \
-		xindy/make-rules/alphabets/norwegian/Makefile \
-		xindy/make-rules/alphabets/polish/Makefile \
-		xindy/make-rules/alphabets/portuguese/Makefile \
-		xindy/make-rules/alphabets/romanian/Makefile \
-		xindy/make-rules/alphabets/russian/Makefile \
-		xindy/make-rules/alphabets/serbian/Makefile \
-		xindy/make-rules/alphabets/slovak/Makefile \
-		xindy/make-rules/alphabets/slovenian/Makefile \
-		xindy/make-rules/alphabets/spanish/Makefile \
-		xindy/make-rules/alphabets/swedish/Makefile \
-		xindy/make-rules/alphabets/test1/Makefile \
-		xindy/make-rules/alphabets/turkish/Makefile \
-		xindy/make-rules/alphabets/ukrainian/Makefile \
-		xindy/make-rules/alphabets/upper-sorbian/Makefile \
-		xindy/make-rules/alphabets/vietnamese/Makefile \
-		xindy/make-rules/inputenc/Makefile \
-		xindy/make-rules/styles/Makefile \
-		xindy/doc/Makefile \
-	    	xindy/doc/style-tutorial/Makefile \
+		xindy-]xindy_version[/Makefile \
+		xindy-]xindy_version[/src/Makefile \
+		xindy-]xindy_version[/tex2xindy/Makefile \
+		xindy-]xindy_version[/modules/Makefile \
+		xindy-]xindy_version[/modules/base/Makefile \
+		xindy-]xindy_version[/modules/class/Makefile \
+		xindy-]xindy_version[/modules/lang/Makefile \
+		xindy-]xindy_version[/modules/lang/german/Makefile \
+		xindy-]xindy_version[/modules/lang/latin/Makefile \
+		xindy-]xindy_version[/modules/ord/Makefile \
+		xindy-]xindy_version[/modules/rules/Makefile \
+		xindy-]xindy_version[/modules/styles/Makefile \
+		xindy-]xindy_version[/user-commands/Makefile \
+		xindy-]xindy_version[/make-rules/Makefile \
+		xindy-]xindy_version[/make-rules/alphabets/Makefile \
+		xindy-]xindy_version[/make-rules/alphabets/albanian/Makefile \
+		xindy-]xindy_version[/make-rules/alphabets/belarusian/Makefile \
+		xindy-]xindy_version[/make-rules/alphabets/bulgarian/Makefile \
+		xindy-]xindy_version[/make-rules/alphabets/croatian/Makefile \
+		xindy-]xindy_version[/make-rules/alphabets/czech/Makefile \
+		xindy-]xindy_version[/make-rules/alphabets/danish/Makefile \
+		xindy-]xindy_version[/make-rules/alphabets/dutch/Makefile \
+		xindy-]xindy_version[/make-rules/alphabets/english/Makefile \
+		xindy-]xindy_version[/make-rules/alphabets/esperanto/Makefile \
+		xindy-]xindy_version[/make-rules/alphabets/estonian/Makefile \
+		xindy-]xindy_version[/make-rules/alphabets/finnish/Makefile \
+		xindy-]xindy_version[/make-rules/alphabets/french/Makefile \
+		xindy-]xindy_version[/make-rules/alphabets/general/Makefile \
+		xindy-]xindy_version[/make-rules/alphabets/georgian/Makefile \
+		xindy-]xindy_version[/make-rules/alphabets/german/Makefile \
+		xindy-]xindy_version[/make-rules/alphabets/greek/Makefile \
+		xindy-]xindy_version[/make-rules/alphabets/gypsy/Makefile \
+		xindy-]xindy_version[/make-rules/alphabets/hausa/Makefile \
+		xindy-]xindy_version[/make-rules/alphabets/hebrew/Makefile \
+		xindy-]xindy_version[/make-rules/alphabets/hungarian/Makefile \
+		xindy-]xindy_version[/make-rules/alphabets/icelandic/Makefile \
+		xindy-]xindy_version[/make-rules/alphabets/italian/Makefile \
+		xindy-]xindy_version[/make-rules/alphabets/klingon/Makefile \
+		xindy-]xindy_version[/make-rules/alphabets/kurdish/Makefile \
+		xindy-]xindy_version[/make-rules/alphabets/latin/Makefile \
+		xindy-]xindy_version[/make-rules/alphabets/latvian/Makefile \
+		xindy-]xindy_version[/make-rules/alphabets/lithuanian/Makefile \
+		xindy-]xindy_version[/make-rules/alphabets/lower-sorbian/Makefile \
+		xindy-]xindy_version[/make-rules/alphabets/macedonian/Makefile \
+		xindy-]xindy_version[/make-rules/alphabets/mongolian/Makefile \
+		xindy-]xindy_version[/make-rules/alphabets/norwegian/Makefile \
+		xindy-]xindy_version[/make-rules/alphabets/polish/Makefile \
+		xindy-]xindy_version[/make-rules/alphabets/portuguese/Makefile \
+		xindy-]xindy_version[/make-rules/alphabets/romanian/Makefile \
+		xindy-]xindy_version[/make-rules/alphabets/russian/Makefile \
+		xindy-]xindy_version[/make-rules/alphabets/serbian/Makefile \
+		xindy-]xindy_version[/make-rules/alphabets/slovak/Makefile \
+		xindy-]xindy_version[/make-rules/alphabets/slovenian/Makefile \
+		xindy-]xindy_version[/make-rules/alphabets/spanish/Makefile \
+		xindy-]xindy_version[/make-rules/alphabets/swedish/Makefile \
+		xindy-]xindy_version[/make-rules/alphabets/test1/Makefile \
+		xindy-]xindy_version[/make-rules/alphabets/turkish/Makefile \
+		xindy-]xindy_version[/make-rules/alphabets/ukrainian/Makefile \
+		xindy-]xindy_version[/make-rules/alphabets/upper-sorbian/Makefile \
+		xindy-]xindy_version[/make-rules/alphabets/vietnamese/Makefile \
+		xindy-]xindy_version[/make-rules/inputenc/Makefile \
+		xindy-]xindy_version[/make-rules/styles/Makefile \
+		xindy-]xindy_version[/doc/Makefile \
+	    	xindy-]xindy_version[/doc/style-tutorial/Makefile \
 ])
 
 AC_OUTPUT