diff options
| author | Alan Coopersmith <Alan.Coopersmith@sun.com> | 2005-10-18 01:50:02 +0000 |
|---|---|---|
| committer | Alan Coopersmith <Alan.Coopersmith@sun.com> | 2005-10-18 01:50:02 +0000 |
| commit | 5e37faddaac8ac50ee4ca719975f9bf526e4c980 (patch) | |
| tree | 4feb3a00af6cbee8174bc5aaadbbcc35517e2ec8 | |
| parent | 52edad6913e3efd3fcec6c73e13d33bf8c3a5e65 (diff) | |
Add --with-xfile-search-path=<path> and default setting to match monolith
XFileSearchPathDefault in Imake (including extra directories used in
Debian section of linux.cf.)
| -rw-r--r-- | ChangeLog | 10 | ||||
| -rw-r--r-- | configure.ac | 9 | ||||
| -rw-r--r-- | src/Makefile.am | 4 |
3 files changed, 21 insertions, 2 deletions
@@ -1,7 +1,15 @@ +2005-10-17 Alan Coopersmith <alan.coopersmith@sun.com> + + * src/Makefile.am: + * configure.ac: + Add --with-xfile-search-path=<path> and default setting to match + monolith XFileSearchPathDefault in Imake (including extra directories + used in Debian section of linux.cf.) + 2005-10-11 Alan Coopersmith <alan.coopersmith@sun.com> * man/Makefile.am: - * configure.ac + * configure.ac: Set up cpp pre-processing of man pages Add shadow man pages for man pages that document multiple functions. diff --git a/configure.ac b/configure.ac index 2d9c6dc..ab3e369 100644 --- a/configure.ac +++ b/configure.ac @@ -55,6 +55,15 @@ if test "x$XKB" = "xyes" ; then AC_DEFINE(XKB, 1, [Define to 1 to use XKB for keysym resolution.]) 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' + +AC_ARG_WITH(xfile-search-path, + AC_HELP_STRING([--with-xfile-search-path=<path>], + [Set path to search for app-defaults and other files]), + [XFILESEARCHPATHDEFAULT="$withval"], []) +AC_SUBST([XFILESEARCHPATHDEFAULT]) + # Replacement for Imake ToolkitStringsABIOptions, controls string tables # generated by util/string.list in StringDefs.h & Shell.h case $host_os in diff --git a/src/Makefile.am b/src/Makefile.am index 18fa4a6..9b7668b 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -3,7 +3,9 @@ lib_LTLIBRARIES = libXt.la BUILT_SOURCES = $(BUILT_FILES) CLEANFILES = $(BUILT_SOURCES) -AM_CFLAGS = $(XT_CFLAGS) $(X11_CFLAGS) +SRCH_DEFINES = -DXFILESEARCHPATHDEFAULT=\"$(XFILESEARCHPATHDEFAULT)\" + +AM_CFLAGS = $(XT_CFLAGS) $(X11_CFLAGS) $(SRCH_DEFINES) INCLUDES = -I$(top_srcdir)/include/ -I$(top_srcdir)/include/X11 \ -I$(top_builddir)/include -I$(top_builddir)/include/X11 |