[Libreoffice-commits] .: configure.in

[Tomáš Chvátal]

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

New commits:
commit 25c27aae73f09759f7d6d874c54c6071e21d0c42
Author: Tomas Chvatal <tchvatal at suse.cz>
Date:   Wed Oct 5 15:27:58 2011 +0200

    Add libexttextcat and libvisio under system-libs switch

diff --git a/configure.in b/configure.in
index 9ba7653..84ae9d6 100644
--- a/configure.in
+++ b/configure.in
@@ -4610,7 +4610,8 @@ dnl ===================================================================
 dnl Check for system libvisio
 dnl ===================================================================
 AC_MSG_CHECKING([which libvisio to use])
-if test -n "$with_system_libvisio" -a "$with_system_libvisio" = "yes"; then
+if test -n "$with_system_libvisio" -o -n "$with_system_libs" && \
+    test "$with_system_libvisio" != "no"; then
     AC_MSG_RESULT([external])
     SYSTEM_LIBVISIO=YES
     PKG_CHECK_MODULES( VISIO, libvisio-0.0 )
@@ -6494,7 +6495,8 @@ dnl ===================================================================
 dnl Checking for libexttextcat
 dnl ===================================================================
 AC_MSG_CHECKING([which libexttextcat to use])
-if test "x$with_system_libexttextcat" = "xyes"; then
+if test -n "$with_system_libexttextcat" -o -n "$with_system_libs" && \
+        test "$with_system_libexttextcat" != "no"; then
     AC_MSG_RESULT([external])
     SYSTEM_LIBEXTTEXTCAT=YES
     PKG_CHECK_MODULES([LIBEXTTEXTCAT], [libexttextcat])