diff options
| author | Kevin E Martin <kem@kem.org> | 2005-12-08 17:55:17 +0000 |
|---|---|---|
| committer | Kevin E Martin <kem@kem.org> | 2005-12-08 17:55:17 +0000 |
| commit | 9169e024c530c9ef60cd96263a9fe6000578ec0f (patch) | |
| tree | 96f942f76537e972274ffe12f99d670a60256f93 | |
| parent | 5e37a2d4e4b23b6f4d40e5d4f3d2d1520c5cf727 (diff) | |
Add configure options to allow hard-coded paths to be changed.MODULAR_COPY
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | Makefile.am | 4 | ||||
| -rw-r--r-- | configure.ac | 7 |
3 files changed, 16 insertions, 1 deletions
@@ -1,3 +1,9 @@ +2005-12-08 Kevin E. Martin <kem-at-freedesktop-dot-org> + + * Makefile.am: + * configure.ac: + Add configure options to allow hard-coded paths to be changed. + 2005-12-06 Kevin E. Martin <kem-at-freedesktop-dot-org> * Makefile.am: diff --git a/Makefile.am b/Makefile.am index 3f2b876..226d448 100644 --- a/Makefile.am +++ b/Makefile.am @@ -21,9 +21,11 @@ bin_PROGRAMS = setxkbmap +XKBCONFIGROOT=@XKBCONFIGROOT@ + setxkbmap_CFLAGS = $(SETXKBMAP_CFLAGS) \ -D__XKBDEFRULES__='"xorg"' \ - -DDFLT_XKB_CONFIG_ROOT='"$(datadir)/X11/xkb"' + -DDFLT_XKB_CONFIG_ROOT=\"$(XKBCONFIGROOT)\" setxkbmap_LDADD = $(SETXKBMAP_LIBS) setxkbmap_SOURCES = \ diff --git a/configure.ac b/configure.ac index 4e7052c..7dc1db7 100644 --- a/configure.ac +++ b/configure.ac @@ -31,6 +31,13 @@ AM_CONFIG_HEADER(config.h) AC_PROG_CC AC_PROG_INSTALL +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]) + # Checks for pkg-config packages PKG_CHECK_MODULES(SETXKBMAP, xkbfile x11) AC_SUBST(SETXKBMAP_CFLAGS) |