← Back to branch summary

~gandelman-a/ubuntu/oneiric/udev/lp818177

« back to all changes in this revision

Viewing changes to configure.ac

  • Committer: Bazaar Package Importer
  • Author(s): Martin Pitt
  • Date: 2011-05-20 11:26:10 UTC
  • mfrom: (0.7.11 upstream)
  • Revision ID: james.westby@ubuntu.com-20110520112610-4mw870d2yzsnfjfg
Tags: 170-0ubuntu1
* New upstream release.
* debian/udev-udeb.install, debian/udev.initramfs-hook: Drop floppy and edd
  rules, there are obsolete and not built by default any more.
* debian/udev.{postinst,postrm,prerm}: Remove a lot of obsolete transition
  handling.
* debian/udev.postinst: Drop create_devices(). devtmpfs does all that by
  itself these days. Update remove_devices() to clean up.

Show diffs side-by-side

added added

removed removed

Lines of Context:
configure.ac
1
 
AC_INIT([udev], [168], [linux-hotplug@vger.kernel.org])
 
1
AC_INIT([udev], [170], [linux-hotplug@vger.kernel.org])
2
2
AC_PREREQ(2.60)
3
3
AM_INIT_AUTOMAKE([check-news foreign 1.10 dist-bzip2 subdir-objects])
4
4
m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
54
54
        [], [with_firmware_path="/lib/firmware/updates:/lib/firmware"])
55
55
OLD_IFS=$IFS
56
56
IFS=:
57
 
for i in $with_firmware_path
58
 
do
 
57
for i in $with_firmware_path; do
59
58
        if test "x${FIRMWARE_PATH}" = "x"; then
60
59
                FIRMWARE_PATH="\\\"${i}/\\\""
61
60
        else
69
68
        AS_HELP_STRING([--with-systemdsystemunitdir=DIR], [Directory for systemd service files]),
70
69
        [], [with_systemdsystemunitdir=$($PKG_CONFIG --variable=systemdsystemunitdir systemd)])
71
70
if test "x$with_systemdsystemunitdir" != xno; then
72
 
    AC_SUBST([systemdsystemunitdir], [$with_systemdsystemunitdir])
 
71
        AC_SUBST([systemdsystemunitdir], [$with_systemdsystemunitdir])
73
72
fi
74
73
AM_CONDITIONAL(WITH_SYSTEMD, [test -n "$with_systemdsystemunitdir" -a "x$with_systemdsystemunitdir" != xno ])
75
74
 
76
 
AC_ARG_ENABLE([extras],
77
 
        AS_HELP_STRING([--disable-extras], [disable extras with external dependencies]),
78
 
        [], [enable_extras=yes])
79
 
if test "x$enable_extras" = xyes; then
80
 
        AC_PATH_PROG([GPERF], [gperf])
81
 
        if test -z "$GPERF"; then
82
 
                AC_MSG_ERROR([gperf is needed])
83
 
        fi
84
 
 
85
 
        PKG_CHECK_MODULES([GLIB], [glib-2.0 >= 2.22.0 gobject-2.0 >= 2.22.0])
86
 
        AC_SUBST([GLIB_CFLAGS])
87
 
        AC_SUBST([GLIB_LIBS])
88
 
 
89
 
        AC_CHECK_LIB([acl], [acl_init], [:], AC_MSG_ERROR([libacl not found]))
90
 
        AC_CHECK_HEADER([acl/libacl.h], [:], AC_MSG_ERROR([libacl header not found]))
91
 
 
92
 
        PKG_CHECK_MODULES(LIBUSB, libusb >= 0.1.12)
93
 
        AC_SUBST(LIBUSB_CFLAGS)
94
 
        AC_SUBST(LIBUSB_LIBS)
95
 
 
96
 
        PKG_CHECK_MODULES(USBUTILS, usbutils >= 0.82)
97
 
        AC_SUBST([USB_DATABASE], [$($PKG_CONFIG --variable=usbids usbutils)])
98
 
 
 
75
# ------------------------------------------------------------------------------
 
76
# rule_generator - persistent network and optical device rule generator
 
77
# ------------------------------------------------------------------------------
 
78
AC_ARG_ENABLE([rule_generator],
 
79
        AS_HELP_STRING([--disable-rule_generator], [disable persistent network, cdrom support]),
 
80
        [], [enable_rule_generator=yes])
 
