Index: configure
--- configure.orig	2009-11-04 13:26:02 +0100
+++ configure	2009-11-04 17:50:44 +0100
@@ -4809,10 +4809,7 @@
 if $ac_preproc_ok; then :
 
 else
-  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "C preprocessor \"$CPP\" fails sanity check
-See \`config.log' for more details." "$LINENO" 5; }
+    :
 fi
 
 ac_ext=c
@@ -17785,7 +17782,7 @@
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
-LIBS="-l"$LDAPLIBNAME"  $LIBS"
+LIBS="-l$LDAPLIBNAME $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -17819,7 +17816,7 @@
 #define `$as_echo "HAVE_LIB"$LDAPLIBNAME"" | $as_tr_cpp` 1
 _ACEOF
 
-  LIBS="-l"$LDAPLIBNAME" $LIBS"
+  LIBS="-l$LDAPLIBNAME $LIBS"
 
 else
 
@@ -17967,7 +17964,7 @@
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
-LIBS="-l"$LBERLIBNAME"  $LIBS"
+LIBS="-l$LBERLIBNAME $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -18001,7 +17998,7 @@
 #define `$as_echo "HAVE_LIB"$LBERLIBNAME"" | $as_tr_cpp` 1
 _ACEOF
 
-  LIBS="-l"$LBERLIBNAME" $LIBS"
+  LIBS="-l$LBERLIBNAME $LIBS"
 
 else