X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=configure.ac;h=bba82ee7bd1b5ecf973323e16098f19de61d5f16;hp=bcc3554ac8d3e094930cf68d80dd4f2ee8d44f4c;hb=514b8d62123e3d63f2b935aa1d58e5c411f3f603;hpb=55eb845c28129baf732a6c1ce5afbc3f7cca9593 diff --git a/configure.ac b/configure.ac index bcc3554ac..bba82ee7b 100644 --- a/configure.ac +++ b/configure.ac @@ -1,36 +1,22 @@ AC_INIT([udev], - [128], - [kay.sievers@vrfy.org]) + [143], + [linux-hotplug@vger.kernel.org]) AC_PREREQ(2.60) -AC_CONFIG_SRCDIR([udev/udevd.c]) AM_INIT_AUTOMAKE([check-news foreign 1.9 dist-bzip2]) -AC_GNU_SOURCE AC_DISABLE_STATIC +AC_USE_SYSTEM_EXTENSIONS +dnl AM_SILENT_RULES AC_SYS_LARGEFILE +AC_CONFIG_MACRO_DIR([m4]) AC_PROG_LIBTOOL +GTK_DOC_CHECK(1.10) -dnl /* libudev version */ -LIBUDEV_LT_CURRENT=0 -LIBUDEV_LT_REVISION=1 -LIBUDEV_LT_AGE=0 -AC_SUBST(LIBUDEV_LT_CURRENT) -AC_SUBST(LIBUDEV_LT_REVISION) -AC_SUBST(LIBUDEV_LT_AGE) - -dnl /* libvolume_id version */ -VOLID_LT_CURRENT=1 -VOLID_LT_REVISION=1 -VOLID_LT_AGE=0 -AC_SUBST(VOLID_LT_CURRENT) -AC_SUBST(VOLID_LT_REVISION) -AC_SUBST(VOLID_LT_AGE) +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_CHECK_LIB(c, inotify_init, - [AC_DEFINE([HAVE_INOTIFY], 1, [inotify available])], - [AC_MSG_WARN([inotify support disabled])]) - AC_ARG_WITH(udev-prefix, AS_HELP_STRING([--with-udev-prefix=DIR], [add prefix to internal udev path names]), [], [with_udev_prefix='${exec_prefix}']) @@ -44,7 +30,7 @@ libdir_name=$with_libdir_name AC_SUBST(libdir_name) AC_ARG_WITH(selinux, - AS_HELP_STRING([--with-selinux], [compile with SELinux support]), + AS_HELP_STRING([--with-selinux], [enable SELinux support]), [], with_selinux=no) if test "x$with_selinux" = xyes; then LIBS_save=$LIBS @@ -52,34 +38,81 @@ if test "x$with_selinux" = xyes; then [], AC_MSG_ERROR([SELinux selected but libselinux not found])) LIBS=$LIBS_save - AC_DEFINE(USE_SELINUX, [1] ,[compile with SELinux support]) - SELINUX_LIBS="-lselinux" + SELINUX_LIBS="-lselinux -lsepol" + AC_DEFINE(WITH_SELINUX, [1] ,[SELinux support.]) fi AC_SUBST([SELINUX_LIBS]) -AM_CONDITIONAL(USE_SELINUX, [test "x$with_selinux" = xyes], [compile with SELinux support]) +AM_CONDITIONAL(WITH_SELINUX, [test "x$with_selinux" = xyes]) AC_ARG_ENABLE(debug, - AS_HELP_STRING([--enable-debug], [turn on debugging]), + AS_HELP_STRING([--enable-debug], [enable debug messages]), [], enable_debug=no) if test "x$enable_debug" = "xyes"; then - AC_DEFINE(DEBUG, [1] ,[Compile in debug messages]) - DEBUG_CFLAGS="-DDEBUG" + AC_DEFINE(ENABLE_DEBUG, [1], [Debug messages.]) fi -AC_SUBST(DEBUG_CFLAGS) AC_ARG_ENABLE(logging, - AS_HELP_STRING([--disable-logging], [turn off logging/syslog]), + AS_HELP_STRING([--disable-logging], [disable system logging]), [], enable_logging=yes) -if test "x$enable_logging" != "xno"; then - AC_DEFINE(USE_LOG, [1] ,[Use logging/syslog]) +if test "x$enable_logging" = "xyes"; then + AC_DEFINE(ENABLE_LOGGING, [1], [System logging.]) +fi + +AC_ARG_ENABLE([extras], + AS_HELP_STRING([--disable-extras], [disable extras with external dependencies]), + [], [enable_extras=yes]) +if test "x$enable_extras" = xyes; then + 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([--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) 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 "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)]) +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 - udev/lib/Makefile - udev/lib/libudev.pc rules/Makefile extras/Makefile extras/ata_id/Makefile @@ -93,19 +126,25 @@ AC_CONFIG_FILES([ extras/rule_generator/Makefile extras/scsi_id/Makefile extras/usb_id/Makefile - extras/volume_id/Makefile - extras/volume_id/lib/Makefile - extras/volume_id/lib/libvolume_id.pc + 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 ]) -AC_OUTPUT -echo " +AC_OUTPUT +AC_MSG_RESULT([ udev $VERSION ======== prefix: ${prefix} exec_prefix: ${exec_prefix} udev_prefix: ${udev_prefix} + libdir: ${libdir} libdir_name: ${libdir_name} datarootdir: ${datarootdir} mandir: ${mandir} @@ -119,5 +158,11 @@ echo " cflags: ${CFLAGS} ldflags: ${LDFLAGS} + extras: ${enable_extras} + gintrospection: ${enable_introspection} + + usb.ids: ${USB_DATABASE} + pci.ids: ${PCI_DATABASE} + xsltproc: ${XSLTPROC} -" +])