[SCM] LibreOffice packaging repository branch, ubuntu-raring-4.0, updated. libreoffice_3.6.4-1-339-gbcbcb4c
The following commit has been merged in the ubuntu-raring-4.0 branch:
commit 99c9e8af07d236e261b3899803db32e87351b2b8
Author: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
Date: Tue Dec 11 12:22:29 2012 +0100
bail out on GFVS and GIO enabled at the same time
diff --git a/rules b/rules
index 5113a0b..452acce 100755
--- a/rules
+++ b/rules
@@ -1212,7 +1212,10 @@ ifneq (,$(filter redland, $(SYSTEM_STUFF)))
endif
ifeq "$(ENABLE_GIO)" "y"
- CONFIGURE_FLAGS += --enable-gio --disable-gnome-vfs
+ ifeq "$(ENABLE_GVFS)" "y"
+ $(error GIO and GVFS cant be enabled at the same time!)
+ endif
+ CONFIGURE_FLAGS += --enable-gio
BUILD_DEPS += , libglib2.0-dev (>= 2.15.0)
endif
--
LibreOffice packaging repository
Reply to: