From 7436d1c74f97fcd3d07c1542ceee4e4a35622419 Mon Sep 17 00:00:00 2001 From: Sam Hocevar Date: Tue, 9 Feb 2010 01:21:56 +0000 Subject: [PATCH] No longer check for zlib, it's provided by libcaca. --- configure.ac | 6 +----- src/Makefile.am | 2 +- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/configure.ac b/configure.ac index fbdefb1..58ff067 100644 --- a/configure.ac +++ b/configure.ac @@ -24,7 +24,7 @@ if test "$build" != "$host" -a "${PKG_CONFIG_LIBDIR}" = ""; then export PKG_CONFIG_LIBDIR=/dev/null fi -AC_CHECK_HEADERS(getopt.h sys/ioctl.h zlib.h) +AC_CHECK_HEADERS(getopt.h sys/ioctl.h) ac_cv_have_getopt_long="no" AC_CHECK_FUNCS(getopt_long, @@ -38,10 +38,6 @@ fi AM_CONDITIONAL(NEED_GETOPT_LONG, test "$ac_cv_have_getopt_long" = "no") AC_SUBST(GETOPT_LIBS) -AC_CHECK_LIB(z, gzopen, - [ZLIB_LIBS="${ZLIB_LIBS} -lz"]) -AC_SUBST(ZLIB_LIBS) - AC_CACHE_CHECK([for TIOCGWINSZ], [ac_cv_have_tiocgwinsz], [AC_TRY_COMPILE( diff --git a/src/Makefile.am b/src/Makefile.am index 8e121a1..4c3bdb9 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -10,7 +10,7 @@ toilet_SOURCES = main.c toilet.h \ toilet_CPPFLAGS = -DFONTDIR=\"$(datadir)/figlet\" toilet_CFLAGS = @CACA_CFLAGS@ -toilet_LDADD = @CACA_LIBS@ @GETOPT_LIBS@ @ZLIB_LIBS@ +toilet_LDADD = @CACA_LIBS@ @GETOPT_LIBS@ if NEED_GETOPT_LONG GETOPT = mygetopt.c mygetopt.h