From: Nikos Mavrogiannopoulos <nmav@gnutls.org>
Date: Fri, 10 Feb 2012 12:25:47 +0000 (+0100)
Subject: fix compilation
X-Git-Tag: gnutls_3_0_13~87
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8b98440c8b00f354e500aeb88099c3e8dd59cf92;p=thirdparty%2Fgnutls.git

fix compilation
---

diff --git a/doc/examples/Makefile.am b/doc/examples/Makefile.am
index ed1592cb06..28476cde11 100644
--- 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 72d3e6a6dc..9c646aa333 100644
--- 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 8d92232820..c4d40012f0 100644
--- 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>