diff options
-rwxr-xr-x | configure | 46 | ||||
-rw-r--r-- | libvo/Makefile | 6 |
2 files changed, 34 insertions, 18 deletions
@@ -964,12 +964,20 @@ fi ###################### -echocheck "Extra headers" -echores "$_extraincdir" +echocheck "extra headers" +if test "$_extraincdir" ; then + echores "$_extraincdir" +else + echores "none" +fi -echocheck "Extra libs" -echores "$_extralibdir" +echocheck "extra libs" +if test "$_extralibdir" ; then + echores "$_extralibdir" +else + echores "none" +fi echocheck "kstat" @@ -1274,7 +1282,7 @@ if test -z "$_x11incdir" ; then for I in /usr/include /usr/X11R6/include /usr/X11/include /usr/openwin/include ; do if test -d "$I/X11" ; then _x11incdir="$I" - echores "found $I" + echores "yes (found: $I)" break fi done @@ -1292,7 +1300,7 @@ if test -z "$_x11libdir" ; then for I in /usr/X11R6/lib /usr/X11/lib /usr/lib32 /usr/openwin/lib ; do if test -d "$I" ; then _x11libdir="$I" - echores "found $I" + echores "yes (found: $I)" break; fi done @@ -1445,7 +1453,7 @@ if test "$_x11" = yes && test "$_dga" != no ; then cat > $TMPC << EOF #include <X11/Xlib.h> #include <X11/extensions/xf86dga.h> -int main (void) { (void) XDGAQueryExtension(0, 0, 0); return 0; } +int main (void) { return 0; } EOF _dga=no cc_check $_inc_x11 $_ld_x11 -lXxf86dga -lXxf86vm && _dga=yes @@ -1671,6 +1679,16 @@ else fi +echocheck "VESA support" +if x86 && linux ; then + _vosrc="$_vosrc vo_vesa.c vesa_lvo.c" + _vomodules="vesa $_vomodules" + echores "ok" +else + echores "not supported on this OS/architecture" +fi + + ################# # VIDEO + AUDIO # ################# @@ -1713,6 +1731,7 @@ if test "$_sdl" = yes ; then _ld_sdl=`$_sdlconfig --libs` _inc_sdl=`$_sdlconfig --cflags` _vosrc="$_vosrc vo_sdl.c" + _vomodules="sdl $_vomodules" _aosrc="$_aosrc ao_sdl.c" _aomodules="sdl $_aomodules" else @@ -2032,10 +2051,11 @@ if test "$_win32" = yes ; then _ld_win32='-Lloader -lloader' _dep_win32='loader/libloader.a' _codecmodules="win32 $_codecmodules" + echores "$_win32 (found: $_win32libdir)" else _def_win32='#undef USE_WIN32DLL' + echores "$_win32" fi -echores "$_win32" echocheck "DirectShow" @@ -2101,7 +2121,7 @@ if test "$_xanim" = auto ; then done fi test "$_xanimlibdir" && _xanim=yes - echores "yes" + echores "yes (found: $_xanimlibdir)" else echores "not supported on non x86" fi @@ -2860,8 +2880,8 @@ Config files successfully generated by ./configure ! Data directory: $_datadir Input: $_inputmodules Codecs: $_codecmodules - Audio output drivers: null $_aomodules - Video output drivers: null $_vomodules + Audio output drivers: null pcm $_aomodules + Video output drivers: null pgm md5 mpegpes $_vomodules 'config.h' and 'config.mak' contain your configuration options. Note: if you alter theses files (for instance CFLAGS) MPlayer may no longer @@ -2905,7 +2925,8 @@ EOF fi else if test "$_win32libdir" ; then - echo "Ok, found Win32 codecs directory at $_win32libdir." +# echo "Ok, found Win32 codecs directory at $_win32libdir." + : else cat <<EOF Failed to find a WIN32 codecs dir! @@ -2923,6 +2944,7 @@ opensource video/audio codec support. EOF fi + cat <<EOF If you cannot understand why a test failed please check $TMPLOG. diff --git a/libvo/Makefile b/libvo/Makefile index e582919622..6a59e36d33 100644 --- a/libvo/Makefile +++ b/libvo/Makefile @@ -6,12 +6,6 @@ LIBNAME = libvo.a SRCS=aspect.c aclib.c osd.c font_load.c video_out.c vo_null.c vo_pgm.c vo_md5.c vo_mpegpes.c x11_common.c $(OPTIONAL_SRCS) img_format.c OBJS=$(SRCS:.c=.o) -ifeq ($(TARGET_ARCH_X86),yes) -ifeq ($(TARGET_OS),Linux) -SRCS += vo_vesa.c vesa_lvo.c -endif -endif - CFLAGS = $(OPTFLAGS) -I. -I.. $(SDL_INC) $(X11_INC) $(EXTRA_INC) $(DVB_INC) -DMPG12PLAY #-Wall # -I/usr/X11R6/include/ |