diff options
| author | Norbert Thiebaud <nthiebaud@gmail.com> | 2012-11-08 16:25:37 -0600 |
|---|---|---|
| committer | Tor Lillqvist <tml@iki.fi> | 2012-11-09 07:58:02 +0000 |
| commit | 060219ac1a2350cfe89d5415b925dca8150f864d (patch) | |
| tree | b708135a25bd5e32673e29eaef9abe785c2ad200 /configure.ac | |
| parent | 325ac9d353057767da9648fab332eac9c4a6ef0c (diff) | |
binfilter.die.die.die
Change-Id: Ia3c103e4343d309b997ed37e33a382ffdfbddac3
Reviewed-on: https://gerrit.libreoffice.org/1014
Reviewed-by: Tor Lillqvist <tml@iki.fi>
Tested-by: Tor Lillqvist <tml@iki.fi>
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 34 |
1 files changed, 4 insertions, 30 deletions
diff --git a/configure.ac b/configure.ac index e3054449ab6c..2439053cfd54 100644 --- a/configure.ac +++ b/configure.ac @@ -943,12 +943,6 @@ AC_ARG_ENABLE(unix-qstart-libpng, enabling this is a good idea (ie. for Linux Distro packaging).]), ,enable_unix_qstart_libpng=yes) -AC_ARG_ENABLE(binfilter, - AS_HELP_STRING([--enable-binfilter], - [Enable legacy binary file formats filters build.]), -,enable_binfilter=no -) - AC_ARG_ENABLE(rpath, AS_HELP_STRING([--disable-rpath], [Disable the use of relative paths in shared libraries.]), @@ -4351,21 +4345,6 @@ else fi AC_SUBST(DO_FETCH_TARBALLS) - -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 - WITH_BINFILTER="YES" - BUILD_TYPE="$BUILD_TYPE BINFILTER" - GIT_NEEDED_SUBMODULES="binfilter $GIT_NEEDED_SUBMODULES" - AC_MSG_RESULT([yes]) -fi -AC_SUBST(WITH_BINFILTER) - AC_MSG_CHECKING([whether to build help]) if test "$with_help" != "no" -a $_os != iOS -a $_os != Android; then AC_MSG_RESULT([yes]) @@ -12358,16 +12337,11 @@ fi AC_MSG_CHECKING([whether to create huge library]) MERGELIBS= if test "$enable_mergelibs" = "yes" ; then - if test $WITH_BINFILTER = YES; then - add_warning "--enable-mergelibs conflicts with --enable-binfilter. Disabling mergelibs." - AC_MSG_RESULT([no]) - else - if test $_os != Linux -a $_os != Android -a $_os != WINNT; then - add_warning "--enable-mergelibs is not tested for this platform" - fi - MERGELIBS="TRUE" - AC_MSG_RESULT([yes]) + if test $_os != Linux -a $_os != Android -a $_os != WINNT; then + add_warning "--enable-mergelibs is not tested for this platform" fi + MERGELIBS="TRUE" + AC_MSG_RESULT([yes]) else AC_MSG_RESULT([no]) fi |