From b6a610df2669336756c67f77eb857b190b77770a Mon Sep 17 00:00:00 2001 From: Victor Julien Date: Tue, 11 Feb 2025 13:50:32 +0100 Subject: [PATCH] build: pass LOCAL_STATE_DIR through autoconf.h Helps tooling like cppcheck, clang-tidy. --- configure.ac | 1 + src/Makefile.am | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index ca964d9039..83e769e40a 100644 --- a/configure.ac +++ b/configure.ac @@ -2489,6 +2489,7 @@ AC_SUBST(e_logcertsdir) AC_SUBST(e_sysconfdir) AC_DEFINE_UNQUOTED([CONFIG_DIR],["$e_sysconfdir"],[Our CONFIG_DIR]) AC_SUBST(e_localstatedir) +AC_DEFINE_UNQUOTED([LOCAL_STATE_DIR],["$localstatedir"],[Our LOCAL_STATE_DIR]) AC_SUBST(e_datadir) AC_DEFINE_UNQUOTED([DATA_DIR],["$e_datadir"],[Our DATA_DIR]) AC_SUBST(e_magic_file) diff --git a/src/Makefile.am b/src/Makefile.am index 3540b31869..5bfa9de62d 100755 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1382,7 +1382,7 @@ endif # default CFLAGS AM_CFLAGS = ${OPTIMIZATION_CFLAGS} ${GCC_CFLAGS} ${CLANG_CFLAGS} \ - ${SECCFLAGS} ${PCAP_CFLAGS} -DLOCAL_STATE_DIR=\"$(localstatedir)\" \ + ${SECCFLAGS} ${PCAP_CFLAGS} \ -Wall -Wno-unused-parameter -Wmissing-prototypes -Wmissing-declarations \ -Wstrict-prototypes -Wwrite-strings -Wbad-function-cast \ -Wformat-security -Wno-format-nonliteral -Wmissing-format-attribute \