[Libreoffice-commits] core.git: 8 commits - config_host.mk.in configure.ac libcdr/Module_libcdr.mk libcmis/Module_libcmis.mk libmspub/Module_libmspub.mk libvisio/Module_libvisio.mk libwpd/Module_libwpd.mk libwpg/Module_libwpg.mk libwps/Module_libwps.mk m4/libo_externals.m4 RepositoryExternal.mk writerperfect/Module_writerperfect.mk
Bjoern Michaelsen
bjoern.michaelsen at canonical.com
Tue Feb 19 04:23:18 PST 2013
RepositoryExternal.mk | 42 +++----
config_host.mk.in | 14 +-
configure.ac | 187 +++++++++-------------------------
libcdr/Module_libcdr.mk | 2
libcmis/Module_libcmis.mk | 2
libmspub/Module_libmspub.mk | 2
libvisio/Module_libvisio.mk | 2
libwpd/Module_libwpd.mk | 2
libwpg/Module_libwpg.mk | 2
libwps/Module_libwps.mk | 2
m4/libo_externals.m4 | 30 +++++
writerperfect/Module_writerperfect.mk | 18 +--
12 files changed, 124 insertions(+), 181 deletions(-)
New commits:
commit cac113602c8f60b7eaea8709f6670b00b0925447
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date: Tue Feb 19 12:42:30 2013 +0100
rename SYSTEM_LIBWPG to SYSTEM_WPG to remove specialcasing
Change-Id: I7fe4da07852d538216b92b9350903b7022bdc9fa
diff --git a/config_host.mk.in b/config_host.mk.in
index 2e2fa56..e1249dd 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -555,7 +555,7 @@ export SYSTEM_LIBORCUS=@SYSTEM_LIBORCUS@
export SYSTEM_LIBPNG=@SYSTEM_LIBPNG@
export SYSTEM_VISIO=@SYSTEM_VISIO@
export SYSTEM_WPD=@SYSTEM_WPD@
-export SYSTEM_LIBWPG=@SYSTEM_WPG@
+export SYSTEM_WPG=@SYSTEM_WPG@
export SYSTEM_WPS=@SYSTEM_WPS@
export SYSTEM_LIBXML=@SYSTEM_LIBXML@
export SYSTEM_LIBXSLT=@SYSTEM_LIBXSLT@
commit 3a3254a900a6a8aad8d3321bf8b10d1770555cf5
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date: Tue Feb 19 11:26:46 2013 +0100
rename SYSTEM_LIBWPS to SYSTEM_WPS to remove specialcasing
Change-Id: I54880cd7d404692b8fee16c331c8e7a64508f52b
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index d295a0c..aed173b 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -1319,7 +1319,7 @@ endef
endif # SYSTEM_WPD
-ifeq ($(SYSTEM_LIBWPG),YES)
+ifeq ($(SYSTEM_WPG),YES)
define gb_LinkTarget__use_wpg
$(call gb_LinkTarget_set_include,$(1),\
@@ -1331,7 +1331,7 @@ $(call gb_LinkTarget_add_libs,$(1),$(WPG_LIBS))
endef
gb_ExternalProject__use_wpg :=
-else # !SYSTEM_LIBWPG
+else # !SYSTEM_WPG
$(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \
wpglib \
@@ -1352,10 +1352,10 @@ $(call gb_ExternalProject_use_static_libraries,$(1),wpglib)
endef
-endif # SYSTEM_LIBWPG
+endif # SYSTEM_WPG
-ifeq ($(SYSTEM_LIBWPS),YES)
+ifeq ($(SYSTEM_WPS),YES)
define gb_LinkTarget__use_wps
$(call gb_LinkTarget_set_include,$(1),\
@@ -1367,7 +1367,7 @@ $(call gb_LinkTarget_add_libs,$(1),$(WPS_LIBS))
endef
gb_ExternalProject__use_wps :=
-else # !SYSTEM_LIBWPS
+else # !SYSTEM_WPS
$(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \
wpslib \
@@ -1385,7 +1385,7 @@ $(call gb_ExternalProject_use_static_libraries,$(1),wpslib)
endef
-endif # SYSTEM_LIBWPS
+endif # SYSTEM_WPS
ifeq ($(SYSTEM_LCMS2),YES)
diff --git a/config_host.mk.in b/config_host.mk.in
index 2d63e35..2e2fa56 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -555,8 +555,8 @@ export SYSTEM_LIBORCUS=@SYSTEM_LIBORCUS@
export SYSTEM_LIBPNG=@SYSTEM_LIBPNG@
export SYSTEM_VISIO=@SYSTEM_VISIO@
export SYSTEM_WPD=@SYSTEM_WPD@
-export SYSTEM_LIBWPG=@SYSTEM_LIBWPG@
-export SYSTEM_LIBWPS=@SYSTEM_LIBWPS@
+export SYSTEM_LIBWPG=@SYSTEM_WPG@
+export SYSTEM_WPS=@SYSTEM_WPS@
export SYSTEM_LIBXML=@SYSTEM_LIBXML@
export SYSTEM_LIBXSLT=@SYSTEM_LIBXSLT@
export SYSTEM_LIBXSLT_FOR_BUILD=@SYSTEM_LIBXSLT_FOR_BUILD@
diff --git a/configure.ac b/configure.ac
index 9013f05..ef68d52 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7343,8 +7343,6 @@ else
fi
libo_CHECK_SYSTEM_MODULE([libwps],[WPS],[libwps-0.2])
fi
-SYSTEM_LIBWPS=$SYSTEM_WPS
-AC_SUBST(SYSTEM_LIBWPS)
dnl ===================================================================
dnl Check for system libwpg
@@ -7358,8 +7356,6 @@ else
fi
libo_CHECK_SYSTEM_MODULE([libwpg],[WPG],[libwpg-0.2])
fi
-SYSTEM_LIBWPG=$SYSTEM_WPG
-AC_SUBST(SYSTEM_LIBWPG)
dnl ===================================================================
dnl Check whether freetype2 supports emboldening
diff --git a/libwpg/Module_libwpg.mk b/libwpg/Module_libwpg.mk
index e628b89..63924c2 100644
--- a/libwpg/Module_libwpg.mk
+++ b/libwpg/Module_libwpg.mk
@@ -9,7 +9,7 @@
$(eval $(call gb_Module_Module,libwpg))
-ifeq ($(SYSTEM_LIBWPG),NO)
+ifeq ($(SYSTEM_WPG),NO)
$(eval $(call gb_Module_add_targets,libwpg,\
ExternalPackage_libwpg \
diff --git a/libwps/Module_libwps.mk b/libwps/Module_libwps.mk
index a903fa9..b17779a 100644
--- a/libwps/Module_libwps.mk
+++ b/libwps/Module_libwps.mk
@@ -9,7 +9,7 @@
$(eval $(call gb_Module_Module,libwps))
-ifeq ($(SYSTEM_LIBWPS),NO)
+ifeq ($(SYSTEM_WPS),NO)
$(eval $(call gb_Module_add_targets,libwps,\
ExternalPackage_libwps \
diff --git a/writerperfect/Module_writerperfect.mk b/writerperfect/Module_writerperfect.mk
index faf9d43..0a9b8b5 100644
--- a/writerperfect/Module_writerperfect.mk
+++ b/writerperfect/Module_writerperfect.mk
@@ -20,7 +20,7 @@
$(eval $(call gb_Module_Module,writerperfect))
ifneq (,$(SYSTEM_WPD))
-ifneq (,$(SYSTEM_LIBWPS))
+ifneq (,$(SYSTEM_WPS))
$(eval $(call gb_Module_add_targets,writerperfect,\
Library_wpftwriter \
))
@@ -28,7 +28,7 @@ endif
endif
ifneq (,$(SYSTEM_WPD))
-ifneq (,$(SYSTEM_LIBWPG))
+ifneq (,$(SYSTEM_WPG))
ifneq (,$(SYSTEM_VISIO))
ifneq (,$(SYSTEM_CDR))
ifneq (,$(SYSTEM_MSPUB))
@@ -42,7 +42,7 @@ endif
endif
ifneq (,$(SYSTEM_WPD))
-ifneq (,$(SYSTEM_LIBWPG))
+ifneq (,$(SYSTEM_WPG))
$(eval $(call gb_Module_add_targets,writerperfect,\
StaticLibrary_writerperfect \
))
commit a4c80756ca429ac3654455b5e6a6b6a700361b9a
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date: Tue Feb 19 11:22:51 2013 +0100
rename SYSTEM_LIBMSPUB to SYSTEM_MSPUB to remove specialcasing
Change-Id: I06d6dec259f4e1d28d0fb13497097bbfae156b2f
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 669c74b..d295a0c 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -1224,7 +1224,7 @@ endef
endif # SYSTEM_CDR
-ifeq ($(SYSTEM_LIBMSPUB),YES)
+ifeq ($(SYSTEM_MSPUB),YES)
define gb_LinkTarget__use_mspub
$(call gb_LinkTarget_set_include,$(1),\
@@ -1235,7 +1235,7 @@ $(call gb_LinkTarget_add_libs,$(1),$(MSPUB_LIBS))
endef
-else # !SYSTEM_LIBMSPUB
+else # !SYSTEM_MSPUB
$(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \
mspub-0.0 \
@@ -1251,7 +1251,7 @@ $(call gb_LinkTarget_use_static_libraries,$(1),\
endef
-endif # SYSTEM_LIBMSPUB
+endif # SYSTEM_MSPUB
ifeq ($(SYSTEM_VISIO),YES)
diff --git a/config_host.mk.in b/config_host.mk.in
index 36339e2..2d63e35 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -550,7 +550,7 @@ export SYSTEM_CMIS=@SYSTEM_CMIS@
export SYSTEM_LIBEXTTEXTCAT=@SYSTEM_LIBEXTTEXTCAT@
export SYSTEM_LIBEXTTEXTCAT_DATA=@SYSTEM_LIBEXTTEXTCAT_DATA@
export SYSTEM_LIBLANGTAG=@SYSTEM_LIBLANGTAG@
-export SYSTEM_LIBMSPUB=@SYSTEM_LIBMSPUB@
+export SYSTEM_MSPUB=@SYSTEM_MSPUB@
export SYSTEM_LIBORCUS=@SYSTEM_LIBORCUS@
export SYSTEM_LIBPNG=@SYSTEM_LIBPNG@
export SYSTEM_VISIO=@SYSTEM_VISIO@
diff --git a/configure.ac b/configure.ac
index 30d25e5..9013f05 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7265,8 +7265,6 @@ if test $_os = iOS; then
else
libo_CHECK_SYSTEM_MODULE([libmspub],[MSPUB],[libmspub-0.0])
fi
-SYSTEM_LIBMSPUB=$SYSTEM_MSPUB
-AC_SUBST(SYSTEM_LIBMSPUB)
dnl ===================================================================
dnl Check for system libvisio
diff --git a/libmspub/Module_libmspub.mk b/libmspub/Module_libmspub.mk
index fd67e90..844ac54 100644
--- a/libmspub/Module_libmspub.mk
+++ b/libmspub/Module_libmspub.mk
@@ -9,7 +9,7 @@
$(eval $(call gb_Module_Module,libmspub))
-ifeq ($(SYSTEM_LIBMSPUB),NO)
+ifeq ($(SYSTEM_MSPUB),NO)
$(eval $(call gb_Module_add_targets,libmspub,\
ExternalPackage_libmspub \
diff --git a/writerperfect/Module_writerperfect.mk b/writerperfect/Module_writerperfect.mk
index ecac55a..faf9d43 100644
--- a/writerperfect/Module_writerperfect.mk
+++ b/writerperfect/Module_writerperfect.mk
@@ -31,7 +31,7 @@ ifneq (,$(SYSTEM_WPD))
ifneq (,$(SYSTEM_LIBWPG))
ifneq (,$(SYSTEM_VISIO))
ifneq (,$(SYSTEM_CDR))
-ifneq (,$(SYSTEM_LIBMSPUB))
+ifneq (,$(SYSTEM_MSPUB))
$(eval $(call gb_Module_add_targets,writerperfect,\
Library_wpftdraw \
))
commit fb455e5013ab014058ad5f92238ef6fc91b2afcf
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date: Tue Feb 19 11:22:02 2013 +0100
rename SYSTEM_LIBCDR to SYSTEM_CDR to remove specialcasing
Change-Id: I14bd9c0a4b9b55963da67102468d573f7132fab7
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 447ddf6..669c74b 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -1194,7 +1194,7 @@ endef
endif # SYSTEM_OPENSSL
-ifeq ($(SYSTEM_LIBCDR),YES)
+ifeq ($(SYSTEM_CDR),YES)
define gb_LinkTarget__use_cdr
$(call gb_LinkTarget_set_include,$(1),\
@@ -1205,7 +1205,7 @@ $(call gb_LinkTarget_add_libs,$(1),$(CDR_LIBS))
endef
-else # !SYSTEM_LIBCDR
+else # !SYSTEM_CDR
$(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \
cdr-0.0 \
@@ -1221,7 +1221,7 @@ $(call gb_LinkTarget_use_static_libraries,$(1),\
endef
-endif # SYSTEM_LIBCDR
+endif # SYSTEM_CDR
ifeq ($(SYSTEM_LIBMSPUB),YES)
diff --git a/config_host.mk.in b/config_host.mk.in
index e4ccac5..36339e2 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -545,7 +545,7 @@ export SYSTEM_JFREEREPORT=@SYSTEM_JFREEREPORT@
export SYSTEM_JPEG=@SYSTEM_JPEG@
export SYSTEM_LCMS2=@SYSTEM_LCMS2@
export SYSTEM_LIBC=@SYSTEM_LIBC@
-export SYSTEM_LIBCDR=@SYSTEM_LIBCDR@
+export SYSTEM_CDR=@SYSTEM_CDR@
export SYSTEM_CMIS=@SYSTEM_CMIS@
export SYSTEM_LIBEXTTEXTCAT=@SYSTEM_LIBEXTTEXTCAT@
export SYSTEM_LIBEXTTEXTCAT_DATA=@SYSTEM_LIBEXTTEXTCAT_DATA@
diff --git a/configure.ac b/configure.ac
index 0b547e7..30d25e5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7255,8 +7255,6 @@ if test $_os = iOS; then
else
libo_CHECK_SYSTEM_MODULE([libcdr],[CDR],[libcdr-0.0 >= 0.0.5])
fi
-SYSTEM_LIBCDR=$SYSTEM_CDR
-AC_SUBST(SYSTEM_LIBCDR)
dnl ===================================================================
dnl Check for system libmspub
diff --git a/libcdr/Module_libcdr.mk b/libcdr/Module_libcdr.mk
index a9ee924..e92d5ad 100644
--- a/libcdr/Module_libcdr.mk
+++ b/libcdr/Module_libcdr.mk
@@ -9,7 +9,7 @@
$(eval $(call gb_Module_Module,libcdr))
-ifeq ($(SYSTEM_LIBCDR),NO)
+ifeq ($(SYSTEM_CDR),NO)
$(eval $(call gb_Module_add_targets,libcdr,\
ExternalPackage_libcdr \
diff --git a/writerperfect/Module_writerperfect.mk b/writerperfect/Module_writerperfect.mk
index 4bf5cc5..ecac55a 100644
--- a/writerperfect/Module_writerperfect.mk
+++ b/writerperfect/Module_writerperfect.mk
@@ -30,7 +30,7 @@ endif
ifneq (,$(SYSTEM_WPD))
ifneq (,$(SYSTEM_LIBWPG))
ifneq (,$(SYSTEM_VISIO))
-ifneq (,$(SYSTEM_LIBCDR))
+ifneq (,$(SYSTEM_CDR))
ifneq (,$(SYSTEM_LIBMSPUB))
$(eval $(call gb_Module_add_targets,writerperfect,\
Library_wpftdraw \
commit 5de206a7fbe74a7022bb3b20f190e6a3e6f1e3ae
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date: Tue Feb 19 11:20:31 2013 +0100
rename SYSTEM_LIBWPD to SYSTEM_WPD to remove specialcasing
Change-Id: Ibc8178e2dd7209705cb752f9570e414483c319a7
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index f838bf8..447ddf6 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -1284,7 +1284,7 @@ endef
endif # SYSTEM_VISIO
-ifeq ($(SYSTEM_LIBWPD),YES)
+ifeq ($(SYSTEM_WPD),YES)
define gb_LinkTarget__use_wpd
$(call gb_LinkTarget_set_include,$(1),\
@@ -1296,7 +1296,7 @@ $(call gb_LinkTarget_add_libs,$(1),$(WPD_LIBS))
endef
gb_ExternalProject__use_wpd :=
-else # !SYSTEM_LIBWPD
+else # !SYSTEM_WPD
$(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \
wpd-0.9 \
@@ -1316,7 +1316,7 @@ $(call gb_ExternalProject_use_package,$(1),libwpd)
endef
-endif # SYSTEM_LIBWPD
+endif # SYSTEM_WPD
ifeq ($(SYSTEM_LIBWPG),YES)
diff --git a/config_host.mk.in b/config_host.mk.in
index dc18078..e4ccac5 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -554,7 +554,7 @@ export SYSTEM_LIBMSPUB=@SYSTEM_LIBMSPUB@
export SYSTEM_LIBORCUS=@SYSTEM_LIBORCUS@
export SYSTEM_LIBPNG=@SYSTEM_LIBPNG@
export SYSTEM_VISIO=@SYSTEM_VISIO@
-export SYSTEM_LIBWPD=@SYSTEM_LIBWPD@
+export SYSTEM_WPD=@SYSTEM_WPD@
export SYSTEM_LIBWPG=@SYSTEM_LIBWPG@
export SYSTEM_LIBWPS=@SYSTEM_LIBWPS@
export SYSTEM_LIBXML=@SYSTEM_LIBXML@
diff --git a/configure.ac b/configure.ac
index 06661c7..0b547e7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7297,8 +7297,6 @@ else
fi
libo_CHECK_SYSTEM_MODULE([libwpd],[WPD],[libwpd-0.9 libwpd-stream-0.9])
fi
-SYSTEM_LIBWPD=$SYSTEM_WPD
-AC_SUBST(SYSTEM_LIBWPD)
dnl ===================================================================
dnl Check for system lcms2
diff --git a/libwpd/Module_libwpd.mk b/libwpd/Module_libwpd.mk
index bd74b12..13ef595 100644
--- a/libwpd/Module_libwpd.mk
+++ b/libwpd/Module_libwpd.mk
@@ -9,7 +9,7 @@
$(eval $(call gb_Module_Module,libwpd))
-ifeq ($(SYSTEM_LIBWPD),NO)
+ifeq ($(SYSTEM_WPD),NO)
$(eval $(call gb_Module_add_targets,libwpd,\
ExternalProject_libwpd \
diff --git a/writerperfect/Module_writerperfect.mk b/writerperfect/Module_writerperfect.mk
index 5b10dcc..4bf5cc5 100644
--- a/writerperfect/Module_writerperfect.mk
+++ b/writerperfect/Module_writerperfect.mk
@@ -19,7 +19,7 @@
$(eval $(call gb_Module_Module,writerperfect))
-ifneq (,$(SYSTEM_LIBWPD))
+ifneq (,$(SYSTEM_WPD))
ifneq (,$(SYSTEM_LIBWPS))
$(eval $(call gb_Module_add_targets,writerperfect,\
Library_wpftwriter \
@@ -27,7 +27,7 @@ $(eval $(call gb_Module_add_targets,writerperfect,\
endif
endif
-ifneq (,$(SYSTEM_LIBWPD))
+ifneq (,$(SYSTEM_WPD))
ifneq (,$(SYSTEM_LIBWPG))
ifneq (,$(SYSTEM_VISIO))
ifneq (,$(SYSTEM_LIBCDR))
@@ -41,7 +41,7 @@ endif
endif
endif
-ifneq (,$(SYSTEM_LIBWPD))
+ifneq (,$(SYSTEM_WPD))
ifneq (,$(SYSTEM_LIBWPG))
$(eval $(call gb_Module_add_targets,writerperfect,\
StaticLibrary_writerperfect \
commit fe8bcfa422c654e35ec22b5e3b1a512ae438b565
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date: Tue Feb 19 11:14:46 2013 +0100
rename SYSTEM_LIBVISIO to SYSTEM_VISIO to remove specialcasing
Change-Id: Ib895be66ecb4c95a86696007fdda453d3a3b34e0
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index da19e44..f838bf8 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -1254,7 +1254,7 @@ endef
endif # SYSTEM_LIBMSPUB
-ifeq ($(SYSTEM_LIBVISIO),YES)
+ifeq ($(SYSTEM_VISIO),YES)
define gb_LinkTarget__use_visio
$(call gb_LinkTarget_set_include,$(1),\
@@ -1265,7 +1265,7 @@ $(call gb_LinkTarget_add_libs,$(1),$(VISIO_LIBS))
endef
-else # !SYSTEM_LIBVISIO
+else # !SYSTEM_VISIO
$(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \
visio-0.0 \
@@ -1281,7 +1281,7 @@ $(call gb_LinkTarget_use_static_libraries,$(1),\
endef
-endif # SYSTEM_LIBVISIO
+endif # SYSTEM_VISIO
ifeq ($(SYSTEM_LIBWPD),YES)
diff --git a/config_host.mk.in b/config_host.mk.in
index 152186b..dc18078 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -553,7 +553,7 @@ export SYSTEM_LIBLANGTAG=@SYSTEM_LIBLANGTAG@
export SYSTEM_LIBMSPUB=@SYSTEM_LIBMSPUB@
export SYSTEM_LIBORCUS=@SYSTEM_LIBORCUS@
export SYSTEM_LIBPNG=@SYSTEM_LIBPNG@
-export SYSTEM_LIBVISIO=@SYSTEM_LIBVISIO@
+export SYSTEM_VISIO=@SYSTEM_VISIO@
export SYSTEM_LIBWPD=@SYSTEM_LIBWPD@
export SYSTEM_LIBWPG=@SYSTEM_LIBWPG@
export SYSTEM_LIBWPS=@SYSTEM_LIBWPS@
diff --git a/configure.ac b/configure.ac
index 41a48d9..06661c7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7279,15 +7279,12 @@ if test $_os = iOS; then
else
libo_CHECK_SYSTEM_MODULE([libvisio],[VISIO],[libvisio-0.0])
fi
-SYSTEM_LIBVISIO=$SYSTEM_VISIO
-AC_SUBST(SYSTEM_LIBVISIO)
dnl ===================================================================
dnl Check for system libcmis
dnl ===================================================================
libo_CHECK_SYSTEM_MODULE([libcmis],[CMIS],[libcmis-0.3 >= 0.3.0])
-
dnl ===================================================================
dnl Check for system libwpd
dnl ===================================================================
diff --git a/libvisio/Module_libvisio.mk b/libvisio/Module_libvisio.mk
index 9f8352a..3714265 100644
--- a/libvisio/Module_libvisio.mk
+++ b/libvisio/Module_libvisio.mk
@@ -9,7 +9,7 @@
$(eval $(call gb_Module_Module,libvisio))
-ifeq ($(SYSTEM_LIBVISIO),NO)
+ifeq ($(SYSTEM_VISIO),NO)
$(eval $(call gb_Module_add_targets,libvisio,\
ExternalPackage_libvisio \
diff --git a/writerperfect/Module_writerperfect.mk b/writerperfect/Module_writerperfect.mk
index 921e7e8..5b10dcc 100644
--- a/writerperfect/Module_writerperfect.mk
+++ b/writerperfect/Module_writerperfect.mk
@@ -29,7 +29,7 @@ endif
ifneq (,$(SYSTEM_LIBWPD))
ifneq (,$(SYSTEM_LIBWPG))
-ifneq (,$(SYSTEM_LIBVISIO))
+ifneq (,$(SYSTEM_VISIO))
ifneq (,$(SYSTEM_LIBCDR))
ifneq (,$(SYSTEM_LIBMSPUB))
$(eval $(call gb_Module_add_targets,writerperfect,\
commit 88ed6d1348b5d3d517afcbe5fa1257d55625f39b
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date: Tue Feb 19 11:10:16 2013 +0100
rename SYSTEM_LIBCMIS to SYSTEM_CMIS to remove specialcasing
Change-Id: I7fdf7fd285d6b8c584d8fe225729f15f3f9798ad
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index c072b8f..da19e44 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -565,7 +565,7 @@ endef
endif # SYSTEM_BOOST
-ifeq ($(SYSTEM_LIBCMIS),YES)
+ifeq ($(SYSTEM_CMIS),YES)
define gb_LinkTarget__use_cmis
$(call gb_LinkTarget_set_include,$(1),\
@@ -576,7 +576,7 @@ $(call gb_LinkTarget_add_libs,$(1),$(CMIS_LIBS))
endef
-else # !SYSTEM_LIBCMIS
+else # !SYSTEM_CMIS
$(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \
cmislib \
@@ -589,7 +589,7 @@ $(call gb_LinkTarget_use_static_libraries,$(1),\
endef
-endif # SYSTEM_LIBCMIS
+endif # SYSTEM_CMIS
ifeq ($(OS)$(COM),WNTGCC)
diff --git a/config_host.mk.in b/config_host.mk.in
index 43566cb..152186b 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -546,7 +546,7 @@ export SYSTEM_JPEG=@SYSTEM_JPEG@
export SYSTEM_LCMS2=@SYSTEM_LCMS2@
export SYSTEM_LIBC=@SYSTEM_LIBC@
export SYSTEM_LIBCDR=@SYSTEM_LIBCDR@
-export SYSTEM_LIBCMIS=@SYSTEM_LIBCMIS@
+export SYSTEM_CMIS=@SYSTEM_CMIS@
export SYSTEM_LIBEXTTEXTCAT=@SYSTEM_LIBEXTTEXTCAT@
export SYSTEM_LIBEXTTEXTCAT_DATA=@SYSTEM_LIBEXTTEXTCAT_DATA@
export SYSTEM_LIBLANGTAG=@SYSTEM_LIBLANGTAG@
diff --git a/configure.ac b/configure.ac
index 002b24f..41a48d9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7286,8 +7286,6 @@ dnl ===================================================================
dnl Check for system libcmis
dnl ===================================================================
libo_CHECK_SYSTEM_MODULE([libcmis],[CMIS],[libcmis-0.3 >= 0.3.0])
-SYSTEM_LIBCMIS=$SYSTEM_CMIS
-AC_SUBST(SYSTEM_LIBCMIS)
dnl ===================================================================
diff --git a/libcmis/Module_libcmis.mk b/libcmis/Module_libcmis.mk
index 5c44009..a7fb0fd 100644
--- a/libcmis/Module_libcmis.mk
+++ b/libcmis/Module_libcmis.mk
@@ -9,7 +9,7 @@
$(eval $(call gb_Module_Module,libcmis))
-ifeq ($(SYSTEM_LIBCMIS),NO)
+ifeq ($(SYSTEM_CMIS),NO)
$(eval $(call gb_Module_add_targets,libcmis,\
ExternalPackage_libcmis \
commit 43682489c18c707bc0d5701f7f6a2df2511eeb0c
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date: Tue Feb 19 13:00:58 2013 +0100
Re-Revert "simplify external module check with macro" modulo expat/clucene
This reverts commit 324d2f94749dfd94c7f09d1923310e145bb64deb.
Change-Id: I0c1c3412554de2093c9c94de89ff74a89869fa6d
diff --git a/configure.ac b/configure.ac
index 7e7406c..002b24f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7135,6 +7135,10 @@ if test "$with_system_zlib" = "auto"; then
esac
fi
+dnl we want to use libo_CHECK_SYSTEM_MODULE here too, but OS X is too stupid
+dnl and has no pkg-config for it at least on some tinderboxes,
+dnl so leaving that out for now
+dnl libo_CHECK_SYSTEM_MODULE([zlib],[ZLIB],[zlib])
AC_MSG_CHECKING([which zlib to use])
if test "$with_system_zlib" = "yes"; then
AC_MSG_RESULT([external])
@@ -7185,15 +7189,18 @@ fi
AC_SUBST(SYSTEM_JPEG)
AC_SUBST([MINGW_JPEG_DLL])
+
dnl ===================================================================
dnl Check for system clucene
dnl ===================================================================
+dnl we should rather be using
+dnl libo_CHECK_SYSTEM_MODULE([clucence],[CLUCENE],[liblucence-core]) here
+dnl but the contibs-lib check seems tricky
AC_MSG_CHECKING([which clucene to use])
if test "$with_system_clucene" = "yes"; then
AC_MSG_RESULT([external])
SYSTEM_CLUCENE=YES
PKG_CHECK_MODULES(CLUCENE, libclucene-core)
-
AC_LANG_PUSH([C++])
save_CXXFLAGS=$CXXFLAGS
save_CPPFLAGS=$CPPFLAGS
@@ -7220,6 +7227,8 @@ AC_SUBST(CLUCENE_LIBS)
dnl ===================================================================
dnl Check for system expat
dnl ===================================================================
+dnl we should use libo_CHECK_SYSTEM_MODULE, but e.g. the mingw tinderbox has no
+dnl proper pkg-config for it. It should really be fixed on the tinderbox though.
AC_MSG_CHECKING([which expat to use])
if test "$with_system_expat" = "yes"; then
AC_MSG_RESULT([external])
@@ -7227,7 +7236,7 @@ if test "$with_system_expat" = "yes"; then
AC_CHECK_HEADER(expat.h, [],
[AC_MSG_ERROR(expat.h not found. install expat)], [])
AC_CHECK_LIB([expat], [XML_ParserCreate], [:],
- [AC_MSG_RESULT(expat library not found or functional.)], [])
+ [AC_MSG_RESULT(expat library not found or functional.)], [])
libo_MINGW_CHECK_DLL([EXPAT], [libexpat])
else
AC_MSG_RESULT([internal])
@@ -7240,143 +7249,82 @@ AC_SUBST([MINGW_EXPAT_DLL])
dnl ===================================================================
dnl Check for system libcdr
dnl ===================================================================
-AC_MSG_CHECKING([which libcdr to use])
-if test "$with_system_libcdr" = "yes"; then
- AC_MSG_RESULT([external])
- SYSTEM_LIBCDR=YES
- PKG_CHECK_MODULES( CDR, libcdr-0.0 >= 0.0.5 )
-elif test $_os = iOS; then
- # libcdr depends on libwpd and libwpg and those are LGPL
- AC_MSG_RESULT([none])
+if test $_os = iOS; then
+ # libcdr depends on libwpd and libwpg and those are LGPL, publishing empty flags
+ libo_PUBLISH_MODULE([CDR])
else
- AC_MSG_RESULT([internal])
- SYSTEM_LIBCDR=NO
- BUILD_TYPE="$BUILD_TYPE CDR"
+ libo_CHECK_SYSTEM_MODULE([libcdr],[CDR],[libcdr-0.0 >= 0.0.5])
fi
+SYSTEM_LIBCDR=$SYSTEM_CDR
AC_SUBST(SYSTEM_LIBCDR)
-AC_SUBST(CDR_CFLAGS)
-AC_SUBST(CDR_LIBS)
dnl ===================================================================
dnl Check for system libmspub
dnl ===================================================================
-AC_MSG_CHECKING([which libmspub to use])
-if test "$with_system_libmspub" = "yes"; then
- AC_MSG_RESULT([external])
- SYSTEM_LIBMSPUB=YES
- PKG_CHECK_MODULES( MSPUB, libmspub-0.0 )
-elif test $_os = iOS; then
- # libmspub depends on libwpd and libwpg and those are LGPL
- AC_MSG_RESULT([none])
+if test $_os = iOS; then
+ # libmspub depends on libwpd and libwpg and those are LGPL, publishing empty flags
+ libo_PUBLISH_MODULE([MSPUB])
else
- AC_MSG_RESULT([internal])
- SYSTEM_LIBMSPUB=NO
- BUILD_TYPE="$BUILD_TYPE MSPUB"
+ libo_CHECK_SYSTEM_MODULE([libmspub],[MSPUB],[libmspub-0.0])
fi
+SYSTEM_LIBMSPUB=$SYSTEM_MSPUB
AC_SUBST(SYSTEM_LIBMSPUB)
-AC_SUBST(MSPUB_CFLAGS)
-AC_SUBST(MSPUB_LIBS)
dnl ===================================================================
dnl Check for system libvisio
dnl ===================================================================
-AC_MSG_CHECKING([which libvisio to use])
-if test "$with_system_libvisio" = "yes"; then
- AC_MSG_RESULT([external])
- SYSTEM_LIBVISIO=YES
- PKG_CHECK_MODULES( VISIO, libvisio-0.0 )
-elif test $_os = iOS; then
- # libvisio depends on libwpd and libwpg and those are LGPL
- AC_MSG_RESULT([none])
+if test $_os = iOS; then
+ # libvisio depends on libwpd and libwpg and those are LGPL, publishing empty flags
+ libo_PUBLISH_MODULE([VISIO])
else
- AC_MSG_RESULT([internal])
- SYSTEM_LIBVISIO=NO
- BUILD_TYPE="$BUILD_TYPE VISIO"
+ libo_CHECK_SYSTEM_MODULE([libvisio],[VISIO],[libvisio-0.0])
fi
+SYSTEM_LIBVISIO=$SYSTEM_VISIO
AC_SUBST(SYSTEM_LIBVISIO)
-AC_SUBST(VISIO_CFLAGS)
-AC_SUBST(VISIO_LIBS)
dnl ===================================================================
dnl Check for system libcmis
dnl ===================================================================
-AC_MSG_CHECKING([which libcmis to use])
-if test "$with_system_libcmis" = "yes"; then
- AC_MSG_RESULT([external])
- SYSTEM_LIBCMIS=YES
- PKG_CHECK_MODULES( CMIS, libcmis-0.3 >= 0.3.0 )
-else
- AC_MSG_RESULT([internal])
- SYSTEM_LIBCMIS=NO
- BUILD_TYPE="$BUILD_TYPE CMIS"
-fi
+libo_CHECK_SYSTEM_MODULE([libcmis],[CMIS],[libcmis-0.3 >= 0.3.0])
+SYSTEM_LIBCMIS=$SYSTEM_CMIS
AC_SUBST(SYSTEM_LIBCMIS)
-AC_SUBST(CMIS_CFLAGS)
-AC_SUBST(CMIS_LIBS)
dnl ===================================================================
dnl Check for system libwpd
dnl ===================================================================
-AC_MSG_CHECKING([which libwpd to use])
-if test "$with_system_libwpd" = "yes"; then
- AC_MSG_RESULT([external])
- SYSTEM_LIBWPD=YES
- PKG_CHECK_MODULES( WPD, libwpd-0.9 libwpd-stream-0.9 )
-elif test $_os = iOS; then
- AC_MSG_RESULT([none])
+if test $_os = iOS; then
+ libo_PUBLISH_MODULE([WPD])
else
- AC_MSG_RESULT([internal])
- SYSTEM_LIBWPD=NO
- WPD_CFLAGS="-I${OUTDIR}/inc/external"
- WPD_LIBS="-L${OUTDIR}/lib -lwpdlib"
- BUILD_TYPE="$BUILD_TYPE WPD"
+ if test "$with_system_libwpd" = "no"; then
+ WPD_CFLAGS="-I${OUTDIR}/inc/external"
+ WPD_LIBS="-L${OUTDIR}/lib -lwpdlib"
+ fi
+ libo_CHECK_SYSTEM_MODULE([libwpd],[WPD],[libwpd-0.9 libwpd-stream-0.9])
fi
+SYSTEM_LIBWPD=$SYSTEM_WPD
AC_SUBST(SYSTEM_LIBWPD)
-AC_SUBST(WPD_CFLAGS)
-AC_SUBST(WPD_LIBS)
dnl ===================================================================
dnl Check for system lcms2
dnl ===================================================================
-AC_MSG_CHECKING([which littlecms v2 to use])
if test "$with_system_lcms2" = "yes"; then
- AC_MSG_RESULT([external])
- SYSTEM_LCMS2=YES
- PKG_CHECK_MODULES( LCMS2, lcms2 )
libo_MINGW_CHECK_DLL([LCMS2], [liblcms2])
else
- AC_MSG_RESULT([internal])
SYSTEM_LCMS2=NO
LCMS2_LIBS="-L${OUTDIR}/lib -llcms2"
LCMS2_CFLAGS="-I${WORKDIR}/UnpackedTarball/lcms2/include"
if test "$GCC" = "yes"; then
LCMS2_CFLAGS="${LCMS2_CFLAGS} -Wno-long-long"
fi
- BUILD_TYPE="$BUILD_TYPE LCMS2"
fi
-AC_SUBST(SYSTEM_LCMS2)
-AC_SUBST(LCMS2_CFLAGS)
-AC_SUBST(LCMS2_LIBS)
+libo_CHECK_SYSTEM_MODULE([lcms2],[LCMS2],[lcms2])
AC_SUBST([MINGW_LCMS2_DLL])
dnl ===================================================================
dnl Check for system cppunit
dnl ===================================================================
-AC_MSG_CHECKING([which cppunit to use])
-if test "$with_system_cppunit" = "yes"; then
- AC_MSG_RESULT([external])
- SYSTEM_CPPUNIT=YES
- # might work for earlier, too but go sure:
- PKG_CHECK_MODULES( CPPUNIT, cppunit >= 1.12.0 )
-else
- AC_MSG_RESULT([internal])
- SYSTEM_CPPUNIT=NO
- BUILD_TYPE="$BUILD_TYPE CPPUNIT"
-fi
-AC_SUBST(SYSTEM_CPPUNIT)
-AC_SUBST(CPPUNIT_CFLAGS)
-AC_SUBST(CPPUNIT_LIBS)
+libo_CHECK_SYSTEM_MODULE([cppunit],[CPPUNIT],[cppunit >= 1.12.0])
dnl ===================================================================
dnl Check whether freetype is available
@@ -7397,44 +7345,32 @@ AC_SUBST(FREETYPE_LIBS)
dnl ===================================================================
dnl Check for system libwps
dnl ===================================================================
-AC_MSG_CHECKING([which libwps to use])
-if test "$with_system_libwps" = "yes"; then
- AC_MSG_RESULT([external])
- SYSTEM_LIBWPS=YES
- PKG_CHECK_MODULES( WPS, libwps-0.2 )
-elif test $_os = iOS; then
- AC_MSG_RESULT([none])
+if test $_os = iOS; then
+ libo_PUBLISH_MODULE([WPS])
else
- AC_MSG_RESULT([internal])
- SYSTEM_LIBWPS=NO
- WPS_CFLAGS="-I${OUTDIR}/inc/external"
- WPS_LIBS="-L${OUTDIR}/lib -lwpslib"
- BUILD_TYPE="$BUILD_TYPE WPS"
+ if test "$with_system_libwps" = "no"; then
+ WPS_CFLAGS="-I${OUTDIR}/inc/external"
+ WPS_LIBS="-L${OUTDIR}/lib -lwpslib"
+ fi
+ libo_CHECK_SYSTEM_MODULE([libwps],[WPS],[libwps-0.2])
fi
+SYSTEM_LIBWPS=$SYSTEM_WPS
AC_SUBST(SYSTEM_LIBWPS)
-AC_SUBST(WPS_CFLAGS)
-AC_SUBST(WPS_LIBS)
dnl ===================================================================
dnl Check for system libwpg
dnl ===================================================================
-AC_MSG_CHECKING([which libwpg to use])
-if test "$with_system_libwpg" = "yes"; then
- AC_MSG_RESULT([external])
- SYSTEM_LIBWPG=YES
- PKG_CHECK_MODULES( WPG, libwpg-0.2 )
-elif test $_os = iOS; then
- AC_MSG_RESULT([none])
+if test $_os = iOS; then
+ libo_PUBLISH_MODULE([WPD])
else
- AC_MSG_RESULT([internal])
- SYSTEM_LIBWPG=NO
- WPG_CFLAGS="-I${OUTDIR}/inc/external"
- WPG_LIBS="-L${OUTDIR}/lib -lwpglib"
- BUILD_TYPE="$BUILD_TYPE WPG"
+ if test "$with_system_libwpg" = "no"; then
+ WPG_CFLAGS="-I${OUTDIR}/inc/external"
+ WPG_LIBS="-L${OUTDIR}/lib -lwpglib"
+ fi
+ libo_CHECK_SYSTEM_MODULE([libwpg],[WPG],[libwpg-0.2])
fi
+SYSTEM_LIBWPG=$SYSTEM_WPG
AC_SUBST(SYSTEM_LIBWPG)
-AC_SUBST(WPG_CFLAGS)
-AC_SUBST(WPG_LIBS)
dnl ===================================================================
dnl Check whether freetype2 supports emboldening
@@ -9117,24 +9053,16 @@ fi
AC_SUBST(SYSTEM_LPSOLVE)
AC_SUBST([MINGW_LPSOLVE_DLL])
+
+
dnl ===================================================================
dnl Checking for libexttextcat
dnl ===================================================================
-AC_MSG_CHECKING([which libexttextcat to use])
+libo_CHECK_SYSTEM_MODULE([libexttextcat],[LIBEXTTEXTCAT],[libexttextcat >= 3.1.1])
if test "$with_system_libexttextcat" = "yes"; then
- AC_MSG_RESULT([external])
- SYSTEM_LIBEXTTEXTCAT=YES
- PKG_CHECK_MODULES([LIBEXTTEXTCAT], [libexttextcat >= 3.1.1])
SYSTEM_LIBEXTTEXTCAT_DATA=file://`$PKG_CONFIG --variable=pkgdatadir libexttextcat`
-else
- AC_MSG_RESULT([internal])
- SYSTEM_LIBEXTTEXTCAT=NO
- BUILD_TYPE="$BUILD_TYPE LIBEXTTEXTCAT"
fi
-AC_SUBST(SYSTEM_LIBEXTTEXTCAT)
AC_SUBST(SYSTEM_LIBEXTTEXTCAT_DATA)
-AC_SUBST(LIBEXTTEXTCAT_CFLAGS)
-AC_SUBST(LIBEXTTEXTCAT_LIBS)
dnl ***************************************
dnl testing libc version for Linux...
diff --git a/m4/libo_externals.m4 b/m4/libo_externals.m4
new file mode 100644
index 0000000..b0b45ed
--- /dev/null
+++ b/m4/libo_externals.m4
@@ -0,0 +1,30 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+AC_DEFUN([libo_PUBLISH_MODULE],
+[
+ true
+ AC_SUBST([SYSTEM_$1])
+ AC_SUBST([$1_CFLAGS])
+ AC_SUBST([$1_LIBS])
+])
+
+AC_DEFUN([libo_CHECK_SYSTEM_MODULE], [
+AC_MSG_CHECKING([which $1 to use])
+if test "$with_system_$1" = "yes"; then
+ AC_MSG_RESULT([external])
+ SYSTEM_$2=YES
+ PKG_CHECK_MODULES([$2], [$3])
+else
+ AC_MSG_RESULT([internal])
+ SYSTEM_$2=NO
+ BUILD_TYPE="$BUILD_TYPE $2"
+fi
+ libo_PUBLISH_MODULE([$2])
+])
+# vim: set noet sw=4 ts=4:
More information about the Libreoffice-commits
mailing list