configure.in | 17 +++++++++++++++++ set_soenv.in | 3 +++ solenv/inc/libs.mk | 5 ++++- ucb/prj/build.lst | 2 +- 4 files changed, 25 insertions(+), 2 deletions(-)
New commits: commit ba44f8805b238479981a9d889e7e432c0a531d42 Author: Rene Engelhard <[email protected]> Date: Sun Oct 2 21:36:48 2011 +0000 add --with-system-libcmis diff --git a/configure.in b/configure.in index cb7cfcc..d04cedc 100644 --- a/configure.in +++ b/configure.in @@ -4614,6 +4614,23 @@ AC_SUBST(SYSTEM_LIBVISIO) AC_SUBST(LIBVISIO_CFLAGS) AC_SUBST(LIBVISIO_LIBS) +dnl =================================================================== +dnl Check for system libcmis +dnl =================================================================== +AC_MSG_CHECKING([which libcmis to use]) +if test -n "$with_system_libcmis" -a "$with_system_libcmis" = "yes"; then + AC_MSG_RESULT([external]) + SYSTEM_LIBVISIO=YES + PKG_CHECK_MODULES( LIBCMIS, libcmis-0.2 ) +else + AC_MSG_RESULT([internal]) + SYSTEM_LIBCMIS=NO + BUILD_TYPE="$BUILD_TYPE LIBCMIS" +fi +AC_SUBST(SYSTEM_LIBCMIS) +AC_SUBST(LIBCMIS_CFLAGS) +AC_SUBST(LIBCMIS_LIBS) + dnl =================================================================== dnl Check for system libwpd diff --git a/set_soenv.in b/set_soenv.in index 9695bef..6b4e4d1 100755 --- a/set_soenv.in +++ b/set_soenv.in @@ -1910,6 +1910,9 @@ ToFile( "LIBWPG_LIBS", "@LIBWPG_LIBS@", "e" ); ToFile( "SYSTEM_LIBVISIO", "@SYSTEM_LIBVISIO@", "e" ); ToFile( "LIBVISIO_CFLAGS", "@LIBVISIO_CFLAGS@", "e" ); ToFile( "LIBVISIO_LIBS", "@LIBVISIO_LIBS@", "e" ); +ToFile( "SYSTEM_LIBCMIS", "@SYSTEM_LIBCMIS@", "e" ); +ToFile( "LIBCMIS_CFLAGS", "@LIBCMIS_CFLAGS@", "e" ); +ToFile( "LIBCMIS_LIBS", "@LIBCMIS_LIBS@", "e" ); ToFile( "SYSTEM_CPPUNIT", "@SYSTEM_CPPUNIT@", "e" ); ToFile( "CPPUNIT_CFLAGS", "@CPPUNIT_CFLAGS@", "e" ); ToFile( "CPPUNIT_LIBS", "@CPPUNIT_LIBS@", "e" ); diff --git a/solenv/inc/libs.mk b/solenv/inc/libs.mk index 1f5dc20..9952bcb 100644 --- a/solenv/inc/libs.mk +++ b/solenv/inc/libs.mk @@ -248,8 +248,11 @@ REDLANDLIB=$(REDLAND_LIBS) .ELSE REDLANDLIB=-lrdf .ENDIF +.IF "$(SYSTEM_LIBCMIS)" +CMISLIB=$(CLIBMIS_LIBS) +.ELSE CMISLIB=-lcmis-0.2 - +.ENDIF # #110743# # For BinFilters, some libs were added. diff --git a/ucb/prj/build.lst b/ucb/prj/build.lst index 34ea2bc..350d3f9 100644 --- a/ucb/prj/build.lst +++ b/ucb/prj/build.lst @@ -1,4 +1,4 @@ -uc ucb : cppuhelper CURL:curl OPENSSL:openssl NEON:neon LIBXML2:libxml2 LIBXSLT:libxslt libcmis offapi sal salhelper ucbhelper udkapi comphelper tools NULL +uc ucb : cppuhelper CURL:curl OPENSSL:openssl NEON:neon LIBXML2:libxml2 LIBXSLT:libxslt LIBCMIS:libcmis offapi sal salhelper ucbhelper udkapi comphelper tools NULL uc ucb usr1 - all uc_mkout NULL uc ucb\inc nmake - all uc_inc NULL uc ucb\source\regexp nmake - all uc_regexp uc_inc NULL _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
