X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=configure.ac;h=d53dd12a6c5ad3d7164e4d285eca0c62cdb62e41;hp=e5642f6b13390ecdcf4210f5f283e0f8a16a5621;hb=fc8d61c53d6c181dc1e9f5a23c0f805c32a392af;hpb=95023c77fc476355c2485ca1cce7b3e2b9619b68

diff --git a/configure.ac b/configure.ac
index e5642f6b1..d53dd12a6 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]),
@@ -81,56 +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
-	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
-	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
 	extras/gudev/gudev-1.0.pc
 	extras/gudev/docs/Makefile
 	extras/gudev/docs/version.xml
-	extras/keymap/Makefile
-	extras/modem-modeswitch/Makefile
 ])
 
 AC_OUTPUT
@@ -142,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}