*** pgsql/configure.in	2003/06/06 19:11:55	1.255
--- pgsql/configure.in	2003/06/23 23:51:59	1.267
***************
*** 1,5 ****
  dnl Process this file with autoconf to produce a configure script.
! dnl $Header: /projects/cvsroot/pgsql/configure.in,v 1.255 2003/06/06 19:11:55 momjian Exp $
  dnl
  dnl Developers, please strive to achieve this order:
  dnl
--- 1,5 ----
  dnl Process this file with autoconf to produce a configure script.
! dnl $Header: /projects/cvsroot/pgsql/configure.in,v 1.267 2003/06/23 23:51:59 momjian Exp $
  dnl
  dnl Developers, please strive to achieve this order:
  dnl
*************** done
*** 320,325 ****
--- 320,335 ----
  IFS=$ac_save_IFS
  
  #
+ # Enable libpq to be thread-safe
+ #
+ AC_MSG_CHECKING([allow threaded libpq])
+ PGAC_ARG_BOOL(with, threads, no, [  --with-threads          allow libpq and ecpg to be thread-safe],
+               [AC_DEFINE([USE_THREADS], 1, [Define to 1 to build libpq and ecpg to be thread-safe. (--with-threads)])])
+ 
+ AC_MSG_RESULT([$with_threads])
+ AC_SUBST(with_threads)
+ 
+ #
  # Tcl/Tk
  #
  AC_MSG_CHECKING([whether to build with Tcl])
*************** AC_SUBST(with_pam)
*** 472,477 ****
--- 482,498 ----
  
  
  #
+ # Rendezvous
+ #
+ AC_MSG_CHECKING([whether to build with Rendezvous support])
+ PGAC_ARG_BOOL(with, rendezvous, no,
+               [  --with-rendezvous       build with Rendezvous support],
+               [AC_DEFINE([USE_RENDEZVOUS], 1, [Define to 1 to build with Rendezvous support. (--with-rendezvous)])])
+ AC_MSG_RESULT([$with_rendezvous])
+ AC_SUBST(with_rendezvous)
+ 
+ 
+ #
  # OpenSSL
  #
  PGAC_ARG_OPTARG(with, openssl,
*************** fi])
*** 531,558 ****
  AC_SUBST(ELF_SYS)
  
  #
- # Pthreads
- #
- 
- AC_CHECK_HEADER(pthread.h,
- 	[AC_DEFINE(HAVE_THREADS, 1, [Define to 1 if you have the threads interface.])])
- if test ! -z "$HAVE_THREADS"
- then	
- 	case $host_os in
- 		# BSD/OS and NetBSD require no special libraries or flags
- 		netbsd*|bsdi*) ;;
- 		freebsd2*|freebsd3*|freebsd4*) THREAD_CFLAGS="-pthread" ;;
- 		freebsd*) THREAD_LIBS="-lc_r" ;;
- 		linux*) THREAD_LIBS="-lpthread"
- 			THREAD_CFLAGS="-D_REENTRANT" ;;
- 	# other operating systems might fail because they have pthread.h but need
- 	# special libs we don't know about yet.
- 	esac
- fi
- AC_SUBST(THREAD_LIBS)
- AC_SUBST(THREAD_CFLAGS)
- 
- #
  # Assignments
  #
  
--- 552,557 ----
*************** PGAC_CHECK_STRIP
*** 587,597 ****
  AC_CHECK_PROGS(YACC, ['bison -y'])
  
  if test "$YACC"; then
!   if bison --version | sed q | $AWK '{ if ($4 < 1.875) exit 0; else exit 1;}'; then
      AC_MSG_WARN([
  *** The installed version of Bison is too old.  PostgreSQL needs
  *** Bison version 1.875 or later.])
-     unset YACC
    fi
  fi
  
--- 586,595 ----
  AC_CHECK_PROGS(YACC, ['bison -y'])
  
  if test "$YACC"; then
!   if $YACC --version | sed q | $AWK '{ if ($4 < 1.875) exit 0; else exit 1;}'; then
      AC_MSG_WARN([
  *** The installed version of Bison is too old.  PostgreSQL needs
  *** Bison version 1.875 or later.])
    fi
  fi
  
*************** if test "$with_pam" = yes ; then
*** 760,765 ****
--- 758,767 ----
                                       [AC_MSG_ERROR([header file <security/pam_appl.h> or <pam/pam_appl.h> is required for PAM.])])])
  fi
  
+ if test "$with_rendezvous" = yes ; then
+   AC_CHECK_HEADER(DNSServiceDiscovery/DNSServiceDiscovery.h, [], [AC_MSG_ERROR([header file <DNSServiceDiscovery/DNSServiceDiscovery.h> is required for Rendezvous])])
+ fi
+ 
  
  ##
  ## Types, structures, compiler characteristics
*************** PGAC_C_FUNCNAME_SUPPORT
*** 775,784 ****
--- 777,789 ----
  PGAC_STRUCT_TIMEZONE
  PGAC_UNION_SEMUN
  PGAC_STRUCT_SOCKADDR_UN
+ PGAC_STRUCT_SOCKADDR_STORAGE
+ PGAC_STRUCT_SOCKADDR_STORAGE_SS_FAMILY
  PGAC_STRUCT_ADDRINFO
  
  AC_CHECK_TYPES([struct cmsgcred, struct fcred, struct sockcred], [], [],
  [#include <sys/param.h>
+ #include <sys/types.h>
  #include <sys/socket.h>
  #include <sys/ucred.h>])
  
*************** AC_CHECK_FUNCS(atexit, [],
*** 954,959 ****
--- 959,1007 ----
  
  AC_FUNC_FSEEKO
  
+ #
+ # Pthreads
+ #
+ # For each platform, we need to know about any special compile and link
+ # libraries, and whether the normal C function names are thread-safe.
+ #
+ NEED_REENTRANT_FUNC_NAMES=no
+ if test "$with_threads" = yes; then
+ AC_CHECK_HEADER(pthread.h, [], [AC_MSG_ERROR([pthread.h not found, required for --with-threads])])
+ 
+ if test "$SUPPORTS_THREADS" != yes; then
+ AC_MSG_ERROR([
+ Cannot enable threads on your platform.
+ Please report your platform threading info to the PostgreSQL mailing lists
+ so it can be added to the next release.  Report any compile flags, link flags,
+ functions, or libraries required for threading support.
+ ])
+ fi
+ fi
+ AC_SUBST(THREAD_CFLAGS)
+ AC_SUBST(THREAD_LIBS)
+ 
+ 
+ #
+ # Check for re-entrant versions of certain functions
+ #
+ # Include special flags if threads are enabled _and_ if required for 
+ # threading on this platform.  Some platforms have *_r functions but
+ # their natively named funcs are threadsafe, and should be used instead.
+ #
+ # One trick here is that if the don't call AC_CHECK_FUNCS, the
+ # functions are marked "not found", which is perfect.
+ #
+ if test "$NEED_REENTRANT_FUNC_NAMES" = yes ; then
+ _CFLAGS="$CFLAGS"
+ _LIB="$LIBS"
+ CFLAGS="$CFLAGS $TREAD_CFLAGS"
+ LIBS="$LIBS $THREAD_LIBS"
+ AC_CHECK_FUNCS([strerror_r getpwuid_r gethostbyname_r])
+ CFLAGS="$_CFLAGS"
+ LIB="$_LIBS"
+ fi
+ 
  
  # This test makes sure that run tests work at all.  Sometimes a shared
  # library is found by the linker, but the runtime linker can't find it.