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

[Fridrich Strba]

 configure.in |   24 ++++++++++++++++++++++++
 ooo.lst.in   |    1 +
 2 files changed, 25 insertions(+)

New commits:
commit 092753f44ac1768fac1d2655f8884332e9efdff3
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date:   Tue May 17 12:47:38 2011 +0200

    Add dummy libvisio into download

diff --git a/ooo.lst.in b/ooo.lst.in
index 56a9d92..c698634 100644
--- a/ooo.lst.in
+++ b/ooo.lst.in
@@ -79,6 +79,7 @@ debc62758716a169df9f62e6ab2bc634-zlib-1.2.3.tar.gz
 f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2
 9ed97fce60a9a65852402248a6659492-hunspell-1.3.1.tar.gz
 0625a7d661f899a8ce263fc8a9879108-graphite2-0.9.2.tgz
+763bb9b14eec5ba9a533d7a9279301db-libvisio-0.0.0.tar.gz
 http://download.go-oo.org/extern
 185d60944ea767075d27247c3162b3bc-unowinreg.dll
 b4cae0700aa1c2aef7eb7f345365e6f1-translate-toolkit-1.8.1.tar.bz2
commit d98c7f8c8c303cfc8d9c7207e22ff8d5c4a6fb1d
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date:   Tue May 17 12:45:04 2011 +0200

    add possibility of system libvisio
    
    which does not yet exist though

diff --git a/configure.in b/configure.in
index 36ea275..77af25c 100755
--- a/configure.in
+++ b/configure.in
@@ -694,6 +694,11 @@ AC_ARG_WITH(system-expat,
         [Use expat already on system.]),
 ,)
 
+AC_ARG_WITH(system-libvisio,
+    AS_HELP_STRING([--with-system-libvisio],
+        [Use libvisio already on system.]),
+,)
+
 AC_ARG_WITH(system-libwpd,
     AS_HELP_STRING([--with-system-libwpd],
         [Use libwpd already on system.]),
@@ -4085,6 +4090,25 @@ fi
 AC_SUBST(SYSTEM_EXPAT)
 
 dnl ===================================================================
+dnl Check for system libvisio
+dnl ===================================================================
+AC_MSG_CHECKING([which libvisio to use])
+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( LIBVISIO, libvisio-0.0 )
+else
+    AC_MSG_RESULT([internal])
+    SYSTEM_LIBVISIO=NO
+    BUILD_TYPE="$BUILD_TYPE LIBVISIO"
+fi
+AC_SUBST(SYSTEM_LIBVISIO)
+AC_SUBST(LIBVISIO_CFLAGS)
+AC_SUBST(LIBVISIO_LIBS)
+
+
+dnl ===================================================================
 dnl Check for system libwpd
 dnl ===================================================================
 AC_MSG_CHECKING([which libwpd to use])