Index: configure
===================================================================
RCS file: /cvsroot/pgsql-server/configure,v
retrieving revision 1.310.2.10
diff -c -c -r1.310.2.10 configure
*** configure	8 Jun 2004 15:36:34 -0000	1.310.2.10
--- configure	16 Jun 2004 03:14:51 -0000
***************
*** 13482,13489 ****
  fi
  done
  
! CFLAGS="$_CFLAGS"
! LIBS="$_LIBS"
  echo "$as_me:$LINENO: checking whether getpwuid_r takes a fifth argument" >&5
  echo $ECHO_N "checking whether getpwuid_r takes a fifth argument... $ECHO_C" >&6
  if test "${pgac_func_getpwuid_r_5arg+set}" = set; then
--- 13482,13488 ----
  fi
  done
  
! # do this test with the proper thread flags
  echo "$as_me:$LINENO: checking whether getpwuid_r takes a fifth argument" >&5
  echo $ECHO_N "checking whether getpwuid_r takes a fifth argument... $ECHO_C" >&6
  if test "${pgac_func_getpwuid_r_5arg+set}" = set; then
***************
*** 13543,13548 ****
--- 13542,13549 ----
  
  fi
  
+ CFLAGS="$_CFLAGS"
+ LIBS="$_LIBS"
  fi
  
  
Index: configure.in
===================================================================
RCS file: /cvsroot/pgsql-server/configure.in,v
retrieving revision 1.301.2.8
diff -c -c -r1.301.2.8 configure.in
*** configure.in	8 Jun 2004 15:36:35 -0000	1.301.2.8
--- configure.in	16 Jun 2004 03:14:53 -0000
***************
*** 1059,1067 ****
  CFLAGS="$CFLAGS $THREAD_CPPFLAGS"
  LIBS="$LIBS $THREAD_LIBS"
  AC_CHECK_FUNCS([strerror_r getpwuid_r gethostbyname_r])
  CFLAGS="$_CFLAGS"
  LIBS="$_LIBS"
- PGAC_FUNC_GETPWUID_R_5ARG
  fi
  
  
--- 1059,1068 ----
  CFLAGS="$CFLAGS $THREAD_CPPFLAGS"
  LIBS="$LIBS $THREAD_LIBS"
  AC_CHECK_FUNCS([strerror_r getpwuid_r gethostbyname_r])
+ # do this test with the proper thread flags
+ PGAC_FUNC_GETPWUID_R_5ARG
  CFLAGS="$_CFLAGS"
  LIBS="$_LIBS"
  fi