[Libreoffice-commits] .: Branch 'libreoffice-3-4' - configure.in

Petr Mladek pmladek at kemper.freedesktop.org
Tue Apr 5 03:27:03 PDT 2011


 configure.in |   11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

New commits:
commit 918685b04662b23855efd486e0fe9e7b438176c2
Author: Petr Mladek <pmladek at suse.cz>
Date:   Tue Apr 5 12:26:12 2011 +0200

    make sure that the system po2oo support --skipsource option

diff --git a/configure.in b/configure.in
index a49bd88..a7fdca7 100755
--- a/configure.in
+++ b/configure.in
@@ -4165,6 +4165,9 @@ dnl Check for system translate-toolkit
 dnl ===================================================================
 AC_MSG_CHECKING([which translate-toolkit to use])
 if test "$with_system_translate_toolkit" = "yes" ; then
+    AC_MSG_RESULT([system])
+    SYSTEM_TRANSLATE_TOOLKIT=YES
+
     AC_PATH_PROGS(OO2PO, oo2po)
     if test -z "$OO2PO"; then
         AC_MSG_ERROR([install translate-toolkit or use --without-system-translate-toolkit])
@@ -4174,9 +4177,11 @@ if test "$with_system_translate_toolkit" = "yes" ; then
     if test -z "$PO2OO"; then
         AC_MSG_ERROR([install translate-toolkit or use --without-system-translate-toolkit])
     fi
-    
-    AC_MSG_RESULT([system])
-    SYSTEM_TRANSLATE_TOOLKIT=YES
+
+    $PO2OO --help | grep -q '\-\-skipsource'
+    if test $? -ne 0 ;  then
+        AC_MSG_ERROR([$PO2OO does not support --skipsource; use translate-toolkit >= 1.9 or use --without-system-translate-toolkit])
+    fi
 else
    AC_MSG_RESULT([internal])
    SYSTEM_TRANSLATE_TOOLKIT=NO


More information about the Libreoffice-commits mailing list