← Back to branch summary

~ubuntu-branches/ubuntu/trusty/net-snmp/trusty

« back to all changes in this revision

Viewing changes to perl/SNMP/Makefile.PL

  • Committer: Bazaar Package Importer
  • Author(s): Steve Kowalik
  • Date: 2007-12-08 14:59:50 UTC
  • mfrom: (1.1.6 upstream)
  • Revision ID: james.westby@ubuntu.com-20071208145950-u1tykhpw56nyzqik
Tags: 5.4.1~dfsg-4ubuntu1
* Merge from debian unstable.
* Remaining Ubuntu changes:
  - Remove stop links from rc0 and rc6
  - Munge Maintainer field as per spec.
* Ubuntu changes dropped:
  - Symlink common files between the packages, CDBS ought to handle that
    for us automatically.
* The latest Debian changes has dropped history from the changelog. Slot in
  the Ubuntu changes as best I can. 

Show diffs side-by-side

added added

removed removed

Lines of Context:
perl/SNMP/Makefile.PL
66
66
          else
67
67
          {
68
68
            @LibDirs = ();
69
 
            @LibDirs[0] = prompt("The Net-SNMP library ($snmp_lib_file) could not be found.\nPlease enter the directory where it is located:");
70
 
            @LibDirs[0] =~ s/\\$//;
 
69
            $LibDirs[0] = prompt("The Net-SNMP library ($snmp_lib_file) could not be found.\nPlease enter the directory where it is located:");
 
70
            $LibDirs[0] =~ s/\\$//;
71
71
          }
72
72
        }
73
73
        $Params{LIBS} = "-L$LibDir -l$snmp_link_lib";
77
77
    }
78
78
    else {
79
79
        $opts = NetSNMPGetOpts();
 
80
        $Params{'LDDLFLAGS'} = "$Config{lddlflags} " . `$opts->{'nsconfig'} --ldflags`;
80
81
        if (!$ENV{'NETSNMP_LIBS'}) {
81
82
            $Params{'LIBS'}    = `$opts->{'nsconfig'} --libs`;
82
83
            chomp($Params{'LIBS'});
217
218
        return undef;
218
219
    }
219
220
    while (<C>) {
220
 
        $has_ssl++, last if /^\s*#define\s+USE_OPENSSL/;
 
221
        $has_ssl++, last if /^\s*#define\s+NETSNMP_USE_OPENSSL/;
221
222
    }
222
223
    close C;
223
224
    return $has_ssl;
324
325
            chomp($srcver);
325
326
            my $srcfloat = floatize_version($srcver);
326
327
            $perlver =~ s/pre/0./;
 
328
            # we allow for perl/CPAN-only revisions beyond the default
 
329
            # version formatting of net-snmp itself.
 
330
            $perlver =~ s/(\.\d{5}).*/\1/;
 
331
            $perlver =~ s/0*$//;
327
332
            if ($srcfloat ne $perlver) {
328
333
                if (!$foundversion) {
329
334
                    print STDERR "ERROR: