Index: config/init/hints/irix.pm
===================================================================
--- config/init/hints/irix.pm	(revision 40800)
+++ config/init/hints/irix.pm	(working copy)
@@ -21,7 +21,7 @@
     $conf->data->set( ccflags => $ccflags );
 
     my $libs = $conf->data->get('libs');
-    if ( $libs !~ /-lpthread/ ) {
+    if ( $libs !~ /-lpthread\b/ ) {
         $libs .= ' -lpthread';
     }
     $conf->data->set( libs => $libs );
Index: config/init/hints/solaris.pm
===================================================================
--- config/init/hints/solaris.pm	(revision 40800)
+++ config/init/hints/solaris.pm	(working copy)
@@ -10,7 +10,7 @@
     my ( $self, $conf ) = @_;
 
     my $libs = $conf->data->get('libs');
-    if ( $libs !~ /-lpthread/ ) {
+    if ( $libs !~ /-lpthread\b/ ) {
         $libs .= ' -lpthread';
     }
     if ( $libs !~ /-lrt\b/ ) {
Index: config/init/hints/netbsd.pm
===================================================================
--- config/init/hints/netbsd.pm	(revision 40800)
+++ config/init/hints/netbsd.pm	(working copy)
@@ -10,13 +10,13 @@
     my ( $self, $conf ) = @_;
 
     my $ccflags = $conf->data->get('ccflags');
-    if ( $ccflags !~ /-pthread/ ) {
+    if ( $ccflags !~ /-pthread\b/ ) {
         $ccflags .= ' -pthread';
     }
     $conf->data->set( ccflags => $ccflags );
 
     my $libs = $conf->data->get('libs');
-    if ( $libs !~ /-lpthread/ ) {
+    if ( $libs !~ /-lpthread\b/ ) {
         $libs .= ' -lpthread';
     }
     $conf->data->set( libs => $libs );
Index: config/init/hints/hpux.pm
===================================================================
--- config/init/hints/hpux.pm	(revision 40800)
+++ config/init/hints/hpux.pm	(working copy)
@@ -10,7 +10,7 @@
     my ( $self, $conf ) = @_;
 
     my $libs = $conf->data->get('libs');
-    if ( $libs !~ /-lpthread/ ) {
+    if ( $libs !~ /-lpthread\b/ ) {
         $libs .= ' -lpthread';
     }
 
Index: config/init/hints/dragonfly.pm
===================================================================
--- config/init/hints/dragonfly.pm	(revision 40800)
+++ config/init/hints/dragonfly.pm	(working copy)
@@ -13,7 +13,7 @@
     my $version   = $conf->option_or_data('VERSION');
     my $libs = $conf->data->get('libs');
 
-    $libs .= ' -pthread' unless $libs =~ /pthread/;
+    $libs .= ' -pthread' unless $libs =~ /pthread\b/;
 
     $conf->data->set(
         libs  => $libs,
Index: config/init/hints/openbsd.pm
===================================================================
--- config/init/hints/openbsd.pm	(revision 40800)
+++ config/init/hints/openbsd.pm	(working copy)
@@ -12,13 +12,13 @@
     my $share_ext = $conf->option_or_data('share_ext');
     my $version   = $conf->option_or_data('VERSION');
     my $ccflags = $conf->data->get('ccflags');
-    if ( $ccflags !~ /-pthread/ ) {
+    if ( $ccflags !~ /-pthread\b/ ) {
         $ccflags .= ' -pthread';
     }
     $conf->data->set( ccflags => $ccflags );
 
     my $libs = $conf->data->get('libs');
-    if ( $libs !~ /-lpthread/ ) {
+    if ( $libs !~ /-lpthread\b/ ) {
         $libs .= ' -lpthread';
     }
     $conf->data->set(
Index: config/init/hints/dec_osf.pm
===================================================================
--- config/init/hints/dec_osf.pm	(revision 40800)
+++ config/init/hints/dec_osf.pm	(working copy)
@@ -11,7 +11,7 @@
 
     # Tru64
     my $ccflags = $conf->data->get('ccflags');
-    if ( $ccflags !~ /-pthread/ ) {
+    if ( $ccflags !~ /-pthread\b/ ) {
         $ccflags .= ' -pthread';
     }
     if ( $ccflags !~ /-D_REENTRANT/ ) {
@@ -24,7 +24,7 @@
     $conf->data->set( ccflags => $ccflags );
 
     my $libs = $conf->data->get('libs');
-    if ( $libs !~ /-lpthread/ ) {
+    if ( $libs !~ /-lpthread\b/ ) {
         $libs .= ' -lpthread';
     }
     $conf->data->set( libs => $libs );
@@ -37,7 +37,7 @@
     }
 
     my $linkflags = $conf->data->get('linkflags');
-    if ( $linkflags !~ /-expect_unresolved/ ) {
+    if ( $linkflags !~ /-expect_unresolved\b/ ) {
         $linkflags = "-expect_unresolved '*' -O4 -msym -std $linkflags";
         $conf->data->set( linkflags => $linkflags );
     }