public/libsxmp
public/libsxmp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 7 Wiki Activity

fixes;

Browse Source
This commit is contained in:
Alexander Vdolainen 2015-03-12 16:58:55 +02:00
commit a0f77c91bb
4 changed files with 61 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
configure.ac
View File

@ -2,9 +2,10 @@ dnl Process this file with autoconf to produce a configure script.
AC_INIT(libsntl, 0.1)
LDFLAGS="$LDFLAGS -L/mingw/lib -L/local/lib"
#LDFLAGS="$LDFLAGS -L/mingw/lib -L/local/lib"
AC_CONFIG_MACRO_DIR(['aclocal'])
AC_CONFIG_MACRO_DIR(['/share/aclocal/'])
AC_CONFIG_HEADERS([config.h])
AM_INIT_AUTOMAKE([1.11])
@ -15,11 +16,6 @@ AC_PROG_CC
LT_INIT
PKG_CHECK_MODULES(OPENSSL, [openssl])
dnl PKG_CHECK_MODULES(LIBUUID, [uuid])
PKG_CHECK_MODULES(LIBTDATA, [libtdata])
PKG_CHECK_MODULES(LIBSEXPR, [libsexpr])
dnl *****************
dnl ***** options *****
dnl *****************
@ -33,6 +29,29 @@ AS_IF([test "x$enable_build_examples" = "xyes"], [
AM_CONDITIONAL(BUILD_EXAMPLES, test "x$enable_build_examples" = "xyes")
dnl ************win32*********
AC_ARG_ENABLE([win32],
AS_HELP_STRING([--enable-win32-build], [Enable win32 build mode]))
AS_IF([test "x$enable_win32_build" = "xyes"], [
AC_DEFINE([BUILD_WIN32], 1, [build for win32]),
LDFLAGS="$LDFLAGS -L/mingw/lib -L/local/lib"
],
[
PKG_CHECK_MODULES(LIBUUID, [uuid])
]
)
PKG_CHECK_MODULES(OPENSSL, [openssl])
dnl PKG_CHECK_MODULES(LIBUUID, [uuid])
PKG_CHECK_MODULES(LIBTDATA, [libtdata])
PKG_CHECK_MODULES(LIBSEXPR, [libsexpr])
AM_CONDITIONAL(BUILD_WIN32, test "x$enable_win32_build" = "xyes")
AC_OUTPUT([
Makefile
lib/libsntl.pc

32
examples/Makefile.am
View File

@ -10,21 +10,39 @@ AM_CPPFLAGS = \
AM_CFLAGS = -Wall -g
#LIBS += $(ZOFFICE_LIBS)
if !BUILD_WIN32
LIBS += $(ZOFFICE_LIBS)
endif !BUILD_WIN32
libsntl = ../lib/.libs/libsntl.la
if !BUILD_WIN32
bin_PROGRAMS = sntlc sntld gentest
sntld_SOURCES = sntld.c
sntld_LDADD = $(LIBTDATA_LIBS) $(LIBSEXPR_LIBS) $(OPENSSL_LIBS) \
$(LIBUUID_LIBS) $(libsntl)
sntlc_SOURCES = sntlc.c
sntlc_LDADD = $(LIBTDATA_LIBS) $(LIBSEXPR_LIBS) $(OPENSSL_LIBS) \
$(LIBUUID_LIBS) $(libsntl)
gentest_SOURCES = gentest.c
gentest_LDADD = $(LIBTDATA_LIBS) $(LIBSEXPR_LIBS) $(OPENSSL_LIBS) \
$(LIBUUID_LIBS) $(libsntl)
else BUILD_WIN32
bin_PROGRAMS = sntlc
#sntld_SOURCES = sntld.c
#sntld_LDADD = $(LIBTDATA_LIBS) $(LIBSEXPR_LIBS) $(OPENSSL_LIBS) \
# $(LIBUUID_LIBS) $(libsntl) -lws2_32
sntlc_SOURCES = sntlc.c
sntlc_LDADD = $(LIBTDATA_LIBS) $(LIBSEXPR_LIBS) $(OPENSSL_LIBS) \
$(LIBUUID_LIBS) $(libsntl) -lws2_32
#gentest_SOURCES = gentest.c
#gentest_LDADD = $(LIBTDATA_LIBS) $(LIBSEXPR_LIBS) $(OPENSSL_LIBS) \
# $(LIBUUID_LIBS) $(libsntl)
endif BUILD_WIN32
#zsyncd_LDFLAGS = \
# -Wl,--export-dynamic

9
lib/Makefile.am
View File

@ -18,8 +18,13 @@ libsntl_la_SOURCES = \
libsntl_la_LDFLAGS = -Wl,--export-dynamic
libsntl_la_LIBADD = -lpthread $(LIBTDATA_LIBS) $(LIBSEXPR_LIBS) $(OPENSSL_LIBS) \
-lcrypto -luuid
libsntl_la_LIBADD = -lpthread -lcrypto $(LIBTDATA_LIBS) $(LIBSEXPR_LIBS) $(OPENSSL_LIBS)
if BUILD_WIN32
libsntl_la_LIBADD += -luuid
else
libsntl_la_LIBADD += $(LIBUUID_LIBS)
endif !BUILD_WIN32
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = libsntl.pc

2
lib/connection.c
View File

@ -93,10 +93,12 @@ static int __conn_read(conn_t *co, void *buf, size_t buf_len)
int ofcmode, read_blocked = 0, read_blocked_on_write = 0;
/* First we make the socket nonblocking */
#ifndef WIN32
ofcmode = fcntl(rfd, F_GETFL,0);
ofcmode |= O_NDELAY;
if(fcntl(rfd, F_SETFL, ofcmode))
fprintf(stderr, "Couldn't make socket nonblocking");
#endif
__retry: