diff --git a/ChangeLog b/ChangeLog index 14ee6f81..99292b87 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2010-01-05 suzuki toshiya + + * 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 */rules.mk: Handle `*pic.c' files. diff --git a/builds/unix/configure.raw b/builds/unix/configure.raw index 1785c47e..cb10ef48 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)