summaryrefslogtreecommitdiff
path: root/Makefile.am
diff options
context:
space:
mode:
authorJeremy Huddleston Sequoia <jeremyhu@apple.com>2022-06-19 10:43:33 -0700
committerJeremy Huddleston Sequoia <jeremyhu@apple.com>2022-06-19 10:43:35 -0700
commit592c3d2b8f56679b35f2b8b97aeba3f8e3fb3b9e (patch)
treea0e713af98501c45261b4822485d85fa91fd2d20 /Makefile.am
parent54b0411f06c4b84ae7efd110c7540edc688a991e (diff)
configure: Move check for zlib into its own section
This allows systems that don't have zlib.pc (eg: darwin) to build by specifying ZLIB_CFLAGS and ZLIB_LIBS in the build environment Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Diffstat (limited to 'Makefile.am')
-rw-r--r--Makefile.am4
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile.am b/Makefile.am
index c36d171..e1fabdc 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -30,9 +30,9 @@ DIR_SUBSTS = -e 's|@bindir[@]|$(bindir)|g'
mkfontdir: mkfontdir.in
$(AM_V_GEN)$(SED) $(DIR_SUBSTS) < $(srcdir)/mkfontdir.in > $@
-AM_CPPFLAGS = @MKFONTSCALE_CFLAGS@ @X11_CFLAGS@ -D_BSD_SOURCE
+AM_CPPFLAGS = @MKFONTSCALE_CFLAGS@ @X11_CFLAGS@ @ZLIB_CFLAGS@ -D_BSD_SOURCE
AM_CFLAGS = $(CWARNFLAGS)
-mkfontscale_LDADD = @MKFONTSCALE_LIBS@
+mkfontscale_LDADD = @MKFONTSCALE_LIBS@ @ZLIB_LIBS@
mkfontscale_SOURCES = \
constlist.c \