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/20190712.121529.194600624[email protected]

diff --git a/src/tools/msvc/Solution.pm b/src/tools/msvc/Solution.pm
index 51711c2bff98aedc070276db4df09c53a7f0abf3..318594db5dacdf8a785cdb5ad705944f70f8569b 100644 (file)
--- 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 2553636dc1402f3df4e1dd7e9c9da69bf442c4fc..043df4c5e871d5f21edde74e280806639df01e2a 100644 (file)
--- a/src/tools/msvc/config_default.pl
+++ b/src/tools/msvc/config_default.pl
@@ -18,10 +18,10 @@ our $config = {
    nls       => undef,    # --enable-nls=
    tap_tests => undef,    # --enable-tap-tests
    tcl       => undef,    # --with-tcl=
-   perl      => undef,    # --with-perl
+   perl      => undef,    # --with-perl=
    python    => undef,    # --with-python=
    openssl   => undef,    # --with-openssl=
-   uuid      => undef,    # --with-ossp-uuid
+   uuid      => undef,    # --with-uuid=
    xml       => undef,    # --with-libxml=
    xslt      => undef,    # --with-libxslt=
    iconv     => undef,    # (not in configure, path to iconv)