diff options
| author | Tor Lillqvist <tml@collabora.com> | 2020-06-11 14:02:57 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2020-06-11 16:23:52 +0200 |
| commit | c392ecfa734731194c366e869a3c2475c53dc867 (patch) | |
| tree | 852813ca2e485335b53ff3f1ca3bf3202de8496d /RepositoryExternal.mk | |
| parent | f62f200f31ac20c4e28a1e6fbead512d55bdf04f (diff) | |
Drop configurability of libnumbertext use
It was fairly pointless to be able to --disable-libnumbertext.
Besides, disabling it broke the ordinal page (etc) numbering feature:
"1st", "2nd", "3rd", etc showed up as "Ordinal-number 1",
"Ordinal-number 2", "Ordinal-number 3" etc.
Change-Id: I645169054a8fdc8dac89cd48b6c369fd61749467
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96119
Tested-by: Jenkins
Reviewed-by: Tor Lillqvist <tml@collabora.com>
Diffstat (limited to 'RepositoryExternal.mk')
| -rw-r--r-- | RepositoryExternal.mk | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 81a65a1a8590..2255d1965382 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -830,8 +830,6 @@ endef else # !SYSTEM_LIBNUMBERTEXT -ifneq ($(ENABLE_LIBNUMBERTEXT),) - $(eval $(call gb_Helper_register_packages_for_install,ooo, \ libnumbertext_numbertext \ )) @@ -842,9 +840,6 @@ $(call gb_LinkTarget_set_include,$(1),\ -I$(call gb_UnpackedTarball_get_dir,libnumbertext/src) \ $$(INCLUDE) \ ) -$(call gb_LinkTarget_add_defs,$(1),\ - -DENABLE_LIBNUMBERTEXT \ -) ifeq ($(COM),MSC) $(call gb_LinkTarget_use_static_libraries,$(1),\ @@ -861,13 +856,6 @@ endif endef -else # !ENABLE_LIBNUMBERTEXT - -define gb_LinkTarget__use_libnumbertext -endef - -endif # ENABLE_LIBNUMBERTEXT - endif # SYSTEM_LIBNUMBERTEXT |