Index: configure
===================================================================
RCS file: /cvsroot/pgsql/configure,v
retrieving revision 1.437
diff -c -c -r1.437 configure
*** configure	7 May 2005 05:48:50 -0000	1.437
--- configure	15 May 2005 00:16:13 -0000
***************
*** 871,877 ****
    --with-krb5             build with Kerberos 5 support
    --with-krb-srvnam=NAME  name of the service principal in Kerberos [postgres]
    --with-pam              build with PAM support
!   --with-rendezvous       build with Rendezvous support
    --with-openssl          build with OpenSSL support
    --without-readline      do not use Readline
    --without-zlib          do not use Zlib
--- 871,877 ----
    --with-krb5             build with Kerberos 5 support
    --with-krb-srvnam=NAME  name of the service principal in Kerberos [postgres]
    --with-pam              build with PAM support
!   --with-bonjour          build with Bonjour support
    --with-openssl          build with OpenSSL support
    --without-readline      do not use Readline
    --without-zlib          do not use Zlib
***************
*** 3431,3452 ****
  
  
  #
! # Rendezvous
  #
! echo "$as_me:$LINENO: checking whether to build with Rendezvous support" >&5
! echo $ECHO_N "checking whether to build with Rendezvous support... $ECHO_C" >&6
  
  
  
! # Check whether --with-rendezvous or --without-rendezvous was given.
! if test "${with_rendezvous+set}" = set; then
!   withval="$with_rendezvous"
  
    case $withval in
      yes)
  
  cat >>confdefs.h <<\_ACEOF
! #define USE_RENDEZVOUS 1
  _ACEOF
  
        ;;
--- 3431,3452 ----
  
  
  #
! # Bonjour
  #
! echo "$as_me:$LINENO: checking whether to build with Bonjour support" >&5
! echo $ECHO_N "checking whether to build with Bonjour support... $ECHO_C" >&6
  
  
  
! # Check whether --with-bonjour or --without-bonjour was given.
! if test "${with_bonjour+set}" = set; then
!   withval="$with_bonjour"
  
    case $withval in
      yes)
  
  cat >>confdefs.h <<\_ACEOF
! #define USE_BONJOUR 1
  _ACEOF
  
        ;;
***************
*** 3454,3472 ****
        :
        ;;
      *)
!       { { echo "$as_me:$LINENO: error: no argument expected for --with-rendezvous option" >&5
! echo "$as_me: error: no argument expected for --with-rendezvous option" >&2;}
     { (exit 1); exit 1; }; }
        ;;
    esac
  
  else
!   with_rendezvous=no
  
  fi;
  
! echo "$as_me:$LINENO: result: $with_rendezvous" >&5
! echo "${ECHO_T}$with_rendezvous" >&6
  
  
  
--- 3454,3472 ----
        :
        ;;
      *)
!       { { echo "$as_me:$LINENO: error: no argument expected for --with-bonjour option" >&5
! echo "$as_me: error: no argument expected for --with-bonjour option" >&2;}
     { (exit 1); exit 1; }; }
        ;;
    esac
  
  else
!   with_bonjour=no
  
  fi;
  
! echo "$as_me:$LINENO: result: $with_bonjour" >&5
! echo "${ECHO_T}$with_bonjour" >&6
  
  
  
***************
*** 9674,9680 ****
  
  fi
  
! if test "$with_rendezvous" = yes ; then
    if test "${ac_cv_header_DNSServiceDiscovery_DNSServiceDiscovery_h+set}" = set; then
    echo "$as_me:$LINENO: checking for DNSServiceDiscovery/DNSServiceDiscovery.h" >&5
  echo $ECHO_N "checking for DNSServiceDiscovery/DNSServiceDiscovery.h... $ECHO_C" >&6
--- 9674,9680 ----
  
  fi
  
! if test "$with_bonjour" = yes ; then
    if test "${ac_cv_header_DNSServiceDiscovery_DNSServiceDiscovery_h+set}" = set; then
    echo "$as_me:$LINENO: checking for DNSServiceDiscovery/DNSServiceDiscovery.h" >&5
  echo $ECHO_N "checking for DNSServiceDiscovery/DNSServiceDiscovery.h... $ECHO_C" >&6
***************
*** 9779,9786 ****
  if test $ac_cv_header_DNSServiceDiscovery_DNSServiceDiscovery_h = yes; then
    :
  else
