diff options
| -rw-r--r-- | configure.ac | 26 | ||||
| -rw-r--r-- | m4/as-ac-expand.m4 | 49 |
2 files changed, 17 insertions, 58 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], diff --git a/m4/as-ac-expand.m4 b/m4/as-ac-expand.m4 deleted file mode 100644 index deebd2bf..00000000 --- a/m4/as-ac-expand.m4 +++ /dev/null @@ -1,49 +0,0 @@ -dnl as-ac-expand.m4 0.2.0 -*- autoconf -*- -dnl autostars m4 macro for expanding directories using configure's prefix - -dnl (C) 2003, 2004, 2005 Thomas Vander Stichele <thomas at apestaart dot org> - -dnl Copying and distribution of this file, with or without modification, -dnl are permitted in any medium without royalty provided the copyright -dnl notice and this notice are preserved. - -dnl AS_AC_EXPAND(VAR, CONFIGURE_VAR) - -dnl example: -dnl AS_AC_EXPAND(SYSCONFDIR, $sysconfdir) -dnl will set SYSCONFDIR to /usr/local/etc if prefix=/usr/local - -AC_DEFUN([AS_AC_EXPAND], -[ - EXP_VAR=[$1] - FROM_VAR=[$2] - - dnl first expand prefix and exec_prefix if necessary - prefix_save=$prefix - exec_prefix_save=$exec_prefix - - dnl if no prefix given, then use /usr/local, the default prefix - if test "x$prefix" = "xNONE"; then - prefix="$ac_default_prefix" - fi - dnl if no exec_prefix given, then use prefix - if test "x$exec_prefix" = "xNONE"; then - exec_prefix=$prefix - fi - - full_var="$FROM_VAR" - dnl loop until it doesn't change anymore - while true; do - new_full_var="`eval echo $full_var`" - if test "x$new_full_var" = "x$full_var"; then break; fi - full_var=$new_full_var - done - - dnl clean up - full_var=$new_full_var - AC_SUBST([$1], "$full_var") - - dnl restore prefix and exec_prefix - prefix=$prefix_save - exec_prefix=$exec_prefix_save -]) |