Fix Windows build and enable CMIS inconditionally

Since the provider should now build everywhere,
enable it inconditionally to catch minor problems

7 files changed, 42 insertions, 63 deletions

diff --git a/configure.in b/configure.in
index 808840903b85..9ba76535180e 100644
--- a/configure.in
+++ b/configure.in
@@ -7030,12 +7030,6 @@ if test "$enable_cairo_canvas" = "yes" ; then
 fi
 AC_SUBST(ENABLE_CAIRO_CANVAS)
 
-ENABLE_CMIS="FALSE"
-if test "x$with_cmis" != "xno" ; then
-   ENABLE_CMIS="TRUE"
-fi
-AC_SUBST(ENABLE_CMIS)
-
 dnl ===================================================================
 dnl Check whether the GStreamer libraries are available.
 dnl ===================================================================
diff --git a/libcmis/Module_libcmis.mk b/libcmis/Module_libcmis.mk
index f311acf89e83..0cf0d040d05a 100644
--- a/libcmis/Module_libcmis.mk
+++ b/libcmis/Module_libcmis.mk
@@ -27,11 +27,9 @@
 
 $(eval $(call gb_Module_Module,libcmis))
 
-ifeq ($(ENABLE_CMIS),TRUE)
 $(eval $(call gb_Module_add_targets,libcmis,\
 	ExternalLib_libcmis \
 ))
-endif
 
 
 # vim: set noet sw=4 ts=4:
diff --git a/postprocess/packcomponents/makefile.mk b/postprocess/packcomponents/makefile.mk
index ec4bc15aeed3..819d7d518b5b 100644
--- a/postprocess/packcomponents/makefile.mk
+++ b/postprocess/packcomponents/makefile.mk
@@ -168,6 +168,7 @@ my_components = \
     ucphier1 \
     ucppkg1 \
     ucptdoc1 \
+	ucpcmis1 \
 
 .IF "$(BUILD_TYPE)" != "$(BUILD_TYPE:s/DESKTOP//)"
 my_components += \
@@ -221,10 +222,6 @@ my_components += gconfbe1
 my_components += ucpgio
 .END
 
-.IF "$(ENABLE_CMIS)" == "TRUE"
-my_components += ucpcmis
-.END
-
 .IF "$(ENABLE_GNOMEVFS)" != ""
 my_components += ucpgvfs
 .END
diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp
index b8eaa201fc2d..9a4f3dda0de4 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -1333,9 +1333,7 @@ SPECIAL_COMPONENT_LIB_FILE(gid_File_Ucpexpand1, ucpexpand1.uno)
 SPECIAL_COMPONENT_LIB_FILE(gid_File_Ucpodma1, ucpodma1)
 #endif
 
-#if ENABLE_CMIS
 SPECIAL_COMPONENT_LIB_FILE(gid_File_Ucpcmis, ucpcmis1.uno)
-#endif
 
 File gid_File_Lib_Lnth
     TXT_FILE_BODY;
diff --git a/scp2/source/ooo/module_hidden_ooo.scp b/scp2/source/ooo/module_hidden_ooo.scp
index 826b6b46c7cb..2d220e342036 100644
--- a/scp2/source/ooo/module_hidden_ooo.scp
+++ b/scp2/source/ooo/module_hidden_ooo.scp
@@ -327,9 +327,7 @@ Module gid_Module_Root_Files_5
 #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,
     gid_File_Lib_Collator_Data,
diff --git a/set_soenv.in b/set_soenv.in
index 1f497384f7c8..63223e76ff38 100755
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -1496,7 +1496,6 @@ 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" );
diff --git a/ucb/source/ucp/cmis/makefile.mk b/ucb/source/ucp/cmis/makefile.mk
index 5db9e92f7a66..08ffa6ff0529 100644
--- a/ucb/source/ucp/cmis/makefile.mk
+++ b/ucb/source/ucp/cmis/makefile.mk
@@ -1,43 +1,41 @@
+#*************************************************************************
 #
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License or as specified alternatively below. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
+# OpenOffice.org - a multi-platform office productivity suite
 #
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
+# This file is part of OpenOffice.org.
 #
-# Major Contributor(s):
-# [ Copyright (C) 2011 SUSE <cbosdonnat@suse.com> (initial developer) ]
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
 #
-# All Rights Reserved.
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
 #
-# For minor contributions see the git repository.
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
-# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
-# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
-# instead of those above.
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.  If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
 #
+#*************************************************************************
 
-PRJ=..$/..$/..
-PRJNAME=ucb
-# Version
-UCPCMIS_MAJOR=1
-TARGET=ucpcmis
-ENABLE_EXCEPTIONS=TRUE
-USE_DEFFILE=TRUE
-NO_BSYMBOLIC=TRUE
+PRJ = ..$/..$/..
+PRJNAME = ucb
+UCPCMIS_MAJOR = 1
+TARGET = ucpcmis$(UCPCMIS_MAJOR).uno
+ENABLE_EXCEPTIONS = TRUE
+NO_BSYMBOLIC = TRUE
 
-.INCLUDE: settings.mk
-.IF "$(L10N_framework)"==""
+.INCLUDE : settings.mk
+DLLPRE =
 
-.IF "$(ENABLE_CMIS)"=="TRUE"
+.IF "$(L10N_framework)"==""
 
 .IF "$(GUI)"=="UNX" || "$(GUI)$(COM)"=="WNTGCC"
 
@@ -53,18 +51,12 @@ CMISLIB=$(LIBPRE) cmislib.lib
 
 .ENDIF
 
-# no "lib" prefix
-DLLPRE =
-
-SLOFILES=$(SLO)$/cmis_provider.obj\
+SLOFILES= \
+        $(SLO)$/cmis_provider.obj\
          $(SLO)$/cmis_content.obj \
 		 $(SLO)$/cmis_url.obj
 
-SHL1TARGET=$(TARGET)$(UCPCMIS_MAJOR).uno
-SHL1DEF=$(MISC)$/$(SHL1TARGET).def
-SHL1LIBS=$(SLB)$/$(TARGET).lib
-SHL1IMPLIB=i$(TARGET)
-SHL1STDLIBS=\
+SHL1STDLIBS = \
     $(CPPUHELPERLIB) \
     $(CPPULIB) \
     $(SALLIB)  \
@@ -75,14 +67,19 @@ SHL1STDLIBS=\
 	$(CURLLIB) \
 	$(LIBXML2LIB)
 
-SHL1VERSIONMAP=$(SOLARENV)/src/component.map
+SHL1VERSIONMAP = $(SOLARENV)/src/component.map
+SHL1TARGET = $(TARGET)
 
-.ENDIF          # "$(ENABLE_CMIS)"=="TRUE"
-.ENDIF # L10N_framework
+SHL1DEPN =
+SHL1IMPLIB = i$(TARGET)
+SHL1LIBS = $(SLB)$/$(TARGET).lib
+SHL1DEF = $(MISC)$/$(SHL1TARGET).def
 
-.INCLUDE: target.mk
+DEF1NAME = $(SHL1TARGET)
 
-.IF "$(ENABLE_CMIS)"=="TRUE"
+.ENDIF # L10N_framework
+
+.INCLUDE : target.mk
 
 ALLTAR : $(MISC)/ucpcmis.component
 
@@ -91,5 +88,3 @@ $(MISC)/ucpcmis.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
     $(XSLTPROC) --nonet --stringparam uri \
         '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
         $(SOLARENV)/bin/createcomponent.xslt ucpcmis.component
-
-.ENDIF          # "$(ENABLE_CMIS)"=="TRUE"