--- configure.orig	2009-04-07 12:23:13.000000000 +0000
+++ configure	2009-04-07 12:25:46.000000000 +0000
@@ -3593,7 +3593,7 @@
 # Check whether --with-ldap was given.
 if test "${with_ldap+set}" = set; then
   withval=$with_ldap; case $with_ldap in
-    no)		with_ldap="";;
+    no)		;;
     *)		cat >>confdefs.h <<\_ACEOF
 #define HAVE_LDAP 1
 _ACEOF
@@ -22311,7 +22311,7 @@
     fi
 fi
 
-if test ${with_ldap-'no'} != "no"; then
+if test "${with_ldap-no}" != "no"; then
     _LDFLAGS="$LDFLAGS"
     if test "$with_ldap" != "yes"; then