Skip to content

Commit cb1d036

Browse files
peterepetere
committed
Generate pg_config.h.in by autoheader. Separate out manually editable
parts. Standardize spelling of comments in pg_config.h.
1 parent d7c333e commit cb1d036

File tree

13 files changed

+802
-777
lines changed

13 files changed

+802
-777
lines changed

‎config/c-compiler.m4

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Macros to detect C compiler features
2-
# $Header: /cvsroot/pgsql/config/c-compiler.m4,v 1.6 2003/01/28 21:57:12 petere Exp $
2+
# $Header: /cvsroot/pgsql/config/c-compiler.m4,v 1.7 2003/04/06 22:45:22 petere Exp $
33

44

55
# PGAC_C_SIGNED
@@ -12,7 +12,7 @@ AC_DEFUN([PGAC_C_SIGNED],
1212
[pgac_cv_c_signed=yes],
1313
[pgac_cv_c_signed=no])])
1414
if test x"$pgac_cv_c_signed" = xno ; then
15-
AC_DEFINE(signed,, [Define empty if the C compiler does not understand signed types])
15+
AC_DEFINE(signed,, [Define to empty if the C compiler does not understand signed types.])
1616
fi])# PGAC_C_SIGNED
1717

1818

@@ -62,7 +62,7 @@ AC_COMPILE_IFELSE([AC_LANG_BOOL_COMPILE_TRY([], [sizeof($1) == 8])],
6262
6363
Ac_define=$Ac_cachevar
6464
if test x"$Ac_cachevar" = xyes ; then
65-
AC_DEFINE(Ac_define,, [Set to 1 if `]$1[' is 64 bits])
65+
AC_DEFINE(Ac_define,, [Define to 1 if `]$1[' works and is 64 bits.])
6666
fi
6767
undefine([Ac_define])dnl
6868
undefine([Ac_cachevar])dnl
@@ -92,5 +92,5 @@ else
9292
fi])dnl
9393
AC_DEFINE_UNQUOTED(AS_TR_CPP(alignof_$1),
9494
[$AS_TR_SH([pgac_cv_alignof_$1])],
95-
[The alignment requirement of a `$1'])
95+
[The alignment requirement of a `$1'.])
9696
])# PGAC_CHECK_ALIGNOF

‎config/c-library.m4

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Macros that test various C library quirks
2-
# $Header: /cvsroot/pgsql/config/c-library.m4,v 1.16 2003/04/02 00:49:27 tgl Exp $
2+
# $Header: /cvsroot/pgsql/config/c-library.m4,v 1.17 2003/04/06 22:45:22 petere Exp $
33

44

55
# PGAC_VAR_INT_TIMEZONE
@@ -14,7 +14,7 @@ int res;],
1414
[pgac_cv_var_int_timezone=yes],
1515
[pgac_cv_var_int_timezone=no])])
1616
if test x"$pgac_cv_var_int_timezone" = xyes ; then
17-
AC_DEFINE(HAVE_INT_TIMEZONE,, [Set to 1 if you have the global variable timezone])
17+
AC_DEFINE(HAVE_INT_TIMEZONE,, [Define to 1 if you have the global variable 'int timezone'.])
1818
fi])# PGAC_VAR_INT_TIMEZONE
1919

2020

@@ -32,8 +32,13 @@ gettimeofday(tp,tzp);],
3232
[pgac_cv_func_gettimeofday_1arg=no],
3333
[pgac_cv_func_gettimeofday_1arg=yes])])
3434
if test x"$pgac_cv_func_gettimeofday_1arg" = xyes ; then
35-
AC_DEFINE(GETTIMEOFDAY_1ARG,, [Set to 1 if gettimeofday() takes only 1 argument])
36-
fi])# PGAC_FUNC_GETTIMEOFDAY_1ARG
35+
AC_DEFINE(GETTIMEOFDAY_1ARG,, [Define to 1 if gettimeofday() takes only 1 argument.])
36+
fi
37+
AH_VERBATIM(GETTIMEOFDAY_1ARG_,
38+
[@%:@ifdef GETTIMEOFDAY_1ARG
39+
@%:@ define gettimeofday(a,b) gettimeofday(a)
40+
@%:@endif])dnl
41+
])# PGAC_FUNC_GETTIMEOFDAY_1ARG
3742

3843

3944
# PGAC_UNION_SEMUN
@@ -92,7 +97,7 @@ sigaction(0, &act, &oact);],
9297
[pgac_cv_func_posix_signals=yes],
9398
[pgac_cv_func_posix_signals=no])])
9499
if test x"$pgac_cv_func_posix_signals" = xyes ; then
95-
AC_DEFINE(HAVE_POSIX_SIGNALS,, [Set to 1 if you have the POSIX signal interface])
100+
AC_DEFINE(HAVE_POSIX_SIGNALS,, [Define to 1 if you have the POSIX signal interface.])
96101
fi
97102
HAVE_POSIX_SIGNALS=$pgac_cv_func_posix_signals
98103
AC_SUBST(HAVE_POSIX_SIGNALS)])# PGAC_FUNC_POSIX_SIGNALS

‎config/programs.m4

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# $Header: /cvsroot/pgsql/config/programs.m4,v 1.10 2002/04/10 22:46:33 petere Exp $
1+
# $Header: /cvsroot/pgsql/config/programs.m4,v 1.11 2003/04/06 22:45:22 petere Exp $
22

33

