comparison configure @ 2961:f8402e758de2

removed _x _y support (no longer used) cosmetic for DVD support (css/dvdread) xanim detection slightly changed
author pl
date Sat, 17 Nov 2001 22:50:30 +0000
parents fb4c904f5d1d
children 98dacfba1195
comparison
equal deleted inserted replaced
2960:6b69f306cf6e 2961:f8402e758de2
61 echo "$_echo_n" "Checking for $@ ... $_echo_c" 61 echo "$_echo_n" "Checking for $@ ... $_echo_c"
62 } 62 }
63 63
64 # Use this to echo the results of a check 64 # Use this to echo the results of a check
65 echores() { 65 echores() {
66 echo "Result is $@" >> "$TMPLOG" 66 echo "Result is: $@" >> "$TMPLOG"
67 echo "##########################################" >> "$TMPLOG" 67 echo "##########################################" >> "$TMPLOG"
68 echo "" >> "$TMPLOG" 68 echo "" >> "$TMPLOG"
69 echo "$@" 69 echo "$@"
70 } 70 }
71 ############################################################################# 71 #############################################################################
656 _lirc=auto 656 _lirc=auto
657 _gui=no 657 _gui=no
658 _termcap=auto 658 _termcap=auto
659 _3dfx=no 659 _3dfx=no
660 _tdfxfb=no 660 _tdfxfb=no
661 661 _largefiles=no
662 _vo2=no 662 _vo2=no
663
664 _x=1
665 _y=1
666 _language=en 663 _language=en
667
668 664
669 665
670 for ac_option do 666 for ac_option do
671 case "$ac_option" in 667 case "$ac_option" in
672 # Skip 1st pass 668 # Skip 1st pass
752 --disable-3dfx) _3dfx=no ;; 748 --disable-3dfx) _3dfx=no ;;
753 --enable-tdfxfb) _tdfxfb=yes ;; 749 --enable-tdfxfb) _tdfxfb=yes ;;
754 --disable-tdfxfb) _tdfxfb=no ;; 750 --disable-tdfxfb) _tdfxfb=no ;;
755 --enable-mtrr) _mtrr=yes ;; 751 --enable-mtrr) _mtrr=yes ;;
756 --disable-mtrr) _mtrr=no ;; 752 --disable-mtrr) _mtrr=no ;;
757 753 --enable-largefiles) _largefiles=yes ;;
754 --enable-largefiles) _largefiles=no ;;
758 --enable-vo2) _vo2=yes ;; 755 --enable-vo2) _vo2=yes ;;
759 --disable-vo2) _vo2=no ;; 756 --disable-vo2) _vo2=no ;;
760 757
761 --enable-select) _def_select='#define HAVE_AUDIO_SELECT' ;; 758 --enable-select) _def_select='#define HAVE_AUDIO_SELECT' ;;
762 --disable-select) _def_select='#undef HAVE_AUDIO_SELECT' ;; 759 --disable-select) _def_select='#undef HAVE_AUDIO_SELECT' ;;
784 _css=yes 781 _css=yes
785 ;; 782 ;;
786 --with-mlibdir=*) 783 --with-mlibdir=*)
787 _mlibdir=`echo $ac_option | cut -d '=' -f 2` 784 _mlibdir=`echo $ac_option | cut -d '=' -f 2`
788 _mlib=yes 785 _mlib=yes
789 ;;
790
791 --size-x=*)
792 _x=`echo $ac_option | cut -d '=' -f 2`
793 ;;
794 --size-y=*)
795 _y=`echo $ac_option | cut -d '=' -f 2`
796 ;;
797
798 --enable-largefiles)
799 _largefiles=yes
800 ;; 786 ;;
801 787
802 --enable-profile) 788 --enable-profile)
803 _profile='-p' 789 _profile='-p'
804 ;; 790 ;;
945 931
946 932
947 ###################### 933 ######################
948 # MAIN TESTS GO HERE # 934 # MAIN TESTS GO HERE #
949 ###################### 935 ######################
950
951
952 echocheck "Screen size ..."
953 _def_x="#define SCREEN_SIZE_X $_x"
954 _def_y="#define SCREEN_SIZE_Y $_y"
955 echores "${_x} x ${_y}"
956 936
957 937
958 echocheck "Extra headers" 938 echocheck "Extra headers"
959 echores "$_extraincdir" 939 echores "$_extraincdir"
960 940
1736 _def_sgiaudio='#undef USE_SGI_AUDIO' 1716 _def_sgiaudio='#undef USE_SGI_AUDIO'
1737 fi 1717 fi
1738 echores "$_sgiaudio" 1718 echores "$_sgiaudio"
1739 1719
1740 1720
1741 echocheck "Encrypted DVD support" 1721 echocheck "DVD support"
1742 if test "$_dvdread" = auto ; then 1722 if test "$_dvdread" = auto ; then
1743 cat > $TMPC << EOF 1723 cat > $TMPC << EOF
1744 #include <dvdread/dvd_reader.h> 1724 #include <dvdread/dvd_reader.h>
1745 #include <dvdread/ifo_types.h> 1725 #include <dvdread/ifo_types.h>
1746 #include <dvdread/ifo_read.h> 1726 #include <dvdread/ifo_read.h>
1756 cat > $TMPC <<EOF 1736 cat > $TMPC <<EOF
1757 #include <css.h> 1737 #include <css.h>
1758 int main(void) { int i=CSSisEncrypted(0); return 0; } 1738 int main(void) { int i=CSSisEncrypted(0); return 0; }
1759 EOF 1739 EOF
1760 _css=no 1740 _css=no
1761 cc_check -lcss && _css=yes 1741 cc_check -lcss && _css=yes
1762 fi 1742 fi
1763 # dvdread preferred to DeCSS 1743 # dvdread preferred to DeCSS
1764 if test "$_dvdread" = yes ; then 1744 if test "$_dvdread" = yes ; then
1765 _largefiles=yes 1745 _largefiles=yes
1766 _def_dvdread='#define USE_DVDREAD 1' 1746 _def_dvdread='#define USE_DVDREAD 1'
1767 _def_css='#undef HAVE_LIBCSS' 1747 _def_css='#undef HAVE_LIBCSS'
1768 _ld_css='-ldvdread' 1748 _ld_css='-ldvdread'
1769 echores "-ldvdread" 1749 echores "libdvdread"
1770 elif test "$_css" = yes ; then 1750 elif test "$_css" = yes ; then
1771 _def_dvdread='#undef USE_DVDREAD' 1751 _def_dvdread='#undef USE_DVDREAD'
1772 _def_css='#define HAVE_LIBCSS 1' 1752 _def_css='#define HAVE_LIBCSS 1'
1773 test "$_csslibdir" && _ld_css="-L${_csslibdir} ${_ld_css}" 1753 test "$_csslibdir" && _ld_css="-L${_csslibdir} ${_ld_css}"
1774 echores "-lcss" 1754 echores "libcss"
1775 else 1755 else
1776 _def_dvdread='#undef USE_DVDREAD' 1756 _def_dvdread='#undef USE_DVDREAD'
1777 _def_css='#undef HAVE_LIBCSS' 1757 _def_css='#undef HAVE_LIBCSS'
1778 echores "none" 1758 echores "no"
1779 fi 1759 fi
1780 1760
1781 1761
1782 echocheck "zlib" 1762 echocheck "zlib"
1783 cat > $TMPC << EOF 1763 cat > $TMPC << EOF
1904 fi 1884 fi
1905 1885
1906 1886
1907 echocheck "XAnim DLL" 1887 echocheck "XAnim DLL"
1908 if test "$_xanim" = auto ; then 1888 if test "$_xanim" = auto ; then
1889 # xanim only requires dlopen() and/or libdl
1890 cat > $TMPC << EOF
1891 int main(void) { (void) dlopen(0, 0); return 0; }
1892 EOF
1909 _xanim=no 1893 _xanim=no
1910 # FreeBSD does not libdl 1894 if cc_check || test "$_dl" = yes ; then
1911 if freebsd || test "$_dl" = yes ; then
1912 if test "$host_arch" = i386 ; then 1895 if test "$host_arch" = i386 ; then
1913 if test -z "$_xanimlibdir" ; then 1896 if test -z "$_xanimlibdir" ; then
1914 for I in /usr/local/lib/xanim/mods /usr/lib/xanim/mods ; do 1897 for I in /usr/local/lib/xanim/mods /usr/lib/xanim/mods ; do
1915 if test -d "$I" ; then 1898 if test -d "$I" ; then
1916 _xanimlibdir="$I" 1899 _xanimlibdir="$I"
2536 #ifdef HAVE_MLIB 2519 #ifdef HAVE_MLIB
2537 #define LIBMPEG2_MLIB 1 2520 #define LIBMPEG2_MLIB 1
2538 #endif 2521 #endif
2539 2522
2540 /* libvo options */ 2523 /* libvo options */
2541 $_def_x 2524 #define SCREEN_SIZE_X 1
2542 $_def_y 2525 #define SCREEN_SIZE_Y 1
2543 $_def_x11 2526 $_def_x11
2544 $_def_xv 2527 $_def_xv
2545 $_def_vm 2528 $_def_vm
2546 $_def_xinerama 2529 $_def_xinerama
2547 $_def_gl 2530 $_def_gl