Skip to content

V
varnish-cache
Unverified Commit daf9b197 authored by Nils Goroll's avatar Nils Goroll
Browse files
Options

fix curses autoconf when configured via pkg-config

parent e479ee0d
Hide whitespace changes
Inline Side-by-side
Showing with 10 additions and 3 deletions
bin/varnishhist/Makefile.am
View file @ daf9b197
...@@ -2,7 +2,8 @@ ...@@ -2,7 +2,8 @@
AM_CPPFLAGS = \ AM_CPPFLAGS = \
-I$(top_srcdir)/include \ -I$(top_srcdir)/include \
-I$(top_builddir)/include -I$(top_builddir)/include \
@CURSES_CFLAGS@
bin_PROGRAMS = varnishhist bin_PROGRAMS = varnishhist
......
bin/varnishstat/Makefile.am
View file @ daf9b197
...@@ -2,7 +2,8 @@ ...@@ -2,7 +2,8 @@
AM_CPPFLAGS = \ AM_CPPFLAGS = \
-I$(top_srcdir)/include \ -I$(top_srcdir)/include \
-I$(top_builddir)/include -I$(top_builddir)/include \
@CURSES_CFLAGS@
bin_PROGRAMS = varnishstat varnishstat_help_gen bin_PROGRAMS = varnishstat varnishstat_help_gen
......
bin/varnishtop/Makefile.am
View file @ daf9b197
...@@ -2,7 +2,8 @@ ...@@ -2,7 +2,8 @@
AM_CPPFLAGS = \ AM_CPPFLAGS = \
-I$(top_srcdir)/include \ -I$(top_srcdir)/include \
-I$(top_builddir)/include -I$(top_builddir)/include \
@CURSES_CFLAGS@
bin_PROGRAMS = varnishtop bin_PROGRAMS = varnishtop
......
configure.ac
View file @ daf9b197
...@@ -218,9 +218,13 @@ CURSES_LIBS="$CURSES_LIB" ...@@ -218,9 +218,13 @@ CURSES_LIBS="$CURSES_LIB"
]) ])
]) ])
]) ])
AC_SUBST([CURSES_CFLAGS])
AC_SUBST([CURSES_LIBS]) AC_SUBST([CURSES_LIBS])
save_CFLAGS="${CFLAGS}"
CFLAGS="${CFLAGS} ${CURSES_CFLAGS}"
AC_CHECK_HEADERS([ncursesw/curses.h ncursesw.h ncurses/curses.h ncurses.h curses.h]) AC_CHECK_HEADERS([ncursesw/curses.h ncursesw.h ncurses/curses.h ncurses.h curses.h])
CFLAGS="${save_CFLAGS}"
# Checks for header files. # Checks for header files.
AC_HEADER_STDC AC_HEADER_STDC
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment