Index: agent/genkey.c
--- agent/genkey.c.orig	2009-06-29 08:20:15 +0200
+++ agent/genkey.c	2009-09-06 22:59:18 +0200
@@ -190,11 +190,9 @@
         return gpg_error (GPG_ERR_INV_PASSPHRASE);
 
       desc = xtryasprintf 
-        ( ngettext ("Warning: You have entered an insecure passphrase.%%0A"
+        (           "Warning: You have entered an insecure passphrase.%%0A"
                     "A passphrase should be at least %u character long.", 
-                    "Warning: You have entered an insecure passphrase.%%0A"
-                    "A passphrase should be at least %u characters long.", 
-                    minlen), minlen );
+                    minlen);
       if (!desc)
         return gpg_error_from_syserror ();
       err = take_this_one_anyway (ctrl, desc);
Index: configure
--- configure.orig	2009-09-04 18:09:14 +0200
+++ configure	2009-09-06 23:05:29 +0200
@@ -7992,13 +7992,13 @@
 # Check wether it is necessary to link against libdl.
 #
 gnupg_dlopen_save_libs="$LIBS"
-LIBS=""
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing dlopen" >&5
 $as_echo_n "checking for library containing dlopen... " >&6; }
 if test "${ac_cv_search_dlopen+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   ac_func_search_save_LIBS=$LIBS
+  LIBS=""
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */