[Libreoffice-commits] core.git: configure.ac

[Lionel Elie Mamane]

 configure.ac |    5 +++++
 1 file changed, 5 insertions(+)

New commits:
commit 0e6fdbd79f196aaa06bf3de31123f6a39fe0ec6e
Author: Lionel Elie Mamane <lionel at mamane.lu>
Date:   Sun Feb 17 13:40:53 2013 +0100

    confgure.ac: dbgutil and system-libcmis incompatible
    
    libcmis exposes STL containers in its API:
    workdir/*/CxxObject/ucb/source/ucp/cmis/cmis_content.o: In function `cmis::Content::setCmisProperty(std::string, std::string, com::sun::star::uno::Reference<com::sun::star::ucb::XCommandEnvironment> const&)':
    ucb/source/ucp/cmis/cmis_content.cxx:1756: undefined reference to `libcmis::Property::Property(boost::shared_ptr<libcmis::PropertyType>, std::__debug::vector<std::string, std::allocator<std::string> >)'
    ucb/source/ucp/cmis/cmis_content.cxx:1762: undefined reference to `libcmis::Property::setValues(std::__debug::vector<std::string, std::allocator<std::string> >)'
    
    Change-Id: Ife845ca5c6cedcbe57e5ce7fbdd8cc641dffae52

diff --git a/configure.ac b/configure.ac
index 7281004..cc801f1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3384,6 +3384,11 @@ if test -n "$enable_dbgutil" -a "$enable_dbgutil" != "no"; then
     else
         with_system_orcus=no
     fi
+    if test "$with_system_libcmis" = "yes"; then
+        AC_MSG_ERROR([--with-system-libcmis conflicts with --enable-dbgutil])
+    else
+        with_system_libcmis=no
+    fi
 else
     ENABLE_DBGUTIL=""
     # PRODUCT is old concept, still used by build.pl .