From c786796d0a7931d67a38840d899c4e45ef4c7bf6 Mon Sep 17 00:00:00 2001 From: Tom Lane Date: Fri, 29 Jun 2007 16:18:43 +0000 Subject: [PATCH] Fix computation of PG_VERSION_NUM by configure: remove unnecessary and unportable backslashes in awk script (per Patrick Welche), and add brackets to prevent autoconf from mangling sed's regexp (the sed call here never did what was expected). --- configure | 4 ++-- configure.in | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/configure b/configure index 60410b3920..4bfae7d163 100755 --- a/configure +++ b/configure @@ -5271,9 +5271,9 @@ fi # Supply a numeric version string for use by 3rd party add-ons # awk -F is a regex on some platforms, and not on others, so make "." a tab -PG_VERSION_NUM="`echo "$PACKAGE_VERSION" | sed 's/A-Za-z.*$//' | +PG_VERSION_NUM="`echo "$PACKAGE_VERSION" | sed 's/[A-Za-z].*$//' | tr '.' ' ' | -$AWK '{printf \"%d%02d%02d\", $1, $2, (NF >= 3) ? $3 : 0}'`" +$AWK '{printf "%d%02d%02d", $1, $2, (NF >= 3) ? $3 : 0}'`" cat >>confdefs.h <<_ACEOF #define PG_VERSION_NUM $PG_VERSION_NUM diff --git a/configure.in b/configure.in index 9cffbc1d0b..c44da58b96 100644 --- a/configure.in +++ b/configure.in @@ -1,5 +1,5 @@ dnl Process this file with autoconf to produce a configure script. -dnl $PostgreSQL: pgsql/configure.in,v 1.515 2007/06/04 21:55:43 adunstan Exp $ +dnl $PostgreSQL: pgsql/configure.in,v 1.516 2007/06/29 16:18:43 tgl Exp $ dnl dnl Developers, please strive to achieve this order: dnl @@ -696,9 +696,9 @@ fi # Supply a numeric version string for use by 3rd party add-ons # awk -F is a regex on some platforms, and not on others, so make "." a tab -PG_VERSION_NUM="`echo "$PACKAGE_VERSION" | sed 's/[A-Za-z].*$//' | +[PG_VERSION_NUM="`echo "$PACKAGE_VERSION" | sed 's/[A-Za-z].*$//' | tr '.' ' ' | -$AWK '{printf \"%d%02d%02d\", $1, $2, (NF >= 3) ? $3 : 0}'`" +$AWK '{printf "%d%02d%02d", $1, $2, (NF >= 3) ? $3 : 0}'`"] AC_DEFINE_UNQUOTED(PG_VERSION_NUM, $PG_VERSION_NUM, [PostgreSQL version as a number]) ##