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 /m4 | |
| 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 'm4')
| -rw-r--r-- | m4/as-ac-expand.m4 | 49 |
1 files changed, 0 insertions, 49 deletions
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 -]) |