X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=configure.ac;h=81233bf29b18518d88ddad96241dc0d19e9acacc;hp=960a552e8701a66c7f4bda823931a419346c2e6b;hb=52934a60c447ae78873b07a01b7fa25e60c86fe4;hpb=c5a9680ee7cddac4b7a7d05447209dcd5a4cfce3 diff --git a/configure.ac b/configure.ac index 960a552e8..81233bf29 100644 --- a/configure.ac +++ b/configure.ac @@ -1,37 +1,25 @@ -AC_INIT([udev], - [143], - [linux-hotplug@vger.kernel.org]) +AC_INIT([udev], [157], [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) - -dnl /* prefix is /usr, exec_prefix is /, if overridden exec_prefix follows prefix */ AC_PREFIX_DEFAULT([/usr]) -test "$prefix" = NONE && test "$exec_prefix" = NONE && exec_prefix= - AC_PATH_PROG([XSLTPROC], [xsltproc]) -AC_ARG_WITH(udev-prefix, - AS_HELP_STRING([--with-udev-prefix=DIR], [add prefix to internal udev path names]), - [], [with_udev_prefix='${exec_prefix}']) -udev_prefix=$with_udev_prefix -AC_SUBST(udev_prefix) - -AC_ARG_WITH(libdir-name, - AS_HELP_STRING([--with-libdir-name=DIR], [name of the arch lib directory]), - [], [with_libdir_name=lib]) -libdir_name=$with_libdir_name -AC_SUBST(libdir_name) +AC_ARG_WITH([rootlibdir], + AS_HELP_STRING([--with-rootlibdir=DIR], [rootfs directory to install shared libraries]), + [], [with_rootlibdir=$libdir]) +AC_SUBST([rootlib_execdir], [$with_rootlibdir]) -AC_ARG_WITH(selinux, +AC_ARG_WITH([selinux], AS_HELP_STRING([--with-selinux], [enable SELinux support]), - [], with_selinux=no) + [], [with_selinux=no]) if test "x$with_selinux" = xyes; then LIBS_save=$LIBS AC_CHECK_LIB(selinux, getprevcon, @@ -44,71 +32,100 @@ fi AC_SUBST([SELINUX_LIBS]) AM_CONDITIONAL(WITH_SELINUX, [test "x$with_selinux" = xyes]) -AC_ARG_ENABLE(debug, +AC_ARG_ENABLE([debug], AS_HELP_STRING([--enable-debug], [enable debug messages]), - [], enable_debug=no) + [], [enable_debug=no]) if test "x$enable_debug" = "xyes"; then AC_DEFINE(ENABLE_DEBUG, [1], [Debug messages.]) fi -AC_ARG_ENABLE(logging, +AC_ARG_ENABLE([logging], AS_HELP_STRING([--disable-logging], [disable system logging]), [], enable_logging=yes) if test "x$enable_logging" = "xyes"; then AC_DEFINE(ENABLE_LOGGING, [1], [System logging.]) fi +AC_ARG_WITH(firmware-path, + AS_HELP_STRING([--with-firmware-path=DIR[[[:DIR[...]]]]], + [Firmware search path (default=/lib/firmware/updates:/lib/firmware)]), + [], [with_firmware_path="/lib/firmware/updates:/lib/firmware"] + ) +OLD_IFS=$IFS +IFS=: +for i in $with_firmware_path +do + if test "x${FIRMWARE_PATH}" = "x"; then + FIRMWARE_PATH="\\\"${i}/\\\"" + else + FIRMWARE_PATH="${FIRMWARE_PATH}, \\\"${i}/\\\"" + fi +done +IFS=$OLD_IFS +AC_SUBST([FIRMWARE_PATH], [$FIRMWARE_PATH]) + AC_ARG_ENABLE([extras], - AS_HELP_STRING([--enable-extras], [enable extras with external dependencies]), - [], [enable_extras=no]) + 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]) AC_CHECK_LIB([acl], [acl_init], [:], AC_MSG_ERROR([libacl not found])) AC_CHECK_HEADER([acl/libacl.h], [:], AC_MSG_ERROR([libacl header not found])) + + PKG_CHECK_MODULES(LIBUSB, libusb >= 0.1.12) + AC_SUBST(LIBUSB_CFLAGS) + AC_SUBST(LIBUSB_LIBS) + + PKG_CHECK_MODULES(USBUTILS, usbutils >= 0.82) + AC_SUBST([USB_DATABASE], [$($PKG_CONFIG --variable=usbids usbutils)]) + + AC_CHECK_FILES([/usr/share/pci.ids], [pciids=/usr/share/pci.ids]) + 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([--with-pci-ids-path=DIR], [Path to pci.ids file]), + [PCI_DATABASE=${withval}], + [if test -n "$pciids" ; then + PCI_DATABASE="$pciids" + else + 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 ' | 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]) -if test "$enable_introspection" = xyes; then + 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/udev-acl/Makefile - extras/gudev/Makefile + udev/udev.pc extras/gudev/gudev-1.0.pc extras/gudev/docs/Makefile extras/gudev/docs/version.xml @@ -120,14 +137,18 @@ AC_MSG_RESULT([ ======== prefix: ${prefix} - exec_prefix: ${exec_prefix} - udev_prefix: ${udev_prefix} + sysconfdir: ${sysconfdir} + sbindir: ${sbindir} libdir: ${libdir} - libdir_name: ${libdir_name} + rootlibdir: ${rootlib_execdir} + libexecdir: ${libexecdir} + datarootdir: ${datarootdir} mandir: ${mandir} includedir: ${includedir} + include_prefix: ${INCLUDE_PREFIX} + logging: ${enable_logging} debug: ${enable_debug} selinux: ${with_selinux} @@ -139,5 +160,10 @@ AC_MSG_RESULT([ extras: ${enable_extras} gintrospection: ${enable_introspection} + usb.ids: ${USB_DATABASE} + pci.ids: ${PCI_DATABASE} + firmware path: ${FIRMWARE_PATH} + xsltproc: ${XSLTPROC} + gperf: ${GPERF} ])