Index: configure.in
===================================================================
RCS file: /cvsroot/pgsql/configure.in,v
retrieving revision 1.178
diff -c -r1.178 configure.in
*** configure.in	14 Apr 2002 17:23:20 -0000	1.178
--- configure.in	16 Apr 2002 01:47:00 -0000
***************
*** 215,229 ****
  AC_SUBST(default_port)
  
  #
! # Maximum number of allowed connections (--with-maxbackends), default 32
  #
! AC_MSG_CHECKING([for default soft limit on number of connections])
! PGAC_ARG_REQ(with, maxbackends, [  --with-maxbackends=N    set default maximum number of connections [32]],
               [],
!              [with_maxbackends=32])
! AC_MSG_RESULT([$with_maxbackends])
! AC_DEFINE_UNQUOTED([DEF_MAXBACKENDS], [$with_maxbackends],
!                    [The default soft limit on the number of concurrent connections, i.e., the default for the postmaster -N switch (--with-maxbackends)])
  
  
  #
--- 215,229 ----
  AC_SUBST(default_port)
  
  #
! # Maximum number of index/function parameters (--with-maxindfuncparams), default 16
  #
! AC_MSG_CHECKING([maximum number of index/function parameters])
! PGAC_ARG_REQ(with, maxindfuncparams, [  --with-maxindfuncparams=N    maximum number of index/function parameters [16]],
               [],
!              [with_maxindfuncparams=16])
! AC_MSG_RESULT([$with_maxindfuncparams])
! AC_DEFINE_UNQUOTED([MAXINDFUNCPARAMS], [$with_maxindfuncparams],
!                    [The maximum number of index/function parameters])
  
  
  #
Index: src/backend/utils/misc/guc.c
===================================================================
RCS file: /cvsroot/pgsql/src/backend/utils/misc/guc.c,v
retrieving revision 1.65
diff -c -r1.65 guc.c
*** src/backend/utils/misc/guc.c	3 Apr 2002 05:39:32 -0000	1.65
--- src/backend/utils/misc/guc.c	16 Apr 2002 01:47:02 -0000
***************
*** 408,419 ****
  	 */
  	{
  		"max_connections", PGC_POSTMASTER, PGC_S_DEFAULT, &MaxBackends,
! 		DEF_MAXBACKENDS, 1, INT_MAX, NULL, NULL
  	},
  
  	{
  		"shared_buffers", PGC_POSTMASTER, PGC_S_DEFAULT, &NBuffers,
! 		DEF_NBUFFERS, 16, INT_MAX, NULL, NULL
  	},
  
  	{
--- 408,419 ----
  	 */
  	{
  		"max_connections", PGC_POSTMASTER, PGC_S_DEFAULT, &MaxBackends,
! 		32, 1, INT_MAX, NULL, NULL
  	},
  
  	{
  		"shared_buffers", PGC_POSTMASTER, PGC_S_DEFAULT, &NBuffers,
! 		64, 16, INT_MAX, NULL, NULL
  	},
  
  	{
Index: src/include/pg_config.h.in
===================================================================
RCS file: /cvsroot/pgsql/src/include/pg_config.h.in,v
retrieving revision 1.21
diff -c -r1.21 pg_config.h.in
*** src/include/pg_config.h.in	10 Apr 2002 22:47:09 -0000	1.21
--- src/include/pg_config.h.in	16 Apr 2002 01:47:03 -0000
***************
*** 77,87 ****
  #undef DEF_PGPORT_STR
  
  /*
!  * Default soft limit on number of backend server processes per postmaster;
!  * this is just the default setting for the postmaster's -N switch.
!  * (--with-maxbackends=N)
   */
! #undef DEF_MAXBACKENDS
  
  /* --enable-nls */
  #undef ENABLE_NLS
--- 77,86 ----
  #undef DEF_PGPORT_STR
  
  /*
!  * The maximum number of columns in an index and the maximum number of
!  * parameters to a function.  This controls the length of oidvector.
   */
! #undef MAXINDFUNCPARAMS
  
  /* --enable-nls */
  #undef ENABLE_NLS
***************
*** 107,121 ****
   */
  
  /*
-  * Default number of buffers in shared buffer pool (each of size BLCKSZ).
-  * This is just the default setting for the postmaster's -B switch.
-  * Perhaps it ought to be configurable from a configure switch.
-  * NOTE: default setting corresponds to the minimum number of buffers
-  * that postmaster.c will allow for the default MaxBackends value.
-  */
- #define DEF_NBUFFERS (DEF_MAXBACKENDS > 8 ? DEF_MAXBACKENDS * 2 : 16)
- 
- /*
   * Size of a disk block --- this also limits the size of a tuple.
   * You can set it bigger if you need bigger tuples (although TOAST
   * should reduce the need to have large tuples, since fields can now
--- 106,111 ----
***************
*** 162,169 ****
   * switch statement in fmgr_oldstyle() in src/backend/utils/fmgr/fmgr.c.
   * But consider converting such functions to new-style instead...
   */
! #define INDEX_MAX_KEYS		16
! #define FUNC_MAX_ARGS		INDEX_MAX_KEYS
  
  /*
   * System default value for pg_attribute.attstattarget
--- 152,159 ----
   * switch statement in fmgr_oldstyle() in src/backend/utils/fmgr/fmgr.c.
   * But consider converting such functions to new-style instead...
   */
! #define INDEX_MAX_KEYS		MAXINDFUNCPARAMS
! #define FUNC_MAX_ARGS		MAXINDFUNCPARAMS
  
  /*
   * System default value for pg_attribute.attstattarget