*** empty log message ***

diff --git a/doc/TODO b/doc/TODO
index deacafc4b2ef68c098d686501064ce478adbe7d2..50ae845893a2cdf59719680ad510581d72edc178 100644 (file)
--- a/doc/TODO
+++ b/doc/TODO
@@ -4,7 +4,8 @@ in order to avoid having people working on the same thing.
 
 Current list:
 * Add a callback function in certificate authentication, to receive
-  the certificate and the private key.
+  the certificate and the private key. This might require a rewrite
+  of the certificate selection part.
 * Add support for generating and handling DSA keys
 * Convert documentation to texinfo format
 * Audit the code

diff --git a/libgcrypt.m4 b/libgcrypt.m4
index fa1c60d72376157c076225cdceded6eeedb42ea8..0e8ab5803d6a77d84e4f595e90b1f7948172acad 100644 (file)
--- a/libgcrypt.m4
+++ b/libgcrypt.m4
@@ -20,7 +20,6 @@ AC_DEFUN(AM_PATH_LIBGCRYPT,
                            [prefix where LIBGCRYPT is installed (optional)]),
      libgcrypt_config_prefix="$withval", libgcrypt_config_prefix="")
   if test x$libgcrypt_config_prefix != x ; then
-     libgcrypt_config_args="$libgcrypt_config_args --prefix=$libgcrypt_config_prefix"
      if test x${LIBGCRYPT_CONFIG+set} != xset ; then
         LIBGCRYPT_CONFIG=$libgcrypt_config_prefix/bin/libgcrypt-config
      fi
@@ -60,7 +59,7 @@ AC_DEFUN(AM_PATH_LIBGCRYPT,
         fi
     fi
   fi
-  if test x$ok = xyes; then
+  if test $ok = yes; then
     LIBGCRYPT_CFLAGS=`$LIBGCRYPT_CONFIG $libgcrypt_config_args --cflags`
     LIBGCRYPT_LIBS=`$LIBGCRYPT_CONFIG $libgcrypt_config_args --libs`
     AC_MSG_RESULT(yes)