DeforaNetworks/fwknop
DeforaNetworks/fwknop
3
0
Fork 0
Code Releases Activity

Tweaks for MINGW builds

Browse Source
This commit is contained in:
Damien Stuart 2016-01-17 13:09:15 -05:00
parent e4fffdf44c
commit 4fc9d05660
3 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
common/Makefile.am
View File

@ -10,6 +10,11 @@ endif
libfko_util_a_SOURCES = $(libfko_util_source_files) libfko_util_a_SOURCES = $(libfko_util_source_files)
if USE_MINGW
EXTRA_libfko_util_a_SOURCES = ../win32/getlogin.c ../win32/getlogin.h
libfko_util_a_LDFLAGS = -lwsock32 -lws2_32
endif
AM_CPPFLAGS = $(GPGME_CFLAGS) -I $(top_srcdir)/common -I $(top_srcdir)/lib AM_CPPFLAGS = $(GPGME_CFLAGS) -I $(top_srcdir)/common -I $(top_srcdir)/lib
EXTRA_DIST = common.h netinet_common.h cunit_common.h cunit_common.c EXTRA_DIST = common.h netinet_common.h cunit_common.h cunit_common.c

6
configure.ac
View File

@ -405,6 +405,8 @@ AC_SEARCH_LIBS([inet_addr], [nsl])
AM_CONDITIONAL(MINGW, false) AM_CONDITIONAL(MINGW, false)
use_mingw=no
case "$host" in case "$host" in
*-*-linux*) *-*-linux*)
;; ;;
@ -413,10 +415,12 @@ case "$host" in
;; ;;
*-mingw32*) *-mingw32*)
AC_DEFINE_UNQUOTED(MINGW,1,[This is a MinGW system]) AC_DEFINE_UNQUOTED(MINGW,1,[This is a MinGW system])
AM_CONDITIONAL(MINGW, true) use_mingw=yes
;; ;;
esac esac
AM_CONDITIONAL(USE_MINGW, [test x$use_mingw = xyes])
dnl Decide whether or not to build the client dnl Decide whether or not to build the client
dnl dnl
want_client=yes want_client=yes

6
lib/Makefile.am
View File

@ -10,12 +10,6 @@ libfko_source_files = \
sha1.h sha2.c sha2.h sha3.c sha3.h fko_context.h fko_state.h \ sha1.h sha2.c sha2.h sha3.c sha3.h fko_context.h fko_state.h \
gpgme_funcs.c gpgme_funcs.h gpgme_funcs.c gpgme_funcs.h
if MINGW
libfko_source_files += ./common/common.h ../common/fko_util.c ../common/fko_util.h \
../common/strlcat.c ../common/strlcpy.c ../win32/getlogin.c ../common/netinet_common.h \
../win32/getlogin.h
endif
if WANT_C_UNIT_TESTS if WANT_C_UNIT_TESTS
libfko_la_LIBADD = $(top_builddir)/common/cunit_common.o libfko_la_LIBADD = $(top_builddir)/common/cunit_common.o
noinst_PROGRAMS = fko_utests noinst_PROGRAMS = fko_utests