comparison configure @ 32665:f0ce228d7323

cosmetics: Drop some unnecessary end-of-line backslashes after &&/||.
author diego
date Wed, 05 Jan 2011 13:34:12 +0000
parents d71575a9c562
children 16b259cea7ae
comparison
equal deleted inserted replaced
32664:6d08af681d54 32665:f0ce228d7323
3247 #include <sys/types.h> 3247 #include <sys/types.h>
3248 #include <sys/socket.h> 3248 #include <sys/socket.h>
3249 #endif 3249 #endif
3250 int main(void) { const void *p = &((struct sockaddr *)0)->sa_len; return 0; } 3250 int main(void) { const void *p = &((struct sockaddr *)0)->sa_len; return 0; }
3251 EOF 3251 EOF
3252 cc_check $cc_check_winsock2_h && _struct_sockaddr_sa_len=yes && \ 3252 cc_check $cc_check_winsock2_h && _struct_sockaddr_sa_len=yes &&
3253 def_struct_sockaddr_sa_len="#define HAVE_STRUCT_SOCKADDR_SA_LEN 1" 3253 def_struct_sockaddr_sa_len="#define HAVE_STRUCT_SOCKADDR_SA_LEN 1"
3254 echores "$_struct_sockaddr_sa_len" 3254 echores "$_struct_sockaddr_sa_len"
3255 3255
3256 3256
3257 echocheck "arpa/inet.h" 3257 echocheck "arpa/inet.h"
3624 return 0; 3624 return 0;
3625 } 3625 }
3626 EOF 3626 EOF
3627 _iconv=no 3627 _iconv=no
3628 for _ld_tmp in "" "-liconv" "-liconv $_ld_dl" ; do 3628 for _ld_tmp in "" "-liconv" "-liconv $_ld_dl" ; do
3629 cc_check $_ld_lm $_ld_tmp && extra_ldflags="$extra_ldflags $_ld_tmp" && \ 3629 cc_check $_ld_lm $_ld_tmp && extra_ldflags="$extra_ldflags $_ld_tmp" &&
3630 _iconv=yes && break 3630 _iconv=yes && break
3631 done 3631 done
3632 fi 3632 fi
3633 if test "$_iconv" = yes ; then 3633 if test "$_iconv" = yes ; then
3634 def_iconv='#define CONFIG_ICONV 1' 3634 def_iconv='#define CONFIG_ICONV 1'
4738 #include <linux/dvb/video.h> 4738 #include <linux/dvb/video.h>
4739 #include <linux/dvb/audio.h> 4739 #include <linux/dvb/audio.h>
4740 int main(void) {return 0;} 4740 int main(void) {return 0;}
4741 EOF 4741 EOF
4742 for _inc_tmp in "" "-I/usr/src/DVB/include" ; do 4742 for _inc_tmp in "" "-I/usr/src/DVB/include" ; do
4743 cc_check $_inc_tmp && _dvb=yes && \ 4743 cc_check $_inc_tmp && _dvb=yes &&
4744 extra_cflags="$extra_cflags $_inc_tmp" && break 4744 extra_cflags="$extra_cflags $_inc_tmp" && break
4745 done 4745 done
4746 fi 4746 fi
4747 echores "$_dvb" 4747 echores "$_dvb"
4748 if test "$_dvb" = yes ; then 4748 if test "$_dvb" = yes ; then
5924 // This need a better test. How ? 5924 // This need a better test. How ?
5925 int main(void) { void *test = cdda_verbose_set; return test == (void *)1; } 5925 int main(void) { void *test = cdda_verbose_set; return test == (void *)1; }
5926 EOF 5926 EOF
5927 _cdparanoia=no 5927 _cdparanoia=no
5928 for _inc_tmp in "" "-I/usr/include/cdda" "-I/usr/local/include/cdda" ; do 5928 for _inc_tmp in "" "-I/usr/include/cdda" "-I/usr/local/include/cdda" ; do
5929 cc_check $_inc_tmp -lcdda_interface -lcdda_paranoia $_ld_lm && \ 5929 cc_check $_inc_tmp -lcdda_interface -lcdda_paranoia $_ld_lm &&
5930 _cdparanoia=yes && extra_cflags="$extra_cflags $_inc_tmp" && break 5930 _cdparanoia=yes && extra_cflags="$extra_cflags $_inc_tmp" && break
5931 done 5931 done
5932 fi 5932 fi
5933 if test "$_cdparanoia" = yes ; then 5933 if test "$_cdparanoia" = yes ; then
5934 _cdda='yes' 5934 _cdda='yes'
6825 $_livelibdir/BasicUsageEnvironment/libBasicUsageEnvironment.a \ 6825 $_livelibdir/BasicUsageEnvironment/libBasicUsageEnvironment.a \
6826 $extra_ldflags -lstdc++" \ 6826 $extra_ldflags -lstdc++" \
6827 extra_cxxflags="-I$_livelibdir/liveMedia/include \ 6827 extra_cxxflags="-I$_livelibdir/liveMedia/include \
6828 -I$_livelibdir/UsageEnvironment/include \ 6828 -I$_livelibdir/UsageEnvironment/include \
6829 -I$_livelibdir/BasicUsageEnvironment/include \ 6829 -I$_livelibdir/BasicUsageEnvironment/include \
6830 -I$_livelibdir/groupsock/include" && \ 6830 -I$_livelibdir/groupsock/include" &&
6831 _live=yes && break 6831 _live=yes && break
6832 done 6832 done
6833 if test "$_live" != yes ; then 6833 if test "$_live" != yes ; then
6834 ld_tmp="-lliveMedia -lgroupsock -lUsageEnvironment -lBasicUsageEnvironment -lstdc++" 6834 ld_tmp="-lliveMedia -lgroupsock -lUsageEnvironment -lBasicUsageEnvironment -lstdc++"
6835 if cxx_check -I/usr/include/liveMedia -I/usr/include/UsageEnvironment -I/usr/include/groupsock $ld_tmp; then 6835 if cxx_check -I/usr/include/liveMedia -I/usr/include/UsageEnvironment -I/usr/include/groupsock $ld_tmp; then
6861 statement_check librtmp/rtmp.h 'RTMP_Socket(NULL)' -lrtmp && 6861 statement_check librtmp/rtmp.h 'RTMP_Socket(NULL)' -lrtmp &&
6862 _librtmp=yes && extra_ldflags="$extra_ldflags -lrtmp" 6862 _librtmp=yes && extra_ldflags="$extra_ldflags -lrtmp"
6863 if test "$_librtmp" != yes && $_pkg_config --exists librtmp ; then 6863 if test "$_librtmp" != yes && $_pkg_config --exists librtmp ; then
6864 _inc_tmp=$($_pkg_config --cflags librtmp) 6864 _inc_tmp=$($_pkg_config --cflags librtmp)
6865 _ld_tmp=$($_pkg_config --libs librtmp) 6865 _ld_tmp=$($_pkg_config --libs librtmp)
6866 cc_check $_inc_tmp $_ld_tmp && _librtmp=yes && \ 6866 cc_check $_inc_tmp $_ld_tmp && _librtmp=yes &&
6867 extra_ldflags="$extra_ldflags $_ld_tmp" && \ 6867 extra_ldflags="$extra_ldflags $_ld_tmp" &&
6868 extra_cflags="$extra_cflags $_inc_tmp" 6868 extra_cflags="$extra_cflags $_inc_tmp"
6869 fi 6869 fi
6870 fi 6870 fi
6871 if test "$_librtmp" = yes && test "$networking" = yes; then 6871 if test "$_librtmp" = yes && test "$networking" = yes; then
6872 nolibrtmp=no 6872 nolibrtmp=no
7485 def_radio_bsdbt848='#define CONFIG_RADIO_BSDBT848 1' 7485 def_radio_bsdbt848='#define CONFIG_RADIO_BSDBT848 1'
7486 else 7486 else
7487 def_radio_bsdbt848='#undef CONFIG_RADIO_BSDBT848' 7487 def_radio_bsdbt848='#undef CONFIG_RADIO_BSDBT848'
7488 fi 7488 fi
7489 7489
7490 if test "$_radio_v4l" = no && test "$_radio_v4l2" = no && \ 7490 if test "$_radio_v4l" = no && test "$_radio_v4l2" = no &&
7491 test "$_radio_bsdbt848" = no && test "$_radio" = yes ; then 7491 test "$_radio_bsdbt848" = no && test "$_radio" = yes ; then
7492 die "Radio driver requires BSD BT848, V4L or V4L2!" 7492 die "Radio driver requires BSD BT848, V4L or V4L2!"
7493 fi 7493 fi
7494 7494
7495 echocheck "Video 4 Linux 2 MPEG PVR interface" 7495 echocheck "Video 4 Linux 2 MPEG PVR interface"
7598 # Required libraries 7598 # Required libraries
7599 if test "$ffmpeg" != yes || 7599 if test "$ffmpeg" != yes ||
7600 ! echo $libavdecoders | grep -q PNG_DECODER ; then 7600 ! echo $libavdecoders | grep -q PNG_DECODER ; then
7601 die "The GUI requires libavcodec with PNG support (needs zlib)." 7601 die "The GUI requires libavcodec with PNG support (needs zlib)."
7602 fi 7602 fi
7603 test "$_freetype" = no && test "$_bitmap_font" = no && \ 7603 test "$_freetype" = no && test "$_bitmap_font" = no &&
7604 die "The GUI requires either FreeType or bitmap font support." 7604 die "The GUI requires either FreeType or bitmap font support."
7605 if ! win32 ; then 7605 if ! win32 ; then
7606 _gui_gtk=yes 7606 _gui_gtk=yes
7607 test "$_x11" != yes && die "X11 support required for GUI compilation." 7607 test "$_x11" != yes && die "X11 support required for GUI compilation."
7608 7608