fix compilation

diff --git a/doc/examples/Makefile.am b/doc/examples/Makefile.am
index ed1592cb067f16cee4e2caf6782424914a62d350..28476cde119b5de9b7d2ff472704edb64a2b8d11 100644 (file)
--- a/doc/examples/Makefile.am
+++ b/doc/examples/Makefile.am
@@ -43,10 +43,6 @@ CXX_LDADD = $(LDADD) \
 noinst_PROGRAMS = ex-client-resume ex-client-dtls
 noinst_PROGRAMS += ex-cert-select ex-client-x509
 
-if ENABLE_PKI
-noinst_PROGRAMS += print-ciphersuites ex-crq ex-serv-x509 ex-serv-dtls
-endif
-
 if ENABLE_CXX
 ex_cxx_SOURCES = ex-cxx.cpp
 ex_cxx_LDADD = $(CXX_LDADD)
@@ -67,10 +63,8 @@ endif
 
 if ENABLE_PSK
 noinst_PROGRAMS += ex-client-psk
-if ENABLE_PKI
 noinst_PROGRAMS += ex-serv-psk
 endif
-endif
 
 if ENABLE_SRP
 noinst_PROGRAMS += ex-client-srp ex-serv-srp

diff --git a/src/Makefile.am b/src/Makefile.am
index 72d3e6a6dc3f49cea55a8b265409f6877e9eb614..9c646aa333538d187ca4c89ba3c4c6dfc24705ed 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -31,9 +31,6 @@ AM_CPPFLAGS = \
        $(LIBOPTS_CFLAGS)
 
 bin_PROGRAMS = gnutls-serv gnutls-cli psktool gnutls-cli-debug
-if ENABLE_PKI
-bin_PROGRAMS += certtool
-endif
 if ENABLE_SRP
 bin_PROGRAMS += srptool
 endif

diff --git a/src/socket.c b/src/socket.c
index 8d922328208437c9ae1b4b50bbf367d391afff66..c4d40012f06d3df903d28ff9f34ab41c490bc0aa 100644 (file)
--- a/src/socket.c
+++ b/src/socket.c
@@ -31,8 +31,8 @@
 #include <sys/types.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <unistd.h>
 #ifndef _WIN32
-# include <unistd.h>
 # include <signal.h>
 #endif
 #include <socket.h>