The following commit has been merged in the debian-experimental-4.0 branch:
commit 6a241038aca0caeda87cf5beeae722e9220a042c
Author: Bjoern Michaelsen <bjoern.michael...@canonical.com>
Date: Fri Dec 7 11:31:08 2012 +0100
remove or fix unrecognized ./configure options
diff --git a/rules b/rules
index f4a626f..416e2cd 100755
--- a/rules
+++ b/rules
@@ -333,7 +333,6 @@ endif
# 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 \
@@ -733,7 +732,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))
@@ -854,7 +852,6 @@ endif
ifneq (,$(filter npapi-headers, $(SYSTEM_STUFF)))
BUILD_DEPS+= , 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
--
LibreOffice packaging repository
--
To UNSUBSCRIBE, email to debian-openoffice-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1th0ke-0001mg...@vasks.debian.org
