integrate biber

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

13 files changed, 172 insertions, 41 deletions

diff --git a/Build/source/Makefile.in b/Build/source/Makefile.in
index c6e6324f699..f43a4e9ee43 100644
--- a/Build/source/Makefile.in
+++ b/Build/source/Makefile.in
@@ -64,6 +64,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/kpse-common.m4 \
 	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
 	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/tardate.ac \
 	$(top_srcdir)/version.ac \
+	$(top_srcdir)/utils/biber/ac/withenable.ac \
 	$(top_srcdir)/utils/chktex/ac/withenable.ac \
 	$(top_srcdir)/utils/dialog/ac/withenable.ac \
 	$(top_srcdir)/utils/ps2eps/ac/withenable.ac \
diff --git a/Build/source/configure b/Build/source/configure
index c1d62d89f46..e7d96c2e8e7 100755
--- a/Build/source/configure
+++ b/Build/source/configure
@@ -759,6 +759,7 @@ enable_native_texlive_build
 enable_multiplatform
 enable_cxx_runtime_hack
 enable_libtool_hack
+enable_biber
 enable_chktex
 enable_dialog
 enable_ps2eps
@@ -1557,6 +1558,7 @@ Optional Features:
                           lib/PLATFORM
   --enable-cxx-runtime-hack  link C++ runtime statically
   --enable-libtool-hack   ignore libtool dependency_libs
+  --disable-biber         do not build the biber package
   --disable-chktex        do not build the chktex package
   --disable-dialog        do not build the dialog package
   --disable-ps2eps        do not build the ps2eps package
@@ -3825,6 +3827,25 @@ $as_echo "$as_me: Assuming \`--with-x'" >&6;}
 $as_echo "$as_me: WIN32 -> \`--without-x'" >&6;}
          ac_configure_args="$ac_configure_args '--without-x'" ;;
 esac
+## utils/biber/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory utils/biber/
+## configure options and TL libraries required for biber
+# Check whether --enable-biber was given.
+if test "${enable_biber+set}" = set; then :
+  enableval=$enable_biber;
+fi
+case $enable_biber in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_biber=$enable_all_pkgs
+     { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-biber=$enable_biber'" >&5
+$as_echo "$as_me: Assuming \`--enable-biber=$enable_biber'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-biber=$enable_biber'"
+    ;;
+esac
+
+
 ## utils/chktex/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory utils/chktex/
 ## configure options and TL libraries required for chktex
 # Check whether --enable-chktex was given.
diff --git a/Build/source/libs/Makefile.in b/Build/source/libs/Makefile.in
index 01ba3736de4..d6110b06e34 100644
--- a/Build/source/libs/Makefile.in
+++ b/Build/source/libs/Makefile.in
@@ -66,6 +66,7 @@ am__aclocal_m4_deps = $(top_srcdir)/../m4/kpse-common.m4 \
 	$(top_srcdir)/../m4/kpse-xpdf-flags.m4 \
 	$(top_srcdir)/../m4/kpse-zlib-flags.m4 \
 	$(top_srcdir)/../m4/kpse-zziplib-flags.m4 \
+	$(top_srcdir)/../utils/biber/ac/withenable.ac \
 	$(top_srcdir)/../utils/chktex/ac/withenable.ac \
 	$(top_srcdir)/../utils/dialog/ac/withenable.ac \
 	$(top_srcdir)/../utils/ps2eps/ac/withenable.ac \
diff --git a/Build/source/libs/configure b/Build/source/libs/configure
index 5ca99d7129f..69aa26cd58d 100755
--- a/Build/source/libs/configure
+++ b/Build/source/libs/configure
@@ -670,6 +670,7 @@ enable_native_texlive_build
 enable_multiplatform
 enable_cxx_runtime_hack
 enable_libtool_hack
+enable_biber
 enable_chktex
 enable_dialog
 enable_ps2eps
@@ -1450,6 +1451,7 @@ Optional Features:
                           lib/PLATFORM
   --enable-cxx-runtime-hack  link C++ runtime statically
   --enable-libtool-hack   ignore libtool dependency_libs
+  --disable-biber         do not build the biber package
   --disable-chktex        do not build the chktex package
   --disable-dialog        do not build the dialog package
   --disable-ps2eps        do not build the ps2eps package
@@ -3151,6 +3153,25 @@ $as_echo "$as_me: Assuming \`--with-x'" >&6;}
 $as_echo "$as_me: WIN32 -> \`--without-x'" >&6;}
          ac_configure_args="$ac_configure_args '--without-x'" ;;
 esac
