diff options
| author | Kevin E Martin <kem@kem.org> | 2005-12-07 16:17:59 +0000 |
|---|---|---|
| committer | Kevin E Martin <kem@kem.org> | 2005-12-07 16:17:59 +0000 |
| commit | af3cf72277abea12541117e7acc9867a7ad48cb7 (patch) | |
| tree | 07292131008037c442e42313f037537949378ca5 | |
| parent | 15eddf034f082a10076967e77fd7af5d6a0cca2a (diff) | |
Change to use the app-defaults default dir configured in libXt.
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | configure.ac | 4 |
3 files changed, 11 insertions, 1 deletions
@@ -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 a484d98..d945683 100644 --- a/Makefile.am +++ b/Makefile.am @@ -150,7 +150,7 @@ chooser_SOURCES = \ # App default files (*.ad) -appdefaultdir = $(libdir)/X11/app-defaults +appdefaultdir = @appdefaultdir@ APPDEFAULTFILES = Chooser diff --git a/configure.ac b/configure.ac index 2e6768f..44b72be 100644 --- a/configure.ac +++ b/configure.ac @@ -459,6 +459,10 @@ AC_DEFINE_DIR(DEF_AUTH_DIR, XDMCONFIGDIR, AC_DEFINE_DIR(DEF_GREETER_LIB, XDMLIBDIR/libXdmGreet.so, [Define to pathname where greeter shared object is installed (if used)]) +PKG_CHECK_MODULES(APPDEFS, xt) +appdefaultdir=$(pkg-config --variable=appdefaultdir xt) +AC_SUBST(appdefaultdir) + XORG_MANPAGE_SECTIONS XORG_RELEASE_VERSION |