From 8113fde1cc66413534f82820c363f7a142ca7b08 Mon Sep 17 00:00:00 2001
From: Kevin E Martin <kem@kem.org>
Date: Wed, 7 Dec 2005 16:17:58 +0000
Subject: Change to use the app-defaults default dir configured in libXt.

---
 ChangeLog    | 6 ++++++
 Makefile.am  | 2 +-
 configure.ac | 4 ++++
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index f05d50a..7492ea6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-12-07  Kevin E. Martin  <kem-at-freedesktop-dot-org>
+
+	* Makefile.am:
+	* configure.ac:
+	Change to use the app-defaults default dir configured in libXt.
+
 2005-12-06  Kevin E. Martin  <kem-at-freedesktop-dot-org>
 
 	* Makefile.am:
diff --git a/Makefile.am b/Makefile.am
index e5396d7..7608eaf 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -44,7 +44,7 @@ appman_PRE = \
 
 # App default files  (*.ad)
 
-appdefaultdir = $(libdir)/X11/app-defaults
+appdefaultdir = @appdefaultdir@
 
 APPDEFAULTFILES = \
         Editres-color \
diff --git a/configure.ac b/configure.ac
index 33dffc6..5a5ee97 100644
--- a/configure.ac
+++ b/configure.ac
@@ -40,6 +40,10 @@ EDITRES_LIBS="$DEP_LIBS $XAW_LIBS"
 AC_SUBST(EDITRES_CFLAGS)
 AC_SUBST(EDITRES_LIBS)
 
+PKG_CHECK_MODULES(APPDEFS, xt)
+appdefaultdir=$(pkg-config --variable=appdefaultdir xt)
+AC_SUBST(appdefaultdir)
+
 XORG_MANPAGE_SECTIONS
 XORG_RELEASE_VERSION
 
-- 
cgit v1.2.3