[SCM] LibreOffice packaging repository branch, master, updated. libreoffice_3.4.5-3-8-ge56e83b
The following commit has been merged in the master branch:
commit 7d9e188492588b19a7123220212ba3970888c3f6
Author: Rene Engelhard <rene@debian.org>
Date: Fri Feb 24 22:03:58 2012 +0100
agg is long gone
diff --git a/rules b/rules
index 9be42dc..a5b3988 100755
--- a/rules
+++ b/rules
@@ -149,7 +149,6 @@ SYSTEM_STUFF += altlinuxhyph
USE_LIBHYPHEN=y
LIBALTLINUXHYPH_MINVER= (>= 0.1.1-11)
LIBHYPHEN_MINVER= (>= 2.4)
-USE_AGG=n
# SYSTEM_STUFF += agg
SYSTEM_STUFF += boost
BOOST_VERSION=default
@@ -929,13 +928,6 @@ ifneq (,$(filter altlinuxhyph, $(SYSTEM_STUFF)))
endif
CONFIGURE_FLAGS += --with-external-hyph-dir=$(HYPH_DIR)
-ifeq "$(USE_AGG)" "y"
- CONFIGURE_FLAGS+= --with-agg
- ifneq (,$(filter agg, $(SYSTEM_STUFF)))
- BUILD_DEPS += , libagg-dev (>= 2.3-2)
- endif
-endif
-
ifneq "$(OOO_STLPORT_ARCHS)" ""
LIBSTLPORT_MINVER= (>= 4.6.2-3)
BUILD_DEPS += , libstlport4.6-dev $(LIBSTLPORT_MINVER) [$(OOO_STLPORT_ARCHS)]
--
LibreOffice packaging repository
Reply to: