Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit 25244b8

Browse files
committed
Rename configure.in to configure.ac
The new name has been preferred by Autoconf for a long time. Future versions of Autoconf will warn about the old name. Discussion: https://www.postgresql.org/message-id/flat/e796c185-5ece-8569-248f-dd3799701be1%402ndquadrant.com
1 parent b9b6105 commit 25244b8

File tree

6 files changed

+17
-17
lines changed

6 files changed

+17
-17
lines changed

config/general.m4

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
# argument (other than "yes/no"), etc.
99
#
1010
# The point of this implementation is to reduce code size and
11-
# redundancy in configure.in and to improve robustness and consistency
11+
# redundancy in configure.ac and to improve robustness and consistency
1212
# in the option evaluation code.
1313

1414

configure.in renamed to configure.ac

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
dnl Process this file with autoconf to produce a configure script.
2-
dnl configure.in
2+
dnl configure.ac
33
dnl
44
dnl Developers, please strive to achieve this order:
55
dnl
@@ -21,7 +21,7 @@ AC_INIT([PostgreSQL], [14devel], [pgsql-bugs@lists.postgresql.org], [], [https:/
2121

2222
m4_if(m4_defn([m4_PACKAGE_VERSION]), [2.69], [], [m4_fatal([Autoconf version 2.69 is required.
2323
Untested combinations of 'autoconf' and PostgreSQL versions are not
24-
recommended. You can remove the check from 'configure.in' but it is then
24+
recommended. You can remove the check from 'configure.ac' but it is then
2525
your responsibility whether the result works or not.])])
2626
AC_COPYRIGHT([Copyright (c) 1996-2020, PostgreSQL Global Development Group])
2727
AC_CONFIG_SRCDIR([src/backend/access/common/heaptuple.c])

src/backend/catalog/Makefile

+2-2
Original file line numberDiff line numberDiff line change
@@ -103,10 +103,10 @@ generated-header-symlinks: $(top_builddir)/src/include/catalog/header-stamp
103103
# won't update them if they didn't change (to avoid unnecessary recompiles).
104104
# Technically, this should depend on Makefile.global which supplies
105105
# $(MAJORVERSION); but then genbki.pl would need to be re-run after every
106-
# configure run, even in distribution tarballs. So depending on configure.in
106+
# configure run, even in distribution tarballs. So depending on configure.ac
107107
# instead is cheating a bit, but it will achieve the goal of updating the
108108
# version number when it changes.
109-
bki-stamp: genbki.pl Catalog.pm $(POSTGRES_BKI_SRCS) $(POSTGRES_BKI_DATA) $(top_srcdir)/configure.in
109+
bki-stamp: genbki.pl Catalog.pm $(POSTGRES_BKI_SRCS) $(POSTGRES_BKI_DATA) $(top_srcdir)/configure.ac
110110
$(PERL) $< --include-path=$(top_srcdir)/src/include/ \
111111
--set-version=$(MAJORVERSION) $(POSTGRES_BKI_SRCS)
112112
touch $@

src/include/pg_config.h.in

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* src/include/pg_config.h.in. Generated from configure.in by autoheader. */
1+
/* src/include/pg_config.h.in. Generated from configure.ac by autoheader. */
22

33
/* Define to the type of arg 1 of 'accept' */
44
#undef ACCEPT_TYPE_ARG1

src/tools/msvc/Solution.pm

+5-5
Original file line numberDiff line numberDiff line change
@@ -155,9 +155,9 @@ sub GenerateFiles
155155
my $ac_define_openssl_api_compat_found = 0;
156156
my $openssl_api_compat;
157157

158-
# Parse configure.in to get version numbers
159-
open(my $c, '<', "configure.in")
160-
|| confess("Could not open configure.in for reading\n");
158+
# Parse configure.ac to get version numbers
159+
open(my $c, '<', "configure.ac")
160+
|| confess("Could not open configure.ac for reading\n");
161161
while (<$c>)
162162
{
163163
if (/^AC_INIT\(\[([^\]]+)\], \[([^\]]+)\], \[([^\]]+)\], \[([^\]]*)\], \[([^\]]+)\]/
@@ -185,7 +185,7 @@ sub GenerateFiles
185185
}
186186
}
187187
close($c);
188-
confess "Unable to parse configure.in for all variables!"
188+
confess "Unable to parse configure.ac for all variables!"
189189
unless $ac_init_found && $ac_define_openssl_api_compat_found;
190190

191191
if (IsNewer("src/include/pg_config_os.h", "src/include/port/win32.h"))
@@ -834,7 +834,7 @@ EOF
834834

835835
# Read lines from input file and substitute symbols using the same
836836
# logic that config.status uses. There should be one call of this for
837-
# each AC_CONFIG_HEADERS call in configure.in.
837+
# each AC_CONFIG_HEADERS call in configure.ac.
838838
#
839839
# If the "required" argument is true, we also keep track which of our
840840
# defines have been found and error out if any are left unused at the

src/tools/version_stamp.pl

+6-6
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@
99
#################################################################
1010

1111
#
12-
# This script updates the version stamp in configure.in, and also in assorted
12+
# This script updates the version stamp in configure.ac, and also in assorted
1313
# other files wherein it's not convenient to obtain the version number from
1414
# configure's output. Note that you still have to run autoconf afterward
15-
# to regenerate configure from the updated configure.in.
15+
# to regenerate configure from the updated configure.ac.
1616
#
1717
# Usage: cd to top of source tree and issue
1818
# src/tools/version_stamp.pl MINORVERSION
@@ -74,7 +74,7 @@
7474
# (this also ensures we're in the right directory)
7575

7676
my $aconfver = "";
77-
open(my $fh, '<', "configure.in") || die "could not read configure.in: $!\n";
77+
open(my $fh, '<', "configure.ac") || die "could not read configure.ac: $!\n";
7878
while (<$fh>)
7979
{
8080
if (m/^m4_if\(m4_defn\(\[m4_PACKAGE_VERSION\]\), \[(.*)\], \[\], \[m4_fatal/
@@ -86,13 +86,13 @@
8686
}
8787
close($fh);
8888
$aconfver ne ""
89-
|| die "could not find autoconf version number in configure.in\n";
89+
|| die "could not find autoconf version number in configure.ac\n";
9090

91-
# Update configure.in and other files that contain version numbers
91+
# Update configure.ac and other files that contain version numbers
9292

9393
my $fixedfiles = "";
9494

95-
sed_file("configure.in",
95+
sed_file("configure.ac",
9696
"-e 's/AC_INIT(\\[PostgreSQL\\], \\[[0-9a-z.]*\\]/AC_INIT([PostgreSQL], [$fullversion]/'"
9797
);
9898

0 commit comments

Comments
 (0)