Remove unifont and terminal checks/support

[elogind.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 16cce408d2ad3604ee736b58013827ef7ecb21b8..55767290e9fdcc4ea8952a68deb100b536edb3e2 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -225,7 +225,6 @@ AC_CHECK_SIZEOF(rlim_t,,[
 
 # ------------------------------------------------------------------------------
 
-AC_SEARCH_LIBS([dlsym], [dl], [], [AC_MSG_ERROR([*** Dynamic linking loader library not found])])
 AC_CHECK_HEADERS([sys/capability.h], [], [AC_MSG_ERROR([*** POSIX caps headers not found])])
 AC_CHECK_HEADERS([linux/btrfs.h], [], [])
 AC_CHECK_HEADERS([linux/memfd.h], [], [])
@@ -239,12 +238,6 @@ AC_SEARCH_LIBS([cap_init], [cap], [], [AC_MSG_ERROR([*** POSIX caps library not
 CAP_LIBS="$LIBS"
 AC_SUBST(CAP_LIBS)
 
-LIBS=
-AC_SEARCH_LIBS([mq_open], [rt], [], [AC_MSG_ERROR([*** POSIX RT library not found])])
-RT_LIBS="$LIBS"
-AC_SUBST(RT_LIBS)
-LIBS="$save_LIBS"
-
 AC_CHECK_FUNCS([memfd_create])
 AC_CHECK_FUNCS([__secure_getenv secure_getenv])
 AC_CHECK_DECLS([gettid, pivot_root, name_to_handle_at, setns, getrandom, renameat2, kcmp, LO_FLAGS_PARTSCAN],
@@ -300,17 +293,6 @@ AM_CONDITIONAL(HAVE_DBUS, [test "$have_dbus" = "yes"])
 # ------------------------------------------------------------------------------
 PKG_CHECK_MODULES(UDEV, [libudev])
 
-# ------------------------------------------------------------------------------
-have_compat_libs=no
-AC_ARG_ENABLE([compat_libs], AS_HELP_STRING([--enable-compat-libs],[Enable creation of compatibility libraries]),
-                [case "${enableval}" in
-                        yes) have_compat_libs=yes ;;
-                        no) have_compat_libs=no ;;
-                        *) AC_MSG_ERROR(bad value ${enableval} for --enable-compat-libs) ;;
-                esac],
-                [have_compat_libs=no])
-AM_CONDITIONAL([ENABLE_COMPAT_LIBS], [test "$have_compat_libs" = "yes"])
-
 # ------------------------------------------------------------------------------
 have_coverage=no
 AC_ARG_ENABLE(coverage, AS_HELP_STRING([--enable-coverage], [enable test coverage]))
@@ -334,18 +316,6 @@ if test "x$enable_coverage" = "xyes" ; then
 fi
 AM_CONDITIONAL(ENABLE_COVERAGE, [test "$have_coverage" = "yes"])
 
-# ------------------------------------------------------------------------------
-have_xkbcommon=no
-AC_ARG_ENABLE(xkbcommon, AS_HELP_STRING([--disable-xkbcommon], [disable xkbcommon keymap support]))
-if test "x$enable_xkbcommon" != "xno"; then
-        PKG_CHECK_MODULES(XKBCOMMON, [ xkbcommon >= 0.3.0 ],
-                [AC_DEFINE(HAVE_XKBCOMMON, 1, [Define if libxkbcommon is available]) have_xkbcommon=yes], have_xkbcommon=no)
-        if test "x$have_xkbcommon" = xno -a "x$enable_xkbcommon" = xyes; then
-                AC_MSG_ERROR([*** xkbcommon support requested but libraries not found])
-        fi
-fi
-AM_CONDITIONAL(HAVE_XKBCOMMON, [test "$have_xkbcommon" = "yes"])
-
 # ------------------------------------------------------------------------------
 have_blkid=no
 AC_ARG_ENABLE(blkid, AS_HELP_STRING([--disable-blkid], [disable blkid support]))
@@ -1083,27 +1053,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]))
@@ -1413,13 +1362,11 @@ AC_MSG_RESULT([
         EFI libdir:              ${EFI_LIB_DIR}
         EFI ldsdir:              ${EFI_LDS_DIR}
         EFI includedir:          ${EFI_INC_DIR}
-        xkbcommon:               ${have_xkbcommon}
         blkid:                   ${have_blkid}
         dbus:                    ${have_dbus}
         nss-myhostname:          ${have_myhostname}
         gudev:                   ${enable_gudev}
         hwdb:                    ${enable_hwdb}
-        terminal:                ${have_terminal}
         kdbus:                   ${have_kdbus}
         Python:                  ${have_python}
         Python Headers:          ${have_python_devel}
@@ -1428,7 +1375,6 @@ AC_MSG_RESULT([
         test coverage:           ${have_coverage}
         Split /usr:              ${enable_split_usr}
         SysV compatibility:      ${SYSTEM_SYSV_COMPAT}
-        compatibility libraries: ${have_compat_libs}
         ldconfig support:        ${enable_ldconfig}
         hibernate support:       ${enable_hibernate}
         extra debugging:         ${enable_debug}