44
# PGAC_PATH_FLEX
@@ -131,7 +131,7 @@ AC_TRY_LINK([#include <stdio.h>
131131
[rl_completion_append_character = 'x';],
132132
[AC_MSG_RESULT(yes)
133133
AC_DEFINE(HAVE_RL_COMPLETION_APPEND_CHARACTER, 1,
134-
[Define if you have rl_completion_append_character])],
134+
[Define to 1 if you have the global variable 'rl_completion_append_character'.])],
135135
[AC_MSG_RESULT(no)])])# PGAC_VAR_RL_COMPLETION_APPEND_CHARACTER
136136

137137

@@ -163,7 +163,7 @@ dnl FIXME: We should probably check for version >=0.10.36.
163163
164164
AC_SUBST(localedir)
165165
AC_DEFINE_UNQUOTED(LOCALEDIR, ["$exp_localedir"],
166-
[location of locale files])
166+
[Define to the location of locale files.])
167167
])# PGAC_CHECK_GETTEXT
168168

169169

‎configure

Lines changed: 7 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -855,7 +855,6 @@ Optional Packages:
855855
--with-libraries=DIRS look for additional libraries in DIRS
856856
--with-libs=DIRS alternative spelling of --with-libraries
857857
--with-pgport=PORTNUM change default port number 5432
858-
--with-maxbackends=N set default maximum number of connections 32
859858
--with-tcl build Tcl and Tk interfaces
860859
--without-tk do not build Tk interfaces if Tcl is enabled
861860
--with-tclconfig=DIR tclConfig.sh and tkConfig.sh are in DIR
@@ -1722,47 +1721,6 @@ _ACEOF
17221721
17231722
17241723
1725-
#
1726-
# Maximum number of allowed connections (--with-maxbackends), default 32
1727-
#
1728-
echo "$as_me:$LINENO: checking for default soft limit on number of connections" >&5
1729-
echo $ECHO_N "checking for default soft limit on number of connections... $ECHO_C" >&6
1730-
1731-
1732-
1733-
# Check whether --with-maxbackends or --without-maxbackends was given.
1734-
if test "${with_maxbackends+set}" = set; then
1735-
withval="$with_maxbackends"
1736-
1737-
case $withval in
1738-
yes)
1739-
{ { echo "$as_me:$LINENO: error: argument required for --with-maxbackends option" >&5
1740-
echo "$as_me: error: argument required for --with-maxbackends option" >&2;}
1741-
{ (exit 1); exit 1; }; }
1742-
;;
1743-
no)
1744-
{ { echo "$as_me:$LINENO: error: argument required for --with-maxbackends option" >&5
1745-
echo "$as_me: error: argument required for --with-maxbackends option" >&2;}
1746-
{ (exit 1); exit 1; }; }
1747-
;;
1748-
*)
1749-
1750-
;;
1751-
esac
1752-
1753-
else
1754-
with_maxbackends=32
1755-
fi;
1756-
1757-
echo "$as_me:$LINENO: result: $with_maxbackends" >&5
1758-
echo "${ECHO_T}$with_maxbackends" >&6
1759-
1760-
cat >>confdefs.h <<_ACEOF
1761-
#define DEF_MAXBACKENDS $with_maxbackends
1762-
_ACEOF
1763-
1764-
1765-
17661724
#
17671725
# Option to disable shared libraries
17681726
#
@@ -10146,6 +10104,8 @@ _ACEOF
1014610104
1014710105
fi
1014810106
10107+
10108+
1014910109
# SunOS doesn't handle negative byte comparisons properly with +/- return
1015010110
echo "$as_me:$LINENO: checking for working memcmp" >&5
1015110111
echo $ECHO_N "checking for working memcmp... $ECHO_C" >&6
@@ -10497,7 +10457,8 @@ fi
1049710457
echo "$as_me:$LINENO: result: $ac_cv_func_inet_ntop" >&5
1049810458
echo "${ECHO_T}$ac_cv_func_inet_ntop" >&6
1049910459
if test $ac_cv_func_inet_ntop = yes; then
10500-
cat >>confdefs.h <<\_ACEOF
10460+
10461+
cat >>confdefs.h <<\_ACEOF
1050110462
#define HAVE_IPV6 1
1050210463
_ACEOF
1050310464
@@ -11809,7 +11770,8 @@ echo "${ECHO_T}$ac_cv_header_syslog_h" >&6
1180911770
1181011771
fi
1181111772
if test $ac_cv_header_syslog_h = yes; then
11812-
cat >>confdefs.h <<\_ACEOF
11773+
11774+
cat >>confdefs.h <<\_ACEOF
1181311775
#define HAVE_SYSLOG 1
1181411776
_ACEOF
1181511777
@@ -12768,7 +12730,7 @@ if test $pgac_need_repl_snprintf = yes; then
1276812730
LIBOBJS="$LIBOBJS snprintf.$ac_objext"
1276912731
fi
1277012732
12771-
12733+
# Need a #define for the size of Datum (unsigned long)
1277212734
echo "$as_me:$LINENO: checking for unsigned long" >&5
1277312735
echo $ECHO_N "checking for unsigned long... $ECHO_C" >&6
1277412736
if test "${ac_cv_type_unsigned_long+set}" = set; then
@@ -13132,11 +13094,6 @@ _ACEOF
1313213094
1313313095
1313413096
13135-
cat >>confdefs.h <<_ACEOF
13136-
#define SIZEOF_DATUM $ac_cv_sizeof_unsigned_long
13137-
_ACEOF
13138-
13139-
1314013097
# Determine memory alignment requirements for the basic C data types.
1314113098
1314213099
echo "$as_me:$LINENO: checking for short" >&5

0 commit comments

Comments
 (0)