From 1e549821dd9fbb322dc9b620f65fa15bd4991279 Mon Sep 17 00:00:00 2001 From: Kevin E Martin Date: Wed, 7 Dec 2005 16:17:59 +0000 Subject: Change to use the app-defaults default dir configured in libXt. --- ChangeLog | 6 ++++++ Makefile.am | 2 +- configure.ac | 3 +++ 3 files changed, 10 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 + + * Makefile.am: + * configure.ac: + Change to use the app-defaults default dir configured in libXt. + 2005-12-06 Kevin E. Martin * Makefile.am: diff --git a/Makefile.am b/Makefile.am index c9a58d5..5d5977d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -35,7 +35,7 @@ appman_PRE = \ # App default files (*.ad) -appdefaultdir = $(libdir)/X11/app-defaults +appdefaultdir = @appdefaultdir@ APPDEFAULTFILES = \ Xfd diff --git a/configure.ac b/configure.ac index 5e8a964..bdc236c 100644 --- a/configure.ac +++ b/configure.ac @@ -43,6 +43,9 @@ AC_SUBST(XFD_CFLAGS) AC_SUBST(XFD_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