shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2025-02-02 09:47:03 +03:00
Code

build-sys: fix HAVE/ENABLE_FIRMWARE

Browse Source 
https://bugs.freedesktop.org/show_bug.cgi?id=62864
This commit is contained in:
Kay Sievers 2013-03-28 15:28:10 +01:00
parent 0014c5221e
commit d8d4bee76c
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure.ac
View File

@ -728,6 +728,7 @@ for i in $with_firmware_path; do
done done
IFS=$OLD_IFS IFS=$OLD_IFS
AC_SUBST(FIRMWARE_PATH) AC_SUBST(FIRMWARE_PATH)
AS_IF([test "x${FIRMWARE_PATH}" != "x"], [ AC_DEFINE(HAVE_FIRMWARE, 1, [Define if FIRMWARE is available]) ])
AM_CONDITIONAL(ENABLE_FIRMWARE, [test "x${FIRMWARE_PATH}" != "x"]) AM_CONDITIONAL(ENABLE_FIRMWARE, [test "x${FIRMWARE_PATH}" != "x"])
# ------------------------------------------------------------------------------ # ------------------------------------------------------------------------------
@ -736,7 +737,6 @@ AC_ARG_ENABLE([gudev],
[], [enable_gudev=yes]) [], [enable_gudev=yes])
AS_IF([test "x$enable_gudev" = "xyes"], [ PKG_CHECK_MODULES([GLIB], [glib-2.0 >= 2.22.0 gobject-2.0 >= 2.22.0 gio-2.0]) ]) AS_IF([test "x$enable_gudev" = "xyes"], [ PKG_CHECK_MODULES([GLIB], [glib-2.0 >= 2.22.0 gobject-2.0 >= 2.22.0 gio-2.0]) ])
AM_CONDITIONAL([ENABLE_GUDEV], [test "x$enable_gudev" = "xyes"]) AM_CONDITIONAL([ENABLE_GUDEV], [test "x$enable_gudev" = "xyes"])
AS_IF([test "x$enable_gudev" = "xyes"], [ AC_DEFINE(HAVE_GLIB, 1, [Define if glib is available]) ]) AS_IF([test "x$enable_gudev" = "xyes"], [ AC_DEFINE(HAVE_GLIB, 1, [Define if glib is available]) ])
# ------------------------------------------------------------------------------ # ------------------------------------------------------------------------------

2
src/udev/udev-builtin.c
View File

@ -34,7 +34,7 @@ static const struct udev_builtin *builtins[] = {
[UDEV_BUILTIN_BLKID] = &udev_builtin_blkid, [UDEV_BUILTIN_BLKID] = &udev_builtin_blkid,
#endif #endif
[UDEV_BUILTIN_BTRFS] = &udev_builtin_btrfs, [UDEV_BUILTIN_BTRFS] = &udev_builtin_btrfs,
#ifdef ENABLE_FIRMWARE #ifdef HAVE_FIRMWARE
[UDEV_BUILTIN_FIRMWARE] = &udev_builtin_firmware, [UDEV_BUILTIN_FIRMWARE] = &udev_builtin_firmware,
#endif #endif
[UDEV_BUILTIN_HWDB] = &udev_builtin_hwdb, [UDEV_BUILTIN_HWDB] = &udev_builtin_hwdb,

4
src/udev/udev.h
View File

@ -140,7 +140,7 @@ enum udev_builtin_cmd {
UDEV_BUILTIN_BLKID, UDEV_BUILTIN_BLKID,
#endif #endif
UDEV_BUILTIN_BTRFS, UDEV_BUILTIN_BTRFS,
#ifdef ENABLE_FIRMWARE #ifdef HAVE_FIRMWARE
UDEV_BUILTIN_FIRMWARE, UDEV_BUILTIN_FIRMWARE,
#endif #endif
UDEV_BUILTIN_HWDB, UDEV_BUILTIN_HWDB,
@ -169,7 +169,7 @@ struct udev_builtin {
extern const struct udev_builtin udev_builtin_blkid; extern const struct udev_builtin udev_builtin_blkid;
#endif #endif
extern const struct udev_builtin udev_builtin_btrfs; extern const struct udev_builtin udev_builtin_btrfs;
#ifdef ENABLE_FIRMWARE #ifdef HAVE_FIRMWARE
extern const struct udev_builtin udev_builtin_firmware; extern const struct udev_builtin udev_builtin_firmware;
#endif #endif
extern const struct udev_builtin udev_builtin_hwdb; extern const struct udev_builtin udev_builtin_hwdb;

6
src/udev/udevd.c
View File

@ -98,7 +98,7 @@ struct event {
dev_t devnum; dev_t devnum;
int ifindex; int ifindex;
bool is_block; bool is_block;
#ifdef ENABLE_FIRMWARE #ifdef HAVE_FIRMWARE
bool nodelay; bool nodelay;
#endif #endif
}; };
@ -444,7 +444,7 @@ static int event_queue_insert(struct udev_device *dev)
event->devnum = udev_device_get_devnum(dev); event->devnum = udev_device_get_devnum(dev);
event->is_block = streq("block", udev_device_get_subsystem(dev)); event->is_block = streq("block", udev_device_get_subsystem(dev));
event->ifindex = udev_device_get_ifindex(dev); event->ifindex = udev_device_get_ifindex(dev);
#ifdef ENABLE_FIRMWARE #ifdef HAVE_FIRMWARE
if (streq(udev_device_get_subsystem(dev), "firmware")) if (streq(udev_device_get_subsystem(dev), "firmware"))
event->nodelay = true; event->nodelay = true;
#endif #endif
@ -527,7 +527,7 @@ static bool is_devpath_busy(struct event *event)
return true; return true;
} }
#ifdef ENABLE_FIRMWARE #ifdef HAVE_FIRMWARE
/* allow to bypass the dependency tracking */ /* allow to bypass the dependency tracking */
if (event->nodelay) if (event->nodelay)
continue; continue;