fdo-mirrors/xorg-libx11
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/xorg/lib/libx11.git synced 2026-05-09 03:48:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix for autoconf 2.60 issue.

Browse source 
Updated AC_DEFINE_DIR.
Reverted datarootdir change.
This commit is contained in:
Matthias Hopf 2006-07-04 12:16:30 +02:00
parent 644f4828b1
commit a92eb67856
2 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
acinclude.m4
View file

@ -4,7 +4,10 @@ AC_DEFUN([AC_DEFINE_DIR], [
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

2
configure.ac
View file

@ -321,7 +321,7 @@ if test "x$GCC" = "xyes"; then
X11_CFLAGS="$GCC_WARNINGS $X11_CFLAGS"
fi
X11_DATADIR="${datarootdir}/X11"
X11_DATADIR="${datadir}/X11"
AC_DEFINE_DIR(X11_DATADIR, X11_DATADIR, [Location of libX11 data])
AC_SUBST(X11_DATADIR)