Author: pfg
Date: Fri Jan 16 20:47:02 2015
New Revision: 1652526
URL: http://svn.apache.org/r1652526
Log:
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
Modified:
openoffice/trunk/main/configure.in
Modified: openoffice/trunk/main/configure.in
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/configure.in?rev=1652526&r1=1652525&r2=1652526&view=diff
==============================================================================
--- openoffice/trunk/main/configure.in (original)
+++ openoffice/trunk/main/configure.in Fri Jan 16 20:47:02 2015
@@ -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=
