From 9169e024c530c9ef60cd96263a9fe6000578ec0f Mon Sep 17 00:00:00 2001
From: Kevin E Martin <kem@kem.org>
Date: Thu, 8 Dec 2005 17:55:17 +0000
Subject: Add configure options to allow hard-coded paths to be changed.

---
 ChangeLog    | 6 ++++++
 Makefile.am  | 4 +++-
 configure.ac | 7 +++++++
 3 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index e32e644..43187d1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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)
-- 
cgit v1.2.3