From ec5821d3a81e748c9e455336a1756f2bd2cd5301 Mon Sep 17 00:00:00 2001 From: Michael Tuexen Date: Fri, 7 Oct 2016 15:15:25 +0200 Subject: [PATCH] Fix detection of sctp_sendmsg and sctp_recvmsg. --- configure.ac | 3 ++- guile-sctp.c | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac index 42087ab..95ce1df 100644 --- a/configure.ac +++ b/configure.ac @@ -98,7 +98,8 @@ AC_TRY_COMPILE([#ifdef HAVE_SYS_TYPES_H AC_MSG_RESULT(yes)], [AC_MSG_RESULT(no)]) -AC_CHECK_LIB(sctp, sctp_sendmsg) +AC_CHECK_FUNCS(sctp_sendmsg,, [AC_CHECK_LIB(sctp, sctp_sendmsg)]) +AC_CHECK_FUNCS(sctp_recvmsg,, [AC_CHECK_LIB(sctp, sctp_sendmsg)]) AC_CONFIG_FILES([Makefile]) AC_OUTPUT diff --git a/guile-sctp.c b/guile-sctp.c index 0d07a82..a4627ca 100644 --- a/guile-sctp.c +++ b/guile-sctp.c @@ -248,8 +248,7 @@ _scm_from_sockaddr (const struct sockaddr *address, unsigned addr_size, const ch } -#ifdef HAVE_LIBSCTP - +#ifdef HAVE_SCTP_RECVMSG SCM_DEFINE (net_sctp_recvmsg, "sctp-recvmsg!", 2, 3, 0, (SCM sock, SCM str, SCM flags, SCM start, SCM end), "Return data from the socket port @var{sock} and also\n" @@ -329,7 +328,9 @@ SCM_DEFINE (net_sctp_recvmsg, "sctp-recvmsg!", 2, 3, 0, return scm_list_4 (scm_from_int (rv), address, scm_from_int (flg), s_sinfo); } #undef FUNC_NAME +#endif +#ifdef HAVE_SCTP_SENDMSG SCM_DEFINE (net_sctp_sendmsg, "sctp-sendmsg", 8, 0, 1, (SCM sock, SCM message, SCM ppid, SCM stream_no, SCM ttl, SCM context, SCM fam_or_sockaddr, SCM address, SCM args_and_flags), "Transmit the string @var{message} on the socket port\n" @@ -404,7 +405,6 @@ SCM_DEFINE (net_sctp_sendmsg, "sctp-sendmsg", 8, 0, 1, return scm_from_int (rv); } #undef FUNC_NAME - #endif