!   { { echo "$as_me:$LINENO: error: header file <DNSServiceDiscovery/DNSServiceDiscovery.h> is required for Rendezvous" >&5
! echo "$as_me: error: header file <DNSServiceDiscovery/DNSServiceDiscovery.h> is required for Rendezvous" >&2;}
     { (exit 1); exit 1; }; }
  fi
  
--- 9779,9786 ----
  if test $ac_cv_header_DNSServiceDiscovery_DNSServiceDiscovery_h = yes; then
    :
  else
!   { { echo "$as_me:$LINENO: error: header file <DNSServiceDiscovery/DNSServiceDiscovery.h> is required for Bonjour" >&5
! echo "$as_me: error: header file <DNSServiceDiscovery/DNSServiceDiscovery.h> is required for Bonjour" >&2;}
     { (exit 1); exit 1; }; }
  fi
  
***************
*** 19710,19716 ****
  s,@with_krb5@,$with_krb5,;t t
  s,@krb_srvtab@,$krb_srvtab,;t t
  s,@with_pam@,$with_pam,;t t
! s,@with_rendezvous@,$with_rendezvous,;t t
  s,@with_openssl@,$with_openssl,;t t
  s,@ELF_SYS@,$ELF_SYS,;t t
  s,@LDFLAGS_SL@,$LDFLAGS_SL,;t t
--- 19710,19716 ----
  s,@with_krb5@,$with_krb5,;t t
  s,@krb_srvtab@,$krb_srvtab,;t t
  s,@with_pam@,$with_pam,;t t
! s,@with_bonjour@,$with_bonjour,;t t
  s,@with_openssl@,$with_openssl,;t t
  s,@ELF_SYS@,$ELF_SYS,;t t
  s,@LDFLAGS_SL@,$LDFLAGS_SL,;t t
Index: configure.in
===================================================================
RCS file: /cvsroot/pgsql/configure.in,v
retrieving revision 1.410
diff -c -c -r1.410 configure.in
*** configure.in	7 May 2005 05:48:50 -0000	1.410
--- configure.in	15 May 2005 00:16:15 -0000
***************
*** 466,479 ****
  
  
  #
! # 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)
  
  
  #
--- 466,479 ----
  
  
  #
! # Bonjour
  #
! AC_MSG_CHECKING([whether to build with Bonjour support])
! PGAC_ARG_BOOL(with, bonjour, no,
!               [  --with-bonjour          build with Bonjour support],
!               [AC_DEFINE([USE_BONJOUR], 1, [Define to 1 to build with Bonjour support. (--with-bonjour)])])
! AC_MSG_RESULT([$with_bonjour])
! AC_SUBST(with_bonjour)
  
  
  #
***************
*** 781,788 ****
                                       [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
  
  
--- 781,788 ----
                                       [AC_MSG_ERROR([header file <security/pam_appl.h> or <pam/pam_appl.h> is required for PAM.])])])
  fi
  
! if test "$with_bonjour" = yes ; then
!   AC_CHECK_HEADER(DNSServiceDiscovery/DNSServiceDiscovery.h, [], [AC_MSG_ERROR([header file <DNSServiceDiscovery/DNSServiceDiscovery.h> is required for Bonjour])])
  fi
  
  
Index: doc/src/sgml/installation.sgml
===================================================================
RCS file: /cvsroot/pgsql/doc/src/sgml/installation.sgml,v
retrieving revision 1.232
diff -c -c -r1.232 installation.sgml
*** doc/src/sgml/installation.sgml	9 Apr 2005 03:52:43 -0000	1.232
--- doc/src/sgml/installation.sgml	15 May 2005 00:16:17 -0000
***************
*** 864,873 ****
        </varlistentry>
  
        <varlistentry>
!        <term><option>--with-rendezvous</option></term>
         <listitem>
          <para>
!          Build with Rendezvous support.  This requires Rendezvous support
           in your operating system.  Recommended on Mac OS X.
          </para>
         </listitem>
--- 864,873 ----
        </varlistentry>
  
        <varlistentry>
!        <term><option>--with-bonjour</option></term>
         <listitem>
          <para>
!          Build with Bonjour support.  This requires Bonjour support
           in your operating system.  Recommended on Mac OS X.
          </para>
         </listitem>
