summaryrefslogtreecommitdiff
path: root/Build/source/utils/biber
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2012-05-05 09:59:32 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2012-05-05 09:59:32 +0000
commitec6c709096d127e4021310a662b63093efd108b8 (patch)
tree5d7af44dc910bbc7fc973f56a30f56b5e73c85fb /Build/source/utils/biber
parent96d43249f1740d32ded36de2469e31d088f85b5c (diff)
biber: Make sure that configuring with '--disable-biber' really works
git-svn-id: svn://tug.org/texlive/trunk@26215 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/utils/biber')
-rw-r--r--Build/source/utils/biber/ChangeLog5
-rwxr-xr-xBuild/source/utils/biber/configure14
-rw-r--r--Build/source/utils/biber/configure.ac9
-rw-r--r--Build/source/utils/biber/m4/kpse-tl-platform.m45
4 files changed, 19 insertions, 14 deletions
diff --git a/Build/source/utils/biber/ChangeLog b/Build/source/utils/biber/ChangeLog
index 956f371c9e2..b2d5dae4ddd 100644
--- a/Build/source/utils/biber/ChangeLog
+++ b/Build/source/utils/biber/ChangeLog
@@ -1,3 +1,8 @@
+2012-05-05 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * configure.ac, m4/kpse-tl-platform.m4:
+ Make sure that configuring with '--disable-biber' really works.
+
2012-05-03 Peter Breitenlohner <peb@mppmu.mpg.de>
* Makefile.am, configure.ac, m4/kpse-tl-platform.m4: Skip
diff --git a/Build/source/utils/biber/configure b/Build/source/utils/biber/configure
index 12ee6436d2f..8cdeb69dc94 100755
--- a/Build/source/utils/biber/configure
+++ b/Build/source/utils/biber/configure
@@ -2388,8 +2388,6 @@ fi
BIBER_BINARY=
-if test "x$enable_build" != xno || test -f config.force; then
-
# Make sure we can run config.sub.
$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
@@ -3539,11 +3537,6 @@ if test "X$TL_PLATFORM" = X; then
if test "x$kpse_cv_have_win32" = xno; then
TL_PLATFORM=`$PERL -I"$srcdir" -MTeXLive::TLUtils -e '
print TeXLive::TLUtils::platform_name("'"$ac_cv_host"'");'`
- if test -z "$TL_PLATFORM"; then
- as_fn_error $? "
-****** cannot determine TeX Live platform name for host \"$ac_cv_host\"
-****** configure with either '--disable-biber' or 'TL_PLATFORM=platform_name'" "$LINENO" 5
- fi
else
TL_PLATFORM=win32
fi
@@ -3552,6 +3545,13 @@ fi
$as_echo "$TL_PLATFORM" >&6; }
+if test "x$enable_build" != xno || test -f config.force; then
+
+if test -z "$TL_PLATFORM"; then
+ as_fn_error $? "****** cannot determine TeX Live platform name for host \"$ac_cv_host\"
+****** configure with either '--disable-biber' or 'TL_PLATFORM=platform_name'" "$LINENO" 5
+fi
+
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a biber binary" >&5
$as_echo_n "checking for a biber binary... " >&6; }
biber_bin="bin/$TL_PLATFORM/biber"
diff --git a/Build/source/utils/biber/configure.ac b/Build/source/utils/biber/configure.ac
index 29e5a7d7dc0..ff83a231db3 100644
--- a/Build/source/utils/biber/configure.ac
+++ b/Build/source/utils/biber/configure.ac
@@ -21,11 +21,16 @@ AC_PROG_MAKE_SET
BIBER_BINARY=
-if test "x$enable_build" != xno || test -f config.force; then
-
dnl Determine the TeX Live platform name.
KPSE_TL_PLATFORM
+if test "x$enable_build" != xno || test -f config.force; then
+
+if test -z "$TL_PLATFORM"; then
+ AC_MSG_ERROR([****** cannot determine TeX Live platform name for host "$ac_cv_host"
+****** configure with either '--disable-biber' or 'TL_PLATFORM=platform_name'])
+fi
+
dnl Check if we have an executable for this platform.
AC_MSG_CHECKING([for a biber binary])
biber_bin="bin/$TL_PLATFORM/biber"
diff --git a/Build/source/utils/biber/m4/kpse-tl-platform.m4 b/Build/source/utils/biber/m4/kpse-tl-platform.m4
index ec106dba39e..ac3364b8300 100644
--- a/Build/source/utils/biber/m4/kpse-tl-platform.m4
+++ b/Build/source/utils/biber/m4/kpse-tl-platform.m4
@@ -18,11 +18,6 @@ if test "X$TL_PLATFORM" = X; then
if test "x$kpse_cv_have_win32" = xno; then
TL_PLATFORM=`$PERL -I"$srcdir" -MTeXLive::TLUtils -e '
print TeXLive::TLUtils::platform_name("'"$ac_cv_host"'");'`
- if test -z "$TL_PLATFORM"; then
- AC_MSG_ERROR([
-****** cannot determine TeX Live platform name for host "$ac_cv_host"
-****** configure with either '--disable-biber' or 'TL_PLATFORM=platform_name'])
- fi
else
TL_PLATFORM=win32
fi