blob: a4bfb81846e35da2d034c0bdce33dac4158064bf (
plain)
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
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
|
$NetBSD: patch-ab,v 1.19 2005/09/18 19:16:49 minskim Exp $
--- configure.orig 2005-07-24 08:22:34.000000000 -0700
+++ configure
@@ -6299,7 +6299,7 @@ else
# Make sure to not put "make" in the Imakefile rules, since we grep it out.
cat > Imakefile <<'EOF'
acfindx:
- @echo 'ac_x_app_defaults="${XAPPLOADDIR}"'
+ @echo 'ac_x_app_defaults="${XAPPLOADDIR}"'
EOF
if (xmkmf) >/dev/null 2>/dev/null && test -f Makefile; then
# GNU make sometimes prints "make[1]: Entering...", which'd confuse us.
@@ -6308,138 +6308,6 @@ EOF
cd ..
rm -fr conftestdir
fi
- # Look for the directory under a standard set of common directories.
- # Check X11 before X11Rn because it's often a symlink to the current release.
- for ac_dir in \
- /lib/X11/app-defaults \
- /lib/app-defaults \
- /lib/X11R6.5.1/app-defaults \
- /lib/X11R6.5.1/X11/app-defaults \
- /lib/X11R6.4/app-defaults \
- /lib/X11R6.4/X11/app-defaults \
- /lib/X11R6.3/app-defaults \
- /lib/X11R6.3/X11/app-defaults \
- /lib/X11R6.2/app-defaults \
- /lib/X11R6.2/X11/app-defaults \
- /lib/X11R6.1/app-defaults \
- /lib/X11R6.1/X11/app-defaults \
- /lib/X11R6/app-defaults \
- /lib/X11R6/X11/app-defaults \
- /lib/X11R5/app-defaults \
- /lib/X11R5/X11/app-defaults \
- /lib/X11R4/app-defaults \
- /lib/X11R4/X11/app-defaults \
- ; \
- do
- found=""
- if test -d "${prefix}$ac_dir"; then
- ac_x_app_defaults=\\\$\\\{prefix\\\}$ac_dir
- found="1"
- break
- fi
- done
- if test -z "$found"; then
- for ac_dir in \
- /usr/X11/lib/app-defaults \
- /lib/X11R6.5.1/lib/app-defaults \
- /lib/X11R6.5.1/lib/X11/app-defaults \
- /lib/X11R6.4/lib/app-defaults \
- /lib/X11R6.4/lib/X11/app-defaults \
- /usr/X11R6.3/lib/app-defaults \
- /usr/X11R6.3/lib/X11/app-defaults \
- /usr/X11R6.2/lib/app-defaults \
- /usr/X11R6.2/lib/X11/app-defaults \
- /usr/X11R6.1/lib/app-defaults \
- /usr/X11R6.1/lib/X11/app-defaults \
- /usr/X11R6/lib/app-defaults \
- /usr/X11R6/lib/X11/app-defaults \
- /usr/X11R5/lib/app-defaults \
- /usr/X11R5/lib/X11/app-defaults \
- /usr/X11R4/lib/app-defaults \
- /usr/X11R4/lib/X11/app-defaults \
- \
- /usr/lib/X11/app-defaults \
- /usr/lib/X11R6.5.1/app-defaults \
- /usr/lib/X11R6.4/app-defaults \
- /usr/lib/X11R6.3/app-defaults \
- /usr/lib/X11R6.2/app-defaults \
- /usr/lib/X11R6.1/app-defaults \
- /usr/lib/X11R6/app-defaults \
- /usr/lib/X11R5/app-defaults \
- /usr/lib/X11R4/app-defaults \
- \
- /usr/local/X11/lib/app-defaults \
- /usr/remote/X11/lib/app-defaults \
- /usr/local/X11R6.5.1/lib/app-defaults \
- /usr/local/X11R6.5.1/lib/X11/app-defaults \
- /usr/local/X11R6.4/lib/app-defaults \
- /usr/local/X11R6.4/lib/X11/app-defaults \
- /usr/local/X11R6.3/lib/app-defaults \
- /usr/local/X11R6.3/lib/X11/app-defaults \
- /usr/local/X11R6.2/lib/app-defaults \
- /usr/local/X11R6.2/lib/X11/app-defaults \
- /usr/local/X11R6.1/lib/app-defaults \
- /usr/local/X11R6.1/lib/X11/app-defaults \
- /usr/local/X11R6/lib/app-defaults \
- /usr/local/X11R6/lib/X11/app-defaults \
- /usr/local/X11R5/lib/app-defaults \
- /usr/local/X11R5/lib/X11/app-defaults \
- /usr/local/X11R4/lib/app-defaults \
- /usr/local/X11R4/lib/X11/app-defaults \
- \
- /usr/local/lib/X11/app-defaults \
- /usr/remote/lib/X11/app-defaults \
- /usr/local/lib/X11R6.5.1/app-defaults \
- /usr/local/lib/X11R6.5.1/X11/app-defaults \
- /usr/local/lib/X11R6.4/app-defaults \
- /usr/local/lib/X11R6.4/X11/app-defaults \
- /usr/local/lib/X11R6.3/app-defaults \
- /usr/local/lib/X11R6.3/X11/app-defaults \
- /usr/local/lib/X11R6.2/app-defaults \
- /usr/local/lib/X11R6.2/X11/app-defaults \
- /usr/local/lib/X11R6.1/app-defaults \
- /usr/local/lib/X11R6.1/X11/app-defaults \
- /usr/local/lib/X11R6/app-defaults \
- /usr/local/lib/X11R6/X11/app-defaults \
- /usr/local/lib/X11R5/app-defaults \
- /usr/local/lib/X11R5/X11/app-defaults \
- /usr/local/lib/X11R4/app-defaults \
- /usr/local/lib/X11R4/X11/app-defaults \
- \
- /usr/X386/lib/X11/app-defaults \
- /usr/x386/lib/X11/app-defaults \
- /usr/XFree86/lib/X11/app-defaults \
- \
- /usr/lib/X11/app-defaults \
- /usr/unsupported/lib/X11/app-defaults \
- /usr/athena/lib/X11/app-defaults \
- /usr/local/x11r5/lib/X11/app-defaults \
- /usr/lpp/Xamples/lib/X11/app-defaults \
- /lib/usr/lib/X11/app-defaults \
- /usr/local/lib/app-defaults \
- /usr/remote/lib/app-defaults \
- \
- /usr/openwin/lib/app-defaults \
- /usr/openwin/lib/X11/app-defaults \
- /usr/openwin/share/lib/app-defaults \
- /usr/openwin/share/lib/X11/app-defaults \
- \
- /X11R6.5.1/lib/app-defaults \
- /X11R6.4/lib/app-defaults \
- /X11R6.3/lib/app-defaults \
- /X11R6.2/lib/app-defaults \
- /X11R6.1/lib/app-defaults \
- /X11R6/lib/app-defaults \
- /X11R5/lib/app-defaults \
- /X11R4/lib/app-defaults \
- ; \
- do
- if test -d "$ac_dir"; then
- ac_x_app_defaults=$ac_dir
- break
- fi
- done
- fi
if test x"$ac_x_app_defaults" = x; then
ac_cv_x_app_defaults="/usr/lib/X11/app-defaults"
@@ -8364,7 +8232,7 @@ else
#define USE_GL 1
_ACEOF
- XLOCKLIBS="${XLOCKLIBS} -lMesaGL -lMesaGLU"
+ XLOCKLIBS="${XLOCKLIBS} -lGL -lGLU"
test "x$mesa_includes" = xNONE && mesa_includes=$ac_mesa_includes
test "x$mesa_libraries" = xNONE && mesa_libraries=$ac_mesa_libraries
case "${canonical}" in
|
