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 | 81320eafe52d6c9f2fa1bc251a9fceec54d9744b (patch) | |
| tree | 8b499b0861eb62bb56effe490acb5a96276040ef | |
| parent | 17f2dc9d447ae523d0ce5b1ab986383d1ceec34c (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 dc22cd7..b3c9c8e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -21,7 +21,9 @@ bin_PROGRAMS = mkcfm -mkcfm_CFLAGS = $(MKCFM_CFLAGS) +DEFAULTCID=@DEFAULTCID@ + +mkcfm_CFLAGS = $(MKCFM_CFLAGS) -DDEFAULTCID=\"$(DEFAULTCID)\" mkcfm_LDADD = $(MKCFM_LIBS) mkcfm_SOURCES = \ diff --git a/configure.ac b/configure.ac index 584db03..5bcdf2c 100644 --- a/configure.ac +++ b/configure.ac @@ -32,6 +32,13 @@ AM_CONFIG_HEADER(config.h) AC_PROG_CC AC_PROG_INSTALL +AC_ARG_WITH(ciddir, + AC_HELP_STRING([--with-ciddir=<path>], + [Set default CID directory (default: ${libdir}/X11/fonts/CID)]), + [DEFAULTCID="$withval"], + [DEFAULTCID=${libdir}/X11/fonts/CID]) +AC_SUBST([DEFAULTCID]) + # Checks for pkg-config packages PKG_CHECK_MODULES(MKCFM, x11 xfont libfs fontenc) AC_SUBST(MKCFM_CFLAGS) |