Added --disable-cmis flag for use while the feature is too unstable

configure.in

@@ -519,6 +519,11 @@ AC_ARG_ENABLE(release-build,
          See http://wiki.documentfoundation.org/DevBuild]),
 ,)
 
+AC_ARG_ENABLE(cmis,
+    AS_HELP_STRING([--disable-cmis],
+        [Disable CMIS experimental feature.]),
+,enable_cmis=yes)
+
 dnl ===================================================================
 dnl Optional Packages (--with/without-)
 dnl ===================================================================
@@ -7026,6 +7031,12 @@ if test "$enable_cairo_canvas" = "yes" ; then
 fi
 AC_SUBST(ENABLE_CAIRO_CANVAS)
 
+ENABLE_CMIS="FALSE"
+if test "$enable_cmis" = "yes" ; then
+   ENABLE_CMIS="TRUE"
+fi
+AC_SUBST(ENABLE_CMIS)
+
 dnl ===================================================================
 dnl Check whether the GStreamer libraries are available.
 dnl ===================================================================

libcmis/Module_libcmis.mk

@@ -27,9 +27,11 @@
 
 $(eval $(call gb_Module_Module,libcmis))
 
+ifneq ($(ENABLE_CMIS),)
 $(eval $(call gb_Module_add_targets,libcmis,\
 	ExternalLib_libcmis \
 ))
+endif
 
 
 # vim: set noet sw=4 ts=4:

postprocess/packcomponents/makefile.mk

@@ -221,6 +221,10 @@ my_components += gconfbe1
 my_components += ucpgio
 .END
 
+.IF "$(ENABLE_CMIS)" != ""
+my_components += ucpcmis
+.END
+
 .IF "$(ENABLE_GNOMEVFS)" != ""
 my_components += ucpgvfs
 .END

scp2/source/ooo/file_library_ooo.scp

@@ -186,8 +186,7 @@ End
 
 #endif
 
-#ifndef WNT
+#if ENABLE_CMIS
-
 File gid_File_Lib_Cmis
     TXT_FILE_BODY;
     Styles = (PACKED);
@@ -206,6 +205,7 @@ File gid_File_Lib_Cmis
    #endif
   #endif
 End
+#endif
 
 #endif
 
@@ -1356,7 +1356,7 @@ SPECIAL_COMPONENT_LIB_FILE(gid_File_Ucpexpand1, ucpexpand1.uno)
 SPECIAL_COMPONENT_LIB_FILE(gid_File_Ucpodma1, ucpodma1)
 #endif
 
-#ifndef WNT
+#if ENABLE_CMIS
 SPECIAL_COMPONENT_LIB_FILE(gid_File_Ucpcmis, ucpcmis1.uno)
 #endif
 

scp2/source/ooo/module_hidden_ooo.scp

@@ -326,6 +326,9 @@ Module gid_Module_Root_Files_5
 #endif
 #if ! defined SYSTEM_LIBGSF
     gid_File_Lib_Libgsf,
+#endif
+#if ENABLE_CMIS
+	gid_File_Lib_Cmis,
 #endif
 	gid_File_Lib_Dict_Ja,
 	gid_File_Lib_Dict_Zh,
@@ -340,7 +343,6 @@ Module gid_Module_Root_Files_5
 	gid_File_Lib_Ldapbe2,
 	gid_File_Lib_Comphelper2,
 	gid_File_Lib_Cached1,
-	gid_File_Lib_Cmis,
 	gid_File_Lib_Curl,
 	gid_Unixlink_File_Lib_Curl,
 	gid_File_Lib_Db,

set_soenv.in

@@ -1496,6 +1496,7 @@ ToFile( "ENABLE_STATIC_GTK", "@ENABLE_STATIC_GTK@", "e" );
 ToFile( "SPLIT_APP_MODULES", "@SPLIT_APP_MODULES@","e" );
 ToFile( "SPLIT_OPT_FEATURES","@SPLIT_OPT_FEATURES@","e" );
 ToFile( "ENABLE_CAIRO_CANVAS", "@ENABLE_CAIRO_CANVAS@",     "e" );
+ToFile( "ENABLE_CMIS",        "@ENABLE_CMIS@",     "e" );
 ToFile( "ENABLE_OPENGL",     "@ENABLE_OPENGL@",    "e" );
 ToFile( "ENABLE_PDFIMPORT",  "@ENABLE_PDFIMPORT@", "e" );
 ToFile( "ENABLE_MINIMIZER",   "@ENABLE_MINIMIZER@","e" );

ucb/source/ucp/cmis/makefile.mk

@@ -37,6 +37,8 @@ NO_BSYMBOLIC=TRUE
 .INCLUDE: settings.mk
 .IF "$(L10N_framework)"==""
 
+.IF "$(ENABLE_CMIS)"!=""
+
 # no "lib" prefix
 DLLPRE =
 
@@ -59,6 +61,7 @@ SHL1STDLIBS=\
 
 SHL1VERSIONMAP=$(SOLARENV)/src/component.map
 
+.ENDIF          # "$(ENABLE_CMIS)"!=""
 .ENDIF # L10N_framework
 
 .INCLUDE: target.mk