GNOME.org
 

[jhbuild] core-deps-3.4: Update gudev to a new modern version

commit 8b6a7e569c43896ad98b905928eaf2f7d95cf83a
Author: Javier JardÃn <jjardon gnome org>
Date:   Mon Feb 13 16:11:23 2012 +0000

    core-deps-3.4: Update gudev to a new modern version
    
    A new version is needed for gnome-boxes, but use 173 as Its the version
    available on latest stable version of major linux distros

 modulesets/gnome-suites-core-deps-3.4.modules |    9 +-
 patches/gudev-173.patch                       |  511 +++++++++++++++++++++++++
 2 files changed, 517 insertions(+), 3 deletions(-)
---
diff --git a/modulesets/gnome-suites-core-deps-3.4.modules b/modulesets/gnome-suites-core-deps-3.4.modules
index 27a7abe..82caa93 100644
--- a/modulesets/gnome-suites-core-deps-3.4.modules
+++ b/modulesets/gnome-suites-core-deps-3.4.modules
@@ -613,9 +613,12 @@
   <autotools id="gudev" check-target="false" supports-non-srcdir-builds="no"
              autogen-sh="autogen.sh">
     <pkg-config>gudev-1.0.pc</pkg-config>
-    <branch checkoutdir="gudev-147" repo="fedoraproject.org"
-            module="udev/udev-147.tar.bz2/aed0129c5a00e01d1be75ffda7d2e0f1/udev-147.tar.bz2" version="147">
-      <patch file="gudev-147.patch" strip="1"/>
+    <branch repo="fedoraproject.org"
+            module="udev/udev-173.tar.bz2/91a88a359b60bbd074b024883cc0dbde/udev-173.tar.bz2"
+            version="173"
+            hash="70a18315a12f8fc1131f7da5b4dae3606988b69d5c08f96f443b84b8486caaaf"
+            size="608027">
+      <patch file="gudev-173.patch" strip="1"/>
     </branch>
     <dependencies>
       <dep package="gobject-introspection"/>
