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
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
|
$NetBSD: patch-ab,v 1.8 2004/11/29 22:11:51 seb Exp $
--- configure.ac.orig 2004-09-14 22:04:08.000000000 +0000
+++ configure.ac
@@ -25,7 +25,10 @@ case "${target_os}" in
PATHSEPARATOR=":"
;;
* ) # This sucks! Whatever happened to standards for file system layout?
- DEFAULT_FONTPATH="/usr/X11R6/lib/X11/fonts/TrueType:/usr/X11R6/lib/X11/fonts/truetype:/usr/X11R6/lib/X11/fonts/TTF:/usr/share/fonts/TrueType:/usr/share/fonts/truetype:/usr/openwin/lib/X11/fonts/TrueType:/usr/X11R6/lib/X11/fonts/Type1:/usr/common/share/fonts/ttf";
+ DEFAULT_FONTPATH="${X11PREFIX}/lib/X11/fonts/TrueType:${X11PREFIX}/lib/X11/fonts/truetype:${X11PREFIX}/lib/X11/fonts/TTF:/usr/share/fonts/TrueType:/usr/share/fonts/truetype:/usr/openwin/lib/X11/fonts/TrueType:/usr/X11R6/lib/X11/fonts/Type1:/usr/common/share/fonts/ttf";
+ if test x"$X11PREFIX" != x"$X11BASE"; then
+ DEFAULT_FONTPATH="${DEFAULT_FONTPATH}:${X11BASE}/lib/X11/fonts/TrueType:${X11BASE}/lib/X11/fonts/truetype:${X11BASE}/lib/X11/fonts/TTF:${X11BASE}/lib/X11/fonts/Type1"
+ fi
PATHSEPARATOR=":"
;;
esac
@@ -206,71 +209,12 @@ dnl INCLUDES and LIBS for TCL
# start by assuming we have it
HAVE_TCL=1
-AC_ARG_WITH(tclsh,
- [ --with-tclsh=PROG build graphviz for specific tclsh],
- TCLSH=$withval,)
-
-if test "x$TCLSH" = "x"; then
- AC_PATH_PROG(TCLSH,tclsh8.4)
- if test "x$TCLSH" = "x"; then
- AC_PATH_PROG(TCLSH,tclsh8.3)
- if test "x$TCLSH" = "x"; then
- AC_PATH_PROG(TCLSH,tclsh)
- fi
- fi
-fi
-
-if test "x$TCLSH" = "x"; then
- AC_MSG_WARN([Unable to find a tclsh. The Tcl packages will not be built])
- HAVE_TCL=0
-fi
-
-if test "$HAVE_TCL" = "1"; then
- TCL_VERSION_FOUND=`echo 'puts [[info tclversion]]' | $TCLSH`
-
- # can't assume ksh on all architectures
- # TCLSH_EXEC_PREFIX=${TCLSH%%/bin/tclsh.*}
- # so use sed instead
- TCLSH_EXEC_PREFIX=`echo $TCLSH|sed -e 's%/bin/tclsh.*$%%'`
-
- if test -f ${TCLSH_EXEC_PREFIX}/include/tcl${TCL_VERSION_FOUND}/tcl.h; then
- TCL_INCLUDES="-I${TCLSH_EXEC_PREFIX}/include/tcl${TCL_VERSION_FOUND} -I${TCLSH_EXEC_PREFIX}/include/tcl${TCL_VERSION_FOUND}/generic"
- else
- if test "x${TCLSH_EXEC_PREFIX}" != "x/usr" -a -f ${TCLSH_EXEC_PREFIX}/include/tcl.h; then
- TCL_INCLUDES=-I${TCLSH_EXEC_PREFIX}/include
- fi
- fi
- if test "x$TCL_INCLUDES" != "x" ; then
- AC_MSG_RESULT([using tcl headers from $TCL_INCLUDES])
- fi
- AC_SUBST(TCL_INCLUDES)
- save_CPPFLAGS=$CPPFLAGS
- CPPFLAGS="$CPPFLAGS $TCL_INCLUDES"
+. ${TCLCONFIG}
+TCL_INCLUDES=${TCL_INCLUDE_SPEC}
+AC_SUBST(TCL_INCLUDES)
AC_CHECK_HEADER(tcl.h,,[
AC_MSG_WARN([Unable to find header tcl.h. The Tcl packages will not be built])
HAVE_TCL=0])
- CPPFLAGS=$save_CPPFLAGS
-fi
-
-if test "$HAVE_TCL" = "1"; then
- # Some systems don't have Tcl. Don't build
- # the Tcl products if we don't have the library.
- if test -f ${TCLSH_EXEC_PREFIX}/lib/tcl${TCL_VERSION_FOUND}/tclConfig.sh; then
- TCLCONFIG=${TCLSH_EXEC_PREFIX}/lib/tcl${TCL_VERSION_FOUND}/tclConfig.sh
- else
- if test -f ${TCLSH_EXEC_PREFIX}/lib/tclConfig.sh; then
- TCLCONFIG=${TCLSH_EXEC_PREFIX}/lib/tclConfig.sh
- fi
- fi
- if test "x$TCLCONFIG" != "x"; then
- AC_MSG_RESULT([using $TCLCONFIG])
- file=${TCLCONFIG}
- . $file
- else
- AC_MSG_WARN([Unable to find tclConfig.sh. The Tcl packages will not be built])
- HAVE_TCL=0
- fi
-fi
if test "$HAVE_TCL" = "1"; then
# TCL STUBS support is required
@@ -353,77 +297,13 @@ if test "$HAVE_TCL" = "0"; then
fi
HAVE_TK=$HAVE_TCL
-
-if test "$HAVE_TK" = "1"; then
- AC_ARG_WITH(wish,
- [ --with-wish=PROG build graphviz for specific wish],
- WISH=$withval,)
- if test "x$WISH" = "x"; then
- AC_PATH_PROG(WISH,wish8.4)
- if test "x$WISH" = "x"; then
- AC_PATH_PROG(WISH,wish8.3)
- if test "x$WISH" = "x"; then
- AC_PATH_PROG(WISH,wish)
- fi
- fi
- fi
- if test "x$WISH" = "x"; then
- AC_MSG_WARN([Unable to find a wish. The Tk packages will not be built])
- HAVE_TK=0
- fi
-fi
-
-if test "$HAVE_TK" = "1"; then
- #TK_VERSION_FOUND=`echo 'puts [[info tkversion]]' | $WISH`
- #
- # No such var as tkversion. Use tclversion instead.
- TK_VERSION_FOUND=${TCL_VERSION_FOUND}
-
- # can't assume ksh on all architectures
- # WISH_EXEC_PREFIX=${WISH%%/bin/tclsh.*}
- # so use sed instead
- WISH_EXEC_PREFIX=`echo $WISH|sed -e 's%/bin/wish.*$%%'`
-
- if test -f ${WISH_EXEC_PREFIX}/include/tk${TK_VERSION_FOUND}/tk.h; then
- TK_INCLUDES="-I${WISH_EXEC_PREFIX}/include/tk${TK_VERSION_FOUND} -I${WISH_EXEC_PREFIX}/include/tk${TK_VERSION_FOUND}/generic"
- else
- if test "x${WISH_EXEC_PREFIX}" != "x/usr" -a -f ${WISH_EXEC_PREFIX}/include/tk.h; then
- TK_INCLUDES=-I${WISH_EXEC_PREFIX}/include
- fi
- fi
- if test "x$TK_INCLUDES" != "x" ; then
- AC_MSG_RESULT([using tk headers from $TK_INCLUDES])
- fi
- AC_SUBST(TK_INCLUDES)
- save_CPPFLAGS=$CPPFLAGS
- CPPFLAGS="$CPPFLAGS $TCL_INCLUDES $TK_INCLUDES"
+. ${TKCONFIG}
+TK_INCLUDES="-I${TK_PREFIX}/include"
+AC_SUBST(TK_INCLUDES)
AC_CHECK_HEADER(tk.h,,[
AC_MSG_WARN([Unable to find header tk.h. The Tk packages will not be built])
HAVE_TK=0])
- CPPFLAGS=$save_CPPFLAGS
-fi
-if test "$HAVE_TK" = "1"; then
- # Some systems don't have Tcl. Don't build
- # Some systems have Tcl, but not TK. Don't build
- # the Tk products if we don't have the library.
- if test -f ${WISH_EXEC_PREFIX}/lib/tk${TK_VERSION_FOUND}/tkConfig.sh; then
- TKCONFIG=${WISH_EXEC_PREFIX}/lib/tk${TK_VERSION_FOUND}/tkConfig.sh
- else
- if test -f ${WISH_EXEC_PREFIX}/lib/tkConfig.sh; then
- TKCONFIG=${WISH_EXEC_PREFIX}/lib/tkConfig.sh
- fi
- fi
- if test "x$TKCONFIG" != "x"; then
- AC_MSG_RESULT([using $TKCONFIG])
- file=${TKCONFIG}
- . $file
- else
- AC_MSG_WARN([Unable to find tkConfig.sh. The Tk packages will not be built])
- HAVE_TK=0
- fi
-fi
-
#if test "$HAVE_TK" = "1"; then
# # TK STUBS support is required (but support is indicated by TCL_SUPPORTS_STUBS)
# if test "x${TCL_SUPPORTS_STUBS}" != "x1"; then
@@ -1014,36 +894,12 @@ AC_MSG_RESULT(no)])
# -----------------------------------
# tclInt.h
-if test -f "$TCL_SRC_DIR/generic/tclInt.h"; then
-TCLINT_INCLUDES="-I$TCL_SRC_DIR/generic"
-else
-if test -f "/usr/include/tclInt.h"; then
-TCLINT_INCLUDES=""
-else
-if test -f "/usr/local/include/tclInt.h"; then
-TCLINT_INCLUDES="-I/usr/local/include"
-else
-TCLINT_INCLUDES="-I$TOP_DIR/tclstubs"
-fi
-fi
-fi
+TCLINT_INCLUDES="-I${TCL_PREFIX}/include/tcl/generic"
AC_SUBST(TCLINT_INCLUDES)
# -----------------------------------
# tkInt.h
-if test -f "$TK_SRC_DIR/generic/tkInt.h"; then
-TKINT_INCLUDES="-I$TK_SRC_DIR/generic"
-else
-if test -f "/usr/include/tkInt.h"; then
-TKINT_INCLUDES=""
-else
-if test -f "/usr/local/include/tkInt.h"; then
-TKINT_INCLUDES="-I/usr/local/include"
-else
-TKINT_INCLUDES="-I$TOP_DIR/tkstubs"
-fi
-fi
-fi
+TKINT_INCLUDES="-I${TK_PREFIX}/include/tk/generic"
AC_SUBST(TKINT_INCLUDES)
# -----------------------------------
|
