diff options
author | Peter Breitenlohner <peb@mppmu.mpg.de> | 2011-03-22 13:34:20 +0000 |
---|---|---|
committer | Peter Breitenlohner <peb@mppmu.mpg.de> | 2011-03-22 13:34:20 +0000 |
commit | 27b2027448c99f6bba28e74590cc5e877aec0025 (patch) | |
tree | 927813dce1508826b512eee52c7d5a1d3d6bc1d5 | |
parent | 7c3b8edb82c6b12594fffa5094984eb95744ef1a (diff) |
Correctly distinguish `biber' and `biber.exe' on Cygwin
git-svn-id: svn://tug.org/texlive/trunk@21797 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r-- | Build/source/utils/biber/ChangeLog | 5 | ||||
-rwxr-xr-x | Build/source/utils/biber/configure | 6 | ||||
-rw-r--r-- | Build/source/utils/biber/configure.ac | 6 |
3 files changed, 11 insertions, 6 deletions
diff --git a/Build/source/utils/biber/ChangeLog b/Build/source/utils/biber/ChangeLog index a7dfa102e06..4dc77968ab0 100644 --- a/Build/source/utils/biber/ChangeLog +++ b/Build/source/utils/biber/ChangeLog @@ -1,3 +1,8 @@ +2011-03-22 Peter Breitenlohner <peb@mppmu.mpg.de> + + * configure.ac: Correctly distinguish `biber' and `biber.exe' on + Cygwin. Problem reported by Ken Brown <kbrow1i@gmail.com>. + 2011-03-17 Peter Breitenlohner <peb@mppmu.mpg.de> * ac: new directory, required for the TeX Live build system. diff --git a/Build/source/utils/biber/configure b/Build/source/utils/biber/configure index 98ece073ca7..06f34ee1d1f 100755 --- a/Build/source/utils/biber/configure +++ b/Build/source/utils/biber/configure @@ -3511,10 +3511,10 @@ $as_echo "$TL_PLATFORM" >&6; } { $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" -if test -r "$srcdir/$biber_bin"; then +if test -n "$ac_exeext" && test -r "$srcdir/$biber_bin$ac_exeext"; then + BIBER_BINARY="$biber_bin$ac_exeext" +elif test -r "$srcdir/$biber_bin"; then BIBER_BINARY="$biber_bin" -elif test -r "$srcdir/$biber_bin.exe"; then - BIBER_BINARY="$biber_bin.exe" else BIBER_BINARY= fi diff --git a/Build/source/utils/biber/configure.ac b/Build/source/utils/biber/configure.ac index 3848cd95828..497e70e1d62 100644 --- a/Build/source/utils/biber/configure.ac +++ b/Build/source/utils/biber/configure.ac @@ -25,10 +25,10 @@ KPSE_TL_PLATFORM dnl Check if we have an executable for this platform. AC_MSG_CHECKING([for a biber binary]) biber_bin="bin/$TL_PLATFORM/biber" -if test -r "$srcdir/$biber_bin"; then +if test -n "$ac_exeext" && test -r "$srcdir/$biber_bin$ac_exeext"; then + BIBER_BINARY="$biber_bin$ac_exeext" +elif test -r "$srcdir/$biber_bin"; then BIBER_BINARY="$biber_bin" -elif test -r "$srcdir/$biber_bin.exe"; then - BIBER_BINARY="$biber_bin.exe" else BIBER_BINARY= fi |