Index: doc/src/sgml/runtime.sgml
===================================================================
RCS file: /cvsroot/pgsql/doc/src/sgml/runtime.sgml,v
retrieving revision 1.318
diff -c -c -r1.318 runtime.sgml
*** doc/src/sgml/runtime.sgml	9 May 2005 17:26:22 -0000	1.318
--- doc/src/sgml/runtime.sgml	15 May 2005 00:16:21 -0000
***************
*** 873,889 ****
        </listitem>
       </varlistentry>
       
!      <varlistentry id="guc-rendezvous-name" xreflabel="rendezvous_name">
!       <term><varname>rendezvous_name</varname> (<type>string</type>)</term>
        <indexterm>
!        <primary><varname>rendezvous_name</> configuration parameter</primary>
        </indexterm>
        <listitem>
         <para>
!         Specifies the <productname>Rendezvous</productname> broadcast
          name.  By default, the computer name is used, specified as an
          empty string ''.  This option is ignored if the server was not
!         compiled with <productname>Rendezvous</productname> support.  This
          option can only be set at server start.
         </para>
        </listitem>
--- 873,889 ----
        </listitem>
       </varlistentry>
       
!      <varlistentry id="guc-bonjour-name" xreflabel="bonjour_name">
!       <term><varname>bonjour_name</varname> (<type>string</type>)</term>
        <indexterm>
!        <primary><varname>bonjour_name</> configuration parameter</primary>
        </indexterm>
        <listitem>
         <para>
!         Specifies the <productname>Bonjour</productname> broadcast
          name.  By default, the computer name is used, specified as an
          empty string ''.  This option is ignored if the server was not
!         compiled with <productname>Bonjour</productname> support.  This
          option can only be set at server start.
         </para>
        </listitem>
Index: src/backend/postmaster/postmaster.c
===================================================================
RCS file: /cvsroot/pgsql/src/backend/postmaster/postmaster.c,v
retrieving revision 1.450
diff -c -c -r1.450 postmaster.c
*** src/backend/postmaster/postmaster.c	25 Mar 2005 00:34:21 -0000	1.450
--- src/backend/postmaster/postmaster.c	15 May 2005 00:16:24 -0000
***************
*** 88,94 ****
  #include <getopt.h>
  #endif
  
! #ifdef USE_RENDEZVOUS
  #include <DNSServiceDiscovery/DNSServiceDiscovery.h>
  #endif
  
--- 88,94 ----
  #include <getopt.h>
  #endif
  
! #ifdef USE_BONJOUR
  #include <DNSServiceDiscovery/DNSServiceDiscovery.h>
  #endif
  
***************
*** 198,204 ****
  bool		Log_connections = false;
  bool		Db_user_namespace = false;
  
! char	   *rendezvous_name;
  
  /* list of library:init-function to be preloaded */
  char	   *preload_libraries_string = NULL;
--- 198,204 ----
  bool		Log_connections = false;
  bool		Db_user_namespace = false;
  
! char	   *bonjour_name;
  
  /* list of library:init-function to be preloaded */
  char	   *preload_libraries_string = NULL;
***************
*** 242,248 ****
   */
  static void checkDataDir(void);
  
! #ifdef USE_RENDEZVOUS
  static void reg_reply(DNSServiceRegistrationReplyErrorType errorCode,
  		  void *context);
  #endif
--- 242,248 ----
   */
  static void checkDataDir(void);
  
! #ifdef USE_BONJOUR
  static void reg_reply(DNSServiceRegistrationReplyErrorType errorCode,
  		  void *context);
  #endif
***************
*** 746,756 ****
  		pfree(rawstring);
  	}
  
