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

Wrap the cmis system/internal check into global feature switch.

Browse Source
This commit is contained in:
Tomas Chvatal
2011-10-04 10:42:36 +02:00
parent 8aaa52f21f
commit 05c008e3fb
1 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
configure.in
View File

@@ -4626,19 +4626,21 @@ AC_SUBST(LIBVISIO_LIBS)
dnl =================================================================== dnl ===================================================================
dnl Check for system libcmis dnl Check for system libcmis
dnl =================================================================== dnl ===================================================================
AC_MSG_CHECKING([which libcmis to use]) if test "x$with_cmis" != "xno" ; then
if test "x$with_system_libcmis" != "xno"; then AC_MSG_CHECKING([which libcmis to use])
AC_MSG_RESULT([external]) if test "x$with_system_libcmis" != "xno"; then
SYSTEM_LIBCMIS=YES AC_MSG_RESULT([external])
PKG_CHECK_MODULES( LIBCMIS, libcmis-0.2 ) SYSTEM_LIBCMIS=YES
else PKG_CHECK_MODULES( LIBCMIS, libcmis-0.2 )
AC_MSG_RESULT([internal]) else
SYSTEM_LIBCMIS=NO AC_MSG_RESULT([internal])
BUILD_TYPE="$BUILD_TYPE LIBCMIS" SYSTEM_LIBCMIS=NO
BUILD_TYPE="$BUILD_TYPE LIBCMIS"
fi
AC_SUBST(SYSTEM_LIBCMIS)
AC_SUBST(LIBCMIS_CFLAGS)
AC_SUBST(LIBCMIS_LIBS)
fi fi
AC_SUBST(SYSTEM_LIBCMIS)
AC_SUBST(LIBCMIS_CFLAGS)
AC_SUBST(LIBCMIS_LIBS)
dnl =================================================================== dnl ===================================================================