[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[SCM] LibreOffice packaging repository branch, debian-experimental-3.5, updated. libreoffice_3.4.3-1-31-g678c5eb



The following commit has been merged in the debian-experimental-3.5 branch:
commit 678c5eb8cc164ba15771705917354a25bef8fe9e
Author: Rene Engelhard <rene@debian.org>
Date:   Wed Sep 28 20:45:45 2011 +0000

    adapt for new configure defaults wrt extensions

diff --git a/rules b/rules
index e9d9793..02f7482 100755
--- a/rules
+++ b/rules
@@ -507,15 +507,16 @@ ifneq "$(PACKAGE_SDK)" "y"
 	CONFIGURE_FLAGS += --disable-odk
 endif
 
-ifeq "$(ENABLE_MINIMIZER)" "y"
-	CONFIGURE_FLAGS += --enable-ext-presenter-minimizer
+ifneq "$(ENABLE_MINIMIZER)" "y"
+	CONFIGURE_FLAGS += --disable-ext-presenter-minimizer
 endif
-ifeq "$(ENABLE_PRESENTER_CONSOLE)" "y"
-	CONFIGURE_FLAGS += --enable-ext-presenter-console
+ifneq "$(ENABLE_PRESENTER_CONSOLE)" "y"
+	CONFIGURE_FLAGS += --disable-ext-presenter-console
 endif
 ifeq "$(ENABLE_PDFIMPORT)" "y"
-	CONFIGURE_FLAGS += --enable-ext-pdfimport
 	BUILD_DEPS += , libpoppler-dev (>= 0.8.0), libpoppler-cpp-dev
+else
+	CONFIGURE_FLAGS += --disable-ext-pdfimport
 endif
 
 # fails their tests
@@ -806,7 +807,8 @@ export MINGWSTRIP = i586-mingw32msvc-strip
 	CONFIGURE_FLAGS += --with-system-servlet-api --with-servlet-api-jar=$(shell dpkg -L `dpkg -s libcommons-logging-java | grep Suggests | cut -d"," -f1 | sed -e s/^\ // | awk '{ print $$2 }'` | grep servlet-api.*\.jar$ | head -n 1)
 	BUILD_DEPS += , $(shell dpkg -s libcommons-logging-java | grep Suggests | cut -d"," -f1 | sed -e s/^\ // | awk '{ print $$2 }')
     endif
-	CONFIGURE_FLAGS += --enable-ext-report-builder
+  else
+	CONFIGURE_FLAGS += --disable-ext-report-builder
   endif
 	OOO_OFFICEBEAN_DEP = libreoffice$(VER)-officebean
 	BUILD_DEPS += , javahelper $(JAVAHELPER_MIN_VERSION)

-- 
LibreOffice packaging repository


Reply to: