Commit1260459

committed

Show plperl version in the meson setup summary.

Also, use perl 'version' instead of 'api_versionstring' to sync withthe configure script.Author: Roman Zharkov <r.zharkov@postgrespro.ru>Discussion:https://postgr.es/m/93e7f77bf4e1ef4640e4ee733f9e2a78@postgrespro.ru

1 parentfc51a60 commit1260459Copy full SHA for 1260459

File tree

-2

lines changed

-2

lines changed

Lines changed: 4 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -1086,6 +1086,7 @@ endif`
`1086`	`1086`
`1087`	`1087`	`perlopt=get_option('plperl')`
`1088`	`1088`	`perl_dep= not_found_dep`
	`1089`	`+perlversion=''`
`1089`	`1090`	`ifnot perlopt.disabled()`
`1090`	`1091`	`perl_may_work=true`
`1091`	`1092`
`@@ -1103,7 +1104,7 @@ if not perlopt.disabled()`
`1103`	`1104`	`# Then inquire perl about its configuration`
`1104`	`1105`	`if perl_may_work`
`1105`	`1106`	`perl_conf_cmd= [perl,'-MConfig','-e','print $Config{$ARGV[0]}']`
`1106`		`- perlversion=run_command(perl_conf_cmd,'api_versionstring',check:true).stdout()`
	`1107`	`+ perlversion=run_command(perl_conf_cmd,'version',check:true).stdout()`
`1107`	`1108`	`archlibexp=run_command(perl_conf_cmd,'archlibexp',check:true).stdout()`
`1108`	`1109`	`privlibexp=run_command(perl_conf_cmd,'privlibexp',check:true).stdout()`
`1109`	`1110`	`useshrplib=run_command(perl_conf_cmd,'useshrplib',check:true).stdout()`
`@@ -3825,7 +3826,7 @@ if meson.version().version_compare('>=0.57')`
`3825`	`3826`	`'nls': libintl,`
`3826`	`3827`	`'openssl': ssl,`
`3827`	`3828`	`'pam': pam,`
`3828`		`-'plperl': perl_dep,`
	`3829`	`+'plperl':[perl_dep, perlversion],`
`3829`	`3830`	`'plpython': python3_dep,`
`3830`	`3831`	`'pltcl': tcl_dep,`
`3831`	`3832`	`'readline': readline,`
`@@ -3836,6 +3837,7 @@ if meson.version().version_compare('>=0.57')`
`3836`	`3837`	`'zstd': zstd,`
`3837`	`3838`	`},`
`3838`	`3839`	`section:'External libraries',`
	`3840`	`+list_sep:'',`
`3839`	`3841`	`)`
`3840`	`3842`
`3841`	`3843`	`endif`

Comments

(0)