Mercurial > mplayer.hg
comparison configure @ 3189:217f564f29ff
summary handling was not correct (bugs found by Nilmoni Deb and Tibcu)
DGA detection changed since it did not detect (patch by tibcu)
changed vo_vesa building to behave as the other vo_*
author | pl |
---|---|
date | Wed, 28 Nov 2001 17:52:25 +0000 |
parents | ad286d1b7705 |
children | 53a6d2fc1498 |
comparison
equal
deleted
inserted
replaced
3188:6c4a66168557 | 3189:217f564f29ff |
---|---|
962 ###################### | 962 ###################### |
963 # MAIN TESTS GO HERE # | 963 # MAIN TESTS GO HERE # |
964 ###################### | 964 ###################### |
965 | 965 |
966 | 966 |
967 echocheck "Extra headers" | 967 echocheck "extra headers" |
968 echores "$_extraincdir" | 968 if test "$_extraincdir" ; then |
969 | 969 echores "$_extraincdir" |
970 | 970 else |
971 echocheck "Extra libs" | 971 echores "none" |
972 echores "$_extralibdir" | 972 fi |
973 | |
974 | |
975 echocheck "extra libs" | |
976 if test "$_extralibdir" ; then | |
977 echores "$_extralibdir" | |
978 else | |
979 echores "none" | |
980 fi | |
973 | 981 |
974 | 982 |
975 echocheck "kstat" | 983 echocheck "kstat" |
976 cat > $TMPC << EOF | 984 cat > $TMPC << EOF |
977 #include <kstat.h> | 985 #include <kstat.h> |
1272 echocheck "X11 headers" | 1280 echocheck "X11 headers" |
1273 if test -z "$_x11incdir" ; then | 1281 if test -z "$_x11incdir" ; then |
1274 for I in /usr/include /usr/X11R6/include /usr/X11/include /usr/openwin/include ; do | 1282 for I in /usr/include /usr/X11R6/include /usr/X11/include /usr/openwin/include ; do |
1275 if test -d "$I/X11" ; then | 1283 if test -d "$I/X11" ; then |
1276 _x11incdir="$I" | 1284 _x11incdir="$I" |
1277 echores "found $I" | 1285 echores "yes (found: $I)" |
1278 break | 1286 break |
1279 fi | 1287 fi |
1280 done | 1288 done |
1281 fi | 1289 fi |
1282 if test -z "$_x11incdir" ; then | 1290 if test -z "$_x11incdir" ; then |
1290 echocheck "X11 libs" | 1298 echocheck "X11 libs" |
1291 if test -z "$_x11libdir" ; then | 1299 if test -z "$_x11libdir" ; then |
1292 for I in /usr/X11R6/lib /usr/X11/lib /usr/lib32 /usr/openwin/lib ; do | 1300 for I in /usr/X11R6/lib /usr/X11/lib /usr/lib32 /usr/openwin/lib ; do |
1293 if test -d "$I" ; then | 1301 if test -d "$I" ; then |
1294 _x11libdir="$I" | 1302 _x11libdir="$I" |
1295 echores "found $I" | 1303 echores "yes (found: $I)" |
1296 break; | 1304 break; |
1297 fi | 1305 fi |
1298 done | 1306 done |
1299 fi | 1307 fi |
1300 if test -z "$_x11libdir" ; then | 1308 if test -z "$_x11libdir" ; then |
1443 echocheck "DGA" | 1451 echocheck "DGA" |
1444 if test "$_x11" = yes && test "$_dga" != no ; then | 1452 if test "$_x11" = yes && test "$_dga" != no ; then |
1445 cat > $TMPC << EOF | 1453 cat > $TMPC << EOF |
1446 #include <X11/Xlib.h> | 1454 #include <X11/Xlib.h> |
1447 #include <X11/extensions/xf86dga.h> | 1455 #include <X11/extensions/xf86dga.h> |
1448 int main (void) { (void) XDGAQueryExtension(0, 0, 0); return 0; } | 1456 int main (void) { return 0; } |
1449 EOF | 1457 EOF |
1450 _dga=no | 1458 _dga=no |
1451 cc_check $_inc_x11 $_ld_x11 -lXxf86dga -lXxf86vm && _dga=yes | 1459 cc_check $_inc_x11 $_ld_x11 -lXxf86dga -lXxf86vm && _dga=yes |
1452 else | 1460 else |
1453 _dga=no | 1461 _dga=no |
1666 _ld_png='-lpng -lz' | 1674 _ld_png='-lpng -lz' |
1667 _vosrc="$_vosrc vo_png.c" | 1675 _vosrc="$_vosrc vo_png.c" |
1668 _vomodules="png $_vomodules" | 1676 _vomodules="png $_vomodules" |
1669 else | 1677 else |
1670 _def_png='#undef HAVE_PNG' | 1678 _def_png='#undef HAVE_PNG' |
1679 fi | |
1680 | |
1681 | |
1682 echocheck "VESA support" | |
1683 if x86 && linux ; then | |
1684 _vosrc="$_vosrc vo_vesa.c vesa_lvo.c" | |
1685 _vomodules="vesa $_vomodules" | |
1686 echores "ok" | |
1687 else | |
1688 echores "not supported on this OS/architecture" | |
1671 fi | 1689 fi |
1672 | 1690 |
1673 | 1691 |
1674 ################# | 1692 ################# |
1675 # VIDEO + AUDIO # | 1693 # VIDEO + AUDIO # |
1711 if test "$_sdl" = yes ; then | 1729 if test "$_sdl" = yes ; then |
1712 _def_sdl='#define HAVE_SDL 1' | 1730 _def_sdl='#define HAVE_SDL 1' |
1713 _ld_sdl=`$_sdlconfig --libs` | 1731 _ld_sdl=`$_sdlconfig --libs` |
1714 _inc_sdl=`$_sdlconfig --cflags` | 1732 _inc_sdl=`$_sdlconfig --cflags` |
1715 _vosrc="$_vosrc vo_sdl.c" | 1733 _vosrc="$_vosrc vo_sdl.c" |
1734 _vomodules="sdl $_vomodules" | |
1716 _aosrc="$_aosrc ao_sdl.c" | 1735 _aosrc="$_aosrc ao_sdl.c" |
1717 _aomodules="sdl $_aomodules" | 1736 _aomodules="sdl $_aomodules" |
1718 else | 1737 else |
1719 _def_sdl='#undef HAVE_SDL' | 1738 _def_sdl='#undef HAVE_SDL' |
1720 fi | 1739 fi |
2030 if test "$_win32" = yes ; then | 2049 if test "$_win32" = yes ; then |
2031 _def_win32='#define USE_WIN32DLL 1' | 2050 _def_win32='#define USE_WIN32DLL 1' |
2032 _ld_win32='-Lloader -lloader' | 2051 _ld_win32='-Lloader -lloader' |
2033 _dep_win32='loader/libloader.a' | 2052 _dep_win32='loader/libloader.a' |
2034 _codecmodules="win32 $_codecmodules" | 2053 _codecmodules="win32 $_codecmodules" |
2054 echores "$_win32 (found: $_win32libdir)" | |
2035 else | 2055 else |
2036 _def_win32='#undef USE_WIN32DLL' | 2056 _def_win32='#undef USE_WIN32DLL' |
2037 fi | 2057 echores "$_win32" |
2038 echores "$_win32" | 2058 fi |
2039 | 2059 |
2040 | 2060 |
2041 echocheck "DirectShow" | 2061 echocheck "DirectShow" |
2042 if test "$_win32" = yes && test "$_dshow" = auto ; then | 2062 if test "$_win32" = yes && test "$_dshow" = auto ; then |
2043 _dshow=no | 2063 _dshow=no |
2099 break; | 2119 break; |
2100 fi; | 2120 fi; |
2101 done | 2121 done |
2102 fi | 2122 fi |
2103 test "$_xanimlibdir" && _xanim=yes | 2123 test "$_xanimlibdir" && _xanim=yes |
2104 echores "yes" | 2124 echores "yes (found: $_xanimlibdir)" |
2105 else | 2125 else |
2106 echores "not supported on non x86" | 2126 echores "not supported on non x86" |
2107 fi | 2127 fi |
2108 else | 2128 else |
2109 echores "dl support needed" | 2129 echores "dl support needed" |
2858 | 2878 |
2859 Install prefix: $_prefix | 2879 Install prefix: $_prefix |
2860 Data directory: $_datadir | 2880 Data directory: $_datadir |
2861 Input: $_inputmodules | 2881 Input: $_inputmodules |
2862 Codecs: $_codecmodules | 2882 Codecs: $_codecmodules |
2863 Audio output drivers: null $_aomodules | 2883 Audio output drivers: null pcm $_aomodules |
2864 Video output drivers: null $_vomodules | 2884 Video output drivers: null pgm md5 mpegpes $_vomodules |
2865 | 2885 |
2866 'config.h' and 'config.mak' contain your configuration options. | 2886 'config.h' and 'config.mak' contain your configuration options. |
2867 Note: if you alter theses files (for instance CFLAGS) MPlayer may no longer | 2887 Note: if you alter theses files (for instance CFLAGS) MPlayer may no longer |
2868 compile *** DON'T BUGREPORT if you tweak these files *** | 2888 compile *** DON'T BUGREPORT if you tweak these files *** |
2869 | 2889 |
2903 ftp://ftp.MPlayerHQ.hu/MPlayer/releases/w32codec.zip | 2923 ftp://ftp.MPlayerHQ.hu/MPlayer/releases/w32codec.zip |
2904 EOF | 2924 EOF |
2905 fi | 2925 fi |
2906 else | 2926 else |
2907 if test "$_win32libdir" ; then | 2927 if test "$_win32libdir" ; then |
2908 echo "Ok, found Win32 codecs directory at $_win32libdir." | 2928 # echo "Ok, found Win32 codecs directory at $_win32libdir." |
2929 : | |
2909 else | 2930 else |
2910 cat <<EOF | 2931 cat <<EOF |
2911 Failed to find a WIN32 codecs dir! | 2932 Failed to find a WIN32 codecs dir! |
2912 Create it and copy the DLL files there! (You can get them from your windows | 2933 Create it and copy the DLL files there! (You can get them from your windows |
2913 directory or download them from: | 2934 directory or download them from: |
2921 You may encounter a few AVI files that cannot be played due to missing | 2942 You may encounter a few AVI files that cannot be played due to missing |
2922 opensource video/audio codec support. | 2943 opensource video/audio codec support. |
2923 EOF | 2944 EOF |
2924 fi | 2945 fi |
2925 | 2946 |
2947 | |
2926 cat <<EOF | 2948 cat <<EOF |
2927 | 2949 |
2928 If you cannot understand why a test failed please check $TMPLOG. | 2950 If you cannot understand why a test failed please check $TMPLOG. |
2929 If you believe it is a bug in configure, please report it. | 2951 If you believe it is a bug in configure, please report it. |
2930 | 2952 |