Add configure option to set the build's app-default dir, and put the result

    in the xt.pc file for applications to use.

3 files changed, 16 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index 837c5b9..e6a568a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2005-12-07  Kevin E. Martin  <kem-at-freedesktop-dot-org>
+
+	* configure.ac:
+	* xt.pc.in:
+	Add configure option to set the build's app-default dir, and put
+	the result in the xt.pc file for applications to use.
+
 2005-12-06  Kevin E. Martin  <kem-at-freedesktop-dot-org>
 
 	* man/Makefile.am:
diff --git a/configure.ac b/configure.ac
index af40370..cde938f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -56,7 +56,7 @@ if test "x$XKB" = "xyes" ; then
 fi
 
 # Replaces XFileSearchPathDefault from Imake configs
-XFILESEARCHPATHDEFAULT='$(sysconfdir)/X11/%L/%T/%N%C%S:$(sysconfdir)/X11/%l/%T/%N%C%S:$(sysconfdir)/X11/%T/%N%C%S:$(sysconfdir)/X11/%L/%T/%N%S:$(sysconfdir)/X11/%l/%T/%N%S:$(sysconfdir)/X11/%T/%N%S:$(libdir)/X11/%L/%T/%N%C%S:$(libdir)/X11/%l/%T/%N%C%S:$(libdir)/X11/%T/%N%C%S:$(libdir)/X11/%L/%T/%N%S:$(libdir)/X11/%l/%T/%N%S:$(libdir)/X11/%T/%N%S'
+XFILESEARCHPATHDEFAULT='$(sysconfdir)/X11/%L/%T/%N%C%S:$(sysconfdir)/X11/%l/%T/%N%C%S:$(sysconfdir)/X11/%T/%N%C%S:$(sysconfdir)/X11/%L/%T/%N%S:$(sysconfdir)/X11/%l/%T/%N%S:$(sysconfdir)/X11/%T/%N%S:$(datadir)/X11/%L/%T/%N%C%S:$(datadir)/X11/%l/%T/%N%C%S:$(datadir)/X11/%T/%N%C%S:$(datadir)/X11/%L/%T/%N%S:$(datadir)/X11/%l/%T/%N%S:$(datadir)/X11/%T/%N%S:$(libdir)/X11/%L/%T/%N%C%S:$(libdir)/X11/%l/%T/%N%C%S:$(libdir)/X11/%T/%N%C%S:$(libdir)/X11/%L/%T/%N%S:$(libdir)/X11/%l/%T/%N%S:$(libdir)/X11/%T/%N%S'
 
 AC_ARG_WITH(xfile-search-path,
 	AC_HELP_STRING([--with-xfile-search-path=<path>],
@@ -64,6 +64,13 @@ AC_ARG_WITH(xfile-search-path,
 	[XFILESEARCHPATHDEFAULT="$withval"], [])
 AC_SUBST([XFILESEARCHPATHDEFAULT])
 
+AC_ARG_WITH(appdefaultdir,
+	AC_HELP_STRING([--with-appdefaultdir=<path>],
+		       [Set app-default directory (default: ${datadir}/X11/app-defaults)]),
+	[appdefaultdir="$withval"],
+	[appdefaultdir=${datadir}/X11/app-defaults])
+AC_SUBST([appdefaultdir])
+
 # Replacement for Imake ToolkitStringsABIOptions, controls string tables
 # generated by util/string.list in StringDefs.h & Shell.h
 case $host_os in
diff --git a/xt.pc.in b/xt.pc.in
index 77d47cf..3ea8c6f 100644
--- a/xt.pc.in
+++ b/xt.pc.in
@@ -2,6 +2,7 @@ prefix=@prefix@
 exec_prefix=@exec_prefix@
 libdir=@libdir@
 includedir=@includedir@
+appdefaultdir=@appdefaultdir@
 
 Name: Xt
 Description: X Toolkit Library