--- configure.orig	Fri Feb  2 08:15:33 2007
+++ configure	Fri Apr  6 23:40:18 2007
@@ -441,6 +441,11 @@
   -docdir=* | --docdir=* | --infodi=* | --infod=* | --doc=* | --inf=*)
     docdir=$ac_optarg ;;
 
+  -infodir | --infodir | --infodi | --infod | --info | --inf)
+    ac_prev=infodir ;;
+  -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*)
+    infodir=$ac_optarg ;;
+
   -libdir | --libdir | --libdi | --libd)
     ac_prev=libdir ;;
   -libdir=* | --libdir=* | --libdi=* | --libd=*)
@@ -3321,11 +3326,13 @@
 _ACEOF
 
 
-  if test -d "$krb4_prefix/include"; then
-    INCLUDES="$INCLUDES -I$krb4_prefix/include"
-  fi
-  if test -d "$krb4_prefix/lib"; then
-    LIBDIRS="$LIBDIRS -L$krb4_prefix/lib"
+  if test "$krb4_prefix" != "/usr"; then
+    if test -d "$krb4_prefix/include"; then
+      INCLUDES="$INCLUDES -I$krb4_prefix/include"
+    fi
+    if test -d "$krb4_prefix/lib"; then
+      LIBDIRS="$LIBDIRS -L$krb4_prefix/lib"
+    fi
   fi
 
   krb_srvtab="/etc/srvtab"
@@ -3379,11 +3386,13 @@
 _ACEOF
 
 
-  if test -d "$krb5_prefix/include"; then
-    INCLUDES="$INCLUDES -I$krb5_prefix/include"
-  fi
-  if test -d "$krb5_prefix/lib"; then
-    LIBDIRS="$LIBDIRS -L$krb5_prefix/lib"
+  if test "$krb5_prefix" != "/usr"; then
+    if test -d "$krb5_prefix/include"; then
+      INCLUDES="$INCLUDES -I$krb5_prefix/include"
+    fi
+    if test -d "$krb5_prefix/lib"; then
+      LIBDIRS="$LIBDIRS -L$krb5_prefix/lib"
+    fi
   fi
 
   krb_srvtab="FILE:\$(sysconfdir)/krb5.keytab"
@@ -3562,11 +3571,13 @@
 _ACEOF
 
 
-  if test -d "${openssl_prefix}/include" ; then
-    INCLUDES="$INCLUDES -I${openssl_prefix}/include"
-  fi
-  if test -d "${openssl_prefix}/lib" ; then
-    LIBDIRS="$LIBDIRS -L${openssl_prefix}/lib"
+  if test "${openssl_prefix}" != "/usr"; then
+    if test -d "${openssl_prefix}/include" ; then
+      INCLUDES="$INCLUDES -I${openssl_prefix}/include"
+    fi
+    if test -d "${openssl_prefix}/lib" ; then
+      LIBDIRS="$LIBDIRS -L${openssl_prefix}/lib"
+    fi
   fi
 
 fi