configure.in | 20 ++++++++++++++++++++
1 file changed, 20 insertions(+)
New commits:
commit 86b9900dc449b7b54a4605521b8929ce1a5aebc9
Author: Pedro Giffuni <p...@apache.org>
Date: Fri Jan 16 20:47:02 2015 +0000
Revert most of r1651396:
We really don't use libwpd but it left some leftover cruft that
has to be removed as well. A mini-project for a rainy day.
Reported by: arielch
diff --git a/configure.in b/configure.in
index 97f4b4c..1baf940 100644
--- a/configure.in
+++ b/configure.in
@@ -435,6 +435,9 @@ AC_ARG_WITH(system-jpeg,
AC_ARG_WITH(system-expat,
[ --with-system-expat Use expat already on system
],,)
+AC_ARG_WITH(system-libwpd,
+[ --with-system-libwpd Use libwpd already on system
+],,)
AC_ARG_WITH(system-libxml,
[ --with-system-libxml Use libxml already on system
],,)
@@ -3764,6 +3767,23 @@ fi
AC_SUBST(SYSTEM_EXPAT)
dnl ===================================================================
+dnl Check for system libwpd
+dnl ===================================================================
+AC_MSG_CHECKING([which libwpd to use])
+if test -n "$with_system_libwpd" -o -n "$with_system_libs" && \
+ test "$with_system_libwpd" != "no"; then
+ AC_MSG_RESULT([external])
+ SYSTEM_LIBWPD=YES
+ PKG_CHECK_MODULES( LIBWPD, libwpd-0.8 )
+else
+ AC_MSG_RESULT([no])
+ SYSTEM_LIBWPD=
+fi
+AC_SUBST(SYSTEM_LIBWPD)
+AC_SUBST(LIBWPD_CFLAGS)
+AC_SUBST(LIBWPD_LIBS)
+
+dnl ===================================================================
dnl Check for system cppunit
dnl ===================================================================
WITH_CPPUNIT=
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
