fix

diff --git a/m4/hooks.m4 b/m4/hooks.m4
index 930592bdfdee2365ab370d98e5093f9cadf00504..09b6500d2065b55442d0ba77e5d2ba7062edbdd5 100644 (file)
--- 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 9c646aa333538d187ca4c89ba3c4c6dfc24705ed..90ba6c0e8f11837e260e3e7888ec8153c4467619 100644 (file)
--- 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