Revision f3ec2d46 configure

View differences:

configure
13 13

  
14 14
TMPC="${TMPDIR1}/ffmpeg-conf-${RANDOM}-$$-${RANDOM}.c"
15 15
TMPO="${TMPDIR1}/ffmpeg-conf-${RANDOM}-$$-${RANDOM}.o"
16
TMPE="${TMPDIR1}/ffmpeg-conf-${RANDOM}-$$-${RANDOM}"
16 17
TMPS="${TMPDIR1}/ffmpeg-conf-${RANDOM}-$$-${RANDOM}.S"
17 18
TMPH="${TMPDIR1}/ffmpeg-conf-${RANDOM}-$$-${RANDOM}.h"
18 19

  
......
61 62
win32="no"
62 63
mingw32="no"
63 64
cygwin="no"
65
os2="no"
64 66
lshared="no"
65 67
extralibs="-lm"
66 68
simpleidct="yes"
......
75 77
ffserver="yes"
76 78
LDFLAGS=-Wl,--warn-common
77 79
FFSLDFLAGS=-Wl,-E
80
LIBPREF="lib"
81
LIBSUF=".a"
82
SLIBPREF="lib"
83
SLIBSUF=".so"
78 84

  
79 85
# OS specific
80 86
targetos=`uname -s`
......
169 175
Linux)
170 176
LDFLAGS="$LDFLAGS -rdynamic"
171 177
;;
178
OS/2)
179
TMPE=$TMPE".exe"
180
ar="emxomfar -p32"
181
strip="echo ignore strip"
182
CFLAGS="-Zomf"
183
LDFLAGS="-Zomf -Zstack 16384"
184
SHFLAGS=""
185
FFSLDFLAGS=""
186
LIBPREF=""
187
LIBSUF=".lib"
188
SLIBPREF=""
189
SLIBSUF=".dll"
190
extralibs=""
191
v4l="no"
192
audio_oss="no"
193
network="no"
194
ffserver="no"
195
os2="yes"
196
;;
172 197
*) ;;
173 198
esac
174 199

  
......
190 215

  
191 216
ldl=-ldl
192 217

  
193
if $cc -o $TMPO $TMPC -ldl 2> /dev/null  ; then
218
if $cc -o $TMPE $TMPC -ldl 2> /dev/null  ; then
194 219
vhook=yes
195 220
dlfcn=yes
196 221
dlopen=yes
197 222
fi
198 223

  
199
if $cc -o $TMPO $TMPC 2> /dev/null  ; then
224
if $cc -o $TMPE $TMPC 2> /dev/null  ; then
200 225
vhook=yes
201 226
dlfcn=yes
202 227
dlopen=yes
......
207 232
int main( void ) { return (int) dlopen("foo", 0); }
208 233
EOF
209 234

  
210
if $cc -o $TMPO $TMPC -ldl 2> /dev/null  ; then
235
if $cc -o $TMPE $TMPC -ldl 2> /dev/null  ; then
211 236
vhook=yes
212 237
dlopen=yes
213 238
fi
214 239

  
215
if $cc -o $TMPO $TMPC 2> /dev/null  ; then
240
if $cc -o $TMPE $TMPC 2> /dev/null  ; then
216 241
vhook=yes
217 242
dlopen=yes
218 243
ldl=""
......
226 251
EOF
227 252

  
228 253
imlib2=no
229
if $cc -o $TMPO $TMPC -lImlib2 2> /dev/null  ; then
254
if $cc -o $TMPE $TMPC -lImlib2 2> /dev/null  ; then
230 255
imlib2=yes
231 256
fi
232 257

  
......
318 343
    return 0;
319 344
}
320 345
EOF
321
$cc -o $TMPO $TMPC -faltivec 2> /dev/null || altivec="no"
346
$cc -o $TMPE $TMPC -faltivec 2> /dev/null || altivec="no"
322 347
fi
323 348

  
324 349
# Can only do mmi on mips
......
338 363
    return 0;
