diff options
| author | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2011-10-06 15:31:42 +0200 |
|---|---|---|
| committer | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2011-10-06 15:31:42 +0200 |
| commit | e9ee46c22cbe809fbe5750b81ccce18403f8b69b (patch) | |
| tree | 1e854ae503af2fcc7b1049f47f1dd9ce5859ed7c /configure.in | |
| parent | 46da2ed6be6df4089df338098f69375e3e494e44 (diff) | |
Kill --without-cmis option that is noop anyway
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 33 |
1 files changed, 13 insertions, 20 deletions
diff --git a/configure.in b/configure.in index 84ae9d6a0ce9..d9d28ff4bb28 100644 --- a/configure.in +++ b/configure.in @@ -522,11 +522,6 @@ AC_ARG_ENABLE(release-build, dnl =================================================================== dnl Optional Packages (--with/without-) dnl =================================================================== -AC_ARG_WITH(cmis, - AS_HELP_STRING([--without-cmis], - [Disable experimental CMIS interface.]), -) - AC_ARG_WITH(gnu-patch, AS_HELP_STRING([--with-gnu-patch], [Specify location of GNU patch on Solaris or FreeBSD.]), @@ -4627,22 +4622,20 @@ AC_SUBST(VISIO_LIBS) dnl =================================================================== dnl Check for system libcmis dnl =================================================================== -if test "x$with_cmis" != "xno" ; then - AC_MSG_CHECKING([which libcmis to use]) - if test -n "$with_system_libcmis" -o -n "$with_system_libs" && \ - test "$with_system_libcmis" != "no"; 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) +AC_MSG_CHECKING([which libcmis to use]) +if test -n "$with_system_libcmis" -o -n "$with_system_libs" && \ + test "$with_system_libcmis" != "no"; 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) dnl =================================================================== |