+## utils/biber/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory utils/biber/
+## configure options and TL libraries required for biber
+# Check whether --enable-biber was given.
+if test "${enable_biber+set}" = set; then :
+  enableval=$enable_biber;
+fi
+case $enable_biber in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_biber=$enable_all_pkgs
+     { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-biber=$enable_biber'" >&5
+$as_echo "$as_me: Assuming \`--enable-biber=$enable_biber'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-biber=$enable_biber'"
+    ;;
+esac
+
+
 ## utils/chktex/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory utils/chktex/
 ## configure options and TL libraries required for chktex
 # Check whether --enable-chktex was given.
diff --git a/Build/source/m4/kpse-pkgs.m4 b/Build/source/m4/kpse-pkgs.m4
index 82b8da9e2a7..42bea6d2286 100644
--- a/Build/source/m4/kpse-pkgs.m4
+++ b/Build/source/m4/kpse-pkgs.m4
@@ -71,6 +71,7 @@ AC_REQUIRE([KPSE_ICU_SYSTEM_FLAGS])[]dnl
 # Define the list of utility sub-packages, i.e., subdirs 'utils/*'.
 AC_DEFUN([KPSE_UTILS_PKGS],
 [m4_define([kpse_utils_pkgs], [
+biber
 chktex
 dialog
 ps2eps
diff --git a/Build/source/texk/Makefile.in b/Build/source/texk/Makefile.in
index 8b0139a5069..ca84e1c7717 100644
--- a/Build/source/texk/Makefile.in
+++ b/Build/source/texk/Makefile.in
@@ -66,6 +66,7 @@ am__aclocal_m4_deps = $(top_srcdir)/../m4/kpse-common.m4 \
 	$(top_srcdir)/../m4/kpse-xpdf-flags.m4 \
 	$(top_srcdir)/../m4/kpse-zlib-flags.m4 \
 	$(top_srcdir)/../m4/kpse-zziplib-flags.m4 \
+	$(top_srcdir)/../utils/biber/ac/withenable.ac \
 	$(top_srcdir)/../utils/chktex/ac/withenable.ac \
 	$(top_srcdir)/../utils/dialog/ac/withenable.ac \
 	$(top_srcdir)/../utils/ps2eps/ac/withenable.ac \
diff --git a/Build/source/texk/configure b/Build/source/texk/configure
index d667af18197..edebce70a9c 100755
--- a/Build/source/texk/configure
+++ b/Build/source/texk/configure
@@ -670,6 +670,7 @@ enable_native_texlive_build
 enable_multiplatform
 enable_cxx_runtime_hack
 enable_libtool_hack
+enable_biber
 enable_chktex
 enable_dialog
 enable_ps2eps
@@ -1471,6 +1472,7 @@ Optional Features:
                           lib/PLATFORM
   --enable-cxx-runtime-hack  link C++ runtime statically
   --enable-libtool-hack   ignore libtool dependency_libs
+  --disable-biber         do not build the biber package
   --disable-chktex        do not build the chktex package
   --disable-dialog        do not build the dialog package
   --disable-ps2eps        do not build the ps2eps package
@@ -3172,6 +3174,25 @@ $as_echo "$as_me: Assuming \`--with-x'" >&6;}
 $as_echo "$as_me: WIN32 -> \`--without-x'" >&6;}
          ac_configure_args="$ac_configure_args '--without-x'" ;;
 esac
+## utils/biber/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory utils/biber/
+## configure options and TL libraries required for biber
+# Check whether --enable-biber was given.
+if test "${enable_biber+set}" = set; then :
+  enableval=$enable_biber;
+fi
+case $enable_biber in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_biber=$enable_all_pkgs
+     { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-biber=$enable_biber'" >&5
+$as_echo "$as_me: Assuming \`--enable-biber=$enable_biber'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-biber=$enable_biber'"
+    ;;
+esac
+
+
 ## utils/chktex/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory utils/chktex/
 ## configure options and TL libraries required for chktex
 # Check whether --enable-chktex was given.
diff --git a/Build/source/utils/Makefile.in b/Build/source/utils/Makefile.in
index 0391e2e489c..6070e25731f 100644
--- a/Build/source/utils/Makefile.in
+++ b/Build/source/utils/Makefile.in
@@ -66,6 +66,7 @@ am__aclocal_m4_deps = $(top_srcdir)/../m4/kpse-common.m4 \
 	$(top_srcdir)/../m4/kpse-xpdf-flags.m4 \
 	$(top_srcdir)/../m4/kpse-zlib-flags.m4 \
 	$(top_srcdir)/../m4/kpse-zziplib-flags.m4 \
+	$(top_srcdir)/../utils/biber/ac/withenable.ac \
 	$(top_srcdir)/../utils/chktex/ac/withenable.ac \
 	$(top_srcdir)/../utils/dialog/ac/withenable.ac \
 	$(top_srcdir)/../utils/ps2eps/ac/withenable.ac \
diff --git a/Build/source/utils/biber/Makefile.am b/Build/source/utils/biber/Makefile.am
index 432cc2e0d5d..08db096f286 100644
--- a/Build/source/utils/biber/Makefile.am
+++ b/Build/source/utils/biber/Makefile.am
@@ -1,17 +1,21 @@
-# See ./README for our basic strategy here.
-#
-#   Copyright 2011 Karl Berry <tex-live@tug.org>
-#
-#   This file is free software; the copyright holder
-#   gives unlimited permission to copy and/or distribute it,
-#   with or without modifications, as long as this notice is preserved.
+## See ./README for our basic strategy here.
+##
+##   Copyright 2011 Karl Berry <tex-live@tug.org>
+##
+##   This file is free software; the copyright holder
+##   gives unlimited permission to copy and/or distribute it,
+##   with or without modifications, as long as this notice is preserved.
+ACLOCAL_AMFLAGS = -I ../../m4 -I m4
 
-if TL_HAVE_BIBER_BINARY
-bin_SCRIPTS = $(BIBER_EXE)
+# in case of an SVN repository
+dist-hook:
+	rm -rf `find $(distdir) -name .svn`
 
-# this EXTRA_ variable must be defined when bin_SCRIPTS refers to a
-# configure-substituted value.
+nodist_bin_SCRIPTS = $(BIBER_BINARY)
+
+# this EXTRA_ variable must be defined because nodist_bin_SCRIPTS
+# refers to a configure-substituted value.
 EXTRA_SCRIPTS =
-endif
 
 EXTRA_DIST = TeXLive bin
+
diff --git a/Build/source/utils/biber/ac/withenable.ac b/Build/source/utils/biber/ac/withenable.ac
new file mode 100644
index 00000000000..535aaf70f9a
--- /dev/null
+++ b/Build/source/utils/biber/ac/withenable.ac
@@ -0,0 +1,7 @@
+## utils/biber/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory utils/biber/
+dnl
+dnl Copyright (C) 2011 Peter Breitenlohner <tex-live@tug.org>
+dnl You may freely use, modify and/or distribute this file.
+dnl
+## configure options and TL libraries required for biber
+KPSE_ENABLE_PROG([biber])
diff --git a/Build/source/utils/biber/configure.ac b/Build/source/utils/biber/configure.ac
index f2ea05ad55f..ece78c94e49 100644
--- a/Build/source/utils/biber/configure.ac
+++ b/Build/source/utils/biber/configure.ac
@@ -15,39 +15,25 @@ AC_CONFIG_MACRO_DIR([../../m4])
 AM_INIT_AUTOMAKE([foreign])
 AM_MAINTAINER_MODE
 
-# System type for cross-compilation.
-AC_CANONICAL_HOST
-AC_EXEEXT
-
-# Checks for programs.
+dnl Checks for programs.
+AC_PROG_INSTALL
 AC_PROG_MAKE_SET
 
-AC_MSG_CHECKING([for TeX Live platform name])
-# we need these variables in the Perl.
-export ac_aux_dir
-export srcdir
-#
-TL_platform=`perl -e '
-  unshift (@INC, "$ENV{srcdir}");
-  use TeXLive::TLUtils;
-  print TeXLive::TLUtils::platform();'`
-#
-AC_MSG_RESULT([$TL_platform])
-if test -z "$TL_platform"; then
-  AC_MSG_ERROR("cannot determine TeX Live platform name")
-fi
+dnl Determine the TeX Live platform name (not yet, just prepare)
+KPSE_TL_PLATFORM
 
-biber_exe=$srcdir/bin/$TL_platform/biber$ac_exeext
-AC_MSG_CHECKING([for executable in $biber_exe])
-if test -r "$biber_exe"; then
-  AC_SUBST([BIBER_EXE], [$biber_exe])
-  AC_MSG_RESULT([yes])
+dnl Check if we have an executable for the current platform.
+AC_MSG_CHECKING([for a biber binary])
+biber_bin="bin/$TL_PLATFORM/biber"
+if test -r "$srcdir/$biber_bin"; then
+  BIBER_BINARY="$biber_bin"
+elif test -r "$srcdir/$biber_bin.exe"; then
+  BIBER_BINARY="$biber_bin.exe"
 else
-  AC_MSG_RESULT([no])
+  BIBER_BINARY=
 fi
-
-# Check for having an executable for the needed platform.
-AM_CONDITIONAL([TL_HAVE_BIBER_BINARY], [test -r "$biber_exe"])
+AC_MSG_RESULT([$BIBER_BINARY])
+AC_SUBST([BIBER_BINARY])
 
 AC_CONFIG_FILES([Makefile])
 AC_OUTPUT
diff --git a/Build/source/utils/biber/m4/kpse-tl-platform.m4 b/Build/source/utils/biber/m4/kpse-tl-platform.m4
new file mode 100644
index 00000000000..f822807f7b4
--- /dev/null
+++ b/Build/source/utils/biber/m4/kpse-tl-platform.m4
@@ -0,0 +1,34 @@
+# Public macros for the TeX Live (TL) tree.
+# Copyright (C) 2011 Peter Breitenlohner <tex-live@tug.org>
+#
+# This file is free software; the copyright holder
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# KPSE_TL_PLATFORM
+# ----------------
+# Determine the TeX Live platform name.
+AC_DEFUN([KPSE_TL_PLATFORM],
+[AC_REQUIRE([AC_CANONICAL_HOST])[]dnl
+AC_REQUIRE([KPSE_CHECK_WIN32])[]dnl
+AC_REQUIRE([KPSE_CHECK_PERL])[]dnl
+AC_ARG_VAR([TL_PLATFORM], [TeX Live platform name [autodetected]])
+AC_MSG_CHECKING([for TeX Live platform name])
+if test "X$TL_PLATFORM" = X; then
+  if test "x$kpse_cv_have_win32" = xno; then
+    # we need this variable in the Perl (current).
+    export ac_aux_dir
+    # we need this variable in the Perl (future).
+    export ac_cv_host
+    TL_PLATFORM=`$PERL -I"$srcdir" -MTeXLive::TLUtils -e '
+      print TeXLive::TLUtils::platform();'`
+    if test -z "$TL_PLATFORM"; then
+      AC_MSG_ERROR([cannot determine TeX Live platform name])
+    fi
+  else
+    TL_PLATFORM=win32
+  fi
+fi
+AC_MSG_RESULT([$TL_PLATFORM])
+]) # KPSE_TL_PLATFORM
+
diff --git a/Build/source/utils/configure b/Build/source/utils/configure
index 3d59e702c58..3bb5d3da237 100755
--- a/Build/source/utils/configure
+++ b/Build/source/utils/configure
@@ -670,6 +670,7 @@ enable_native_texlive_build
 enable_multiplatform
 enable_cxx_runtime_hack
 enable_libtool_hack
+enable_biber
 enable_chktex
 enable_dialog
 enable_ps2eps
@@ -810,7 +811,8 @@ CFLAGS
 LDFLAGS
 LIBS
 CPPFLAGS'
-ac_subdirs_all='chktex
+ac_subdirs_all='biber
+chktex
 dialog
 ps2eps
 psutils
@@ -1447,6 +1449,7 @@ Optional Features:
                           lib/PLATFORM
   --enable-cxx-runtime-hack  link C++ runtime statically
   --enable-libtool-hack   ignore libtool dependency_libs
+  --disable-biber         do not build the biber package
   --disable-chktex        do not build the chktex package
   --disable-dialog        do not build the dialog package
   --disable-ps2eps        do not build the ps2eps package
@@ -3148,6 +3151,25 @@ $as_echo "$as_me: Assuming \`--with-x'" >&6;}
 $as_echo "$as_me: WIN32 -> \`--without-x'" >&6;}
          ac_configure_args="$ac_configure_args '--without-x'" ;;
 esac
+## utils/biber/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory utils/biber/
+## configure options and TL libraries required for biber
+# Check whether --enable-biber was given.
+if test "${enable_biber+set}" = set; then :
+  enableval=$enable_biber;
+fi
+case $enable_biber in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_biber=$enable_all_pkgs
+     { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-biber=$enable_biber'" >&5
+$as_echo "$as_me: Assuming \`--enable-biber=$enable_biber'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-biber=$enable_biber'"
+    ;;
+esac
+
+
 ## utils/chktex/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory utils/chktex/
 ## configure options and TL libraries required for chktex
 # Check whether --enable-chktex was given.
@@ -5690,6 +5712,16 @@ DIST_SUBUTILS=
 
 
 
+if test -x $srcdir/biber/configure; then
+  test "x$enable_biber" = xno || SUBUTILS="$SUBUTILS biber"
+  DIST_SUBUTILS="$DIST_SUBUTILS biber"
+  if false; then
+    subdirs="$subdirs biber"
+
+  fi
+fi
+
+
 if test -x $srcdir/chktex/configure; then
   test "x$enable_chktex" = xno || SUBUTILS="$SUBUTILS chktex"
   DIST_SUBUTILS="$DIST_SUBUTILS chktex"