summaryrefslogtreecommitdiff
path: root/Build/source/utils
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2009-06-15 15:14:49 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2009-06-15 15:14:49 +0000
commitfa4a6e52817931e2231cf5804bbe700c759fd420 (patch)
tree01ee07f7ec7d907331b9f9caaedf1e113f9961d5 /Build/source/utils
parentaa5c6d6d8dd6d2d7e34150060ef7ed5c23139efa (diff)
regenerate
git-svn-id: svn://tug.org/texlive/trunk@13755 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/utils')
-rwxr-xr-xBuild/source/utils/configure33
-rwxr-xr-xBuild/source/utils/xindy/configure13
2 files changed, 32 insertions, 14 deletions
diff --git a/Build/source/utils/configure b/Build/source/utils/configure
index ebae40dfc43..bb9f6185a68 100755
--- a/Build/source/utils/configure
+++ b/Build/source/utils/configure
@@ -1537,8 +1537,7 @@ Optional Features:
do not run mktextfm if TFM file missing
--disable-mkocp-default do not run mkocp if OCP file missing
--disable-mkofm-default do not run mkofm if OFM file missing
- --disable-mktexfmt-default
- do not run mktexfmt if format file missing
+ --enable-mktexfmt-default run mktexfmt if format file missing
--enable-mktextex-default run mktextex if TeX source missing
--enable-maintainer-mode enable make rules and dependencies not useful
(and sometimes confusing) to the casual installer
@@ -2191,13 +2190,28 @@ esac
ac_configure_args="$ac_configure_args '--enable-cxx-runtime-hack'" ;;
esac
- case $enable_shared in
- yes | no) : ;;
+fi
+case $enable_shared in
+ no) : ;;
+ yes ) if test "x$enable_native_texlive_build" = xyes; then
+ { { $as_echo "$as_me:$LINENO: error: you can not use a shared Kpathsea library for a native TeX Live build" >&5
+$as_echo "$as_me: error: you can not use a shared Kpathsea library for a native TeX Live build" >&2;}
+ { (exit 1); exit 1; }; }
+fi
+ ;;
*) enable_shared=no
- ac_configure_args="$ac_configure_args '--disable-shared'" ;;
+ ac_configure_args="$ac_configure_args '--disable-shared'" ;;
+esac
+
+case $enable_texlive_build in
+ yes) : ;;
+ no) { { $as_echo "$as_me:$LINENO: error: you can not configure the TeX Live tree with \`--disable-texlive-build'" >&5
+$as_echo "$as_me: error: you can not configure the TeX Live tree with \`--disable-texlive-build'" >&2;}
+ { (exit 1); exit 1; }; } ;;
+ *) enable_texlive_build=yes
+ ac_configure_args="$ac_configure_args '--enable-texlive-build'" ;;
esac
-fi
# Check whether --enable-multiplatform was given.
if test "${enable_multiplatform+set}" = set; then
enableval=$enable_multiplatform;
@@ -3210,9 +3224,8 @@ $as_echo "$as_me: Assuming installed \`kpathsea' headers and library" >&6;}
ac_configure_args="$ac_configure_args '--with-system-kpathsea=$with_system_kpathsea'"
fi
-## texk/kpathsea/ac/web2c.ac: configure.ac fragment for the TeX Live
-## subdirectory texk/kpathsea.
-## configure defaults for mktexfmt & Co.
+## texk/kpathsea/ac/web2c.ac: configure.ac fragment for the TeX Live subdirectory texk/kpathsea/
+## configure options for mktextmf-default & Co
# Check whether --enable-mktexmf-default was given.
if test "${enable_mktexmf_default+set}" = set; then
enableval=$enable_mktexmf_default;
@@ -3259,7 +3272,7 @@ if test "${enable_mktexfmt_default+set}" = set; then
fi
case $enable_mktexfmt_default in
yes|no) : ;;
- *) enable_mktexfmt_default=yes ;;
+ *) enable_mktexfmt_default=no ;;
esac
# Check whether --enable-mktextex-default was given.
if test "${enable_mktextex_default+set}" = set; then
diff --git a/Build/source/utils/xindy/configure b/Build/source/utils/xindy/configure
index e6f68f4fc37..fada22d85ac 100755
--- a/Build/source/utils/xindy/configure
+++ b/Build/source/utils/xindy/configure
@@ -755,6 +755,7 @@ enable_dependency_tracking
enable_xindy_rules
enable_xindy_docs
with_xindy_recode
+enable_texlive_build
'
ac_precious_vars='build_alias
host_alias
@@ -1401,6 +1402,7 @@ Optional Features:
--enable-dependency-tracking do not reject slow dependency extractors
--enable-xindy-rules build and install make-rules package
--enable-xindy-docs build and install documentation
+ --enable-texlive-build Build as part of a TeX Live installation
Optional Packages:
--with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
@@ -4032,7 +4034,11 @@ test "x$enable_xindy_docs" = xyes || enable_xindy_docs=no
# This option has 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]))
+# Check whether --enable-texlive-build was given.
+if test "${enable_texlive_build+set}" = set; then
+ enableval=$enable_texlive_build;
+fi
+
if test "x$with_xindy_recode" != xyes; then
CONVERT_FROM_UTF8="iconv -f UTF-8 -t "
@@ -4082,15 +4088,14 @@ $as_echo "$as_me: error: --with-xindy-recode specified, but \`recode' not found"
fi
-## if test "x$enable_native_texlive_build" = xyes -a "x$datadir" = "x$prefix"; then
-if test "x$enable_native_texlive_build" = xyes; then
+if test "x$enable_texlive_build" = xyes; then
{ $as_echo "$as_me:$LINENO: Using installation layout for TeX Live" >&5
$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"
fi
- if test "x$enable_native_texlive_build" = xyes; then
+ if test "x$enable_texlive_build" = xyes; then
TETEX_BUILD_TRUE=
TETEX_BUILD_FALSE='#'
else