User PORTNAME for win32 tests, rather than $template, for consistency.

configure

@@ -21710,7 +21710,7 @@ fi
 
 
 
-if test x"$template" != x"win32"
+if "$PORTNAME" != "win32"
 then
 echo "$as_me:$LINENO: checking for POSIX signal interface" >&5
 echo $ECHO_N "checking for POSIX signal interface... $ECHO_C" >&6
@@ -23252,7 +23252,7 @@ done
 # defined.  Cross compiling throws a warning.
 #
 if test "$enable_thread_safety_force" = yes; then
-if test x"$template" != x"win32"
+if "$PORTNAME" != "win32"
 then
   { echo "$as_me:$LINENO: WARNING:
 *** Skipping thread test program.  --enable-thread-safety-force was used.
@@ -23269,7 +23269,7 @@ else
 echo "$as_me: WARNING: *** skipping thread test on Win32" >&2;}
 fi
 elif test "$enable_thread_safety" = yes; then
-if test x"$template" != x"win32"
+if "$PORTNAME" != "win32"
 then
 echo "$as_me:$LINENO: checking thread safety of required library functions" >&5
 echo $ECHO_N "checking thread safety of required library functions... $ECHO_C" >&6

configure.in

 dnl Process this file with autoconf to produce a configure script.
-dnl $PostgreSQL: pgsql/configure.in,v 1.504 2007/03/26 02:37:16 tgl Exp $
+dnl $PostgreSQL: pgsql/configure.in,v 1.505 2007/03/26 19:46:56 momjian Exp $
 dnl
 dnl Developers, please strive to achieve this order:
 dnl
@@ -1328,7 +1328,7 @@ AC_CHECK_TYPES([int8, uint8, int64, uint64], [], [],
 AC_CHECK_TYPES(sig_atomic_t, [], [], [#include <signal.h>])
 
 
-if test x"$template" != x"win32"
+if "$PORTNAME" != "win32"
 then
 PGAC_FUNC_POSIX_SIGNALS
 if test "$pgac_cv_func_posix_signals" != yes -a "$enable_thread_safety" = yes; then
@@ -1415,7 +1415,7 @@ AC_CHECK_PROGS(SGMLSPL, sgmlspl)
 # defined.  Cross compiling throws a warning.
 #
 if test "$enable_thread_safety_force" = yes; then
-if test x"$template" != x"win32"
+if "$PORTNAME" != "win32"
 then
   AC_MSG_WARN([
 *** Skipping thread test program.  --enable-thread-safety-force was used.
@@ -1426,7 +1426,7 @@ else
 AC_MSG_WARN([*** skipping thread test on Win32])
 fi
 elif test "$enable_thread_safety" = yes; then
-if test x"$template" != x"win32"
+if "$PORTNAME" != "win32"
 then
 AC_MSG_CHECKING([thread safety of required library functions])