[libreoffice] 01/02: update webdav conditionals to specify --with-webdav=

[Rene Engelhard <rene@moszumanska.debian.org>]

This is an automated email from the git hooks/post-receive script.

rene pushed a commit to branch debian-experimental-4.3
in repository libreoffice.

commit 133fe1adb75a1bd7d68075768c4dc8ab5b2f24ad
Author: Rene Engelhard <rene@debian.org>
Date:   Sat Jun 21 20:27:45 2014 +0200

    update webdav conditionals to specify --with-webdav=
---
 changelog |  9 +++++++++
 rules     | 42 +++++++++++++++++++++++++-----------------
 2 files changed, 34 insertions(+), 17 deletions(-)

diff --git a/changelog b/changelog
index 06c8b19..c12a841 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,12 @@
+libreoffice (1:4.3.0~rc1-2) UNRELEASED; urgency=low
+
+  * new upstream snapshot
+
+  * debian/rules:
+    - update webdav conditionals to specify --with-webdav=
+
+ -- Rene Engelhard <rene@debian.org>  Sat, 21 Jun 2014 20:23:29 +0200
+
 libreoffice (1:4.3.0~rc1-1) experimental; urgency=low
 
   * new upstream release candidate 
diff --git a/rules b/rules
index dd49289..98df319 100755
--- a/rules
+++ b/rules
@@ -274,14 +274,17 @@ else
    GSTREAMER_VERSION=0.10
 endif
 USE_VLC=y
-ENABLE_NEON=y
-ifeq "$(ENABLE_NEON)" "y"
-SYSTEM_STUFF += neon
-NEON_SECTYPE=gnutls
-NEONSONR=27
-else
-SYSTEM_STUFF += apr
-SYSTEM_STUFF += serf
+ENABLE_WEBDAV=y
+ifeq "$(ENABLE_WEBDAV)" "y"
+WEBDAV_LIB=neon
+  ifeq "$(WEBDAV_LIB)" "neon"
+    SYSTEM_STUFF += neon
+    NEON_SECTYPE=gnutls
+    NEONSONR=27
+  else
+   SYSTEM_STUFF += apr
+   SYSTEM_STUFF += serf
+  endif
 endif
 SYSTEM_STUFF += redland
 PACKAGE_SDK=y
@@ -1420,23 +1423,28 @@ else
 	DEBHELPER_OPTIONS += -Nlibreoffice-avmedia-backend-vlc
 endif
 
-ifeq "$(ENABLE_NEON)" "y"
-  ifneq (,$(filter neon, $(SYSTEM_STUFF)))
-    ifneq "$(NEON_SECTYPE)" "openssl"
+ifeq "$(ENABLE_WEBDAV)" "y"
+  ifeq "$(WEBDAV_LIB)" "neon"
+    ifneq (,$(filter neon, $(SYSTEM_STUFF)))
+      ifneq "$(NEON_SECTYPE)" "openssl"
 	BUILD_DEPS += , libneon$(NEONSONR)-$(NEON_SECTYPE)-dev
 	DBG_DBG_SUGGESTS+= , libneon$(NEONSONR)-$(NEON_SECTYPE)-dbg
-    else
+      else
 	BUILD_DEPS += , libneon$(NEONSONR)-dev
 	DBG_DBG_SUGGESTS+= , libneon$(NEONSONR)-dbg
+      endif
     endif
-  endif
-else
-  ifneq (,$(filter apr, $(SYSTEM_STUFF)))
+  else
+    ifneq (,$(filter apr, $(SYSTEM_STUFF)))
 	BUILD_DEPS += , libaprutil1-dev
-  endif
-  ifneq (,$(filter serf, $(SYSTEM_STUFF)))
+    endif
+    ifneq (,$(filter serf, $(SYSTEM_STUFF)))
 	BUILD_DEPS += , libserf-dev
+    endif
   endif
+  CONFIGURE_FLAGS += --with-webdav=$(WEBDAV_LIB)
+else
+  CONFIGURE_FLAGS += --with-webdav=no
 endif
 
 ifeq "$(ENABLE_HELP)" "n"

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git