[SCM] LibreOffice packaging repository branch, ubuntu-raring-4.0, updated. libreoffice_3.6.4_rc3-1-283-ge775875
The following commit has been merged in the ubuntu-raring-4.0 branch:
commit fa38047ee772336ec00f5d9feae9423b7da8c60f
Author: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
Date: Fri Dec 7 11:31:08 2012 +0100
remove or fix unrecognized ./configure options
diff --git a/rules b/rules
index 81b22cd..4fb10f8 100755
--- a/rules
+++ b/rules
@@ -328,7 +328,6 @@ ENABLE_MERGEDLIBS=n
# Default flags to pass to configure
CONFIGURE_FLAGS= \
--with-vendor='$(OOO_VENDOR)' \
- --with-install-dirname=$(OODIRNAME) \
--prefix=/usr --mandir=/usr/share/man \
--docdir=/usr/share/doc/libreoffice \
--enable-lockdown \
@@ -751,7 +750,6 @@ ifneq "$(BUILD_ONLY_EN_US)" "y"
endif
ifeq "$(ENABLE_JAVA)" "y"
- CONFIGURE_FLAGS += --with-java-target-version=1.5
ifeq "$(JDK)" "default"
JAVA_HOME=/usr/lib/jvm/default-java
BUILD_DEPS += , default-jdk$(filter-out !ia64,$(OOO_NO_JAVA_ARCHS))
@@ -872,7 +870,6 @@ endif
ifneq (,$(filter npapi-headers, $(SYSTEM_STUFF)))
BUILD_DEPS+= , firefox-dev$(OOO_NO_NSPLUGIN_ARCHS) | xulrunner-dev$(OOO_NO_NSPLUGIN_ARCHS)
endif
- CONFIGURE_FLAGS += --disable-build-mozilla --disable-mozilla
ifeq (,$(findstring $(DEB_HOST_ARCH),$(OOO_NSPLUGIN_ARCHS)))
PACKAGE_NSPLUGIN=n
CONFIGURE_FLAGS += --disable-nsplugin
@@ -1203,7 +1200,7 @@ ifneq (ccache,$(findstring ccache,$(DEB_BUILD_OPTIONS)))
endif
ifneq ($(ENABLE_LIBMERGED),y)
-CONFIGURE_FLAGS += --enable-mergedlibs
+CONFIGURE_FLAGS += --enable-mergelibs
endif
## Build n projects in parallel?
--
LibreOffice packaging repository
Reply to: