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

fix
---

diff --git a/m4/hooks.m4 b/m4/hooks.m4
index 930592bdfd..09b6500d20 100644
--- a/m4/hooks.m4
+++ b/m4/hooks.m4
@@ -132,6 +132,7 @@ fi
     AC_MSG_WARN([C99 macros not supported. This may affect compiling.])
   ])
 
+  ac_enable_srp=yes
   AC_MSG_CHECKING([whether to disable SRP authentication support])
   AC_ARG_ENABLE(srp-authentication,
     AS_HELP_STRING([--disable-srp-authentication],
@@ -146,6 +147,7 @@ fi
   fi
   AM_CONDITIONAL(ENABLE_SRP, test "$ac_enable_srp" != "no")
   
+  ac_enable_psk=yes
   AC_MSG_CHECKING([whether to disable PSK authentication support])
   AC_ARG_ENABLE(psk-authentication,
     AS_HELP_STRING([--disable-psk-authentication],
@@ -160,6 +162,7 @@ fi
   fi
   AM_CONDITIONAL(ENABLE_PSK, test "$ac_enable_psk" != "no")
   
+  ac_enable_anon=yes
   AC_MSG_CHECKING([whether to disable anonymous authentication support])
   AC_ARG_ENABLE(anon-authentication,
     AS_HELP_STRING([--disable-anon-authentication],
diff --git a/src/Makefile.am b/src/Makefile.am
index 9c646aa333..90ba6c0e8f 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -30,7 +30,7 @@ AM_CPPFLAGS = \
 	-I$(srcdir)/../extra/includes	\
 	$(LIBOPTS_CFLAGS)
 
-bin_PROGRAMS = gnutls-serv gnutls-cli psktool gnutls-cli-debug
+bin_PROGRAMS = gnutls-serv gnutls-cli psktool gnutls-cli-debug certtool
 if ENABLE_SRP
 bin_PROGRAMS += srptool
 endif