X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=configure.ac;h=492fa022429bf096c2b4415b805c51c8c86969d7;hp=e81d999d9ea637dc3d8ad611f01114a1927f06ed;hb=b3ad0c3c6fce3c04a2f3070200001d6566d1b322;hpb=181368a3b26329f77a93b06a5d2b285d4bf5f8e3

diff --git a/configure.ac b/configure.ac
index e81d999d9..492fa0224 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,12 +1,12 @@
-AC_INIT([udev], [143], [linux-hotplug@vger.kernel.org])
+AC_INIT([udev], [152], [linux-hotplug@vger.kernel.org])
 AC_PREREQ(2.60)
-AM_INIT_AUTOMAKE([check-news foreign 1.9 dist-bzip2])
+AM_INIT_AUTOMAKE([check-news foreign 1.10 dist-bzip2 subdir-objects])
+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
+LT_INIT
 AC_PROG_AWK
 GTK_DOC_CHECK(1.10)
 AC_PREFIX_DEFAULT([/usr])
@@ -15,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]),
@@ -51,6 +51,9 @@ AC_ARG_ENABLE([extras],
 	[], [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])
@@ -70,7 +73,7 @@ if test "x$enable_extras" = xyes; then
 	AC_CHECK_FILES([/usr/share/hwdata/pci.ids], [pciids=/usr/share/hwdata/pci.ids])
 	AC_CHECK_FILES([/usr/share/misc/pci.ids], [pciids=/usr/share/misc/pci.ids])
 	AC_ARG_WITH(pci-ids-path,
-		AS_HELP_STRING([--pci-ids-path=DIR], [Path to pci.ids file]),
+		AS_HELP_STRING([--with-pci-ids-path=DIR], [Path to pci.ids file]),
 		[PCI_DATABASE=${withval}],
 		[if test -n "$pciids" ; then
 			PCI_DATABASE="$pciids"
@@ -78,54 +81,36 @@ if test "x$enable_extras" = xyes; then
 			AC_MSG_ERROR([pci.ids not found, try --with-pci-ids-path=])
 		fi])
 	AC_SUBST(PCI_DATABASE)
+
+	AC_CHECK_HEADER([linux/input.h], [:], AC_MSG_ERROR([kernel headers not found]))
+	AC_SUBST([INCLUDE_PREFIX], [$(echo '#include <linux/input.h>' | eval $ac_cpp -E - | sed -n '/linux\/input.h/ {s:.*"\(.*\)/linux/input.h".*:\1:; p; q}')])
 fi
 AM_CONDITIONAL([ENABLE_EXTRAS], [test "x$enable_extras" = xyes])
 
 AC_ARG_ENABLE([introspection],
-	AS_HELP_STRING([--enable-introspection], [enable GObject introspection]),
-	[], [enable_introspection=no])
+	AS_HELP_STRING([--disable-introspection], [disable GObject introspection]),
+	[], [enable_introspection=yes])
 if test "x$enable_introspection" = xyes; then
 	PKG_CHECK_MODULES([INTROSPECTION], [gobject-introspection-1.0 >= 0.6.2])
 	AC_DEFINE([ENABLE_INTROSPECTION], [1], [enable GObject introspection support])
 	AC_SUBST([G_IR_SCANNER], [$($PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0)])
 	AC_SUBST([G_IR_COMPILER], [$($PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0)])
 	AC_SUBST([G_IR_GENERATE], [$($PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0)])
-	AC_SUBST([GIRDIR], [$($PKG_CONFIG --variable=girdir gobject-introspection-1.0)])
-	AC_SUBST([GIRTYPELIBDIR], [$($PKG_CONFIG --variable=typelibdir gobject-introspection-1.0)])
+	AC_SUBST([GIRDIR], [$($PKG_CONFIG --define-variable=datadir=${datadir} --variable=girdir gobject-introspection-1.0)])
+	AC_SUBST([GIRTYPELIBDIR], [$($PKG_CONFIG --define-variable=libdir=${libdir} --variable=typelibdir gobject-introspection-1.0)])
 fi
 AM_CONDITIONAL([ENABLE_INTROSPECTION], [test "x$enable_introspection" = xyes])
 
 AC_CONFIG_HEADERS(config.h)
 AC_CONFIG_FILES([
 	Makefile
-	libudev/Makefile
 	libudev/libudev.pc
 	libudev/docs/Makefile
 	libudev/docs/version.xml
-	udev/Makefile
-	rules/Makefile
-	extras/Makefile
-	extras/ata_id/Makefile
-	extras/cdrom_id/Makefile
-	extras/edd_id/Makefile
-	extras/path_id/Makefile
-	extras/firmware/Makefile
-	extras/collect/Makefile
-	extras/floppy/Makefile
-	extras/fstab_import/Makefile
-	extras/rule_generator/Makefile
-	extras/scsi_id/Makefile
-	extras/usb_id/Makefile
-	extras/v4l_id/Makefile
-	extras/hid2hci/Makefile
-	extras/udev-acl/Makefile
-	extras/usb-db/Makefile
-	extras/gudev/Makefile
+	udev/udev.pc
 	extras/gudev/gudev-1.0.pc
 	extras/gudev/docs/Makefile
 	extras/gudev/docs/version.xml
-	extras/keymap/Makefile
-	extras/modem-modeswitch/Makefile
 ])
 
 AC_OUTPUT
@@ -137,13 +122,15 @@ AC_MSG_RESULT([
 	sysconfdir:		${sysconfdir}
 	sbindir:		${sbindir}
 	libdir:			${libdir}
-	rootlibdir:		${rootlibdir}
+	rootlibdir:		${rootlib_execdir}
 	libexecdir:		${libexecdir}
 
 	datarootdir:		${datarootdir}
 	mandir:			${mandir}
 	includedir:		${includedir}
 
+	include_prefix:		${INCLUDE_PREFIX}
+
 	logging:		${enable_logging}
 	debug:			${enable_debug}
 	selinux:		${with_selinux}