diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | acinclude.m4 | 5 |
2 files changed, 9 insertions, 2 deletions
@@ -1,3 +1,9 @@ +2006-06-05 Keith Packard <keithp@keithp.com> + + * acinclude.m4: + Update AC_DEFINE_DIR to version compatible with CVS autoconf + which requires double eval to avoid leaving ${prefix} in output + 2006-06-04 Adam Jackson <ajax@freedesktop.org> * hw/xfree86/loader/dixsym.c: diff --git a/acinclude.m4 b/acinclude.m4 index 3d3d03f77..203143214 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -1,11 +1,12 @@ -dnl From http://autoconf-archive.cryp.to/ac_define_dir.html. - AC_DEFUN([AC_DEFINE_DIR], [ prefix_NONE= exec_prefix_NONE= test "x$prefix" = xNONE && prefix_NONE=yes && prefix=$ac_default_prefix test "x$exec_prefix" = xNONE && exec_prefix_NONE=yes && exec_prefix=$prefix +dnl In Autoconf 2.60, ${datadir} refers to ${datarootdir}, which in turn +dnl refers to ${prefix}. Thus we have to use `eval' twice. eval ac_define_dir="\"[$]$2\"" + eval ac_define_dir="\"$ac_define_dir\"" AC_SUBST($1, "$ac_define_dir") AC_DEFINE_UNQUOTED($1, "$ac_define_dir", [$3]) test "$prefix_NONE" && prefix=NONE |