Skip to content

Commit b120382

Browse files
peterepetere
committed
Upgrade to Autoconf 2.61:
- Change configure.in to use Autoconf 2.61 and update generated files. - Update build system and documentation to support now directory variables offered by Autoconf 2.61. - Replace usages of PGAC_CHECK_ALIGNOF by AC_CHECK_ALIGNOF, now available in Autoconf 2.61. - Drop our patched version of AC_C_INLINE, as Autoconf now has the change.
1 parent 8b63aa1 commit b120382

File tree

8 files changed

+9544
-10330
lines changed

8 files changed

+9544
-10330
lines changed

‎config/c-compiler.m4

Lines changed: 3 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Macros to detect C compiler features
2-
# $PostgreSQL: pgsql/config/c-compiler.m4,v 1.14 2004/12/16 17:48:25 momjian Exp $
2+
# $PostgreSQL: pgsql/config/c-compiler.m4,v 1.15 2008/02/17 16:36:42 petere Exp $
33

44

55
# PGAC_C_SIGNED
@@ -70,32 +70,6 @@ undefine([Ac_cachevar])dnl
7070

7171

7272

73-
# PGAC_CHECK_ALIGNOF(TYPE, [INCLUDES = DEFAULT-INCLUDES])
74-
# -----------------------------------------------------
75-
# Find the alignment requirement of the given type. Define the result
76-
# as ALIGNOF_TYPE. This macro works even when cross compiling.
77-
# (Modelled after AC_CHECK_SIZEOF.)
78-
79-
AC_DEFUN([PGAC_CHECK_ALIGNOF],
80-
[AS_LITERAL_IF([$1], [],
81-
[AC_FATAL([$0: requires literal arguments])])dnl
82-
AC_CHECK_TYPE([$1], [], [], [$2])
83-
AC_CACHE_CHECK([alignment of $1], [AS_TR_SH([pgac_cv_alignof_$1])],
84-
[if test "$AS_TR_SH([ac_cv_type_$1])" = yes; then
85-
_AC_COMPUTE_INT([((char*) & pgac_struct.field) - ((char*) & pgac_struct)],
86-
[AS_TR_SH([pgac_cv_alignof_$1])],
87-
[AC_INCLUDES_DEFAULT([$2])
88-
struct { char filler; $1 field; } pgac_struct;],
89-
[AC_MSG_ERROR([cannot compute alignment of $1, 77])])
90-
else
91-
AS_TR_SH([pgac_cv_alignof_$1])=0
92-
fi])dnl
93-
AC_DEFINE_UNQUOTED(AS_TR_CPP(alignof_$1),
94-
[$AS_TR_SH([pgac_cv_alignof_$1])],
95-
[The alignment requirement of a `$1'.])
96-
])# PGAC_CHECK_ALIGNOF
97-
98-
9973
# PGAC_C_FUNCNAME_SUPPORT
10074
# -----------------------
10175
# Check if the C compiler understands __func__ (C99) or __FUNCTION__ (gcc).
@@ -121,6 +95,8 @@ AC_DEFINE(HAVE_FUNCNAME__FUNCTION, 1,
12195
fi
12296
fi])# PGAC_C_FUNCNAME_SUPPORT
12397

98+
99+
124100
# PGAC_PROG_CC_CFLAGS_OPT
125101
# -----------------------
126102
# Given a string, check if the compiler supports the string as a
@@ -134,42 +110,3 @@ _AC_COMPILE_IFELSE([AC_LANG_PROGRAM()],
134110
[CFLAGS="$pgac_save_CFLAGS"
135111
AC_MSG_RESULT(no)])
136112
])# PGAC_PROG_CC_CFLAGS_OPT
137-
138-
# The below backpatches the following Autoconf change:
139-
#
140-
# 2002-03-28 Kevin Ryde <user42@zip.com.au>
141-
#
142-
# * lib/autoconf/c.m4 (AC_C_INLINE): Test with a typedef return value,
143-
# to avoid versions of HP C which don't allow that.
144-
#
145-
# When we upgrade to Autoconf >= 2.53a then we can drop this and rely
146-
# on the standard macro.
147-
148-
# AC_C_INLINE
149-
# -----------
150-
# Do nothing if the compiler accepts the inline keyword.
151-
# Otherwise define inline to __inline__ or __inline if one of those work,
152-
# otherwise define inline to be empty.
153-
AC_DEFUN([AC_C_INLINE],
154-
[AC_REQUIRE([AC_PROG_CC_STDC])dnl
155-
AC_CACHE_CHECK([for inline], ac_cv_c_inline,
156-
[ac_cv_c_inline=no
157-
for ac_kw in inline __inline__ __inline; do
158-
AC_COMPILE_IFELSE([AC_LANG_SOURCE(
159-
[#ifndef __cplusplus
160-
typedef int foo_t;
161-
static $ac_kw foo_t static_foo () {return 0; }
162-
$ac_kw int foo () {return 0; }
163-
#endif
164-
])],
165-
[ac_cv_c_inline=$ac_kw; break])
166-
done
167-
])
168-
case $ac_cv_c_inline in
169-
inline | yes) ;;
170-
no) AC_DEFINE(inline,,
171-
[Define as `__inline' if that's what the C compiler calls it,
172-
or to nothing if it is not supported.]) ;;
173-
*) AC_DEFINE_UNQUOTED(inline, $ac_cv_c_inline) ;;
174-
esac
175-
])# AC_C_INLINE

‎config/programs.m4

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# $PostgreSQL: pgsql/config/programs.m4,v 1.21 2007/07/19 17:15:30 tgl Exp $
1+
# $PostgreSQL: pgsql/config/programs.m4,v 1.22 2008/02/17 16:36:42 petere Exp $
22

33

44
# PGAC_PATH_YACC
@@ -201,10 +201,6 @@ AC_DEFUN([PGAC_CHECK_GETTEXT],
201201
AC_CHECK_PROGS(MSGMERGE, msgmerge)
202202
dnl FIXME: We should probably check for version >=0.10.36.
203203
AC_CHECK_PROGS(XGETTEXT, xgettext)
204-
205-
# Note: share/locale is always the default, independent of $datadir
206-
localedir='${prefix}/share/locale'
207-
AC_SUBST(localedir)
208204
])# PGAC_CHECK_GETTEXT
209205

210206

0 commit comments

Comments
 (0)