summaryrefslogtreecommitdiff
path: root/Build/source
diff options
context:
space:
mode:
authorVladimir Volovich <vvv@vsu.ru>2008-03-26 11:58:20 +0000
committerVladimir Volovich <vvv@vsu.ru>2008-03-26 11:58:20 +0000
commitf1284e6810faf814861702268b6c6df6f62f9725 (patch)
treed1406dd77dbcb8705e230224e83d629ba3f68563 /Build/source
parentb74c59dac2fc1ca24b4e3a5b5b42eacf869eedc1 (diff)
configure.ac: rearranged code to allow TETEX_BUILD override the defaults for enable_make_rules and enable_docs
git-svn-id: svn://tug.org/texlive/trunk@7163 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source')
-rwxr-xr-xBuild/source/utils/xindy/configure121
-rw-r--r--Build/source/utils/xindy/configure.ac29
2 files changed, 72 insertions, 78 deletions
diff --git a/Build/source/utils/xindy/configure b/Build/source/utils/xindy/configure
index 0bcd84c2925..17ef23e270e 100755
--- a/Build/source/utils/xindy/configure
+++ b/Build/source/utils/xindy/configure
@@ -695,14 +695,14 @@ am__fastdepCC_FALSE
LEX
LEX_OUTPUT_ROOT
LEXLIB
+TETEX_BUILD_TRUE
+TETEX_BUILD_FALSE
latex
BUILDRULES_TRUE
BUILDRULES_FALSE
pdflatex
BUILDDOCS_TRUE
BUILDDOCS_FALSE
-TETEX_BUILD_TRUE
-TETEX_BUILD_FALSE
CLISP
EXT_CLISP_TRUE
EXT_CLISP_FALSE
@@ -3680,13 +3680,54 @@ fi
# Check whether --enable-make-rules was given.
if test "${enable_make_rules+set}" = set; then
- enableval=$enable_make_rules; BUILDRULES=$enableval
+ enableval=$enable_make_rules;
+fi
+
+# Check whether --enable-docs was given.
+if test "${enable_docs+set}" = set; then
+ enableval=$enable_docs;
+fi
+
+
+# Building inside TeX Live?
+# Check whether --enable-tetex-build was given.
+if test "${enable_tetex_build+set}" = set; then
+ enableval=$enable_tetex_build;
+fi
+
+
+if test "x$enable_tetex_build" = xyes; then
+ if test ! -d $srcdir/../../texk/kpathsea; then
+ { { echo "$as_me:$LINENO: error:
+=========================================
+
+You specified --enable-tetex-build, but I can't find the kpathsea
+directory. I expected it to be in $srcdir/../../texk/kpathsea.
+
+=========================================" >&5
+echo "$as_me: error:
+=========================================
+
+You specified --enable-tetex-build, but I can't find the kpathsea
+directory. I expected it to be in $srcdir/../../texk/kpathsea.
+
+=========================================" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+ docdir="$prefix/texmf/doc/$PACKAGE_NAME"
+ if test -z "$enable_docs"; then enable_docs=no; fi
+ if test -z "$enable_make_rules"; then enable_make_rules=no; fi
+fi
+ if test "x$enable_tetex_build" = xyes; then
+ TETEX_BUILD_TRUE=
+ TETEX_BUILD_FALSE='#'
else
- BUILDRULES=yes
+ TETEX_BUILD_TRUE='#'
+ TETEX_BUILD_FALSE=
fi
-if test "$BUILDRULES" = "yes"; then
+if test "x$enable_make_rules" != xno; then
for ac_prog in latex elatex lambda
do
@@ -3742,7 +3783,7 @@ fi
fi
- if test "$BUILDRULES" = "yes"; then
+ if test "x$enable_make_rules" != xno; then
BUILDRULES_TRUE=
BUILDRULES_FALSE='#'
else
@@ -3751,15 +3792,7 @@ else
fi
-# Check whether --enable-docs was given.
-if test "${enable_docs+set}" = set; then
- enableval=$enable_docs; BUILDDOCS=$enableval
-else
- BUILDDOCS=yes
-fi
-
-
-if test "$BUILDDOCS" = "yes"; then
+if test "x$enable_docs" != xno; then
for ac_prog in pdflatex
do
@@ -3815,7 +3848,7 @@ fi
fi
- if test "$BUILDDOCS" = "yes"; then
+ if test "x$enable_docs" != xno; then
BUILDDOCS_TRUE=
BUILDDOCS_FALSE='#'
else
@@ -3824,44 +3857,6 @@ else
fi
-# Building inside TeX Live?
-# Check whether --enable-tetex-build was given.
-if test "${enable_tetex_build+set}" = set; then
- enableval=$enable_tetex_build;
-fi
-
-
-if test "x$enable_tetex_build" = xyes; then
- if test ! -d $srcdir/../../texk/kpathsea; then
- { { echo "$as_me:$LINENO: error:
-=========================================
-
-You specified --enable-tetex-build, but I can't find the kpathsea
-directory. I expected it to be in $srcdir/../../texk/kpathsea.
-
-=========================================" >&5
-echo "$as_me: error:
-=========================================
-
-You specified --enable-tetex-build, but I can't find the kpathsea
-directory. I expected it to be in $srcdir/../../texk/kpathsea.
-
-=========================================" >&2;}
- { (exit 1); exit 1; }; }
- fi
- docdir="$prefix/texmf/doc/$PACKAGE_NAME"
- if test -z "$enable_docs"; then enable_docs=no; fi
- if test -z "$enable_make_rules"; then enable_make_rules=no; fi
-fi
- if test "x$enable_tetex_build" = xyes; then
- TETEX_BUILD_TRUE=
- TETEX_BUILD_FALSE='#'
-else
- TETEX_BUILD_TRUE='#'
- TETEX_BUILD_FALSE=
-fi
-
-
# Check whether --with-clisp was given.
if test "${with_clisp+set}" = set; then
@@ -5195,6 +5190,13 @@ echo "$as_me: error: conditional \"am__fastdepCC\" was never defined.
Usually this means the macro was only invoked conditionally." >&2;}
{ (exit 1); exit 1; }; }
fi
+if test -z "${TETEX_BUILD_TRUE}" && test -z "${TETEX_BUILD_FALSE}"; then
+ { { echo "$as_me:$LINENO: error: conditional \"TETEX_BUILD\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+echo "$as_me: error: conditional \"TETEX_BUILD\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+ { (exit 1); exit 1; }; }
+fi
if test -z "${BUILDRULES_TRUE}" && test -z "${BUILDRULES_FALSE}"; then
{ { echo "$as_me:$LINENO: error: conditional \"BUILDRULES\" was never defined.
Usually this means the macro was only invoked conditionally." >&5
@@ -5209,13 +5211,6 @@ echo "$as_me: error: conditional \"BUILDDOCS\" was never defined.
Usually this means the macro was only invoked conditionally." >&2;}
{ (exit 1); exit 1; }; }
fi
-if test -z "${TETEX_BUILD_TRUE}" && test -z "${TETEX_BUILD_FALSE}"; then
- { { echo "$as_me:$LINENO: error: conditional \"TETEX_BUILD\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"TETEX_BUILD\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
-fi
if test -z "${EXT_CLISP_TRUE}" && test -z "${EXT_CLISP_FALSE}"; then
{ { echo "$as_me:$LINENO: error: conditional \"EXT_CLISP\" was never defined.
Usually this means the macro was only invoked conditionally." >&5
@@ -5885,14 +5880,14 @@ am__fastdepCC_FALSE!$am__fastdepCC_FALSE$ac_delim
LEX!$LEX$ac_delim
LEX_OUTPUT_ROOT!$LEX_OUTPUT_ROOT$ac_delim
LEXLIB!$LEXLIB$ac_delim
+TETEX_BUILD_TRUE!$TETEX_BUILD_TRUE$ac_delim
+TETEX_BUILD_FALSE!$TETEX_BUILD_FALSE$ac_delim
latex!$latex$ac_delim
BUILDRULES_TRUE!$BUILDRULES_TRUE$ac_delim
BUILDRULES_FALSE!$BUILDRULES_FALSE$ac_delim
pdflatex!$pdflatex$ac_delim
BUILDDOCS_TRUE!$BUILDDOCS_TRUE$ac_delim
BUILDDOCS_FALSE!$BUILDDOCS_FALSE$ac_delim
-TETEX_BUILD_TRUE!$TETEX_BUILD_TRUE$ac_delim
-TETEX_BUILD_FALSE!$TETEX_BUILD_FALSE$ac_delim
CLISP!$CLISP$ac_delim
EXT_CLISP_TRUE!$EXT_CLISP_TRUE$ac_delim
EXT_CLISP_FALSE!$EXT_CLISP_FALSE$ac_delim
diff --git a/Build/source/utils/xindy/configure.ac b/Build/source/utils/xindy/configure.ac
index 134f744b183..de73fbb973b 100644
--- a/Build/source/utils/xindy/configure.ac
+++ b/Build/source/utils/xindy/configure.ac
@@ -35,22 +35,9 @@ 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)]),[BUILDRULES=$enableval],[BUILDRULES=yes])
-
-if test "$BUILDRULES" = "yes"; then
- AC_PROG_LATEX
-fi
-
-AM_CONDITIONAL(BUILDRULES, test "$BUILDRULES" = "yes")
-
+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)]),[BUILDDOCS=$enableval],[BUILDDOCS=yes])
-
-if test "$BUILDDOCS" = "yes"; then
- AC_PROG_PDFLATEX
-fi
-
-AM_CONDITIONAL(BUILDDOCS, test "$BUILDDOCS" = "yes")
+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]))
@@ -71,6 +58,18 @@ directory. I expected it to be in $srcdir/../../texk/kpathsea.
fi
AM_CONDITIONAL([TETEX_BUILD],[test "x$enable_tetex_build" = xyes])
+if test "x$enable_make_rules" != xno; then
+ AC_PROG_LATEX
+fi
+
+AM_CONDITIONAL([BUILDRULES], [test "x$enable_make_rules" != xno])
+
+if test "x$enable_docs" != xno; then
+ AC_PROG_PDFLATEX
+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]))