From: Andy Wingo <wingo@pobox.com>
Date: Sun, 19 Apr 2015 12:10:00 +0000 (+0200)
Subject: Remove xkbcommon checks
X-Git-Tag: v219.0~64
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=391aea85be1c258f77caf9f8972106e84b60ef15;hp=ec9259f0034043edd2878a22be7f7c86e18c70b4

Remove xkbcommon checks
---

diff --git a/configure.ac b/configure.ac
index 40f60431e..92bc24330 100644
--- a/configure.ac
+++ b/configure.ac
@@ -316,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]))
@@ -1395,7 +1383,6 @@ 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}