Commit f48f7dc84b46657e197bfb429a5ce5ec0fc4f806
2014-03-04T04:40:07
Minor fix for `make devel'. * builds/freetype.mk (INCLUDE_FLAGS) [DEVEL_DIR]: Don't use pkg-config for bzip2 since not all GNU/Linux distributions have `bzip2.pc' (and the header file `bzlib.h' is located in /usr/include normally).
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40
diff --git a/ChangeLog b/ChangeLog
index 55f08fd..4784912 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2014-03-04 Werner Lemberg <wl@gnu.org>
+
+ Minor fix for `make devel'.
+
+ * builds/freetype.mk (INCLUDE_FLAGS) [DEVEL_DIR]: Don't use
+ pkg-config for bzip2 since not all GNU/Linux distributions have
+ `bzip2.pc' (and the header file `bzlib.h' is located in /usr/include
+ normally).
+
2014-03-04 Sean McBride <sean@rogue-research.com>
Fix several clang static analyzer dead store warnings.
diff --git a/builds/freetype.mk b/builds/freetype.mk
index bf372fd..3f1519e 100644
--- a/builds/freetype.mk
+++ b/builds/freetype.mk
@@ -3,7 +3,7 @@
#
-# Copyright 1996-2006, 2008, 2013 by
+# Copyright 1996-2006, 2008, 2013, 2014 by
# David Turner, Robert Wilhelm, and Werner Lemberg.
#
# This file is part of the FreeType project, and may only be used, modified,
@@ -130,8 +130,7 @@ ifdef DEVEL_DIR
# We assume that all library dependencies for FreeType are fulfilled for a
# development build, so we directly access the necessary include directory
# information using `pkg-config'.
- INCLUDE_FLAGS += $(shell pkg-config --cflags bzip2 \
- libpng \
+ INCLUDE_FLAGS += $(shell pkg-config --cflags libpng \
harfbuzz )
endif