81
AM_CONDITIONAL([ENABLE_RULE_GENERATOR], [test "x$enable_rule_generator" = xyes])
 
82
 
 
83
# ------------------------------------------------------------------------------
 
84
# usb/pci-db - read vendor/device string database
 
85
# ------------------------------------------------------------------------------
 
86
AC_ARG_ENABLE([hwdb],
 
87
        AS_HELP_STRING([--disable-hwdb], [disable hardware database support]),
 
88
        [], [enable_hwdb=yes])
 
89
if test "x$enable_hwdb" = xyes; then
99
90
        if test "x$cross_compiling" = "xno" ; then
100
91
                AC_CHECK_FILES([/usr/share/pci.ids], [pciids=/usr/share/pci.ids])
101
92
                AC_CHECK_FILES([/usr/share/hwdata/pci.ids], [pciids=/usr/share/hwdata/pci.ids])
102
93
                AC_CHECK_FILES([/usr/share/misc/pci.ids], [pciids=/usr/share/misc/pci.ids])
103
94
        fi
 
95
 
 
96
        PKG_CHECK_MODULES(USBUTILS, usbutils >= 0.82)
 
97
        AC_SUBST([USB_DATABASE], [$($PKG_CONFIG --variable=usbids usbutils)])
 
98
 
104
99
        AC_ARG_WITH(pci-ids-path,
105
100
                [AS_HELP_STRING([--with-pci-ids-path=DIR], [Path to pci.ids file])],
106
101
                [PCI_DATABASE=${withval}],
112
107
        AC_MSG_CHECKING([for PCI database location])
113
108
        AC_MSG_RESULT([$PCI_DATABASE])
114
109
        AC_SUBST(PCI_DATABASE)
115
 
 
116
 
        AC_CHECK_HEADER([linux/input.h], [:], AC_MSG_ERROR([kernel headers not found]))
117
 
        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}')])
118
 
fi
119
 
AM_CONDITIONAL([ENABLE_EXTRAS], [test "x$enable_extras" = xyes])
 
110
fi
 
111
AM_CONDITIONAL([ENABLE_HWDB], [test "x$enable_hwdb" = xyes])
 
112
 
 
113
# ------------------------------------------------------------------------------
 
114
# udev_acl - apply ACLs for users with local forground sessions
 
115
# ------------------------------------------------------------------------------
 
116
AC_ARG_ENABLE([udev_acl],
 
117
        AS_HELP_STRING([--disable-udev_acl], [disable local user acl permissions support]),
 
118
        [], [enable_udev_acl=yes])
 
119
if test "x$enable_udev_acl" = xyes; then
 
120
        AC_CHECK_LIB([acl], [acl_init], [:], AC_MSG_ERROR([libacl not found]))
 
121
        AC_CHECK_HEADER([acl/libacl.h], [:], AC_MSG_ERROR([libacl header not found]))
 
122
 
 
123
        PKG_CHECK_MODULES([GLIB], [glib-2.0 >= 2.22.0 gobject-2.0 >= 2.22.0])
 
124
        AC_SUBST([GLIB_CFLAGS])
 
125
        AC_SUBST([GLIB_LIBS])
 
126
fi
 
127
AM_CONDITIONAL([ENABLE_UDEV_ACL], [test "x$enable_udev_acl" = xyes])
 
128
 
 
129
# ------------------------------------------------------------------------------
 
130
# GUdev - libudev gobject interface
 
131
# ------------------------------------------------------------------------------
 
132
AC_ARG_ENABLE([gudev],
 
133
        AS_HELP_STRING([--disable-gudev], [disable Gobject libudev support]),
 
134
        [], [enable_gudev=yes])
 
135
if test "x$enable_gudev" = xyes; then
 
136
        PKG_CHECK_MODULES([GLIB], [glib-2.0 >= 2.22.0 gobject-2.0 >= 2.22.0])
 
137
        AC_SUBST([GLIB_CFLAGS])
 
138
        AC_SUBST([GLIB_LIBS])
 
139
fi
120
140
 
121
141
AC_ARG_ENABLE([introspection],
122
 
        AS_HELP_STRING([--disable-introspection], [disable GObject introspection]),
123
 
        [], [enable_introspection=yes])
 
142
       AS_HELP_STRING([--disable-introspection], [disable GObject introspection]),
 
143
       [], [enable_introspection=yes])
