Revert "autotools: Replace AS_AC_EXPAND with AX_RECURSIVE_EVAL"

This reverts commit 86b42e633c7679d97e7844ecec4c7783c6aedff0.

2 files changed, 55 insertions, 6 deletions

diff --git a/acinclude.m4 b/acinclude.m4
new file mode 100644
index 00000000..deebd2bf
--- /dev/null
+++ b/acinclude.m4
@@ -0,0 +1,49 @@
+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
+])
diff --git a/configure.ac b/configure.ac
index 469ca9cc..31206f36 100644
--- a/configure.ac
+++ b/configure.ac
@@ -97,12 +97,12 @@ AC_DEFINE_UNQUOTED([SHLIB_SUFFIX], "$SHLIB_SUFFIX", [Define to the platform's sh
 #### 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)
-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)
+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")
 
 #### Directory to install the libexec binaries
 GOBJECT_INTROSPECTION_LIBDIR="$EXPANDED_LIBDIR"