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

Work around recent autoconf (2.59?) changes in directory expansion.

Browse source 
Recent autoconf versions have changed how directory names are managed in the
configure.ac script; automatic 'eval' invocations now occur as a part of the
AC_DEFINE_DIR macro which make it imperative that AC_DEFINE_DIR be executed
before the variables are used in further macro definitions. Also, ${datadir}
is apparantly an old name for ${datarootdir} as ${datadir} doesn't get
expanded correctly by AC_DEFINE_DIR. This looks like an autoconf bug, but it
is easy to work around by just using ${datarootdir} instead of ${datadir}.
This commit is contained in:
Keith Packard 2006-07-01 21:31:23 -07:00
parent be70a31229
commit 644f4828b1
1 changed files with 21 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
configure.ac
View file

@ -321,8 +321,13 @@ if test "x$GCC" = "xyes"; then
X11_CFLAGS="$GCC_WARNINGS $X11_CFLAGS"
fi
X11_DATADIR="${datadir}/X11"
X11_DATADIR="${datarootdir}/X11"
AC_DEFINE_DIR(X11_DATADIR, X11_DATADIR, [Location of libX11 data])
AC_SUBST(X11_DATADIR)
X11_LIBDIR="${libdir}/X11"
AC_DEFINE_DIR(X11_LIBDIR, X11_LIBDIR, [Location of libX11 library data])
AC_SUBST(X11_LIBDIR)
X11_CFLAGS="$X11_CFLAGS $XPROTO_CFLAGS"
AC_SUBST(X11_CFLAGS)
@ -337,20 +342,23 @@ AC_SUBST(X11_LIBS)
#
X11_LOCALEDATADIR="${X11_DATADIR}/locale"
X11_LOCALELIBDIR="${X11_LIBDIR}/locale"
X11_LOCALEDIR="${X11_LOCALEDATADIR}"
XKEYSYMDB="${X11_DATADIR}/XKeysymDB"
XERRORDB="${X11_DATADIR}/XErrorDB"
AC_SUBST(X11_DATADIR)
AC_SUBST(X11_LIBDIR)
AC_DEFINE_DIR(XLOCALEDATADIR, X11_LOCALEDATADIR, [Location of libX11 locale data])
AC_SUBST(X11_LOCALEDATADIR)
AC_SUBST(X11_LOCALELIBDIR)
AC_DEFINE_DIR(X11_DATADIR, X11_DATADIR, [Location of libX11 data])
AC_DEFINE_DIR(XKEYSYMDB, XKEYSYMDB, [Location of keysym database])
AC_DEFINE_DIR(XERRORDB, XERRORDB, [Location of error message database])
AC_DEFINE_DIR(XLOCALEDIR, X11_LOCALEDIR, [Location of libX11 locale data])
X11_LOCALELIBDIR="${X11_LIBDIR}/locale"
AC_DEFINE_DIR(XLOCALELIBDIR, X11_LOCALELIBDIR, [Location of libX11 locale libraries])
AC_SUBST(X11_LOCALELIBDIR)
X11_LOCALEDIR="${X11_LOCALEDATADIR}"
AC_DEFINE_DIR(XLOCALEDIR, X11_LOCALEDIR, [Location of libX11 locale data])
AC_SUBST(X11_LOCALEDIR)
XKEYSYMDB="${X11_DATADIR}/XKeysymDB"
AC_DEFINE_DIR(XKEYSYMDB, XKEYSYMDB, [Location of keysym database])
XERRORDB="${X11_DATADIR}/XErrorDB"
AC_DEFINE_DIR(XERRORDB, XERRORDB, [Location of error message database])
XORG_CHECK_MALLOC_ZERO
XORG_RELEASE_VERSION