blob: b3baeba9d1dd648084b1c88d02f7a8b2f32f94f3 (
plain) (
blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
|
*** conflib.pl.orig Wed Oct 26 21:55:24 2005
--- conflib.pl Wed Oct 26 21:57:36 2005
***************
*** 246,252 ****
else
{
if ($OSf eq 'FreeBSD')
! { $prefix='/usr/local'; }
else
{ $prefix='/usr'; }
}
--- 246,252 ----
else
{
if ($OSf eq 'FreeBSD')
! { $prefix=$ENV{'PREFIX'}; }
else
{ $prefix='/usr'; }
}
***************
*** 567,573 ****
$ret.=' -pipe' if $UsePipe;
# Looks like that's common and some sysadmins doesn't configure gcc to
# look there:
! $conf{'EXTRA_INCLUDE_DIRS'}.=' /usr/local/include' if ($OSf eq 'FreeBSD');
}
}
print "$ret\n";
--- 567,573 ----
$ret.=' -pipe' if $UsePipe;
# Looks like that's common and some sysadmins doesn't configure gcc to
# look there:
! $conf{'EXTRA_INCLUDE_DIRS'}.=' ' . $ENV{'LOCALBASE'} . '/include' if ($OSf eq 'FreeBSD');
}
}
print "$ret\n";
***************
*** 596,602 ****
return $ret;
}
$ret='';
! $ret.='/usr/local/lib' if ($OSf eq 'FreeBSD');
$conf{'LDExtraDirs'}=$ret;
$ret;
}
--- 596,602 ----
return $ret;
}
$ret='';
! $ret.=$ENV{'LOCALBASE'} . '/lib' if ($OSf eq 'FreeBSD');
$conf{'LDExtraDirs'}=$ret;
$ret;
}
***************
*** 639,646 ****
{
$ret='-O2'; # -gstabs+3';
$ret.=' -pipe' if $UsePipe;
! $ret.=' -L/usr/local/include' if ($OSf eq 'FreeBSD');
! $conf{'EXTRA_INCLUDE_DIRS'}.=' /usr/local/include' if ($OSf eq 'FreeBSD');
}
}
print "$ret\n";
--- 639,646 ----
{
$ret='-O2'; # -gstabs+3';
$ret.=' -pipe' if $UsePipe;
! $ret.=' -L' . $ENV{'LOCALBASE'} . '/include' if ($OSf eq 'FreeBSD');
! $conf{'EXTRA_INCLUDE_DIRS'}.=' ' . $ENV{'LOCALBASE'} . '/include' if ($OSf eq 'FreeBSD');
}
}
print "$ret\n";
|
