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

Added support for darwin

Browse source 
Darwin does not have -lrt
This commit is contained in:
thorkill 2015-07-01 11:18:29 +02:00
parent fbb62fa80e
commit 905572863c
2 changed files with 15 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
configure.ac
View file

@ -40,6 +40,7 @@ case $host_os in
;; ;;
*darwin*) *darwin*)
bsd=true bsd=true
darwin=true
AC_DEFINE(HAVE_DARWIN, 1, [Darwin (MacOS/X)]) AC_DEFINE(HAVE_DARWIN, 1, [Darwin (MacOS/X)])
;; ;;
*solaris*) *solaris*)
@ -120,6 +121,7 @@ AC_ARG_WITH(windows2000,
AM_CONDITIONAL(LINUX, test "$linux" = true) AM_CONDITIONAL(LINUX, test "$linux" = true)
AM_CONDITIONAL(BSD, test "$bsd" = true) AM_CONDITIONAL(BSD, test "$bsd" = true)
AM_CONDITIONAL(DARWIN, test "$darwin" = true)
AM_CONDITIONAL(SOLARIS, test "$solaris" = true) AM_CONDITIONAL(SOLARIS, test "$solaris" = true)
AM_CONDITIONAL(MINGW, test "$mingw" = true) AM_CONDITIONAL(MINGW, test "$mingw" = true)
AM_CONDITIONAL(CYGWIN, test "$cygwin" = true) AM_CONDITIONAL(CYGWIN, test "$cygwin" = true)

19
src/Makefile.am
View file

@ -36,11 +36,12 @@ libed25519_la_SOURCES = \
ed25519/verify.c ed25519/verify.c
libtincconf_la_SOURCES = \ libtincconf_la_SOURCES = \
conf.h conf.h\
conf.c
libtincd_la_SOURCES = \ libtincd_la_SOURCES = \
conf.h \ conf.h \
conf.c \ conf.c \
buffer.c buffer.h \ buffer.c buffer.h \
cipher.h \ cipher.h \
connection.c connection.h \ connection.c connection.h \
@ -185,9 +186,15 @@ sptps_speed_SOURCES = \
tincd_LDADD = libtincd.la libed25519.la libchacha_poly1305.la libtincconf.la tincd_LDADD = libtincd.la libed25519.la libchacha_poly1305.la libtincconf.la
tinc_LDADD = $(READLINE_LIBS) $(CURSES_LIBS) libtincd.la libtincconf.la libed25519.la libchacha_poly1305.la tinc_LDADD = $(READLINE_LIBS) $(CURSES_LIBS) libtincd.la libtincconf.la libed25519.la libchacha_poly1305.la
sptps_speed_LDADD = -lrt libtincd.la libed25519.la libtincconf.la libchacha_poly1305.la sptps_speed_LDADD = libtincd.la libed25519.la libtincconf.la libchacha_poly1305.la
sptps_test_LDADD = -lrt libtincd.la libed25519.la libtincconf.la libchacha_poly1305.la sptps_test_LDADD = libtincd.la libed25519.la libtincconf.la libchacha_poly1305.la
sptps_keypair_LDADD = -lrt libed25519.la libtincconf.la libchacha_poly1305.la libtincd.la sptps_keypair_LDADD = libed25519.la libtincconf.la libchacha_poly1305.la libtincd.la
if !DARWIN
sptps_speed_LDADD += -lrt
sptps_test_LDADD += -lrt
sptps_keypair_LDADD += -lrt
endif
LIBS = @LIBS@ -lm LIBS = @LIBS@ -lm