mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Don't bother with libcmis on Windows for now"

Browse Source 
This reverts commit 0dd1e3b124. Use
--disable-cmis now to avoid building all CMIS-related code.
This commit is contained in:
Cédric Bosdonnat
2011-10-03 14:12:19 +02:00
parent 5bd2890a56
commit c45f59f062
2 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
configure.in
View File

@@ -4632,13 +4632,10 @@ if test -n "$with_system_libcmis" -a "$with_system_libcmis" = "yes"; then
AC_MSG_RESULT([external]) AC_MSG_RESULT([external])
SYSTEM_LIBCMIS=YES SYSTEM_LIBCMIS=YES
PKG_CHECK_MODULES( LIBCMIS, libcmis-0.2 ) PKG_CHECK_MODULES( LIBCMIS, libcmis-0.2 )
elif test $_os != WINNT; then else
AC_MSG_RESULT([internal]) AC_MSG_RESULT([internal])
SYSTEM_LIBCMIS=NO SYSTEM_LIBCMIS=NO
BUILD_TYPE="$BUILD_TYPE LIBCMIS" BUILD_TYPE="$BUILD_TYPE LIBCMIS"
else
AC_MSG_RESULT([none])
SYSTEM_LIBCMIS=YES
fi fi
AC_SUBST(SYSTEM_LIBCMIS) AC_SUBST(SYSTEM_LIBCMIS)
AC_SUBST(LIBCMIS_CFLAGS) AC_SUBST(LIBCMIS_CFLAGS)

2
ucb/prj/build.lst
View File

@@ -16,7 +16,7 @@ uc ucb\source\ucp\tdoc nmake - all uc_tdoc uc_inc NULL
uc ucb\source\ucp\expand nmake - all uc_expand uc_inc NULL uc ucb\source\ucp\expand nmake - all uc_expand uc_inc NULL
uc ucb\source\ucp\ext nmake - all uc_ext uc_inc NULL uc ucb\source\ucp\ext nmake - all uc_ext uc_inc NULL
uc ucb\source\ucp\odma nmake - w uc_odma uc_inc NULL uc ucb\source\ucp\odma nmake - w uc_odma uc_inc NULL
uc ucb\source\ucp\cmis nmake - u uc_cmis uc_inc NULL uc ucb\source\ucp\cmis nmake - all uc_cmis uc_inc NULL
#uc ucb\qa\complex\ucb nmake - all uc_complex_ucb uc_inc NULL #uc ucb\qa\complex\ucb nmake - all uc_complex_ucb uc_inc NULL
# fails, please fix # fails, please fix
# uc ucb\qa\complex\tdoc nmake - all uc_complex_tdoc uc_complex_tdoc_interfaces uc_inc NULL # uc ucb\qa\complex\tdoc nmake - all uc_complex_tdoc uc_complex_tdoc_interfaces uc_inc NULL