Change to use the app-defaults default dir configured in libXt.

01110cd4 · Kevin E Martin · de145e04 · 01110cd4 · 01110cd4 · 01110cd4
Commit 01110cd4 authored Dec 07, 2005 by Kevin E Martin
Hide whitespace changes
Inline Side-by-side

Showing with 11 additions and 1 deletion

ChangeLog ChangeLog +6 -0

Makefile.am Makefile.am +1 -1

configure.ac configure.ac +4 -0

No files found.
--- a/ChangeLog
+++ b/ChangeLog
+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:

--- a/Makefile.am
+++ b/Makefile.am
@@ -38,7 +38,7 @@ appman_PRE = \

 # App default files  (*.ad)

-appdefaultdir = $(libdir)/X11/app-defaults
+appdefaultdir = @appdefaultdir@


 APPDEFAULTFILES = \

--- a/configure.ac
+++ b/configure.ac
@@ -36,6 +36,10 @@ PKG_CHECK_MODULES(OCLOCK, x11 xmu xext)
 AC_SUBST(OCLOCK_CFLAGS)
 AC_SUBST(OCLOCK_LIBS)

+PKG_CHECK_MODULES(APPDEFS, xt)
+appdefaultdir=$(pkg-config --variable=appdefaultdir xt)
+AC_SUBST(appdefaultdir)
+
 XORG_MANPAGE_SECTIONS
 XORG_RELEASE_VERSION