diff options
| author | Tor Lillqvist <tlillqvist@suse.com> | 2011-10-03 13:14:28 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tlillqvist@suse.com> | 2011-10-03 13:23:12 +0300 |
| commit | 0dd1e3b1240e4d5a2c9ac6de0348658918e012a8 (patch) | |
| tree | ac0dee539258dc4f699dfc6d2fbff94fe02b5e50 | |
| parent | 296abad4fadd87b6b38074b504e40f1532c65969 (diff) | |
Don't bother with libcmis on Windows for now
It obviously doesn't build as autoconf and libtool have little clue
about MSVC. Thus make the cmis UCP Unix-only as well. Looking forward
to coming gbuildification of more 3rd-party modules.
| -rw-r--r-- | configure.in | 5 | ||||
| -rw-r--r-- | ucb/prj/build.lst | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/configure.in b/configure.in index 49b7185929a2..a62863454004 100644 --- a/configure.in +++ b/configure.in @@ -4627,10 +4627,13 @@ 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 ) -else +elif test $_os != WINNT; then 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 350d3f92a159..5fc0179eb860 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 - all uc_cmis uc_inc NULL +uc ucb\source\ucp\cmis nmake - u 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 |