[Libreoffice-commits] .: 2 commits - configure.in

[David Tardon]

 configure.in |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

New commits:
commit c005385082bb7c5abcf81610e4140d74dd460a9c
Author: David Tardon <dtardon at redhat.com>
Date:   Mon Oct 11 12:09:13 2010 +0200

    use system libtextcat with --with-system-libs

diff --git a/configure.in b/configure.in
index 17a2e14..36ceec9 100644
--- a/configure.in
+++ b/configure.in
@@ -5426,7 +5426,8 @@ dnl ===================================================================
 dnl Checking for libtextcat
 dnl ===================================================================
 AC_MSG_CHECKING([which libtextcat to use])
-if test -n "$with_system_libtextcat" && test "$with_system_libtextcat" != "no"; then
+if test -n "$with_system_libtextcat" -o -n "$with_system_libs" && \
+    test "$with_system_libtextcat" != "no"; then
     AC_MSG_RESULT([external])
     SYSTEM_LIBTEXTCAT=YES
     AC_CHECK_HEADER(libtextcat/textcat.h, [],
commit 0d1988c9ebea7354039d87325e549160797dc062
Author: David Tardon <dtardon at redhat.com>
Date:   Mon Oct 11 12:07:50 2010 +0200

    #i112821# system mythes is not used when configured with --with-system-libs

diff --git a/configure.in b/configure.in
index e156b96..17a2e14 100644
--- a/configure.in
+++ b/configure.in
@@ -5371,7 +5371,8 @@ dnl ===================================================================
 dnl Checking for mythes
 dnl ===================================================================
 AC_MSG_CHECKING([which mythes to use])
-if test -n "$with_system_mythes" && test "$with_system_mythes" != "no"; then
+if test -n "$with_system_mythes" -o -n "$with_system_libs" && \
+   test "$with_system_mythes" != "no"; then
     AC_MSG_RESULT([external])
     SYSTEM_MYTHES=YES
     AC_LANG_PUSH([C++])