From: Karel Zak <kzak@redhat.com>
Date: Mon, 11 Nov 2019 12:08:04 +0000 (+0100)
Subject: build-sys: introduce $sysconfstaticdir
X-Git-Tag: v2.35-rc1~61
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c2409b55a08806f4b746e5edf3a42665ef636665;p=thirdparty%2Futil-linux.git

build-sys: introduce $sysconfstaticdir

The current situation is that distros differentiate between:

* host specific configuration -- usually /etc, maintained by admin

* distribution specific (static) configuration -- usually /usr/lib,
  maintained by ditro packages

Unfortunately autotools have clue about $sysconfdir (/etc) only. This
patch introduces $sysconfstaticdir (default $prefix/lib).

Signed-off-by: Karel Zak <kzak@redhat.com>
---

diff --git a/Makefile.am b/Makefile.am
index 9ef752f3c7..95e832cdc2 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,7 +2,9 @@ AM_CPPFLAGS = \
 	-include config.h \
 	-I$(top_srcdir)/include \
 	-DLOCALEDIR=\"$(localedir)\" \
-	-D_PATH_RUNSTATEDIR=\"${runstatedir}\"
+	-D_PATH_RUNSTATEDIR=\"${runstatedir}\" \
+	-D_PATH_SYSCONFSTATICDIR=\"${sysconfstaticdir}\"
+
 AM_CFLAGS = -fsigned-char $(WARN_CFLAGS)
 AM_LDFLAGS = $(ASAN_LDFLAGS)
 
diff --git a/configure.ac b/configure.ac
index f70f8d1eea..e8a03bf009 100644
--- a/configure.ac
+++ b/configure.ac
@@ -101,6 +101,14 @@ AS_CASE([$libdir],
 )
 AC_SUBST([usrlib_execdir])
 
+# static configuration maintaned by packages (e.g. /usr/lib)
+AC_ARG_VAR([SYSCONFSTATICDIR],
+	   [Path to static system configuration, default ${prefix}/lib])
+AS_IF([test "x$SYSCONFSTATICDIR" = x],
+      [sysconfstaticdir='${prefix}/lib'],
+      [sysconfstaticdir=$SYSCONFSTATICDIR])
+AC_SUBST([sysconfstaticdir])
+
 
 AM_PROG_CC_C_O
 AC_PROG_MKDIR_P