summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Paquier2019-07-13 07:51:31 +0000
committerMichael Paquier2019-07-13 07:51:31 +0000
commit39aadc984221f57ce7dc11dd3c8c719e10198549 (patch)
treed1f591dbbc09d284fc94048814e8b301ebe53bdf
parent170d11b8e7cb9df96a7ee0b8140d28536d55fe3e (diff)
Fix some inconsistencies in MSVC scripts
In configure scripts, --with-ossp-uuid is obsolete is replaced by --with-uuid, and it needs to specify a path to its library builds when building with the MSVC scripts. --with-perl needs also to specify a path. Author: Kyotaro Horiguchi Discussion: https://postgr.es/m/[email protected]
-rw-r--r--src/tools/msvc/Solution.pm2
-rw-r--r--src/tools/msvc/config_default.pl4
2 files changed, 3 insertions, 3 deletions
diff --git a/src/tools/msvc/Solution.pm b/src/tools/msvc/Solution.pm
index 51711c2bff..318594db5d 100644
--- a/src/tools/msvc/Solution.pm
+++ b/src/tools/msvc/Solution.pm
@@ -873,7 +873,7 @@ sub GetFakeConfigure
$cfg .= ' --without-zlib' unless ($self->{options}->{zlib});
$cfg .= ' --with-extra-version' if ($self->{options}->{extraver});
$cfg .= ' --with-openssl' if ($self->{options}->{openssl});
- $cfg .= ' --with-ossp-uuid' if ($self->{options}->{uuid});
+ $cfg .= ' --with-uuid' if ($self->{options}->{uuid});
$cfg .= ' --with-libxml' if ($self->{options}->{xml});
$cfg .= ' --with-libxslt' if ($self->{options}->{xslt});
$cfg .= ' --with-gssapi' if ($self->{options}->{gss});
diff --git a/src/tools/msvc/config_default.pl b/src/tools/msvc/config_default.pl
index 2553636dc1..043df4c5e8 100644
--- a/src/tools/msvc/config_default.pl
+++ b/src/tools/msvc/config_default.pl
@@ -18,10 +18,10 @@ our $config = {
nls => undef, # --enable-nls=<path>
tap_tests => undef, # --enable-tap-tests
tcl => undef, # --with-tcl=<path>
- perl => undef, # --with-perl
+ perl => undef, # --with-perl=<path>
python => undef, # --with-python=<path>
openssl => undef, # --with-openssl=<path>
- uuid => undef, # --with-ossp-uuid
+ uuid => undef, # --with-uuid=<path>
xml => undef, # --with-libxml=<path>
xslt => undef, # --with-libxslt=<path>
iconv => undef, # (not in configure, path to iconv)