--- configure.orig	Tue Nov  1 08:56:54 2005
+++ configure	Tue Nov  1 09:00:45 2005
@@ -1286,13 +1286,13 @@
 fi
 
 echo "$ac_t""$andrew_runpath_switch" 1>&6
-CPPFLAGS="-I/usr/local/include ${CPPFLAGS}"
+CPPFLAGS="-I%%LOCALBASE%%/include ${CPPFLAGS}"
 
   # this is CMU ADD LIBPATH
   if test "$andrew_runpath_switch" = "none" ; then
-	LDFLAGS="-L"/usr/local/lib" ${LDFLAGS}"
+	LDFLAGS="-L"%%LOCALBASE%%/lib" ${LDFLAGS}"
   else
-	LDFLAGS="-L"/usr/local/lib" $andrew_runpath_switch"/usr/local/lib" ${LDFLAGS}"
+	LDFLAGS="-L"%%LOCALBASE%%/lib" $andrew_runpath_switch"/usr/local/lib" ${LDFLAGS}"
   fi
 
 
@@ -2779,16 +2779,16 @@
 	  LDFLAGS="${cmu_saved_LDFLAGS} -L${ac_cv_sasl_where_lib}"
 	fi
 
-	ac_safe=`echo "sasl.h" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for sasl.h""... $ac_c" 1>&6
-echo "configure:2785: checking for sasl.h" >&5
+	ac_safe=`echo "sasl1/sasl.h" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for sasl1/sasl.h""... $ac_c" 1>&6
+echo "configure:2785: checking for sasl1/sasl.h" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
 #line 2790 "configure"
 #include "confdefs.h"
-#include <sasl.h>
+#include <sasl1/sasl.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
 { (eval echo configure:2795: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }