summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--Makefile.am2
-rw-r--r--configure.ac4
3 files changed, 11 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 9e0b71d..d0a7faf 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 fb58caf..241de9e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -60,7 +60,7 @@ SUFFIXES = .$(APP_MAN_SUFFIX) .man
# App default files (*.ad)
-appdefaultdir = $(libdir)/X11/app-defaults
+appdefaultdir = @appdefaultdir@
appdefault_DATA = Xvidtune
diff --git a/configure.ac b/configure.ac
index 2dbca64..5adbd56 100644
--- a/configure.ac
+++ b/configure.ac
@@ -55,6 +55,10 @@ AC_ARG_WITH(vendor-name,
[ VENDOR_NAME="The X.Org Foundation" ])
AC_SUBST([VENDOR_NAME])
+PKG_CHECK_MODULES(APPDEFS, xt)
+appdefaultdir=$(pkg-config --variable=appdefaultdir xt)
+AC_SUBST(appdefaultdir)
+
XORG_MANPAGE_SECTIONS
XORG_RELEASE_VERSION