Changing fonts configure.ac

[Kristian Høgsberg]

On 8/31/06, Kristian Høgsberg <krh at bitplanet.net> wrote:
> Hi,
>
> I was just touching our X font packaging and it turns out that the
> font configure.ac files are a bit awkward to work with.  ...

Doh, forgot to attach the proposed change.

Kristian

diff --git a/Makefile.am b/Makefile.am
diff --git a/configure.ac b/configure.ac
index 7297c63..0656f03 100644
--- a/configure.ac
+++ b/configure.ac
@@ -37,14 +37,14 @@ AC_PATH_PROG(MKFONTDIR, mkfontdir)

 m4_ifdef([AS_HELP_STRING], , [m4_define([AS_HELP_STRING],
m4_defn([AC_HELP_STRING]))])

-DEFAULT_FONTDIR=${libdir}/X11/fonts/misc
+PKG_CHECK_MODULES(MAPS, [fontutil])
+DEFAULT_FONTDIR=$(pkg-config --variable=fontdir)/misc
 AC_ARG_WITH(fontdir,
        AS_HELP_STRING([--with-fontdir=FONTDIR], [Path to install fonts]),
-       [FONTDIR="$withval"],
+       [FONTDIR="$withval"/misc],
        [FONTDIR="$DEFAULT_FONTDIR"])
 AC_SUBST(FONTDIR)

-PKG_CHECK_MODULES(MAPS, [fontutil])
 MAPFILES_PATH=$(pkg-config --variable=mapdir fontutil)
 AC_SUBST(MAPFILES_PATH)