This lets Xt search for it's ErrorDB in the same location
as Xlib. These error databases are architecture independent
data files.
The XtErrorDB file neither exists in libXt nor has it ever
been supplied by any '3rd party' (at least Google didn't
turn up any results).
Therefore changing the location of this file (again) should
have no side effects on backward compatibility.
Signed-off-by: Egbert Eich <e...@freedesktop.org>
---
configure.ac | 4 ++++
src/Makefile.am | 2 +-
2 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/configure.ac b/configure.ac
index 84a9f4f..35c43a2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -154,6 +154,10 @@ case $host_os in
esac
AC_SUBST(STRINGSABIOPTIONS)
+ERRORDBDIR=${datadir}/X11
+AX_DEFINE_DIR(ERRORDBDIR, ERRORDBDIR, [Location of Xt errordb])
+AC_SUBST(ERRORDBDIR)
+
case $host_os in
darwin*)
OS_CFLAGS="-Wl,-flat_namespace"
diff --git a/src/Makefile.am b/src/Makefile.am
index 2b39ec5..a689b47 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -4,7 +4,7 @@ BUILT_SOURCES = $(BUILT_FILES)
CLEANFILES = $(BUILT_SOURCES)
SRCH_DEFINES = -DXFILESEARCHPATHDEFAULT=\"$(XFILESEARCHPATHDEFAULT)\"
-ERRORDB_DEFINES = -DERRORDB=\"$(libdir)/X11/XtErrorDB\"
+ERRORDB_DEFINES = -DERRORDB=\"$(ERRORDBDIR)/XtErrorDB\"
AM_CFLAGS = $(CWARNFLAGS) $(XT_CFLAGS) $(SRCH_DEFINES) $(ERRORDB_DEFINES) \
$(XTMALLOC_ZERO_CFLAGS)
--
1.7.3.4
_______________________________________________
xorg-devel@lists.x.org: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: http://lists.x.org/mailman/listinfo/xorg-devel
