Skip to content

Commit cbe9c39

Browse files
authored
Merge pull request #25 from dAdAbird/fixv
Fix version with autoconf
2 parents 5ebf008 + 6fbaca5 commit cbe9c39

File tree

2 files changed

+14
-14
lines changed

2 files changed

+14
-14
lines changed

configure

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#! /bin/sh
22
# Guess values for system-dependent variables and create Makefiles.
3-
# Generated by GNU Autoconf 2.69 for PostgreSQL 17.2.1.
3+
# Generated by GNU Autoconf 2.69 for PostgreSQL 17.2.
44
#
55
# Report bugs to <[email protected]>.
66
#
@@ -582,8 +582,8 @@ MAKEFLAGS=
582582
# Identity of this package.
583583
PACKAGE_NAME='PostgreSQL'
584584
PACKAGE_TARNAME='postgresql'
585-
PACKAGE_VERSION='17.2.1'
586-
PACKAGE_STRING='PostgreSQL 17.2.1'
585+
PACKAGE_VERSION='17.2'
586+
PACKAGE_STRING='PostgreSQL 17.2'
587587
PACKAGE_BUGREPORT='[email protected]'
588588
PACKAGE_URL='https://www.postgresql.org/'
589589

@@ -1453,7 +1453,7 @@ if test "$ac_init_help" = "long"; then
14531453
# Omit some internal or obsolete options to make the list less imposing.
14541454
# This message is too long to be a string in the A/UX 3.1 sh.
14551455
cat <<_ACEOF
1456-
\`configure' configures PostgreSQL 17.2.1 to adapt to many kinds of systems.
1456+
\`configure' configures PostgreSQL 17.2 to adapt to many kinds of systems.
14571457

14581458
Usage: $0 [OPTION]... [VAR=VALUE]...
14591459

@@ -1518,7 +1518,7 @@ fi
15181518

15191519
if test -n "$ac_init_help"; then
15201520
case $ac_init_help in
1521-
short | recursive ) echo "Configuration of PostgreSQL 17.2.1:";;
1521+
short | recursive ) echo "Configuration of PostgreSQL 17.2:";;
15221522
esac
15231523
cat <<\_ACEOF
15241524

@@ -1695,7 +1695,7 @@ fi
16951695
test -n "$ac_init_help" && exit $ac_status
16961696
if $ac_init_version; then
16971697
cat <<\_ACEOF
1698-
PostgreSQL configure 17.2.1
1698+
PostgreSQL configure 17.2
16991699
generated by GNU Autoconf 2.69
17001700

17011701
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2448,7 +2448,7 @@ cat >config.log <<_ACEOF
24482448
This file contains any messages produced by compilers while
24492449
running configure, to aid debugging if configure makes a mistake.
24502450

2451-
It was created by PostgreSQL $as_me 17.2.1, which was
2451+
It was created by PostgreSQL $as_me 17.2, which was
24522452
generated by GNU Autoconf 2.69. Invocation command line was
24532453

24542454
$ $0 $@
@@ -2837,7 +2837,7 @@ _ACEOF
28372837

28382838

28392839
PG_MAJORVERSION=`expr "$PACKAGE_VERSION" : '\([0-9][0-9]*\)'`
2840-
PG_MINORVERSION=`expr "$PACKAGE_VERSION" : '.*\.\([0-9][0-9]*\)*\.'`
2840+
PG_MINORVERSION=`expr "$PACKAGE_VERSION" : '.*\.\([0-9][0-9]*\)'`
28412841
test -n "$PG_MINORVERSION" || PG_MINORVERSION=0
28422842

28432843

@@ -2856,7 +2856,7 @@ cat >>confdefs.h <<_ACEOF
28562856
_ACEOF
28572857

28582858

2859-
PG_PERCONAVERSION=`expr "$PACKAGE_VERSION" : '.*\.\([0-9][0-9]*\)'`
2859+
PG_PERCONAVERSION=1
28602860

28612861
cat >>confdefs.h <<_ACEOF
28622862
#define PG_PERCONAVERSION "$PG_PERCONAVERSION"
@@ -19933,7 +19933,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
1993319933
# report actual input values of CONFIG_FILES etc. instead of their
1993419934
# values after options handling.
1993519935
ac_log="
19936-
This file was extended by PostgreSQL $as_me 17.2.1, which was
19936+
This file was extended by PostgreSQL $as_me 17.2, which was
1993719937
generated by GNU Autoconf 2.69. Invocation command line was
1993819938

1993919939
CONFIG_FILES = $CONFIG_FILES
@@ -20004,7 +20004,7 @@ _ACEOF
2000420004
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
2000520005
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
2000620006
ac_cs_version="\\
20007-
PostgreSQL config.status 17.2.1
20007+
PostgreSQL config.status 17.2
2000820008
configured by $0, generated by GNU Autoconf 2.69,
2000920009
with options \\"\$ac_cs_config\\"
2001020010

configure.ac

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ dnl Read the Autoconf manual for details.
1717
dnl
1818
m4_pattern_forbid(^PGAC_)dnl to catch undefined macros
1919

20-
AC_INIT([PostgreSQL], [17.2.1], [[email protected]], [], [https://www.postgresql.org/])
20+
AC_INIT([PostgreSQL], [17.2], [[email protected]], [], [https://www.postgresql.org/])
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
@@ -30,14 +30,14 @@ AC_PREFIX_DEFAULT(/usr/local/pgsql)
3030
AC_DEFINE_UNQUOTED(CONFIGURE_ARGS, ["$ac_configure_args"], [Saved arguments from configure])
3131

3232
[PG_MAJORVERSION=`expr "$PACKAGE_VERSION" : '\([0-9][0-9]*\)'`]
33-
[PG_MINORVERSION=`expr "$PACKAGE_VERSION" : '.*\.\([0-9][0-9]*\)*\.'`]
33+
[PG_MINORVERSION=`expr "$PACKAGE_VERSION" : '.*\.\([0-9][0-9]*\)'`]
3434
test -n "$PG_MINORVERSION" || PG_MINORVERSION=0
3535
AC_SUBST(PG_MAJORVERSION)
3636
AC_DEFINE_UNQUOTED(PG_MAJORVERSION, "$PG_MAJORVERSION", [PostgreSQL major version as a string])
3737
AC_DEFINE_UNQUOTED(PG_MAJORVERSION_NUM, $PG_MAJORVERSION, [PostgreSQL major version number])
3838
AC_DEFINE_UNQUOTED(PG_MINORVERSION_NUM, $PG_MINORVERSION, [PostgreSQL minor version number])
3939

40-
[PG_PERCONAVERSION=`expr "$PACKAGE_VERSION" : '.*\.\([0-9][0-9]*\)'`]
40+
[PG_PERCONAVERSION=1]
4141
AC_DEFINE_UNQUOTED(PG_PERCONAVERSION, "$PG_PERCONAVERSION", [PostgreSQL Percona version as a string])
4242

4343
PGAC_ARG_REQ(with, extra-version, [STRING], [append STRING to version],

0 commit comments

Comments
 (0)