124
144
if test "x$enable_introspection" = xyes; then
125
145
        PKG_CHECK_MODULES([INTROSPECTION], [gobject-introspection-1.0 >= 0.6.2])
126
146
        AC_DEFINE([ENABLE_INTROSPECTION], [1], [enable GObject introspection support])
132
152
fi
133
153
AM_CONDITIONAL([ENABLE_INTROSPECTION], [test "x$enable_introspection" = xyes])
134
154
 
 
155
AM_CONDITIONAL([ENABLE_GUDEV], [test "x$enable_gudev" = xyes])
 
156
 
 
157
# ------------------------------------------------------------------------------
 
158
# keymap - map custom hardware's multimedia keys
 
159
# ------------------------------------------------------------------------------
 
160
AC_ARG_ENABLE([keymap],
 
161
        AS_HELP_STRING([--disable-keymap], [disable keymap fixup support]),
 
162
        [], [enable_keymap=yes])
 
163
if test "x$enable_keymap" = xyes; then
 
164
        AC_PATH_PROG([GPERF], [gperf])
 
165
        if test -z "$GPERF"; then
 
166
                AC_MSG_ERROR([gperf is needed])
 
167
        fi
 
168
 
 
169
        AC_CHECK_HEADER([linux/input.h], [:], AC_MSG_ERROR([kernel headers not found]))
 
170
        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}')])
 
171
fi
 
172
AM_CONDITIONAL([ENABLE_KEYMAP], [test "x$enable_keymap" = xyes])
 
173
 
 
174
# ------------------------------------------------------------------------------
 
175
# create_floppy_devices - historical floppy kernel device nodes (/dev/fd0h1440, ...)
 
176
# ------------------------------------------------------------------------------
 
177
AC_ARG_ENABLE([floppy],
 
178
        AS_HELP_STRING([--enable-floppy], [enable legacy floppy support]),
 
179
        [], [enable_floppy=no])
 
180
AM_CONDITIONAL([ENABLE_FLOPPY], [test "x$enable_floppy" = xyes])
 
181
 
 
182
# ------------------------------------------------------------------------------
 
183
# edd_id - create /dev/disk/by-id/edd-* links for BIOS EDD data
 
184
# ------------------------------------------------------------------------------
 
185
AC_ARG_ENABLE([edd],
 
186
        AS_HELP_STRING([--enable-edd], [enable disk edd support]),
 
187
        [], [enable_edd=no])
 
188
AM_CONDITIONAL([ENABLE_EDD], [test "x$enable_edd" = xyes])
 
189
 
 
190
# ------------------------------------------------------------------------------
 
191
# mobile-action-modeswitch - switch Mobile Action cables into serial mode
 
192
# ------------------------------------------------------------------------------
 
193
AC_ARG_ENABLE([action_modeswitch],
 
194
        AS_HELP_STRING([--enable-action_modeswitch], [enable action modeswitch support]),
 
195
        [], [enable_action_modeswitch=no])
 
196
if test "x$enable_action_modeswitch" = xyes; then
 
197
        PKG_CHECK_MODULES(LIBUSB, libusb >= 0.1.12)
 
198
        AC_SUBST(LIBUSB_CFLAGS)
 
199
        AC_SUBST(LIBUSB_LIBS)
 
200
fi
 
201
AM_CONDITIONAL([ENABLE_ACTION_MODESWITCH], [test "x$enable_action_modeswitch" = xyes])
 
202
 
135
203
AC_CONFIG_HEADERS(config.h)
136
204
AC_CONFIG_FILES([
137
205
        Makefile
175
243
        cflags:                 ${CFLAGS}
176
244
        ldflags:                ${LDFLAGS}
177
245
 
178
 
        extras:                 ${enable_extras}
 
246
        rule_generator:         ${enable_rule_generator}
 
247
        hwdb:                   ${enable_hwdb}
 
248
        udev_acl:               ${enable_udev_acl}
 
249
        gudev:                  ${enable_gudev}
179
250
        gintrospection:         ${enable_introspection}
 
251
        keymap:                 ${enable_keymap}
 
252
        floppy:                 ${enable_floppy}
 
253
        edd:                    ${enable_edd}
 
254
        action_modeswitch:      ${enable_action_modeswitch}
180
255
 
181
256
        usb.ids:                ${USB_DATABASE}
182
257
        pci.ids:                ${PCI_DATABASE}