X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=configure.ac;h=d4fb4e19a0eb8255431628f50e794cad95581845;hb=fc206fbe3e326f5acfc64243f9e04eecad121e27;hp=c73872e1ac46fe82b7204bb0404a8af433a5b548;hpb=6133f3432fe86bc140cc9ba74794826f75c915fa;p=elogind.git

diff --git a/configure.ac b/configure.ac
index c73872e1a..d4fb4e19a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,12 +1,13 @@
-AC_INIT([udev], [143], [linux-hotplug@vger.kernel.org])
+AC_INIT([udev], [146], [linux-hotplug@vger.kernel.org])
 AC_PREREQ(2.60)
 AM_INIT_AUTOMAKE([check-news foreign 1.9 dist-bzip2])
+m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
 AC_DISABLE_STATIC
 AC_USE_SYSTEM_EXTENSIONS
-dnl AM_SILENT_RULES
 AC_SYS_LARGEFILE
 AC_CONFIG_MACRO_DIR([m4])
 AC_PROG_LIBTOOL
+AC_PROG_AWK
 GTK_DOC_CHECK(1.10)
 AC_PREFIX_DEFAULT([/usr])
 AC_PATH_PROG([XSLTPROC], [xsltproc])
@@ -14,7 +15,7 @@ AC_PATH_PROG([XSLTPROC], [xsltproc])
 AC_ARG_WITH([rootlibdir],
 	AS_HELP_STRING([--with-rootlibdir=DIR], [rootfs directory to install shared libraries]),
 	[], [with_rootlibdir=$libdir])
-AC_SUBST([rootlibdir], [$with_rootlibdir])
+AC_SUBST([rootlib_execdir], [$with_rootlibdir])
 
 AC_ARG_WITH([selinux],
 	AS_HELP_STRING([--with-selinux], [enable SELinux support]),
@@ -49,6 +50,11 @@ AC_ARG_ENABLE([extras],
 	AS_HELP_STRING([--disable-extras], [disable extras with external dependencies]),
 	[], [enable_extras=yes])
 if test "x$enable_extras" = xyes; then
+	AC_PATH_PROG([GPERF], [gperf])
+	if test -z "$GPERF"; then
+		AC_MSG_ERROR([gperf is needed])
+	fi
+
 	PKG_CHECK_MODULES([GLIB], [glib-2.0 >= 2.7.0 gobject-2.0 >= 2.7.0])
 	AC_SUBST([GLIB_CFLAGS])
 	AC_SUBST([GLIB_LIBS])
@@ -95,11 +101,13 @@ AM_CONDITIONAL([ENABLE_INTROSPECTION], [test "x$enable_introspection" = xyes])
 AC_CONFIG_HEADERS(config.h)
 AC_CONFIG_FILES([
 	Makefile
+	docs/Makefile
 	libudev/Makefile
 	libudev/libudev.pc
 	libudev/docs/Makefile
 	libudev/docs/version.xml
 	udev/Makefile
+	udev/udev.pc
 	rules/Makefile
 	extras/Makefile
 	extras/ata_id/Makefile
@@ -121,6 +129,8 @@ AC_CONFIG_FILES([
 	extras/gudev/gudev-1.0.pc
 	extras/gudev/docs/Makefile
 	extras/gudev/docs/version.xml
+	extras/keymap/Makefile
+	extras/modem-modeswitch/Makefile
 ])
 
 AC_OUTPUT
@@ -132,7 +142,7 @@ AC_MSG_RESULT([
 	sysconfdir:		${sysconfdir}
 	sbindir:		${sbindir}
 	libdir:			${libdir}
-	rootlibdir:		${rootlibdir}
+	rootlibdir:		${rootlib_execdir}
 	libexecdir:		${libexecdir}
 
 	datarootdir:		${datarootdir}
@@ -154,4 +164,5 @@ AC_MSG_RESULT([
 	pci.ids:		${PCI_DATABASE}
 
 	xsltproc:		${XSLTPROC}
+	gperf:			${GPERF}
 ])