Rename Rendezvous to Bonjour to match OS/X renaming.
This commit is contained in:
Bruce Momjian
parent
c8a6b52705
commit
c9a382b2ed
|
|
@ -871,7 +871,7 @@ Optional Packages:
|
|||
--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-bonjour build with Bonjour support
|
||||
--with-openssl build with OpenSSL support
|
||||
--without-readline do not use Readline
|
||||
--without-zlib do not use Zlib
|
||||
|
|
@ -3431,22 +3431,22 @@ echo "${ECHO_T}$with_pam" >&6
|
|||
|
||||
|
||||
#
|
||||
# Rendezvous
|
||||
# Bonjour
|
||||
#
|
||||
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
|
||||
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-rendezvous or --without-rendezvous was given.
|
||||
if test "${with_rendezvous+set}" = set; then
|
||||
withval="$with_rendezvous"
|
||||
# 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_RENDEZVOUS 1
|
||||
#define USE_BONJOUR 1
|
||||
_ACEOF
|
||||
|
||||
;;
|
||||
|
|
@ -3454,19 +3454,19 @@ _ACEOF
|
|||
:
|
||||
;;
|
||||
*)
|
||||
{ { 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;}
|
||||
{ { 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_rendezvous=no
|
||||
with_bonjour=no
|
||||
|
||||
fi;
|
||||
|
||||
echo "$as_me:$LINENO: result: $with_rendezvous" >&5
|
||||
echo "${ECHO_T}$with_rendezvous" >&6
|
||||
echo "$as_me:$LINENO: result: $with_bonjour" >&5
|
||||
echo "${ECHO_T}$with_bonjour" >&6
|
||||
|
||||
|
||||
|
||||
|
|
@ -9674,7 +9674,7 @@ done
|
|||
|
||||
fi
|
||||
|
||||
if test "$with_rendezvous" = yes ; then
|
||||
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,8 +9779,8 @@ fi
|
|||
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;}
|
||||
{ { 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,7 +19710,7 @@ s,@with_krb4@,$with_krb4,;t t
|
|||
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_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
|
||||
|
|
|
|||
20
configure.in
20
configure.in
|
|
@ -1,5 +1,5 @@
|
|||
dnl Process this file with autoconf to produce a configure script.
|
||||
dnl $PostgreSQL: pgsql/configure.in,v 1.410 2005/05/07 05:48:50 neilc Exp $
|
||||
dnl $PostgreSQL: pgsql/configure.in,v 1.411 2005/05/15 00:26:18 momjian Exp $
|
||||
dnl
|
||||
dnl Developers, please strive to achieve this order:
|
||||
dnl
|
||||
|
|
@ -466,14 +466,14 @@ AC_SUBST(with_pam)
|
|||
|
||||
|
||||
#
|
||||
# Rendezvous
|
||||
# Bonjour
|
||||
#
|
||||
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)
|
||||
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,8 +781,8 @@ if test "$with_pam" = yes ; then
|
|||
[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])])
|
||||
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
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
<!-- $PostgreSQL: pgsql/doc/src/sgml/installation.sgml,v 1.232 2005/04/09 03:52:43 momjian Exp $ -->
|
||||
<!-- $PostgreSQL: pgsql/doc/src/sgml/installation.sgml,v 1.233 2005/05/15 00:26:18 momjian Exp $ -->
|
||||
|
||||
<chapter id="installation">
|
||||
<title><![%standalone-include[<productname>PostgreSQL</>]]>
|
||||
|
|
@ -864,10 +864,10 @@ su - postgres
|
|||
</varlistentry>
|
||||
|
||||
<varlistentry>
|
||||
<term><option>--with-rendezvous</option></term>
|
||||
<term><option>--with-bonjour</option></term>
|
||||
<listitem>
|
||||
<para>
|
||||
Build with Rendezvous support. This requires Rendezvous support
|
||||
Build with Bonjour support. This requires Bonjour support
|
||||
in your operating system. Recommended on Mac OS X.
|
||||
</para>
|
||||
</listitem>
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
<!--
|
||||
$PostgreSQL: pgsql/doc/src/sgml/runtime.sgml,v 1.318 2005/05/09 17:26:22 momjian Exp $
|
||||
$PostgreSQL: pgsql/doc/src/sgml/runtime.sgml,v 1.319 2005/05/15 00:26:18 momjian Exp $
|
||||
-->
|
||||
|
||||
<chapter Id="runtime">
|
||||
|
|
@ -873,17 +873,17 @@ SET ENABLE_SEQSCAN TO OFF;
|
|||
</listitem>
|
||||
</varlistentry>
|
||||
|
||||
<varlistentry id="guc-rendezvous-name" xreflabel="rendezvous_name">
|
||||
<term><varname>rendezvous_name</varname> (<type>string</type>)</term>
|
||||
<varlistentry id="guc-bonjour-name" xreflabel="bonjour_name">
|
||||
<term><varname>bonjour_name</varname> (<type>string</type>)</term>
|
||||
<indexterm>
|
||||
<primary><varname>rendezvous_name</> configuration parameter</primary>
|
||||
<primary><varname>bonjour_name</> configuration parameter</primary>
|
||||
</indexterm>
|
||||
<listitem>
|
||||
<para>
|
||||
Specifies the <productname>Rendezvous</productname> broadcast
|
||||
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>Rendezvous</productname> support. This
|
||||
compiled with <productname>Bonjour</productname> support. This
|
||||
option can only be set at server start.
|
||||
</para>
|
||||
</listitem>
|
||||
|
|
|
|||
|
|
@ -37,7 +37,7 @@
|
|||
*
|
||||
*
|
||||
* IDENTIFICATION
|
||||
* $PostgreSQL: pgsql/src/backend/postmaster/postmaster.c,v 1.450 2005/03/25 00:34:21 tgl Exp $
|
||||
* $PostgreSQL: pgsql/src/backend/postmaster/postmaster.c,v 1.451 2005/05/15 00:26:18 momjian Exp $
|
||||
*
|
||||
* NOTES
|
||||
*
|
||||
|
|
@ -88,7 +88,7 @@
|
|||
#include <getopt.h>
|
||||
#endif
|
||||
|
||||
#ifdef USE_RENDEZVOUS
|
||||
#ifdef USE_BONJOUR
|
||||
#include <DNSServiceDiscovery/DNSServiceDiscovery.h>
|
||||
#endif
|
||||
|
||||
|
|
@ -198,7 +198,7 @@ bool log_hostname; /* for ps display and logging */
|
|||
bool Log_connections = false;
|
||||
bool Db_user_namespace = false;
|
||||
|
||||
char *rendezvous_name;
|
||||
char *bonjour_name;
|
||||
|
||||
/* list of library:init-function to be preloaded */
|
||||
char *preload_libraries_string = NULL;
|
||||
|
|
@ -242,7 +242,7 @@ extern int optreset;
|
|||
*/
|
||||
static void checkDataDir(void);
|
||||
|
||||
#ifdef USE_RENDEZVOUS
|
||||
#ifdef USE_BONJOUR
|
||||
static void reg_reply(DNSServiceRegistrationReplyErrorType errorCode,
|
||||
void *context);
|
||||
#endif
|
||||
|
|
@ -746,11 +746,11 @@ PostmasterMain(int argc, char *argv[])
|
|||
pfree(rawstring);
|
||||
}
|
||||
|
||||
#ifdef USE_RENDEZVOUS
|
||||
/* Register for Rendezvous only if we opened TCP socket(s) */
|
||||
if (ListenSocket[0] != -1 && rendezvous_name != NULL)
|
||||
#ifdef USE_BONJOUR
|
||||
/* Register for Bonjour only if we opened TCP socket(s) */
|
||||
if (ListenSocket[0] != -1 && bonjour_name != NULL)
|
||||
{
|
||||
DNSServiceRegistrationCreate(rendezvous_name,
|
||||
DNSServiceRegistrationCreate(bonjour_name,
|
||||
"_postgresql._tcp.",
|
||||
"",
|
||||
htonl(PostPortNumber),
|
||||
|
|
@ -1009,7 +1009,7 @@ checkDataDir(void)
|
|||
}
|
||||
|
||||
|
||||
#ifdef USE_RENDEZVOUS
|
||||
#ifdef USE_BONJOUR
|
||||
|
||||
/*
|
||||
* empty callback function for DNSServiceRegistrationCreate()
|
||||
|
|
@ -1019,7 +1019,7 @@ reg_reply(DNSServiceRegistrationReplyErrorType errorCode, void *context)
|
|||
{
|
||||
|
||||
}
|
||||
#endif /* USE_RENDEZVOUS */
|
||||
#endif /* USE_BONJOUR */
|
||||
|
||||
|
||||
/*
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@
|
|||
* Written by Peter Eisentraut <peter_e@gmx.net>.
|
||||
*
|
||||
* IDENTIFICATION
|
||||
* $PostgreSQL: pgsql/src/backend/utils/misc/guc.c,v 1.261 2005/05/01 18:56:19 tgl Exp $
|
||||
* $PostgreSQL: pgsql/src/backend/utils/misc/guc.c,v 1.262 2005/05/15 00:26:19 momjian Exp $
|
||||
*
|
||||
*--------------------------------------------------------------------
|
||||
*/
|
||||
|
|
@ -1573,11 +1573,11 @@ static struct config_string ConfigureNamesString[] =
|
|||
},
|
||||
|
||||
{
|
||||
{"rendezvous_name", PGC_POSTMASTER, CONN_AUTH_SETTINGS,
|
||||
gettext_noop("Sets the Rendezvous broadcast service name."),
|
||||
{"bonjour_name", PGC_POSTMASTER, CONN_AUTH_SETTINGS,
|
||||
gettext_noop("Sets the Bonjour broadcast service name."),
|
||||
NULL
|
||||
},
|
||||
&rendezvous_name,
|
||||
&bonjour_name,
|
||||
"", NULL, NULL
|
||||
},
|
||||
|
||||
|
|
|
|||
|
|
@ -56,7 +56,7 @@
|
|||
#unix_socket_directory = ''
|
||||
#unix_socket_group = ''
|
||||
#unix_socket_permissions = 0777 # octal
|
||||
#rendezvous_name = '' # defaults to the computer name
|
||||
#bonjour_name = '' # defaults to the computer name
|
||||
|
||||
# - Security & Authentication -
|
||||
|
||||
|
|
|
|||
|
|
@ -645,8 +645,8 @@
|
|||
/* 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
|
||||
/* Define to 1 to build with Bonjour support. (--with-bonjour) */
|
||||
#undef USE_BONJOUR
|
||||
|
||||
/* Use replacement snprintf() functions. */
|
||||
#undef USE_SNPRINTF
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
* Portions Copyright (c) 1996-2005, PostgreSQL Global Development Group
|
||||
* Portions Copyright (c) 1994, Regents of the University of California
|
||||
*
|
||||
* $PostgreSQL: pgsql/src/include/postmaster/postmaster.h,v 1.9 2004/12/31 22:03:39 pgsql Exp $
|
||||
* $PostgreSQL: pgsql/src/include/postmaster/postmaster.h,v 1.10 2005/05/15 00:26:19 momjian Exp $
|
||||
*
|
||||
*-------------------------------------------------------------------------
|
||||
*/
|
||||
|
|
@ -28,7 +28,7 @@ extern int AuthenticationTimeout;
|
|||
extern char *preload_libraries_string;
|
||||
extern bool Log_connections;
|
||||
extern bool log_hostname;
|
||||
extern char *rendezvous_name;
|
||||
extern char *bonjour_name;
|
||||
|
||||
#ifdef WIN32
|
||||
extern HANDLE PostmasterHandle;
|
||||
|
|
|
|||
Loading…
Reference in New Issue