diff options
| author | Andy Wingo <wingo@pobox.com> | 2015-04-19 14:12:41 +0200 |
|---|---|---|
| committer | Andy Wingo <wingo@pobox.com> | 2015-04-19 14:12:41 +0200 |
| commit | fe6d835c755c240d48f85c154caf2f36fa1b833b (patch) | |
| tree | f294a25aba6c2db16de59c638f131af44a2d523d /configure.ac | |
| parent | 391aea85be1c258f77caf9f8972106e84b60ef15 (diff) | |
Remove unifont and terminal checks/support
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 22 |
1 files changed, 0 insertions, 22 deletions
diff --git a/configure.ac b/configure.ac index 92bc24330d..55767290e9 100644 --- a/configure.ac +++ b/configure.ac @@ -1054,27 +1054,6 @@ AS_IF([test "x$enable_gnuefi" != "xno"], [ AM_CONDITIONAL(HAVE_GNUEFI, [test "x$have_gnuefi" = 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]) - 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 -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" -a "x$have_unifont" = "xyes"]) - -# ------------------------------------------------------------------------------ have_kdbus=no AC_ARG_ENABLE(kdbus, AS_HELP_STRING([--enable-kdbus], [do connect to kdbus by default])) if test "x$enable_kdbus" = "xyes"; then @@ -1388,7 +1367,6 @@ AC_MSG_RESULT([ nss-myhostname: ${have_myhostname} gudev: ${enable_gudev} hwdb: ${enable_hwdb} - terminal: ${have_terminal} kdbus: ${have_kdbus} Python: ${have_python} Python Headers: ${have_python_devel} |