Don't use AM_CONDITIONAL for CURSES.
For some reason, this doesn't work when cross-compiling for Windows.
This commit is contained in:
parent
365f60f3f8
commit
7944cce19e
3 changed files with 6 additions and 6 deletions
|
@ -38,5 +38,4 @@ AC_DEFUN([tinc_CURSES],
|
|||
])
|
||||
|
||||
AC_SUBST(CURSES_LIBS)
|
||||
AM_CONDITIONAL(CURSES, test "$curses" = true)
|
||||
])
|
||||
|
|
|
@ -12,16 +12,13 @@ tincd_SOURCES = \
|
|||
|
||||
tincctl_SOURCES = \
|
||||
utils.c getopt.c getopt1.c dropin.c \
|
||||
list.c tincctl.c rsagen.c
|
||||
list.c tincctl.c rsagen.c top.c
|
||||
|
||||
if TUNEMU
|
||||
tincd_SOURCES += bsd/tunemu.c
|
||||
endif
|
||||
|
||||
if CURSES
|
||||
tincctl_SOURCES += top.c
|
||||
tincctl_LDADD = $(CURSES_LIBS)
|
||||
endif
|
||||
|
||||
nodist_tincd_SOURCES = device.c
|
||||
|
||||
|
@ -32,7 +29,7 @@ INCLUDES = @INCLUDES@ -I$(top_builddir)
|
|||
noinst_HEADERS = \
|
||||
xalloc.h utils.h getopt.h list.h splay_tree.h dropin.h fake-getaddrinfo.h fake-getnameinfo.h fake-gai-errnos.h ipv6.h ipv4.h ethernet.h \
|
||||
buffer.h cipher.h conf.h connection.h control.h control_common.h crypto.h device.h digest.h edge.h graph.h logger.h meta.h net.h netutl.h node.h process.h \
|
||||
protocol.h route.h rsa.h rsagen.h subnet.h bsd/tunemu.h
|
||||
protocol.h route.h rsa.h rsagen.h subnet.h top.h bsd/tunemu.h
|
||||
|
||||
LIBS = @LIBS@ @LIBGCRYPT_LIBS@
|
||||
|
||||
|
|
|
@ -19,6 +19,8 @@
|
|||
|
||||
#include "system.h"
|
||||
|
||||
#ifdef HAVE_CURSES
|
||||
|
||||
#include <curses.h>
|
||||
|
||||
#include "control_common.h"
|
||||
|
@ -310,3 +312,5 @@ void top(int fd) {
|
|||
|
||||
endwin();
|
||||
}
|
||||
|
||||
#endif
|
||||
|
|
Loading…
Reference in a new issue