build-sys: fix HAVE/ENABLE_FIRMWARE

https://bugs.freedesktop.org/show_bug.cgi?id=62864

diff --git a/configure.ac b/configure.ac
index 5b88bcf0058157f22f09eb92249531c1dd1c2d4b..e73cd5c76f22452d8218ba7d865f32f0c66fcd40 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -728,6 +728,7 @@ for i in $with_firmware_path; do
 done
 IFS=$OLD_IFS
 AC_SUBST(FIRMWARE_PATH)
 done
 IFS=$OLD_IFS
 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])
 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"])
        [], [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]) ])
 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]) ])
 
 # ------------------------------------------------------------------------------

diff --git a/src/udev/udev-builtin.c b/src/udev/udev-builtin.c
index 13922d3ce3d66da11649957c4e4fd4179b035d98..c7d431988d0f3c9b3fdc4187e332f86d07be4a7d 100644 (file)
--- a/src/udev/udev-builtin.c
+++ b/src/udev/udev-builtin.c
@@ -34,7 +34,7 @@ static const struct udev_builtin *builtins[] = {
         [UDEV_BUILTIN_BLKID] = &udev_builtin_blkid,
 #endif
         [UDEV_BUILTIN_BTRFS] = &udev_builtin_btrfs,
         [UDEV_BUILTIN_BLKID] = &udev_builtin_blkid,
 #endif
         [UDEV_BUILTIN_BTRFS] = &udev_builtin_btrfs,

-#ifdef ENABLE_FIRMWARE
+#ifdef HAVE_FIRMWARE

         [UDEV_BUILTIN_FIRMWARE] = &udev_builtin_firmware,
 #endif
         [UDEV_BUILTIN_HWDB] = &udev_builtin_hwdb,
         [UDEV_BUILTIN_FIRMWARE] = &udev_builtin_firmware,
 #endif
         [UDEV_BUILTIN_HWDB] = &udev_builtin_hwdb,

diff --git a/src/udev/udev.h b/src/udev/udev.h
index aa2edbef6eaf755f827828a942d02b8316a11d66..906dfbaa0bdc0a585047c90b11046b5b7b97258e 100644 (file)
--- a/src/udev/udev.h
+++ b/src/udev/udev.h
@@ -140,7 +140,7 @@ enum udev_builtin_cmd {
         UDEV_BUILTIN_BLKID,
 #endif
         UDEV_BUILTIN_BTRFS,
         UDEV_BUILTIN_BLKID,
 #endif
         UDEV_BUILTIN_BTRFS,

-#ifdef ENABLE_FIRMWARE
+#ifdef HAVE_FIRMWARE

         UDEV_BUILTIN_FIRMWARE,
 #endif
         UDEV_BUILTIN_HWDB,
         UDEV_BUILTIN_FIRMWARE,
 #endif
         UDEV_BUILTIN_HWDB,


@@ -169,7 +169,7 @@ struct udev_builtin {
 extern const struct udev_builtin udev_builtin_blkid;
 #endif
 extern const struct udev_builtin udev_builtin_btrfs;
 extern const struct udev_builtin udev_builtin_blkid;
 #endif
 extern const struct udev_builtin udev_builtin_btrfs;

-#ifdef ENABLE_FIRMWARE
+#ifdef HAVE_FIRMWARE

 extern const struct udev_builtin udev_builtin_firmware;
 #endif
 extern const struct udev_builtin udev_builtin_hwdb;
 extern const struct udev_builtin udev_builtin_firmware;
 #endif
 extern const struct udev_builtin udev_builtin_hwdb;

diff --git a/src/udev/udevd.c b/src/udev/udevd.c
index b30bedfa5c184e9df673ffac53b38f202d3d44bc..2ad73881d6cdcead779a52bbb3eb1be9ff0a0c39 100644 (file)
--- a/src/udev/udevd.c
+++ b/src/udev/udevd.c
@@ -98,7 +98,7 @@ struct event {
         dev_t devnum;
         int ifindex;
         bool is_block;
         dev_t devnum;
         int ifindex;
         bool is_block;

-#ifdef ENABLE_FIRMWARE
+#ifdef HAVE_FIRMWARE

         bool nodelay;
 #endif
 };
         bool nodelay;
 #endif
 };


@@ -444,7 +444,7 @@ static int event_queue_insert(struct udev_device *dev)
         event->devnum = udev_device_get_devnum(dev);
         event->is_block = streq("block", udev_device_get_subsystem(dev));
         event->ifindex = udev_device_get_ifindex(dev);
         event->devnum = udev_device_get_devnum(dev);
         event->is_block = streq("block", udev_device_get_subsystem(dev));
         event->ifindex = udev_device_get_ifindex(dev);

-#ifdef ENABLE_FIRMWARE
+#ifdef HAVE_FIRMWARE

         if (streq(udev_device_get_subsystem(dev), "firmware"))
                 event->nodelay = true;
 #endif
         if (streq(udev_device_get_subsystem(dev), "firmware"))
                 event->nodelay = true;
 #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 */
                 if (event->nodelay)
                         continue;
                 /* allow to bypass the dependency tracking */
                 if (event->nodelay)
                         continue;