[PATCH:libfontenc] Use fontutil macros to determine default font path

[Alan Coopersmith]

I've had essentially the same thing sitting in my libfontenc tree, as part
of my development & testing of the font-util macros, but hadn't
commited/pushed it yet - I'll do that now.   Thanks for the reminder.

	-alan-

Yaakov (Cygwin/X) wrote:
> From: Yaakov Selkowitz <yselkowitz at users.sourceforge.net>
> 
> With font-util 1.1, the default font path has changed, and macros are
> provided to determine the configured path.  libfontenc should use these
> macros as well to provide a default which is more likely to be correct.
> 
> This adds a build-time (or at least an autoconf/autogen time) dependency
> on font-util.
> 
> Signed-off-by: Yaakov Selkowitz <yselkowitz at users.sourceforge.net>
> ---
>  configure.ac |   10 +++++-----
>  1 files changed, 5 insertions(+), 5 deletions(-)
> 
> diff --git a/configure.ac b/configure.ac
> index fc28ef9..1edb4c3 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -30,6 +30,10 @@ AM_MAINTAINER_MODE
>  # Require xorg-macros: XORG_CWARNFLAGS, XORG_CHANGELOG, XORG_WITH_LINT
>  m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.2 or later before running autoconf/autogen])])
>  XORG_MACROS_VERSION(1.2)
> +
> +m4_ifndef([XORG_FONT_MACROS_VERSION], [AC_FATAL([must install font-util 1.1 or later before running autoconf/autogen])])
> +XORG_FONT_MACROS_VERSION(1.1)
> +
>  AM_CONFIG_HEADER(config.h)
>  
>  # Check for progs
> @@ -37,11 +41,7 @@ AC_PROG_CC
>  AC_PROG_LIBTOOL
>  XORG_CWARNFLAGS
>  
> -encodingsdir=${libdir}/X11/fonts/encodings
> -AC_ARG_WITH(encodingsdir, AC_HELP_STRING([--with-encodingsdir=<pathname>],
> -	[Path to font encodings]), [encodingsdir="$withval"])
> -ENCODINGSDIR="$encodingsdir"
> -AC_SUBST(ENCODINGSDIR)
> +XORG_FONTSUBDIR([ENCODINGSDIR],[encodingsdir],[encodings])
>  
>  # zlib
>  

-- 
	-Alan Coopersmith-           alan.coopersmith at sun.com
	 Sun Microsystems, Inc. - X Window System Engineering