From c2b7758d268fd98e09c3e66a0e7717b47ff12a47 Mon Sep 17 00:00:00 2001
From: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Thu, 15 May 2014 22:44:38 -0700
Subject: Don't compile bitmap source files for disabled formats
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

pcfread.c is a special case - it's needed for either reading pcf files
from disk (--enable-pcfformat) or from the builtin fonts in memory
(--enable-builtins), so needed a new AM_CONDITIONAL case.

Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Rémi Cardona <remi@gentoo.org>
---
 configure.ac           |  3 +++
 src/bitmap/Makefile.am | 24 +++++++++++++++++-------
 2 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/configure.ac b/configure.ac
index 30f4d6d..13fe3e1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -153,6 +153,9 @@ if test "x$XFONT_PCFFORMAT" = xyes; then
 	XFONT_BITMAP=yes
 fi
 
+AM_CONDITIONAL(XFONT_PCF_OR_BUILTIN,
+	[test "x$XFONT_PCFFORMAT" = xyes -o "x$XFONT_BUILTINS" = xyes])
+
 AC_ARG_ENABLE(bdfformat,
 	AS_HELP_STRING([--disable-bdfformat],
 		[Support BDF format bitmap fonts (default: enabled)]),
diff --git a/src/bitmap/Makefile.am b/src/bitmap/Makefile.am
index 99682d9..0f2d10a 100644
--- a/src/bitmap/Makefile.am
+++ b/src/bitmap/Makefile.am
@@ -6,14 +6,24 @@ AM_CFLAGS = $(XFONT_CFLAGS) $(OS_CFLAGS) $(CWARNFLAGS)
 noinst_LTLIBRARIES = libbitmap.la
 
 libbitmap_la_SOURCES = 		\
-	bdfread.c		\
-	bdfutils.c		\
 	bitmap.c		\
 	bitmapfunc.c		\
 	bitmaputil.c		\
 	bitscale.c		\
-	fontink.c		\
-	pcfread.c		\
-	pcfwrite.c		\
-	snfread.c		\
-	snfstr.h
+	fontink.c
+
+if XFONT_BDFFORMAT
+libbitmap_la_SOURCES += bdfread.c bdfutils.c
+endif
+
+if XFONT_PCF_OR_BUILTIN
+libbitmap_la_SOURCES += pcfread.c
+endif
+
+if XFONT_PCFFORMAT
+libbitmap_la_SOURCES += pcfwrite.c
+endif
+
+if XFONT_SNFFORMAT
+libbitmap_la_SOURCES += snfread.c snfstr.h
+endif
-- 
cgit v1.2.3