extend license filtering, and add fallback-checks.

Change-Id: Ia1ec3564326cf898d756c231a64a54db8698bf20

config_host/config_lgpl.h.in

+/*
+ * Include this file to ensure that this code is not
+ * compiled into the MPL subset.
+ */
+#ifndef CONFIG_LGPL_H
+#define CONFIG_LGPL_H
+
+#define MPL_HAVE_SUBSET 0
+
+#if MPL_HAVE_SUBSET
+#  error "Attempting to compile LGPL code into MPL subset"
+#endif
+
+#endif

configure.ac

@@ -6944,12 +6944,17 @@ AC_MSG_CHECKING([MPL subset])
 MPL_SUBSET=
 if test "$enable_mpl_subset" = "yes"; then
    if test "x$enable_postgresql_sdbc" != "xno"; then
-        AC_MSG_ERROR([need to --disable-postgresql-sdbc.])
+        AC_MSG_ERROR([need to --disable-postgresql-sdbc - the postgress database backend.])
    fi
    if test "$enable_lotuswordpro" = "yes"; then
-        AC_MSG_ERROR([need to --disable-lotuswordpro.])
+        AC_MSG_ERROR([need to --disable-lotuswordpro - a Lotus Word Pro file format import filter.])
    fi
+   if test "$enable_neon" != "no"; then
+        AC_MSG_ERROR([need to --disable-neon - webdav support.])
+   fi
+
    MPL_SUBSET="TRUE"
+   AC_DEFINE(MPL_HAVE_SUBSET)
    AC_MSG_RESULT([only])
 else
    AC_MSG_RESULT([no restrictions])
@@ -11931,6 +11936,7 @@ AC_CONFIG_HEADERS([config_host/config_features.h])
 AC_CONFIG_HEADERS([config_host/config_global.h])
 AC_CONFIG_HEADERS([config_host/config_graphite.h])
 AC_CONFIG_HEADERS([config_host/config_harfbuzz.h])
+AC_CONFIG_HEADERS([config_host/config_lgpl.h])
 AC_CONFIG_HEADERS([config_host/config_kde4.h])
 AC_CONFIG_HEADERS([config_host/config_mingw.h])
 AC_CONFIG_HEADERS([config_host/config_oox.h])

include/tubes/file-transfer-helper.h

@@ -24,6 +24,7 @@
 #ifndef __EMPATHY_FT_HANDLER_H__
 #define __EMPATHY_FT_HANDLER_H__
 
+#include <config_lgpl.h>
 #include <glib-object.h>
 #include <gio/gio.h>
 

lotuswordpro/source/filter/lwpheader.hxx

@@ -57,14 +57,11 @@
  * @file
  *  For LWP filter architecture prototype
  ************************************************************************/
-/*************************************************************************
- * Change History
- Jan 2005           Created
- ************************************************************************/
 
 #ifndef _LWPHEADERS_HXX
 #define _LWPHEADERS_HXX
 
+#include <config_lgpl.h>
 #include <math.h>
 #include <vector>
 #include <memory>

ucb/source/ucp/webdav-neon/ContentProperties.hxx

@@ -29,6 +29,7 @@
 #ifndef _WEBDAV_UCP_CONTENTPROPERTIES_HXX
 #define _WEBDAV_UCP_CONTENTPROPERTIES_HXX
 
+#include <config_lgpl.h>
 #include <memory>
 #include <vector>
 #include <boost/unordered_map.hpp>

ucb/source/ucp/webdav-neon/DAVAuthListener.hxx

@@ -28,6 +28,7 @@
 #ifndef _DAVAUTHLISTENER_HXX_
 #define _DAVAUTHLISTENER_HXX_
 
+#include <config_lgpl.h>
 #include <salhelper/simplereferenceobject.hxx>
 #include <rtl/ustring.hxx>
 

ucb/source/ucp/webdav-neon/DAVAuthListenerImpl.hxx

@@ -29,6 +29,7 @@
 #ifndef _DAVAUTHLISTENERIMPL_HXX_
 #define _DAVAUTHLISTENERIMPL_HXX_
 
+#include <config_lgpl.h>
 #include "DAVAuthListener.hxx"
 
 

ucb/source/ucp/webdav-neon/DAVException.hxx

@@ -29,6 +29,7 @@
 #ifndef _DAVEXCEPTION_HXX_
 #define _DAVEXCEPTION_HXX_
 
+#include <config_lgpl.h>
 #include <rtl/ustring.hxx>
 
 namespace webdav_ucp

