Currently the deprecated binfilter are build by default as the inner
configure explicitely requires --disable-binfilter to get rid of
them. This patch defaults to disabled and require --enable-binfilter
to turn them on. Ran configure with both options and it worked fine.
Signed-off-by: Sebastian Spaeth <sebast...@sspaeth.de>
---
configure.in | 14 ++++++++------
1 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/configure.in b/configure.in
index 7a9dc43..57b48e9 100644
--- a/configure.in
+++ b/configure.in
@@ -240,8 +240,9 @@ AC_ARG_ENABLE(kde4,
],,)
AC_ARG_ENABLE(binfilter,
-[ --disable-binfilter Disable legacy binary file formats filters
-],,if ! test -d ./binfilter; then enable_binfilter=no; fi)
+[ --enable-binfilter Enable legacy binary file formats filters],
+[ enable_binfilter=yes
+])
AC_ARG_ENABLE(rpath,
[ --disable-rpath Disable the use of relative paths in shared
libraries
@@ -1567,13 +1568,14 @@ dnl
===================================================================
dnl Disable legacy binary file formats filters
dnl ===================================================================
AC_MSG_CHECKING([whether to enable filters for legacy binary file formats
(StarOffice 5.2)])
-if test "$enable_binfilter" = "no"; then
- WITH_BINFILTER="NO"
- AC_MSG_RESULT([no])
-else
+if test "$enable_binfilter" = "yes" &&
+ test -d ./binfilter; then
WITH_BINFILTER="YES"
BUILD_TYPE="$BUILD_TYPE BINFILTER"
AC_MSG_RESULT([yes])
+else
+ WITH_BINFILTER="NO"
+ AC_MSG_RESULT([no])
fi
AC_SUBST(WITH_BINFILTER)
--
1.7.1
_______________________________________________
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
