[SCM] LibreOffice packaging repository branch, debian-experimental-3.4.0, updated. 88c33eabdc2865740f54a01511f4f6c9b8e10bff
The following commit has been merged in the debian-experimental-3.4.0 branch:
commit 88c33eabdc2865740f54a01511f4f6c9b8e10bff
Author: Rene Engelhard <rene@debian.org>
Date: Tue May 31 22:08:37 2011 +0200
fix some more CONFIGURE_FLAGS for new -ext- options, remove obsolete --enable-gcjaot
diff --git a/rules b/rules
index 2f102f9..964c389 100755
--- a/rules
+++ b/rules
@@ -486,7 +486,7 @@ ifneq "$(PACKAGE_SDK)" "y"
endif
ifeq "$(ENABLE_MINIMIZER)" "y"
- CONFIGURE_FLAGS += --enable-ext-minimizer
+ CONFIGURE_FLAGS += --enable-ext-presenter-minimizer
endif
ifeq "$(ENABLE_PRESENTER_CONSOLE)" "y"
CONFIGURE_FLAGS += --enable-ext-presenter-console
@@ -664,7 +664,6 @@ ifeq "$(ENABLE_JAVA)" "y"
endif
TEST_JAVA_HOME=$(JAVA_HOME)
ifeq "$(BUILD_JARS_NATIVE)" "y"
- CONFIGURE_FLAGS += --enable-gcjaot
BUILD_DEPS += , gcj-native-helper$(OOO_NO_GCJ_ARCHS), libgcj-common (>= 1:4.4.1)$(OOO_NO_GCJ_ARCHS)
else
ifneq "$(OOO_GCJ_JDK_ARCHS)" ""
@@ -913,7 +912,7 @@ else
endif
ifeq "$(ENABLE_MYSQLNATIVE)" "y"
- CONFIGURE_FLAGS += --enable-mysql-connector
+ CONFIGURE_FLAGS += --enable-ext-mysql-connector
ifneq (,$(filter mysql, $(SYSTEM_STUFF)))
BUILD_DEPS += , libmysqlclient-dev
endif
--
LibreOffice packaging repository
Reply to: