From 480f9c6a9df847ea8ccc46713618084711c09a0f Mon Sep 17 00:00:00 2001 From: Joachim Wiberg Date: Sun, 16 Aug 2026 12:36:03 +0200 Subject: [PATCH] build: initctl loses AM_CPPFLAGS without D-Bus initctl_CPPFLAGS is only assigned under the DBUS conditional, but an automake per-target variable exists even when its conditional is false, so a --disable-dbus build dropped AM_CPPFLAGS entirely: util.c:319:16: error: invalid use of undefined type 'struct FTW' Assign the base flags unconditionally and append under DBUS. Signed-off-by: Joachim Wiberg --- src/Makefile.am | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/Makefile.am b/src/Makefile.am index b7c544f4..cd1fde63 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -97,11 +97,12 @@ endif initctl_SOURCES = initctl.c initctl.h cgutil.c cgutil.h \ client.c client.h cond.c cond.h reboot.c \ serv.c serv.h svc.h util.c util.h log.h +initctl_CPPFLAGS = $(AM_CPPFLAGS) initctl_CFLAGS = -W -Wall -Wextra -Wno-unused-parameter -std=gnu99 initctl_CFLAGS += $(lite_CFLAGS) $(uev_CFLAGS) initctl_LDADD = $(lite_LIBS) $(uev_LIBS) if DBUS -initctl_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_srcdir)/libink +initctl_CPPFLAGS += -I$(top_srcdir)/libink initctl_LDADD += $(top_builddir)/libink/libink.la endif