Fix distcheck for fonts with multiple encodings

4 files changed, 24 insertions, 58 deletions

diff --git a/Makefile.am b/Makefile.am
index de6c239..8211bb3 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -24,11 +24,11 @@ bin_SCRIPTS = bdftruncate
 
 ucs2any_SOURCES = ucs2any.c
 
-bdftruncate: $(srcdir)/bdftruncate.pl
+bdftruncate: $(top_srcdir)/bdftruncate.pl
 	@rm -f $@
-	cp $(srcdir)/bdftruncate.pl $@
+	cp $(top_srcdir)/bdftruncate.pl $@
 
-mapfilesdir = $(libdir)/X11/fonts/util
+mapfilesdir = @mapdir@
 mapfiles_DATA = \
 	map-ISO8859-1 \
 	map-ISO8859-2 \
@@ -48,9 +48,15 @@ mapfiles_DATA = \
 	map-JISX0201.1976-0 \
 	map-KOI8-R
 
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = fontutil.pc
+
 man1_MANS = bdftruncate.man ucs2any.man
 
-aclocaldir = $(datadir)/aclocal
-aclocal_DATA = fontutil.m4
+DISTCLEANFILES = bdftruncate
 
-EXTRA_DIST = $(mapfiles_DATA) $(man1_MANS) autogen.sh $(aclocal_DATA)
+EXTRA_DIST = $(mapfiles_DATA) \
+	$(man1_MANS) \
+	autogen.sh \
+	bdftruncate.pl \
+	fontutil.pc.in
diff --git a/configure.ac b/configure.ac
index 509580b..1fb32a3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -31,4 +31,7 @@ AM_CONFIG_HEADER(config.h)
 AC_PROG_CC
 AC_PROG_INSTALL
 
-AC_OUTPUT([Makefile])
+mapdir="$libdir/X11/font/util"
+AC_SUBST(mapdir)
+
+AC_OUTPUT([Makefile fontutil.pc])
diff --git a/fontutil.m4 b/fontutil.m4
deleted file mode 100644
index 9446703..0000000
--- a/fontutil.m4
+++ /dev/null
@@ -1,51 +0,0 @@
-dnl  Copyright 2005 Red Hat, Inc.
-dnl
-dnl  Permission to use, copy, modify, distribute, and sell this software
-dnl  and its documentation for any purpose is hereby granted without
-dnl  fee, provided that the above copyright notice appear in all copies
-dnl  and that both that copyright notice and this permission notice
-dnl  appear in supporting documentation, and that the name of Red Hat
-dnl  not be used in advertising or publicity pertaining to distribution
-dnl  of the software without specific, written prior permission.  Red
-dnl  Hat makes no representations about the suitability of this software
-dnl  for any purpose.  It is provided "as is" without express or implied
-dnl  warranty.
-dnl
-dnl  RED HAT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-dnl  INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN
-dnl  NO EVENT SHALL RED HAT BE LIABLE FOR ANY SPECIAL, INDIRECT OR
-dnl  CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS
-dnl  OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
-dnl  NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
-dnl  CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-dnl
-dnl Process this file with autoconf to create configure.
-
-# UTILFONT_MAPFILES()
-# -------------------
-# Adds --with-mapfiles=path and verifies map file location.  If no explicit
-# path is given, then it tries to find an appropriate one by first falling
-# back to $prefix and finally to $x_libraries.  If no prefix is given, then
-# it tries /usr/X11R6.
-AC_DEFUN([UTILFONT_MAPFILES],[
-AC_PATH_X
-AC_ARG_WITH(mapfiles, [  --with-mapfiles=path    path to mapfiles],
-	TMPFUDIR=$with_mapfiles,
-	TMPFUDIR=)
-AC_MSG_CHECKING([for font map files])
-if ! test -e "$TMPFUDIR/map-ISO8859-1" ; then
-    TMPPFX=`echo $prefix`
-    if test "$prefix" = "NONE" ; then
-        TMPPFX="/usr/X11R6"
-    fi
-    TMPFUDIR="$TMPPFX/lib/X11/fonts/util"
-    if ! test -e "$TMPFUDIR/map-ISO8859-1" ; then
-        TMPFUDIR="$x_libraries/X11/fonts/util"
-        if ! test -e "$TMPFUDIR/map-ISO8859-1" ; then
-	    AC_MSG_ERROR([Not found])
-        fi
-    fi
-fi
-AC_MSG_RESULT($TMPFUDIR)
-$1_PATH="$TMPFUDIR"
-])
diff --git a/fontutil.pc.in b/fontutil.pc.in
new file mode 100644
index 0000000..3aeeaba
--- /dev/null
+++ b/fontutil.pc.in
@@ -0,0 +1,8 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+mapdir=@mapdir@
+ 
+Name: FontUtil
+Description: Font utilities dirs
+Version: @PACKAGE_VERSION@