diff options
| author | Cédric Bosdonnat <cedric.bosdonnat.ooo@free.fr> | 2011-10-03 14:12:19 +0200 |
|---|---|---|
| committer | Cédric Bosdonnat <cedric.bosdonnat.ooo@free.fr> | 2011-10-04 09:38:36 +0200 |
| commit | c45f59f062eb135463ea8ce0a06950eb9a6dfec2 (patch) | |
| tree | 6419207315b7a73705f1d5a28f7554485d8663a2 | |
| parent | Added --disable-cmis flag for use while the feature is too unstable (diff) | |
| download | core-c45f59f062eb135463ea8ce0a06950eb9a6dfec2.tar.gz core-c45f59f062eb135463ea8ce0a06950eb9a6dfec2.zip | |
Revert "Don't bother with libcmis on Windows for now"
This reverts commit 0dd1e3b1240e4d5a2c9ac6de0348658918e012a8. Use
--disable-cmis now to avoid building all CMIS-related code.
| -rw-r--r-- | configure.in | 5 | ||||
| -rw-r--r-- | ucb/prj/build.lst | 2 |
2 files changed, 2 insertions, 5 deletions
diff --git a/configure.in b/configure.in index 2b58f7893bf7..550b3a227f06 100644 --- a/configure.in +++ b/configure.in @@ -4632,13 +4632,10 @@ if test -n "$with_system_libcmis" -a "$with_system_libcmis" = "yes"; then AC_MSG_RESULT([external]) SYSTEM_LIBCMIS=YES PKG_CHECK_MODULES( LIBCMIS, libcmis-0.2 ) -elif test $_os != WINNT; then +else AC_MSG_RESULT([internal]) SYSTEM_LIBCMIS=NO BUILD_TYPE="$BUILD_TYPE LIBCMIS" -else - AC_MSG_RESULT([none]) - SYSTEM_LIBCMIS=YES fi AC_SUBST(SYSTEM_LIBCMIS) AC_SUBST(LIBCMIS_CFLAGS) diff --git a/ucb/prj/build.lst b/ucb/prj/build.lst index 5fc0179eb860..350d3f92a159 100644 --- a/ucb/prj/build.lst +++ b/ucb/prj/build.lst @@ -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\ext nmake - all uc_ext 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 # fails, please fix # uc ucb\qa\complex\tdoc nmake - all uc_complex_tdoc uc_complex_tdoc_interfaces uc_inc NULL |