Commita8b9cbf

committed

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

scripts like pgaccess.

1 parent5add3e8 commita8b9cbfCopy full SHA for a8b9cbf

File tree

+11

-6

lines changed

+11

-6

lines changed

Lines changed: 3 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -976,7 +976,8 @@ if test x"${with_pgport+set}" = xset; then`
`976`	`976`	`else`
`977`	`977`	`default_port=5432`
`978`	`978`	`fi`
`979`		`-# Need both of these because backend wants an integer and frontend a string`
	`979`	`+echo"$ac_t""$default_port"1>&6`
	`980`	`+# Need both of these because some places want an integer and some a string`
`980`	`981`	`cat>> confdefs.h<<EOF`
`981`	`982`	`#define DEF_PGPORT${default_port}`
`982`	`983`	`EOF`
`@@ -985,7 +986,6 @@ cat >> confdefs.h <<EOF`
`985`	`986`	`#define DEF_PGPORT_STR "${default_port}"`
`986`	`987`	`EOF`
`987`	`988`
`988`		`-echo"$ac_t""$default_port"1>&6`
`989`	`989`
`990`	`990`
`991`	`991`	`#`
`@@ -7903,6 +7903,7 @@ s%@host_os@%$host_os%g`
`7903`	`7903`	`s%@PORTNAME@%$PORTNAME%g`
`7904`	`7904`	`s%@TAS@%$TAS%g`
`7905`	`7905`	`s%@MULTIBYTE@%$MULTIBYTE%g`
	`7906`	`+s%@default_port@%$default_port%g`
`7906`	`7907`	`s%@enable_shared@%$enable_shared%g`
`7907`	`7908`	`s%@enable_rpath@%$enable_rpath%g`
`7908`	`7909`	`s%@CC@%$CC%g`

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -223,11 +223,11 @@ AC_MSG_CHECKING([for default port number])`
`223`	`223`	`PGAC_ARG_REQ(with, pgport, [ --with-pgport=PORTNUM change default port number [5432]],`
`224`	`224`	`[default_port=$withval],`
`225`	`225`	`[default_port=5432])`
`226`		`-# Need both of these because backend wants an integer and frontend a string`
	`226`	`+AC_MSG_RESULT([$default_port])`
	`227`	`+# Need both of these because some places want an integer and some a string`
`227`	`228`	`AC_DEFINE_UNQUOTED(DEF_PGPORT, ${default_port})`
`228`	`229`	`AC_DEFINE_UNQUOTED(DEF_PGPORT_STR, "${default_port}")`
`229`		`-AC_MSG_RESULT([$default_port])`
`230`		`-`
	`230`	`+AC_SUBST(default_port)`
`231`	`231`
`232`	`232`	`#`
`233`	`233`	`# Maximum number of allowed connections (--with-maxbackends), default 32`

Lines changed: 5 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`# --makefile--`
`2`		`-# $Header: /cvsroot/pgsql/src/Makefile.global.in,v 1.117 2001/01/20 22:56:33 tgl Exp $`
	`2`	`+# $Header: /cvsroot/pgsql/src/Makefile.global.in,v 1.118 2001/02/07 20:13:27 tgl Exp $`
`3`	`3`
`4`	`4`	`#------------------------------------------------------------------------------`
`5`	`5`	`# All PostgreSQL makefiles include this file and use the variables it sets,`
`@@ -200,6 +200,10 @@ JADE= @JADE@`
`200`	`200`	`NSGMLS= @NSGMLS@`
`201`	`201`	`SGMLSPL= @SGMLSPL@`
`202`	`202`
	`203`	`+# Feature settings`
	`204`	`+`
	`205`	`+DEF_PGPORT = @default_port@`
	`206`	`+`
`203`	`207`
`204`	`208`	`##########################################################################`
`205`	`209`	`#`

Comments

(0)