comparison configure @ 19328:f3a2785cd7f0

Unify include path handling in the build system, part III: Get rid of the last --with-*incdir parameters.
author diego
date Fri, 04 Aug 2006 23:57:04 +0000
parents e29f5544e2a0
children 9fc33f89c15f
comparison
equal deleted inserted replaced
19327:e29f5544e2a0 19328:f3a2785cd7f0
402 402
403 Use these options if autodetection fails (Options marked with (*) accept 403 Use these options if autodetection fails (Options marked with (*) accept
404 multiple paths separated by ':'): 404 multiple paths separated by ':'):
405 --with-extraincdir=DIR extra headers (png, mad, sdl, ...) in DIR (*) 405 --with-extraincdir=DIR extra headers (png, mad, sdl, ...) in DIR (*)
406 --with-extralibdir=DIR extra library files (png, mad, sdl, ...) in DIR (*) 406 --with-extralibdir=DIR extra library files (png, mad, sdl, ...) in DIR (*)
407 --with-x11incdir=DIR X headers in DIR (*)
408 --with-x11libdir=DIR X library files in DIR (*) 407 --with-x11libdir=DIR X library files in DIR (*)
409 --with-dxr2incdir=DIR DXR2 headers in DIR (*)
410 --with-dvbincdir=DIR DVB headers in DIR (*)
411 --with-madlibdir=DIR libmad (libmad shared library) in DIR (*) 408 --with-madlibdir=DIR libmad (libmad shared library) in DIR (*)
412 --with-mlibdir=DIR libmlib (mediaLib support) in DIR (Solaris only) 409 --with-mlibdir=DIR libmlib (mediaLib support) in DIR (Solaris only)
413 --with-codecsdir=DIR Binary codec files in DIR 410 --with-codecsdir=DIR Binary codec files in DIR
414 --with-win32libdir=DIR W*ndows DLL files in DIR 411 --with-win32libdir=DIR W*ndows DLL files in DIR
415 --with-xanimlibdir=DIR XAnim DLL files in DIR 412 --with-xanimlibdir=DIR XAnim DLL files in DIR
419 --with-libdtslibdir=DIR libdts library in DIR (*) 416 --with-libdtslibdir=DIR libdts library in DIR (*)
420 --with-livelibdir=DIR LIVE555 Streaming Media libraries in DIR 417 --with-livelibdir=DIR LIVE555 Streaming Media libraries in DIR
421 --with-toolamedir=DIR path to Toolame library and include file 418 --with-toolamedir=DIR path to Toolame library and include file
422 --with-xmmsplugindir=DIR XMMS plugins in DIR 419 --with-xmmsplugindir=DIR XMMS plugins in DIR
423 --with-xmmslibdir=DIR libxmms.so.1 in DIR 420 --with-xmmslibdir=DIR libxmms.so.1 in DIR
424 --with-cdparanoiaincdir=DIR cdparanoia headers in DIR (*)
425 --with-cdparanoialibdir=DIR cdparanoia libraries (libcdda_*) in DIR (*) 421 --with-cdparanoialibdir=DIR cdparanoia libraries (libcdda_*) in DIR (*)
426 --with-xvmclib=NAME name of adapter-specific library (e.g. XvMCNVIDIA) 422 --with-xvmclib=NAME name of adapter-specific library (e.g. XvMCNVIDIA)
427 --with-termcaplib=NAME name of library with termcap functionality 423 --with-termcaplib=NAME name of library with termcap functionality
428 name should be given without leading "lib" 424 name should be given without leading "lib"
429 checks for "termcap" and "tinfo" 425 checks for "termcap" and "tinfo"
2102 _3dnow=no _3dnowext=no _mmx=no _mmxext=no ;; 2098 _3dnow=no _3dnowext=no _mmx=no _mmxext=no ;;
2103 2099
2104 --enable-win32) _win32=yes ;; 2100 --enable-win32) _win32=yes ;;
2105 --disable-win32) _win32=no ;; 2101 --disable-win32) _win32=no ;;
2106 2102
2107 --with-x11incdir=*)
2108 _inc_x11=-I`echo $ac_option | cut -d '=' -f 2 | sed 's,:, -I,g'`
2109 ;;
2110 --with-x11libdir=*) 2103 --with-x11libdir=*)
2111 _x11libdir=`echo $ac_option | cut -d '=' -f 2` 2104 _x11libdir=`echo $ac_option | cut -d '=' -f 2`
2112 ;; 2105 ;;
2113 --with-dxr2incdir=*)
2114 _inc_dxr2=-I`echo $ac_option | cut -d '=' -f 2 | sed 's,:, -I,g'`
2115 ;;
2116 --with-xvmclib=*) 2106 --with-xvmclib=*)
2117 _xvmclib=`echo $ac_option | cut -d '=' -f 2` 2107 _xvmclib=`echo $ac_option | cut -d '=' -f 2`
2118 ;; 2108 ;;
2119 --with-dvbincdir=*)
2120 _inc_dvb=-I`echo $ac_option | cut -d '=' -f 2 | sed 's,:, -I,g'`
2121 ;;
2122 --with-xvidlibdir=*) 2109 --with-xvidlibdir=*)
2123 _ld_xvid=-L`echo $ac_option | cut -d '=' -f 2 | sed 's,:, -L,g'` 2110 _ld_xvid=-L`echo $ac_option | cut -d '=' -f 2 | sed 's,:, -L,g'`
2124 ;; 2111 ;;
2125 --with-libdtslibdir=*) 2112 --with-libdtslibdir=*)
2126 _ld_libdts=-L`echo $ac_option | cut -d '=' -f 2 | sed 's,:, -L,g'` 2113 _ld_libdts=-L`echo $ac_option | cut -d '=' -f 2 | sed 's,:, -L,g'`
2146 --with-dvdnav-config=*) 2133 --with-dvdnav-config=*)
2147 _dvdnavconfig=`echo $ac_option | cut -d '=' -f 2` 2134 _dvdnavconfig=`echo $ac_option | cut -d '=' -f 2`
2148 ;; 2135 ;;
2149 --with-madlibdir=*) 2136 --with-madlibdir=*)
2150 _ld_mad=-L`echo $ac_option | cut -d '=' -f 2 | sed 's,:, -L,g'` 2137 _ld_mad=-L`echo $ac_option | cut -d '=' -f 2 | sed 's,:, -L,g'`
2151 ;;
2152 --with-cdparanoiaincdir=*)
2153 _inc_cdparanoia=-I`echo $ac_option | cut -d '=' -f 2 | sed 's,:, -I,g'`
2154 ;; 2138 ;;
2155 --with-cdparanoialibdir=*) 2139 --with-cdparanoialibdir=*)
2156 _ld_cdparanoia=-L`echo $ac_option | cut -d '=' -f 2 | sed 's,:, -L,g'` 2140 _ld_cdparanoia=-L`echo $ac_option | cut -d '=' -f 2 | sed 's,:, -L,g'`
2157 ;; 2141 ;;
2158 --with-termcaplib=*) 2142 --with-termcaplib=*)
3658 if linux && test -c /dev/fb0; then 3642 if linux && test -c /dev/fb0; then
3659 cat > $TMPC <<EOF 3643 cat > $TMPC <<EOF
3660 #include <directfb.h> 3644 #include <directfb.h>
3661 int main(void) { IDirectFB *foo; DirectFBInit(0,0); return 0; } 3645 int main(void) { IDirectFB *foo; DirectFBInit(0,0); return 0; }
3662 EOF 3646 EOF
3663 for _inc_directfb in $_inc_extra -I/usr/local/include/directfb \ 3647 for _inc_directfb in "" -I/usr/local/include/directfb \
3664 -I/usr/include/directfb -I/usr/local/include -I/usr/include; do 3648 -I/usr/include/directfb -I/usr/local/include -I/usr/include; do
3665 cc_check $_inc_directfb -ldirectfb && _directfb=yes && break 3649 cc_check $_inc_directfb -ldirectfb && _directfb=yes && break
3666 done 3650 done
3651 _inc_extra="$_inc_extra $_inc_directfb"
3667 fi 3652 fi
3668 fi 3653 fi
3669 3654
3670 if test "$_directfb" = yes; then 3655 if test "$_directfb" = yes; then
3671 cat > $TMPC << EOF 3656 cat > $TMPC << EOF
3672 #include <directfb_version.h> 3657 #include <directfb_version.h>
3673 int 3658 int
3674 dfb_ver = DIRECTFB_MAJOR_VERSION DIRECTFB_MINOR_VERSION DIRECTFB_MICRO_VERSION 3659 dfb_ver = DIRECTFB_MAJOR_VERSION DIRECTFB_MINOR_VERSION DIRECTFB_MICRO_VERSION
3675 ; 3660 ;
3676 EOF 3661 EOF
3677 if $_cc -E $TMPC $_inc_directfb > "$TMPO"; then 3662 if $_cc -E $TMPC $_inc_extra > "$TMPO"; then
3678 _directfb_version=`sed -n 's/^dfb_ver[^1-9]*\(.*\)/\1/p' "$TMPO" | tr -d '() '` 3663 _directfb_version=`sed -n 's/^dfb_ver[^1-9]*\(.*\)/\1/p' "$TMPO" | tr -d '() '`
3679 _def_directfb_version="#define DIRECTFBVERSION $_directfb_version" 3664 _def_directfb_version="#define DIRECTFBVERSION $_directfb_version"
3680 if test "$_directfb_version" -ge 913; then 3665 if test "$_directfb_version" -ge 913; then
3681 _res_comment="$_directfb_version" 3666 _res_comment="$_directfb_version"
3682 else 3667 else
3704 _vomodules="dfbmga $_vomodules" 3689 _vomodules="dfbmga $_vomodules"
3705 fi 3690 fi
3706 else 3691 else
3707 _def_directfb='#undef HAVE_DIRECTFB' 3692 _def_directfb='#undef HAVE_DIRECTFB'
3708 _novomodules="directfb $_novomodules" 3693 _novomodules="directfb $_novomodules"
3709 _inc_directfb=""
3710 fi 3694 fi
3711 3695
3712 3696
3713 echocheck "X11 headers presence" 3697 echocheck "X11 headers presence"
3714 if test -z "$_inc_x11" ; then 3698 for I in $_inc_extra /usr/X11/include /usr/X11R6/include /usr/include/X11R6 /usr/include /usr/openwin/include ; do
3715 for I in /usr/X11/include /usr/X11R6/include /usr/include/X11R6 /usr/include /usr/openwin/include ; do 3699 if test -f "$I/X11/Xlib.h" ; then
3716 if test -d "$I/X11" && test -f "$I/X11/Xlib.h" ; then
3717 _inc_x11="-I$I" 3700 _inc_x11="-I$I"
3718 _x11_headers="yes" 3701 _x11_headers="yes"
3719 _res_comment="using $I" 3702 _res_comment="using $I"
3720 break 3703 break
3721 fi 3704 fi
3722 done 3705 done
3706 #FIXME: This is ugly as it can duplicate a -I parameter..
3707 _inc_extra="$_inc_extra $_inc_x11"
3723 if test -z "$_inc_x11" ; then 3708 if test -z "$_inc_x11" ; then
3724 _x11=no 3709 _x11=no
3725 _x11_headers="no" 3710 _x11_headers="no"
3726 _res_comment="check if the dev(el) packages are installed" 3711 _res_comment="check if the dev(el) packages are installed"
3727 fi 3712 fi
3728 else
3729 _x11_headers="yes"
3730 _res_comment="using $_inc_x11"
3731 fi
3732 if test "$_inc_x11" = "-I/usr/include" ; then
3733 _inc_x11=""
3734 fi
3735 echores "$_x11_headers" 3713 echores "$_x11_headers"
3736 3714
3737 3715
3738 echocheck "X11" 3716 echocheck "X11"
3739 if test "$_x11" != no ; then 3717 if test "$_x11" != no ; then
3748 for I in $_x11libdir ; do 3726 for I in $_x11libdir ; do
3749 _ld_x11="-L$I -lXext -lX11 $_ld_sock $_ld_pthread" 3727 _ld_x11="-L$I -lXext -lX11 $_ld_sock $_ld_pthread"
3750 if netbsd; then 3728 if netbsd; then
3751 _ld_x11="$_ld_x11 -Wl,-R$I" 3729 _ld_x11="$_ld_x11 -Wl,-R$I"
3752 fi 3730 fi
3753 if test -d "$I" && cc_check $_inc_x11 $_ld_x11 ; then 3731 if test -d "$I" && cc_check $_ld_x11 ; then
3754 _x11=yes 3732 _x11=yes
3755 break 3733 break
3756 fi 3734 fi
3757 done 3735 done
3758 fi 3736 fi
3762 _vomodules="x11 xover $_vomodules" 3740 _vomodules="x11 xover $_vomodules"
3763 _res_comment="using $I" 3741 _res_comment="using $I"
3764 else 3742 else
3765 _x11=no 3743 _x11=no
3766 _def_x11='#undef HAVE_X11' 3744 _def_x11='#undef HAVE_X11'
3767 _inc_x11=''
3768 _ld_x11='' 3745 _ld_x11=''
3769 _novomodules="x11 $_novomodules" 3746 _novomodules="x11 $_novomodules"
3770 _res_comment="check if the dev(el) packages are installed" 3747 _res_comment="check if the dev(el) packages are installed"
3771 fi 3748 fi
3772 echores "$_x11" 3749 echores "$_x11"
3784 #include <X11/extensions/dpms.h> 3761 #include <X11/extensions/dpms.h>
3785 int main(void) { 3762 int main(void) {
3786 (void) DPMSQueryExtension(0, 0, 0); 3763 (void) DPMSQueryExtension(0, 0, 0);
3787 } 3764 }
3788 EOF 3765 EOF
3789 cc_check $_inc_x11 -lXdpms $_ld_x11 && _xdpms3=yes 3766 cc_check -lXdpms $_ld_x11 && _xdpms3=yes
3790 cat > $TMPC <<EOF 3767 cat > $TMPC <<EOF
3791 #include <X11/Xlib.h> 3768 #include <X11/Xlib.h>
3792 #include <X11/extensions/dpms.h> 3769 #include <X11/extensions/dpms.h>
3793 int main(void) { 3770 int main(void) {
3794 (void) DPMSQueryExtension(0, 0, 0); 3771 (void) DPMSQueryExtension(0, 0, 0);
3795 } 3772 }
3796 EOF 3773 EOF
3797 cc_check $_inc_x11 $_ld_x11 && _xdpms4=yes 3774 cc_check $_ld_x11 && _xdpms4=yes
3798 fi 3775 fi
3799 if test "$_xdpms4" = yes ; then 3776 if test "$_xdpms4" = yes ; then
3800 _def_xdpms='#define HAVE_XDPMS 1' 3777 _def_xdpms='#define HAVE_XDPMS 1'
3801 _res_comment="using Xdpms 4" 3778 _res_comment="using Xdpms 4"
3802 echores "yes" 3779 echores "yes"
3820 (void) XvGetPortAttribute(0, 0, 0, 0); 3797 (void) XvGetPortAttribute(0, 0, 0, 0);
3821 (void) XvQueryPortAttributes(0, 0, 0); 3798 (void) XvQueryPortAttributes(0, 0, 0);
3822 return 0; } 3799 return 0; }
3823 EOF 3800 EOF
3824 _xv=no 3801 _xv=no
3825 cc_check $_inc_x11 -lXv $_ld_x11 && _xv=yes 3802 cc_check -lXv $_ld_x11 && _xv=yes
3826 else 3803 else
3827 _xv=no 3804 _xv=no
3828 fi 3805 fi
3829 if test "$_xv" = yes ; then 3806 if test "$_xv" = yes ; then
3830 _def_xv='#define HAVE_XV 1' 3807 _def_xv='#define HAVE_XV 1'
3834 else 3811 else
3835 _def_xv='#undef HAVE_XV' 3812 _def_xv='#undef HAVE_XV'
3836 _novomodules="xv $_novomodules" 3813 _novomodules="xv $_novomodules"
3837 fi 3814 fi
3838 echores "$_xv" 3815 echores "$_xv"
3816 fi #if test "$_x11" = yes ; then
3839 3817
3840 3818
3841 echocheck "XvMC" 3819 echocheck "XvMC"
3842 if test "$_x11" = yes && test "$_xv" = yes && test "$_xvmc" != no ; then 3820 if test "$_x11" = yes && test "$_xv" = yes && test "$_xvmc" != no ; then
3843 _xvmc=no 3821 _xvmc=no
3849 (void) XvMCQueryExtension(0,0,0); 3827 (void) XvMCQueryExtension(0,0,0);
3850 (void) XvMCCreateContext(0,0,0,0,0,0,0); 3828 (void) XvMCCreateContext(0,0,0,0,0,0,0);
3851 return 0; } 3829 return 0; }
3852 EOF 3830 EOF
3853 for _ld_tmp in $_xvmclib XvMCNVIDIA XvMCW I810XvMC ; do 3831 for _ld_tmp in $_xvmclib XvMCNVIDIA XvMCW I810XvMC ; do
3854 cc_check $_inc_x11 -lXvMC -l$_ld_tmp $_ld_xv $_ld_x11 && _xvmc=yes && _xvmclib="$_ld_tmp" && break 3832 cc_check -lXvMC -l$_ld_tmp $_ld_xv $_ld_x11 && _xvmc=yes && _xvmclib="$_ld_tmp" && break
3855 done 3833 done
3856 fi 3834 fi
3857 if test "$_xvmc" = yes ; then 3835 if test "$_xvmc" = yes ; then
3858 _def_xvmc='#define HAVE_XVMC 1' 3836 _def_xvmc='#define HAVE_XVMC 1'
3859 _ld_xvmc="-lXvMC -l$_xvmclib" 3837 _ld_xvmc="-lXvMC -l$_xvmclib"
3873 #include <X11/Xlib.h> 3851 #include <X11/Xlib.h>
3874 #include <X11/extensions/Xinerama.h> 3852 #include <X11/extensions/Xinerama.h>
3875 int main(void) { (void) XineramaIsActive(0); return 0; } 3853 int main(void) { (void) XineramaIsActive(0); return 0; }
3876 EOF 3854 EOF
3877 _xinerama=no 3855 _xinerama=no
3878 cc_check $_inc_x11 -lXinerama $_ld_x11 && _xinerama=yes 3856 cc_check -lXinerama $_ld_x11 && _xinerama=yes
3879 else 3857 else
3880 _xinerama=no 3858 _xinerama=no
3881 fi 3859 fi
3882 if test "$_xinerama" = yes ; then 3860 if test "$_xinerama" = yes ; then
3883 _def_xinerama='#define HAVE_XINERAMA 1' 3861 _def_xinerama='#define HAVE_XINERAMA 1'
3899 #include <X11/Xlib.h> 3877 #include <X11/Xlib.h>
3900 #include <X11/extensions/xf86vmode.h> 3878 #include <X11/extensions/xf86vmode.h>
3901 int main(void) { (void) XF86VidModeQueryExtension(0, 0, 0); return 0; } 3879 int main(void) { (void) XF86VidModeQueryExtension(0, 0, 0); return 0; }
3902 EOF 3880 EOF
3903 _vm=no 3881 _vm=no
3904 cc_check $_inc_x11 -lXxf86vm $_ld_x11 && _vm=yes 3882 cc_check -lXxf86vm $_ld_x11 && _vm=yes
3905 fi 3883 fi
3906 if test "$_vm" = yes ; then 3884 if test "$_vm" = yes ; then
3907 _def_vm='#define HAVE_XF86VM 1' 3885 _def_vm='#define HAVE_XF86VM 1'
3908 _ld_vm='-lXxf86vm' 3886 _ld_vm='-lXxf86vm'
3909 else 3887 else
3922 cat > $TMPC <<EOF 3900 cat > $TMPC <<EOF
3923 #include <X11/Xlib.h> 3901 #include <X11/Xlib.h>
3924 #include <X11/XF86keysym.h> 3902 #include <X11/XF86keysym.h>
3925 int main(void) { return XF86XK_AudioPause; } 3903 int main(void) { return XF86XK_AudioPause; }
3926 EOF 3904 EOF
3927 cc_check $_inc_x11 $_ld_x11 && _xf86keysym=yes 3905 cc_check $_ld_x11 && _xf86keysym=yes
3928 fi 3906 fi
3929 fi 3907 fi
3930 if test "$_xf86keysym" = yes ; then 3908 if test "$_xf86keysym" = yes ; then
3931 _def_xf86keysym='#define HAVE_XF86XK 1' 3909 _def_xf86keysym='#define HAVE_XF86XK 1'
3932 else 3910 else
3944 #include <X11/Xlib.h> 3922 #include <X11/Xlib.h>
3945 #include <X11/extensions/xf86dga.h> 3923 #include <X11/extensions/xf86dga.h>
3946 int main (void) { (void) XF86DGASetViewPort(0, 0, 0, 0); return 0; } 3924 int main (void) { (void) XF86DGASetViewPort(0, 0, 0, 0); return 0; }
3947 EOF 3925 EOF
3948 _dga=no 3926 _dga=no
3949 cc_check $_inc_x11 -lXxf86dga -lXxf86vm $_ld_x11 && _dga=1 3927 cc_check -lXxf86dga -lXxf86vm $_ld_x11 && _dga=1
3950 3928
3951 cat > $TMPC << EOF 3929 cat > $TMPC << EOF
3952 #include <X11/Xlib.h> 3930 #include <X11/Xlib.h>
3953 #include <X11/extensions/xf86dga.h> 3931 #include <X11/extensions/xf86dga.h>
3954 int main (void) { (void) XDGASetViewport(0, 0, 0, 0, 0); return 0; } 3932 int main (void) { (void) XDGASetViewport(0, 0, 0, 0, 0); return 0; }
3955 EOF 3933 EOF
3956 cc_check $_inc_x11 -lXxf86dga $_ld_x11 && _dga=2 3934 cc_check -lXxf86dga $_ld_x11 && _dga=2
3957 fi 3935 fi
3958 3936
3959 _def_dga='#undef HAVE_DGA' 3937 _def_dga='#undef HAVE_DGA'
3960 _def_dga2='#undef HAVE_DGA2' 3938 _def_dga2='#undef HAVE_DGA2'
3961 if test "$_dga" = 1 ; then 3939 if test "$_dga" = 1 ; then
3985 cat > $TMPC << EOF 3963 cat > $TMPC << EOF
3986 #include <GL/gl.h> 3964 #include <GL/gl.h>
3987 int main(void) { return 0; } 3965 int main(void) { return 0; }
3988 EOF 3966 EOF
3989 _gl=no 3967 _gl=no
3990 if cc_check $_inc_x11 $_ld_x11 -lGL $_ld_lm ; then 3968 if cc_check $_ld_x11 -lGL $_ld_lm ; then
3991 _gl=yes 3969 _gl=yes
3992 _ld_gl="-lGL $_ld_dl" 3970 _ld_gl="-lGL $_ld_dl"
3993 elif cc_check $_inc_x11 $_ld_x11 -lGL $_ld_lm $_ld_pthread ; then 3971 elif cc_check $_ld_x11 -lGL $_ld_lm $_ld_pthread ; then
3994 _gl=yes 3972 _gl=yes
3995 _ld_gl="-lGL $_ld_pthread $_ld_dl" 3973 _ld_gl="-lGL $_ld_pthread $_ld_dl"
3996 elif cc_check -lopengl32 ; then 3974 elif cc_check -lopengl32 ; then
3997 _gl=yes 3975 _gl=yes
3998 _gl_win32=yes 3976 _gl_win32=yes
4215 #include <ost/sec.h> 4193 #include <ost/sec.h>
4216 #include <ost/video.h> 4194 #include <ost/video.h>
4217 #include <ost/audio.h> 4195 #include <ost/audio.h>
4218 int main(void) {return 0;} 4196 int main(void) {return 0;}
4219 EOF 4197 EOF
4220 if cc_check ; then 4198 for _inc_dvb in "" "-I/usr/src/DVB/ost/include" ; do
4221 _dvb=yes 4199 cc_check $_inc_dvb && _dvb=yes && break
4222 else 4200 done
4223 for I in "$_inc_dvb" "-I/usr/src/DVB/ost/include" ; do 4201 _inc_extra="$_inc_extra $_inc_dvb"
4224 if cc_check "$I" ; then
4225 _dvb=yes
4226 _inc_dvb="$I"
4227 _res_comment="using $_inc_dvb"
4228 break
4229 fi
4230 done
4231 test "$_dvb" = no && _res_comment="specify path to DVB/ost/include with --with-dvbincdir=DIR"
4232 fi
4233 fi 4202 fi
4234 echores "$_dvb" 4203 echores "$_dvb"
4235 if test "$_dvb" = yes ; then 4204 if test "$_dvb" = yes ; then
4236 _def_dvb='#define HAVE_DVB 1' 4205 _def_dvb='#define HAVE_DVB 1'
4237 _def_dvb_in='#define HAS_DVBIN_SUPPORT 1' 4206 _def_dvb_in='#define HAS_DVBIN_SUPPORT 1'
4254 #include <linux/dvb/frontend.h> 4223 #include <linux/dvb/frontend.h>
4255 #include <linux/dvb/video.h> 4224 #include <linux/dvb/video.h>
4256 #include <linux/dvb/audio.h> 4225 #include <linux/dvb/audio.h>
4257 int main(void) {return 0;} 4226 int main(void) {return 0;}
4258 EOF 4227 EOF
4259 if cc_check ; then 4228 for _inc_dvb in "" "-I/usr/src/DVB/include" ; do
4260 _dvbhead=yes 4229 cc_check $_inc_dvb && _dvbhead=yes && break
4261 else 4230 done
4262 for I in "$_inc_dvb" "-I/usr/src/DVB/include" ; do 4231 _inc_extra="$_inc_extra $_inc_dvb"
4263 if cc_check "$I" ; then
4264 _dvbhead=yes
4265 _inc_dvb="$I"
4266 _res_comment="using $_inc_dvb"
4267 break
4268 fi
4269 done
4270 test "$_dvbhead" = no && _res_comment="specify path to DVB/include (HEAD Version) with --with-dvbincdir=DIR"
4271 fi
4272 fi 4232 fi
4273 echores "$_dvbhead" 4233 echores "$_dvbhead"
4274 if test "$_dvbhead" = yes ; then 4234 if test "$_dvbhead" = yes ; then
4275 _def_dvb='#define HAVE_DVB_HEAD 1' 4235 _def_dvb='#define HAVE_DVB_HEAD 1'
4276 _def_dvb_in='#define HAS_DVBIN_SUPPORT 1' 4236 _def_dvb_in='#define HAS_DVBIN_SUPPORT 1'
4604 cat > $TMPC << EOF 4564 cat > $TMPC << EOF
4605 #include <audio/audiolib.h> 4565 #include <audio/audiolib.h>
4606 int main(void) { return 0; } 4566 int main(void) { return 0; }
4607 EOF 4567 EOF
4608 _nas=no 4568 _nas=no
4609 cc_check -laudio $_inc_x11 -lXt $_ld_x11 $_ld_lm && _nas=yes 4569 cc_check -laudio -lXt $_ld_x11 $_ld_lm && _nas=yes
4610 fi 4570 fi
4611 if test "$_nas" = yes ; then 4571 if test "$_nas" = yes ; then
4612 _def_nas='#define HAVE_NAS 1' 4572 _def_nas='#define HAVE_NAS 1'
4613 _ld_nas="-laudio -lXt $_ld_x11" 4573 _ld_nas="-laudio -lXt $_ld_x11"
4614 _aosrc="$_aosrc ao_nas.c" 4574 _aosrc="$_aosrc ao_nas.c"
4624 _dxr2=no 4584 _dxr2=no
4625 cat > $TMPC << EOF 4585 cat > $TMPC << EOF
4626 #include <dxr2ioctl.h> 4586 #include <dxr2ioctl.h>
4627 int main(void) { return 0; } 4587 int main(void) { return 0; }
4628 EOF 4588 EOF
4629 for _inc_dxr2 in "$_inc_dxr2" \ 4589 for _inc_dxr2 in "" -I/usr/local/include/dxr2 -I/usr/include/dxr2; do
4630 "-I/usr/local/include/dxr2" \
4631 "-I/usr/include/dxr2"; do
4632 cc_check $_inc_dxr2 && _dxr2=yes && break 4590 cc_check $_inc_dxr2 && _dxr2=yes && break
4633 done 4591 done
4592 _inc_extra="$_inc_extra $_inc_dxr2"
4634 fi 4593 fi
4635 if test "$_dxr2" = yes; then 4594 if test "$_dxr2" = yes; then
4636 _def_dxr2='#define HAVE_DXR2 1' 4595 _def_dxr2='#define HAVE_DXR2 1'
4637 _vosrc="$_vosrc vo_dxr2.c" 4596 _vosrc="$_vosrc vo_dxr2.c"
4638 _aosrc="$_aosrc ao_dxr2.c" 4597 _aosrc="$_aosrc ao_dxr2.c"
4639 _aomodules="dxr2 $_aomodules" 4598 _aomodules="dxr2 $_aomodules"
4640 _vomodules="dxr2 $_vomodules" 4599 _vomodules="dxr2 $_vomodules"
4641 _res_comment="using $_inc_dxr2"
4642 else 4600 else
4643 _def_dxr2='#undef HAVE_DXR2' 4601 _def_dxr2='#undef HAVE_DXR2'
4644 _noaomodules="dxr2 $_noaomodules" 4602 _noaomodules="dxr2 $_noaomodules"
4645 _novomodules="dxr2 $_novomodules" 4603 _novomodules="dxr2 $_novomodules"
4646 _inc_dxr2=""
4647 fi 4604 fi
4648 echores "$_dxr2" 4605 echores "$_dxr2"
4649 4606
4650 echocheck "DXR3/H+" 4607 echocheck "DXR3/H+"
4651 if test "$_dxr3" = auto ; then 4608 if test "$_dxr3" = auto ; then
5234 #include <cdda_paranoia.h> 5191 #include <cdda_paranoia.h>
5235 // This need a better test. How ? 5192 // This need a better test. How ?
5236 int main(void) { return 1; } 5193 int main(void) { return 1; }
5237 EOF 5194 EOF
5238 _cdparanoia=no 5195 _cdparanoia=no
5239 for _inc_tmp in "$_inc_cdparanoia" "-I/usr/include/cdda" "-I/usr/local/include/cdda" ; do 5196 for _inc_cdparanoia in "" "-I/usr/include/cdda" "-I/usr/local/include/cdda" ; do
5240 cc_check $_inc_tmp $_ld_cdparanoia -lcdda_interface -lcdda_paranoia $_ld_lm && _inc_cdparanoia="$_inc_tmp" && _cdparanoia=yes && break 5197 cc_check $_inc_cdparanoia $_ld_cdparanoia -lcdda_interface -lcdda_paranoia $_ld_lm && _cdparanoia=yes && break
5241 done 5198 done
5199 _inc_extra="$_inc_extra $_inc_cdparanoia"
5242 fi 5200 fi
5243 if test "$_cdparanoia" = yes ; then 5201 if test "$_cdparanoia" = yes ; then
5244 _cdda='yes' 5202 _cdda='yes'
5245 _def_cdparanoia='#define HAVE_CDDA' 5203 _def_cdparanoia='#define HAVE_CDDA'
5246 _inputmodules="cdda $_inputmodules" 5204 _inputmodules="cdda $_inputmodules"
6511 _ld_x264="$_ld_x264 -lx264 $_ld_pthread" 6469 _ld_x264="$_ld_x264 -lx264 $_ld_pthread"
6512 if test "$_x264" != no ; then 6470 if test "$_x264" != no ; then
6513 _x264=no 6471 _x264=no
6514 if cc_check $_ld_x264 $_ld_lm ; then 6472 if cc_check $_ld_x264 $_ld_lm ; then
6515 _x264=yes 6473 _x264=yes
6516 elif test "$_x11" = yes && cc_check $_inc_x11 $_ld_x264 $_ld_x11 $_ld_lm ; then 6474 elif test "$_x11" = yes && cc_check $_ld_x264 $_ld_x11 $_ld_lm ; then
6517 _x264=yes 6475 _x264=yes
6518 _ld_x264="$_ld_x264 $_ld_x11" 6476 _ld_x264="$_ld_x264 $_ld_x11"
6519 fi 6477 fi
6520 fi 6478 fi
6521 6479
6926 exitvar=1; 6884 exitvar=1;
6927 XCloseDisplay(wsDisplay); 6885 XCloseDisplay(wsDisplay);
6928 return exitvar; 6886 return exitvar;
6929 } 6887 }
6930 EOF 6888 EOF
6931 cc_check $_inc_x11 $_ld_x11 && _xshape=yes 6889 cc_check $_ld_x11 && _xshape=yes
6932 fi 6890 fi
6933 if test "$_xshape" = yes ; then 6891 if test "$_xshape" = yes ; then
6934 _def_xshape='#define HAVE_XSHAPE 1' 6892 _def_xshape='#define HAVE_XSHAPE 1'
6935 else 6893 else
6936 die "The GUI requires the X11 extension XShape (which was not found)." 6894 die "The GUI requires the X11 extension XShape (which was not found)."
7290 HOST_CC = $_host_cc 7248 HOST_CC = $_host_cc
7291 AWK = $_awk 7249 AWK = $_awk
7292 RANLIB = $_ranlib 7250 RANLIB = $_ranlib
7293 INSTALL = $_install 7251 INSTALL = $_install
7294 # FIXME: Should only be _inc_extra eventually. 7252 # FIXME: Should only be _inc_extra eventually.
7295 EXTRA_INC = $_inc_extra $_inc_x11 $inc_dxr2 $_inc_dvb $_inc_directfb $_inc_cdparanoia 7253 EXTRA_INC = $_inc_extra
7296 OPTFLAGS = -I../libvo -I../../libvo $_inc_x11 $CFLAGS \$(EXTRA_INC) 7254 OPTFLAGS = -I../libvo -I../../libvo $CFLAGS \$(EXTRA_INC)
7297 STRIPBINARIES = $_stripbinaries 7255 STRIPBINARIES = $_stripbinaries
7298 CHARSET = $_charset 7256 CHARSET = $_charset
7299 HELP_FILE = $_mp_help 7257 HELP_FILE = $_mp_help
7300 7258
7301 PRG = $_prg 7259 PRG = $_prg