Mercurial > mplayer.hg

comparison configure @ 18037:3c8aa5261e80

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Simplify some checks.
author diego
date Tue, 04 Apr 2006 05:09:12 +0000
parents 976fff94d59c
children 7b408d60de9e
comparison
equal deleted inserted replaced
18036:3406a28698cf 18037:3c8aa5261e80
2651 #include <inttypes.h> 2651 #include <inttypes.h>
2652 int main(void) { return 0; } 2652 int main(void) { return 0; }
2653 EOF 2653 EOF
2654 _inttypes=no 2654 _inttypes=no
2655 cc_check && _inttypes=yes 2655 cc_check && _inttypes=yes
2656 if test "$_inttypes" = yes ; then 2656 echores "$_inttypes"
2657 # nothing to do 2657
2658 : 2658 if test "$_inttypes" = no ; then
2659 else
2660 echores "no"
2661 echocheck "bitypes.h (inttypes.h predecessor)" 2659 echocheck "bitypes.h (inttypes.h predecessor)"
2662 cat > $TMPC << EOF 2660 cat > $TMPC << EOF
2663 #include <sys/bitypes.h> 2661 #include <sys/bitypes.h>
2664 int main(void) { return 0; } 2662 int main(void) { return 0; }
2665 EOF 2663 EOF
2666 _inttypes=no
2667 cc_check && _inttypes=yes 2664 cc_check && _inttypes=yes
2668 if test "$_inttypes" = yes ; then 2665 if test "$_inttypes" = yes ; then
2669 die "You don't have inttypes.h, but sys/bitypes.h is present. Please copy etc/inttypes.h into the include path, and re-run configure." 2666 die "You don't have inttypes.h, but sys/bitypes.h is present. Please copy etc/inttypes.h into the include path, and re-run configure."
2670 else 2667 else
2671 die "Cannot find header either inttypes.h or bitypes.h (see DOCS/HTML/$_doc_lang/faq.html)." 2668 die "Cannot find header either inttypes.h or bitypes.h (see DOCS/HTML/$_doc_lang/faq.html)."
2672 fi 2669 fi
2673 fi 2670 fi
2674 echores "$_inttypes"
2675 2671
2676 2672
2677 echocheck "int_fastXY_t in inttypes.h" 2673 echocheck "int_fastXY_t in inttypes.h"
2678 cat > $TMPC << EOF 2674 cat > $TMPC << EOF
2679 #include <inttypes.h> 2675 #include <inttypes.h>
3837 if test "$_dga" = 1 ; then 3833 if test "$_dga" = 1 ; then
3838 _def_dga='#define HAVE_DGA 1' 3834 _def_dga='#define HAVE_DGA 1'
3839 _ld_dga='-lXxf86dga' 3835 _ld_dga='-lXxf86dga'
3840 _vosrc="$_vosrc vo_dga.c" 3836 _vosrc="$_vosrc vo_dga.c"
3841 _vomodules="dga $_vomodules" 3837 _vomodules="dga $_vomodules"
3842 echores "yes (using DGA 1.0)" 3838 _res_comment="(using DGA 1.0)"
3843 elif test "$_dga" = 2 ; then 3839 elif test "$_dga" = 2 ; then
3844 _def_dga='#define HAVE_DGA 1' 3840 _def_dga='#define HAVE_DGA 1'
3845 _def_dga2='#define HAVE_DGA2 1' 3841 _def_dga2='#define HAVE_DGA2 1'
3846 _ld_dga='-lXxf86dga' 3842 _ld_dga='-lXxf86dga'
3847 _vosrc="$_vosrc vo_dga.c" 3843 _vosrc="$_vosrc vo_dga.c"
3848 _vomodules="dga $_vomodules" 3844 _vomodules="dga $_vomodules"
3849 echores "yes (using DGA 2.0)" 3845 _res_comment="(using DGA 2.0)"
3850 elif test "$_dga" = no ; then 3846 elif test "$_dga" = no ; then
3851 echores "no"
3852 _novomodules="dga $_novomodules" 3847 _novomodules="dga $_novomodules"
3853 else 3848 else
3854 die "DGA version must be 1 or 2" 3849 die "DGA version must be 1 or 2"
3855 fi 3850 fi
3851 echores "$_dga"
3856 3852
3857 3853
3858 echocheck "OpenGL" 3854 echocheck "OpenGL"
3859 #Note: this test is run even with --enable-gl since we autodetect $_ld_gl 3855 #Note: this test is run even with --enable-gl since we autodetect $_ld_gl
3860 if (test "$_x11" = yes || win32) && test "$_gl" != no ; then 3856 if (test "$_x11" = yes || win32) && test "$_gl" != no ; then
5003 else 4999 else
5004 _noinputmodules="mpdvdkit2 $_noinputmodules" 5000 _noinputmodules="mpdvdkit2 $_noinputmodules"
5005 fi 5001 fi
5006 if test "$_dvdkit2" = yes; then 5002 if test "$_dvdkit2" = yes; then
5007 _have_dvd=yes 5003 _have_dvd=yes
5008 echores "yes"
5009 else
5010 echores "no"
5011 fi 5004 fi
5005 echores "$_dvdkit"
5012 5006
5013 echocheck "DVD support (libdvdread)" 5007 echocheck "DVD support (libdvdread)"
5014 if test "$_dvdread" = auto ; then 5008 if test "$_dvdread" = auto ; then
5015 cat > $TMPC << EOF 5009 cat > $TMPC << EOF
5016 #include <inttypes.h> 5010 #include <inttypes.h>
5033 _largefiles=yes 5027 _largefiles=yes
5034 _def_dvdread='#define USE_DVDREAD 1' 5028 _def_dvdread='#define USE_DVDREAD 1'
5035 _ld_dvdread='-ldvdread' 5029 _ld_dvdread='-ldvdread'
5036 _inputmodules="dvdread $_inputmodules" 5030 _inputmodules="dvdread $_inputmodules"
5037 _have_dvd=yes 5031 _have_dvd=yes
5038 echores "yes"
5039 ;; 5032 ;;
5040 no) 5033 no)
5041 _def_dvdread='#undef USE_DVDREAD' 5034 _def_dvdread='#undef USE_DVDREAD'
5042 _noinputmodules="dvdread $_noinputmodules" 5035 _noinputmodules="dvdread $_noinputmodules"
5043 echores "no"
5044 ;; 5036 ;;
5045 libmpdvdkit2) 5037 libmpdvdkit2)
5046 _largefiles=yes 5038 _largefiles=yes
5047 _def_dvdread='#define USE_DVDREAD 1' 5039 _def_dvdread='#define USE_DVDREAD 1'
5048 _ld_dvdread='-Llibmpdvdkit2 -lmpdvdkit' 5040 _ld_dvdread='-Llibmpdvdkit2 -lmpdvdkit'
5049 _noinputmodules="dvdread $_noinputmodules" 5041 _noinputmodules="dvdread $_noinputmodules"
5050 _def_mpdvdkit="#define USE_MPDVDKIT 2" 5042 _def_mpdvdkit="#define USE_MPDVDKIT 2"
5051 _have_dvd=yes 5043 _have_dvd=yes
5052 echores "disabled by libmpdvdkit2" 5044 _dvdread=no
5045 _res_comment="disabled by libmpdvdkit2"
5053 ;; 5046 ;;
5054 esac 5047 esac
5048 echores "$_dvdread"
5055 5049
5056 if test "$_have_dvd" = yes ; then 5050 if test "$_have_dvd" = yes ; then
5057 _def_have_dvd='#define HAVE_DVD 1' 5051 _def_have_dvd='#define HAVE_DVD 1'
5058 else 5052 else
5059 _def_have_dvd='#undef HAVE_DVD' 5053 _def_have_dvd='#undef HAVE_DVD'
5094 # fi 5088 # fi
5095 # if test -n "$_dvdnavdir" ; then 5089 # if test -n "$_dvdnavdir" ; then
5096 # _inc_extra="$_inc_extra -I$_dvdnavdir" 5090 # _inc_extra="$_inc_extra -I$_dvdnavdir"
5097 # fi 5091 # fi
5098 # _inputmodules="dvdnav $_inputmodules" 5092 # _inputmodules="dvdnav $_inputmodules"
5099 # echores "yes"
5100 # else 5093 # else
5101 # _def_dvdnav='#undef USE_DVDNAV' 5094 # _def_dvdnav='#undef USE_DVDNAV'
5102 # _noinputmodules="dvdnav $_noinputmodules" 5095 # _noinputmodules="dvdnav $_noinputmodules"
5103 # echores "no"
5104 # fi 5096 # fi
5097 # echores "$_dvdnav"
5105 5098
5106 echocheck "cdparanoia" 5099 echocheck "cdparanoia"
5107 if test "$_cdparanoia" = auto ; then 5100 if test "$_cdparanoia" = auto ; then
5108 cat > $TMPC <<EOF 5101 cat > $TMPC <<EOF
5109 #include <cdda_interface.h> 5102 #include <cdda_interface.h>
5951 _live_dist=yes 5944 _live_dist=yes
5952 fi 5945 fi
5953 fi 5946 fi
5954 fi 5947 fi
5955 if test "$_live" = yes && test "$_network" = yes ; then 5948 if test "$_live" = yes && test "$_network" = yes ; then
5956 echores "yes (using $_livelibdir)" 5949 _res_comment="(using $_livelibdir)"
5957 _def_live='#define STREAMING_LIVE555 1' 5950 _def_live='#define STREAMING_LIVE555 1'
5958 _live_libs_def="# LIVE555 Streaming Media libraries: 5951 _live_libs_def="# LIVE555 Streaming Media libraries:
5959 LIVE_LIB_DIR = $_livelibdir 5952 LIVE_LIB_DIR = $_livelibdir
5960 LIVE_LIBS = \$(LIVE_LIB_DIR)/liveMedia/libliveMedia.a 5953 LIVE_LIBS = \$(LIVE_LIB_DIR)/liveMedia/libliveMedia.a
5961 LIVE_LIBS += \$(LIVE_LIB_DIR)/groupsock/libgroupsock.a 5954 LIVE_LIBS += \$(LIVE_LIB_DIR)/groupsock/libgroupsock.a
5967 LIVE_INCLUDES += -I\$(LIVE_LIB_DIR)/BasicUsageEnvironment/include 5960 LIVE_INCLUDES += -I\$(LIVE_LIB_DIR)/BasicUsageEnvironment/include
5968 LIVE_INCLUDES += -I\$(LIVE_LIB_DIR)/groupsock/include" 5961 LIVE_INCLUDES += -I\$(LIVE_LIB_DIR)/groupsock/include"
5969 _ld_live='$(LIVE_LIBS)' 5962 _ld_live='$(LIVE_LIBS)'
5970 _inputmodules="live555 $_inputmodules" 5963 _inputmodules="live555 $_inputmodules"
5971 elif test "$_live_dist" = yes && test "$_network" = yes ; then 5964 elif test "$_live_dist" = yes && test "$_network" = yes ; then
5972 echores "yes (using distribution version)" 5965 _res_comment="(using distribution version)"
5973 _live="yes" 5966 _live="yes"
5974 _def_live='#define STREAMING_LIVE555 1' 5967 _def_live='#define STREAMING_LIVE555 1'
5975 _live_libs_def="# LIVE555 Streaming Media libraries: 5968 _live_libs_def="# LIVE555 Streaming Media libraries:
5976 LIVE_LIB_DIR = $_livelibdir 5969 LIVE_LIB_DIR = $_livelibdir
5977 LIVE_LIBS = -lliveMedia 5970 LIVE_LIBS = -lliveMedia
5984 LIVE_INCLUDES += -I/usr/include/BasicUsageEnvironment 5977 LIVE_INCLUDES += -I/usr/include/BasicUsageEnvironment
5985 LIVE_INCLUDES += -I/usr/include/groupsock" 5978 LIVE_INCLUDES += -I/usr/include/groupsock"
5986 _ld_live='$(LIVE_LIBS)' 5979 _ld_live='$(LIVE_LIBS)'
5987 _inputmodules="live555 $_inputmodules" 5980 _inputmodules="live555 $_inputmodules"
5988 else 5981 else
5989 echores "no"
5990 _def_live='#undef STREAMING_LIVE555' 5982 _def_live='#undef STREAMING_LIVE555'
5991 _noinputmodules="live555 $_noinputmodules" 5983 _noinputmodules="live555 $_noinputmodules"
5992 fi 5984 fi
5985 echores "$_live"
5986
5993 5987
5994 echocheck "FFmpeg libavutil (static)" 5988 echocheck "FFmpeg libavutil (static)"
5995 if test -d libavutil ; then 5989 if test -d libavutil ; then
5996 _libavutil=yes 5990 _libavutil=yes
5997 else 5991 else