From 9b949814b988ffb0d01bfd945b207bbb8379e573 Mon Sep 17 00:00:00 2001 From: Kevin E Martin Date: Thu, 8 Dec 2005 17:55:17 +0000 Subject: [PATCH] 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 f05d50a..d80e8f0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2005-12-08 Kevin E. Martin + + * Makefile.am: + * configure.ac: + Add configure options to allow hard-coded paths to be changed. + 2005-12-06 Kevin E. Martin * Makefile.am: diff --git a/Makefile.am b/Makefile.am index 55c510e..705d239 100644 --- a/Makefile.am +++ b/Makefile.am @@ -21,7 +21,9 @@ bin_PROGRAMS = luit -luit_CFLAGS = $(LUIT_CFLAGS) +LOCALEALIASFILE = @LOCALEALIASFILE@ + +luit_CFLAGS = $(LUIT_CFLAGS) -DLOCALE_ALIAS_FILE=\"$(LOCALEALIASFILE)\" luit_LDADD = $(LUIT_LIBS) luit_SOURCES = \ diff --git a/configure.ac b/configure.ac index 9b91b89..e6c530b 100644 --- a/configure.ac +++ b/configure.ac @@ -34,6 +34,13 @@ AC_CANONICAL_HOST AC_CHECK_LIB(z, gzopen,, AC_MSG_ERROR([zlib not found])) +AC_ARG_WITH(localealiasfile, + AC_HELP_STRING([--with-localealiasfile=], + [The locale alias file (default: ${libdir}/X11/locale/locale.alias)]), + [LOCALEALIASFILE="$withval"], + [LOCALEALIASFILE=${libdir}/X11/locale/locale.alias]) +AC_SUBST([LOCALEALIASFILE]) + # Checks for pkg-config packages PKG_CHECK_MODULES(LUIT, x11 fontenc) -- GitLab