biber: Skip autodetection of TeX Live platform name when configured with '--disable-biber'

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

8 files changed, 61 insertions, 23 deletions

diff --git a/Build/source/utils/biber/ChangeLog b/Build/source/utils/biber/ChangeLog
index 781cce94421..956f371c9e2 100644
--- a/Build/source/utils/biber/ChangeLog
+++ b/Build/source/utils/biber/ChangeLog
@@ -1,3 +1,9 @@
+2012-05-03  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* Makefile.am, configure.ac, m4/kpse-tl-platform.m4: Skip
+	autodetection of TeX Live platform name (via KPSE_TL_PLATFORM)
+	when configured with '--disable-biber'.
+
 2011-03-29  Karl Berry  <karl@tug.org>
 
 	* configure.ac: only install the freebsd binary if the current
diff --git a/Build/source/utils/biber/Makefile.am b/Build/source/utils/biber/Makefile.am
index 08db096f286..cc3010ee1a8 100644
--- a/Build/source/utils/biber/Makefile.am
+++ b/Build/source/utils/biber/Makefile.am
@@ -1,6 +1,6 @@
 ## See ./README for our basic strategy here.
 ##
-##   Copyright 2011 Karl Berry <tex-live@tug.org>
+##   Copyright 2011, 2012 Karl Berry <tex-live@tug.org>
 ##
 ##   This file is free software; the copyright holder
 ##   gives unlimited permission to copy and/or distribute it,
@@ -11,6 +11,14 @@ ACLOCAL_AMFLAGS = -I ../../m4 -I m4
 dist-hook:
 	rm -rf `find $(distdir) -name .svn`
 
+all-local: config.force
+
+config.force:
+	echo timestamp >config.force
+	$(SHELL) ./config.status --recheck
+
+DISTCLEANFILES = config.force
+
 nodist_bin_SCRIPTS = $(BIBER_BINARY)
 
 # this EXTRA_ variable must be defined because nodist_bin_SCRIPTS
diff --git a/Build/source/utils/biber/Makefile.in b/Build/source/utils/biber/Makefile.in
index a8cafe65378..48132ec9ec5 100644
--- a/Build/source/utils/biber/Makefile.in
+++ b/Build/source/utils/biber/Makefile.in
@@ -223,6 +223,7 @@ top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 ACLOCAL_AMFLAGS = -I ../../m4 -I m4
+DISTCLEANFILES = config.force
 nodist_bin_SCRIPTS = $(BIBER_BINARY)
 
 # this EXTRA_ variable must be defined because nodist_bin_SCRIPTS
@@ -471,7 +472,7 @@ distcleancheck: distclean
 	       exit 1; } >&2
 check-am: all-am
 check: check-am
-all-am: Makefile $(SCRIPTS)
+all-am: Makefile $(SCRIPTS) all-local
 installdirs:
 	for dir in "$(DESTDIR)$(bindir)"; do \
 	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
@@ -502,6 +503,7 @@ clean-generic:
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+	-test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -577,14 +579,14 @@ uninstall-am: uninstall-nodist_binSCRIPTS
 
 .MAKE: install-am install-strip
 
-.PHONY: all all-am am--refresh check check-am clean clean-generic dist \
-	dist-all dist-bzip2 dist-gzip dist-hook dist-lzip dist-shar \
-	dist-tarZ dist-xz dist-zip distcheck distclean \
-	distclean-generic distcleancheck distdir distuninstallcheck \
-	dvi dvi-am html html-am info info-am install install-am \
-	install-data install-data-am install-dvi install-dvi-am \
-	install-exec install-exec-am install-html install-html-am \
-	install-info install-info-am install-man \
+.PHONY: all all-am all-local am--refresh check check-am clean \
+	clean-generic dist dist-all dist-bzip2 dist-gzip dist-hook \
+	dist-lzip dist-shar dist-tarZ dist-xz dist-zip distcheck \
+	distclean distclean-generic distcleancheck distdir \
+	distuninstallcheck dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am install-man \
 	install-nodist_binSCRIPTS install-pdf install-pdf-am \
 	install-ps install-ps-am install-strip installcheck \
 	installcheck-am installdirs maintainer-clean \
@@ -597,6 +599,12 @@ uninstall-am: uninstall-nodist_binSCRIPTS
 dist-hook:
 	rm -rf `find $(distdir) -name .svn`
 
+all-local: config.force
+
+config.force:
+	echo timestamp >config.force
+	$(SHELL) ./config.status --recheck
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff --git a/Build/source/utils/biber/configure b/Build/source/utils/biber/configure
index 3df3f5c984e..12ee6436d2f 100755
--- a/Build/source/utils/biber/configure
+++ b/Build/source/utils/biber/configure
@@ -2386,6 +2386,10 @@ $as_echo "no" >&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
@@ -3536,7 +3540,9 @@ if test "X$TL_PLATFORM" = X; 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" "$LINENO" 5
+      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
@@ -3574,19 +3580,19 @@ elif test -r "$srcdir/$biber_bin"; then
     # check if freebsd os version is new enough.
     if test "$OSVERSION" -ge 701000; then
       BIBER_BINARY="$biber_bin"
