walkero
/
nghttp2
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Added a check to see whether the installed cunit requires -lncurses

This commit is contained in:
Tatsuhiro Tsujikawa 2012-02-09 22:11:30 +09:00
parent 61dc691385
commit f1c4427328
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
configure.ac
View File

@ -65,6 +65,17 @@ if test "x${have_cunit}" = "xno"; then
AC_SUBST([CUNIT_CFLAGS]) AC_SUBST([CUNIT_CFLAGS])
fi fi
fi fi
if test "x${have_cunit}" = "xyes"; then
# Check whether the installed cunit requires ncurses. This is
# needed because cunit in Mac OS X requires it.
LIBS_TEMP=${LIBS}
LIBS=${CUNIT_LIBS}
AC_SEARCH_LIBS([CU_initialize_registry], [ncurses])
CUNIT_LIBS=${LIBS}
AC_SUBST([CUNIT_LIBS])
LIBS=${LIBS_TEMP}
fi
AM_CONDITIONAL([HAVE_CUNIT], [ test "x${have_cunit}" = "xyes" ]) AM_CONDITIONAL([HAVE_CUNIT], [ test "x${have_cunit}" = "xyes" ])
AX_HAVE_EPOLL([have_epoll=yes], [have_epoll=no]) AX_HAVE_EPOLL([have_epoll=yes], [have_epoll=no])
AM_CONDITIONAL([HAVE_EPOLL], [ test "x${have_epoll}" = "xyes" ]) AM_CONDITIONAL([HAVE_EPOLL], [ test "x${have_epoll}" = "xyes" ])

2
tests/Makefile.am
View File

@ -36,7 +36,7 @@ HFILES = spdylay_pq_test.h spdylay_map_test.h spdylay_queue_test.h \
main_SOURCES = $(HFILES) $(OBJECTS) main_SOURCES = $(HFILES) $(OBJECTS)
main_LDADD = ${top_builddir}/lib/libspdylay.la main_LDADD = ${top_builddir}/lib/libspdylay.la
main_LDFLAGS = -static @CUNIT_LIBS@ -lncurses main_LDFLAGS = -static @CUNIT_LIBS@
AM_CFLAGS = -Wall -g -O2 -I${top_srcdir}/lib -I${top_srcdir}/lib/includes \ AM_CFLAGS = -Wall -g -O2 -I${top_srcdir}/lib -I${top_srcdir}/lib/includes \
@CUNIT_CFLAGS@ @CUNIT_CFLAGS@