← Back to branch summary

~ubuntu-branches/ubuntu/natty/postgresql-8.4/natty-security

« back to all changes in this revision

Viewing changes to src/tools/msvc/Mkvcbuild.pm

  • Committer: Bazaar Package Importer
  • Author(s): Martin Pitt
  • Date: 2009-07-11 16:59:35 UTC
  • mfrom: (5.1.1 karmic)
  • Revision ID: james.westby@ubuntu.com-20090711165935-jfwin6gfrxf0gfsi
Tags: 8.4.0-2
http://bugs.debian.org/536139
* debian/libpq-dev.install: Ship catalog/genbki.h. (Closes: #536139)
* debian/rules: Drop --enable-cassert for final release.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/tools/msvc/Mkvcbuild.pm
3
3
#
4
4
# Package that generates build files for msvc build
5
5
#
6
 
# $PostgreSQL: pgsql/src/tools/msvc/Mkvcbuild.pm,v 1.39 2009/04/07 19:35:57 mha Exp $
 
6
# $PostgreSQL: pgsql/src/tools/msvc/Mkvcbuild.pm,v 1.40 2009/06/05 18:29:56 adunstan Exp $
7
7
#
8
8
use Carp;
9
9
use Win32;
104
104
            }
105
105
        }
106
106
        $plperl->AddReference($postgres);
107
 
        if (-e $solution->{options}->{perl} . '\lib\CORE\perl510.lib')
108
 
        {
109
 
            $plperl->AddLibrary($solution->{options}->{perl} . '\lib\CORE\perl510.lib');
110
 
        }
111
 
        else
112
 
        {
113
 
            $plperl->AddLibrary($solution->{options}->{perl} . '\lib\CORE\perl58.lib');
114
 
        }
 
107
                my @perl_libs = grep {/perl\d+.lib$/ }
 
108
                        glob($solution->{options}->{perl} . '\lib\CORE\perl*.lib');
 
109
        if (@perl_libs == 1)
 
110
        {
 
111
            $plperl->AddLibrary($perl_libs[0]);
 
112
        }
 
113
                else
 
114
                {
 
115
                        die "could not identify perl library version";
 
116
                }
115
117
    }
116
118
 
117
119
    if ($solution->{options}->{python})