ucb/source/ucp/webdav-neon/DAVProperties.hxx

@@ -28,6 +28,7 @@
 #ifndef _DAVPROPERTIES_HXX_
 #define _DAVPROPERTIES_HXX_
 
+#include <config_lgpl.h>
 #include <rtl/ustring.hxx>
 #include "NeonTypes.hxx"
 

ucb/source/ucp/webdav-neon/DAVRequestEnvironment.hxx

@@ -28,6 +28,7 @@
 #ifndef _DAVREQUESTENVIRONMENT_HXX_
 #define _DAVREQUESTENVIRONMENT_HXX_
 
+#include <config_lgpl.h>
 #include <vector>
 #include <rtl/ref.hxx>
 #include "DAVAuthListener.hxx"

ucb/source/ucp/webdav-neon/DAVResource.hxx

@@ -29,6 +29,7 @@
 #ifndef _DAVRESOURCE_HXX_
 #define _DAVRESOURCE_HXX_
 
+#include <config_lgpl.h>
 #include <vector>
 
 #include "rtl/ustring.hxx"

ucb/source/ucp/webdav-neon/DAVResourceAccess.hxx

@@ -29,6 +29,7 @@
 #ifndef _DAVRESOURCEACCESS_HXX_
 #define _DAVRESOURCEACCESS_HXX_
 
+#include <config_lgpl.h>
 #include <vector>
 #include <rtl/ustring.hxx>
 #include <rtl/ref.hxx>

ucb/source/ucp/webdav-neon/DAVSession.hxx

@@ -29,6 +29,7 @@
 #ifndef _DAVSESSION_HXX_
 #define _DAVSESSION_HXX_
 
+#include <config_lgpl.h>
 #include <memory>
 #include <rtl/ustring.hxx>
 #include <com/sun/star/io/XInputStream.hpp>

ucb/source/ucp/webdav-neon/DAVSessionFactory.hxx

@@ -31,6 +31,7 @@
 #ifdef min
 #undef min // GNU libstdc++ <memory> includes <limit> which defines methods called min...
 #endif
+#include <config_lgpl.h>
 #include <map>
 #include <memory>
 #include <osl/mutex.hxx>

ucb/source/ucp/webdav-neon/DAVTypes.hxx

@@ -29,6 +29,7 @@
 #ifndef _DAVTYPES_HXX_
 #define _DAVTYPES_HXX_
 
+#include <config_lgpl.h>
 #include <rtl/ustring.hxx>
 #include <com/sun/star/uno/Any.hxx>
 

ucb/source/ucp/webdav-neon/DateTimeHelper.hxx

@@ -29,6 +29,7 @@
 #ifndef _WEBDAV_DATETIME_HELPER_HXX
 #define _WEBDAV_DATETIME_HELPER_HXX
 
