Fedora 28: Fix "Macro %_dracutdir has empty body"

If you run ./configure --with-config=srpm, it will not trigger
the user m4 scripts to populate the dracut and udev directories.
This causes a build error on Fedora 28.  Make the dracut and
udev lines conditional to get around this.

Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Tony Hutter <hutter2@llnl.gov>
Closes #7326
Closes #7328

diff --git a/config/zfs-build.m4 b/config/zfs-build.m4
index 8fc3863f49d2031bc101efa1fef47525d3d5a45f..e6c9c21e0730b9822d4580c8d6550870d83bf639 100644 (file)
--- a/config/zfs-build.m4
+++ b/config/zfs-build.m4
@@ -160,7 +160,27 @@ AC_DEFUN([ZFS_AC_RPM], [
        ])
 
        RPM_DEFINE_COMMON='--define "$(DEBUG_ZFS) 1"'
-       RPM_DEFINE_UTIL='--define "_dracutdir $(dracutdir)" --define "_udevdir $(udevdir)" --define "_udevruledir $(udevruledir)" --define "_initconfdir $(DEFAULT_INITCONF_DIR)" $(DEFINE_INITRAMFS) $(DEFINE_SYSTEMD)'
+
+
+       RPM_DEFINE_UTIL=' --define "_initconfdir $(DEFAULT_INITCONF_DIR)"'
+
+        dnl # Make the next three RPM_DEFINE_UTIL additions conditional, since
+        dnl # their values may not be set when running:
+        dnl #
+        dnl #   ./configure --with-config=srpm
+        dnl #
+        AS_IF([test -n "$dracutdir" ], [
+                RPM_DEFINE_UTIL='--define "_dracutdir $(dracutdir)"'
+        ])
+        AS_IF([test -n "$udevdir" ], [
+                RPM_DEFINE_UTIL+=' --define "_udevdir $(udevdir)"'
+        ])
+        AS_IF([test -n "$udevruledir" ], [
+                RPM_DEFINE_UTIL+=' --define "_udevdir $(udevruledir)"'
+        ])
+        RPM_DEFINE_UTIL+=' $(DEFINE_INITRAMFS)'
+        RPM_DEFINE_UTIL+=' $(DEFINE_SYSTEMD)'
+
        RPM_DEFINE_KMOD='--define "kernels $(LINUX_VERSION)" --define "require_spldir $(SPL)" --define "require_splobj $(SPL_OBJ)" --define "ksrc $(LINUX)" --define "kobj $(LINUX_OBJ)"'
        RPM_DEFINE_KMOD+=' --define "_wrong_version_format_terminate_build 0"'