<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 TRANSITIONAL//EN"> <HTML> <HEAD> <META HTTP-EQUIV="Content-Type" CONTENT="text/html; CHARSET=UTF-8"> <META NAME="GENERATOR" CONTENT="GtkHTML/3.32.2"> </HEAD> <BODY> On Fri, 2011-09-09 at 09:58 +0200, Egbert Eich wrote: <BLOCKQUOTE TYPE=CITE> <PRE> 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 <<A HREF="mailto:eich@freedesktop.org">eich@freedesktop.org</A>> --- configure.ac | 3 +++ src/Makefile.am | 2 +- 2 files changed, 4 insertions(+), 1 deletions(-) diff --git a/configure.ac b/configure.ac index 84a9f4f..3edfeeb 100644 --- a/configure.ac +++ b/configure.ac @@ -154,6 +154,9 @@ case $host_os in esac AC_SUBST(STRINGSABIOPTIONS) +ERRORDBDIR=${datadir}/X11 +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) </PRE> </BLOCKQUOTE> Simpler and better, thanks. Reviewed-by: Gaetan Nadon <<A HREF="mailto:memsize@videotron.ca">memsize@videotron.ca</A>> Tested-by: Gaetan Nadon <<A HREF="mailto:memsize@videotron.ca">memsize@videotron.ca</A>> </BODY> </HTML>