|
|
|
@ -1086,6 +1086,7 @@ endif |
|
|
|
|
|
|
|
|
|
|
|
perlopt = get_option('plperl') |
|
|
|
perlopt = get_option('plperl') |
|
|
|
perl_dep = not_found_dep |
|
|
|
perl_dep = not_found_dep |
|
|
|
|
|
|
|
perlversion = '' |
|
|
|
if not perlopt.disabled() |
|
|
|
if not perlopt.disabled() |
|
|
|
perl_may_work = true |
|
|
|
perl_may_work = true |
|
|
|
|
|
|
|
|
|
|
|
@ -1103,7 +1104,7 @@ if not perlopt.disabled() |
|
|
|
# Then inquire perl about its configuration |
|
|
|
# Then inquire perl about its configuration |
|
|
|
if perl_may_work |
|
|
|
if perl_may_work |
|
|
|
perl_conf_cmd = [perl, '-MConfig', '-e', 'print $Config{$ARGV[0]}'] |
|
|
|
perl_conf_cmd = [perl, '-MConfig', '-e', 'print $Config{$ARGV[0]}'] |
|
|
|
perlversion = run_command(perl_conf_cmd, 'api_versionstring', check: true).stdout() |
|
|
|
perlversion = run_command(perl_conf_cmd, 'version', check: true).stdout() |
|
|
|
archlibexp = run_command(perl_conf_cmd, 'archlibexp', check: true).stdout() |
|
|
|
archlibexp = run_command(perl_conf_cmd, 'archlibexp', check: true).stdout() |
|
|
|
privlibexp = run_command(perl_conf_cmd, 'privlibexp', check: true).stdout() |
|
|
|
privlibexp = run_command(perl_conf_cmd, 'privlibexp', check: true).stdout() |
|
|
|
useshrplib = run_command(perl_conf_cmd, 'useshrplib', check: true).stdout() |
|
|
|
useshrplib = run_command(perl_conf_cmd, 'useshrplib', check: true).stdout() |
|
|
|
@ -3825,7 +3826,7 @@ if meson.version().version_compare('>=0.57') |
|
|
|
'nls': libintl, |
|
|
|
'nls': libintl, |
|
|
|
'openssl': ssl, |
|
|
|
'openssl': ssl, |
|
|
|
'pam': pam, |
|
|
|
'pam': pam, |
|
|
|
'plperl': perl_dep, |
|
|
|
'plperl': [perl_dep, perlversion], |
|
|
|
'plpython': python3_dep, |
|
|
|
'plpython': python3_dep, |
|
|
|
'pltcl': tcl_dep, |
|
|
|
'pltcl': tcl_dep, |
|
|
|
'readline': readline, |
|
|
|
'readline': readline, |
|
|
|
@ -3836,6 +3837,7 @@ if meson.version().version_compare('>=0.57') |
|
|
|
'zstd': zstd, |
|
|
|
'zstd': zstd, |
|
|
|
}, |
|
|
|
}, |
|
|
|
section: 'External libraries', |
|
|
|
section: 'External libraries', |
|
|
|
|
|
|
|
list_sep: ' ', |
|
|
|
) |
|
|
|
) |
|
|
|
|
|
|
|
|
|
|
|
endif |
|
|
|
endif |
|
|
|
|