*** src/tools/msvc/Install.pm.orig	Mon Feb 25 13:15:34 2008
--- src/tools/msvc/Install.pm	Mon Feb 25 13:18:33 2008
***************
*** 291,297 ****
      {
          next if ($d =~ /^\./);
          next unless (-f "contrib/$d/Makefile");
!         next if ($d eq "uuid-ossp");
          next if ($d eq "sslinfo" && !defined($config->{openssl}));
          next if ($d eq "xml2" && !defined($config->{xml}));
  
--- 291,297 ----
      {
          next if ($d =~ /^\./);
          next unless (-f "contrib/$d/Makefile");
!         next if ($d eq "uuid-ossp"&& !defined($config->{uuid}));
          next if ($d eq "sslinfo" && !defined($config->{openssl}));
          next if ($d eq "xml2" && !defined($config->{xml}));
  
*** src/tools/msvc/Mkvcbuild.pm.orig	Mon Feb 25 13:20:25 2008
--- src/tools/msvc/Mkvcbuild.pm	Mon Feb 25 18:24:20 2008
***************
*** 31,37 ****
      'cube' => ['cubescan.l','cubeparse.y'],
      'seg' => ['segscan.l','segparse.y']
  };
! my @contrib_excludes = ('pgcrypto','uuid-ossp');
  
  sub mkvcbuild
  {
--- 31,37 ----
      'cube' => ['cubescan.l','cubeparse.y'],
      'seg' => ['segscan.l','segparse.y']
  };
! my @contrib_excludes = ('pgcrypto');
  
  sub mkvcbuild
  {
*** src/tools/msvc/Solution.pm.orig	Mon Feb 25 13:18:49 2008
--- src/tools/msvc/Solution.pm	Mon Feb 25 18:04:03 2008
***************
*** 113,118 ****
--- 113,122 ----
          print O "#define USE_SSL 1\n" if ($self->{options}->{openssl});
          print O "#define ENABLE_NLS 1\n" if ($self->{options}->{nls});
  
+         if ($self->{options}->{uuid})
+         {
+             print O "#define HAVE_UUID_H\n";
+         }
          if ($self->{options}->{xml})
          {
              print O "#define HAVE_LIBXML2\n";
***************
*** 346,351 ****
--- 350,360 ----
          $proj->AddLibrary($self->{options}->{krb5} . '\lib\i386\comerr32.lib');
          $proj->AddLibrary($self->{options}->{krb5} . '\lib\i386\gssapi32.lib');
      }
+     if ($self->{options}->{uuid})
+     {
+         $proj->AddIncludeDir($self->{options}->{uuid} . '\include');
+         $proj->AddLibrary($self->{options}->{uuid} . '\lib\uuid.lib');
+     }
      if ($self->{options}->{xml})
      {
          $proj->AddIncludeDir($self->{options}->{xml} . '\include');
***************
*** 451,456 ****
--- 460,466 ----
      $cfg .= ' --with-ldap' if ($self->{options}->{ldap});
      $cfg .= ' --without-zlib' unless ($self->{options}->{zlib});
      $cfg .= ' --with-openssl' if ($self->{options}->{ssl});
+     $cfg .= ' --with-ossp-uuid' if ($self->{options}->{uuid});
      $cfg .= ' --with-libxml' if ($self->{options}->{xml});
      $cfg .= ' --with-libxslt' if ($self->{options}->{xslt});
      $cfg .= ' --with-krb5' if ($self->{options}->{krb5});
*** src/tools/msvc/config.pl.orig	Mon Feb 25 13:17:11 2008
--- src/tools/msvc/config.pl	Mon Feb 25 18:39:15 2008
***************
*** 12,17 ****
--- 12,18 ----
      krb5=>'c:\prog\pgsql\depend\krb5', # --with-krb5=<path>
      ldap=>1,			# --with-ldap
      openssl=>'c:\openssl', # --with-ssl=<path>
+     uuid=>'c:\prog\pgsql\depend\uuid-ossp',
      xml=>'c:\prog\pgsql\depend\libxml2',
      xslt=>'c:\prog\pgsql\depend\libxslt',
      iconv=>'c:\prog\pgsql\depend\iconv',