! #ifdef USE_RENDEZVOUS
! 	/* Register for Rendezvous only if we opened TCP socket(s) */
! 	if (ListenSocket[0] != -1 && rendezvous_name != NULL)
  	{
! 		DNSServiceRegistrationCreate(rendezvous_name,
  									 "_postgresql._tcp.",
  									 "",
  									 htonl(PostPortNumber),
--- 746,756 ----
  		pfree(rawstring);
  	}
  
! #ifdef USE_BONJOUR
! 	/* Register for Bonjour only if we opened TCP socket(s) */
! 	if (ListenSocket[0] != -1 && bonjour_name != NULL)
  	{
! 		DNSServiceRegistrationCreate(bonjour_name,
  									 "_postgresql._tcp.",
  									 "",
  									 htonl(PostPortNumber),
***************
*** 1009,1015 ****
  }
  
  
! #ifdef USE_RENDEZVOUS
  
  /*
   * empty callback function for DNSServiceRegistrationCreate()
--- 1009,1015 ----
  }
  
  
! #ifdef USE_BONJOUR
  
  /*
   * empty callback function for DNSServiceRegistrationCreate()
***************
*** 1019,1025 ****
  {
  
  }
! #endif   /* USE_RENDEZVOUS */
  
  
  /*
--- 1019,1025 ----
  {
  
  }
! #endif   /* USE_BONJOUR */
  
  
  /*
Index: src/backend/utils/misc/guc.c
===================================================================
RCS file: /cvsroot/pgsql/src/backend/utils/misc/guc.c,v
retrieving revision 1.261
diff -c -c -r1.261 guc.c
*** src/backend/utils/misc/guc.c	1 May 2005 18:56:19 -0000	1.261
--- src/backend/utils/misc/guc.c	15 May 2005 00:16:28 -0000
***************
*** 1573,1583 ****
  	},
  
  	{
! 		{"rendezvous_name", PGC_POSTMASTER, CONN_AUTH_SETTINGS,
! 			gettext_noop("Sets the Rendezvous broadcast service name."),
  			NULL
  		},
! 		&rendezvous_name,
  		"", NULL, NULL
  	},
  
--- 1573,1583 ----
  	},
  
  	{
! 		{"bonjour_name", PGC_POSTMASTER, CONN_AUTH_SETTINGS,
! 			gettext_noop("Sets the Bonjour broadcast service name."),
  			NULL
  		},
! 		&bonjour_name,
  		"", NULL, NULL
  	},
  
Index: src/backend/utils/misc/postgresql.conf.sample
===================================================================
RCS file: /cvsroot/pgsql/src/backend/utils/misc/postgresql.conf.sample,v
retrieving revision 1.140
diff -c -c -r1.140 postgresql.conf.sample
*** src/backend/utils/misc/postgresql.conf.sample	21 Apr 2005 19:18:13 -0000	1.140
--- src/backend/utils/misc/postgresql.conf.sample	15 May 2005 00:16:28 -0000
***************
*** 56,62 ****
  #unix_socket_directory = ''
  #unix_socket_group = ''
  #unix_socket_permissions = 0777	# octal
! #rendezvous_name = ''		# defaults to the computer name
  
  # - Security & Authentication -
  
--- 56,62 ----
  #unix_socket_directory = ''
  #unix_socket_group = ''
  #unix_socket_permissions = 0777	# octal
! #bonjour_name = ''		# defaults to the computer name
  
  # - Security & Authentication -
  
Index: src/include/pg_config.h.in
===================================================================
RCS file: /cvsroot/pgsql/src/include/pg_config.h.in,v
retrieving revision 1.82
diff -c -c -r1.82 pg_config.h.in
*** src/include/pg_config.h.in	11 Mar 2005 17:20:34 -0000	1.82
--- src/include/pg_config.h.in	15 May 2005 00:16:29 -0000
***************
*** 645,652 ****
  /* Define to 1 to build with PAM support. (--with-pam) */
  #undef USE_PAM
  
! /* Define to 1 to build with Rendezvous support. (--with-rendezvous) */
! #undef USE_RENDEZVOUS
  
  /* Use replacement snprintf() functions. */
  #undef USE_SNPRINTF
--- 645,652 ----
  /* Define to 1 to build with PAM support. (--with-pam) */
  #undef USE_PAM
  
! /* Define to 1 to build with Bonjour support. (--with-bonjour) */
! #undef USE_BONJOUR
  
  /* Use replacement snprintf() functions. */
  #undef USE_SNPRINTF
Index: src/include/postmaster/postmaster.h
===================================================================
RCS file: /cvsroot/pgsql/src/include/postmaster/postmaster.h,v
retrieving revision 1.9
diff -c -c -r1.9 postmaster.h
*** src/include/postmaster/postmaster.h	31 Dec 2004 22:03:39 -0000	1.9
--- src/include/postmaster/postmaster.h	15 May 2005 00:16:30 -0000
***************
*** 28,34 ****
  extern char *preload_libraries_string;
  extern bool Log_connections;
  extern bool log_hostname;
! extern char *rendezvous_name;
  
  #ifdef WIN32
  extern HANDLE PostmasterHandle;
--- 28,34 ----
  extern char *preload_libraries_string;
  extern bool Log_connections;
  extern bool log_hostname;
! extern char *bonjour_name;
  
  #ifdef WIN32
  extern HANDLE PostmasterHandle;