summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Josefsson <simon@josefsson.org>2008-06-19 13:43:01 +0200
committerSimon Josefsson <simon@josefsson.org>2008-06-19 13:43:01 +0200
commit2770d22d9c2b122289e936f77a1f3efd6613186a (patch)
treedfb8ab1fee0a0ab18af32b390ac57619a4b72310
parent62475c6048bb76a5252109fbdeac7e797ae85fb0 (diff)
downloadgnutls-2770d22d9c2b122289e936f77a1f3efd6613186a.tar.gz
Make --disable-psk-authentication work.
-rw-r--r--configure.in1
-rw-r--r--doc/examples/Makefile.am8
2 files changed, 7 insertions, 2 deletions
diff --git a/configure.in b/configure.in
index 53439546a4..e806fe950f 100644
--- a/configure.in
+++ b/configure.in
@@ -422,6 +422,7 @@ else
ac_full=0
AC_MSG_RESULT(yes)
fi
+AM_CONDITIONAL(ENABLE_PSK, test "$ac_enable_psk" != "no")
AC_MSG_CHECKING([whether to disable anonymous authentication support])
AC_ARG_ENABLE(anon-authentication,
diff --git a/doc/examples/Makefile.am b/doc/examples/Makefile.am
index c8d925269e..df1e89158f 100644
--- a/doc/examples/Makefile.am
+++ b/doc/examples/Makefile.am
@@ -31,9 +31,9 @@ LDADD = libexamples.la \
CXX_LDADD = $(LDADD) \
../../lib/libgnutlsxx.la
-noinst_PROGRAMS = ex-client2 ex-client-resume ex-client-psk
+noinst_PROGRAMS = ex-client2 ex-client-resume
noinst_PROGRAMS += ex-cert-select ex-crq
-noinst_PROGRAMS += ex-serv1 ex-serv-export ex-serv-psk
+noinst_PROGRAMS += ex-serv1 ex-serv-export
if ENABLE_CXX
ex_cxx_SOURCES = ex-cxx.cpp
@@ -50,6 +50,10 @@ if ENABLE_OPENPGP
noinst_PROGRAMS += ex-serv-pgp
endif
+if ENABLE_PSK
+noinst_PROGRAMS += ex-client-psk ex-serv-psk
+endif
+
if ENABLE_SRP
noinst_PROGRAMS += ex-client-srp ex-serv-srp
endif