summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNikos Mavrogiannopoulos <nmav@gnutls.org>2012-02-10 13:25:47 +0100
committerNikos Mavrogiannopoulos <nmav@gnutls.org>2012-02-10 13:27:00 +0100
commit8b98440c8b00f354e500aeb88099c3e8dd59cf92 (patch)
treebd45ebb6a9003533c67963128628be5808e234cd
parentfc8c253957a8f642cee1c263c742cc96f966c01c (diff)
downloadgnutls-8b98440c8b00f354e500aeb88099c3e8dd59cf92.tar.gz
fix compilation
-rw-r--r--doc/examples/Makefile.am6
-rw-r--r--src/Makefile.am3
-rw-r--r--src/socket.c2
3 files changed, 1 insertions, 10 deletions
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>