j3d1/tinc
1
0
Fork 0
Code Issues 1 Pull requests Releases Wiki Activity

Don't use AM_CONDITIONAL for CURSES.

Browse source 
For some reason, this doesn't work when cross-compiling for Windows.
This commit is contained in:
Guus Sliepen 2011-06-25 00:06:06 +02:00
parent 365f60f3f8
commit 7944cce19e
3 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
m4/curses.m4
View file

@ -38,5 +38,4 @@ AC_DEFUN([tinc_CURSES],
]) ])
AC_SUBST(CURSES_LIBS) AC_SUBST(CURSES_LIBS)
AM_CONDITIONAL(CURSES, test "$curses" = true)
]) ])

7
src/Makefile.am
View file

@ -12,16 +12,13 @@ tincd_SOURCES = \
tincctl_SOURCES = \ tincctl_SOURCES = \
utils.c getopt.c getopt1.c dropin.c \ utils.c getopt.c getopt1.c dropin.c \
list.c tincctl.c rsagen.c list.c tincctl.c rsagen.c top.c
if TUNEMU if TUNEMU
tincd_SOURCES += bsd/tunemu.c tincd_SOURCES += bsd/tunemu.c
endif endif
if CURSES
tincctl_SOURCES += top.c
tincctl_LDADD = $(CURSES_LIBS) tincctl_LDADD = $(CURSES_LIBS)
endif
nodist_tincd_SOURCES = device.c nodist_tincd_SOURCES = device.c
@ -32,7 +29,7 @@ INCLUDES = @INCLUDES@ -I$(top_builddir)
noinst_HEADERS = \ 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 \ 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 \ 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@ LIBS = @LIBS@ @LIBGCRYPT_LIBS@

4
src/top.c
View file

@ -19,6 +19,8 @@
#include "system.h" #include "system.h"
#ifdef HAVE_CURSES
#include <curses.h> #include <curses.h>
#include "control_common.h" #include "control_common.h"
@ -310,3 +312,5 @@ void top(int fd) {
endwin(); endwin();
} }
#endif