X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=configure.ac;h=4ba9964cbdc21df096294d712e796e835d8b01a5;hb=ad29a9f14fa8b1932c0e418bfcf1c10ce6a35a33;hp=497a74fc0af188fbc6b56e09914f2024bfce20cc;hpb=3cf5266b029c1ec4522edc6b42d874d80407a246;p=elogind.git

diff --git a/configure.ac b/configure.ac
index 497a74fc0..4ba9964cb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ AC_INIT([udev],
 	[linux-hotplug@vger.kernel.org],
 	[udev],
 	[http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html])
-AC_CONFIG_SRCDIR([udev/udevd.c])
+AC_CONFIG_SRCDIR([src/udevd.c])
 AC_CONFIG_AUX_DIR([build-aux])
 AM_INIT_AUTOMAKE([check-news foreign 1.11 -Wall -Wno-portability silent-rules tar-pax no-dist-gzip dist-xz subdir-objects])
 AC_USE_SYSTEM_EXTENSIONS
@@ -23,7 +23,7 @@ AC_SEARCH_LIBS([clock_gettime], [rt], [], [AC_MSG_ERROR([POSIX RT library not fo
 
 PKG_CHECK_MODULES(BLKID, blkid >= 2.20)
 
-PKG_CHECK_MODULES(KMOD, libkmod >= 2)
+PKG_CHECK_MODULES(KMOD, libkmod >= 3)
 
 if test "x$cross_compiling" = "xno" ; then
 	AC_CHECK_FILES([/usr/share/pci.ids], [pciids=/usr/share/pci.ids])
@@ -58,7 +58,7 @@ AC_SUBST(PCI_DATABASE)
 
 AC_ARG_WITH([rootprefix],
 	AS_HELP_STRING([--with-rootprefix=DIR], [rootfs directory prefix for config files and kernel modules]),
-	[], [with_rootprefix=$prefix])
+	[], [with_rootprefix=${ac_default_prefix}])
 AC_SUBST([rootprefix], [$with_rootprefix])
 
 AC_ARG_WITH([rootlibdir],
@@ -210,10 +210,10 @@ AC_SUBST([my_CFLAGS])
 AC_CONFIG_HEADERS(config.h)
 AC_CONFIG_FILES([
 	Makefile
-	libudev/docs/Makefile
-	libudev/docs/version.xml
-	extras/gudev/docs/Makefile
-	extras/gudev/docs/version.xml
+	src/docs/Makefile
+	src/docs/version.xml
+	src/extras/gudev/docs/Makefile
+	src/extras/gudev/docs/version.xml
 ])
 
 AC_OUTPUT