[git] NTBTLS - branch, master, updated. af472e2554bf8b8ed0c3387a7625a65792e85ffb

[by NIIBE Yutaka]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Not Too Bad TLS".

The branch, master has been updated
       via  af472e2554bf8b8ed0c3387a7625a65792e85ffb (commit)
      from  33f3b5f298ded3c34b65bc08ee714294c9918411 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit af472e2554bf8b8ed0c3387a7625a65792e85ffb
Author: NIIBE Yutaka <gniibe at fsij.org>
Date:   Fri Jan 20 13:13:02 2017 +0900

    configure: Add check for sys/socket.
    
    * configure.ac (gl_HEADER_SYS_SOCKET): Add.
    * m4/sys_socket_h.m4: New from gnupg.
    * src/Makefile.am (libntbtls_la_LIBADD, ntbtls_cli_LDADD): Fix.
    
    Signed-off-by: NIIBE Yutaka <gniibe at fsij.org>

diff --git a/configure.ac b/configure.ac
index 29ea3ac..fec870a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -321,6 +321,8 @@ AC_TYPE_MODE_T
 AC_TYPE_SIGNAL
 AC_DECL_SYS_SIGLIST
 
+gl_HEADER_SYS_SOCKET
+
 # For some systems we know that we have ld_version scripts.
 # Use it then as default.
 have_ld_version_script=no
diff --git a/m4/sys_socket_h.m4 b/m4/sys_socket_h.m4
new file mode 100644
index 0000000..d3e45b4
--- /dev/null
+++ b/m4/sys_socket_h.m4
@@ -0,0 +1,23 @@
+# sys_socket_h.m4 serial 2
+dnl Copyright (C) 2005, 2006 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+dnl From Simon Josefsson.
+
+AC_DEFUN([gl_HEADER_SYS_SOCKET],
+[
+  AC_CHECK_HEADERS_ONCE([sys/socket.h])
+  if test $ac_cv_header_sys_socket_h = yes; then
+    SYS_SOCKET_H=''
+  else
+    dnl We cannot use AC_CHECK_HEADERS_ONCE here, because that would make
+    dnl the check for those headers unconditional; yet cygwin reports
+    dnl that the headers are present but cannot be compiled (since on
+    dnl cygwin, all socket information should come from sys/socket.h).
+    AC_CHECK_HEADERS([winsock2.h ws2tcpip.h])
+    SYS_SOCKET_H='sys/socket.h'
+  fi
+  AC_SUBST(SYS_SOCKET_H)
+])
diff --git a/src/Makefile.am b/src/Makefile.am
index 88895ab..d0fa8a2 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -75,7 +75,7 @@ libntbtls_la_LDFLAGS = $(no_undefined) $(export_symbols) \
       @LIBNTBTLS_LT_CURRENT@:@LIBNTBTLS_LT_REVISION@:@LIBNTBTLS_LT_AGE@
 libntbtls_la_INCLUDES = -I$(top_srcdir)/lib
 libntbtls_la_DEPENDENCIES = $(srcdir)/libntbtls.vers $(ntbtls_deps)
-libntbtls_la_LIBADD = $(ntbtls_res) @LTLIBOBJS@ @GPG_ERROR_LIBS@
+libntbtls_la_LIBADD = $(ntbtls_res) @LTLIBOBJS@ @LIBGCRYPT_LIBS@ @KSBA_LIBS@ @GPG_ERROR_LIBS@ @NETLIBS@
 
 
 libntbtls_la_SOURCES = \
@@ -100,4 +100,4 @@ uninstall-local: uninstall-def-file
 
 ntbtls_cli_CFLAGS = @LIBGCRYPT_CFLAGS@ @KSBA_CFLAGS@ @GPG_ERROR_CFLAGS@
 ntbtls_cli_LDFLAGS = -no-install
-ntbtls_cli_LDADD = libntbtls.la @LIBGCRYPT_LIBS@ @KSBA_LIBS@ @GPG_ERROR_LIBS@
+ntbtls_cli_LDADD = libntbtls.la @LIBGCRYPT_LIBS@ @KSBA_LIBS@ @GPG_ERROR_LIBS@ @NETLIBS@

-----------------------------------------------------------------------

Summary of changes:
 configure.ac       |  2 ++
 m4/sys_socket_h.m4 | 23 +++++++++++++++++++++++
 src/Makefile.am    |  4 ++--
 3 files changed, 27 insertions(+), 2 deletions(-)
 create mode 100644 m4/sys_socket_h.m4


hooks/post-receive
-- 
Not Too Bad TLS
http://git.gnupg.org