diff options
| author | suzuki toshiya <mpsuzuki@hiroshima-u.ac.jp> | 2011-01-06 02:05:43 +0900 |
|---|---|---|
| committer | suzuki toshiya <mpsuzuki@hiroshima-u.ac.jp> | 2011-01-06 02:09:23 +0900 |
| commit | 1909959973585c9f827683dfc33391d4654c37eb (patch) | |
| tree | 4bf983f5d0b9cbdd3032fe8ad1bfb85d5be24d5d | |
| parent | f3ce23702761ebd25df797186187722ee5c7514c (diff) | |
| download | freetype2-1909959973585c9f827683dfc33391d4654c37eb.tar.gz | |
* 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.
| -rw-r--r-- | ChangeLog | 10 | ||||
| -rw-r--r-- | builds/unix/configure.raw | 2 |
2 files changed, 10 insertions, 2 deletions
@@ -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 1785c47ee..cb10ef481 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) |