+#include <config_lgpl.h>
 #include <sal/types.h>
 
 namespace com { namespace sun { namespace star { namespace util {

ucb/source/ucp/webdav-neon/LinkSequence.cxx

@@ -26,7 +26,7 @@
  *
  ************************************************************************/
 
-
+#include <config_lgpl.h>
 #include <string.h>
 #include <ne_xml.h>
 

ucb/source/ucp/webdav-neon/LockEntrySequence.cxx

@@ -26,7 +26,7 @@
  *
  ************************************************************************/
 
-
+#include <config_lgpl.h>
 #include <string.h>
 #include <ne_xml.h>
 #include "LockEntrySequence.hxx"

ucb/source/ucp/webdav-neon/LockSequence.cxx

@@ -26,7 +26,7 @@
  *
  ************************************************************************/
 
-
+#include <config_lgpl.h>
 #include <string.h>
 #include <ne_xml.h>
 #include "LockSequence.hxx"

ucb/source/ucp/webdav-neon/LockSequence.hxx

@@ -29,6 +29,7 @@
 #ifndef _LOCKSEQUENCE_HXX_
 #define _LOCKSEQUENCE_HXX_
 
+#include <config_lgpl.h>
 #include <rtl/string.hxx>
 #include <com/sun/star/uno/Sequence.hxx>
 #include <com/sun/star/ucb/Lock.hpp>

ucb/source/ucp/webdav-neon/NeonHeadRequest.hxx

@@ -29,6 +29,7 @@
 #ifndef _NEONHEADREQUEST_HXX_
 #define _NEONHEADREQUEST_HXX_
 
+#include <config_lgpl.h>
 #include <vector>
 #include "NeonTypes.hxx"
 #include "DAVResource.hxx"

ucb/source/ucp/webdav-neon/NeonInputStream.hxx

@@ -28,6 +28,7 @@
 #ifndef _NEONINPUTSTREAM_HXX_
 #define _NEONINPUTSTREAM_HXX_
 
+#include <config_lgpl.h>
 #include <sal/types.h>
 #include <rtl/ustring.hxx>
 #include <cppuhelper/weak.hxx>

ucb/source/ucp/webdav-neon/NeonLockStore.hxx

@@ -28,6 +28,7 @@
 #ifndef INCLUDED_NEONLOCKSTORE_HXX
 #define INCLUDED_NEONLOCKSTORE_HXX
 
+#include <config_lgpl.h>
 #include <map>
 #include "warnings_guard_ne_locks.h"
 #include "osl/mutex.hxx"

ucb/source/ucp/webdav-neon/NeonPropFindRequest.hxx

@@ -29,6 +29,7 @@
 #ifndef _NEONPROPFINDREQUEST_HXX_
 #define _NEONPROPFINDREQUEST_HXX_
 
+#include <config_lgpl.h>
 #include <vector>
 #include <rtl/ustring.hxx>
 #include "NeonTypes.hxx"

ucb/source/ucp/webdav-neon/NeonSession.hxx

@@ -29,6 +29,7 @@
 #ifndef _NEONSESSION_HXX_
 #define _NEONSESSION_HXX_
 
+#include <config_lgpl.h>
 #include <vector>
 #include <osl/mutex.hxx>
 #include "DAVSession.hxx"

ucb/source/ucp/webdav-neon/NeonTypes.hxx

@@ -29,6 +29,7 @@
 #ifndef _NEONTYPES_HXX_
 #define _NEONTYPES_HXX_
 
+#include <config_lgpl.h>
 #include <ne_session.h>
 #include <ne_utils.h>
 #include <ne_basic.h>

ucb/source/ucp/webdav-neon/NeonUri.hxx

@@ -28,6 +28,7 @@
 #ifndef _NEONURI_HXX_
 #define _NEONURI_HXX_
 
+#include <config_lgpl.h>
 #include <ne_uri.h>
 #include <rtl/ustring.hxx>
 #include <DAVException.hxx>

ucb/source/ucp/webdav-neon/PropertyMap.hxx

@@ -29,6 +29,7 @@
 #ifndef _WEBDAV_UCP_PROPERTYMAP_HXX
 #define _WEBDAV_UCP_PROPERTYMAP_HXX
 
+#include <config_lgpl.h>
 #include <boost/unordered_set.hpp>
 #include <com/sun/star/beans/Property.hpp>
 

ucb/source/ucp/webdav-neon/UCBDeadPropertyValue.cxx

@@ -26,7 +26,7 @@
  *
  ************************************************************************/
 
-
+#include <config_lgpl.h>
 #include <string.h>
 #include <ne_xml.h>
 #include <osl/diagnose.h>

ucb/source/ucp/webdav-neon/webdavcontent.hxx

@@ -29,6 +29,7 @@
 #ifndef _WEBDAV_UCP_CONTENT_HXX
 #define _WEBDAV_UCP_CONTENT_HXX
 
+#include <config_lgpl.h>
 #include <memory>
 #include <list>
 #include <rtl/ref.hxx>

ucb/source/ucp/webdav-neon/webdavdatasupplier.hxx

@@ -29,6 +29,7 @@
 #ifndef WEBDAV_UCP_DATASUPPLIER_HXX
 #define WEBDAV_UCP_DATASUPPLIER_HXX
 
+#include <config_lgpl.h>
 #include <vector>
 #include <boost/scoped_ptr.hpp>
 #include <rtl/ref.hxx>

ucb/source/ucp/webdav-neon/webdavprovider.hxx

@@ -29,6 +29,7 @@
 #ifndef _WEBDAV_UCP_PROVIDER_HXX
 #define _WEBDAV_UCP_PROVIDER_HXX
 
+#include <config_lgpl.h>
 #include <rtl/ref.hxx>
 #include <com/sun/star/beans/Property.hpp>
 #include "DAVSessionFactory.hxx"

ucb/source/ucp/webdav-neon/webdavresultset.hxx

@@ -29,6 +29,7 @@
 #ifndef _WEBDAV_UCP_RESULTSET_HXX
 #define _WEBDAV_UCP_RESULTSET_HXX
 
+#include <config_lgpl.h>
 #include <rtl/ref.hxx>
 #include <ucbhelper/resultsethelper.hxx>
 #include "webdavcontent.hxx"