mirrors/postgres
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Build fix: reran autoconf

Browse Source
This commit is contained in:
Zsolt Parragi 2024-09-27 11:08:50 +01:00
parent 4879037b53
commit 763491857c
1 changed files with 0 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
configure vendored
View File

@ -1452,13 +1452,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
<<<<<<< HEAD
\`configure' configures PostgreSQL 17.0 to adapt to many kinds of systems.
||||||| parent of bf7e2c3b90 (PG-1008: Change product name and version number)
\`configure' configures PostgreSQL 17rc1 to adapt to many kinds of systems.
=======
\`configure' configures PostgreSQL 17rc1.1 to adapt to many kinds of systems.
>>>>>>> bf7e2c3b90 (PG-1008: Change product name and version number)
Usage: $0 [OPTION]... [VAR=VALUE]...
@ -1523,13 +1517,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
<<<<<<< HEAD
short | recursive ) echo "Configuration of PostgreSQL 17.0:";;
||||||| parent of bf7e2c3b90 (PG-1008: Change product name and version number)
short | recursive ) echo "Configuration of PostgreSQL 17rc1:";;
=======
short | recursive ) echo "Configuration of PostgreSQL 17rc1.1:";;
>>>>>>> bf7e2c3b90 (PG-1008: Change product name and version number)
esac
cat <<\_ACEOF
@ -1705,13 +1693,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
<<<<<<< HEAD
PostgreSQL configure 17.0
||||||| parent of bf7e2c3b90 (PG-1008: Change product name and version number)
PostgreSQL configure 17rc1
=======
PostgreSQL configure 17rc1.1
>>>>>>> bf7e2c3b90 (PG-1008: Change product name and version number)
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@ -2464,13 +2446,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
<<<<<<< HEAD
It was created by PostgreSQL $as_me 17.0, which was
||||||| parent of bf7e2c3b90 (PG-1008: Change product name and version number)
It was created by PostgreSQL $as_me 17rc1, which was
=======
It was created by PostgreSQL $as_me 17rc1.1, which was
>>>>>>> bf7e2c3b90 (PG-1008: Change product name and version number)
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@ -19845,13 +19821,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
<<<<<<< HEAD
This file was extended by PostgreSQL $as_me 17.0, which was
||||||| parent of bf7e2c3b90 (PG-1008: Change product name and version number)
This file was extended by PostgreSQL $as_me 17rc1, which was
=======
This file was extended by PostgreSQL $as_me 17rc1.1, which was
>>>>>>> bf7e2c3b90 (PG-1008: Change product name and version number)
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@ -19922,13 +19892,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
<<<<<<< HEAD
PostgreSQL config.status 17.0
||||||| parent of bf7e2c3b90 (PG-1008: Change product name and version number)
PostgreSQL config.status 17rc1
=======
PostgreSQL config.status 17rc1.1
>>>>>>> bf7e2c3b90 (PG-1008: Change product name and version number)
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"