-    else
-      BIBER_BINARY=  # too old, skip it
     fi
   else
     # not freebsd, just take it.
     BIBER_BINARY="$biber_bin"
   fi
-else
-  BIBER_BINARY=
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BIBER_BINARY" >&5
 $as_echo "$BIBER_BINARY" >&6; }
 
+echo timestamp >config.force
+fi
+
+
 
 ac_config_files="$ac_config_files Makefile"
 
diff --git a/Build/source/utils/biber/configure.ac b/Build/source/utils/biber/configure.ac
index a8f01e2f23f..29e5a7d7dc0 100644
--- a/Build/source/utils/biber/configure.ac
+++ b/Build/source/utils/biber/configure.ac
@@ -1,6 +1,6 @@
 dnl See ./README for our basic strategy here.
 dnl
-dnl   Copyright (C) 2011 Karl Berry <tex-live@tug.org>
+dnl   Copyright (C) 2011, 2012 Karl Berry <tex-live@tug.org>
 dnl
 dnl   This file is free software; the copyright holder
 dnl   gives unlimited permission to copy and/or distribute it,
@@ -19,6 +19,10 @@ dnl Checks for programs.
 AC_PROG_INSTALL
 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
 
@@ -50,17 +54,17 @@ elif test -r "$srcdir/$biber_bin"; then
     # check if freebsd os version is new enough.
     if test "$OSVERSION" -ge 701000; then
       BIBER_BINARY="$biber_bin"
-    else
-      BIBER_BINARY=  # too old, skip it
     fi
   else
     # not freebsd, just take it.
     BIBER_BINARY="$biber_bin"
   fi
-else
-  BIBER_BINARY=
 fi
 AC_MSG_RESULT([$BIBER_BINARY])
+
+echo timestamp >config.force
+fi
+
 AC_SUBST([BIBER_BINARY])
 
 AC_CONFIG_FILES([Makefile])
diff --git a/Build/source/utils/biber/m4/kpse-tl-platform.m4 b/Build/source/utils/biber/m4/kpse-tl-platform.m4
index 445e6c88ad5..ec106dba39e 100644
--- a/Build/source/utils/biber/m4/kpse-tl-platform.m4
+++ b/Build/source/utils/biber/m4/kpse-tl-platform.m4
@@ -1,5 +1,5 @@
 # Public macros for the TeX Live (TL) tree.
-# Copyright (C) 2011 Peter Breitenlohner <tex-live@tug.org>
+# Copyright (C) 2011, 2012 Peter Breitenlohner <tex-live@tug.org>
 #
 # This file is free software; the copyright holder
 # gives unlimited permission to copy and/or distribute it,
@@ -19,7 +19,9 @@ if test "X$TL_PLATFORM" = X; 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])
+      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
diff --git a/Build/source/utils/xindy/Makefile.am b/Build/source/utils/xindy/Makefile.am
index c5b14f952ff..68b34f4f207 100644
--- a/Build/source/utils/xindy/Makefile.am
+++ b/Build/source/utils/xindy/Makefile.am
@@ -1,6 +1,6 @@
 ## Makefile.am for the TeX Live subdirectory utils/xindy/
 ##
-## Copyright (C) 2009-2011 Peter Breitenlohner <tex-live@tug.org>
+## Copyright (C) 2009-2012 Peter Breitenlohner <tex-live@tug.org>
 ## You may freely use, modify and/or distribute this file.
 ##
 ACLOCAL_AMFLAGS = -I ../../m4
@@ -47,6 +47,8 @@ config.force:
 	echo timestamp >config.force
 	$(SHELL) ./config.status --recheck
 
+DISTCLEANFILES = config.force
+
 perl_scripts = texindy xindy
 scriptsdir = texmf/scripts/xindy
 nodist_bin_SCRIPTS =
diff --git a/Build/source/utils/xindy/Makefile.in b/Build/source/utils/xindy/Makefile.in
index 6dfbb8e0432..198fc5954c8 100644
--- a/Build/source/utils/xindy/Makefile.in
+++ b/Build/source/utils/xindy/Makefile.in
@@ -287,6 +287,7 @@ EXTRA_DIST = README-clisp $(XINDY_TREE)-PATCHES $(XINDY_TREE)/AUTHORS \
 	../../build-aux/relpath
 SUBDIRS = . $(XINDY_TREE)
 DIST_SUBDIRS = $(SUBDIRS)
+DISTCLEANFILES = config.force
 perl_scripts = texindy xindy
 scriptsdir = texmf/scripts/xindy
 nodist_bin_SCRIPTS = $(am__append_1)
@@ -787,6 +788,7 @@ clean-generic:
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+	-test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"