diff options
| author | Jürgen Schmidt <jsc@apache.org> | 2011-11-14 12:37:29 +0000 |
|---|---|---|
| committer | Jürgen Schmidt <jsc@apache.org> | 2011-11-14 12:37:29 +0000 |
| commit | ba0d0a588d5bfc00e8076ec0e9e0c9d38154a854 (patch) | |
| tree | 87025fa0819a5b4a12c55d17d59ae0d1dc227e4c /configure.in | |
| parent | 3360d33d73a80c1c114af3e34ad7867e0388e9be (diff) | |
118587: remove libwpd, disable WordPerfect filter, allow built with system libwpd
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/configure.in b/configure.in index 947d9d75dbdb..681b39a1c5cc 100644 --- a/configure.in +++ b/configure.in @@ -1240,7 +1240,6 @@ if test "$enable_copyleft" != "yes"; then DISABLE_HUNSPELL="TRUE" DISABLE_HYPHEN="TRUE" - DISABLE_LIBWPD="TRUE" DISABLE_SAXON="TRUE" BUILD_EPM="NO" @@ -1251,7 +1250,6 @@ else DISABLE_HUNSPELL= DISABLE_HYPHEN= - DISABLE_LIBWPD= DISABLE_SAXON= AC_MSG_RESULT([no]) @@ -1259,7 +1257,6 @@ else fi AC_SUBST(DISABLE_HUNSPELL) AC_SUBST(DISABLE_HYPHEN) -AC_SUBST(DISABLE_LIBWPD) AC_SUBST(DISABLE_SAXON) AC_SUBST(BUILD_EPM) @@ -3671,22 +3668,16 @@ AC_SUBST(SYSTEM_EXPAT) dnl =================================================================== dnl Check for system libwpd dnl =================================================================== -if test -n "$enable_copyleft" -a "$enable_copyleft" != "no"; then 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([internal]) - SYSTEM_LIBWPD=NO - BUILD_TYPE="$BUILD_TYPE LIBWPD" fi AC_SUBST(SYSTEM_LIBWPD) AC_SUBST(LIBWPD_CFLAGS) AC_SUBST(LIBWPD_LIBS) -fi dnl =================================================================== dnl Check for system cppunit |