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
|
diff --git a/myConfig b/myConfig
index fcf1933..14033cb 100755
--- a/myConfig
+++ b/myConfig
@@ -316,7 +316,7 @@ if ($win_arch eq 'x') {
}
close(XMKMF);
while (defined $uidir) {
- last unless ($uidir =~ s!^.*-I(\S+)/lib/X11/config!!o);
+ last unless ($uidir =~ s!^.*-I(\S+)/lib(64)/X11/config!!o);
$try = $1;
$try =~ s/'x11root'/$ENV{X11ROOT}/;
push(@xdirs,$try);
@@ -365,8 +365,7 @@ if ($win_arch eq 'x') {
#
unless (defined $xlib)
{
- $xlib = &lX11(0,chooseX11(</usr/X11*/lib>),chooseX11(</usr/lib/X11*>),</usr/Xfree*/lib>,'/usr/X386/lib',
- '/opt/X11/lib')
+ $xlib = &lX11(0,chooseX11(</usr/X11*/lib>),chooseX11(</usr/lib/X11*>),</usr/Xfree*/lib>,'/usr/X386/lib','/opt/X11/lib','/usr/lib64')
}
#
@@ -385,7 +384,7 @@ if ($win_arch eq 'x') {
exit 0;
}
- ($base) = $xlib =~ m#-L(.*)(?:/lib)$#x;
+ ($base) = $xlib =~ m#-L(.*)(?:/lib(64))$#x;
if (defined $X11INC)
{
$xinc = &IX11("$X11INC");
@@ -397,6 +396,8 @@ if ($win_arch eq 'x') {
{
warn "Cannot find X include files via $base/include\n";
$xinc = &IX11(map("$_/include",@xdirs),
+ chooseX11(</usr/include/X11*>),
+ '/usr/include',
'/usr/openwin/include',
chooseX11(</usr/X11*/include>),
chooseX11(</usr/include/X11*>),
|
GitWeb