339 364
}
340 365
EOF
341
$cc -o $TMPO $TMPC 2> /dev/null || mmi="no"
366
$cc -o $TMPE $TMPC 2> /dev/null || mmi="no"
342 367
fi
343 368

  
344 369
# Checking for CFLAGS
......
377 402
}
378 403
EOF
379 404

  
380
if $cc -o $TMPO $TMPC 2>/dev/null ; then
381
$TMPO && bigendian="yes"
405
if $cc -o $TMPE $TMPC 2>/dev/null ; then
406
$TMPE && bigendian="yes"
382 407
else
383 408
echo big/little test failed
384 409
fi
......
402 427

  
403 428
_memalign=no
404 429
_malloc_h=no
405
if $cc -o $TMPO $TMPC 2> /dev/null ; then
430
if $cc -o $TMPE $TMPC 2> /dev/null ; then
406 431
_malloc_h=yes
407 432
_memalign=yes
408 433
# check for memalign - atmos
......
414 439
return 0;
415 440
}
416 441
EOF
417
$cc -o $TMPO $TMPC 2> /dev/null || _memalign=no
442
$cc -o $TMPE $TMPC 2> /dev/null || _memalign=no
418 443
fi
419 444

  
420 445
cat > $TMPC << EOF
......
424 449
EOF
425 450

  
426 451
strptime=no
427
if $cc -o $TMPO $TMPC 2> /dev/null ; then
452
if $cc -o $TMPE $TMPC 2> /dev/null ; then
428 453
  strptime=yes
429 454
fi
430 455

  
......
439 464
return 0;
440 465
}
441 466
EOF
442
$cc -o $TMPO $TMPC -lz 2> /dev/null || zlib="no"
443
# $TMPO 2> /dev/null > /dev/null || zlib="no"
467
$cc -o $TMPE $TMPC -lz 2> /dev/null || zlib="no"
468
# $TMPE 2> /dev/null > /dev/null || zlib="no"
444 469
# XXX: more tests needed - runtime test
445 470
fi
446 471
if test "$zlib" = "yes"; then
......
455 480
EOF
456 481

  
457 482
have_lrintf="no"
458
if $cc $extralibs -o $TMPO $TMPC 2> /dev/null ; then
483
if $cc $extralibs -o $TMPE $TMPC 2> /dev/null ; then
459 484
  have_lrintf="yes"
460
  $TMPO 2> /dev/null > /dev/null || have_lrintf="no"
485
  $TMPE 2> /dev/null > /dev/null || have_lrintf="no"
461 486
fi
462 487

  
463 488
_restrict=
......
577 602
echo "LDFLAGS=$LDFLAGS" >> config.mak
578 603
echo "FFSLDFLAGS=$FFSLDFLAGS" >> config.mak
579 604
echo "SHFLAGS=$SHFLAGS" >> config.mak
605
echo "LIBPREF=$LIBPREF" >> config.mak
606
echo "LIBSUF=$LIBSUF" >> config.mak
607
echo "SLIBPREF=$SLIBPREF" >> config.mak
608
echo "SLIBSUF=$SLIBSUF" >> config.mak
580 609
if test "$cpu" = "x86" ; then
581 610
  echo "TARGET_ARCH_X86=yes" >> config.mak
582 611
  echo "#define ARCH_X86 1" >> $TMPH
......
728 757
  echo "CONFIG_WIN32=yes" >> config.mak
729 758
fi
730 759

  
760
if test "$os2" = "yes" ; then
761
  echo "#define CONFIG_OS2 1" >> $TMPH
762
  echo "CONFIG_OS2=yes" >> config.mak
763
fi
764

  
731 765
if test "$darwin" = "yes"; then
732 766
  echo "#define CONFIG_DARWIN 1"  >> $TMPH
733 767
  echo "CONFIG_DARWIN=yes" >> config.mak
......
786 820
	echo "config.h is unchanged"
787 821
fi
788 822

  
789
rm -f $TMPO $TMPC $TMPS $TMPH
823
rm -f $TMPO $TMPC $TMPE $TMPS $TMPH

Also available in: Unified diff