diff --git a/ChangeLog b/ChangeLog index f05d50a022b917772d596726c1d1e06f1fdec24c..d80e8f03071f8868bb60926078fa4a04425e2349 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 55c510e2a2bb163cbf37b68644c87fa773d959d8..705d239dae41f894452632b8651c65a29a1dc358 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 9b91b891f636f50823150a919535b8480790eae6..e6c530b44559ada34b10c3b9b0bb10f188f265cc 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)