diff options
| author | Peter Eisentraut | 2020-07-24 08:34:16 +0000 |
|---|---|---|
| committer | Peter Eisentraut | 2020-07-24 08:42:08 +0000 |
| commit | 25244b8972a34b838c4033fe9efc1d31cba9d0e3 (patch) | |
| tree | 47df6cdd86048afada60c7d480772b379f754531 /src/tools | |
| parent | b9b610577d7f70d959968c3697557011699b3a54 (diff) | |
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
Diffstat (limited to 'src/tools')
| -rw-r--r-- | src/tools/msvc/Solution.pm | 10 | ||||
| -rwxr-xr-x | src/tools/version_stamp.pl | 12 |
2 files changed, 11 insertions, 11 deletions
diff --git a/src/tools/msvc/Solution.pm b/src/tools/msvc/Solution.pm index 023da623826..bc8904732f0 100644 --- a/src/tools/msvc/Solution.pm +++ b/src/tools/msvc/Solution.pm @@ -155,9 +155,9 @@ sub GenerateFiles my $ac_define_openssl_api_compat_found = 0; my $openssl_api_compat; - # Parse configure.in to get version numbers - open(my $c, '<', "configure.in") - || confess("Could not open configure.in for reading\n"); + # Parse configure.ac to get version numbers + open(my $c, '<', "configure.ac") + || confess("Could not open configure.ac for reading\n"); while (<$c>) { if (/^AC_INIT\(\[([^\]]+)\], \[([^\]]+)\], \[([^\]]+)\], \[([^\]]*)\], \[([^\]]+)\]/ @@ -185,7 +185,7 @@ sub GenerateFiles } } close($c); - confess "Unable to parse configure.in for all variables!" + confess "Unable to parse configure.ac for all variables!" unless $ac_init_found && $ac_define_openssl_api_compat_found; if (IsNewer("src/include/pg_config_os.h", "src/include/port/win32.h")) @@ -834,7 +834,7 @@ EOF # Read lines from input file and substitute symbols using the same # logic that config.status uses. There should be one call of this for -# each AC_CONFIG_HEADERS call in configure.in. +# each AC_CONFIG_HEADERS call in configure.ac. # # If the "required" argument is true, we also keep track which of our # defines have been found and error out if any are left unused at the diff --git a/src/tools/version_stamp.pl b/src/tools/version_stamp.pl index 35955876222..36b18d514cf 100755 --- a/src/tools/version_stamp.pl +++ b/src/tools/version_stamp.pl @@ -9,10 +9,10 @@ ################################################################# # -# This script updates the version stamp in configure.in, and also in assorted +# This script updates the version stamp in configure.ac, and also in assorted # other files wherein it's not convenient to obtain the version number from # configure's output. Note that you still have to run autoconf afterward -# to regenerate configure from the updated configure.in. +# to regenerate configure from the updated configure.ac. # # Usage: cd to top of source tree and issue # src/tools/version_stamp.pl MINORVERSION @@ -74,7 +74,7 @@ else # (this also ensures we're in the right directory) my $aconfver = ""; -open(my $fh, '<', "configure.in") || die "could not read configure.in: $!\n"; +open(my $fh, '<', "configure.ac") || die "could not read configure.ac: $!\n"; while (<$fh>) { if (m/^m4_if\(m4_defn\(\[m4_PACKAGE_VERSION\]\), \[(.*)\], \[\], \[m4_fatal/ @@ -86,13 +86,13 @@ while (<$fh>) } close($fh); $aconfver ne "" - || die "could not find autoconf version number in configure.in\n"; + || die "could not find autoconf version number in configure.ac\n"; -# Update configure.in and other files that contain version numbers +# Update configure.ac and other files that contain version numbers my $fixedfiles = ""; -sed_file("configure.in", +sed_file("configure.ac", "-e 's/AC_INIT(\\[PostgreSQL\\], \\[[0-9a-z.]*\\]/AC_INIT([PostgreSQL], [$fullversion]/'" ); |