Commit 1909959973585c9f827683dfc33391d4654c37eb
2011-01-06T02:05:43
* builds/unix/configure.raw: Remove `SYSTEM_BZ2LIB' macro. SYSTEM_ZLIB is used to switch the builtin zlib source or system zlib source out of FreeType2. But ftbzip2 module has no builtin bzip2 library and always requires system bzip2 library. Thus SYSTEM_BZ2LIB is always yes, it is not used.
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
diff --git a/ChangeLog b/ChangeLog
index 14ee6f8..99292b8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2010-01-05 suzuki toshiya <mpsuzuki@hiroshima-u.ac.jp>
+
+ * builds/unix/configure.raw: Remove `SYSTEM_BZ2LIB' macro.
+
+ SYSTEM_ZLIB is used to switch the builtin zlib source
+ or system zlib source out of FreeType2. But ftbzip2
+ module has no builtin bzip2 library and always requires
+ system bzip2 library. Thus SYSTEM_BZ2LIB is always yes,
+ it is not used.
+
2011-01-03 Werner Lemberg <wl@gnu.org>
*/rules.mk: Handle `*pic.c' files.
diff --git a/builds/unix/configure.raw b/builds/unix/configure.raw
index 1785c47..cb10ef4 100644
--- a/builds/unix/configure.raw
+++ b/builds/unix/configure.raw
@@ -241,7 +241,6 @@ fi
if test x$with_bzip2 != xno && test -n "$LIBBZ2"; then
CFLAGS="$CFLAGS -DFT_CONFIG_OPTION_USE_BZIP2"
LDFLAGS="$LDFLAGS $LIBBZ2"
- SYSTEM_BZ2LIB=yes
fi
# Some options handling SDKs/archs in CFLAGS should be copied
@@ -663,7 +662,6 @@ AC_SUBST([CFLAGS])
AC_SUBST([LDFLAGS])
AC_SUBST([FT2_EXTRA_LIBS])
AC_SUBST([SYSTEM_ZLIB])
-AC_SUBST([SYSTEM_BZ2LIB])
LT_INIT(win32-dll)