Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
varnish-cache
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Commits
Open sidebar
varnishcache
varnish-cache
Commits
458d50d5
Commit
458d50d5
authored
Oct 30, 2017
by
Guillaume Quintard
Committed by
guillaume quintard
Nov 06, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use pkg-config for curses, if possible
parent
c1d8dbe1
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
18 additions
and
8 deletions
+18
-8
Makefile.am
bin/varnishhist/Makefile.am
+1
-1
Makefile.am
bin/varnishstat/Makefile.am
+1
-1
Makefile.am
bin/varnishtop/Makefile.am
+1
-1
configure.ac
configure.ac
+15
-5
No files found.
bin/varnishhist/Makefile.am
View file @
458d50d5
...
@@ -18,4 +18,4 @@ varnishhist_LDADD = \
...
@@ -18,4 +18,4 @@ varnishhist_LDADD = \
$(top_builddir)
/lib/libvarnishapi/libvarnishapi.la
\
$(top_builddir)
/lib/libvarnishapi/libvarnishapi.la
\
-lm
\
-lm
\
@SAN_LDFLAGS@
\
@SAN_LDFLAGS@
\
@CURSES_LIB@
${
RT_LIBS
}
${
PTHREAD_LIBS
}
@CURSES_LIB
S
@
${
RT_LIBS
}
${
PTHREAD_LIBS
}
bin/varnishstat/Makefile.am
View file @
458d50d5
...
@@ -18,4 +18,4 @@ varnishstat_CFLAGS = \
...
@@ -18,4 +18,4 @@ varnishstat_CFLAGS = \
varnishstat_LDADD
=
\
varnishstat_LDADD
=
\
$(top_builddir)
/lib/libvarnishapi/libvarnishapi.la
\
$(top_builddir)
/lib/libvarnishapi/libvarnishapi.la
\
@SAN_LDFLAGS@
\
@SAN_LDFLAGS@
\
@CURSES_LIB@
${
RT_LIBS
}
${
LIBM
}
${
PTHREAD_LIBS
}
@CURSES_LIB
S
@
${
RT_LIBS
}
${
LIBM
}
${
PTHREAD_LIBS
}
bin/varnishtop/Makefile.am
View file @
458d50d5
...
@@ -17,4 +17,4 @@ varnishtop_CFLAGS = \
...
@@ -17,4 +17,4 @@ varnishtop_CFLAGS = \
varnishtop_LDADD
=
\
varnishtop_LDADD
=
\
$(top_builddir)
/lib/libvarnishapi/libvarnishapi.la
\
$(top_builddir)
/lib/libvarnishapi/libvarnishapi.la
\
@SAN_LDFLAGS@
\
@SAN_LDFLAGS@
\
@CURSES_LIB@
${
RT_LIBS
}
${
LIBM
}
${
PTHREAD_LIBS
}
@CURSES_LIB
S
@
${
RT_LIBS
}
${
LIBM
}
${
PTHREAD_LIBS
}
configure.ac
View file @
458d50d5
...
@@ -82,11 +82,6 @@ _VARNISH_CHECK_LIB(nsl, getaddrinfo)
...
@@ -82,11 +82,6 @@ _VARNISH_CHECK_LIB(nsl, getaddrinfo)
AC_SUBST(NET_LIBS, "${SOCKET_LIBS} ${NSL_LIBS}")
AC_SUBST(NET_LIBS, "${SOCKET_LIBS} ${NSL_LIBS}")
AX_WITH_CURSES
if test "x$ax_cv_curses" != xyes; then
AC_MSG_ERROR([requires an X/Open-compatible Curses library])
fi
# Userland slab allocator from Solaris, ported to other systems
# Userland slab allocator from Solaris, ported to other systems
AC_CHECK_HEADERS([umem.h], [_VARNISH_CHECK_LIB(umem, umem_alloc)])
AC_CHECK_HEADERS([umem.h], [_VARNISH_CHECK_LIB(umem, umem_alloc)])
...
@@ -187,6 +182,21 @@ AC_CHECK_HEADERS([edit/readline/readline.h],
...
@@ -187,6 +182,21 @@ AC_CHECK_HEADERS([edit/readline/readline.h],
])
])
])
])
PKG_CHECK_MODULES([CURSES], [ncursesw], [], [
PKG_CHECK_MODULES([CURSES], [ncurses], [], [
PKG_CHECK_MODULES([CURSES], [curses], [], [
AX_WITH_CURSES
if test "x$ax_cv_curses" != xyes; then
AC_MSG_ERROR([requires an X/Open-compatible Curses library])
fi
CURSES_LIBS="$CURSES_LIB"
])
])
])
AC_SUBST([CURSES_LIBS])
AC_CHECK_HEADERS([ncursesw/curses.h ncursesw.h ncurses/curses.h ncurses.h curses.h])
# Checks for header files.
# Checks for header files.
AC_HEADER_STDC
AC_HEADER_STDC
AC_CHECK_HEADERS([sys/endian.h])
AC_CHECK_HEADERS([sys/endian.h])
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment