Kaydet (Commit) 86b9900d authored tarafından Pedro Giffuni's avatar Pedro Giffuni

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
üst ca2d29e1
......@@ -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
],,)
......@@ -3763,6 +3766,23 @@ else
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 ===================================================================
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment