incubator-ooo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From p..@apache.org
Subject svn commit: r1204334 - /incubator/ooo/trunk/main/configure.in
Date Mon, 21 Nov 2011 03:09:49 GMT
Author: pfg
Date: Mon Nov 21 03:09:49 2011
New Revision: 1204334

URL: http://svn.apache.org/viewvc?rev=1204334&view=rev
Log:
Revert r1190021: make sure that binfilter will be built by default for the next release.

Modified:
    incubator/ooo/trunk/main/configure.in

Modified: incubator/ooo/trunk/main/configure.in
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/configure.in?rev=1204334&r1=1204333&r2=1204334&view=diff
==============================================================================
--- incubator/ooo/trunk/main/configure.in (original)
+++ incubator/ooo/trunk/main/configure.in Mon Nov 21 03:09:49 2011
@@ -272,8 +272,8 @@ AC_ARG_ENABLE(kde4,
                           if you want to support both KDE3 and KDE4.
 ],,)
 AC_ARG_ENABLE(binfilter,
-[  --enable-binfilter      Enable legacy binary file formats filters
-],,)
+[  --disable-binfilter     Disable legacy binary file formats filters
+],,if ! test -d ./binfilter; then enable_binfilter=no; fi)
 AC_ARG_ENABLE(rpath,
 [  --disable-rpath         Disable the use of relative paths in shared libraries
 ],,)
@@ -1299,13 +1299,13 @@ 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" = "yes"; then
+if test "$enable_binfilter" = "no"; then
+   WITH_BINFILTER="NO"
+   AC_MSG_RESULT([no])
+else
    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)
 



Mime
View raw message