Commit a8b9cbfa authored by Tom Lane's avatar Tom Lane

Make DEF_PGPORT available to Makefiles, so it can be substituted into

scripts like pgaccess.
parent 5add3e8e
...@@ -976,7 +976,8 @@ if test x"${with_pgport+set}" = xset; then ...@@ -976,7 +976,8 @@ if test x"${with_pgport+set}" = xset; then
else else
default_port=5432 default_port=5432
fi fi
# Need both of these because backend wants an integer and frontend a string echo "$ac_t""$default_port" 1>&6
# Need both of these because some places want an integer and some a string
cat >> confdefs.h <<EOF cat >> confdefs.h <<EOF
#define DEF_PGPORT ${default_port} #define DEF_PGPORT ${default_port}
EOF EOF
...@@ -985,7 +986,6 @@ cat >> confdefs.h <<EOF ...@@ -985,7 +986,6 @@ cat >> confdefs.h <<EOF
#define DEF_PGPORT_STR "${default_port}" #define DEF_PGPORT_STR "${default_port}"
EOF EOF
echo "$ac_t""$default_port" 1>&6
# #
...@@ -7903,6 +7903,7 @@ s%@host_os@%$host_os%g ...@@ -7903,6 +7903,7 @@ s%@host_os@%$host_os%g
s%@PORTNAME@%$PORTNAME%g s%@PORTNAME@%$PORTNAME%g
s%@TAS@%$TAS%g s%@TAS@%$TAS%g
s%@MULTIBYTE@%$MULTIBYTE%g s%@MULTIBYTE@%$MULTIBYTE%g
s%@default_port@%$default_port%g
s%@enable_shared@%$enable_shared%g s%@enable_shared@%$enable_shared%g
s%@enable_rpath@%$enable_rpath%g s%@enable_rpath@%$enable_rpath%g
s%@CC@%$CC%g s%@CC@%$CC%g
......
...@@ -223,11 +223,11 @@ AC_MSG_CHECKING([for default port number]) ...@@ -223,11 +223,11 @@ AC_MSG_CHECKING([for default port number])
PGAC_ARG_REQ(with, pgport, [ --with-pgport=PORTNUM change default port number [5432]], PGAC_ARG_REQ(with, pgport, [ --with-pgport=PORTNUM change default port number [5432]],
[default_port=$withval], [default_port=$withval],
[default_port=5432]) [default_port=5432])
# Need both of these because backend wants an integer and frontend a string AC_MSG_RESULT([$default_port])
# Need both of these because some places want an integer and some a string
AC_DEFINE_UNQUOTED(DEF_PGPORT, ${default_port}) AC_DEFINE_UNQUOTED(DEF_PGPORT, ${default_port})
AC_DEFINE_UNQUOTED(DEF_PGPORT_STR, "${default_port}") AC_DEFINE_UNQUOTED(DEF_PGPORT_STR, "${default_port}")
AC_MSG_RESULT([$default_port]) AC_SUBST(default_port)
# #
# Maximum number of allowed connections (--with-maxbackends), default 32 # Maximum number of allowed connections (--with-maxbackends), default 32
......
# -*-makefile-*- # -*-makefile-*-
# $Header: /cvsroot/pgsql/src/Makefile.global.in,v 1.117 2001/01/20 22:56:33 tgl Exp $ # $Header: /cvsroot/pgsql/src/Makefile.global.in,v 1.118 2001/02/07 20:13:27 tgl Exp $
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# All PostgreSQL makefiles include this file and use the variables it sets, # All PostgreSQL makefiles include this file and use the variables it sets,
...@@ -200,6 +200,10 @@ JADE = @JADE@ ...@@ -200,6 +200,10 @@ JADE = @JADE@
NSGMLS = @NSGMLS@ NSGMLS = @NSGMLS@
SGMLSPL = @SGMLSPL@ SGMLSPL = @SGMLSPL@
# Feature settings
DEF_PGPORT = @default_port@
########################################################################## ##########################################################################
# #
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment