diff options
| author | Dan Nicholson <dbn.lists@gmail.com> | 2009-03-07 16:36:51 -0800 |
|---|---|---|
| committer | Dan Nicholson <dbn.lists@gmail.com> | 2009-03-07 16:36:51 -0800 |
| commit | 2fd42dae8840089727f95211abdb86316e566afd (patch) | |
| tree | 18d3d9f9b55a768ff5ebb7f109f61d99d47b04ae | |
| parent | 3b816fe819bd849acdbabcfba769041bd3eab753 (diff) | |
Allow the default XKB config root to be set from configure
The default was hardcoded in the Makefile as $(datadir)/share/X11/xkb.
This could cause a problem if you are installing xkbcomp to an alternate
location but want to continue using the system's XKB data.
Signed-off-by: Dan Nicholson <dbn.lists@gmail.com>
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | configure.ac | 7 |
2 files changed, 8 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am index e5234d1..fca1f67 100644 --- a/Makefile.am +++ b/Makefile.am @@ -21,7 +21,7 @@ bin_PROGRAMS = xkbcomp -AM_CFLAGS = $(XKBCOMP_CFLAGS) -DDFLT_XKB_CONFIG_ROOT='"$(datadir)/X11/xkb"' +AM_CFLAGS = $(XKBCOMP_CFLAGS) -DDFLT_XKB_CONFIG_ROOT='"$(XKBCONFIGROOT)"' xkbcomp_LDADD = $(XKBCOMP_LIBS) xkbcomp_SOURCES = \ diff --git a/configure.ac b/configure.ac index 0470334..9543655 100644 --- a/configure.ac +++ b/configure.ac @@ -45,6 +45,13 @@ XKBCOMP_CFLAGS="$CWARNFLAGS $XKBCOMP_CFLAGS" AC_SUBST(XKBCOMP_CFLAGS) AC_SUBST(XKBCOMP_LIBS) +AC_ARG_WITH([xkb_config_root], + [AC_HELP_STRING([--with-xkb-config-root=<paths>], + [Set default XKB config root (default: ${datadir}/X11/xkb)])], + [XKBCONFIGROOT="$withval"], + [XKBCONFIGROOT='${datadir}/X11/xkb']) +AC_SUBST([XKBCONFIGROOT]) + XORG_MANPAGE_SECTIONS XORG_RELEASE_VERSION XORG_CHANGELOG |