diff options
| author | Alan Coopersmith <alan.coopersmith@oracle.com> | 2023-01-01 15:16:24 -0800 |
|---|---|---|
| committer | Alan Coopersmith <alan.coopersmith@oracle.com> | 2023-01-01 15:16:24 -0800 |
| commit | 889f8a9c9ac733c62a86fa2fbc6614554eefd3ba (patch) | |
| tree | a699a5bf10a74d5bf7f429e2260e390071e79f64 | |
| parent | 8d88c559b177e832b581c8ac0aa383b6cf79e0d0 (diff) | |
configure.ac: Don't pass through '${FONTROOTDIR}' into site.def
Imake doesn't know how to expand shell variables, so instead we
rely on the FontDir #define already in the site.def file.
(I don't think this setting is really used in X11R7.0 or later,
which is why no one has noticed before now, but since we set it,
might as well set it to something that can be used instead of
"#define FontEncDir ${FONTROOTDIR}/encodings".)
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
| -rw-r--r-- | configure.ac | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac index 11cf3f7..1ac0c5d 100644 --- a/configure.ac +++ b/configure.ac @@ -23,6 +23,9 @@ m4_ifndef([XORG_FONT_MACROS_VERSION], XORG_FONT_MACROS_VERSION(1.1) XORG_FONTROOTDIR XORG_FONTSUBDIR([ENCODINGSDIR],[encodingsdir],[encodings]) +# Convert ${FONTROOTDIR} to something Imake can handle +AC_PROG_SED +ENCODINGSDIR="`echo ${ENCODINGSDIR} | ${SED} 's/${FONTROOTDIR}/FontDir/'`" m4_ifdef([AS_HELP_STRING], , [m4_define([AS_HELP_STRING], m4_defn([AC_HELP_STRING]))]) |