/
patch-configure
399 lines (381 loc) · 20 KB
/
patch-configure
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
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
$NetBSD: patch-configure,v 1.1.1.1 2008/12/16 19:35:46 sborrill Exp $
- Portability fixes
- pkgsrc ffmpeg includes path
- pkgsrc common-mml includes path
- NetBSD v4l2 support
- ov511 support on NetBSD
--- configure.orig 2008-12-10 19:28:01.000000000 +0000
+++ configure 2008-12-14 11:05:24.000000000 +0000
@@ -4538,7 +4538,7 @@
V_DEFINE="$V_DEFINE -DMAC_OSX_TCL"
fi
-elif test "${TCL_VERSION}" == "8.0" ; then
+elif test "${TCL_VERSION}" = "8.0" ; then
if test -f "${TCL_SRC_DIR}/generic/tcl2c.c" ; then
{ echo "$as_me:$LINENO: result: UCL Tcl ${TCL_VERSION}${TCL_PATCH_LEVEL}" >&5
echo "${ECHO_T}UCL Tcl ${TCL_VERSION}${TCL_PATCH_LEVEL}" >&6; }
@@ -4752,7 +4752,7 @@
{ echo "$as_me:$LINENO: checking for a compatible version of Tk" >&5
echo $ECHO_N "checking for a compatible version of Tk... $ECHO_C" >&6; }
-if test "${TCL_VERSION}" == "${TK_VERSION}"; then
+if test "${TCL_VERSION}" = "${TK_VERSION}"; then
{ echo "$as_me:$LINENO: result: Tk ${TK_VERSION}${TK_PATCH_LEVEL}" >&5
echo "${ECHO_T}Tk ${TK_VERSION}${TK_PATCH_LEVEL}" >&6; }
@@ -5012,14 +5012,14 @@
if test "$ffmpegco" != "yes"; then
if test "$ffmpeginc" != "" ; then
- if test ! -r $ffmpeginc/ffmpeg/avcodec.h ; then
- echo "Error! you need to have $ffmpeginc/ffmpeg/avcodec.h around"
+ if test ! -r $ffmpeginc/libavcodec/avcodec.h ; then
+ echo "Error! you need to have $ffmpeginc/libavcodec/avcodec.h around"
exit 1
- elif test ! -r $ffmpeginc/ffmpeg/avutil.h ; then
- echo "Error! you need to have $ffmpeginc/ffmpeg/avutil.h around"
+ elif test ! -r $ffmpeginc/libavutil/avutil.h ; then
+ echo "Error! you need to have $ffmpeginc/libavutil/avutil.h around"
exit 1
- elif test ! -r $ffmpeginc/ffmpeg/swscale.h ; then
- echo "Error! you need to have $ffmpeginc/ffmpeg/swscale.h around"
+ elif test ! -r $ffmpeginc/libswscale/swscale.h ; then
+ echo "Error! you need to have $ffmpeginc/libswscale/swscale.h around"
exit 1
fi
echo "checking for FFmpeg headers...yes"
@@ -5028,8 +5028,8 @@
else
if test "${ac_cv_header_ffmpeg_avcodec_h+set}" = set; then
- { echo "$as_me:$LINENO: checking for ffmpeg/avcodec.h" >&5
-echo $ECHO_N "checking for ffmpeg/avcodec.h... $ECHO_C" >&6; }
+ { echo "$as_me:$LINENO: checking for libavcodec/avcodec.h" >&5
+echo $ECHO_N "checking for libavcodec/avcodec.h... $ECHO_C" >&6; }
if test "${ac_cv_header_ffmpeg_avcodec_h+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
fi
@@ -5037,8 +5037,8 @@
echo "${ECHO_T}$ac_cv_header_ffmpeg_avcodec_h" >&6; }
else
# Is the header compilable?
-{ echo "$as_me:$LINENO: checking ffmpeg/avcodec.h usability" >&5
-echo $ECHO_N "checking ffmpeg/avcodec.h usability... $ECHO_C" >&6; }
+{ echo "$as_me:$LINENO: checking libavcodec/avcodec.h usability" >&5
+echo $ECHO_N "checking libavcodec/avcodec.h usability... $ECHO_C" >&6; }
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -5046,7 +5046,7 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
-#include <ffmpeg/avcodec.h>
+#include <libavcodec/avcodec.h>
_ACEOF
rm -f conftest.$ac_objext
if { (ac_try="$ac_compile"
@@ -5078,15 +5078,15 @@
echo "${ECHO_T}$ac_header_compiler" >&6; }
# Is the header present?
-{ echo "$as_me:$LINENO: checking ffmpeg/avcodec.h presence" >&5
-echo $ECHO_N "checking ffmpeg/avcodec.h presence... $ECHO_C" >&6; }
+{ echo "$as_me:$LINENO: checking libavcodec/avcodec.h presence" >&5
+echo $ECHO_N "checking libavcodec/avcodec.h presence... $ECHO_C" >&6; }
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-#include <ffmpeg/avcodec.h>
+#include <libavcodec/avcodec.h>
_ACEOF
if { (ac_try="$ac_cpp conftest.$ac_ext"
case "(($ac_try" in
@@ -5119,30 +5119,30 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
yes:no: )
- { echo "$as_me:$LINENO: WARNING: ffmpeg/avcodec.h: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: ffmpeg/avcodec.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
- { echo "$as_me:$LINENO: WARNING: ffmpeg/avcodec.h: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: ffmpeg/avcodec.h: proceeding with the compiler's result" >&2;}
+ { echo "$as_me:$LINENO: WARNING: libavcodec/avcodec.h: accepted by the compiler, rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: libavcodec/avcodec.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+ { echo "$as_me:$LINENO: WARNING: libavcodec/avcodec.h: proceeding with the compiler's result" >&5
+echo "$as_me: WARNING: libavcodec/avcodec.h: proceeding with the compiler's result" >&2;}
ac_header_preproc=yes
;;
no:yes:* )
- { echo "$as_me:$LINENO: WARNING: ffmpeg/avcodec.h: present but cannot be compiled" >&5
-echo "$as_me: WARNING: ffmpeg/avcodec.h: present but cannot be compiled" >&2;}
- { echo "$as_me:$LINENO: WARNING: ffmpeg/avcodec.h: check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: ffmpeg/avcodec.h: check for missing prerequisite headers?" >&2;}
- { echo "$as_me:$LINENO: WARNING: ffmpeg/avcodec.h: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: ffmpeg/avcodec.h: see the Autoconf documentation" >&2;}
- { echo "$as_me:$LINENO: WARNING: ffmpeg/avcodec.h: section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: ffmpeg/avcodec.h: section \"Present But Cannot Be Compiled\"" >&2;}
- { echo "$as_me:$LINENO: WARNING: ffmpeg/avcodec.h: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: ffmpeg/avcodec.h: proceeding with the preprocessor's result" >&2;}
- { echo "$as_me:$LINENO: WARNING: ffmpeg/avcodec.h: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: ffmpeg/avcodec.h: in the future, the compiler will take precedence" >&2;}
+ { echo "$as_me:$LINENO: WARNING: libavcodec/avcodec.h: present but cannot be compiled" >&5
+echo "$as_me: WARNING: libavcodec/avcodec.h: present but cannot be compiled" >&2;}
+ { echo "$as_me:$LINENO: WARNING: libavcodec/avcodec.h: check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: libavcodec/avcodec.h: check for missing prerequisite headers?" >&2;}
+ { echo "$as_me:$LINENO: WARNING: libavcodec/avcodec.h: see the Autoconf documentation" >&5
+echo "$as_me: WARNING: libavcodec/avcodec.h: see the Autoconf documentation" >&2;}
+ { echo "$as_me:$LINENO: WARNING: libavcodec/avcodec.h: section \"Present But Cannot Be Compiled\"" >&5
+echo "$as_me: WARNING: libavcodec/avcodec.h: section \"Present But Cannot Be Compiled\"" >&2;}
+ { echo "$as_me:$LINENO: WARNING: libavcodec/avcodec.h: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: libavcodec/avcodec.h: proceeding with the preprocessor's result" >&2;}
+ { echo "$as_me:$LINENO: WARNING: libavcodec/avcodec.h: in the future, the compiler will take precedence" >&5
+echo "$as_me: WARNING: libavcodec/avcodec.h: in the future, the compiler will take precedence" >&2;}
;;
esac
-{ echo "$as_me:$LINENO: checking for ffmpeg/avcodec.h" >&5
-echo $ECHO_N "checking for ffmpeg/avcodec.h... $ECHO_C" >&6; }
+{ echo "$as_me:$LINENO: checking for libavcodec/avcodec.h" >&5
+echo $ECHO_N "checking for libavcodec/avcodec.h... $ECHO_C" >&6; }
if test "${ac_cv_header_ffmpeg_avcodec_h+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -5163,8 +5163,8 @@
if test "${ac_cv_header_ffmpeg_avutil_h+set}" = set; then
- { echo "$as_me:$LINENO: checking for ffmpeg/avutil.h" >&5
-echo $ECHO_N "checking for ffmpeg/avutil.h... $ECHO_C" >&6; }
+ { echo "$as_me:$LINENO: checking for libavutil/avutil.h" >&5
+echo $ECHO_N "checking for libavutil/avutil.h... $ECHO_C" >&6; }
if test "${ac_cv_header_ffmpeg_avutil_h+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
fi
@@ -5172,8 +5172,8 @@
echo "${ECHO_T}$ac_cv_header_ffmpeg_avutil_h" >&6; }
else
# Is the header compilable?
-{ echo "$as_me:$LINENO: checking ffmpeg/avutil.h usability" >&5
-echo $ECHO_N "checking ffmpeg/avutil.h usability... $ECHO_C" >&6; }
+{ echo "$as_me:$LINENO: checking libavutil/avutil.h usability" >&5
+echo $ECHO_N "checking libavutil/avutil.h usability... $ECHO_C" >&6; }
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -5181,7 +5181,7 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
-#include <ffmpeg/avutil.h>
+#include <libavutil/avutil.h>
_ACEOF
rm -f conftest.$ac_objext
if { (ac_try="$ac_compile"
@@ -5213,15 +5213,15 @@
echo "${ECHO_T}$ac_header_compiler" >&6; }
# Is the header present?
-{ echo "$as_me:$LINENO: checking ffmpeg/avutil.h presence" >&5
-echo $ECHO_N "checking ffmpeg/avutil.h presence... $ECHO_C" >&6; }
+{ echo "$as_me:$LINENO: checking libavutil/avutil.h presence" >&5
+echo $ECHO_N "checking libavutil/avutil.h presence... $ECHO_C" >&6; }
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-#include <ffmpeg/avutil.h>
+#include <libavutil/avutil.h>
_ACEOF
if { (ac_try="$ac_cpp conftest.$ac_ext"
case "(($ac_try" in
@@ -5254,30 +5254,30 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
yes:no: )
- { echo "$as_me:$LINENO: WARNING: ffmpeg/avutil.h: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: ffmpeg/avutil.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
- { echo "$as_me:$LINENO: WARNING: ffmpeg/avutil.h: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: ffmpeg/avutil.h: proceeding with the compiler's result" >&2;}
+ { echo "$as_me:$LINENO: WARNING: libavutil/avutil.h: accepted by the compiler, rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: libavutil/avutil.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+ { echo "$as_me:$LINENO: WARNING: libavutil/avutil.h: proceeding with the compiler's result" >&5
+echo "$as_me: WARNING: libavutil/avutil.h: proceeding with the compiler's result" >&2;}
ac_header_preproc=yes
;;
no:yes:* )
- { echo "$as_me:$LINENO: WARNING: ffmpeg/avutil.h: present but cannot be compiled" >&5
-echo "$as_me: WARNING: ffmpeg/avutil.h: present but cannot be compiled" >&2;}
- { echo "$as_me:$LINENO: WARNING: ffmpeg/avutil.h: check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: ffmpeg/avutil.h: check for missing prerequisite headers?" >&2;}
- { echo "$as_me:$LINENO: WARNING: ffmpeg/avutil.h: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: ffmpeg/avutil.h: see the Autoconf documentation" >&2;}
- { echo "$as_me:$LINENO: WARNING: ffmpeg/avutil.h: section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: ffmpeg/avutil.h: section \"Present But Cannot Be Compiled\"" >&2;}
- { echo "$as_me:$LINENO: WARNING: ffmpeg/avutil.h: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: ffmpeg/avutil.h: proceeding with the preprocessor's result" >&2;}
- { echo "$as_me:$LINENO: WARNING: ffmpeg/avutil.h: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: ffmpeg/avutil.h: in the future, the compiler will take precedence" >&2;}
+ { echo "$as_me:$LINENO: WARNING: libavutil/avutil.h: present but cannot be compiled" >&5
+echo "$as_me: WARNING: libavutil/avutil.h: present but cannot be compiled" >&2;}
+ { echo "$as_me:$LINENO: WARNING: libavutil/avutil.h: check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: libavutil/avutil.h: check for missing prerequisite headers?" >&2;}
+ { echo "$as_me:$LINENO: WARNING: libavutil/avutil.h: see the Autoconf documentation" >&5
+echo "$as_me: WARNING: libavutil/avutil.h: see the Autoconf documentation" >&2;}
+ { echo "$as_me:$LINENO: WARNING: libavutil/avutil.h: section \"Present But Cannot Be Compiled\"" >&5
+echo "$as_me: WARNING: libavutil/avutil.h: section \"Present But Cannot Be Compiled\"" >&2;}
+ { echo "$as_me:$LINENO: WARNING: libavutil/avutil.h: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: libavutil/avutil.h: proceeding with the preprocessor's result" >&2;}
+ { echo "$as_me:$LINENO: WARNING: libavutil/avutil.h: in the future, the compiler will take precedence" >&5
+echo "$as_me: WARNING: libavutil/avutil.h: in the future, the compiler will take precedence" >&2;}
;;
esac
-{ echo "$as_me:$LINENO: checking for ffmpeg/avutil.h" >&5
-echo $ECHO_N "checking for ffmpeg/avutil.h... $ECHO_C" >&6; }
+{ echo "$as_me:$LINENO: checking for libavutil/avutil.h" >&5
+echo $ECHO_N "checking for libavutil/avutil.h... $ECHO_C" >&6; }
if test "${ac_cv_header_ffmpeg_avutil_h+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -5298,8 +5298,8 @@
if test "${ac_cv_header_ffmpeg_swscale_h+set}" = set; then
- { echo "$as_me:$LINENO: checking for ffmpeg/swscale.h" >&5
-echo $ECHO_N "checking for ffmpeg/swscale.h... $ECHO_C" >&6; }
+ { echo "$as_me:$LINENO: checking for libswscale/swscale.h" >&5
+echo $ECHO_N "checking for libswscale/swscale.h... $ECHO_C" >&6; }
if test "${ac_cv_header_ffmpeg_swscale_h+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
fi
@@ -5307,8 +5307,8 @@
echo "${ECHO_T}$ac_cv_header_ffmpeg_swscale_h" >&6; }
else
# Is the header compilable?
-{ echo "$as_me:$LINENO: checking ffmpeg/swscale.h usability" >&5
-echo $ECHO_N "checking ffmpeg/swscale.h usability... $ECHO_C" >&6; }
+{ echo "$as_me:$LINENO: checking libswscale/swscale.h usability" >&5
+echo $ECHO_N "checking libswscale/swscale.h usability... $ECHO_C" >&6; }
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -5316,7 +5316,7 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
-#include <ffmpeg/swscale.h>
+#include <libswscale/swscale.h>
_ACEOF
rm -f conftest.$ac_objext
if { (ac_try="$ac_compile"
@@ -5348,15 +5348,15 @@
echo "${ECHO_T}$ac_header_compiler" >&6; }
# Is the header present?
-{ echo "$as_me:$LINENO: checking ffmpeg/swscale.h presence" >&5
-echo $ECHO_N "checking ffmpeg/swscale.h presence... $ECHO_C" >&6; }
+{ echo "$as_me:$LINENO: checking libswscale/swscale.h presence" >&5
+echo $ECHO_N "checking libswscale/swscale.h presence... $ECHO_C" >&6; }
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-#include <ffmpeg/swscale.h>
+#include <libswscale/swscale.h>
_ACEOF
if { (ac_try="$ac_cpp conftest.$ac_ext"
case "(($ac_try" in
@@ -5389,30 +5389,30 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
yes:no: )
- { echo "$as_me:$LINENO: WARNING: ffmpeg/swscale.h: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: ffmpeg/swscale.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
- { echo "$as_me:$LINENO: WARNING: ffmpeg/swscale.h: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: ffmpeg/swscale.h: proceeding with the compiler's result" >&2;}
+ { echo "$as_me:$LINENO: WARNING: libswscale/swscale.h: accepted by the compiler, rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: libswscale/swscale.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+ { echo "$as_me:$LINENO: WARNING: libswscale/swscale.h: proceeding with the compiler's result" >&5
+echo "$as_me: WARNING: libswscale/swscale.h: proceeding with the compiler's result" >&2;}
ac_header_preproc=yes
;;
no:yes:* )
- { echo "$as_me:$LINENO: WARNING: ffmpeg/swscale.h: present but cannot be compiled" >&5
-echo "$as_me: WARNING: ffmpeg/swscale.h: present but cannot be compiled" >&2;}
- { echo "$as_me:$LINENO: WARNING: ffmpeg/swscale.h: check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: ffmpeg/swscale.h: check for missing prerequisite headers?" >&2;}
- { echo "$as_me:$LINENO: WARNING: ffmpeg/swscale.h: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: ffmpeg/swscale.h: see the Autoconf documentation" >&2;}
- { echo "$as_me:$LINENO: WARNING: ffmpeg/swscale.h: section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: ffmpeg/swscale.h: section \"Present But Cannot Be Compiled\"" >&2;}
- { echo "$as_me:$LINENO: WARNING: ffmpeg/swscale.h: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: ffmpeg/swscale.h: proceeding with the preprocessor's result" >&2;}
- { echo "$as_me:$LINENO: WARNING: ffmpeg/swscale.h: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: ffmpeg/swscale.h: in the future, the compiler will take precedence" >&2;}
+ { echo "$as_me:$LINENO: WARNING: libswscale/swscale.h: present but cannot be compiled" >&5
+echo "$as_me: WARNING: libswscale/swscale.h: present but cannot be compiled" >&2;}
+ { echo "$as_me:$LINENO: WARNING: libswscale/swscale.h: check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: libswscale/swscale.h: check for missing prerequisite headers?" >&2;}
+ { echo "$as_me:$LINENO: WARNING: libswscale/swscale.h: see the Autoconf documentation" >&5
+echo "$as_me: WARNING: libswscale/swscale.h: see the Autoconf documentation" >&2;}
+ { echo "$as_me:$LINENO: WARNING: libswscale/swscale.h: section \"Present But Cannot Be Compiled\"" >&5
+echo "$as_me: WARNING: libswscale/swscale.h: section \"Present But Cannot Be Compiled\"" >&2;}
+ { echo "$as_me:$LINENO: WARNING: libswscale/swscale.h: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: libswscale/swscale.h: proceeding with the preprocessor's result" >&2;}
+ { echo "$as_me:$LINENO: WARNING: libswscale/swscale.h: in the future, the compiler will take precedence" >&5
+echo "$as_me: WARNING: libswscale/swscale.h: in the future, the compiler will take precedence" >&2;}
;;
esac
-{ echo "$as_me:$LINENO: checking for ffmpeg/swscale.h" >&5
-echo $ECHO_N "checking for ffmpeg/swscale.h... $ECHO_C" >&6; }
+{ echo "$as_me:$LINENO: checking for libswscale/swscale.h" >&5
+echo $ECHO_N "checking for libswscale/swscale.h... $ECHO_C" >&6; }
if test "${ac_cv_header_ffmpeg_swscale_h+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -6425,7 +6425,7 @@
if test "$v4l2old" = "yes" ; then
V_OBJ_GRABBER="$V_OBJ_GRABBER video/grabber-v4l2-old.o"
echo "Using old Linux grabber-v4l2"
-elif test -r /usr/include/linux/videodev.h ; then
+elif test -r /usr/include/linux/videodev.h -o -r /usr/include/sys/videoio.h ; then
if test "${ac_cv_header_libv4lconvert_h+set}" = set; then
{ echo "$as_me:$LINENO: checking for libv4lconvert.h" >&5
echo $ECHO_N "checking for libv4lconvert.h... $ECHO_C" >&6; }
@@ -6553,7 +6553,11 @@
fi
if test $ac_cv_header_libv4lconvert_h = yes; then
V_DEFINE="$V_DEFINE -DHAVE_LIBV4L"
- V_LIB_GRABBER="$V_LIB_GRABBER -lv4l1 -lv4l2"
+ if test -r /usr/include/sys/videoio.h; then
+ V_LIB_GRABBER="$V_LIB_GRABBER -lv4l2"
+ else
+ V_LIB_GRABBER="$V_LIB_GRABBER -lv4l1 -lv4l2"
+ fi
else
V_OBJ_GRABBER="$V_OBJ_GRABBER video/tinyjpeg.o video/jidctflt.o"
fi
@@ -6562,6 +6566,9 @@
if test -r /usr/include/linux/videodev2.h ; then
V_OBJ_GRABBER="$V_OBJ_GRABBER video/grabber-v4l2.o video/grabber-video4linux.o"
echo "Using Linux Grabbers: Video4Linux2 and Video4Linux1"
+ elif test -r /usr/include/sys/videoio.h; then
+ V_OBJ_GRABBER="$V_OBJ_GRABBER video/grabber-v4l2.o"
+ echo "Using NetBSD Grabbers: Video4Linux2"
else
V_OBJ_GRABBER="$V_OBJ_GRABBER video/grabber-video4linux.o"
echo "Using Linux Grabber: Video4Linux1"
@@ -6790,8 +6797,9 @@
V_LIB="$V_LIB -lipc"
;;
*-*-netbsd*)
+ V_STATIC=""
V_TARCMD="tar -h -c -f"
- V_LIB="$V_LIB -L/usr/local/lib"
+ V_OBJ_GRABBER="video/grabber-ov511.o $V_OBJ_GRABBER"
;;
*-*-freebsd*)
V_STATIC=""
@@ -7077,7 +7085,8 @@
# various include hacks
dirs="/usr/src/local/include-fixes \
- /import/mcast/include"
+ /import/mcast/include \
+ $prefix/include/common-mml"
for dir in $dirs; do
if test -d $dir ; then
V_INCLUDE="$V_INCLUDE -I$dir"