diff options
| author | Tomas Chvatal <tchvatal@suse.cz> | 2011-10-04 10:42:36 +0200 |
|---|---|---|
| committer | Tomas Chvatal <tchvatal@suse.cz> | 2011-10-04 10:42:36 +0200 |
| commit | 05c008e3fb8aef19d3fa521859dd40d40e1eb9e0 (patch) | |
| tree | f32b59e94d1638233056661a054d5236cc2484ac | |
| parent | 8aaa52f21fc20f3266c4b6a13422e7e35bc8d34d (diff) | |
Wrap the cmis system/internal check into global feature switch.
| -rw-r--r-- | configure.in | 26 |
1 files changed, 14 insertions, 12 deletions
diff --git a/configure.in b/configure.in index 911aed2828d7..d08e4c1703a0 100644 --- a/configure.in +++ b/configure.in @@ -4626,19 +4626,21 @@ AC_SUBST(LIBVISIO_LIBS) dnl =================================================================== dnl Check for system libcmis dnl =================================================================== -AC_MSG_CHECKING([which libcmis to use]) -if test "x$with_system_libcmis" != "xno"; then - AC_MSG_RESULT([external]) - SYSTEM_LIBCMIS=YES - PKG_CHECK_MODULES( LIBCMIS, libcmis-0.2 ) -else - AC_MSG_RESULT([internal]) - SYSTEM_LIBCMIS=NO - BUILD_TYPE="$BUILD_TYPE LIBCMIS" +if test "x$with_cmis" != "xno" ; then + AC_MSG_CHECKING([which libcmis to use]) + if test "x$with_system_libcmis" != "xno"; then + AC_MSG_RESULT([external]) + SYSTEM_LIBCMIS=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) fi -AC_SUBST(SYSTEM_LIBCMIS) -AC_SUBST(LIBCMIS_CFLAGS) -AC_SUBST(LIBCMIS_LIBS) dnl =================================================================== |