diff --git a/patches/gudev-173.patch b/patches/gudev-173.patch
new file mode 100644
index 0000000..bbd7c60
--- /dev/null
+++ b/patches/gudev-173.patch
@@ -0,0 +1,511 @@
+diff --git a/Makefile.am b/Makefile.am
+index a0c007a..cef6585 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -7,7 +7,7 @@ SUBDIRS = .
+ 
+ EXTRA_DIST = autogen.sh
+ 
+-ACLOCAL_AMFLAGS = -I m4
++ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
+ 
+ AM_MAKEFLAGS = --no-print-directory
+ 
+@@ -38,274 +38,9 @@ UNINSTALL_EXEC_HOOKS =
+ DISTCHECK_HOOKS =
+ dist_libexec_SCRIPTS =
+ 
+-# ------------------------------------------------------------------------------
+-# libudev
+-# ------------------------------------------------------------------------------
+-LIBUDEV_CURRENT=12
+-LIBUDEV_REVISION=0
+-LIBUDEV_AGE=12
+-
+-SUBDIRS += libudev/docs
+-
+-include_HEADERS = libudev/libudev.h
+-lib_LTLIBRARIES = libudev/libudev.la
+-
+-libudev_libudev_la_SOURCES =\
+-	libudev/libudev-private.h \
+-	libudev/libudev.c \
+-	libudev/libudev-list.c \
+-	libudev/libudev-util.c \
+-	libudev/libudev-device.c \
+-	libudev/libudev-enumerate.c \
+-	libudev/libudev-monitor.c \
+-	libudev/libudev-queue.c
+-
+-libudev_libudev_la_LDFLAGS = \
+-	-version-info $(LIBUDEV_CURRENT):$(LIBUDEV_REVISION):$(LIBUDEV_AGE)
+-
+-noinst_LTLIBRARIES = \
+-	libudev/libudev-private.la
+-
+-libudev_libudev_private_la_SOURCES =\
+-	$(libudev_libudev_la_SOURCES) \
+-	libudev/libudev-util-private.c \
+-	libudev/libudev-device-private.c \
+-	libudev/libudev-queue-private.c
+-
+-if WITH_SELINUX
+-libudev_libudev_private_la_SOURCES += libudev/libudev-selinux-private.c
+-libudev_libudev_private_la_LIBADD = $(SELINUX_LIBS)
+-endif
+-
++lib_LTLIBRARIES =
+ pkgconfigdir = $(libdir)/pkgconfig
+-pkgconfig_DATA = libudev/libudev.pc
+-
+-EXTRA_DIST += libudev/COPYING
+-# move lib from $(libdir) to $(rootlib_execdir) and update devel link, if needed
+-libudev-install-move-hook:
+-	if test "$(libdir)" != "$(rootlib_execdir)"; then \
+-		mkdir -p $(DESTDIR)$(rootlib_execdir) && \
+-		so_img_name=$$(readlink $(DESTDIR)$(libdir)/libudev.so) && \
+-		so_img_rel_target_prefix=$$(echo $(libdir) | sed 's,\(^/\|\)[^/][^/]*,..,g') && \
+-		ln -sf $$so_img_rel_target_prefix$(rootlib_execdir)/$$so_img_name $(DESTDIR)$(libdir)/libudev.so && \
+-		mv $(DESTDIR)$(libdir)/libudev.so.* $(DESTDIR)$(rootlib_execdir); \
+-	fi
+-
+-libudev-uninstall-move-hook:
+-	rm -f $(DESTDIR)$(rootlib_execdir)/libudev.so*
+-
+-INSTALL_EXEC_HOOKS += libudev-install-move-hook
+-UNINSTALL_EXEC_HOOKS += libudev-uninstall-move-hook
+-
+-# ------------------------------------------------------------------------------
+-# main udev
+-# ------------------------------------------------------------------------------
+-udev-confdirs:
+-	-mkdir -p $(DESTDIR)$(sysconfdir)/udev/rules.d
+-	-mkdir -p $(DESTDIR)$(libexecdir)/devices
+-
+-INSTALL_DATA_HOOKS += udev-confdirs
+-
+-EXTRA_DIST += \
+-	rules/arch \
+-	rules/misc
+-
+-udevrulesdir = $(libexecdir)/rules.d
+-dist_udevrules_DATA = \
+-	rules/rules.d/50-udev-default.rules \
+-	rules/rules.d/60-persistent-storage.rules \
+-	rules/rules.d/60-persistent-storage-tape.rules \
+-	rules/rules.d/60-persistent-serial.rules \
+-	rules/rules.d/60-persistent-input.rules \
+-	rules/rules.d/60-persistent-alsa.rules \
+-	rules/rules.d/80-drivers.rules \
+-	rules/rules.d/95-udev-late.rules
+-
+-udevconfdir = $(sysconfdir)/udev
+-dist_udevconf_DATA = udev.conf
+-
+-sharepkgconfigdir = $(datadir)/pkgconfig
+-sharepkgconfig_DATA = udev/udev.pc
+-
+-if WITH_SYSTEMD
+-systemdsystemunit_DATA = \
+-	init/udev-control.socket \
+-	init/udev-kernel.socket \
+-	init/udev.service \
+-	init/udev-trigger.service \
+-	init/udev-settle.service
+-
+-EXTRA_DIST += \
+-	init/udev-control.socket \
+-	init/udev-kernel.socket
+-
+-systemd-install-hook:
+-	mkdir -p $(DESTDIR)$(systemdsystemunitdir)/sockets.target.wants
+-	ln -sf ../udev-control.socket $(DESTDIR)$(systemdsystemunitdir)/sockets.target.wants/udev-control.socket
+-	ln -sf ../udev-kernel.socket $(DESTDIR)$(systemdsystemunitdir)/sockets.target.wants/udev-kernel.socket
+-	mkdir -p $(DESTDIR)$(systemdsystemunitdir)/basic.target.wants
+-	ln -sf ../udev.service $(DESTDIR)$(systemdsystemunitdir)/basic.target.wants/udev.service
+-	ln -sf ../udev-trigger.service $(DESTDIR)$(systemdsystemunitdir)/basic.target.wants/udev-trigger.service
+-
+-INSTALL_DATA_HOOKS += systemd-install-hook
+-endif
+-
+-sbin_PROGRAMS = \
+-	udev/udevd \
+-	udev/udevadm
+-
+-udev_common_sources =\
+-	udev/udev.h \
+-	udev/udev-event.c \
+-	udev/udev-watch.c \
+-	udev/udev-node.c \
+-	udev/udev-rules.c \
+-	udev/udev-ctrl.c
+-
+-udev_udevd_SOURCES = \
+-	$(udev_common_sources) \
+-	udev/udevd.c \
+-	udev/sd-daemon.h \
+-	udev/sd-daemon.c
+-udev_udevd_LDADD = libudev/libudev-private.la
+-
+-udev_udevadm_SOURCES = \
+-	$(udev_common_sources) \
+-	udev/udevadm.c \
+-	udev/udevadm-info.c \
+-	udev/udevadm-control.c \
+-	udev/udevadm-test.c \
+-	udev/udevadm-monitor.c \
+-	udev/udevadm-settle.c \
+-	udev/udevadm-trigger.c
+-udev_udevadm_LDADD = libudev/libudev-private.la
+-
+-# ------------------------------------------------------------------------------
+-# udev man pages
+-# ------------------------------------------------------------------------------
+-dist_man_MANS = \
+-	udev/udev.7 \
+-	udev/udevadm.8 \
+-	udev/udevd.8
+-
+-dist_noinst_DATA = \
+-	udev/udev.html \
+-	udev/udevadm.html \
+-	udev/udevd.html
+-
+-EXTRA_DIST += \
+-	udev/udev.xml \
+-	udev/udevadm.xml \
+-	udev/udevd.xml
+-
+-udev/%.7 udev/%.8 : udev/%.xml
+-	$(AM_V_GEN)$(XSLTPROC) -o $@ -nonet http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $<
+-
+-udev/%.html : udev/%.xml
+-	$(AM_V_GEN)$(XSLTPROC) -o $@ -nonet http://docbook.sourceforge.net/release/xsl/current/xhtml-1_1/docbook.xsl $<
+-
+-# ------------------------------------------------------------------------------
+-# udev tests
+-# ------------------------------------------------------------------------------
+-TESTS = test/udev-test.pl test/rules-test.sh
+-
+-check_PROGRAMS = \
+-	libudev/test-libudev \
+-	udev/test-udev
+-
+-libudev_test_libudev_SOURCES = libudev/test-libudev.c
+-libudev_test_libudev_LDADD = libudev/libudev.la
+-
+-udev_test_udev_SOURCES = \
+-	$(udev_common_sources) \
+-	udev/test-udev.c
+-udev_test_udev_LDADD = libudev/libudev-private.la
+-
+-# ------------------------------------------------------------------------------
+-# firmware - firmware loading
+-# ------------------------------------------------------------------------------
+-extras_firmware_firmware_SOURCES = extras/firmware/firmware.c
+-extras_firmware_firmware_LDADD = libudev/libudev-private.la
+-extras_firmware_firmware_CPPFLAGS = $(AM_CPPFLAGS) -DFIRMWARE_PATH="$(FIRMWARE_PATH)"
+-dist_udevrules_DATA += extras/firmware/50-firmware.rules
+-libexec_PROGRAMS = extras/firmware/firmware
+-
+-# ------------------------------------------------------------------------------
+-# ata_id - ATA identify
+-# ------------------------------------------------------------------------------
+-extras_ata_id_ata_id_SOURCES = extras/ata_id/ata_id.c
+-extras_ata_id_ata_id_LDADD = libudev/libudev-private.la
+-libexec_PROGRAMS += extras/ata_id/ata_id
+-
+-# ------------------------------------------------------------------------------
+-# cdrom_id - optical drive/media capability
+-# ------------------------------------------------------------------------------
+-extras_cdrom_id_cdrom_id_SOURCES = extras/cdrom_id/cdrom_id.c
+-extras_cdrom_id_cdrom_id_LDADD = libudev/libudev-private.la
+-libexec_PROGRAMS += extras/cdrom_id/cdrom_id
+-dist_udevrules_DATA += extras/cdrom_id/60-cdrom_id.rules
+-
+-# ------------------------------------------------------------------------------
+-# collect - trigger action when a collection of devices appeared
+-# ------------------------------------------------------------------------------
+-extras_collect_collect_SOURCES = extras/collect/collect.c
+-extras_collect_collect_LDADD = libudev/libudev-private.la
+-libexec_PROGRAMS += extras/collect/collect
+-
+-# ------------------------------------------------------------------------------
+-# input_id - import input device class
+-# ------------------------------------------------------------------------------
+-extras_input_id_input_id_SOURCES = extras/input_id/input_id.c
+-extras_input_id_input_id_LDADD = libudev/libudev-private.la
+-libexec_PROGRAMS += extras/input_id/input_id
+-
+-# ------------------------------------------------------------------------------
+-# path_id - compose identifier of persistent elements of the parent buses
+-# ------------------------------------------------------------------------------
+-extras_path_id_path_id_SOURCES = extras/path_id/path_id.c
+-extras_path_id_path_id_LDADD = libudev/libudev-private.la
+-libexec_PROGRAMS += extras/path_id/path_id
+-
+-# ------------------------------------------------------------------------------
+-# scsi_id - SCSI inquiry to get various serial numbers
+-# ------------------------------------------------------------------------------
+-extras_scsi_id_scsi_id_SOURCES =\
+-	extras/scsi_id/scsi_id.c \
+-	extras/scsi_id/scsi_serial.c \
+-	extras/scsi_id/scsi.h \
+-	extras/scsi_id/scsi_id.h
+-extras_scsi_id_scsi_id_LDADD = libudev/libudev-private.la
+-libexec_PROGRAMS += extras/scsi_id/scsi_id
+-dist_man_MANS += extras/scsi_id/scsi_id.8
+-EXTRA_DIST += extras/scsi_id/README
+-
+-# ------------------------------------------------------------------------------
+-# usb_id - USB device property import
+-# ------------------------------------------------------------------------------
+-extras_usb_id_usb_id_SOURCES = extras/usb_id/usb_id.c
+-extras_usb_id_usb_id_LDADD = libudev/libudev-private.la
+-libexec_PROGRAMS += extras/usb_id/usb_id
+-
+-# ------------------------------------------------------------------------------
+-# v4l_id - video4linux capabilities
+-# ------------------------------------------------------------------------------
+-extras_v4l_id_v4l_id_SOURCES = extras/v4l_id/v4l_id.c
+-extras_v4l_id_v4l_id_LDADD = libudev/libudev-private.la
+-libexec_PROGRAMS += extras/v4l_id/v4l_id
+-dist_udevrules_DATA += extras/v4l_id/60-persistent-v4l.rules
+-
+-# ------------------------------------------------------------------------------
+-# accelerometer - updates device orientation
+-# ------------------------------------------------------------------------------
+-extras_accelerometer_accelerometer_SOURCES = extras/accelerometer/accelerometer.c
+-extras_accelerometer_accelerometer_LDADD = libudev/libudev-private.la -lm
+-libexec_PROGRAMS += extras/accelerometer/accelerometer
+-dist_udevrules_DATA += extras/accelerometer/61-accelerometer.rules
+-
+-# ------------------------------------------------------------------------------
+-# qemu -- qemu/kvm guest tweaks
+-# ------------------------------------------------------------------------------
+-dist_udevrules_DATA += extras/qemu/42-qemu-usb.rules
++pkgconfig_DATA =
+ 
+ if ENABLE_GUDEV
+ # ------------------------------------------------------------------------------
+@@ -362,9 +97,10 @@ extras_gudev_libgudev_1_0_la_CPPFLAGS = \
+ 
+ extras_gudev_libgudev_1_0_la_CFLAGS = \
+ 	-fvisibility=default \
++	$(LIBUDEV_CFLAGS) \
+ 	$(GLIB_CFLAGS)
+ 
+-extras_gudev_libgudev_1_0_la_LIBADD = libudev/libudev.la $(GLIB_LIBS)
++extras_gudev_libgudev_1_0_la_LIBADD = $(LIBUDEV_LIBS) $(GLIB_LIBS)
+ 
+ extras_gudev_libgudev_1_0_la_LDFLAGS = \
+ 	-version-info $(LIBGUDEV_CURRENT):$(LIBGUDEV_REVISION):$(LIBGUDEV_AGE) \
+@@ -452,196 +188,6 @@ INSTALL_EXEC_HOOKS += libgudev-install-move-hook
+ UNINSTALL_EXEC_HOOKS += libgudev-uninstall-move-hook
+ endif
+ 
+-if ENABLE_HWDB
+-# ------------------------------------------------------------------------------
+-# usb/pci-db - read vendor/device string database
+-# ------------------------------------------------------------------------------
+-extras_usb_db_usb_db_SOURCES = extras/usb-db/usb-db.c
+-extras_usb_db_usb_db_CPPFLAGS = $(AM_CPPFLAGS) -DUSB_DATABASE=\"$(USB_DATABASE)\" -DBUILD_FOR_USB
+-extras_usb_db_usb_db_LDADD = libudev/libudev-private.la
+-libexec_PROGRAMS += extras/usb-db/usb-db
+-dist_udevrules_DATA += \
+-	rules/rules.d/75-net-description.rules \
+-	rules/rules.d/75-tty-description.rules \
+-	rules/rules.d/78-sound-card.rules
+-
+-extras_usb_db_pci_db_SOURCES = extras/usb-db/usb-db.c
+-extras_usb_db_pci_db_CPPFLAGS = $(AM_CPPFLAGS) -DPCI_DATABASE=\"$(PCI_DATABASE)\" -DBUILD_FOR_PCI
+-extras_usb_db_pci_db_LDADD = libudev/libudev-private.la
+-libexec_PROGRAMS += extras/usb-db/pci-db
+-endif
+-
+-if ENABLE_KEYMAP
+-# ------------------------------------------------------------------------------
+-# keymap - map custom hardware's multimedia keys
+-# ------------------------------------------------------------------------------
+-extras_keymap_keymap_SOURCES = extras/keymap/keymap.c
+-extras_keymap_keymap_CPPFLAGS = $(AM_CPPFLAGS) -I extras/keymap
+-nodist_extras_keymap_keymap_SOURCES = \
+-	extras/keymap/keys-from-name.h \
+-	extras/keymap/keys-to-name.h
+-BUILT_SOURCES += $(nodist_extras_keymap_keymap_SOURCES)
+-
+-EXTRA_DIST += extras/keymap/check-keymaps.sh
+-dist_udevrules_DATA += extras/keymap/95-keymap.rules
+-dist_udevrules_DATA += extras/keymap/95-keyboard-force-release.rules
+-libexec_PROGRAMS += extras/keymap/keymap
+-dist_libexec_SCRIPTS += extras/keymap/findkeyboards
+-dist_libexec_SCRIPTS += extras/keymap/keyboard-force-release.sh
+-dist_doc_DATA = extras/keymap/README.keymap.txt
+-CLEANFILES += \
+-	extras/keymap/keys.txt \
+-	extras/keymap/keys-from-name.gperf
+-
+-udevkeymapdir = $(libexecdir)/keymaps
+-dist_udevkeymap_DATA = \
+-	extras/keymap/keymaps/acer \
+-	extras/keymap/keymaps/acer-aspire_5720 \
+-	extras/keymap/keymaps/acer-aspire_8930 \
+-	extras/keymap/keymaps/acer-aspire_5920g \
+-	extras/keymap/keymaps/acer-aspire_6920 \
+-	extras/keymap/keymaps/acer-travelmate_c300 \
+-	extras/keymap/keymaps/asus \
+-	extras/keymap/keymaps/compaq-e_evo \
+-	extras/keymap/keymaps/dell \
+-	extras/keymap/keymaps/dell-latitude-xt2 \
+-	extras/keymap/keymaps/everex-xt5000 \
+-	extras/keymap/keymaps/fujitsu-amilo_pa_2548 \
+-	extras/keymap/keymaps/fujitsu-amilo_pro_edition_v3505 \
+-	extras/keymap/keymaps/fujitsu-amilo_pro_v3205 \
+-	extras/keymap/keymaps/fujitsu-amilo_si_1520 \
+-	extras/keymap/keymaps/fujitsu-esprimo_mobile_v5 \
+-	extras/keymap/keymaps/fujitsu-esprimo_mobile_v6 \
+-	extras/keymap/keymaps/hewlett-packard \
+-	extras/keymap/keymaps/hewlett-packard-2510p_2530p \
+-	extras/keymap/keymaps/hewlett-packard-compaq_elitebook \
+-	extras/keymap/keymaps/hewlett-packard-pavilion \
+-	extras/keymap/keymaps/hewlett-packard-presario-2100 \
+-	extras/keymap/keymaps/hewlett-packard-tablet \
+-	extras/keymap/keymaps/hewlett-packard-tx2 \
+-	extras/keymap/keymaps/ibm-thinkpad-usb-keyboard-trackpoint \
+-	extras/keymap/keymaps/inventec-symphony_6.0_7.0 \
+-	extras/keymap/keymaps/lenovo-3000 \
+-	extras/keymap/keymaps/lenovo-ideapad \
+-	extras/keymap/keymaps/lenovo-thinkpad-usb-keyboard-trackpoint \
+-	extras/keymap/keymaps/lenovo-thinkpad_x6_tablet \
+-	extras/keymap/keymaps/lenovo-thinkpad_x200_tablet \
+-	extras/keymap/keymaps/lg-x110 \
+-	extras/keymap/keymaps/logitech-wave \
+-	extras/keymap/keymaps/logitech-wave-cordless \
+-	extras/keymap/keymaps/logitech-wave-pro-cordless \
+-	extras/keymap/keymaps/maxdata-pro_7000 \
+-	extras/keymap/keymaps/medion-fid2060 \
+-	extras/keymap/keymaps/medionnb-a555 \
+-	extras/keymap/keymaps/micro-star \
+-	extras/keymap/keymaps/module-asus-w3j \
+-	extras/keymap/keymaps/module-ibm \
+-	extras/keymap/keymaps/module-lenovo \
+-	extras/keymap/keymaps/module-sony \
+-	extras/keymap/keymaps/module-sony-old \
+-	extras/keymap/keymaps/module-sony-vgn \
+-	extras/keymap/keymaps/olpc-xo \
+-	extras/keymap/keymaps/onkyo \
+-	extras/keymap/keymaps/oqo-model2 \
+-	extras/keymap/keymaps/samsung-other \
+-	extras/keymap/keymaps/samsung-sq1us \
+-	extras/keymap/keymaps/samsung-sx20s \
+-	extras/keymap/keymaps/toshiba-satellite_a100 \
+-	extras/keymap/keymaps/toshiba-satellite_a110 \
+-	extras/keymap/keymaps/toshiba-satellite_m30x \
+-	extras/keymap/keymaps/zepto-znote
+-
+-udevkeymapforcereldir = $(libexecdir)/keymaps/force-release
+-dist_udevkeymapforcerel_DATA = \
+-	extras/keymap/force-release-maps/dell-touchpad \
+-	extras/keymap/force-release-maps/hp-other \
+-	extras/keymap/force-release-maps/samsung-other \
+-	extras/keymap/force-release-maps/common-volume-keys
+-
+-extras/keymap/keys.txt: $(INCLUDE_PREFIX)/linux/input.h
+-	$(AM_V_at)mkdir -p extras/keymap
+-	$(AM_V_GEN)$(AWK) '/^#define.*KEY_[^ ]+[ \t]+[0-9]/ { if ($$2 != "KEY_MAX") { print $$2 } }' < $< | sed 's/^KEY_COFFEE$$/KEY_SCREENLOCK/' > $@
+-
+-extras/keymap/keys-from-name.gperf: extras/keymap/keys.txt
+-	$(AM_V_GEN)$(AWK) 'BEGIN{ print "struct key { const char* name; unsigned short id; };"; print "%null-strings"; print "%%";} { print $$1 ", " $$1 }' < $< > $@
+-
+-extras/keymap/keys-from-name.h: extras/keymap/keys-from-name.gperf Makefile
+-	$(AM_V_GEN)$(GPERF) -L ANSI-C -t --ignore-case -N lookup_key -H hash_key_name -p -C < $< > $@
+-
+-extras/keymap/keys-to-name.h: extras/keymap/keys.txt Makefile
+-	$(AM_V_GEN)$(AWK) 'BEGIN{ print "const char* const key_names[KEY_CNT] = { "} { print "[" $$1 "] = \"" $$1 "\"," } END{print "};"}' < $< > $@
+-
+-keymaps-distcheck-hook: extras/keymap/keys.txt
+-	$(top_srcdir)/extras/keymap/check-keymaps.sh $(top_srcdir) $^
+-DISTCHECK_HOOKS += keymaps-distcheck-hook
+-endif
+-
+-if ENABLE_MTD_PROBE
+-# ------------------------------------------------------------------------------
+-# mtd_probe - autoloads FTL module for mtd devices
+-# ------------------------------------------------------------------------------
+-extras_mtd_probe_mtd_probe_SOURCES =  \
+-	extras/mtd_probe/mtd_probe.c \
+-	extras/mtd_probe/mtd_probe.h \
+-	extras/mtd_probe/probe_smartmedia.c
+-extras_mtd_probe_mtd_probe_CPPFLAGS = $(AM_CPPFLAGS)
+-dist_udevrules_DATA += extras/mtd_probe/75-probe_mtd.rules
+-libexec_PROGRAMS += extras/mtd_probe/mtd_probe
+-endif
+-
+-if ENABLE_RULE_GENERATOR
+-# ------------------------------------------------------------------------------
+-# rule_generator - persistent network and optical device rule generator
+-# ------------------------------------------------------------------------------
+-dist_libexec_SCRIPTS += \
+-	extras/rule_generator/write_cd_rules \
+-	extras/rule_generator/write_net_rules
+-
+-udevhomedir = $(libexecdir)
+-dist_udevhome_DATA = extras/rule_generator/rule_generator.functions
+-
+-dist_udevrules_DATA += \
+-	extras/rule_generator/75-cd-aliases-generator.rules \
+-	extras/rule_generator/75-persistent-net-generator.rules
+-endif
+-
+-if ENABLE_UDEV_ACL
+-# ------------------------------------------------------------------------------
+-# udev_acl - apply ACLs for users with local forground sessions
+-# ------------------------------------------------------------------------------
+-extras_udev_acl_udev_acl_SOURCES = extras/udev-acl/udev-acl.c
+-extras_udev_acl_udev_acl_CPPFLAGS = $(AM_CPPFLAGS) $(GLIB_CFLAGS)
+-extras_udev_acl_udev_acl_LDADD = libudev/libudev-private.la -lacl $(GLIB_LIBS)
+-dist_udevrules_DATA += extras/udev-acl/70-udev-acl.rules
+-libexec_PROGRAMS += extras/udev-acl/udev-acl
+-
+-udevacl-install-hook:
+-	mkdir -p $(DESTDIR)$(prefix)/lib/ConsoleKit/run-seat.d
+-	ln -sf $(libexecdir)/udev-acl $(DESTDIR)$(prefix)/lib/ConsoleKit/run-seat.d/udev-acl.ck
+-
+-INSTALL_EXEC_HOOKS += udevacl-install-hook
+-endif
+-
+-if ENABLE_FLOPPY
+-# ------------------------------------------------------------------------------
+-# create_floppy_devices - historical floppy kernel device nodes (/dev/fd0h1440, ...)
+-# ------------------------------------------------------------------------------
+-extras_floppy_create_floppy_devices_SOURCES = extras/floppy/create_floppy_devices.c
+-extras_floppy_create_floppy_devices_LDADD = libudev/libudev-private.la
+-libexec_PROGRAMS += extras/floppy/create_floppy_devices
+-dist_udevrules_DATA += extras/floppy/60-floppy.rules
+-endif
+-
+-if ENABLE_EDD
+-# ------------------------------------------------------------------------------
+-# edd_id - create /dev/disk/by-id/edd-* links for BIOS EDD data
+-# ------------------------------------------------------------------------------
+-extras_edd_id_edd_id_SOURCES = extras/edd_id/edd_id.c
+-extras_edd_id_edd_id_LDADD = libudev/libudev-private.la
+-libexec_PROGRAMS += extras/edd_id/edd_id
+-dist_udevrules_DATA += extras/edd_id/61-persistent-storage-edd.rules
+-endif
+-
+ # ------------------------------------------------------------------------------
+ # install, uninstall, clean hooks
+ # ------------------------------------------------------------------------------
+diff --git a/configure.ac b/configure.ac
+index bc8e6fb..806bd27 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -86,6 +86,7 @@ AC_ARG_ENABLE([gudev],
+ 	[], [enable_gudev=yes])
+ if test "x$enable_gudev" = xyes; then
+ 	PKG_CHECK_MODULES([GLIB], [glib-2.0 >= 2.22.0 gobject-2.0 >= 2.22.0])
++	PKG_CHECK_MODULES([LIBUDEV], [libudev >= 173])
+ fi
+ 
+ AC_ARG_ENABLE([introspection],
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]