diff options
| author | Anthony G. Basile <blueness@gentoo.org> | 2013-07-31 10:46:49 -0400 |
|---|---|---|
| committer | Anthony G. Basile <blueness@gentoo.org> | 2013-07-31 10:46:49 -0400 |
| commit | aa417a4d83999f6d7f092161d5c411b8cbce9977 (patch) | |
| tree | a3c0da66e997c079d3803c2c72293bbdc73f2ece /configure.ac | |
| parent | ccc30166822f4597ceba3e3b62c09b8f091b9cbb (diff) | |
static-nodes: remove creation of static nodes if HAVE_LIBKMOD
This address upstream commit edeb68c53f1cdc452016b4c8512586a70b1262e3
and https://bugs.gentoo.org/show_bug.cgi?id=477890. If eudev is
configured with --enable-libkmod then we check for kmod >= 14 and
ifdef out the code removed in the upstream commit. Otherwise we
retain it for modutils.
Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac index 52e241fa70..1fe801411c 100644 --- a/configure.ac +++ b/configure.ac @@ -1,7 +1,7 @@ AC_PREREQ([2.68]) AC_INIT([eudev],[1.2],[https://github.com/gentoo/eudev/issues]) -AC_SUBST(UDEV_VERSION, 205) +AC_SUBST(UDEV_VERSION, 206) AC_CONFIG_SRCDIR([src/udev/udevd.c]) AC_USE_SYSTEM_EXTENSIONS @@ -267,10 +267,10 @@ if test "x${enable_modules}" = xyes; then AS_IF([test "x${enable_libkmod}" = xyes], [AC_CHECK_LIB([kmod], [main], - [PKG_CHECK_MODULES(KMOD, [libkmod >= 5]) + [PKG_CHECK_MODULES(KMOD, [libkmod >= 14]) AC_SUBST([LIBKMOD], ["-lkmod"]) AC_DEFINE([HAVE_LIBKMOD], [1], - [Define if you have libkmod]) + [AC_MSG_ERROR([*** kmod version >= 14 not found])]) ], [AC_MSG_FAILURE( [--enable-libkmod was given, but test for kmod failed])], @@ -281,7 +281,6 @@ fi AM_CONDITIONAL([HAVE_MODULES], [test "x${enable_modules}" = xyes]) AM_CONDITIONAL([HAVE_LIBKMOD], [test "x${enable_libkmod}" = xyes]) - # ------------------------------------------------------------------------------ AC_ARG_WITH([modprobe], |