diff --git a/configure b/configure
index e81aae154d0dde0ff9eb451d993a67fbe91796bc..38f24ffa2e22b24c266cae136183e8c8a6aa8e3a 100755
--- a/configure
+++ b/configure
@@ -7744,9 +7744,8 @@ if test "$ac_res" != no; then
 fi
 
 # Required for thread_test.c on Solaris 2.5:
-case $host_os in
-     solaris*)
-	{ echo "$as_me:$LINENO: checking for library containing gethostbyname_r" >&5
+# Other ports use it too (HP-UX) so test unconditionally
+{ echo "$as_me:$LINENO: checking for library containing gethostbyname_r" >&5
 echo $ECHO_N "checking for library containing gethostbyname_r... $ECHO_C" >&6; }
 if test "${ac_cv_search_gethostbyname_r+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -7829,8 +7828,6 @@ if test "$ac_res" != no; then
 
 fi
 
-	;;
-esac
 # Cygwin:
 { echo "$as_me:$LINENO: checking for library containing shmget" >&5
 echo $ECHO_N "checking for library containing shmget... $ECHO_C" >&6; }
diff --git a/configure.in b/configure.in
index ff5964d77e2302fbb4e0c5ace8ad2e09ce2da6f4..fadd4c53adfc3ef801d1a2414773551e9deefc71 100644
--- a/configure.in
+++ b/configure.in
@@ -1,5 +1,5 @@
 dnl Process this file with autoconf to produce a configure script.
-dnl $PostgreSQL: pgsql/configure.in,v 1.586 2009/01/14 16:39:58 momjian Exp $
+dnl $PostgreSQL: pgsql/configure.in,v 1.587 2009/01/14 18:10:21 momjian Exp $
 dnl
 dnl Developers, please strive to achieve this order:
 dnl
@@ -871,11 +871,8 @@ AC_SEARCH_LIBS(crypt, crypt)
 # Solaris:
 AC_SEARCH_LIBS(fdatasync, [rt posix4])
 # Required for thread_test.c on Solaris 2.5:
-case $host_os in
-     solaris*)
-	AC_SEARCH_LIBS(gethostbyname_r, nsl)
-	;;
-esac
+# Other ports use it too (HP-UX) so test unconditionally
+AC_SEARCH_LIBS(gethostbyname_r, nsl)
 # Cygwin:
 AC_SEARCH_LIBS(shmget, cygipc)