[Libreoffice-commits] .: configure.in

[Fridrich Strba]

 configure.in |   33 +++++++++++++--------------------
 1 file changed, 13 insertions(+), 20 deletions(-)

New commits:
commit e9ee46c22cbe809fbe5750b81ccce18403f8b69b
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date:   Thu Oct 6 15:31:42 2011 +0200

    Kill --without-cmis option that is noop anyway

diff --git a/configure.in b/configure.in
index 84ae9d6..d9d28ff 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 ===================================================================