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
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
|
--- configure_min.orig 2008-04-02 22:58:34.504868912 +0100
+++ configure_min 2008-04-02 23:47:56.967829265 +0100
@@ -13,22 +13,22 @@
#----- C++ compiler name
echo "Input C++ compiler name (e.g. g++, no default)."
echo -n " :"
-set cpp_compiler=$<
+set cpp_compiler=
#----- Optimization option of the C++ compiler
echo "Input optimization option (e.g. -O2, no default)"
echo -n " :"
-set optimize=$<
+set optimize=
#----- Input Tcl/Tk window shell name
echo "Input Tcl/Tk window shell name"
echo -n " (e.g. wish, no default): "
-set wish=$<
+set wish=wish
#----- Input directory name to install dawn and DAWN_GUI
echo "Input directory to install executable files"
echo -n " (e.g. /usr/local/bin, no default ): "
-set install_dir=$<
+set install_dir=
##### DELETE #####
@@ -57,14 +57,14 @@
echo "### C++ compiler" >> Makefile
#echo "ifndef CXX" >> Makefile
-echo "CC = $cpp_compiler" >> Makefile
+#echo "CC = $cpp_compiler" >> Makefile
#echo "else" >> Makefile
-#echo 'CC = $(CXX)' >> Makefile
+echo 'CC = $(CXX)' >> Makefile
#echo "endif" >> Makefile
echo "" >> Makefile
echo "### Optimization" >> Makefile
-echo "OPTIMIZE = $optimize" >> Makefile
+echo 'OPTIMIZE = $(CXXFLAGS)' >> Makefile
echo "" >> Makefile
echo "### Waring level" >> Makefile
@@ -78,7 +78,7 @@
echo "### Directory where to install executable files" >> Makefile
-echo "INSTALL_DIR = $install_dir" >> Makefile
+echo 'INSTALL_DIR = $(DESTDIR)/usr/bin' >> Makefile
echo "" >> Makefile
echo "" >> Makefile
--- configure.orig 2008-04-02 22:58:23.660250913 +0100
+++ configure 2008-04-03 00:06:20.081610809 +0100
@@ -17,19 +17,19 @@
#----- C++ compiler name
echo "Input C++ compiler name (e.g. g++, no default)."
echo -n " : "
-set cpp_compiler=$<
+set cpp_compiler=
echo ""
#----- Optimization option of the C++ compiler
echo "Input optimization option (e.g. -O2, no default)"
echo -n " : "
-set optimize=$<
+set optimize=
echo ""
#----- Input Tcl/Tk window shell name
echo "Input Tcl/Tk window shell name"
echo -n " (e.g. wish, no default): "
-set wish=$<
+set wish=wish
echo ""
#-----
@@ -37,7 +37,7 @@
echo " (e.g. -I/usr/X11R6/include) "
echo " Hit return key if path is already set properly. )"
echo -n " : "
-set xlib_inc=$<
+set xlib_inc=
echo ""
@@ -46,7 +46,7 @@
echo " (e.g. -L/usr/X11R6/lib) "
echo " Hit return key if path is already set properly.)"
echo -n " : "
-set xlib_lib=$<
+set xlib_lib=
echo ""
@@ -55,7 +55,7 @@
echo " (e.g. -I/usr/X11R6/include) "
echo " Hit return key if path is already set properly. )"
echo -n " : "
-set openglinc=$<
+set openglinc=
echo ""
#-----
@@ -63,7 +63,7 @@
echo " (e.g. -I/usr/X11R6/include/GL "
echo " Hit return key if path is already set properly. )"
echo -n " : "
-set openglinc2=$<
+set openglinc2=
echo ""
@@ -72,24 +72,24 @@
echo " (e.g. -L/usr/X11R6/lib "
echo " Hit return key if path is already set properly.)"
echo -n " : "
-set opengllib=$<
+set opengllib=
echo ""
#-----
echo -n "Select OpenGL/Mesa or old Masa (0: OpenGL/Mesa , 1: Old Mesa (ver.3.0)): "
-set opengl_type=$<
+set opengl_type=0
echo ""
#----- Input directory name to install dawn and DAWN_GUI
echo "Input directory to install executable files"
echo -n " (e.g. /usr/local/bin, no default ): "
-set install_dir=$<
+set install_dir=
echo ""
#----- Input system name
echo -n "Select a system (0: Defalut, 1: AIX, 2: IRIX, 3: Solaris, 4: RedHat/FedoraCore): "
-set sysid=$<
+set sysid=0
switch ($sysid)
case "0":
set sysname = "Default"
@@ -116,7 +116,7 @@
echo "Do you use remote-visualization function? (y/n, no default)"
echo " (Select n if your compilation fails for FRClientServer.cc)"
echo -n " : "
-set ynflag_socket=$<
+set ynflag_socket=n
switch ($ynflag_socket)
case "y":
set macro_socket = '#define USE_SOCKET'
@@ -159,14 +159,14 @@
echo "### C++ compiler" >> Makefile
#echo "ifndef CXX" >> Makefile
-echo "CC = $cpp_compiler" >> Makefile
+#echo "CC = $cpp_compiler" >> Makefile
#echo "else" >> Makefile
-#echo 'CC = $(CXX)' >> Makefile
+echo 'CC = $(CXX)' >> Makefile
#echo "endif" >> Makefile
echo "" >> Makefile
echo "### Optimization" >> Makefile
-echo "OPTIMIZE = $optimize" >> Makefile
+echo 'OPTIMIZE = $(CXXFLAGS)' >> Makefile
echo "" >> Makefile
echo "### Waring level" >> Makefile
@@ -224,7 +224,7 @@
echo "" >> Makefile
echo "### Directory where to install executable files" >> Makefile
-echo "INSTALL_DIR = $install_dir" >> Makefile
+echo 'INSTALL_DIR = $(DESTDIR)/usr/bin' >> Makefile
echo "" >> Makefile
echo "### Socket libraries to be linked " >> Makefile
@@ -313,6 +313,6 @@
echo ""
echo 'After compilation, type "make install" for installation.'
echo 'Then four executable files "dawn", "DAWN_GUI",'
-echo '"dawnunixd", and "dawninetd" will be installed to '
+echo '"dawnunixd", and "dawninetd" will be installed'
echo "$install_dir."
echo ""
--- configure_xwin.orig 2008-04-02 22:58:44.973465484 +0100
+++ configure_xwin 2008-04-03 00:02:15.950190359 +0100
@@ -16,17 +16,17 @@
#----- C++ compiler name
echo "Input C++ compiler name (e.g. g++, no default)."
echo -n " :"
-set cpp_compiler=$<
+set cpp_compiler=
#----- Optimization option of the C++ compiler
echo "Input optimization option (e.g. -O2, no default)"
echo -n " :"
-set optimize=$<
+set optimize=
#----- Input Tcl/Tk window shell name
echo "Input Tcl/Tk window shell name"
echo -n " (e.g. wish, no default): "
-set wish=$<
+set wish=wish
#-----
@@ -34,7 +34,7 @@
echo " (e.g. -I/usr/X11R6/include) "
echo " Hit return key if path is already set properly. )"
echo -n " : "
-set xlib_inc=$<
+set xlib_inc=
echo ""
@@ -43,17 +43,17 @@
echo " (e.g. -L/usr/X11R6/lib) "
echo " Hit return key if path is already set properly.)"
echo -n " : "
-set xlib_lib=$<
+set xlib_lib=
echo ""
#----- Input directory name to install dawn and DAWN_GUI
echo "Input directory to install executable files"
echo -n " (e.g. /usr/local/bin, no default ): "
-set install_dir=$<
+set install_dir=
#----- Input system name
echo -n "Select a system (0: Defalut, 1: AIX, 2: IRIX, 3: Solaris, 4: RedHat/FedoraCore): "
-set sysid=$<
+set sysid=0
switch ($sysid)
case "0":
set sysname = "Default"
@@ -80,7 +80,7 @@
echo "Do you use remote-visualization function? (y/n, no default)"
echo " (Select n if your compilation fails for FRClientServer.cc)"
echo -n " : "
-set ynflag_socket=$<
+set ynflag_socket=n
switch ($ynflag_socket)
case "y":
set macro_socket = '#define USE_SOCKET'
@@ -123,14 +123,14 @@
echo "### C++ compiler" >> Makefile
#echo "ifndef CXX" >> Makefile
-echo "CC = $cpp_compiler" >> Makefile
+#echo "CC = $cpp_compiler" >> Makefile
#echo "else" >> Makefile
-#echo 'CC = $(CXX)' >> Makefile
+echo 'CC = $(CXX)' >> Makefile
#echo "endif" >> Makefile
echo "" >> Makefile
echo "### Optimization" >> Makefile
-echo "OPTIMIZE = $optimize" >> Makefile
+echo 'OPTIMIZE = $(CXXFLAGS)' >> Makefile
echo "" >> Makefile
echo "### Waring level" >> Makefile
@@ -152,7 +152,7 @@
echo "" >> Makefile
echo "### Directory where to install executable files" >> Makefile
-echo "INSTALL_DIR = $install_dir" >> Makefile
+echo 'INSTALL_DIR = $(DESTDIR)/usr/bin' >> Makefile
echo "" >> Makefile
echo "### Socket libraries to be linked " >> Makefile
--- FRSocketMacro.h.orig 2008-04-02 23:58:51.126518123 +0100
+++ FRSocketMacro.h 2008-04-02 23:59:03.443220012 +0100
@@ -14,8 +14,8 @@
#elif defined SOCKET_REDHAT61
#define CLIENT_ADDR_LENGTH socklen_t
#else
- #define CLIENT_ADDR_LENGTH int
-// #define CLIENT_ADDR_LENGTH size_t
+// #define CLIENT_ADDR_LENGTH int
+ #define CLIENT_ADDR_LENGTH size_t
#endif
//----- gethostname
|
GitWeb