Mercurial > mplayer.hg
comparison configure @ 6634:d2c224cf5468
* Link with -lossaudio and/or -li386 only when needed
* Fix iconv detection
patch by Bj«Órn Sandell <biorn@dce.chalmers.se>
author | arpi |
---|---|
date | Wed, 03 Jul 2002 22:17:33 +0000 |
parents | b408ba1e7402 |
children | 64cf429bd7eb |
comparison
equal
deleted
inserted
replaced
6633:769246a4eb41 | 6634:d2c224cf5468 |
---|---|
1557 if test "$_malloc" = yes ; then | 1557 if test "$_malloc" = yes ; then |
1558 _def_malloc='#define HAVE_MALLOC_H 1' | 1558 _def_malloc='#define HAVE_MALLOC_H 1' |
1559 else | 1559 else |
1560 _def_malloc='#undef HAVE_MALLOC_H' | 1560 _def_malloc='#undef HAVE_MALLOC_H' |
1561 fi | 1561 fi |
1562 # malloc.h emits a warning in FreeBSD | 1562 # malloc.h emits a warning in FreeBSD and OpenBSD |
1563 (freebsd || openbsd) && _def_malloc='#undef HAVE_MALLOC_H' | 1563 (freebsd || openbsd) && _def_malloc='#undef HAVE_MALLOC_H' |
1564 echores "$_malloc" | 1564 echores "$_malloc" |
1565 | 1565 |
1566 | 1566 |
1567 echocheck "memalign()" | 1567 echocheck "memalign()" |
1704 _inc_soundcard='#include <soundcard.h>' | 1704 _inc_soundcard='#include <soundcard.h>' |
1705 else | 1705 else |
1706 _def_soundcard='#undef HAVE_SOUNDCARD_H' | 1706 _def_soundcard='#undef HAVE_SOUNDCARD_H' |
1707 fi | 1707 fi |
1708 echores "$_soundcard" | 1708 echores "$_soundcard" |
1709 else | |
1710 _def_soundcard='#undef HAVE_SOUNDCARD_H' | |
1709 fi | 1711 fi |
1710 | 1712 |
1711 echocheck "sys/dvdio.h" | 1713 echocheck "sys/dvdio.h" |
1712 cat > $TMPC << EOF | 1714 cat > $TMPC << EOF |
1713 #include <unistd.h> | 1715 #include <unistd.h> |
2798 _def_ossaudio_devdsp='#define PATH_DEV_DSP "/dev/sound/dsp"' | 2800 _def_ossaudio_devdsp='#define PATH_DEV_DSP "/dev/sound/dsp"' |
2799 _def_ossaudio_devmixer='#define PATH_DEV_MIXER "/dev/sound/mixer"' | 2801 _def_ossaudio_devmixer='#define PATH_DEV_MIXER "/dev/sound/mixer"' |
2800 else | 2802 else |
2801 if netbsd || openbsd ; then | 2803 if netbsd || openbsd ; then |
2802 _def_ossaudio_devdsp='#define PATH_DEV_DSP "/dev/sound"' | 2804 _def_ossaudio_devdsp='#define PATH_DEV_DSP "/dev/sound"' |
2805 openbsd && _ld_arch="$_ld_arch -lossaudio" | |
2803 else | 2806 else |
2804 _def_ossaudio_devdsp='#define PATH_DEV_DSP "/dev/dsp"' | 2807 _def_ossaudio_devdsp='#define PATH_DEV_DSP "/dev/dsp"' |
2805 fi | 2808 fi |
2806 _def_ossaudio_devmixer='#define PATH_DEV_MIXER "/dev/mixer"' | 2809 _def_ossaudio_devmixer='#define PATH_DEV_MIXER "/dev/mixer"' |
2807 fi | 2810 fi |
3230 _def_win32='#define USE_WIN32DLL 1' | 3233 _def_win32='#define USE_WIN32DLL 1' |
3231 _ld_win32='-Lloader -lloader' | 3234 _ld_win32='-Lloader -lloader' |
3232 _dep_win32='loader/libloader.a' | 3235 _dep_win32='loader/libloader.a' |
3233 _codecmodules="win32 $_codecmodules" | 3236 _codecmodules="win32 $_codecmodules" |
3234 echores "yes (using $_win32libdir)" | 3237 echores "yes (using $_win32libdir)" |
3238 if openbsd ; then | |
3239 x86 && _ld_win32="$_ld_win32 -li386" | |
3240 fi | |
3235 else | 3241 else |
3236 _def_win32='#undef USE_WIN32DLL' | 3242 _def_win32='#undef USE_WIN32DLL' |
3237 _nocodecmodules="win32 $_nocodecmodules" | 3243 _nocodecmodules="win32 $_nocodecmodules" |
3238 _dshow=no | 3244 _dshow=no |
3239 echores "no" | 3245 echores "no" |
3410 } | 3416 } |
3411 EOF | 3417 EOF |
3412 _iconv=no | 3418 _iconv=no |
3413 if freebsd ; then | 3419 if freebsd ; then |
3414 cc_check -lm -lgiconv && _iconv=yes | 3420 cc_check -lm -lgiconv && _iconv=yes |
3415 elif bsdos ; then | 3421 elif bsdos || openbsd ; then |
3416 cc_check -lm -liconv && _iconv=yes | 3422 cc_check -lm -liconv && _iconv=yes |
3417 else | 3423 else |
3418 cc_check -lm && _iconv=yes | 3424 cc_check -lm && _iconv=yes |
3419 fi | 3425 fi |
3420 fi | 3426 fi |
3421 if test "$_iconv" = yes ; then | 3427 if test "$_iconv" = yes ; then |
3422 _def_iconv='#define USE_ICONV 1' | 3428 _def_iconv='#define USE_ICONV 1' |
3423 freebsd && _ld_iconv='-lgiconv' | 3429 freebsd && _ld_iconv='-lgiconv' |
3424 bsdos && _ld_iconv='-liconv' | 3430 bsdos && _ld_iconv='-liconv' |
3431 openbsd && _ld_iconv='-liconv' | |
3425 else | 3432 else |
3426 _def_iconv='#undef USE_ICONV' | 3433 _def_iconv='#undef USE_ICONV' |
3427 fi | 3434 fi |
3428 echores "$_iconv" | 3435 echores "$_iconv" |
3429 | 3436 |
3685 if test "$_tv_bsdbt848" = auto ; then | 3692 if test "$_tv_bsdbt848" = auto ; then |
3686 _tv_bsdbt848=no | 3693 _tv_bsdbt848=no |
3687 if test "$_tv" = yes ; then | 3694 if test "$_tv" = yes ; then |
3688 cat > $TMPC <<EOF | 3695 cat > $TMPC <<EOF |
3689 #include <sys/types.h> | 3696 #include <sys/types.h> |
3690 #ifdef __NetBSD__ | 3697 #if defined(__NetBSD__) |
3691 #include <dev/ic/bt8xx.h> | 3698 #include <dev/ic/bt8xx.h> |
3692 #else | 3699 #else |
3693 #include <machine/ioctl_bt848.h> | 3700 #include <machine/ioctl_bt848.h> |
3694 #endif | 3701 #endif |
3695 int main(void) { return 0; } | 3702 int main(void) { return 0; } |
3930 test "$_xanim" = yes && _ld_dl_dynamic='-rdynamic' | 3937 test "$_xanim" = yes && _ld_dl_dynamic='-rdynamic' |
3931 test "$_real" = yes && _ld_dl_dynamic='-rdynamic' | 3938 test "$_real" = yes && _ld_dl_dynamic='-rdynamic' |
3932 | 3939 |
3933 _ld_arch="$_ld_arch $_ld_pthread $_ld_dl $_ld_dl_dynamic" | 3940 _ld_arch="$_ld_arch $_ld_pthread $_ld_dl $_ld_dl_dynamic" |
3934 bsdos && _ld_arch="$_ld_arch -ldvd" | 3941 bsdos && _ld_arch="$_ld_arch -ldvd" |
3935 if netbsd || openbsd ; then | 3942 if netbsd ; then |
3936 _ld_arch="$_ld_arch -lossaudio" | 3943 _ld_arch="$_ld_arch -lossaudio" |
3937 x86 && _ld_arch="$_ld_arch -li386" | 3944 x86 && _ld_arch="$_ld_arch -li386" |
3938 fi | 3945 fi |
3939 | 3946 |
3940 _def_debug='#undef MP_DEBUG' | 3947 _def_debug='#undef MP_DEBUG' |