summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndy Wingo <wingo@pobox.com>2015-04-19 13:48:53 +0200
committerAndy Wingo <wingo@pobox.com>2015-04-19 14:08:12 +0200
commitbe1cfc2db1bd9b57f2989595bae6b6c5b2d50815 (patch)
tree4fdd7d07fd52ec007ba50d13fe77e89ba9cf5da7
parent0ea3f901134d2b78c177d3353523db5c39df629b (diff)
Remove kmod support
-rw-r--r--Makefile.am1
-rw-r--r--configure.ac19
-rw-r--r--src/shared/build.h7
3 files changed, 0 insertions, 27 deletions
diff --git a/Makefile.am b/Makefile.am
index 7eb7730922..d40b3bb782 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1000,7 +1000,6 @@ substitutions = \
'|SUSHELL=$(SUSHELL)|' \
'|SULOGIN=$(SULOGIN)|' \
'|DEBUGTTY=$(DEBUGTTY)|' \
- '|KMOD=$(KMOD)|' \
'|MKDIR_P=$(MKDIR_P)|' \
'|SYSTEM_SYSVINIT_PATH=$(sysvinitdir)|' \
'|VARLOGDIR=$(varlogdir)|' \
diff --git a/configure.ac b/configure.ac
index 555667bfca..61ad8b6b9a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -87,8 +87,6 @@ AC_PROG_CC_C99
AC_PATH_PROG([M4], [m4])
AC_PATH_PROG([XSLTPROC], [xsltproc])
-AC_PATH_PROG([KMOD], [kmod], [/usr/bin/kmod], [$PATH:/usr/sbin:/sbin])
-
AC_PATH_PROG([KEXEC], [kexec], [/usr/sbin/kexec], [$PATH:/usr/sbin:/sbin])
AC_PATH_PROG([SULOGIN], [sulogin], [/usr/sbin/sulogin], [$PATH:/usr/sbin:/sbin])
@@ -346,22 +344,6 @@ fi
AM_CONDITIONAL(ENABLE_COVERAGE, [test "$have_coverage" = "yes"])
# ------------------------------------------------------------------------------
-have_kmod=no
-AC_ARG_ENABLE(kmod, AS_HELP_STRING([--disable-kmod], [disable loadable modules support]))
-if test "x$enable_kmod" != "xno"; then
- PKG_CHECK_EXISTS([ libkmod ], have_kmod=yes, have_kmod=no)
- if test "x$have_kmod" = "xyes"; then
- PKG_CHECK_MODULES(KMOD, [ libkmod >= 15 ],
- [AC_DEFINE(HAVE_KMOD, 1, [Define if kmod is available])],
- AC_MSG_ERROR([*** kmod version >= 15 not found]))
- fi
- if test "x$have_kmod" = xno -a "x$enable_kmod" = xyes; then
- AC_MSG_ERROR([*** kmod support requested, but libraries not found])
- fi
-fi
-AM_CONDITIONAL(HAVE_KMOD, [test "$have_kmod" = "yes"])
-
-# ------------------------------------------------------------------------------
have_xkbcommon=no
AC_ARG_ENABLE(xkbcommon, AS_HELP_STRING([--disable-xkbcommon], [disable xkbcommon keymap support]))
if test "x$enable_xkbcommon" != "xno"; then
@@ -1440,7 +1422,6 @@ AC_MSG_RESULT([
EFI libdir: ${EFI_LIB_DIR}
EFI ldsdir: ${EFI_LDS_DIR}
EFI includedir: ${EFI_INC_DIR}
- kmod: ${have_kmod}
xkbcommon: ${have_xkbcommon}
blkid: ${have_blkid}
dbus: ${have_dbus}
diff --git a/src/shared/build.h b/src/shared/build.h
index 653a505e68..720ab21fbe 100644
--- a/src/shared/build.h
+++ b/src/shared/build.h
@@ -111,12 +111,6 @@
#define _ELFUTILS_FEATURE_ "-ELFUTILS"
#endif
-#ifdef HAVE_KMOD
-#define _KMOD_FEATURE_ "+KMOD"
-#else
-#define _KMOD_FEATURE_ "-KMOD"
-#endif
-
#ifdef HAVE_LIBIDN
#define _IDN_FEATURE_ "+IDN"
#else
@@ -139,5 +133,4 @@
_SECCOMP_FEATURE_ " " \
_BLKID_FEATURE_ " " \
_ELFUTILS_FEATURE_ " " \
- _KMOD_FEATURE_ " " \
_IDN_FEATURE_