diff options
| author | Simon McVittie <smcv@collabora.com> | 2022-10-11 21:20:50 +0100 |
|---|---|---|
| committer | Ralf Habacker <ralf.habacker@freenet.de> | 2022-10-12 06:40:30 +0000 |
| commit | 786c47b51d910eac75a3c838e77d34d98f489e77 (patch) | |
| tree | 60b60f70611cfa047a7666f905140c34099131bb /configure.ac | |
| parent | cced1a5e2d38d117f8e2f664f22e562d08b4c2ca (diff) | |
| download | dbus-786c47b51d910eac75a3c838e77d34d98f489e77.tar.gz | |
Autotools: use AX_RECURSIVE_EVAL instead of AS_AC_EXPAND
AX_RECURSIVE_EVAL is maintained as part of autoconf-archive, so we don't
need to bundle our own copy and keep track of its licensing status.
It's very similar to AS_AC_EXPAND, but the arguments are the other way
round and it doesn't automatically AC_SUBST its result.
Signed-off-by: Simon McVittie <smcv@collabora.com>
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 26 |
1 files changed, 17 insertions, 9 deletions
diff --git a/configure.ac b/configure.ac index 7da53d5d..5187229c 100644 --- a/configure.ac +++ b/configure.ac @@ -10,7 +10,7 @@ AC_INIT([dbus], [dbus_version], [https://gitlab.freedesktop.org/dbus/dbus/issues AC_CONFIG_AUX_DIR([build-aux]) -m4_pattern_forbid([^AX_(CHECK_ENABLE_DEBUG|CODE_COVERAGE|COMPILER_FLAGS|COMPILER_FLAGS_(CFLAGS|CXXFLAGS|LDFLAGS))\b], +m4_pattern_forbid([^AX_(CHECK_ENABLE_DEBUG|CODE_COVERAGE|COMPILER_FLAGS|COMPILER_FLAGS_(CFLAGS|CXXFLAGS|LDFLAGS)|RECURSIVE_EVAL)\b], [Unexpanded AX_ macro found. Please install GNU autoconf-archive]) AC_CANONICAL_HOST @@ -1296,14 +1296,22 @@ AC_SUBST([runstatedir]) #### find the actual value for $prefix that we'll end up with ## (I know this is broken and should be done in the Makefile, but ## that's a major pain and almost nobody actually seems to care) -AS_AC_EXPAND(EXPANDED_PREFIX, "$prefix") -AS_AC_EXPAND(EXPANDED_LOCALSTATEDIR, "$localstatedir") -AS_AC_EXPAND(EXPANDED_SYSCONFDIR, "$sysconfdir") -AS_AC_EXPAND(EXPANDED_BINDIR, "$bindir") -AS_AC_EXPAND(EXPANDED_LIBDIR, "$libdir") -AS_AC_EXPAND(EXPANDED_LIBEXECDIR, "$libexecdir") -AS_AC_EXPAND(EXPANDED_DATADIR, "$datadir") -AS_AC_EXPAND(EXPANDED_RUNSTATEDIR, "$runstatedir") +AX_RECURSIVE_EVAL(["$prefix"], [EXPANDED_PREFIX]) +AX_RECURSIVE_EVAL(["$localstatedir"], [EXPANDED_LOCALSTATEDIR]) +AX_RECURSIVE_EVAL(["$sysconfdir"], [EXPANDED_SYSCONFDIR]) +AX_RECURSIVE_EVAL(["$bindir"], [EXPANDED_BINDIR]) +AX_RECURSIVE_EVAL(["$libdir"], [EXPANDED_LIBDIR]) +AX_RECURSIVE_EVAL(["$libexecdir"], [EXPANDED_LIBEXECDIR]) +AX_RECURSIVE_EVAL(["$datadir"], [EXPANDED_DATADIR]) +AX_RECURSIVE_EVAL(["$runstatedir"], [EXPANDED_RUNSTATEDIR]) +AC_SUBST([EXPANDED_PREFIX]) +AC_SUBST([EXPANDED_LOCALSTATEDIR]) +AC_SUBST([EXPANDED_SYSCONFDIR]) +AC_SUBST([EXPANDED_BINDIR]) +AC_SUBST([EXPANDED_LIBDIR]) +AC_SUBST([EXPANDED_LIBEXECDIR]) +AC_SUBST([EXPANDED_DATADIR]) +AC_SUBST([EXPANDED_RUNSTATEDIR]) ##### systemd unit files AC_ARG_WITH([systemdsystemunitdir], |