diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2015-01-26 19:12:56 -0500 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2015-01-26 23:56:34 -0500 |
| commit | 10bc4cd469fc677892b07748ec85804ca120825f (patch) | |
| tree | 662c8f72ce1bb03c0be25e6469e357fd183b254f | |
| parent | 4a84f3e61434cdc52f91477d7fd937600159e4f1 (diff) | |
build-sys: unbundle unifont
We should prefer the unifont.hex file from the system, instead of our
own. Upstream has made a few releases since our version was included,
and we should follow upstream changes. But adding 2.6MB to our source
repo every time upstream releases is not nice.
| -rw-r--r-- | Makefile.am | 10 | ||||
| -rw-r--r-- | configure.ac | 15 | ||||
| -rw-r--r-- | src/libsystemd-terminal/.gitignore | 1 | ||||
| -rw-r--r-- | src/libsystemd-terminal/unifont-glyph-array.bin | bin | 2621472 -> 0 bytes |
4 files changed, 16 insertions, 10 deletions
diff --git a/Makefile.am b/Makefile.am index c463f2353e..f42f132553 100644 --- a/Makefile.am +++ b/Makefile.am @@ -3326,7 +3326,7 @@ noinst_PROGRAMS += \ systemd-subterm dist_pkgdata_DATA += \ - src/libsystemd-terminal/unifont-glyph-array.bin + src/libsystemd-terminal/unifont-glyph-array.bin nodist_userunit_DATA += \ units/user/systemd-consoled.service @@ -3454,12 +3454,8 @@ test_unifont_LDADD = \ libsystemd-internal.la \ libsystemd-shared.la -.PHONY: update-unifont -update-unifont: tools/compile-unifont.py - $(AM_V_GEN)$(PYTHON) $< \ - <$(top_srcdir)/src/libsystemd-terminal/unifont.hex \ - >$(top_srcdir)/src/libsystemd-terminal/unifont-glyph-array.bin - @echo "unifont-glyph-array.bin has been regenerated" +src/libsystemd-terminal/unifont-glyph-array.bin: tools/compile-unifont.py $(UNIFONT) + $(AM_V_GEN)$(PYTHON) $< <$(UNIFONT) >$@ # ------------------------------------------------------------------------------ if ENABLE_GTK_DOC diff --git a/configure.ac b/configure.ac index 12e4ab2175..cf19681c85 100644 --- a/configure.ac +++ b/configure.ac @@ -1142,16 +1142,25 @@ fi AM_CONDITIONAL(ENABLE_EFI, [test "x$have_efi" = "xyes"]) # ------------------------------------------------------------------------------ +AC_ARG_WITH(unifont, + AS_HELP_STRING([--with-unifont=PATH], + [Path to unifont.hex]), + [UNIFONT="$withval"], + [UNIFONT="/usr/share/unifont/unifont.hex"]) +AC_SUBST(UNIFONT) + have_terminal=no +have_unifont=no AC_ARG_ENABLE(terminal, AS_HELP_STRING([--enable-terminal], [enable terminal support])) if test "x$enable_terminal" = "xyes"; then PKG_CHECK_MODULES([TERMINAL], [ libevdev >= 1.2 xkbcommon >= 0.5 libdrm >= 2.4], [have_terminal=yes]) - AS_IF([test "x$have_terminal" != xyes -a "x$enable_terminal" = xyes], + AC_CHECK_FILE($UNIFONT, [have_unifont=yes]) + AS_IF([test "x$have_terminal" != xyes -o "x$have_unifont" != "xyes" -a "x$enable_terminal" = xyes], [AC_MSG_ERROR([*** terminal support requested but required dependencies not available])], - [test "x$have_terminal" = xyes], + [test "x$have_terminal" = xyes -a "x$have_unifont" = "xyes"], [AC_DEFINE(ENABLE_TERMINAL, 1, [Define if terminal support is to be enabled])]) fi -AM_CONDITIONAL(ENABLE_TERMINAL, [test "x$have_terminal" = "xyes"]) +AM_CONDITIONAL(ENABLE_TERMINAL, [test "x$have_terminal" = "xyes" -a "x$have_unifont" = "xyes"]) # ------------------------------------------------------------------------------ have_kdbus=no diff --git a/src/libsystemd-terminal/.gitignore b/src/libsystemd-terminal/.gitignore new file mode 100644 index 0000000000..7de83bd3e9 --- /dev/null +++ b/src/libsystemd-terminal/.gitignore @@ -0,0 +1 @@ +/unifont-glyph-array.bin diff --git a/src/libsystemd-terminal/unifont-glyph-array.bin b/src/libsystemd-terminal/unifont-glyph-array.bin Binary files differdeleted file mode 100644 index 46f150c42b..0000000000 --- a/src/libsystemd-terminal/unifont-glyph-array.bin +++ /dev/null |