comparison configure @ 31202:b0618e2021e9

cosmetics: Drop leading '_' from noinputmodules variable.
author diego
date Sat, 29 May 2010 10:43:51 +0000
parents 07faae7acdfa
children cf8a807cf4af
comparison
equal deleted inserted replaced
31201:203789464176 31202:b0618e2021e9
3329 if test "$_network" = yes ; then 3329 if test "$_network" = yes ; then
3330 def_network='#define CONFIG_NETWORK 1' 3330 def_network='#define CONFIG_NETWORK 1'
3331 extra_ldflags="$extra_ldflags $_ld_sock" 3331 extra_ldflags="$extra_ldflags $_ld_sock"
3332 inputmodules="network $inputmodules" 3332 inputmodules="network $inputmodules"
3333 else 3333 else
3334 _noinputmodules="network $_noinputmodules" 3334 noinputmodules="network $noinputmodules"
3335 def_network='#undef CONFIG_NETWORK' 3335 def_network='#undef CONFIG_NETWORK'
3336 _ftp=no 3336 _ftp=no
3337 _libavprotocols=$(echo $_libavprotocols | sed -e s/GOPHER_PROTOCOL// -e s/HTTP_PROTOCOL// -e s/RTMP_PROTOCOL// -e s/RTP_PROTOCOL// -e s/TCP_PROTOCOL// -e s/UDP_PROTOCOL//) 3337 _libavprotocols=$(echo $_libavprotocols | sed -e s/GOPHER_PROTOCOL// -e s/HTTP_PROTOCOL// -e s/RTMP_PROTOCOL// -e s/RTP_PROTOCOL// -e s/TCP_PROTOCOL// -e s/UDP_PROTOCOL//)
3338 _libavdemuxers=$(echo $_libavdemuxers | sed -e s/RTSP_DEMUXER// -e s/SDP_DEMUXER//) 3338 _libavdemuxers=$(echo $_libavdemuxers | sed -e s/RTSP_DEMUXER// -e s/SDP_DEMUXER//)
3339 fi 3339 fi
4191 if test "$_smb" = yes; then 4191 if test "$_smb" = yes; then
4192 def_smb="#define CONFIG_LIBSMBCLIENT 1" 4192 def_smb="#define CONFIG_LIBSMBCLIENT 1"
4193 inputmodules="smb $inputmodules" 4193 inputmodules="smb $inputmodules"
4194 else 4194 else
4195 def_smb="#undef CONFIG_LIBSMBCLIENT" 4195 def_smb="#undef CONFIG_LIBSMBCLIENT"
4196 _noinputmodules="smb $_noinputmodules" 4196 noinputmodules="smb $noinputmodules"
4197 fi 4197 fi
4198 echores "$_smb" 4198 echores "$_smb"
4199 4199
4200 4200
4201 ######### 4201 #########
4966 def_dvbin='#define CONFIG_DVBIN 1' 4966 def_dvbin='#define CONFIG_DVBIN 1'
4967 aomodules="mpegpes(dvb) $aomodules" 4967 aomodules="mpegpes(dvb) $aomodules"
4968 vomodules="mpegpes(dvb) $vomodules" 4968 vomodules="mpegpes(dvb) $vomodules"
4969 else 4969 else
4970 _dvbin=no 4970 _dvbin=no
4971 _noinputmodules="dvb $_noinputmodules" 4971 noinputmodules="dvb $noinputmodules"
4972 def_dvb='#undef CONFIG_DVB' 4972 def_dvb='#undef CONFIG_DVB'
4973 def_dvbin='#undef CONFIG_DVBIN ' 4973 def_dvbin='#undef CONFIG_DVBIN '
4974 aomodules="mpegpes(file) $aomodules" 4974 aomodules="mpegpes(file) $aomodules"
4975 vomodules="mpegpes(file) $vomodules" 4975 vomodules="mpegpes(file) $vomodules"
4976 fi 4976 fi
6135 if test "$_vcd" = yes; then 6135 if test "$_vcd" = yes; then
6136 inputmodules="vcd $inputmodules" 6136 inputmodules="vcd $inputmodules"
6137 def_vcd='#define CONFIG_VCD 1' 6137 def_vcd='#define CONFIG_VCD 1'
6138 else 6138 else
6139 def_vcd='#undef CONFIG_VCD' 6139 def_vcd='#undef CONFIG_VCD'
6140 _noinputmodules="vcd $_noinputmodules" 6140 noinputmodules="vcd $noinputmodules"
6141 res_comment="not supported on this OS" 6141 res_comment="not supported on this OS"
6142 fi 6142 fi
6143 echores "$_vcd" 6143 echores "$_vcd"
6144 6144
6145 6145
6190 extra_ldflags="$extra_ldflags -ldvdread" 6190 extra_ldflags="$extra_ldflags -ldvdread"
6191 inputmodules="dvdread(external) $inputmodules" 6191 inputmodules="dvdread(external) $inputmodules"
6192 res_comment="external" 6192 res_comment="external"
6193 else 6193 else
6194 def_dvdread='#undef CONFIG_DVDREAD' 6194 def_dvdread='#undef CONFIG_DVDREAD'
6195 _noinputmodules="dvdread $_noinputmodules" 6195 noinputmodules="dvdread $noinputmodules"
6196 fi 6196 fi
6197 echores "$_dvdread" 6197 echores "$_dvdread"
6198 6198
6199 6199
6200 echocheck "internal libdvdcss" 6200 echocheck "internal libdvdcss"
6222 cflags_libdvdcss_dvdread="-Ilibdvdcss" 6222 cflags_libdvdcss_dvdread="-Ilibdvdcss"
6223 def_dvdcss="#define HAVE_DVDCSS_DVDCSS_H 1" 6223 def_dvdcss="#define HAVE_DVDCSS_DVDCSS_H 1"
6224 inputmodules="libdvdcss(internal) $inputmodules" 6224 inputmodules="libdvdcss(internal) $inputmodules"
6225 _largefiles=yes 6225 _largefiles=yes
6226 else 6226 else
6227 _noinputmodules="libdvdcss(internal) $_noinputmodules" 6227 noinputmodules="libdvdcss(internal) $noinputmodules"
6228 fi 6228 fi
6229 echores "$_libdvdcss_internal" 6229 echores "$_libdvdcss_internal"
6230 6230
6231 6231
6232 echocheck "cdparanoia" 6232 echocheck "cdparanoia"
6294 test $_cddb = auto && test $_network = yes && _cddb=yes 6294 test $_cddb = auto && test $_network = yes && _cddb=yes
6295 def_cdparanoia='#define CONFIG_CDDA 1' 6295 def_cdparanoia='#define CONFIG_CDDA 1'
6296 inputmodules="cdda $inputmodules" 6296 inputmodules="cdda $inputmodules"
6297 else 6297 else
6298 def_cdparanoia='#undef CONFIG_CDDA' 6298 def_cdparanoia='#undef CONFIG_CDDA'
6299 _noinputmodules="cdda $_noinputmodules" 6299 noinputmodules="cdda $noinputmodules"
6300 fi 6300 fi
6301 6301
6302 if test "$_cddb" = yes ; then 6302 if test "$_cddb" = yes ; then
6303 def_cddb='#define CONFIG_CDDB 1' 6303 def_cddb='#define CONFIG_CDDB 1'
6304 inputmodules="cddb $inputmodules" 6304 inputmodules="cddb $inputmodules"
6305 else 6305 else
6306 _cddb=no 6306 _cddb=no
6307 def_cddb='#undef CONFIG_CDDB' 6307 def_cddb='#undef CONFIG_CDDB'
6308 _noinputmodules="cddb $_noinputmodules" 6308 noinputmodules="cddb $noinputmodules"
6309 fi 6309 fi
6310 6310
6311 echocheck "bitmap font support" 6311 echocheck "bitmap font support"
6312 if test "$_bitmap_font" = yes ; then 6312 if test "$_bitmap_font" = yes ; then
6313 def_bitmap_font="#define CONFIG_BITMAP_FONT 1" 6313 def_bitmap_font="#define CONFIG_BITMAP_FONT 1"
7137 inputmodules="nemesi $inputmodules" 7137 inputmodules="nemesi $inputmodules"
7138 else 7138 else
7139 _native_rtsp="$_network" 7139 _native_rtsp="$_network"
7140 _nemesi=no 7140 _nemesi=no
7141 def_nemesi='#undef CONFIG_LIBNEMESI' 7141 def_nemesi='#undef CONFIG_LIBNEMESI'
7142 _noinputmodules="nemesi $_noinputmodules" 7142 noinputmodules="nemesi $noinputmodules"
7143 fi 7143 fi
7144 echores "$_nemesi" 7144 echores "$_nemesi"
7145 7145
7146 echocheck "LIVE555 Streaming Media libraries" 7146 echocheck "LIVE555 Streaming Media libraries"
7147 if test "$_live" = auto && test "$_network" = yes ; then 7147 if test "$_live" = auto && test "$_network" = yes ; then
7188 -I/usr/include/BasicUsageEnvironment -I/usr/include/groupsock" 7188 -I/usr/include/BasicUsageEnvironment -I/usr/include/groupsock"
7189 inputmodules="live555 $inputmodules" 7189 inputmodules="live555 $inputmodules"
7190 else 7190 else
7191 _live=no 7191 _live=no
7192 def_live='#undef CONFIG_LIVE555' 7192 def_live='#undef CONFIG_LIVE555'
7193 _noinputmodules="live555 $_noinputmodules" 7193 noinputmodules="live555 $noinputmodules"
7194 fi 7194 fi
7195 echores "$_live" 7195 echores "$_live"
7196 7196
7197 7197
7198 echocheck "FFmpeg libavutil" 7198 echocheck "FFmpeg libavutil"
7748 echocheck "TV interface" 7748 echocheck "TV interface"
7749 if test "$_tv" = yes ; then 7749 if test "$_tv" = yes ; then
7750 def_tv='#define CONFIG_TV 1' 7750 def_tv='#define CONFIG_TV 1'
7751 inputmodules="tv $inputmodules" 7751 inputmodules="tv $inputmodules"
7752 else 7752 else
7753 _noinputmodules="tv $_noinputmodules" 7753 noinputmodules="tv $noinputmodules"
7754 def_tv='#undef CONFIG_TV' 7754 def_tv='#undef CONFIG_TV'
7755 fi 7755 fi
7756 echores "$_tv" 7756 echores "$_tv"
7757 7757
7758 7758
7833 if test "$_tv_bsdbt848" = yes ; then 7833 if test "$_tv_bsdbt848" = yes ; then
7834 def_tv_bsdbt848='#define CONFIG_TV_BSDBT848 1' 7834 def_tv_bsdbt848='#define CONFIG_TV_BSDBT848 1'
7835 inputmodules="tv-bsdbt848 $inputmodules" 7835 inputmodules="tv-bsdbt848 $inputmodules"
7836 else 7836 else
7837 def_tv_bsdbt848='#undef CONFIG_TV_BSDBT848' 7837 def_tv_bsdbt848='#undef CONFIG_TV_BSDBT848'
7838 _noinputmodules="tv-bsdbt848 $_noinputmodules" 7838 noinputmodules="tv-bsdbt848 $noinputmodules"
7839 fi 7839 fi
7840 echores "$_tv_bsdbt848" 7840 echores "$_tv_bsdbt848"
7841 fi #if freebsd || netbsd || openbsd || dragonfly || bsdos 7841 fi #if freebsd || netbsd || openbsd || dragonfly || bsdos
7842 7842
7843 7843
7859 if test "$_tv_dshow" = yes ; then 7859 if test "$_tv_dshow" = yes ; then
7860 inputmodules="tv-dshow $inputmodules" 7860 inputmodules="tv-dshow $inputmodules"
7861 def_tv_dshow='#define CONFIG_TV_DSHOW 1' 7861 def_tv_dshow='#define CONFIG_TV_DSHOW 1'
7862 extra_ldflags="$extra_ldflags -lole32 -luuid" 7862 extra_ldflags="$extra_ldflags -lole32 -luuid"
7863 else 7863 else
7864 _noinputmodules="tv-dshow $_noinputmodules" 7864 noinputmodules="tv-dshow $noinputmodules"
7865 def_tv_dshow='#undef CONFIG_TV_DSHOW' 7865 def_tv_dshow='#undef CONFIG_TV_DSHOW'
7866 fi 7866 fi
7867 echores "$_tv_dshow" 7867 echores "$_tv_dshow"
7868 7868
7869 7869
7884 _tv_v4l=yes 7884 _tv_v4l=yes
7885 def_tv_v4l='#define CONFIG_TV_V4L 1' 7885 def_tv_v4l='#define CONFIG_TV_V4L 1'
7886 def_tv_v4l1='#define CONFIG_TV_V4L1 1' 7886 def_tv_v4l1='#define CONFIG_TV_V4L1 1'
7887 inputmodules="tv-v4l $inputmodules" 7887 inputmodules="tv-v4l $inputmodules"
7888 else 7888 else
7889 _noinputmodules="tv-v4l1 $_noinputmodules" 7889 noinputmodules="tv-v4l1 $noinputmodules"
7890 def_tv_v4l='#undef CONFIG_TV_V4L' 7890 def_tv_v4l='#undef CONFIG_TV_V4L'
7891 fi 7891 fi
7892 echores "$_tv_v4l1" 7892 echores "$_tv_v4l1"
7893 7893
7894 7894
7910 _tv_v4l=yes 7910 _tv_v4l=yes
7911 def_tv_v4l='#define CONFIG_TV_V4L 1' 7911 def_tv_v4l='#define CONFIG_TV_V4L 1'
7912 def_tv_v4l2='#define CONFIG_TV_V4L2 1' 7912 def_tv_v4l2='#define CONFIG_TV_V4L2 1'
7913 inputmodules="tv-v4l2 $inputmodules" 7913 inputmodules="tv-v4l2 $inputmodules"
7914 else 7914 else
7915 _noinputmodules="tv-v4l2 $_noinputmodules" 7915 noinputmodules="tv-v4l2 $noinputmodules"
7916 def_tv_v4l2='#undef CONFIG_TV_V4L2' 7916 def_tv_v4l2='#undef CONFIG_TV_V4L2'
7917 fi 7917 fi
7918 echores "$_tv_v4l2" 7918 echores "$_tv_v4l2"
7919 7919
7920 7920
7930 def_radio_capture="#define CONFIG_RADIO_CAPTURE 1" 7930 def_radio_capture="#define CONFIG_RADIO_CAPTURE 1"
7931 else 7931 else
7932 def_radio_capture="#undef CONFIG_RADIO_CAPTURE" 7932 def_radio_capture="#undef CONFIG_RADIO_CAPTURE"
7933 fi 7933 fi
7934 else 7934 else
7935 _noinputmodules="radio $_noinputmodules" 7935 noinputmodules="radio $noinputmodules"
7936 def_radio='#undef CONFIG_RADIO' 7936 def_radio='#undef CONFIG_RADIO'
7937 def_radio_capture="#undef CONFIG_RADIO_CAPTURE" 7937 def_radio_capture="#undef CONFIG_RADIO_CAPTURE"
7938 _radio_capture=no 7938 _radio_capture=no
7939 fi 7939 fi
7940 echores "$_radio" 7940 echores "$_radio"
8023 fi 8023 fi
8024 if test "$_pvr" = yes ; then 8024 if test "$_pvr" = yes ; then
8025 def_pvr='#define CONFIG_PVR 1' 8025 def_pvr='#define CONFIG_PVR 1'
8026 inputmodules="pvr $inputmodules" 8026 inputmodules="pvr $inputmodules"
8027 else 8027 else
8028 _noinputmodules="pvr $_noinputmodules" 8028 noinputmodules="pvr $noinputmodules"
8029 def_pvr='#undef CONFIG_PVR' 8029 def_pvr='#undef CONFIG_PVR'
8030 fi 8030 fi
8031 echores "$_pvr" 8031 echores "$_pvr"
8032 8032
8033 8033
8034 echocheck "ftp" 8034 echocheck "ftp"
8035 if ! beos && test "$_ftp" = yes ; then 8035 if ! beos && test "$_ftp" = yes ; then
8036 def_ftp='#define CONFIG_FTP 1' 8036 def_ftp='#define CONFIG_FTP 1'
8037 inputmodules="ftp $inputmodules" 8037 inputmodules="ftp $inputmodules"
8038 else 8038 else
8039 _noinputmodules="ftp $_noinputmodules" 8039 noinputmodules="ftp $noinputmodules"
8040 def_ftp='#undef CONFIG_FTP' 8040 def_ftp='#undef CONFIG_FTP'
8041 fi 8041 fi
8042 echores "$_ftp" 8042 echores "$_ftp"
8043 8043
8044 echocheck "vstream client" 8044 echocheck "vstream client"
8054 if test "$_vstream" = yes ; then 8054 if test "$_vstream" = yes ; then
8055 def_vstream='#define CONFIG_VSTREAM 1' 8055 def_vstream='#define CONFIG_VSTREAM 1'
8056 inputmodules="vstream $inputmodules" 8056 inputmodules="vstream $inputmodules"
8057 extra_ldflags="$extra_ldflags -lvstream-client" 8057 extra_ldflags="$extra_ldflags -lvstream-client"
8058 else 8058 else
8059 _noinputmodules="vstream $_noinputmodules" 8059 noinputmodules="vstream $noinputmodules"
8060 def_vstream='#undef CONFIG_VSTREAM' 8060 def_vstream='#undef CONFIG_VSTREAM'
8061 fi 8061 fi
8062 echores "$_vstream" 8062 echores "$_vstream"
8063 8063
8064 8064
8442 extra_ldflags="$extra_ldflags $($_dvdnavconfig --minilibs)" 8442 extra_ldflags="$extra_ldflags $($_dvdnavconfig --minilibs)"
8443 inputmodules="dvdnav $inputmodules" 8443 inputmodules="dvdnav $inputmodules"
8444 fi 8444 fi
8445 else 8445 else
8446 def_dvdnav='#undef CONFIG_DVDNAV' 8446 def_dvdnav='#undef CONFIG_DVDNAV'
8447 _noinputmodules="dvdnav $_noinputmodules" 8447 noinputmodules="dvdnav $noinputmodules"
8448 fi 8448 fi
8449 echores "$_dvdnav" 8449 echores "$_dvdnav"
8450 8450
8451 # DO NOT ADD ANY TESTS THAT USE LINKER FLAGS HERE (like cc_check). 8451 # DO NOT ADD ANY TESTS THAT USE LINKER FLAGS HERE (like cc_check).
8452 # Read dvdnav comment above. 8452 # Read dvdnav comment above.
9340 Codecs: $codecmodules 9340 Codecs: $codecmodules
9341 Audio output: $aomodules 9341 Audio output: $aomodules
9342 Video output: $vomodules 9342 Video output: $vomodules
9343 9343
9344 Disabled optional drivers: 9344 Disabled optional drivers:
9345 Input: $_noinputmodules 9345 Input: $noinputmodules
9346 Codecs: $nocodecmodules 9346 Codecs: $nocodecmodules
9347 Audio output: $noaomodules 9347 Audio output: $noaomodules
9348 Video output: $novomodules 9348 Video output: $novomodules
9349 9349
9350 'config.h' and 'config.mak' contain your configuration options. 9350 'config.h' and 'config.mak' contain your configuration options.