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
162
163
164
|
--- configure.orig 2008-01-04 16:26:38.000000000 +0300
+++ configure 2009-04-06 23:35:00.000000000 +0400
@@ -79,6 +79,8 @@
withcurses=no;;
-no-shared-libs)
withsharedlibs=no;;
+ -no-x11|--no-x11)
+ x11_wanted=no;;
-x11include*|--x11include*)
x11_include_dir=$2; shift;;
-x11lib*|--x11lib*)
@@ -686,6 +688,7 @@
i386,*,gnu) profiling='prof';;
i386,*,bsd_elf) profiling='prof';;
i386,*,macosx) profiling='prof';;
+ *,*,freebsd) profiling='prof';;
sparc,*,solaris)
profiling='prof'
case "$nativecc" in gcc*) ;; *) cc_profile='-xpg';; esac;;
@@ -1132,124 +1135,24 @@
x11_include="not found"
x11_link="not found"
-for dir in \
- $x11_include_dir \
- \
- /usr/X11R6/include \
- /usr/include/X11R6 \
- /usr/local/X11R6/include \
- /usr/local/include/X11R6 \
- /opt/X11R6/include \
- \
- /usr/X11/include \
- /usr/include/X11 \
- /usr/local/X11/include \
- /usr/local/include/X11 \
- /opt/X11/include \
- \
- /usr/X11R5/include \
- /usr/include/X11R5 \
- /usr/local/X11R5/include \
- /usr/local/include/X11R5 \
- /usr/local/x11r5/include \
- /opt/X11R5/include \
- \
- /usr/X11R4/include \
- /usr/include/X11R4 \
- /usr/local/X11R4/include \
- /usr/local/include/X11R4 \
- \
- /usr/X386/include \
- /usr/x386/include \
- /usr/XFree86/include/X11 \
- \
- /usr/include \
- /usr/local/include \
- /usr/unsupported/include \
- /usr/athena/include \
- /usr/lpp/Xamples/include \
- \
- /usr/openwin/include \
- /usr/openwin/share/include \
- ; \
-do
- if test -f $dir/X11/X.h; then
- x11_include=$dir
- break
- fi
-done
-
-if test "$x11_include" = "not found"; then
- x11_try_lib_dir=''
-else
- x11_try_lib_dir=`echo $x11_include | sed -e 's|include|lib|'`
+if [ -n "$x11_include_dir" ]; then
+ x11_include="$x11_include_dir"
fi
-for dir in \
- $x11_lib_dir \
- $x11_try_lib_dir \
- \
- /usr/X11R6/lib64 \
- /usr/X11R6/lib \
- /usr/lib/X11R6 \
- /usr/local/X11R6/lib \
- /usr/local/lib/X11R6 \
- /opt/X11R6/lib \
- \
- /usr/X11/lib \
- /usr/lib/X11 \
- /usr/local/X11/lib \
- /usr/local/lib/X11 \
- /opt/X11/lib \
- \
- /usr/X11R5/lib \
- /usr/lib/X11R5 \
- /usr/local/X11R5/lib \
- /usr/local/lib/X11R5 \
- /usr/local/x11r5/lib \
- /opt/X11R5/lib \
- \
- /usr/X11R4/lib \
- /usr/lib/X11R4 \
- /usr/local/X11R4/lib \
- /usr/local/lib/X11R4 \
- \
- /usr/X386/lib \
- /usr/x386/lib \
- /usr/XFree86/lib/X11 \
- \
- /usr/lib64 \
- /usr/lib \
- /usr/local/lib \
- /usr/unsupported/lib \
- /usr/athena/lib \
- /usr/lpp/Xamples/lib \
- /lib/usr/lib/X11 \
- \
- /usr/openwin/lib \
- /usr/openwin/share/lib \
- ; \
-do
- if test -f $dir/libX11.a || \
- test -f $dir/libX11.so || \
- test -f $dir/libX11.dll.a || \
- test -f $dir/libX11.dylib || \
- test -f $dir/libX11.sa; then
- if test $dir = /usr/lib; then
- x11_link="-lX11"
- else
- x11_link="-L$dir -lX11"
- x11_libs="-L$dir"
- fi
- break
- fi
-done
-
+if [ -n "$x11_lib_dir" ]; then
+ x11_link="-L$x11_lib_dir -lX11"
+ x11_libs="-L$x11_lib_dir"
+fi
if test "$x11_include" = "not found" || test "$x11_link" = "not found"
then
echo "X11 not found, the \"graph\" library will not be supported."
x11_include=""
+elif test "$x11_wanted" = "no"
+then
+ echo "X11 support was disabled, the \"graph\" library will not be supported."
+ x11_include=""
+ x11_link=""
else
echo "Location of X11 include files: $x11_include/X11"
echo "Options for linking with X11: $x11_link"
@@ -1372,7 +1275,7 @@
then tk_libs="$tk_libs $dllib"
elif sh ./hasgot $tk_libs -ltcl$tclmaj.$tclmin $tkauxlibs Tcl_DoOneEvent
then
- tk_libs="$tk_libs -ltk$tkmaj.$tkmin -ltcl$tclmaj.$tclmin $dllib"
+ tk_libs="$tk_libs -ltk$tkmaj$tkmin -ltcl$tclmaj.$tclmin $dllib"
elif sh ./hasgot $tk_libs -ltcl$tclmaj$tclmin $tkauxlibs Tcl_DoOneEvent
then
tk_libs="$tk_libs -ltk$tkmaj$tkmin -ltcl$tclmaj$tclmin $dllib"
|
