femsci/toilet
femsci/toilet
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

No longer check for zlib, it's provided by libcaca.

Browse source
This commit is contained in:
Sam Hocevar 2010-02-09 01:21:56 +00:00 committed by sam
parent ec7c63a624
commit 7436d1c74f
2 changed files with 2 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
configure.ac
View file

@ -24,7 +24,7 @@ if test "$build" != "$host" -a "${PKG_CONFIG_LIBDIR}" = ""; then
export PKG_CONFIG_LIBDIR=/dev/null export PKG_CONFIG_LIBDIR=/dev/null
fi 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_cv_have_getopt_long="no"
AC_CHECK_FUNCS(getopt_long, AC_CHECK_FUNCS(getopt_long,
@ -38,10 +38,6 @@ fi
AM_CONDITIONAL(NEED_GETOPT_LONG, test "$ac_cv_have_getopt_long" = "no") AM_CONDITIONAL(NEED_GETOPT_LONG, test "$ac_cv_have_getopt_long" = "no")
AC_SUBST(GETOPT_LIBS) AC_SUBST(GETOPT_LIBS)
AC_CHECK_LIB(z, gzopen,
[ZLIB_LIBS="${ZLIB_LIBS} -lz"])
AC_SUBST(ZLIB_LIBS)
AC_CACHE_CHECK([for TIOCGWINSZ], AC_CACHE_CHECK([for TIOCGWINSZ],
[ac_cv_have_tiocgwinsz], [ac_cv_have_tiocgwinsz],
[AC_TRY_COMPILE( [AC_TRY_COMPILE(

2
src/Makefile.am
View file

@ -10,7 +10,7 @@ toilet_SOURCES = main.c toilet.h \
toilet_CPPFLAGS = -DFONTDIR=\"$(datadir)/figlet\" toilet_CPPFLAGS = -DFONTDIR=\"$(datadir)/figlet\"
toilet_CFLAGS = @CACA_CFLAGS@ toilet_CFLAGS = @CACA_CFLAGS@
toilet_LDADD = @CACA_LIBS@ @GETOPT_LIBS@ @ZLIB_LIBS@ toilet_LDADD = @CACA_LIBS@ @GETOPT_LIBS@
if NEED_GETOPT_LONG if NEED_GETOPT_LONG
GETOPT = mygetopt.c mygetopt.h GETOPT = mygetopt.c mygetopt.h