Mercurial > mplayer.hg

comparison configure @ 21330:dceeec121837

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge _ld_arch into _ld_extra.
author diego
date Mon, 27 Nov 2006 22:55:46 +0000
parents 8b96b6cb51b4
children 4556f7c82535
comparison
equal deleted inserted replaced
21329:6e49ddb21b9d 21330:dceeec121837
2440 fi 2440 fi
2441 2441
2442 2442
2443 # On QNX we must link to libph - Gabucino 2443 # On QNX we must link to libph - Gabucino
2444 if qnx ; then 2444 if qnx ; then
2445 _ld_arch="$_ld_arch -lph" 2445 _ld_extra="$_ld_extra -lph"
2446 fi 2446 fi
2447 2447
2448 # checking for a working awk, I'm using mawk first, because it's fastest - atmos 2448 # checking for a working awk, I'm using mawk first, because it's fastest - atmos
2449 _awk= 2449 _awk=
2450 if test "$_vidix_internal" = yes ; then 2450 if test "$_vidix_internal" = yes ; then
2497 echocheck "-lposix" 2497 echocheck "-lposix"
2498 cat > $TMPC <<EOF 2498 cat > $TMPC <<EOF
2499 int main(void) { return 0; } 2499 int main(void) { return 0; }
2500 EOF 2500 EOF
2501 if cc_check -lposix ; then 2501 if cc_check -lposix ; then
2502 _ld_arch="$_ld_arch -lposix" 2502 _ld_extra="$_ld_extra -lposix"
2503 echores "yes" 2503 echores "yes"
2504 else 2504 else
2505 echores "no" 2505 echores "no"
2506 fi 2506 fi
2507 2507
2627 EOF 2627 EOF
2628 _kstat=no 2628 _kstat=no
2629 cc_check -lkstat && _kstat=yes 2629 cc_check -lkstat && _kstat=yes
2630 if test "$_kstat" = yes ; then 2630 if test "$_kstat" = yes ; then
2631 _def_kstat="#define HAVE_LIBKSTAT 1" 2631 _def_kstat="#define HAVE_LIBKSTAT 1"
2632 _ld_arch="-lkstat $_ld_arch" 2632 _ld_extra="$_ld_extra -lkstat"
2633 else 2633 else
2634 _def_kstat="#undef HAVE_LIBKSTAT" 2634 _def_kstat="#undef HAVE_LIBKSTAT"
2635 fi 2635 fi
2636 echores "$_kstat" 2636 echores "$_kstat"
2637 2637
2643 int main(void) { (void) nanosleep(0, 0); return 0; } 2643 int main(void) { (void) nanosleep(0, 0); return 0; }
2644 EOF 2644 EOF
2645 _posix4=no 2645 _posix4=no
2646 cc_check -lposix4 && _posix4=yes 2646 cc_check -lposix4 && _posix4=yes
2647 if test "$_posix4" = yes ; then 2647 if test "$_posix4" = yes ; then
2648 _ld_arch="-lposix4 $_ld_arch" 2648 _ld_extra="$_ld_extra -lposix4"
2649 fi 2649 fi
2650 echores "$_posix4" 2650 echores "$_posix4"
2651 2651
2652 echocheck "lrintf" 2652 echocheck "lrintf"
2653 cat > $TMPC << EOF 2653 cat > $TMPC << EOF
2682 cat > $TMPC << EOF 2682 cat > $TMPC << EOF
2683 #include <time.h> 2683 #include <time.h>
2684 int main(void) { (void) nanosleep(0, 0); return 0; } 2684 int main(void) { (void) nanosleep(0, 0); return 0; }
2685 EOF 2685 EOF
2686 _nanosleep=no 2686 _nanosleep=no
2687 cc_check $_ld_arch && _nanosleep=yes 2687 cc_check && _nanosleep=yes
2688 if test "$_nanosleep" = yes ; then 2688 if test "$_nanosleep" = yes ; then
2689 _def_nanosleep='#define HAVE_NANOSLEEP 1' 2689 _def_nanosleep='#define HAVE_NANOSLEEP 1'
2690 else 2690 else
2691 _def_nanosleep='#undef HAVE_NANOSLEEP' 2691 _def_nanosleep='#undef HAVE_NANOSLEEP'
2692 fi 2692 fi
4767 cc_check && _real_ossaudio=yes 4767 cc_check && _real_ossaudio=yes
4768 if test "$_real_ossaudio" = yes; then 4768 if test "$_real_ossaudio" = yes; then
4769 _def_ossaudio_devdsp='#define PATH_DEV_DSP "/dev/dsp"' 4769 _def_ossaudio_devdsp='#define PATH_DEV_DSP "/dev/dsp"'
4770 elif netbsd || openbsd ; then 4770 elif netbsd || openbsd ; then
4771 _def_ossaudio_devdsp='#define PATH_DEV_DSP "/dev/sound"' 4771 _def_ossaudio_devdsp='#define PATH_DEV_DSP "/dev/sound"'
4772 _ld_arch="$_ld_arch -lossaudio" 4772 _ld_extra="$_ld_extra -lossaudio"
4773 else 4773 else
4774 _def_ossaudio_devdsp='#define PATH_DEV_DSP "/dev/dsp"' 4774 _def_ossaudio_devdsp='#define PATH_DEV_DSP "/dev/dsp"'
4775 fi 4775 fi
4776 _def_ossaudio_devmixer='#define PATH_DEV_MIXER "/dev/mixer"' 4776 _def_ossaudio_devmixer='#define PATH_DEV_MIXER "/dev/mixer"'
4777 fi 4777 fi
7178 bsd && _ld_dl_dynamic='-rdynamic' 7178 bsd && _ld_dl_dynamic='-rdynamic'
7179 if test "$_real" = yes || test "$_xanim" = yes && not win32 && not qnx && not darwin ; then 7179 if test "$_real" = yes || test "$_xanim" = yes && not win32 && not qnx && not darwin ; then
7180 _ld_dl_dynamic='-rdynamic' 7180 _ld_dl_dynamic='-rdynamic'
7181 fi 7181 fi
7182 7182
7183 _ld_arch="$_ld_arch $_ld_pthread $_ld_dl $_ld_dl_dynamic" 7183 _ld_extra="$_ld_extra $_ld_pthread $_ld_dl $_ld_dl_dynamic"
7184 bsdos && _ld_arch="$_ld_arch -ldvd" 7184 bsdos && _ld_extra="$_ld_extra -ldvd"
7185 if netbsd ; then 7185 netbsd && x86 && _ld_extra="$_ld_extra -li386"
7186 x86 && _ld_arch="$_ld_arch -li386"
7187 fi
7188 7186
7189 _def_debug='#undef MP_DEBUG' 7187 _def_debug='#undef MP_DEBUG'
7190 test "$_debug" != "" && _def_debug='#define MP_DEBUG 1' 7188 test "$_debug" != "" && _def_debug='#define MP_DEBUG 1'
7191 7189
7192 _def_linux='#undef TARGET_LINUX' 7190 _def_linux='#undef TARGET_LINUX'
7375 PNG = $_png 7373 PNG = $_png
7376 JPEG = $_jpeg 7374 JPEG = $_jpeg
7377 GIF = $_gif 7375 GIF = $_gif
7378 7376
7379 EXTRALIBS = $_extra_libs 7377 EXTRALIBS = $_extra_libs
7380 EXTRA_LIB = $_ld_extra $_ld_static $_ld_lm $_ld_arch 7378 EXTRA_LIB = $_ld_extra $_ld_static $_ld_lm
7381 EXTRALIBS_MPLAYER = $_libs_mplayer 7379 EXTRALIBS_MPLAYER = $_libs_mplayer
7382 EXTRALIBS_MENCODER = $_libs_mencoder 7380 EXTRALIBS_MENCODER = $_libs_mencoder
7383 7381
7384 HAVE_MLIB = $_mlib 7382 HAVE_MLIB = $_mlib
7385 HAVE_PTHREADS = $_pthreads 7383 HAVE_PTHREADS = $_pthreads