frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update AC_DEFINE_DIR to version compatible with CVS autoconf which requires 

double eval to avoid leaving ${prefix} in output
This commit is contained in:
Keith Packard 2006-06-05 07:15:23 +00:00
parent 52fc7c8dc7
commit 11cf4d2fde
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -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> 2006-06-04 Adam Jackson <ajax@freedesktop.org>
* hw/xfree86/loader/dixsym.c: * hw/xfree86/loader/dixsym.c:

5
acinclude.m4
View File

@ -1,11 +1,12 @@
dnl From http://autoconf-archive.cryp.to/ac_define_dir.html.
AC_DEFUN([AC_DEFINE_DIR], [ AC_DEFUN([AC_DEFINE_DIR], [
prefix_NONE= prefix_NONE=
exec_prefix_NONE= exec_prefix_NONE=
test "x$prefix" = xNONE && prefix_NONE=yes && prefix=$ac_default_prefix test "x$prefix" = xNONE && prefix_NONE=yes && prefix=$ac_default_prefix
test "x$exec_prefix" = xNONE && exec_prefix_NONE=yes && exec_prefix=$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="\"[$]$2\""
eval ac_define_dir="\"$ac_define_dir\""
AC_SUBST($1, "$ac_define_dir") AC_SUBST($1, "$ac_define_dir")
AC_DEFINE_UNQUOTED($1, "$ac_define_dir", [$3]) AC_DEFINE_UNQUOTED($1, "$ac_define_dir", [$3])
test "$prefix_NONE" && prefix=NONE test "$prefix_NONE" && prefix=NONE