[Libreoffice-commits] core.git: configure.ac

[Andreas K. Huettel (dilfridge)]

 configure.ac |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit f53e79acd0d42f5c41e1104056af9cf23e9e2e2a
Author: Andreas K. Huettel (dilfridge) <dilfridge at gentoo.org>
Date:   Sun Jan 4 15:33:35 2015 +0100

    Replace bash-specific code from configure.ac, fixes build for sh=dash users
    
    Original patch by Rémi Cardona <remi at gentoo.org>
    
    Change-Id: I815567df8a868c3997e8ac357b8529fded28c950
    Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=525454
    Reviewed-on: https://gerrit.libreoffice.org/13731
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/configure.ac b/configure.ac
index 8aa33d0..5dbe640 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11483,9 +11483,8 @@ test_font_map()
     FONTFILE_LOWER="$(echo $FONTFILE | $AWK '{print tolower($0)}')"
 
     TESTEXPR="'${FONTFILE_LOWER}' = '$(echo $FONT | $AWK '{print tolower($0)}').ttf'"
-    while true ; do
+    while test "$#" -ge 1 ; do
         MAPPING="$(echo $1 | $AWK '{print tolower($0)}')"; shift
-        test -n "$MAPPING" || break
         TESTEXPR="${TESTEXPR} -o '${FONTFILE_LOWER}' = '$MAPPING-regular.ttf'"
     done
     if test $TESTEXPR