--- samba-3.0.26a/source/configure.in	2007-08-20 22:04:51.000000000 +0900
+++ samba-3.0.26a.osstech/source/configure.in	2007-10-18 16:02:22.389835381 +0900
@@ -281,6 +281,7 @@
 AC_SUBST(INSTALL_LIBSMBCLIENT)
 AC_SUBST(UNINSTALL_LIBSMBCLIENT)
 AC_SUBST(LIBSMBCLIENT_SHARED)
+AC_SUBST(LIBSMBCLIENT_EXTRA_LDSHFLAGS)
 AC_SUBST(LIBSMBCLIENT)
 AC_SUBST(INSTALL_LIBSMBSHAREMODES)
 AC_SUBST(UNINSTALL_LIBSMBSHAREMODES)
@@ -673,20 +674,17 @@
 				rm -fr conftest.c
 				case "$ac_cv_gcc_compiler_version_number" in
 					*"gcc version 2.6"*|*"gcc version 2.7"*)
-						CPPFLAGS="$CPPFLAGS -D_LARGEFILE64_SOURCE -D_REENTRANT"
-						LDFLAGS="$LDFLAGS -lthread"
+						CPPFLAGS="$CPPFLAGS -D_LARGEFILE64_SOURCE"
 						AC_DEFINE(_LARGEFILE64_SOURCE, 1, [Whether to enable large file support])
 						;;
 					*)
-						CPPFLAGS="$CPPFLAGS -D_LARGEFILE_SOURCE -D_REENTRANT -D_FILE_OFFSET_BITS=64"
-						LDFLAGS="$LDFLAGS -lthread"
+						CPPFLAGS="$CPPFLAGS -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64"
 						AC_DEFINE(_LARGEFILE64_SOURCE, 1, [Whether to enable large file support])
 						AC_DEFINE(_FILE_OFFSET_BITS, 64, [File offset bits])
 						;;
 				esac
 			else
-				CPPFLAGS="$CPPFLAGS -D_LARGEFILE_SOURCE -D_REENTRANT -D_FILE_OFFSET_BITS=64"
-				LDFLAGS="$LDFLAGS -lthread"
+				CPPFLAGS="$CPPFLAGS -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64"
 				AC_DEFINE(_LARGEFILE64_SOURCE, 1, [Whether to enable large file support])
 				AC_DEFINE(_FILE_OFFSET_BITS, 64, [File offset bits])
 			fi
@@ -4798,6 +4796,7 @@
 INSTALL_LIBSMBCLIENT=
 UNINSTALL_LIBSMBCLIENT=
 LIBSMBCLIENT_SHARED=
+LIBSMBCLIENT_EXTRA_LDSHFLAGS=
 LIBSMBCLIENT=
 AC_MSG_CHECKING(whether to build the libsmbclient shared library)
 AC_ARG_WITH(libsmbclient,
@@ -4839,6 +4838,24 @@
   UNINSTALL_LIBSMBCLIENT=uninstallclientlib
 )
 
+case "$host_os" in
+	*solaris*)
+		# Bugzilla Bug 1822
+		CPPFLAGS="$CPPFLAGS -D_REENTRANT"
+		AC_MSG_CHECKING(whether libsmbclient.so needs -lthread)
+		case $UNAME_R in
+			5.[1-9][0-9]*)
+				# Solaris 10 and later
+	  			AC_MSG_RESULT([no])
+				;;
+			*)
+	  			AC_MSG_RESULT([yes])
+				LIBSMBCLIENT_EXTRA_LDSHFLAGS="$LIBSMBCLIENT_EXTRA_LDSHFLAGS -lthread"
+				;;
+		esac
+		;;
+esac
+
 INSTALL_LIBSMBSHAREMODES=
 LIBSMBSHAREMODES_SHARED=
 LIBSMBSHAREMODES=
--- samba-3.0.26a/source/Makefile.in	2007-06-20 02:11:39.000000000 +0900
+++ samba-3.0.26a.osstech/source/Makefile.in	2007-10-18 16:08:52.438580299 +0900
@@ -26,6 +26,7 @@
 AR=@AR@
 LDSHFLAGS=@LDSHFLAGS@ @LDFLAGS@
 WINBIND_NSS_LDSHFLAGS=@WINBIND_NSS_LDSHFLAGS@ @LDFLAGS@
+LIBSMBCLIENT_LDSHFLAGS=@LDSHFLAGS@ @LDFLAGS@ @LIBSMBCLIENT_EXTRA_LDSHFLAGS@
 LDFLAGS=@PIE_LDFLAGS@ @LDFLAGS@
 AWK=@AWK@
 PICFLAG=@PICFLAG@
@@ -1154,7 +1155,7 @@
 
 bin/libsmbclient.@SHLIBEXT@: proto_exists $(LIBSMBCLIENT_OBJ)
 	@echo Linking libsmbclient shared library $@
-	@$(SHLD) $(LDSHFLAGS) -o $@ $(LIBSMBCLIENT_OBJ) $(LIBS) \
+	@$(SHLD) $(LIBSMBCLIENT_LDSHFLAGS) -o $@ $(LIBSMBCLIENT_OBJ) $(LIBS) \
 		$(KRB5LIBS) $(LDAP_LIBS) $(NSCD_LIBS) \
 		@SONAMEFLAG@`basename $@`.$(LIBSMBCLIENT_MAJOR)