--- a/usr/src/cmd/samba/Patches/configure.in.diff	Fri Mar 25 15:04:55 2011 +0000
+++ b/usr/src/cmd/samba/Patches/configure.in.diff	Tue Aug 16 20:32:52 2011 +0000
@@ -1,6 +1,17 @@
 --- source3/configure.in	Mon Jan 18 12:38:09 2010
 +++ source3/configure.in	Sat Mar 13 19:19:27 2010
-@@ -3282,6 +3360,22 @@
+@@ -1737,7 +1737,9 @@
+ 		# try if check no fails
+ 		save_LIBS=$LIBS
+ 		LIBS="$LIBS $TERMLIBS"
+-		AC_TRY_LINK([], [rl_callback_handler_install();], [AC_MSG_RESULT([yes])],[ AC_MSG_RESULT([no]); LDFLAGS="$saved_before_as_needed_ldflags"])
++		AC_TRY_RUN([main() { rl_reset_terminal(); return 0; }],
++		[AC_MSG_RESULT([yes])],[AC_MSG_RESULT([no]);
++		  LDFLAGS="$saved_before_as_needed_ldflags"])
+ 		LIBS="$save_LIBS"
+         fi
+ fi
+@@ -3522,6 +3524,22 @@
      fi
    fi
  
@@ -23,7 +34,7 @@
    ac_save_CFLAGS=$CFLAGS
    ac_save_CPPFLAGS=$CPPFLAGS
    ac_save_LDFLAGS=$LDFLAGS
-@@ -6313,6 +6353,7 @@
+@@ -6612,6 +6630,7 @@
  SMB_MODULE(vfs_preopen, \$(VFS_PREOPEN_OBJ), "bin/preopen.$SHLIBEXT", VFS)
  SMB_MODULE(vfs_syncops, \$(VFS_SYNCOPS_OBJ), "bin/syncops.$SHLIBEXT", VFS)
  SMB_MODULE(vfs_zfsacl, \$(VFS_ZFSACL_OBJ), "bin/zfsacl.$SHLIBEXT", VFS)