You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by pf...@apache.org on 2015/01/13 17:07:00 UTC
svn commit: r1651396 - /openoffice/trunk/main/configure.in
Author: pfg
Date: Tue Jan 13 16:07:00 2015
New Revision: 1651396
URL: http://svn.apache.org/r1651396
Log:
Don't look for libwpd - we don't use it.
Fix typo while here.
Modified:
openoffice/trunk/main/configure.in
Modified: openoffice/trunk/main/configure.in
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/configure.in?rev=1651396&r1=1651395&r2=1651396&view=diff
==============================================================================
--- openoffice/trunk/main/configure.in (original)
+++ openoffice/trunk/main/configure.in Tue Jan 13 16:07:00 2015
@@ -435,9 +435,6 @@ 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
],,)
@@ -1415,7 +1412,7 @@ if test "$enable_category_b" = "yes"; th
AC_MSG_RESULT([yes: allow modules nss, hunspell, hyphen, saxon, rhino, beanshell, graphite, coinmp to be built])
else
- # Disable libaries.
+ # Disable libraries.
enable_nss_module="no"
enable_hunspell="no"
enable_hyphen="no"
@@ -3767,23 +3764,6 @@ 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=
Re: svn commit: r1651396 - /openoffice/trunk/main/configure.in
Posted by Ariel Constenla-Haile <ar...@apache.org>.
On Tue, Jan 13, 2015 at 04:07:00PM -0000, pfg@apache.org wrote:
> Author: pfg
> Date: Tue Jan 13 16:07:00 2015
> New Revision: 1651396
>
> URL: http://svn.apache.org/r1651396
> Log:
> Don't look for libwpd - we don't use it.
This breaks the build in all platforms:
http://ci.apache.org/builders/openoffice-linux32-nightly/builds/271/steps/configure/logs/stdio
http://ci.apache.org/builders/openoffice-linux64-nightly/builds/252/steps/configure/logs/stdio
http://ci.apache.org/builders/aoo-win7/builds/278/steps/configure/logs/stdio
and need further clean-up, if "we don't use it":
http://opengrok.adfinis-sygroup.org/source/search?q=SYSTEM_LIBWPD&defs=&refs=&path=&hist=&project=aoo-trunk
http://opengrok.adfinis-sygroup.org/source/search?q=LIBWPD_CFLAGS&defs=&refs=&path=&hist=&project=aoo-trunk
http://opengrok.adfinis-sygroup.org/source/search?q=LIBWPD_LIBS&defs=&refs=&path=&hist=&project=aoo-trunk
Regards
--
Ariel Constenla-Haile
La Plata, Argentina