X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=configure;h=72d1a1e11ea3b8b0243efedeaa124c357daff330;hb=a33d6accd4cf7ff908b2bf17bb6a01cc3e77daee;hp=15df38899dec22bc02c0d2f9ef732c67dfc1e27b;hpb=641382a2dc21be280585bddc97e4c314beb22ec6;p=vlc diff --git a/configure b/configure index 15df38899d..72d1a1e11e 100755 --- a/configure +++ b/configure @@ -18,94 +18,124 @@ ac_help="$ac_help ac_help="$ac_help --with-included-gettext use the GNU gettext library included here" ac_help="$ac_help - --with-words=endianness Set endianness (big or little)" +" +ac_help="$ac_help +Optimization options:" ac_help="$ac_help - --with-tuning=[arch] Enable special tuning for an architecture + --with-tuning=ARCH enable special tuning for an architecture (default i686 on IA-32 and 750 on PPC)" ac_help="$ac_help - --enable-release Activate extra optimizations (default disabled)" + --disable-optimizations disable compiler optimizations (default enabled)" ac_help="$ac_help - --disable-altivec Disable altivec optimizations (default enabled on PPC)" + --disable-altivec disable altivec optimizations (default enabled on PPC)" ac_help="$ac_help - --enable-debug Enable debug mode (default disabled)" + --enable-debug debug mode (default disabled)" ac_help="$ac_help - --enable-trace Enable trace mode (default disabled)" + --enable-release activate extra optimizations (default disabled)" ac_help="$ac_help - --enable-gprof Enable gprof profiling (default disabled)" +Input plugins:" ac_help="$ac_help - --enable-cprof Enable cprof profiling (default disabled)" + --enable-dvd DVD input module (default enabled)" ac_help="$ac_help - --disable-optimizations Disable compiler optimizations (default enabled)" + --with-dvdcss=PATH libdvdcss headers and libraries" ac_help="$ac_help - --enable-pth Enable GNU Pth support (default disabled)" + --with-dvdcss-tree=PATH libdvdcss tree for static linking" ac_help="$ac_help - --with-dvdcss[=name] way to use libdvdcss, either 'yes' or 'no', - or 'local-static', 'local-shared', or a path to - another libdvdcss such as '/usr/local' - (default 'local-static')" + --enable-dvdread dvdread input module (default disabled)" ac_help="$ac_help - --enable-dvdread Enable dvdread support (default disabled)" + --with-dvdread=PATH libdvdread headers and libraries" ac_help="$ac_help - --enable-vcd VCD support for Linux (default enabled)" + --enable-vcd VCD support for Linux and MacOS X (default enabled)" ac_help="$ac_help - --disable-dummy dummy module (default enabled)" + --enable-satellite satellite card support (default disabled)" ac_help="$ac_help - --disable-null Null module (default enabled)" +Codec plugins:" ac_help="$ac_help - --disable-rc Remote Control module (default enabled)" + --enable-mad libmad module (default disabled)" ac_help="$ac_help - --with-mad[=PATH] libmad module (default disabled)" + --with-mad=PATH path to libmad" ac_help="$ac_help - --disable-dsp Linux /dev/dsp support (default enabled)" + --enable-a52 AC3 support with liba52 (default enabled)" ac_help="$ac_help - --enable-esd Esound library support (default disabled)" + --enable-vorbis Ogg/Vorbis decoder support (default enabled)" ac_help="$ac_help - --enable-arts aRts sound server (default disabled)" +Video plugins:" ac_help="$ac_help - --enable-macosx MacOS X support (default enabled on MacOS X)" + --enable-x11 X11 support (default enabled)" +ac_help="$ac_help + --enable-xvideo XVideo support (default enabled)" +ac_help="$ac_help + --enable-sdl SDL support (default enabled)" +ac_help="$ac_help + --with-sdl-config-path=PATH sdl-config path (default search in \$PATH)" ac_help="$ac_help - --disable-qnx QNX RTOS support (default enabled on QNX RTOS)" + --enable-directx Win32 DirectX support (default enabled on Win32)" ac_help="$ac_help - --enable-fb Linux framebuffer support (default disabled)" + --with-directx=PATH Win32 DirectX headers and libraries" +ac_help="$ac_help + --enable-fb Linux framebuffer support (default enabled on Linux)" ac_help="$ac_help --enable-mga Linux kernel Matrox support (default disabled)" ac_help="$ac_help - --with-ggi[=name] GGI support (default disabled)" + --enable-ggi GGI support (default disabled)" ac_help="$ac_help - --disable-sdl SDL support (default enabled)" + --with-ggi=PATH path to libggi" ac_help="$ac_help - --with-sdl-config-path=path sdl-config path (default search in \$PATH)" + --enable-glide Glide (3dfx) support (default disabled)" ac_help="$ac_help - --disable-directx Windows DirectX support (default enabled on WIN32)" + --with-glide=PATH path to libglide" ac_help="$ac_help - --with-directx-path=path Windows DirectX headers and libraries" + --enable-aa aalib output (default disabled)" ac_help="$ac_help - --enable-win32 Windows DirectX support (default disabled)" +Audio plugins:" ac_help="$ac_help - --with-glide[=name] Glide (3dfx) support (default disabled)" + --enable-dsp Linux /dev/dsp support (enabled on Linux)" ac_help="$ac_help - --enable-ncurses ncurses interface support (default disabled)" + --enable-esd Esound library support (default disabled)" +ac_help="$ac_help + --enable-arts aRts sound server (default disabled)" +ac_help="$ac_help + --enable-alsa ALSA sound support for Linux (default disabled)" +ac_help="$ac_help + --enable-waveout Win32 waveOut module (default enabled on Win32)" +ac_help="$ac_help +Interface plugins:" +ac_help="$ac_help + --enable-gtk Gtk+ support (default enabled)" +ac_help="$ac_help + --with-gtk-config-path=PATH gtk-config path (default search in \$PATH)" +ac_help="$ac_help + --enable-gnome Gnome interface support (default disabled)" ac_help="$ac_help --enable-qt Qt interface support (default disabled)" ac_help="$ac_help --enable-kde KDE interface support (default disabled)" ac_help="$ac_help - --enable-gnome Gnome interface support (default disabled)" + --enable-macosx MacOS X support (default enabled on MacOS X)" +ac_help="$ac_help + --enable-qnx QNX RTOS support (default enabled on QNX RTOS)" +ac_help="$ac_help + --enable-win32 Win32 interface support (default disabled)" ac_help="$ac_help - --disable-gtk Gtk+ support (default enabled)" + --enable-ncurses ncurses interface support (default disabled)" +ac_help="$ac_help + --enable-lirc lirc support (default disabled)" +ac_help="$ac_help +Misc options:" +ac_help="$ac_help + --with-words=endianness set endianness (big or little)" ac_help="$ac_help - --with-gtk-config-path=path gtk-config path (default search in \$PATH)" + --with-dll-path=PATH path to Win32 DLLs (default search in \$PWD)" ac_help="$ac_help - --disable-x11 X11 support (default enabled)" + --enable-gprof gprof profiling (default disabled)" ac_help="$ac_help - --disable-xvideo XVideo support (default enabled)" + --enable-cprof cprof profiling (default disabled)" ac_help="$ac_help - --enable-alsa Alsa sound drivers support (Only for linux) - (default disabled)" + --enable-pth GNU Pth support (default disabled)" ac_help="$ac_help - --disable-plugins Make all plug-ins built-in (default plug-ins enabled)" + --enable-st State Threads (default disabled)" ac_help="$ac_help - --with-dll-path=path Path to Win32 DLLs (default search in \$PWD)" + --disable-plugins make all plug-ins built-in (default plug-ins enabled)" # Initialize some variables set by options. # The variables have the same names as the options, with @@ -665,7 +695,7 @@ else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; } fi echo $ac_n "checking host system type""... $ac_c" 1>&6 -echo "configure:669: checking host system type" >&5 +echo "configure:699: checking host system type" >&5 host_alias=$host case "$host_alias" in @@ -686,7 +716,7 @@ host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` echo "$ac_t""$host" 1>&6 echo $ac_n "checking target system type""... $ac_c" 1>&6 -echo "configure:690: checking target system type" >&5 +echo "configure:720: checking target system type" >&5 target_alias=$target case "$target_alias" in @@ -704,7 +734,7 @@ target_os=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` echo "$ac_t""$target" 1>&6 echo $ac_n "checking build system type""... $ac_c" 1>&6 -echo "configure:708: checking build system type" >&5 +echo "configure:738: checking build system type" >&5 build_alias=$build case "$build_alias" in @@ -727,31 +757,14 @@ test "$host_alias" != "$target_alias" && program_prefix=${target_alias}- -HAVE_VLC=0 -if test -r src/interface/main.c; then - HAVE_VLC=1 - VLC_VERSION="0.2.92-dev" - VLC_CODENAME=Ourumov -fi - -HAVE_LIBDVDCSS=0 -if test -r extras/libdvdcss/libdvdcss.c; then - HAVE_LIBDVDCSS=1 - LIBDVDCSS_VERSION="1.0.1-dev" - - if test -r extras/libdvdcss/csskeys.h; then - cat >> confdefs.h <<\EOF -#define HAVE_CSSKEYS 1 -EOF - - fi -fi +VERSION="0.3.0" +CODENAME=Ourumov save_CFLAGS="${CFLAGS}" save_LDFLAGS="${LDFLAGS}" echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6 -echo "configure:755: checking whether ${MAKE-make} sets \${MAKE}" >&5 +echo "configure:768: checking whether ${MAKE-make} sets \${MAKE}" >&5 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -780,7 +793,7 @@ fi # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:784: checking for $ac_word" >&5 +echo "configure:797: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -810,7 +823,7 @@ if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:814: checking for $ac_word" >&5 +echo "configure:827: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -861,7 +874,7 @@ fi # Extract the first word of "cl", so it can be a program name with args. set dummy cl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:865: checking for $ac_word" >&5 +echo "configure:878: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -893,7 +906,7 @@ fi fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:897: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:910: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -904,12 +917,12 @@ cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext << EOF -#line 908 "configure" +#line 921 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:913: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:926: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cc_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -935,12 +948,12 @@ if test $ac_cv_prog_cc_works = no; then { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:939: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:952: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:944: checking whether we are using GNU C" >&5 +echo "configure:957: checking whether we are using GNU C" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -949,7 +962,7 @@ else yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:953: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:966: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gcc=yes else ac_cv_prog_gcc=no @@ -968,7 +981,7 @@ ac_test_CFLAGS="${CFLAGS+set}" ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:972: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:985: checking whether ${CC-cc} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1000,7 +1013,7 @@ else fi echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:1004: checking how to run the C preprocessor" >&5 +echo "configure:1017: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -1015,13 +1028,13 @@ else # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1025: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1038: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -1032,13 +1045,13 @@ else rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1042: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1055: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -1049,13 +1062,13 @@ else rm -rf conftest* CPP="${CC-cc} -nologo -E" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1059: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1072: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -1089,7 +1102,7 @@ fi # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. set dummy ${ac_tool_prefix}ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1093: checking for $ac_word" >&5 +echo "configure:1106: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1121,7 +1134,7 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1125: checking for $ac_word" >&5 +echo "configure:1138: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1154,20 +1167,77 @@ fi fi -ALL_LINGUAS="de fr ru" +# Extract the first word of "gmake", so it can be a program name with args. +set dummy gmake; ac_word=$2 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +echo "configure:1174: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_path_GMAKE'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + case "$GMAKE" in + /*) + ac_cv_path_GMAKE="$GMAKE" # Let the user override the test with a path. + ;; + ?:/*) + ac_cv_path_GMAKE="$GMAKE" # Let the user override the test with a dos path. + ;; + *) + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_path_GMAKE="$ac_dir/$ac_word" + break + fi + done + IFS="$ac_save_ifs" + test -z "$ac_cv_path_GMAKE" && ac_cv_path_GMAKE="no" + ;; +esac +fi +GMAKE="$ac_cv_path_GMAKE" +if test -n "$GMAKE"; then + echo "$ac_t""$GMAKE" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi + +if test "x$GMAKE" = "xno"; then + echo $ac_n "checking whether GNU make is installed""... $ac_c" 1>&6 +echo "configure:1209: checking whether GNU make is installed" >&5 +if eval "test \"`echo '$''{'ac_cv_gmake'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + if make --version | grep -q -i gnu; then + ac_cv_gmake="yes" + else + echo "This software needs you to install GNU make to compile properly." + echo "You can get it from http://www.gnu.org/." + exit + fi +fi + +echo "$ac_t""$ac_cv_gmake" 1>&6 + VLC_MAKE="make" +else + VLC_MAKE="gmake" +fi + +ALL_LINGUAS="de fr ja no ru nl" cat >> confdefs.h <> confdefs.h <&6 -echo "configure:1171: checking for $ac_word" >&5 +echo "configure:1241: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1196,7 +1266,7 @@ fi echo $ac_n "checking for strerror in -lcposix""... $ac_c" 1>&6 -echo "configure:1200: checking for strerror in -lcposix" >&5 +echo "configure:1270: checking for strerror in -lcposix" >&5 ac_lib_var=`echo cposix'_'strerror | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1204,7 +1274,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lcposix $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1289: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1238,12 +1308,12 @@ fi echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:1242: checking for ANSI C header files" >&5 +echo "configure:1312: checking for ANSI C header files" >&5 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -1251,7 +1321,7 @@ else #include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1255: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1325: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -1268,7 +1338,7 @@ rm -f conftest* if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. cat > conftest.$ac_ext < EOF @@ -1286,7 +1356,7 @@ fi if test $ac_cv_header_stdc = yes; then # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. cat > conftest.$ac_ext < EOF @@ -1307,7 +1377,7 @@ if test "$cross_compiling" = yes; then : else cat > conftest.$ac_ext < #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -1318,7 +1388,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2); exit (0); } EOF -if { (eval echo configure:1322: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:1392: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -1342,12 +1412,12 @@ EOF fi echo $ac_n "checking for working const""... $ac_c" 1>&6 -echo "configure:1346: checking for working const" >&5 +echo "configure:1416: checking for working const" >&5 if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1470: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_const=yes else @@ -1417,21 +1487,21 @@ EOF fi echo $ac_n "checking for inline""... $ac_c" 1>&6 -echo "configure:1421: checking for inline" >&5 +echo "configure:1491: checking for inline" >&5 if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_cv_c_inline=no for ac_kw in inline __inline__ __inline; do cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1505: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_inline=$ac_kw; break else @@ -1457,12 +1527,12 @@ EOF esac echo $ac_n "checking for off_t""... $ac_c" 1>&6 -echo "configure:1461: checking for off_t" >&5 +echo "configure:1531: checking for off_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_off_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -1490,12 +1560,12 @@ EOF fi echo $ac_n "checking for size_t""... $ac_c" 1>&6 -echo "configure:1494: checking for size_t" >&5 +echo "configure:1564: checking for size_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -1525,19 +1595,19 @@ fi # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works # for constant arguments. Useless! echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6 -echo "configure:1529: checking for working alloca.h" >&5 +echo "configure:1599: checking for working alloca.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_alloca_h'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { char *p = alloca(2 * sizeof(int)); ; return 0; } EOF -if { (eval echo configure:1541: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1611: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_header_alloca_h=yes else @@ -1558,12 +1628,12 @@ EOF fi echo $ac_n "checking for alloca""... $ac_c" 1>&6 -echo "configure:1562: checking for alloca" >&5 +echo "configure:1632: checking for alloca" >&5 if eval "test \"`echo '$''{'ac_cv_func_alloca_works'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1665: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_func_alloca_works=yes else @@ -1623,12 +1693,12 @@ EOF echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6 -echo "configure:1627: checking whether alloca needs Cray hooks" >&5 +echo "configure:1697: checking whether alloca needs Cray hooks" >&5 if eval "test \"`echo '$''{'ac_cv_os_cray'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&6 if test $ac_cv_os_cray = yes; then for ac_func in _getb67 GETB67 getb67; do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:1657: checking for $ac_func" >&5 +echo "configure:1727: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1755: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -1708,7 +1778,7 @@ done fi echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6 -echo "configure:1712: checking stack direction for C alloca" >&5 +echo "configure:1782: checking stack direction for C alloca" >&5 if eval "test \"`echo '$''{'ac_cv_c_stack_direction'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1716,7 +1786,7 @@ else ac_cv_c_stack_direction=0 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:1809: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_c_stack_direction=1 else @@ -1760,17 +1830,17 @@ for ac_hdr in unistd.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:1764: checking for $ac_hdr" >&5 +echo "configure:1834: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1774: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1844: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -1799,12 +1869,12 @@ done for ac_func in getpagesize do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:1803: checking for $ac_func" >&5 +echo "configure:1873: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1901: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -1852,7 +1922,7 @@ fi done echo $ac_n "checking for working mmap""... $ac_c" 1>&6 -echo "configure:1856: checking for working mmap" >&5 +echo "configure:1926: checking for working mmap" >&5 if eval "test \"`echo '$''{'ac_cv_func_mmap_fixed_mapped'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1860,7 +1930,7 @@ else ac_cv_func_mmap_fixed_mapped=no else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2074: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_func_mmap_fixed_mapped=yes else @@ -2024,12 +2094,12 @@ fi echo $ac_n "checking whether we are using the GNU C Library 2.1 or newer""... $ac_c" 1>&6 -echo "configure:2028: checking whether we are using the GNU C Library 2.1 or newer" >&5 +echo "configure:2098: checking whether we are using the GNU C Library 2.1 or newer" >&5 if eval "test \"`echo '$''{'ac_cv_gnu_library_2_1'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -2065,17 +2135,17 @@ stdlib.h string.h unistd.h sys/param.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:2069: checking for $ac_hdr" >&5 +echo "configure:2139: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2079: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2149: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -2106,12 +2176,12 @@ getgid getuid mempcpy munmap putenv setenv setlocale stpcpy strchr strcasecmp \ strdup strtoul tsearch __argz_count __argz_stringify __argz_next do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:2110: checking for $ac_func" >&5 +echo "configure:2180: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2208: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -2174,7 +2244,7 @@ fi echo $ac_n "checking for iconv""... $ac_c" 1>&6 -echo "configure:2178: checking for iconv" >&5 +echo "configure:2248: checking for iconv" >&5 if eval "test \"`echo '$''{'am_cv_func_iconv'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2182,7 +2252,7 @@ else am_cv_func_iconv="no, consider installing GNU libiconv" am_cv_lib_iconv=no cat > conftest.$ac_ext < #include @@ -2192,7 +2262,7 @@ iconv_t cd = iconv_open("",""); iconv_close(cd); ; return 0; } EOF -if { (eval echo configure:2196: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2266: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* am_cv_func_iconv=yes else @@ -2204,7 +2274,7 @@ rm -f conftest* am_save_LIBS="$LIBS" LIBS="$LIBS -liconv" cat > conftest.$ac_ext < #include @@ -2214,7 +2284,7 @@ iconv_t cd = iconv_open("",""); iconv_close(cd); ; return 0; } EOF -if { (eval echo configure:2218: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2288: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* am_cv_lib_iconv=yes am_cv_func_iconv=yes @@ -2235,13 +2305,13 @@ echo "$ac_t""$am_cv_func_iconv" 1>&6 EOF echo $ac_n "checking for iconv declaration""... $ac_c" 1>&6 -echo "configure:2239: checking for iconv declaration" >&5 +echo "configure:2309: checking for iconv declaration" >&5 if eval "test \"`echo '$''{'am_cv_proto_iconv'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -2260,7 +2330,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:2264: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2334: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* am_cv_proto_iconv_arg1="" else @@ -2289,19 +2359,19 @@ EOF echo $ac_n "checking for nl_langinfo and CODESET""... $ac_c" 1>&6 -echo "configure:2293: checking for nl_langinfo and CODESET" >&5 +echo "configure:2363: checking for nl_langinfo and CODESET" >&5 if eval "test \"`echo '$''{'am_cv_langinfo_codeset'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { char* cs = nl_langinfo(CODESET); ; return 0; } EOF -if { (eval echo configure:2305: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2375: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* am_cv_langinfo_codeset=yes else @@ -2324,19 +2394,19 @@ EOF if test $ac_cv_header_locale_h = yes; then echo $ac_n "checking for LC_MESSAGES""... $ac_c" 1>&6 -echo "configure:2328: checking for LC_MESSAGES" >&5 +echo "configure:2398: checking for LC_MESSAGES" >&5 if eval "test \"`echo '$''{'am_cv_val_LC_MESSAGES'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { return LC_MESSAGES ; return 0; } EOF -if { (eval echo configure:2340: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2410: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* am_cv_val_LC_MESSAGES=yes else @@ -2357,7 +2427,7 @@ EOF fi fi echo $ac_n "checking whether NLS is requested""... $ac_c" 1>&6 -echo "configure:2361: checking whether NLS is requested" >&5 +echo "configure:2431: checking whether NLS is requested" >&5 # Check whether --enable-nls or --disable-nls was given. if test "${enable_nls+set}" = set; then enableval="$enable_nls" @@ -2379,7 +2449,7 @@ fi EOF echo $ac_n "checking whether included gettext is requested""... $ac_c" 1>&6 -echo "configure:2383: checking whether included gettext is requested" >&5 +echo "configure:2453: checking whether included gettext is requested" >&5 # Check whether --with-included-gettext or --without-included-gettext was given. if test "${with_included_gettext+set}" = set; then withval="$with_included_gettext" @@ -2399,17 +2469,17 @@ fi ac_safe=`echo "libintl.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for libintl.h""... $ac_c" 1>&6 -echo "configure:2403: checking for libintl.h" >&5 +echo "configure:2473: checking for libintl.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2413: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2483: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -2426,12 +2496,12 @@ fi if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then echo "$ac_t""yes" 1>&6 echo $ac_n "checking for GNU gettext in libc""... $ac_c" 1>&6 -echo "configure:2430: checking for GNU gettext in libc" >&5 +echo "configure:2500: checking for GNU gettext in libc" >&5 if eval "test \"`echo '$''{'gt_cv_func_gnugettext1_libc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < extern int _nl_msg_cat_cntr; @@ -2440,7 +2510,7 @@ bindtextdomain ("", ""); return (int) gettext ("") + _nl_msg_cat_cntr ; return 0; } EOF -if { (eval echo configure:2444: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2514: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* gt_cv_func_gnugettext1_libc=yes else @@ -2456,14 +2526,14 @@ echo "$ac_t""$gt_cv_func_gnugettext1_libc" 1>&6 if test "$gt_cv_func_gnugettext1_libc" != "yes"; then echo $ac_n "checking for GNU gettext in libintl""... $ac_c" 1>&6 -echo "configure:2460: checking for GNU gettext in libintl" >&5 +echo "configure:2530: checking for GNU gettext in libintl" >&5 if eval "test \"`echo '$''{'gt_cv_func_gnugettext1_libintl'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else gt_save_LIBS="$LIBS" LIBS="$LIBS -lintl $LIBICONV" cat > conftest.$ac_ext < extern int _nl_msg_cat_cntr; @@ -2472,7 +2542,7 @@ bindtextdomain ("", ""); return (int) gettext ("") + _nl_msg_cat_cntr ; return 0; } EOF -if { (eval echo configure:2476: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2546: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* gt_cv_func_gnugettext1_libintl=yes else @@ -2505,12 +2575,12 @@ EOF for ac_func in dcgettext do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:2509: checking for $ac_func" >&5 +echo "configure:2579: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2607: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -2562,7 +2632,7 @@ done # Extract the first word of "msgfmt", so it can be a program name with args. set dummy msgfmt; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2566: checking for $ac_word" >&5 +echo "configure:2636: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_MSGFMT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2596,7 +2666,7 @@ fi # Extract the first word of "gmsgfmt", so it can be a program name with args. set dummy gmsgfmt; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2600: checking for $ac_word" >&5 +echo "configure:2670: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_GMSGFMT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2633,7 +2703,7 @@ fi # Extract the first word of "xgettext", so it can be a program name with args. set dummy xgettext; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2637: checking for $ac_word" >&5 +echo "configure:2707: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_XGETTEXT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2683,7 +2753,7 @@ fi # Extract the first word of "msgfmt", so it can be a program name with args. set dummy msgfmt; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2687: checking for $ac_word" >&5 +echo "configure:2757: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_MSGFMT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2717,7 +2787,7 @@ fi # Extract the first word of "gmsgfmt", so it can be a program name with args. set dummy gmsgfmt; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2721: checking for $ac_word" >&5 +echo "configure:2791: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_GMSGFMT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2753,7 +2823,7 @@ fi # Extract the first word of "xgettext", so it can be a program name with args. set dummy xgettext; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2757: checking for $ac_word" >&5 +echo "configure:2827: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_XGETTEXT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2824,7 +2894,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2828: checking for $ac_word" >&5 +echo "configure:2898: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_INTLBISON'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2857,7 +2927,7 @@ done ac_verc_fail=yes else echo $ac_n "checking version of bison""... $ac_c" 1>&6 -echo "configure:2861: checking version of bison" >&5 +echo "configure:2931: checking version of bison" >&5 ac_prog_version=`$INTLBISON --version 2>&1 | sed -n 's/^.*GNU Bison.* \([0-9]*\.[0-9.]*\).*$/\1/p'` case $ac_prog_version in '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;; @@ -2904,7 +2974,7 @@ echo "configure:2861: checking version of bison" >&5 LINGUAS= else echo $ac_n "checking for catalogs to be installed""... $ac_c" 1>&6 -echo "configure:2908: checking for catalogs to be installed" >&5 +echo "configure:2978: checking for catalogs to be installed" >&5 NEW_LINGUAS= for presentlang in $ALL_LINGUAS; do useit=no @@ -2956,7 +3026,7 @@ echo "configure:2908: checking for catalogs to be installed" >&5 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # ./install, which can be erroneously created by make from ./install.sh. echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 -echo "configure:2960: checking for a BSD compatible install" >&5 +echo "configure:3030: checking for a BSD compatible install" >&5 if test -z "$INSTALL"; then if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3009,72 +3079,119 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}' test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' -# Check whether --with-words or --without-words was given. -if test "${with_words+set}" = set; then - withval="$with_words" - : +case x"${target_os}" in + x) + SYS=unknown + ;; + xlinux*) + SYS=linux + ;; + xbsdi*) + SYS=bsdi + LIB_DVD="${LIB_DVD} -ldvd" + LIB_VCD="${LIB_VCD} -ldvd" + ;; + xdarwin*) + SYS=darwin + ;; + x*mingw32*) + SYS=mingw32 + # Extract the first word of "${ac_tool_prefix}windres", so it can be a program name with args. +set dummy ${ac_tool_prefix}windres; ac_word=$2 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +echo "configure:3103: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_WINDRES'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + if test -n "$WINDRES"; then + ac_cv_prog_WINDRES="$WINDRES" # Let the user override the test. +else + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_prog_WINDRES="${ac_tool_prefix}windres" + break + fi + done + IFS="$ac_save_ifs" +fi +fi +WINDRES="$ac_cv_prog_WINDRES" +if test -n "$WINDRES"; then + echo "$ac_t""$WINDRES" 1>&6 +else + echo "$ac_t""no" 1>&6 fi - case "x$withval" in - xbig) - ac_cv_c_bigendian=yes - ;; - xlittle) - ac_cv_c_bigendian=no - ;; - *) - ac_cv_c_bigendian=unknown - echo $ac_n "checking what the byte order looks to be""... $ac_c" 1>&6 -echo "configure:3029: checking what the byte order looks to be" >&5 - cat >conftest.c <config.log 2>&1 \ - && test -f conftest.o - then - if test `grep -l BIGenDianSyS conftest.o` - then - echo "$ac_t"""big endian"" 1>&6 - ac_cv_c_bigendian=yes - fi - if test `grep -l LiTTleEnDian conftest.o` - then - echo "$ac_t"""little endian"" 1>&6 - ac_cv_c_bigendian=no - fi - fi - fi - if test $ac_cv_c_bigendian = xunknown - then - { echo "configure: error: Could not guess endianness, please use --with-words" 1>&2; exit 1; } - fi - if test $ac_cv_c_bigendian = yes - then - cat >> confdefs.h <<\EOF -#define WORDS_BIGENDIAN 1 -EOF - fi - ;; - esac -for ac_func in gettimeofday select strerror strtod strtol isatty +if test -z "$ac_cv_prog_WINDRES"; then +if test -n "$ac_tool_prefix"; then + # Extract the first word of "windres", so it can be a program name with args. +set dummy windres; ac_word=$2 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +echo "configure:3135: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_WINDRES'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + if test -n "$WINDRES"; then + ac_cv_prog_WINDRES="$WINDRES" # Let the user override the test. +else + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_prog_WINDRES="windres" + break + fi + done + IFS="$ac_save_ifs" + test -z "$ac_cv_prog_WINDRES" && ac_cv_prog_WINDRES=":" +fi +fi +WINDRES="$ac_cv_prog_WINDRES" +if test -n "$WINDRES"; then + echo "$ac_t""$WINDRES" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi + +else + WINDRES=":" +fi +fi + + LIB_IPV4="${LIB_IPV4} -lws2_32" + LIB_RC="${LIB_RC} -lws2_32" + ;; + x*nto*) + SYS=nto + LIB_X11="${LIB_X11} -lsocket" + LIB_XVIDEO="${LIB_XVIDEO} -lsocket" + ;; + xbeos) + SYS=beos + LIB_VLC="${LIB_VLC} -lbe" + LIB_BEOS="${LIB_BEOS} -lbe -lgame -lroot -ltracker" + LIB_IPV4="${LIB_IPV4} -lbind" + PLDFLAGS="${PLDFLAGS} -nostart" + ;; + x*) + SYS="${target_os}" + ;; +esac + +for ac_func in gettimeofday select strerror strtod strtol isatty usleep vasprintf swab sigrelse getpwuid memalign valloc do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:3073: checking for $ac_func" >&5 +echo "configure:3190: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3218: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -3121,13 +3238,14 @@ else fi done + echo $ac_n "checking for connect""... $ac_c" 1>&6 -echo "configure:3126: checking for connect" >&5 +echo "configure:3244: checking for connect" >&5 if eval "test \"`echo '$''{'ac_cv_func_connect'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3272: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_connect=yes" else @@ -3169,7 +3287,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6 -echo "configure:3173: checking for connect in -lsocket" >&5 +echo "configure:3291: checking for connect in -lsocket" >&5 ac_lib_var=`echo socket'_'connect | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3177,7 +3295,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lsocket $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3310: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3203,21 +3321,22 @@ LIBS="$ac_save_LIBS" fi if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then echo "$ac_t""yes" 1>&6 - LIB="${LIB} -lsocket" + LIB_IPV4="${LIB_IPV4} -lsocket" + LIB_VLC="${LIB_VLC} -lsocket" + else echo "$ac_t""no" 1>&6 fi - fi echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6 -echo "configure:3216: checking for gethostbyname" >&5 +echo "configure:3335: checking for gethostbyname" >&5 if eval "test \"`echo '$''{'ac_cv_func_gethostbyname'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3363: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_gethostbyname=yes" else @@ -3259,7 +3378,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6 -echo "configure:3263: checking for gethostbyname in -lnsl" >&5 +echo "configure:3382: checking for gethostbyname in -lnsl" >&5 ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3267,7 +3386,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lnsl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3401: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3293,7 +3412,7 @@ LIBS="$ac_save_LIBS" fi if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then echo "$ac_t""yes" 1>&6 - LIB="${LIB} -lnsl" + LIB_IPV4="${LIB_IPV4} -lnsl" else echo "$ac_t""no" 1>&6 fi @@ -3301,74 +3420,74 @@ fi fi -echo $ac_n "checking for nanosleep""... $ac_c" 1>&6 -echo "configure:3306: checking for nanosleep" >&5 -if eval "test \"`echo '$''{'ac_cv_func_nanosleep'+set}'`\" = set"; then +echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6 +echo "configure:3425: checking for gethostbyname" >&5 +if eval "test \"`echo '$''{'ac_cv_func_gethostbyname'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ -char nanosleep(); +char gethostbyname(); int main() { /* The GNU C library defines this for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ -#if defined (__stub_nanosleep) || defined (__stub___nanosleep) +#if defined (__stub_gethostbyname) || defined (__stub___gethostbyname) choke me #else -nanosleep(); +gethostbyname(); #endif ; return 0; } EOF -if { (eval echo configure:3334: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3453: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* - eval "ac_cv_func_nanosleep=yes" + eval "ac_cv_func_gethostbyname=yes" else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 rm -rf conftest* - eval "ac_cv_func_nanosleep=no" + eval "ac_cv_func_gethostbyname=no" fi rm -f conftest* fi -if eval "test \"`echo '$ac_cv_func_'nanosleep`\" = yes"; then +if eval "test \"`echo '$ac_cv_func_'gethostbyname`\" = yes"; then echo "$ac_t""yes" 1>&6 : else echo "$ac_t""no" 1>&6 - echo $ac_n "checking for nanosleep in -lrt""... $ac_c" 1>&6 -echo "configure:3353: checking for nanosleep in -lrt" >&5 -ac_lib_var=`echo rt'_'nanosleep | sed 'y%./+-%__p_%'` + echo $ac_n "checking for gethostbyname in -lbind""... $ac_c" 1>&6 +echo "configure:3472: checking for gethostbyname in -lbind" >&5 +ac_lib_var=`echo bind'_'gethostbyname | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_save_LIBS="$LIBS" -LIBS="-lrt $LIBS" +LIBS="-lbind $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3491: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3383,179 +3502,121 @@ LIBS="$ac_save_LIBS" fi if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then echo "$ac_t""yes" 1>&6 - LIB="${LIB} -lrt" + LIB_IPV4="${LIB_IPV4} -lbind" else echo "$ac_t""no" 1>&6 +fi - echo $ac_n "checking for nanosleep in -lposix4""... $ac_c" 1>&6 -echo "configure:3392: checking for nanosleep in -lposix4" >&5 -ac_lib_var=`echo posix4'_'nanosleep | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + +fi + +echo $ac_n "checking for nanosleep""... $ac_c" 1>&6 +echo "configure:3515: checking for nanosleep" >&5 +if eval "test \"`echo '$''{'ac_cv_func_nanosleep'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else - ac_save_LIBS="$LIBS" -LIBS="-lposix4 $LIBS" -cat > conftest.$ac_ext < conftest.$ac_ext < /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char nanosleep(); int main() { -nanosleep() + +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub_nanosleep) || defined (__stub___nanosleep) +choke me +#else +nanosleep(); +#endif + ; return 0; } EOF -if { (eval echo configure:3411: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3543: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" + eval "ac_cv_func_nanosleep=yes" else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -f conftest* -LIBS="$ac_save_LIBS" - -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - LIB="${LIB} -lposix4" -else - echo "$ac_t""no" 1>&6 -fi - - -fi - - -fi - -for ac_func in usleep -do -echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:3440: checking for $ac_func" >&5 -if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - cat > conftest.$ac_ext < -/* Override any gcc2 internal prototype to avoid an error. */ -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char $ac_func(); - -int main() { - -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub_$ac_func) || defined (__stub___$ac_func) -choke me -#else -$ac_func(); -#endif - -; return 0; } -EOF -if { (eval echo configure:3468: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_$ac_func=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_func_$ac_func=no" + eval "ac_cv_func_nanosleep=no" fi rm -f conftest* fi -if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then +if eval "test \"`echo '$ac_cv_func_'nanosleep`\" = yes"; then echo "$ac_t""yes" 1>&6 - ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` - cat >> confdefs.h <&6 -fi -done -echo $ac_n "checking for inet_aton""... $ac_c" 1>&6 -echo "configure:3493: checking for inet_aton" >&5 -if eval "test \"`echo '$''{'ac_cv_func_inet_aton'+set}'`\" = set"; then + echo $ac_n "checking for nanosleep in -lrt""... $ac_c" 1>&6 +echo "configure:3562: checking for nanosleep in -lrt" >&5 +ac_lib_var=`echo rt'_'nanosleep | sed 'y%./+-%__p_%'` +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else - cat > conftest.$ac_ext < conftest.$ac_ext < /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ -char inet_aton(); +char nanosleep(); int main() { - -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub_inet_aton) || defined (__stub___inet_aton) -choke me -#else -inet_aton(); -#endif - +nanosleep() ; return 0; } EOF -if { (eval echo configure:3521: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3581: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* - eval "ac_cv_func_inet_aton=yes" + eval "ac_cv_lib_$ac_lib_var=yes" else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 rm -rf conftest* - eval "ac_cv_func_inet_aton=no" + eval "ac_cv_lib_$ac_lib_var=no" fi rm -f conftest* -fi +LIBS="$ac_save_LIBS" -if eval "test \"`echo '$ac_cv_func_'inet_aton`\" = yes"; then +fi +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then echo "$ac_t""yes" 1>&6 - : + LIB_VLC="${LIB_VLC} -lrt" else echo "$ac_t""no" 1>&6 - echo $ac_n "checking for inet_aton in -lresolv""... $ac_c" 1>&6 -echo "configure:3540: checking for inet_aton in -lresolv" >&5 -ac_lib_var=`echo resolv'_'inet_aton | sed 'y%./+-%__p_%'` + echo $ac_n "checking for nanosleep in -lposix4""... $ac_c" 1>&6 +echo "configure:3601: checking for nanosleep in -lposix4" >&5 +ac_lib_var=`echo posix4'_'nanosleep | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_save_LIBS="$LIBS" -LIBS="-lresolv $LIBS" +LIBS="-lposix4 $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3620: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3570,244 +3631,206 @@ LIBS="$ac_save_LIBS" fi if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then echo "$ac_t""yes" 1>&6 - LIB="${LIB} -lresolv" + LIB_VLC="${LIB_VLC} -lposix4" else echo "$ac_t""no" 1>&6 fi + +fi + fi -for ac_func in vasprintf -do -echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:3585: checking for $ac_func" >&5 -if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then +echo $ac_n "checking for inet_aton""... $ac_c" 1>&6 +echo "configure:3647: checking for inet_aton" >&5 +if eval "test \"`echo '$''{'ac_cv_func_inet_aton'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ -char $ac_func(); +char inet_aton(); int main() { /* The GNU C library defines this for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ -#if defined (__stub_$ac_func) || defined (__stub___$ac_func) +#if defined (__stub_inet_aton) || defined (__stub___inet_aton) choke me #else -$ac_func(); +inet_aton(); #endif ; return 0; } EOF -if { (eval echo configure:3613: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3675: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* - eval "ac_cv_func_$ac_func=yes" + eval "ac_cv_func_inet_aton=yes" else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 rm -rf conftest* - eval "ac_cv_func_$ac_func=no" + eval "ac_cv_func_inet_aton=no" fi rm -f conftest* fi -if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then +if eval "test \"`echo '$ac_cv_func_'inet_aton`\" = yes"; then echo "$ac_t""yes" 1>&6 - ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` - cat >> confdefs.h <&6 -fi -done -for ac_func in swab -do -echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:3640: checking for $ac_func" >&5 -if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then + echo $ac_n "checking for inet_aton in -lresolv""... $ac_c" 1>&6 +echo "configure:3694: checking for inet_aton in -lresolv" >&5 +ac_lib_var=`echo resolv'_'inet_aton | sed 'y%./+-%__p_%'` +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else - cat > conftest.$ac_ext < conftest.$ac_ext < /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ -char $ac_func(); +char inet_aton(); int main() { - -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub_$ac_func) || defined (__stub___$ac_func) -choke me -#else -$ac_func(); -#endif - +inet_aton() ; return 0; } EOF -if { (eval echo configure:3668: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3713: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* - eval "ac_cv_func_$ac_func=yes" + eval "ac_cv_lib_$ac_lib_var=yes" else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 rm -rf conftest* - eval "ac_cv_func_$ac_func=no" + eval "ac_cv_lib_$ac_lib_var=no" fi rm -f conftest* -fi +LIBS="$ac_save_LIBS" -if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then +fi +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then echo "$ac_t""yes" 1>&6 - ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` - cat >> confdefs.h <&6 fi -done -for ac_func in memalign valloc -do -echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:3695: checking for $ac_func" >&5 -if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then + +fi + +echo $ac_n "checking for textdomain""... $ac_c" 1>&6 +echo "configure:3737: checking for textdomain" >&5 +if eval "test \"`echo '$''{'ac_cv_func_textdomain'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ -char $ac_func(); +char textdomain(); int main() { /* The GNU C library defines this for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ -#if defined (__stub_$ac_func) || defined (__stub___$ac_func) +#if defined (__stub_textdomain) || defined (__stub___textdomain) choke me #else -$ac_func(); +textdomain(); #endif ; return 0; } EOF -if { (eval echo configure:3723: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3765: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* - eval "ac_cv_func_$ac_func=yes" + eval "ac_cv_func_textdomain=yes" else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 rm -rf conftest* - eval "ac_cv_func_$ac_func=no" + eval "ac_cv_func_textdomain=no" fi rm -f conftest* fi -if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then +if eval "test \"`echo '$ac_cv_func_'textdomain`\" = yes"; then echo "$ac_t""yes" 1>&6 - ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` - cat >> confdefs.h <&6 -fi -done - -for ac_func in sigrelse -do -echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:3751: checking for $ac_func" >&5 -if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then + echo $ac_n "checking for textdomain in -lintl""... $ac_c" 1>&6 +echo "configure:3784: checking for textdomain in -lintl" >&5 +ac_lib_var=`echo intl'_'textdomain | sed 'y%./+-%__p_%'` +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else - cat > conftest.$ac_ext < conftest.$ac_ext < /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ -char $ac_func(); +char textdomain(); int main() { - -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub_$ac_func) || defined (__stub___$ac_func) -choke me -#else -$ac_func(); -#endif - +textdomain() ; return 0; } EOF -if { (eval echo configure:3779: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3803: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* - eval "ac_cv_func_$ac_func=yes" + eval "ac_cv_lib_$ac_lib_var=yes" else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 rm -rf conftest* - eval "ac_cv_func_$ac_func=no" + eval "ac_cv_lib_$ac_lib_var=no" fi rm -f conftest* -fi +LIBS="$ac_save_LIBS" -if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then +fi +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then echo "$ac_t""yes" 1>&6 - ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` - cat >> confdefs.h <&6 fi -done + + +fi NEED_GETOPT=0 echo $ac_n "checking for getopt_long""... $ac_c" 1>&6 -echo "configure:3806: checking for getopt_long" >&5 +echo "configure:3829: checking for getopt_long" >&5 if eval "test \"`echo '$''{'ac_cv_func_getopt_long'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3857: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_getopt_long=yes" else @@ -3852,7 +3875,7 @@ else echo "$ac_t""no" 1>&6 # FreeBSD has a gnugetopt library for this: echo $ac_n "checking for getopt_long in -lgnugetopt""... $ac_c" 1>&6 -echo "configure:3856: checking for getopt_long in -lgnugetopt" >&5 +echo "configure:3879: checking for getopt_long in -lgnugetopt" >&5 ac_lib_var=`echo gnugetopt'_'getopt_long | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3860,7 +3883,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lgnugetopt $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3898: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3889,7 +3912,7 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then cat >> confdefs.h <<\EOF #define HAVE_GETOPT_LONG 1 EOF - LIB="${LIB} -lgnugetopt" + LIB_VLC="${LIB_VLC} -lgnugetopt" else echo "$ac_t""no" 1>&6 NEED_GETOPT=1 @@ -3899,12 +3922,12 @@ fi echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6 -echo "configure:3903: checking return type of signal handlers" >&5 +echo "configure:3926: checking return type of signal handlers" >&5 if eval "test \"`echo '$''{'ac_cv_type_signal'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -3921,7 +3944,7 @@ int main() { int i; ; return 0; } EOF -if { (eval echo configure:3925: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3948: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_type_signal=void else @@ -3940,7 +3963,7 @@ EOF echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6 -echo "configure:3944: checking for dlopen in -ldl" >&5 +echo "configure:3967: checking for dlopen in -ldl" >&5 ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3948,7 +3971,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ldl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3986: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3974,13 +3997,13 @@ LIBS="$ac_save_LIBS" fi if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then echo "$ac_t""yes" 1>&6 - LIB="${LIB} -ldl" + LIB_VLC="${LIB_VLC} -ldl" else echo "$ac_t""no" 1>&6 fi echo $ac_n "checking for cos in -lm""... $ac_c" 1>&6 -echo "configure:3984: checking for cos in -lm" >&5 +echo "configure:4007: checking for cos in -lm" >&5 ac_lib_var=`echo m'_'cos | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3988,7 +4011,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lm $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4026: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4021,7 +4044,7 @@ else fi echo $ac_n "checking for pow in -lm""... $ac_c" 1>&6 -echo "configure:4025: checking for pow in -lm" >&5 +echo "configure:4048: checking for pow in -lm" >&5 ac_lib_var=`echo m'_'pow | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4029,7 +4052,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lm $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4067: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4058,6 +4081,7 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then LIB_IMDCT="${LIB_IMDCT} -lm" LIB_IMDCT3DN="${LIB_IMDCT3DN} -lm" LIB_IMDCTSSE="${LIB_IMDCTSSE} -lm" + LIB_CHROMA_I420_RGB="${LIB_CHROMA_I420_RGB} -lm" else echo "$ac_t""no" 1>&6 @@ -4067,7 +4091,7 @@ fi THREAD_LIB=error if test "x${THREAD_LIB}" = xerror; then echo $ac_n "checking for pthread_attr_init in -lpthread""... $ac_c" 1>&6 -echo "configure:4071: checking for pthread_attr_init in -lpthread" >&5 +echo "configure:4095: checking for pthread_attr_init in -lpthread" >&5 ac_lib_var=`echo pthread'_'pthread_attr_init | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4075,7 +4099,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lpthread $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4114: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4109,7 +4133,7 @@ fi fi if test "x${THREAD_LIB}" = xerror; then echo $ac_n "checking for pthread_attr_init in -lpthreads""... $ac_c" 1>&6 -echo "configure:4113: checking for pthread_attr_init in -lpthreads" >&5 +echo "configure:4137: checking for pthread_attr_init in -lpthreads" >&5 ac_lib_var=`echo pthreads'_'pthread_attr_init | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4117,7 +4141,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lpthreads $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4156: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4151,7 +4175,7 @@ fi fi if test "x${THREAD_LIB}" = xerror; then echo $ac_n "checking for pthread_attr_init in -lc_r""... $ac_c" 1>&6 -echo "configure:4155: checking for pthread_attr_init in -lc_r" >&5 +echo "configure:4179: checking for pthread_attr_init in -lc_r" >&5 ac_lib_var=`echo c_r'_'pthread_attr_init | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4159,7 +4183,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lc_r $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4198: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4193,12 +4217,12 @@ fi fi if test "x${THREAD_LIB}" = xerror; then echo $ac_n "checking for pthread_attr_init""... $ac_c" 1>&6 -echo "configure:4197: checking for pthread_attr_init" >&5 +echo "configure:4221: checking for pthread_attr_init" >&5 if eval "test \"`echo '$''{'ac_cv_func_pthread_attr_init'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4249: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_pthread_attr_init=yes" else @@ -4244,7 +4268,7 @@ fi fi echo $ac_n "checking for cthread_fork in -lthreads""... $ac_c" 1>&6 -echo "configure:4248: checking for cthread_fork in -lthreads" >&5 +echo "configure:4272: checking for cthread_fork in -lthreads" >&5 ac_lib_var=`echo threads'_'cthread_fork | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4252,7 +4276,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lthreads $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4291: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4285,7 +4309,7 @@ fi cat > conftest.$ac_ext < EOF @@ -4301,7 +4325,7 @@ fi rm -f conftest* cat > conftest.$ac_ext < EOF @@ -4321,17 +4345,17 @@ for ac_hdr in getopt.h strings.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:4325: checking for $ac_hdr" >&5 +echo "configure:4349: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4335: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4359: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -4361,17 +4385,17 @@ for ac_hdr in sys/sockio.h fcntl.h sys/time.h sys/times.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:4365: checking for $ac_hdr" >&5 +echo "configure:4389: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4375: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4399: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -4397,21 +4421,21 @@ else fi done -for ac_hdr in sys/soundcard.h machine/soundcard.h +for ac_hdr in dlfcn.h image.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:4405: checking for $ac_hdr" >&5 +echo "configure:4429: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4415: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4439: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -4437,21 +4461,21 @@ else fi done -for ac_hdr in dlfcn.h image.h +for ac_hdr in arpa/inet.h net/if.h netinet/in.h sys/socket.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:4445: checking for $ac_hdr" >&5 +echo "configure:4469: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4455: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4479: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -4477,21 +4501,21 @@ else fi done -for ac_hdr in arpa/inet.h net/if.h netinet/in.h sys/socket.h +for ac_hdr in machine/param.h sys/shm.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:4485: checking for $ac_hdr" >&5 +echo "configure:4509: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4495: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4519: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -4517,21 +4541,21 @@ else fi done -for ac_hdr in machine/param.h +for ac_hdr in linux/version.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:4525: checking for $ac_hdr" >&5 +echo "configure:4549: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4535: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4559: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -4559,12 +4583,12 @@ done echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6 -echo "configure:4563: checking whether time.h and sys/time.h may both be included" >&5 +echo "configure:4587: checking whether time.h and sys/time.h may both be included" >&5 if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -4573,7 +4597,7 @@ int main() { struct tm *tp; ; return 0; } EOF -if { (eval echo configure:4577: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4601: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_header_time=yes else @@ -4598,17 +4622,17 @@ for ac_hdr in cthreads.h pthread.h kernel/scheduler.h kernel/OS.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:4602: checking for $ac_hdr" >&5 +echo "configure:4626: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4612: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4636: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -4635,21 +4659,92 @@ fi done -echo $ac_n "checking for ntohl in sys/param.h""... $ac_c" 1>&6 -echo "configure:4640: checking for ntohl in sys/param.h" >&5 -if eval "test \"`echo '$''{'ac_cv_c_ntohl_sys_param_h'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - CFLAGS="${save_CFLAGS} -Wall -Werror" - cat > conftest.$ac_ext < -int main() { -void foo() { int meuh; ntohl(meuh); } -; return 0; } +if test x$SYS != xmingw32 +then + if test x$x_includes = xNONE; then + x_includes=/usr/X11R6/include + fi + if test x$x_libraries = xNONE; then + x_libraries=/usr/X11R6/lib + fi + saved_CPPFLAGS=$CPPFLAGS + CPPFLAGS="$CPPFLAGS -I$x_includes" + for ac_hdr in X11/extensions/dpms.h +do +ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` +echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 +echo "configure:4677: checking for $ac_hdr" >&5 +if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + cat > conftest.$ac_ext < +EOF +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +{ (eval echo configure:4687: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` +if test -z "$ac_err"; then + rm -rf conftest* + eval "ac_cv_header_$ac_safe=yes" +else + echo "$ac_err" >&5 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_header_$ac_safe=no" +fi +rm -f conftest* +fi +if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then + echo "$ac_t""yes" 1>&6 + ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` + cat >> confdefs.h < conftest.$ac_ext < +EOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + egrep "DPMSInfo" >/dev/null 2>&1; then + rm -rf conftest* + + cat >> confdefs.h <<\EOF +#define DPMSINFO_IN_DPMS_H 1 +EOF + + +fi +rm -f conftest* + + +else + echo "$ac_t""no" 1>&6 +fi +done + + CPPFLAGS=$saved_CPPFLAGS +fi + +echo $ac_n "checking for ntohl in sys/param.h""... $ac_c" 1>&6 +echo "configure:4735: checking for ntohl in sys/param.h" >&5 +if eval "test \"`echo '$''{'ac_cv_c_ntohl_sys_param_h'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + CFLAGS="${save_CFLAGS} -Wall -Werror" + cat > conftest.$ac_ext < +int main() { +void foo() { int meuh; ntohl(meuh); } +; return 0; } EOF -if { (eval echo configure:4653: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4748: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_ntohl_sys_param_h=yes else @@ -4670,20 +4765,20 @@ EOF fi echo $ac_n "checking if \$CC accepts -finline-limit""... $ac_c" 1>&6 -echo "configure:4674: checking if \$CC accepts -finline-limit" >&5 +echo "configure:4769: checking if \$CC accepts -finline-limit" >&5 if eval "test \"`echo '$''{'ac_cv_c_inline_limit'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else CFLAGS="${save_CFLAGS} -finline-limit-30000" cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4782: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_inline_limit=yes else @@ -4701,20 +4796,20 @@ if test x"$ac_cv_c_inline_limit" != x"no"; then fi echo $ac_n "checking if \$CC accepts -Wall -Winline""... $ac_c" 1>&6 -echo "configure:4705: checking if \$CC accepts -Wall -Winline" >&5 +echo "configure:4800: checking if \$CC accepts -Wall -Winline" >&5 if eval "test \"`echo '$''{'ac_cv_c_Wall_Winline'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else CFLAGS="${save_CFLAGS} -Wall -Winline" cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4813: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_Wall_Winline=yes else @@ -4731,20 +4826,20 @@ if test x"$ac_cv_c_Wall_Winline" != x"no"; then save_CFLAGS="${save_CFLAGS} -Wall -Winline" else echo $ac_n "checking if \$CC accepts -wall -winline""... $ac_c" 1>&6 -echo "configure:4735: checking if \$CC accepts -wall -winline" >&5 +echo "configure:4830: checking if \$CC accepts -wall -winline" >&5 if eval "test \"`echo '$''{'ac_cv_c_wall_winline'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else CFLAGS="${save_CFLAGS} -wall -winline" cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4843: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_wall_winline=yes else @@ -4763,20 +4858,20 @@ echo "$ac_t""$ac_cv_c_wall_winline" 1>&6 fi echo $ac_n "checking if \$CC accepts -pipe""... $ac_c" 1>&6 -echo "configure:4767: checking if \$CC accepts -pipe" >&5 +echo "configure:4862: checking if \$CC accepts -pipe" >&5 if eval "test \"`echo '$''{'ac_cv_c_pipe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else CFLAGS="${save_CFLAGS} -pipe" cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4875: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_pipe=yes else @@ -4794,20 +4889,20 @@ if test x"$ac_cv_c_pipe" != x"no"; then fi echo $ac_n "checking if \$CC accepts -O3""... $ac_c" 1>&6 -echo "configure:4798: checking if \$CC accepts -O3" >&5 +echo "configure:4893: checking if \$CC accepts -O3" >&5 if eval "test \"`echo '$''{'ac_cv_c_o3'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else CFLAGS="${save_CFLAGS} -O3" cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4906: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_o3=yes else @@ -4824,20 +4919,20 @@ if test x"$ac_cv_c_o3" != x"no"; then CFLAGS_OPTIM="${CFLAGS_OPTIM} -O3" else echo $ac_n "checking if \$CC accepts -O2""... $ac_c" 1>&6 -echo "configure:4828: checking if \$CC accepts -O2" >&5 +echo "configure:4923: checking if \$CC accepts -O2" >&5 if eval "test \"`echo '$''{'ac_cv_c_o2'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else CFLAGS="${save_CFLAGS} -O2" cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4936: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_o2=yes else @@ -4854,20 +4949,20 @@ echo "$ac_t""$ac_cv_c_o2" 1>&6 CFLAGS_OPTIM="${CFLAGS_OPTIM} -O2" else echo $ac_n "checking if \$CC accepts -O""... $ac_c" 1>&6 -echo "configure:4858: checking if \$CC accepts -O" >&5 +echo "configure:4953: checking if \$CC accepts -O" >&5 if eval "test \"`echo '$''{'ac_cv_c_o'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else CFLAGS="${save_CFLAGS} -O" cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4966: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_o=yes else @@ -4887,20 +4982,20 @@ echo "$ac_t""$ac_cv_c_o" 1>&6 fi echo $ac_n "checking if \$CC accepts -ffast-math""... $ac_c" 1>&6 -echo "configure:4891: checking if \$CC accepts -ffast-math" >&5 +echo "configure:4986: checking if \$CC accepts -ffast-math" >&5 if eval "test \"`echo '$''{'ac_cv_c_fast_math'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else CFLAGS="${save_CFLAGS} -ffast-math" cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4999: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_fast_math=yes else @@ -4918,20 +5013,20 @@ if test x"$ac_cv_c_fast_math" != x"no"; then fi echo $ac_n "checking if \$CC accepts -funroll-loops""... $ac_c" 1>&6 -echo "configure:4922: checking if \$CC accepts -funroll-loops" >&5 +echo "configure:5017: checking if \$CC accepts -funroll-loops" >&5 if eval "test \"`echo '$''{'ac_cv_c_unroll_loops'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else CFLAGS="${save_CFLAGS} -funroll-loops" cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5030: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_unroll_loops=yes else @@ -4949,20 +5044,20 @@ if test x"$ac_cv_c_unroll_loops" != x"no"; then fi echo $ac_n "checking if \$CC accepts -fomit-frame-pointer""... $ac_c" 1>&6 -echo "configure:4953: checking if \$CC accepts -fomit-frame-pointer" >&5 +echo "configure:5048: checking if \$CC accepts -fomit-frame-pointer" >&5 if eval "test \"`echo '$''{'ac_cv_c_omit_frame_pointer'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else CFLAGS="${save_CFLAGS} -fomit-frame-pointer" cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5061: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_omit_frame_pointer=yes else @@ -4979,21 +5074,21 @@ if test x"$ac_cv_c_omit_frame_pointer" != x"no"; then CFLAGS_OPTIM_NODEBUG="${CFLAGS_OPTIM_NODEBUG} -fomit-frame-pointer" fi -echo $ac_n "checking if \$CC accepts -bundle -undefined error""... $ac_c" 1>&6 -echo "configure:4984: checking if \$CC accepts -bundle -undefined error" >&5 +echo $ac_n "checking if \$CC accepts -bundle -undefined error -lcc_dynamic""... $ac_c" 1>&6 +echo "configure:5079: checking if \$CC accepts -bundle -undefined error -lcc_dynamic" >&5 if eval "test \"`echo '$''{'ac_cv_ld_darwin'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else - CFLAGS="${save_CFLAGS} -bundle -undefined error" + CFLAGS="${save_CFLAGS} -bundle -undefined error -lcc_dynamic" cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5092: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_ld_darwin=yes else @@ -5007,24 +5102,24 @@ fi echo "$ac_t""$ac_cv_ld_darwin" 1>&6 if test x"$ac_cv_ld_darwin" != x"no"; then - PLDFLAGS="${PLDFLAGS} -bundle -undefined error" + PLDFLAGS="${PLDFLAGS} -bundle -undefined error -lcc_dynamic" fi echo $ac_n "checking if \$CC accepts -shared""... $ac_c" 1>&6 -echo "configure:5015: checking if \$CC accepts -shared" >&5 +echo "configure:5110: checking if \$CC accepts -shared" >&5 if eval "test \"`echo '$''{'ac_cv_ld_plugins'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else CFLAGS="${save_CFLAGS} -shared" cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5123: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_ld_plugins=yes else @@ -5041,73 +5136,8 @@ if test x"$ac_cv_ld_plugins" != x"no"; then PLDFLAGS="${PLDFLAGS} -shared" fi -if test x"${SOFLAGS}" = x; then - echo $ac_n "checking for soname setting""... $ac_c" 1>&6 -echo "configure:5047: checking for soname setting" >&5 -if eval "test \"`echo '$''{'ac_cv_ld_soname'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - - # Standard - try_SOFLAGS="-Wl,-soname -Wl," - LDFLAGS="${save_LDFLAGS} ${try_SOFLAGS}foo.so.0" - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - ac_cv_ld_soname="${try_SOFLAGS}" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - - # SunOS - try_SOFLAGS="-Wl,-h -Wl," - LDFLAGS="${save_LDFLAGS} ${try_SOFLAGS}foo.so.0" - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - ac_cv_ld_soname="${try_SOFLAGS}" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - ac_cv_ld_soname=none -fi -rm -f conftest* - -fi -rm -f conftest* -fi - -echo "$ac_t""$ac_cv_ld_soname" 1>&6 - if test x"$ac_cv_ld_soname" != x"none"; then - SOFLAGS=$ac_cv_ld_soname - else - echo " ------------- -Your system doesn't seem to have support for dynamic linking. You may -have problems using libdvdcss. ------------- -" - fi -fi - echo $ac_n "checking __attribute__ ((aligned ())) support""... $ac_c" 1>&6 -echo "configure:5111: checking __attribute__ ((aligned ())) support" >&5 +echo "configure:5141: checking __attribute__ ((aligned ())) support" >&5 if eval "test \"`echo '$''{'ac_cv_c_attribute_aligned'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -5115,14 +5145,14 @@ else CFLAGS="${save_CFLAGS} -Werror" for ac_cv_c_attr_align_try in 2 4 8 16 32 64; do cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5156: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_attribute_aligned=$ac_cv_c_attr_align_try else @@ -5145,19 +5175,19 @@ CFLAGS="${save_CFLAGS}" LDFLAGS="${save_LDFLAGS}" echo $ac_n "checking for boolean_t in sys/types.h""... $ac_c" 1>&6 -echo "configure:5149: checking for boolean_t in sys/types.h" >&5 +echo "configure:5179: checking for boolean_t in sys/types.h" >&5 if eval "test \"`echo '$''{'ac_cv_c_boolean_t_sys_types_h'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { boolean_t foo; ; return 0; } EOF -if { (eval echo configure:5161: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5191: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_boolean_t_sys_types_h=yes else @@ -5178,19 +5208,19 @@ EOF fi echo $ac_n "checking for boolean_t in pthread.h""... $ac_c" 1>&6 -echo "configure:5182: checking for boolean_t in pthread.h" >&5 +echo "configure:5212: checking for boolean_t in pthread.h" >&5 if eval "test \"`echo '$''{'ac_cv_c_boolean_t_pthread_h'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { boolean_t foo; ; return 0; } EOF -if { (eval echo configure:5194: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5224: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_boolean_t_pthread_h=yes else @@ -5211,19 +5241,19 @@ EOF fi echo $ac_n "checking for boolean_t in cthreads.h""... $ac_c" 1>&6 -echo "configure:5215: checking for boolean_t in cthreads.h" >&5 +echo "configure:5245: checking for boolean_t in cthreads.h" >&5 if eval "test \"`echo '$''{'ac_cv_c_boolean_t_cthreads_h'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { boolean_t foo; ; return 0; } EOF -if { (eval echo configure:5227: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5257: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_boolean_t_cthreads_h=yes else @@ -5248,33 +5278,35 @@ case x"${target_cpu}" in ARCH=unknown ;; *) - ARCH=${target_cpu} + ARCH="${target_cpu}" ;; esac -BUILTINS="${BUILTINS} mpeg_es mpeg_ps mpeg_ts memcpy idct idctclassic motion imdct downmix chroma_i420_rgb chroma_i420_yuy2 chroma_i422_yuy2 chroma_i420_ymga mpeg_adec ac3_adec mpeg_vdec" -PLUGINS="${PLUGINS} lpcm_adec ac3_spdif spudec filter_deinterlace filter_invert filter_wall filter_transform filter_distort" +BUILTINS="${BUILTINS} idct idctclassic motion imdct downmix chroma_i420_rgb chroma_i420_yuy2 chroma_i422_yuy2 chroma_i420_ymga mpeg_adec ac3_adec mpeg_vdec" +PLUGINS="${PLUGINS} dummy null rc logger mpeg_es mpeg_ps mpeg_ts file udp http ipv4 memcpy lpcm_adec ac3_spdif spudec filter_deinterlace filter_invert filter_wall filter_transform filter_distort fx_scope" MMX_MODULES="memcpymmx idctmmx motionmmx chroma_i420_rgb_mmx chroma_i420_yuy2_mmx chroma_i422_yuy2_mmx chroma_i420_ymga_mmx" MMXEXT_MODULES="memcpymmxext idctmmxext motionmmxext" THREEDNOW_MODULES="memcpy3dn imdct3dn downmix3dn" -SSE_MODULES="imdctsse downmixsse" +if test x$SYS != xmingw32; then + SSE_MODULES="imdctsse downmixsse" +fi ALTIVEC_MODULES="idctaltivec motionaltivec" echo $ac_n "checking if \$CC groks MMX inline assembly""... $ac_c" 1>&6 -echo "configure:5266: checking if \$CC groks MMX inline assembly" >&5 +echo "configure:5298: checking if \$CC groks MMX inline assembly" >&5 if eval "test \"`echo '$''{'ac_cv_mmx_inline'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5310: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_mmx_inline=yes else @@ -5292,19 +5324,19 @@ if test x"$ac_cv_mmx_inline" != x"no"; then fi echo $ac_n "checking if \$CC groks MMX EXT inline assembly""... $ac_c" 1>&6 -echo "configure:5296: checking if \$CC groks MMX EXT inline assembly" >&5 +echo "configure:5328: checking if \$CC groks MMX EXT inline assembly" >&5 if eval "test \"`echo '$''{'ac_cv_mmxext_inline'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5340: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_mmxext_inline=yes else @@ -5322,19 +5354,19 @@ if test x"$ac_cv_mmxext_inline" != x"no"; then fi echo $ac_n "checking if \$CC groks 3D Now! inline assembly""... $ac_c" 1>&6 -echo "configure:5326: checking if \$CC groks 3D Now! inline assembly" >&5 +echo "configure:5358: checking if \$CC groks 3D Now! inline assembly" >&5 if eval "test \"`echo '$''{'ac_cv_3dnow_inline'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5370: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_3dnow_inline=yes else @@ -5356,19 +5388,19 @@ EOF fi echo $ac_n "checking if \$CC groks SSE inline assembly""... $ac_c" 1>&6 -echo "configure:5360: checking if \$CC groks SSE inline assembly" >&5 +echo "configure:5392: checking if \$CC groks SSE inline assembly" >&5 if eval "test \"`echo '$''{'ac_cv_sse_inline'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5404: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_sse_inline=yes else @@ -5389,20 +5421,23 @@ EOF ACCEL_MODULES="${ACCEL_MODULES} ${SSE_MODULES}" fi +# don't try to grok altivec with native mingw32 it doesn't work right now +# we should be able to remove this test with future versions of mingw32 +if test x$SYS != xmingw32; then echo $ac_n "checking if \$CC groks Altivec inline assembly""... $ac_c" 1>&6 -echo "configure:5394: checking if \$CC groks Altivec inline assembly" >&5 +echo "configure:5429: checking if \$CC groks Altivec inline assembly" >&5 if eval "test \"`echo '$''{'ac_cv_altivec_inline'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5441: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_altivec_inline=yes else @@ -5412,14 +5447,14 @@ else save_CFLAGS=$CFLAGS CFLAGS="$CFLAGS -Wa,-m7400" cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5458: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_altivec_inline="-Wa,-m7400" else @@ -5444,13 +5479,14 @@ EOF if test x"$ac_cv_altivec_inline" != x"yes"; then CFLAGS_IDCTALTIVEC="$CFLAGS_IDCTALTIVEC $ac_cv_altivec_inline" CFLAGS_MOTIONALTIVEC="$CFLAGS_MOTIONALTIVEC $ac_cv_altivec_inline" + CFLAGS_MEMCPYALTIVEC="$CFLAGS_MEMCPYALTIVEC $ac_cv_altivec_inline" CFLAGS_VLC="$CFLAGS_VLC $ac_cv_altivec_inline" fi ACCEL_MODULES="${ACCEL_MODULES} ${ALTIVEC_MODULES}" fi echo $ac_n "checking if \$CC groks Altivec C extensions""... $ac_c" 1>&6 -echo "configure:5454: checking if \$CC groks Altivec C extensions" >&5 +echo "configure:5490: checking if \$CC groks Altivec C extensions" >&5 if eval "test \"`echo '$''{'ac_cv_c_altivec'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -5458,14 +5494,14 @@ else CFLAGS="$CFLAGS -faltivec" # Darwin test cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5505: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_altivec=-faltivec else @@ -5476,14 +5512,14 @@ else # Linux/PPC test CFLAGS="$save_CFLAGS $CFLAGS_IDCTALTIVEC -fvec" cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5523: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_altivec="-fvec" else @@ -5508,26 +5544,27 @@ EOF CFLAGS_IDCTALTIVEC="$CFLAGS_IDCTALTIVEC $ac_cv_c_altivec" CFLAGS_MOTIONALTIVEC="$CFLAGS_MOTIONALTIVEC $ac_cv_c_altivec" + CFLAGS_MEMCPYALTIVEC="$CFLAGS_MEMCPYALTIVEC $ac_cv_c_altivec" CFLAGS_VLC="$CFLAGS_VLC $ac_cv_c_altivec" ACCEL_MODULES="${ACCEL_MODULES} ${ALTIVEC_MODULES}" fi echo $ac_n "checking if linker needs -framework vecLib""... $ac_c" 1>&6 -echo "configure:5517: checking if linker needs -framework vecLib" >&5 +echo "configure:5554: checking if linker needs -framework vecLib" >&5 if eval "test \"`echo '$''{'ac_cv_ld_altivec'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else save_LDFLAGS=$LDFLAGS LDFLAGS="$LDFLAGS -framework vecLib" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5568: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_ld_altivec=yes else @@ -5545,149 +5582,130 @@ echo "$ac_t""$ac_cv_ld_altivec" 1>&6 if test x"$ac_cv_ld_altivec" != x"no"; then LIB_IDCTALTIVEC="${LIB_IDCTALTIVEC} -framework vecLib" LIB_MOTIONALTIVEC="${LIB_MOTIONALTIVEC} -framework vecLib" - LIB="${LIB} -framework vecLib" + LIB_MEMCPYALTIVEC="${LIB_MEMCPYALTIVEC} -framework vecLib" + LIB_VLC="${LIB_VLC} -framework vecLib" fi +fi # end if mingw32 -case x"${target_os}" in - x) - SYS=unknown - ;; - xlinux*) - SYS=linux - ;; - xbsdi*) - SYS=bsdi - ;; - xdarwin*) - SYS=darwin - ;; - x*mingw32*) - SYS=mingw32 - # Extract the first word of "${ac_tool_prefix}windres", so it can be a program name with args. -set dummy ${ac_tool_prefix}windres; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:5570: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_WINDRES'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - if test -n "$WINDRES"; then - ac_cv_prog_WINDRES="$WINDRES" # Let the user override the test. -else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_prog_WINDRES="${ac_tool_prefix}windres" - break - fi - done - IFS="$ac_save_ifs" -fi + +# Check whether --with- or --without- was given. +if test "${with_+set}" = set; then + withval="$with_" + : fi -WINDRES="$ac_cv_prog_WINDRES" -if test -n "$WINDRES"; then - echo "$ac_t""$WINDRES" 1>&6 -else - echo "$ac_t""no" 1>&6 + +# Check whether --with- or --without- was given. +if test "${with_+set}" = set; then + withval="$with_" + : fi -if test -z "$ac_cv_prog_WINDRES"; then -if test -n "$ac_tool_prefix"; then - # Extract the first word of "windres", so it can be a program name with args. -set dummy windres; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:5602: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_WINDRES'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - if test -n "$WINDRES"; then - ac_cv_prog_WINDRES="$WINDRES" # Let the user override the test. +# Check whether --with-tuning or --without-tuning was given. +if test "${with_tuning+set}" = set; then + withval="$with_tuning" + : +fi + +if test "x$withval" != "x"; then + TUNING=$withval else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_prog_WINDRES="windres" - break + if test x${target_cpu} = xi686 -o x${target_cpu} = xi586 -o x${target_cpu} = xi486 -o x${target_cpu} = xi386; then TUNING="pentiumpro" + else + if test x${target_cpu} = xpowerpc; then TUNING="750"; fi fi - done - IFS="$ac_save_ifs" - test -z "$ac_cv_prog_WINDRES" && ac_cv_prog_WINDRES=":" fi + +if test x${target_cpu} = xi686 -o x${target_cpu} = xi586 -o x${target_cpu} = xx86 -o x${target_cpu} = xi386 +then + ARCH="${ARCH} mmx" + BUILTINS="${BUILTINS} ${ACCEL_MODULES}" fi -WINDRES="$ac_cv_prog_WINDRES" -if test -n "$WINDRES"; then - echo "$ac_t""$WINDRES" 1>&6 + +# Check whether --enable-optimizations or --disable-optimizations was given. +if test "${enable_optimizations+set}" = set; then + enableval="$enable_optimizations" + if test x$enableval = xno; then OPTIMS=0; fi else - echo "$ac_t""no" 1>&6 + OPTIMS=1 fi + +# Check whether --enable-altivec or --disable-altivec was given. +if test "${enable_altivec+set}" = set; then + enableval="$enable_altivec" + if test x$enableval = xyes; then ARCH="${ARCH} altivec"; + BUILTINS="${BUILTINS} ${ACCEL_MODULES}"; fi else - WINDRES=":" -fi + if test x${target_cpu} = xpowerpc; then ARCH="${ARCH} altivec"; + BUILTINS="${BUILTINS} ${ACCEL_MODULES}"; fi fi - LIB_MPEG_TS="${LIB_MPEG_TS} -lws2_32" - LIB_RC="${LIB_RC} -lws2_32" - ;; - x*nto*) - SYS=nto - LIB_X11="${LIB_X11} -lsocket" - LIB_XVIDEO="${LIB_XVIDEO} -lsocket" - ;; - xbeos) - SYS=beos - LIB="${LIB} -lbe" - LIB_BEOS="${LIB_BEOS} -lbe -lgame -lroot -ltracker" - PLDFLAGS="${PLDFLAGS} -nostart" - ;; - x*) - SYS=${target_os} - ;; -esac -case $SYS in - mingw32) - DVD_DEVICE="E:" - VCD_DEVICE="E:" - ;; - *) - DVD_DEVICE="/dev/dvd" - VCD_DEVICE="/dev/cdrom" - ;; -esac +DEBUG=0 +# Check whether --enable-debug or --disable-debug was given. +if test "${enable_debug+set}" = set; then + enableval="$enable_debug" + if test x$enableval = xyes; then DEBUG=1; fi +fi -cat >> confdefs.h <> confdefs.h <&6 -echo "configure:5681: checking for $ac_hdr" >&5 +echo "configure:5699: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5691: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5709: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -5707,30 +5725,89 @@ if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then cat >> confdefs.h <&6 +echo "configure: warning: libdvdcss is no longer provided with vlc; please get libdvdcss from http://www.videolan.org/libdvdcss/ and build it. Then either use --with-dvdcss= for dynamic linking (recommended under Unix) or --with-dvdcss-tree= for static linking (recommended under BeOS, Windows, MacOS X). Alternatively you can use --disable-dvd to disable the DVD plugin." 1>&2 + { echo "configure: error: cannot find libdvdcss headers" 1>&2; exit 1; } fi done + else + echo $ac_n "checking for libdvdcss.a in ${with_dvdcss_tree}""... $ac_c" 1>&6 +echo "configure:5740: checking for libdvdcss.a in ${with_dvdcss_tree}" >&5 + real_dvdcss_tree="`cd ${with_dvdcss_tree} 2>/dev/null && pwd`" + if test "x$real_dvdcss_tree" = x + then + echo "$ac_t""no" 1>&6 + { echo "configure: error: cannot cd to ${with_dvdcss_tree}" 1>&2; exit 1; } + fi + if test -f "${real_dvdcss_tree}/src/.libs/libdvdcss.a" + then + echo "$ac_t""${real_dvdcss_tree}/src/.libs/libdvdcss.a" 1>&6 + BUILTINS="${BUILTINS} dvd" + LIB_DVD="${LIB_DVD} ${real_dvdcss_tree}/src/.libs/libdvdcss.a" + CFLAGS_DVD="${CFLAGS_DVD} -I${real_dvdcss_tree}/src" + else + echo "$ac_t""no" 1>&6 + { echo "configure: error: cannot find ${real_dvdcss_tree}/src/.libs/libdvdcss.a, make sure you compiled libdvdcss in ${with_dvdcss_tree}" 1>&2; exit 1; } + fi + fi + ;; + xno) + PLUGINS="${PLUGINS} dvd" + CFLAGS_DVD="${CFLAGS_DVD} -DGOD_DAMN_DMCA" + LIB_DVD="${LIB_DVD} -ldl" + ;; + *) + echo $ac_n "checking for dvdcss headers in ${with_dvdcss}""... $ac_c" 1>&6 +echo "configure:5766: checking for dvdcss headers in ${with_dvdcss}" >&5 + if test -f ${with_dvdcss}/include/dvdcss/dvdcss.h + then + echo "$ac_t""yes" 1>&6 + PLUGINS="${PLUGINS} dvd" + LIB_DVD="${LIB_DVD} -L${with_dvdcss}/lib -ldvdcss" + CFLAGS_DVD="${CFLAGS_DVD} -I${with_dvdcss}/include" + else + echo "$ac_t""no" 1>&6 + { echo "configure: error: cannot find ${with_dvdcss}/include/dvdcss/dvdcss.h" 1>&2; exit 1; } + fi + ;; + esac +fi + +# Check whether --enable-dvdread or --disable-dvdread was given. +if test "${enable_dvdread+set}" = set; then + enableval="$enable_dvdread" + : +fi + +if test "x$enableval" != "xno" +then + # Check whether --with-dvdread or --without-dvdread was given. +if test "${with_dvdread+set}" = set; then + withval="$with_dvdread" + : +fi -for ac_hdr in sys/ioctl.h + case "x$with_dvdread" in + x) + for ac_hdr in dvdread/dvd_reader.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:5724: checking for $ac_hdr" >&5 +echo "configure:5801: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5734: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5811: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -5750,23 +5827,177 @@ if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then cat >> confdefs.h <&6 +fi +done + + ;; + *) + echo $ac_n "checking for dvdread headers in ${withval}""... $ac_c" 1>&6 +echo "configure:5841: checking for dvdread headers in ${withval}" >&5 + if test -f ${withval}/include/dvdread/dvd_reader.h + then + echo "$ac_t""yes" 1>&6 + PLUGINS="${PLUGINS} dvdread" + LIB_DVDREAD="${LIB_DVDREAD} -L${withval}/lib -ldvdread" + CFLAGS_DVDREAD="${CFLAGS_DVDREAD} -I${withval}/include" + else + echo "$ac_t""no" 1>&6 + { echo "configure: error: Cannot find ${withval}/dvdread/dvd_reader.h" 1>&2; exit 1; } + fi + ;; + esac +fi + +# Check whether --enable-vcd or --disable-vcd was given. +if test "${enable_vcd+set}" = set; then + enableval="$enable_vcd" + : +fi + + +if test x$enable_vcd != xno +then + cat > conftest.$ac_ext < +EOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + egrep "cdrom_msf0" >/dev/null 2>&1; then + rm -rf conftest* + + PLUGINS="${PLUGINS} vcd" + +fi +rm -f conftest* + + + if test "x${SYS}" = "xbsdi" + then + PLUGINS="${PLUGINS} vcd" + fi + + if test "x${SYS}" = "xdarwin" + then + PLUGINS="${PLUGINS} vcd" + LIB_VCD="${LIB_VCD} -framework IOKit -framework CoreFoundation" + fi +fi + +# Check whether --enable-satellite or --disable-satellite was given. +if test "${enable_satellite+set}" = set; then + enableval="$enable_satellite" + if test x$enable_satellite = xyes + then + BUILTINS="${BUILTINS} satellite" + cat >> confdefs.h <<\EOF +#define HAVE_SATELLITE 1 +EOF + + fi +fi + + +echo $ac_n "checking for inet_pton""... $ac_c" 1>&6 +echo "configure:5907: checking for inet_pton" >&5 +if eval "test \"`echo '$''{'ac_cv_func_inet_pton'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + cat > conftest.$ac_ext < +/* Override any gcc2 internal prototype to avoid an error. */ +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char inet_pton(); + +int main() { + +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub_inet_pton) || defined (__stub___inet_pton) +choke me +#else +inet_pton(); +#endif + +; return 0; } +EOF +if { (eval echo configure:5935: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_func_inet_pton=yes" +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_func_inet_pton=no" +fi +rm -f conftest* +fi + +if eval "test \"`echo '$ac_cv_func_'inet_pton`\" = yes"; then + echo "$ac_t""yes" 1>&6 + PLUGINS="${PLUGINS} ipv6" +else + echo "$ac_t""no" 1>&6 +fi + + + +# Check whether --with- or --without- was given. +if test "${with_+set}" = set; then + withval="$with_" + : +fi + + +# Check whether --enable-mad or --disable-mad was given. +if test "${enable_mad+set}" = set; then + enableval="$enable_mad" + : +fi + +if test x$enable_mad = xyes +then + PLUGINS="${PLUGINS} mad" + LIB_MAD="${LIB_MAD} -lmad" + # Check whether --with-mad or --without-mad was given. +if test "${with_mad+set}" = set; then + withval="$with_mad" + if test "x$with_val" != "xno" -a "x$with_val" != "x" + then + CFLAGS_MAD="${CFLAGS_MAD} -I$with_val/include" + LIB_MAD="${LIB_MAD} -L$with_val/lib" + fi +fi + + save_CFLAGS=$CFLAGS + save_LDFLAGS=$LDFLAGS + CFLAGS="$CFLAGS $CFLAGS_MAD" + LDFLAGS="$LDFLAGS $LIB_MAD" + for ac_hdr in mad.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:5760: checking for $ac_hdr" >&5 +echo "configure:5991: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5770: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:6001: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -5789,131 +6020,95 @@ EOF else echo "$ac_t""no" 1>&6 +echo "Cannot find development headers for libmad..." + exit 1 + fi done - BSD_DVD_STRUCT=0 - LINUX_DVD_STRUCT=0 - OPENBSD_DVD_STRUCT=0 - cat > conftest.$ac_ext <&6 +echo "configure:6031: checking for mad_bit_init in -lmad" >&5 +ac_lib_var=`echo mad'_'mad_bit_init | sed 'y%./+-%__p_%'` +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + ac_save_LIBS="$LIBS" +LIBS="-lmad $LIBS" +cat > conftest.$ac_ext < -EOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - egrep "dvd_struct" >/dev/null 2>&1; then - rm -rf conftest* - - cat >> confdefs.h <<\EOF -#define DVD_STRUCT_IN_SYS_CDIO_H 1 -EOF +/* Override any gcc2 internal prototype to avoid an error. */ +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char mad_bit_init(); - cat > conftest.$ac_ext < +int main() { +mad_bit_init() +; return 0; } EOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - egrep "struct dvd_struct" >/dev/null 2>&1; then +if { (eval echo configure:6050: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* - - BSD_DVD_STRUCT=1 + eval "ac_cv_lib_$ac_lib_var=yes" else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 rm -rf conftest* - LINUX_DVD_STRUCT=1; OPENBSD_DVD_STRUCT=1 + eval "ac_cv_lib_$ac_lib_var=no" fi rm -f conftest* +LIBS="$ac_save_LIBS" - fi -rm -f conftest* - - cat > conftest.$ac_ext < -EOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - egrep "dvd_struct" >/dev/null 2>&1; then - rm -rf conftest* - - cat >> confdefs.h <<\EOF -#define DVD_STRUCT_IN_SYS_DVDIO_H 1 +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + echo "$ac_t""yes" 1>&6 + ac_tr_lib=HAVE_LIB`echo mad | sed -e 's/[^a-zA-Z0-9_]/_/g' \ + -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` + cat >> confdefs.h < conftest.$ac_ext < -EOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - egrep "struct dvd_struct" >/dev/null 2>&1; then - rm -rf conftest* - - BSD_DVD_STRUCT=1 -else - rm -rf conftest* - LINUX_DVD_STRUCT=1 -fi -rm -f conftest* + LIBS="-lmad $LIBS" +else + echo "$ac_t""no" 1>&6 + echo "Cannot find libmad library..." + exit 1 fi -rm -f conftest* - - cat > conftest.$ac_ext < -EOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - egrep "dvd_struct" >/dev/null 2>&1; then - rm -rf conftest* - - cat >> confdefs.h <<\EOF -#define DVD_STRUCT_IN_LINUX_CDROM_H 1 -EOF - LINUX_DVD_STRUCT=1 - + CFLAGS=$save_CFLAGS + LDFLAGS=$save_LDFLAGS fi -rm -f conftest* - NEED_BSDI_LIBDVD=0 - cat > conftest.$ac_ext < -EOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - egrep "dvd_struct" >/dev/null 2>&1; then - rm -rf conftest* - - cat >> confdefs.h <<\EOF -#define DVD_STRUCT_IN_DVD_H 1 -EOF +if test x$SYS = xbeos +then + PLUGINS="${PLUGINS} beos" - LIB_LIBDVDCSS="${LIB_LIBDVDCSS} -ldvd" - LINUX_DVD_STRUCT=1 - else - rm -rf conftest* - - for ac_hdr in /sys/dev/scsi/scsi_ioctl.h + +# Check whether --enable-a52 or --disable-a52 was given. +if test "${enable_a52+set}" = set; then + enableval="$enable_a52" + : +fi + +if test "x$enableval" != "xno" -a x$SYS != xmingw32 + then + for ac_hdr in a52dec/a52.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:5907: checking for $ac_hdr" >&5 +echo "configure:6102: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5917: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:6112: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -5934,36 +6129,39 @@ if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then #define $ac_tr_hdr 1 EOF - NEED_BSDI_LIBDVD=1 - cat >> confdefs.h <<\EOF -#define DVD_STRUCT_IN_BSDI_DVDIOCTL_DVD_H 1 -EOF - - SRC_DVDCSS_EXTRA="${SRC_DVDCSS_EXTRA} bsdi_dvdioctl.c" - LINUX_DVD_STRUCT=1 - + BUILTINS="${BUILTINS} a52" + LIB_A52="${LIB_A52} -la52 -lm" + else echo "$ac_t""no" 1>&6 fi done - fi -rm -f conftest* - ac_safe=`echo "sys/scsi/scsi_types.h" | sed 'y%./+-%__p_%'` -echo $ac_n "checking for sys/scsi/scsi_types.h""... $ac_c" 1>&6 -echo "configure:5957: checking for sys/scsi/scsi_types.h" >&5 +# Check whether --enable-vorbis or --disable-vorbis was given. +if test "${enable_vorbis+set}" = set; then + enableval="$enable_vorbis" + : +fi + +if test "x$enableval" != "xno" +then + for ac_hdr in ogg/ogg.h +do +ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` +echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 +echo "configure:6155: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < +#include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5967: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:6165: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -5979,20 +6177,60 @@ rm -f conftest* fi if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then echo "$ac_t""yes" 1>&6 - - ac_safe=`echo "sys/scsi/impl/uscsi.h" | sed 'y%./+-%__p_%'` -echo $ac_n "checking for sys/scsi/impl/uscsi.h""... $ac_c" 1>&6 -echo "configure:5986: checking for sys/scsi/impl/uscsi.h" >&5 + ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` + cat >> confdefs.h <&6 +fi +done + +fi + + +# Check whether --with- or --without- was given. +if test "${with_+set}" = set; then + withval="$with_" + : +fi + + +# Check whether --enable-x11 or --disable-x11 was given. +if test "${enable_x11+set}" = set; then + enableval="$enable_x11" + : +fi + +if test x$enable_x11 != xno && + (test x$SYS != xmingw32 || test x$enable_x11 = xyes); then + if test x$x_includes = xNONE; then + x_includes=/usr/X11R6/include + fi + if test x$x_libraries = xNONE; then + x_libraries=/usr/X11R6/lib + fi + saved_CPPFLAGS=$CPPFLAGS + CPPFLAGS="$CPPFLAGS -I$x_includes" + for ac_hdr in X11/Xlib.h +do +ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` +echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 +echo "configure:6224: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < +#include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5996: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:6234: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -6008,34 +6246,54 @@ rm -f conftest* fi if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then echo "$ac_t""yes" 1>&6 - - cat >> confdefs.h <<\EOF -#define SOLARIS_USCSI 1 + ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` + cat >> confdefs.h <&6 fi +done - -else - echo "$ac_t""no" 1>&6 + CPPFLAGS=$saved_CPPFLAGS +fi + +# Check whether --enable-xvideo or --disable-xvideo was given. +if test "${enable_xvideo+set}" = set; then + enableval="$enable_xvideo" + : fi - ac_safe=`echo "sys/scsi.h" | sed 'y%./+-%__p_%'` -echo $ac_n "checking for sys/scsi.h""... $ac_c" 1>&6 -echo "configure:6029: checking for sys/scsi.h" >&5 +if test x$enable_xvideo != xno && + (test x$SYS != xmingw32 || test x$enable_xvideo = xyes); then + if test x$x_includes = xNONE; then + x_includes=/usr/X11R6/include + fi + if test x$x_libraries = xNONE; then + x_libraries=/usr/X11R6/lib + fi + saved_CPPFLAGS=$CPPFLAGS + CPPFLAGS="$CPPFLAGS -I$x_includes" + for ac_hdr in X11/extensions/Xv.h +do +ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` +echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 +echo "configure:6287: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < +#include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:6039: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:6297: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -6051,168 +6309,34 @@ rm -f conftest* fi if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then echo "$ac_t""yes" 1>&6 - - cat > conftest.$ac_ext < -EOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - egrep "sctl_io" >/dev/null 2>&1; then - rm -rf conftest* - - cat >> confdefs.h <<\EOF -#define HPUX_SCTL_IO 1 -EOF - - -fi -rm -f conftest* - - -else - echo "$ac_t""no" 1>&6 -fi - - if test x$LINUX_DVD_STRUCT = x1; then - cat >> confdefs.h <<\EOF -#define HAVE_LINUX_DVD_STRUCT 1 -EOF - - if test x$OPENBSD_DVD_STRUCT = x1; then - cat >> confdefs.h <<\EOF -#define HAVE_OPENBSD_DVD_STRUCT 1 -EOF - - fi - else - if test x$BSD_DVD_STRUCT = x1; then - cat >> confdefs.h <<\EOF -#define HAVE_BSD_DVD_STRUCT 1 + ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` + cat >> confdefs.h <&6 -fi -done - - -# Check whether --with-tuning or --without-tuning was given. -if test "${with_tuning+set}" = set; then - withval="$with_tuning" - : -fi - -if test "x$withval" != "x"; then - TUNING=$withval -else - if test x${target_cpu} = xi686 -o x${target_cpu} = xi586 -o x${target_cpu} = xi486 -o x${target_cpu} = xi386; then TUNING="pentiumpro" - else - if test x${target_cpu} = xpowerpc; then TUNING="750"; fi - fi -fi - -# Check whether --enable-release or --disable-release was given. -if test "${enable_release+set}" = set; then - enableval="$enable_release" - if test x$enableval = xyes; then RELEASE=1; fi -else - VLC_VERSION="${VLC_VERSION}_`date +%Y-%m-%d`"; - LIBDVDCSS_VERSION="${LIBDVDCSS_VERSION}_`date +%Y-%m-%d`"; -fi - - -if test x${target_cpu} = xi686 -o x${target_cpu} = xi586 -o x${target_cpu} = xx86 -o x${target_cpu} = xi386 -then - ARCH="${ARCH} mmx" - BUILTINS="${BUILTINS} ${ACCEL_MODULES}" -fi - -# Check whether --enable-altivec or --disable-altivec was given. -if test "${enable_altivec+set}" = set; then - enableval="$enable_altivec" - if test x$enableval = xyes; then ARCH="${ARCH} altivec"; - BUILTINS="${BUILTINS} ${ACCEL_MODULES}"; fi -else - if test x${target_cpu} = xpowerpc; then ARCH="${ARCH} altivec"; - BUILTINS="${BUILTINS} ${ACCEL_MODULES}"; fi -fi - - -DEBUG=0 -# Check whether --enable-debug or --disable-debug was given. -if test "${enable_debug+set}" = set; then - enableval="$enable_debug" - if test x$enableval = xyes; then DEBUG=1; fi -fi - - -TRACE=0 -# Check whether --enable-trace or --disable-trace was given. -if test "${enable_trace+set}" = set; then - enableval="$enable_trace" - if test x$enableval = xyes; then TRACE=1; fi -fi - - -GPROF=0 -# Check whether --enable-gprof or --disable-gprof was given. -if test "${enable_gprof+set}" = set; then - enableval="$enable_gprof" - if test x$enableval = xyes; then GPROF=1; fi -fi - - -CPROF=0 -# Check whether --enable-cprof or --disable-cprof was given. -if test "${enable_cprof+set}" = set; then - enableval="$enable_cprof" - if test x$enableval = xyes; - then - LIB="${LIB} -lcprof" - CPROF=1 - fi - -fi - - -# Check whether --enable-optimizations or --disable-optimizations was given. -if test "${enable_optimizations+set}" = set; then - enableval="$enable_optimizations" - if test x$enableval = xno; then OPTIMS=0; fi -else - OPTIMS=1 -fi - - -# Check whether --enable-pth or --disable-pth was given. -if test "${enable_pth+set}" = set; then - enableval="$enable_pth" - if test x$enableval = xyes; then - echo $ac_n "checking for pth_init in -lpth""... $ac_c" 1>&6 -echo "configure:6197: checking for pth_init in -lpth" >&5 -ac_lib_var=`echo pth'_'pth_init | sed 'y%./+-%__p_%'` + + saved_CFLAGS=$CFLAGS + CFLAGS="$CFLAGS -L$x_libraries -lX11 -lXext" + echo $ac_n "checking for XvSetPortAttribute in -lXv_pic""... $ac_c" 1>&6 +echo "configure:6321: checking for XvSetPortAttribute in -lXv_pic" >&5 +ac_lib_var=`echo Xv_pic'_'XvSetPortAttribute | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_save_LIBS="$LIBS" -LIBS="-lpth $LIBS" +LIBS="-lXv_pic $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6340: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6227,232 +6351,499 @@ LIBS="$ac_save_LIBS" fi if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then echo "$ac_t""yes" 1>&6 - ac_tr_lib=HAVE_LIB`echo pth | sed -e 's/[^a-zA-Z0-9_]/_/g' \ - -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` - cat >> confdefs.h <&6 +# We don't have Xv_pic, let's make xvideo.a as builtin + BUILTINS="${BUILTINS} xvideo" + LIB_XVIDEO="${LIB_XVIDEO} -L$x_libraries -lX11 -lXext -lXv" + CFLAGS_XVIDEO="${CFLAGS_XVIDEO} -I$x_includes" fi - cat > conftest.$ac_ext < -EOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - egrep "pth_init" >/dev/null 2>&1; then - rm -rf conftest* + CFLAGS=$saved_CFLAGS - cat >> confdefs.h <<\EOF -#define PTH_INIT_IN_PTH_H 1 -EOF + CPPFLAGS=$saved_CPPFLAGS +else + echo "$ac_t""no" 1>&6 +fi +done - THREAD_LIB="-lpth" +fi + +# Check whether --enable-sdl or --disable-sdl was given. +if test "${enable_sdl+set}" = set; then + enableval="$enable_sdl" + : +fi + +if test "x$enable_sdl" != "xno" +then + SDL_PATH=$PATH + # Check whether --with-sdl-config-path or --without-sdl-config-path was given. +if test "${with_sdl_config_path+set}" = set; then + withval="$with_sdl_config_path" + if test "x$withval" != "xno" + then + SDL_PATH=$withval:$PATH + fi +fi + + # Extract the first word of "sdl12-config", so it can be a program name with args. +set dummy sdl12-config; ac_word=$2 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +echo "configure:6398: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_path_SDL12_CONFIG'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + case "$SDL12_CONFIG" in + /*) + ac_cv_path_SDL12_CONFIG="$SDL12_CONFIG" # Let the user override the test with a path. + ;; + ?:/*) + ac_cv_path_SDL12_CONFIG="$SDL12_CONFIG" # Let the user override the test with a dos path. + ;; + *) + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$SDL_PATH" + for ac_dir in $ac_dummy; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_path_SDL12_CONFIG="$ac_dir/$ac_word" + break fi + done + IFS="$ac_save_ifs" + test -z "$ac_cv_path_SDL12_CONFIG" && ac_cv_path_SDL12_CONFIG="no" + ;; +esac +fi +SDL12_CONFIG="$ac_cv_path_SDL12_CONFIG" +if test -n "$SDL12_CONFIG"; then + echo "$ac_t""$SDL12_CONFIG" 1>&6 +else + echo "$ac_t""no" 1>&6 fi -rm -f conftest* + SDL_CONFIG=${SDL12_CONFIG} + SDL_HEADER="SDL12/SDL.h" + if test x${SDL_CONFIG} = xno + then + # Extract the first word of "sdl11-config", so it can be a program name with args. +set dummy sdl11-config; ac_word=$2 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +echo "configure:6438: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_path_SDL11_CONFIG'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + case "$SDL11_CONFIG" in + /*) + ac_cv_path_SDL11_CONFIG="$SDL11_CONFIG" # Let the user override the test with a path. + ;; + ?:/*) + ac_cv_path_SDL11_CONFIG="$SDL11_CONFIG" # Let the user override the test with a dos path. + ;; + *) + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$SDL_PATH" + for ac_dir in $ac_dummy; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_path_SDL11_CONFIG="$ac_dir/$ac_word" + break + fi + done + IFS="$ac_save_ifs" + test -z "$ac_cv_path_SDL11_CONFIG" && ac_cv_path_SDL11_CONFIG="no" + ;; +esac +fi +SDL11_CONFIG="$ac_cv_path_SDL11_CONFIG" +if test -n "$SDL11_CONFIG"; then + echo "$ac_t""$SDL11_CONFIG" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi + SDL_CONFIG=${SDL11_CONFIG} + SDL_HEADER="SDL11/SDL.h" + fi + if test x${SDL_CONFIG} = xno + then + # Extract the first word of "sdl-config", so it can be a program name with args. +set dummy sdl-config; ac_word=$2 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +echo "configure:6479: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_path_SDL_CONFIG'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + case "$SDL_CONFIG" in + /*) + ac_cv_path_SDL_CONFIG="$SDL_CONFIG" # Let the user override the test with a path. + ;; + ?:/*) + ac_cv_path_SDL_CONFIG="$SDL_CONFIG" # Let the user override the test with a dos path. + ;; + *) + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$SDL_PATH" + for ac_dir in $ac_dummy; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_path_SDL_CONFIG="$ac_dir/$ac_word" + break + fi + done + IFS="$ac_save_ifs" + test -z "$ac_cv_path_SDL_CONFIG" && ac_cv_path_SDL_CONFIG="no" + ;; +esac +fi +SDL_CONFIG="$ac_cv_path_SDL_CONFIG" +if test -n "$SDL_CONFIG"; then + echo "$ac_t""$SDL_CONFIG" 1>&6 +else + echo "$ac_t""no" 1>&6 fi + SDL_HEADER="SDL/SDL.h" + fi + if test x${SDL_CONFIG} != xno + then + PLUGINS="${PLUGINS} sdl" + CFLAGS_SDL="${CFLAGS_SDL} `${SDL_CONFIG} --cflags`" + LIB_SDL="${LIB_SDL} `${SDL_CONFIG} --libs | sed 's,-rdynamic,,'`" + save_CPPFLAGS=$CPPFLAGS + CPPFLAGS="$CPPFLAGS $CFLAGS_SDL" + for ac_hdr in ${SDL_HEADER} +do +ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` +echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 +echo "configure:6525: checking for $ac_hdr" >&5 +if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + cat > conftest.$ac_ext < +EOF +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +{ (eval echo configure:6535: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` +if test -z "$ac_err"; then + rm -rf conftest* + eval "ac_cv_header_$ac_safe=yes" +else + echo "$ac_err" >&5 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_header_$ac_safe=no" +fi +rm -f conftest* +fi +if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then + echo "$ac_t""yes" 1>&6 + ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` + cat >> confdefs.h <> confdefs.h < +EOF -LIB="${LIB} ${THREAD_LIB}" +else + echo "$ac_t""no" 1>&6 +{ echo "configure: error: The development package for SDL is not installed. +Please install it and try again. Alternatively you can also configure with +--disable-sdl." 1>&2; exit 1; } + +fi +done -NEED_LIBDVDCSS=0 -STATIC_LIBDVDCSS=0 -DUMMY_LIBDVDCSS=0 -# Check whether --with-dvdcss or --without-dvdcss was given. -if test "${with_dvdcss+set}" = set; then - withval="$with_dvdcss" - case "x${withval}" in - xlocal-static|xyes) - # local libdvdcss, statically linked - if test x${CAN_BUILD_LIBDVDCSS} = x1 - then - NEED_LIBDVDCSS=1 - STATIC_LIBDVDCSS=1 - BUILTINS="${BUILTINS} dvd" - CFLAGS_DVD="${CFLAGS_DVD} -I../../extras/libdvdcss" - LIB_DVD="${LIB_DVD} lib/libdvdcss.a ${LIB_LIBDVDCSS}" - LIB_DVD_PLUGIN="${LIB_DVD_PLUGIN} ../../lib/libdvdcss.a ${LIB_LIBDVDCSS}" - LIB_DVDREAD_PLUGIN="${LIB_DVDREAD_PLUGIN} ../../lib/libdvdcss.a ${LIB_LIBDVDCSS}" - fi - ;; - xlocal-shared) - # local libdvdcss, dynamically linked - if test x${CAN_BUILD_LIBDVDCSS} = x1 - then - NEED_LIBDVDCSS=1 - BUILTINS="${BUILTINS} dvd" - CFLAGS_DVD="${CFLAGS_DVD} -I../../extras/libdvdcss" - LIB_DVD="${LIB_DVD} -Llib -ldvdcss" - LIB_DVD_PLUGIN="${LIB_DVD_PLUGIN} -L../../lib -ldvdcss" - LIB_DVDREAD_PLUGIN="${LIB_DVDREAD_PLUGIN} -L../../lib -ldvdcss" - fi - ;; - xno) - # don't use libdvdcss at all, build a DVD module that can dlopen() it - DUMMY_LIBDVDCSS=1 - BUILTINS="${BUILTINS} dvd" - SRC_DVD_EXTRA="${SRC_DVD_EXTRA} dummy_dvdcss.c" - CFLAGS_DVD="${CFLAGS_DVD} -DGOD_DAMN_DMCA" - CFLAGS_DVD="${CFLAGS_DVD} -DLIBDVDCSS_VERSION=\"${LIBDVDCSS_VERSION}\"" - LIB_DVD="${LIB_DVD} -ldl" - LIB_DVD_PLUGIN="${LIB_DVD_PLUGIN} -ldl" - LIB_DVDREAD_PLUGIN="${LIB_DVDREAD_PLUGIN} -ldl" - ;; - *) - # existing libdvdcss - BUILTINS="${BUILTINS} dvd" - if test "x$withval" != "xyes" - then - LIB_DVD_PLUGIN="${LIB_DVD_PLUGIN} -L"$withval"/lib" - LIB_DVDREAD_PLUGIN="${LIB_DVDREAD_PLUGIN} -L"$withval"/lib" - CFLAGS_DVD="${CFLAGS_DVD} -I"$withval"/include" - fi - LIB_DVD="${LIB_DVD} -ldvdcss" - LIB_DVD_PLUGIN="${LIB_DVD_PLUGIN} -ldvdcss" - LIB_DVDREAD_PLUGIN="${LIB_DVDREAD_PLUGIN} -ldvdcss" - esac -else - # user didn't decide, we choose to use local libdvdcss and link statically - # if libdvdcss is in the archive, or to use the dummy replacement otherwise. - if test x${CAN_BUILD_LIBDVDCSS} = x1 + CPPFLAGS=$save_CPPFLAGS + if expr 1.1.5 \> `$SDL_CONFIG --version` >/dev/null then - NEED_LIBDVDCSS=1 - STATIC_LIBDVDCSS=1 - BUILTINS="${BUILTINS} dvd" - CFLAGS_DVD="${CFLAGS_DVD} -I../../extras/libdvdcss" - LIB_DVD="${LIB_DVD} lib/libdvdcss.a ${LIB_LIBDVDCSS}" - LIB_DVD_PLUGIN="${LIB_DVD_PLUGIN} ../../lib/libdvdcss.a ${LIB_LIBDVDCSS}" - LIB_DVDREAD_PLUGIN="${LIB_DVDREAD_PLUGIN} ../../lib/libdvdcss.a ${LIB_LIBDVDCSS}" - else - # XXX: no check for libdl is done, don't try this at home ! - DUMMY_LIBDVDCSS=1 - BUILTINS="${BUILTINS} dvd" - SRC_DVD_EXTRA="${SRC_DVD_EXTRA} dummy_dvdcss.c" - CFLAGS_DVD="${CFLAGS_DVD} -DGOD_DAMN_DMCA" - LIB_DVD="${LIB_DVD} -ldl" - LIB_DVD_PLUGIN="${LIB_DVD_PLUGIN} -ldl" - LIB_DVDREAD_PLUGIN="${LIB_DVDREAD_PLUGIN} -ldl" - fi + { echo "configure: error: The development package for SDL is not installed. +Please install it and try again. Alternatively you can also configure with +--disable-sdl." 1>&2; exit 1; } + fi + elif test "x$enable_sdl" = "xyes" + then + { echo "configure: error: I couldn't find the SDL package. You can download libSDL +from http://www.libsdl.org/, or configure with --disable-sdl. Have a nice day. + " 1>&2; exit 1; } + fi fi +# Check whether --enable-directx or --disable-directx was given. +if test "${enable_directx+set}" = set; then + enableval="$enable_directx" + : +fi -# Check whether --enable-dvdread or --disable-dvdread was given. -if test "${enable_dvdread+set}" = set; then - enableval="$enable_dvdread" - if test x$enableval = xyes +if test "x$enableval" != "xno" +then + if test x$SYS = xmingw32 then - NEED_LIBDVDCSS=1 - STATIC_LIBDVDCSS=1 - BUILTINS="${BUILTINS} dvdread" - CFLAGS_DVDREAD="${CFLAGS_DVDREAD} -I../../extras/libdvdread" - LIB_DVDREAD="${LIB_DVDREAD} lib/libdvdread.a lib/libdvdcss.a" - fi + # Check whether --with-directx or --without-directx was given. +if test "${with_directx+set}" = set; then + withval="$with_directx" + : +fi + + if test "x$with_directx" = "x" + then + for ac_hdr in ddraw.h +do +ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` +echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 +echo "configure:6605: checking for $ac_hdr" >&5 +if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + cat > conftest.$ac_ext < +EOF +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +{ (eval echo configure:6615: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` +if test -z "$ac_err"; then + rm -rf conftest* + eval "ac_cv_header_$ac_safe=yes" +else + echo "$ac_err" >&5 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_header_$ac_safe=no" +fi +rm -f conftest* +fi +if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then + echo "$ac_t""yes" 1>&6 + ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` + cat >> confdefs.h <&6 fi +done + else + echo $ac_n "checking for directX headers in ${withval}""... $ac_c" 1>&6 +echo "configure:6644: checking for directX headers in ${withval}" >&5 + if test -f ${withval}/ddraw.h + then + PLUGINS="${PLUGINS} directx" + LIB_DIRECTX="${LIB_DIRECTX} -L${withval}/lib -lgdi32" + INCLUDE="${INCLUDE} -I${withval}" + echo "$ac_t""yes" 1>&6 + else + echo "$ac_t""no" 1>&6 + { echo "configure: error: Cannot find ${withval}/ddraw.h!" 1>&2; exit 1; } + fi + fi + fi +fi -# Check whether --enable-vcd or --disable-vcd was given. -if test "${enable_vcd+set}" = set; then - enableval="$enable_vcd" +# Check whether --enable-fb or --disable-fb was given. +if test "${enable_fb+set}" = set; then + enableval="$enable_fb" : fi - -if test x$enable_vcd != xno -then + if test x$enable_fb != xno + then + for ac_hdr in linux/fb.h +do +ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` +echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 +echo "configure:6671: checking for $ac_hdr" >&5 +if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else cat > conftest.$ac_ext < +#include <$ac_hdr> EOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - egrep "cdrom_msf0" >/dev/null 2>&1; then +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +{ (eval echo configure:6681: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` +if test -z "$ac_err"; then rm -rf conftest* - - BUILTINS="${BUILTINS} vcd" - + eval "ac_cv_header_$ac_safe=yes" +else + echo "$ac_err" >&5 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_header_$ac_safe=no" fi rm -f conftest* +fi +if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then + echo "$ac_t""yes" 1>&6 + ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` + cat >> confdefs.h <&6 +fi +done + + fi + +# Check whether --enable-mga or --disable-mga was given. +if test "${enable_mga+set}" = set; then + enableval="$enable_mga" + if test x$enable_mga = xyes + then + PLUGINS="${PLUGINS} mga xmga" + fi +fi + +# Check whether --enable-ggi or --disable-ggi was given. +if test "${enable_ggi+set}" = set; then + enableval="$enable_ggi" + : fi -if test x$enable_vcd != xno -a "${SYS}" = "bsdi" +if test x$enable_ggi = xyes then - BUILTINS="${BUILTINS} vcd" + PLUGINS="${PLUGINS} ggi" + LIB_GGI="${LIB_GGI} -lggi" + # Check whether --with-ggi or --without-ggi was given. +if test "${with_ggi+set}" = set; then + withval="$with_ggi" + if test "x$with_val" != "xno" -a "x$with_val" != "x" + then + CFLAGS_GGI="${CFLAGS_GGI} -I$with_val/include" + LIB_GGI="${LIB_GGI} -L$with_val/lib" + fi fi -# Check whether --enable-dummy or --disable-dummy was given. -if test "${enable_dummy+set}" = set; then - enableval="$enable_dummy" - : fi +# Check whether --enable-glide or --disable-glide was given. +if test "${enable_glide+set}" = set; then + enableval="$enable_glide" + : +fi -if test x$enable_dummy != xno +if test x$enable_glide = xyes then - BUILTINS="${BUILTINS} dummy" + PLUGINS="${PLUGINS} glide" + LIB_GLIDE="${LIB_GLIDE} -lglide2x -lm" + CFLAGS_GLIDE="${CFLAGS_GLIDE} -I/usr/include/glide" + # Check whether --with-glide or --without-glide was given. +if test "${with_glide+set}" = set; then + withval="$with_glide" + if test "x$with_val" != "xno" -a "x$with_val" != "x" + then + CFLAGS_GLIDE="${CFLAGS_GLIDE} -I$with_val/include" + LIB_GLIDE="${LIB_GLIDE} -L$with_val/lib" + fi fi -# Check whether --enable-null or --disable-null was given. -if test "${enable_null+set}" = set; then - enableval="$enable_null" - : fi +# Check whether --enable-aa or --disable-aa was given. +if test "${enable_aa+set}" = set; then + enableval="$enable_aa" + : +fi -if test x$enable_null != xno +if test x$enable_aa = xyes then - BUILTINS="${BUILTINS} null" + ac_safe=`echo "aalib.h" | sed 'y%./+-%__p_%'` +echo $ac_n "checking for aalib.h""... $ac_c" 1>&6 +echo "configure:6776: checking for aalib.h" >&5 +if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + cat > conftest.$ac_ext < +EOF +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +{ (eval echo configure:6786: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` +if test -z "$ac_err"; then + rm -rf conftest* + eval "ac_cv_header_$ac_safe=yes" +else + echo "$ac_err" >&5 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_header_$ac_safe=no" +fi +rm -f conftest* +fi +if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then + echo "$ac_t""yes" 1>&6 + have_aa="true" +else + echo "$ac_t""no" 1>&6 +have_aa="false" fi -# Check whether --enable-rc or --disable-rc was given. -if test "${enable_rc+set}" = set; then - enableval="$enable_rc" + if test x$have_aa = xtrue + then + PLUGINS="${PLUGINS} aa" + LIB_AA="${LIB_AA} -laa" + fi +fi + + +# Check whether --with- or --without- was given. +if test "${with_+set}" = set; then + withval="$with_" : fi -if test x$enable_rc != xno -then - BUILTINS="${BUILTINS} rc" +# Check whether --enable-dsp or --disable-dsp was given. +if test "${enable_dsp+set}" = set; then + enableval="$enable_dsp" + : fi -# Check whether --with-mad or --without-mad was given. -if test "${with_mad+set}" = set; then - withval="$with_mad" - if test "x$with_val" != "xno"; then - if test -n $with_val; then - CFLAGS_MAD="${CFLAGS_MAD} -I$with_val/include" - LIB_MAD="${LIB_MAD} -L$with_val/lib -lmad" - else - LIB_MAD="${LIB_MAD} -lmad" - fi - save_CFLAGS=$CFLAGS - save_LDFLAGS=$LDFLAGS - CFLAGS="$CFLAGS $CFLAGS_MAD" - LDFLAGS="$LDFLAGS $LIB_MAD" - for ac_hdr in mad.h + +if test x$enable_dsp != xno && + (test x$SYS != xmingw32 || test x$enable_dsp = xyes) +then + for ac_hdr in soundcard.h sys/soundcard.h machine/soundcard.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:6446: checking for $ac_hdr" >&5 +echo "configure:6837: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:6456: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:6847: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -6473,35 +6864,24 @@ if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then #define $ac_tr_hdr 1 EOF -else - echo "$ac_t""no" 1>&6 -echo "Cannot find development headers for libmad..." - exit 1 - -fi -done - - echo $ac_n "checking for mad_bit_init in -lmad""... $ac_c" 1>&6 -echo "configure:6486: checking for mad_bit_init in -lmad" >&5 -ac_lib_var=`echo mad'_'mad_bit_init | sed 'y%./+-%__p_%'` + PLUGINS="${PLUGINS} dsp" + echo $ac_n "checking for main in -lossaudio""... $ac_c" 1>&6 +echo "configure:6870: checking for main in -lossaudio" >&5 +ac_lib_var=`echo ossaudio'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_save_LIBS="$LIBS" -LIBS="-lmad $LIBS" +LIBS="-lossaudio $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6885: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6516,48 +6896,17 @@ LIBS="$ac_save_LIBS" fi if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then echo "$ac_t""yes" 1>&6 - ac_tr_lib=HAVE_LIB`echo mad | sed -e 's/[^a-zA-Z0-9_]/_/g' \ - -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` - cat >> confdefs.h <&6 - echo "Cannot find libmad library..." - exit 1 - -fi - - CFLAGS=$save_CFLAGS - LDFLAGS=$save_LDFLAGS - PLUGINS="${PLUGINS} mad" - fi fi - -if test x$SYS = xbeos -then - BUILTINS="${BUILTINS} beos" - + else - -# Check whether --enable-dsp or --disable-dsp was given. -if test "${enable_dsp+set}" = set; then - enableval="$enable_dsp" - : + echo "$ac_t""no" 1>&6 fi +done - -if test x$enable_dsp != xno && - (test $SYS != mingw32 || test x$enable_dsp = xyes) -then - if test -c /dev/dsp - then - PLUGINS="${PLUGINS} dsp" - fi fi # Check whether --enable-esd or --disable-esd was given. @@ -6568,7 +6917,7 @@ if test "${enable_esd+set}" = set; then # Extract the first word of "esd-config", so it can be a program name with args. set dummy esd-config; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:6572: checking for $ac_word" >&5 +echo "configure:6921: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_ESD_CONFIG'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -6619,7 +6968,7 @@ if test "${enable_arts+set}" = set; then # Extract the first word of "artsc-config", so it can be a program name with args. set dummy artsc-config; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:6623: checking for $ac_word" >&5 +echo "configure:6972: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_ARTS_CONFIG'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -6662,87 +7011,24 @@ fi fi -# Check whether --enable-macosx or --disable-macosx was given. -if test "${enable_macosx+set}" = set; then - enableval="$enable_macosx" - if test x$enable_macosx = xyes +# Check whether --enable-alsa or --disable-alsa was given. +if test "${enable_alsa+set}" = set; then + enableval="$enable_alsa" + if test x$enable_alsa = xyes then - BUILTINS="${BUILTINS} macosx" - LIB_MACOSX="${LIB_MACOSX} -framework CoreAudio -framework Cocoa -framework AGL -framework QuickTime -lobjc" - CFLAGS_MACOSX="${CFLAGS_MACOSX} -ObjC" - LIB="${LIB} -ObjC" - fi -else - for ac_hdr in Cocoa/Cocoa.h -do -ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` -echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:6681: checking for $ac_hdr" >&5 -if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - cat > conftest.$ac_ext < -EOF -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:6691: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` -if test -z "$ac_err"; then - rm -rf conftest* - eval "ac_cv_header_$ac_safe=yes" -else - echo "$ac_err" >&5 - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_header_$ac_safe=no" -fi -rm -f conftest* -fi -if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then - echo "$ac_t""yes" 1>&6 - ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` - cat >> confdefs.h <&6 -fi -done - -fi - - -# Check whether --enable-qnx or --disable-qnx was given. -if test "${enable_qnx+set}" = set; then - enableval="$enable_qnx" - : -fi - - if test x$enable_qnx != xno - then - for ac_hdr in Ph.h -do -ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` -echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:6736: checking for $ac_hdr" >&5 + ac_safe=`echo "alsa/asoundlib.h" | sed 'y%./+-%__p_%'` +echo $ac_n "checking for alsa/asoundlib.h""... $ac_c" 1>&6 +echo "configure:7022: checking for alsa/asoundlib.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < +#include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:6746: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7032: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -6758,296 +7044,199 @@ rm -f conftest* fi if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then echo "$ac_t""yes" 1>&6 - ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` - cat >> confdefs.h <&6 +echo "configure:7049: checking for main in -lasound" >&5 +ac_lib_var=`echo asound'_'main | sed 'y%./+-%__p_%'` +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + ac_save_LIBS="$LIBS" +LIBS="-lasound $LIBS" +cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=no" +fi +rm -f conftest* +LIBS="$ac_save_LIBS" + +fi +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + echo "$ac_t""yes" 1>&6 + have_alsa="true" else echo "$ac_t""no" 1>&6 +have_alsa="false" fi -done - fi +else + echo "$ac_t""no" 1>&6 +have_alsa="false" +fi -# Check whether --enable-fb or --disable-fb was given. -if test "${enable_fb+set}" = set; then - enableval="$enable_fb" - if test x$enable_fb = xyes - then - PLUGINS="${PLUGINS} fb" - fi + if test x$have_alsa = xtrue + then + PLUGINS="${PLUGINS} alsa" + LIB_ALSA="${LIB_ALSA} -lasound -lm -ldl" + fi + fi fi -# Check whether --enable-mga or --disable-mga was given. -if test "${enable_mga+set}" = set; then - enableval="$enable_mga" - if test x$enable_mga = xyes - then - PLUGINS="${PLUGINS} mga xmga" - fi +# Check whether --enable-waveout or --disable-waveout was given. +if test "${enable_waveout+set}" = set; then + enableval="$enable_waveout" + : fi +if test "x$enableval" != "xno" -a x$SYS = xmingw32 + then + PLUGINS="${PLUGINS} waveout" + LIB_WAVEOUT="-lwinmm" +fi -# Check whether --with-ggi or --without-ggi was given. -if test "${with_ggi+set}" = set; then - withval="$with_ggi" - if test "x$withval" != "xno" - then - PLUGINS="${PLUGINS} ggi" - if test "x$withval" != "xyes" - then - LIB_GGI="${LIB_GGI} -l$withval" - else - LIB_GGI="${LIB_GGI} -lggi" - fi - fi + +# Check whether --with- or --without- was given. +if test "${with_+set}" = set; then + withval="$with_" + : fi -# Check whether --enable-sdl or --disable-sdl was given. -if test "${enable_sdl+set}" = set; then - enableval="$enable_sdl" +# Check whether --enable-gtk or --disable-gtk was given. +if test "${enable_gtk+set}" = set; then + enableval="$enable_gtk" : fi -if test "x$enable_sdl" != "xno" +if test x$enable_gtk != xno then - SDL_PATH=$PATH - # Check whether --with-sdl-config-path or --without-sdl-config-path was given. -if test "${with_sdl_config_path+set}" = set; then - withval="$with_sdl_config_path" + GTK_PATH=$PATH + # Check whether --with-gtk-config-path or --without-gtk-config-path was given. +if test "${with_gtk_config_path+set}" = set; then + withval="$with_gtk_config_path" if test "x$withval" != "xno" then - SDL_PATH=$withval:$PATH + GTK_PATH=$withval:$PATH fi fi - # Extract the first word of "sdl12-config", so it can be a program name with args. -set dummy sdl12-config; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:6834: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_path_SDL12_CONFIG'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - case "$SDL12_CONFIG" in - /*) - ac_cv_path_SDL12_CONFIG="$SDL12_CONFIG" # Let the user override the test with a path. - ;; - ?:/*) - ac_cv_path_SDL12_CONFIG="$SDL12_CONFIG" # Let the user override the test with a dos path. - ;; - *) - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$SDL_PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_path_SDL12_CONFIG="$ac_dir/$ac_word" - break - fi - done - IFS="$ac_save_ifs" - test -z "$ac_cv_path_SDL12_CONFIG" && ac_cv_path_SDL12_CONFIG="no" - ;; -esac -fi -SDL12_CONFIG="$ac_cv_path_SDL12_CONFIG" -if test -n "$SDL12_CONFIG"; then - echo "$ac_t""$SDL12_CONFIG" 1>&6 -else - echo "$ac_t""no" 1>&6 -fi - - SDL_CONFIG=${SDL12_CONFIG} - SDL_HEADER="SDL12/SDL.h" - if test x${SDL_CONFIG} = xno - then - # Extract the first word of "sdl11-config", so it can be a program name with args. -set dummy sdl11-config; ac_word=$2 + # look for gtk-config + # Extract the first word of "gtk12-config", so it can be a program name with args. +set dummy gtk12-config; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:6874: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_path_SDL11_CONFIG'+set}'`\" = set"; then +echo "configure:7141: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_path_GTK12_CONFIG'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else - case "$SDL11_CONFIG" in + case "$GTK12_CONFIG" in /*) - ac_cv_path_SDL11_CONFIG="$SDL11_CONFIG" # Let the user override the test with a path. + ac_cv_path_GTK12_CONFIG="$GTK12_CONFIG" # Let the user override the test with a path. ;; ?:/*) - ac_cv_path_SDL11_CONFIG="$SDL11_CONFIG" # Let the user override the test with a dos path. + ac_cv_path_GTK12_CONFIG="$GTK12_CONFIG" # Let the user override the test with a dos path. ;; *) IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$SDL_PATH" + ac_dummy="$GTK_PATH" for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if test -f $ac_dir/$ac_word; then - ac_cv_path_SDL11_CONFIG="$ac_dir/$ac_word" + ac_cv_path_GTK12_CONFIG="$ac_dir/$ac_word" break fi done IFS="$ac_save_ifs" - test -z "$ac_cv_path_SDL11_CONFIG" && ac_cv_path_SDL11_CONFIG="no" + test -z "$ac_cv_path_GTK12_CONFIG" && ac_cv_path_GTK12_CONFIG="no" ;; esac fi -SDL11_CONFIG="$ac_cv_path_SDL11_CONFIG" -if test -n "$SDL11_CONFIG"; then - echo "$ac_t""$SDL11_CONFIG" 1>&6 +GTK12_CONFIG="$ac_cv_path_GTK12_CONFIG" +if test -n "$GTK12_CONFIG"; then + echo "$ac_t""$GTK12_CONFIG" 1>&6 else echo "$ac_t""no" 1>&6 fi - SDL_CONFIG=${SDL11_CONFIG} - SDL_HEADER="SDL11/SDL.h" - fi - if test x${SDL_CONFIG} = xno + GTK_CONFIG=${GTK12_CONFIG} + if test x${GTK_CONFIG} = xno then - # Extract the first word of "sdl-config", so it can be a program name with args. -set dummy sdl-config; ac_word=$2 + # Extract the first word of "gtk-config", so it can be a program name with args. +set dummy gtk-config; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:6915: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_path_SDL_CONFIG'+set}'`\" = set"; then +echo "configure:7180: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_path_GTK_CONFIG'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else - case "$SDL_CONFIG" in + case "$GTK_CONFIG" in /*) - ac_cv_path_SDL_CONFIG="$SDL_CONFIG" # Let the user override the test with a path. + ac_cv_path_GTK_CONFIG="$GTK_CONFIG" # Let the user override the test with a path. ;; ?:/*) - ac_cv_path_SDL_CONFIG="$SDL_CONFIG" # Let the user override the test with a dos path. + ac_cv_path_GTK_CONFIG="$GTK_CONFIG" # Let the user override the test with a dos path. ;; *) IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$SDL_PATH" + ac_dummy="$GTK_PATH" for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if test -f $ac_dir/$ac_word; then - ac_cv_path_SDL_CONFIG="$ac_dir/$ac_word" + ac_cv_path_GTK_CONFIG="$ac_dir/$ac_word" break fi done IFS="$ac_save_ifs" - test -z "$ac_cv_path_SDL_CONFIG" && ac_cv_path_SDL_CONFIG="no" + test -z "$ac_cv_path_GTK_CONFIG" && ac_cv_path_GTK_CONFIG="no" ;; esac fi -SDL_CONFIG="$ac_cv_path_SDL_CONFIG" -if test -n "$SDL_CONFIG"; then - echo "$ac_t""$SDL_CONFIG" 1>&6 +GTK_CONFIG="$ac_cv_path_GTK_CONFIG" +if test -n "$GTK_CONFIG"; then + echo "$ac_t""$GTK_CONFIG" 1>&6 else echo "$ac_t""no" 1>&6 fi - SDL_HEADER="SDL/SDL.h" fi - if test x${SDL_CONFIG} != xno + if test x${GTK_CONFIG} != xno then - PLUGINS="${PLUGINS} sdl" - CFLAGS_SDL="${CFLAGS_SDL} `${SDL_CONFIG} --cflags`" - LIB_SDL="${LIB_SDL} `${SDL_CONFIG} --libs | sed 's,-rdynamic,,'`" - save_CPPFLAGS=$CPPFLAGS - CPPFLAGS="$CPPFLAGS $CFLAGS_SDL" - for ac_hdr in ${SDL_HEADER} -do -ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` -echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:6961: checking for $ac_hdr" >&5 -if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - cat > conftest.$ac_ext < -EOF -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:6971: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` -if test -z "$ac_err"; then - rm -rf conftest* - eval "ac_cv_header_$ac_safe=yes" -else - echo "$ac_err" >&5 - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_header_$ac_safe=no" -fi -rm -f conftest* -fi -if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then - echo "$ac_t""yes" 1>&6 - ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` - cat >> confdefs.h <> confdefs.h < -EOF - -else - echo "$ac_t""no" 1>&6 -{ echo "configure: error: The development package for SDL is not installed. -Please install it and try again. Alternatively you can also configure with ---disable-sdl." 1>&2; exit 1; } - -fi -done - - CPPFLAGS=$save_CPPFLAGS - if expr 1.1.5 \> `$SDL_CONFIG --version` >/dev/null + if expr 1.2.0 \> `$GTK_CONFIG --version` >/dev/null then - { echo "configure: error: The development package for SDL is not installed. -Please install it and try again. Alternatively you can also configure with ---disable-sdl." 1>&2; exit 1; } + { echo "configure: error: Your development package for Gtk+ is too old, you need at least version 1.2.0. Please upgrade and try again. Alternatively you can also configure with --disable-gtk." 1>&2; exit 1; } fi - elif test "x$enable_sdl" = "xyes" - then - { echo "configure: error: I couldn't find the SDL package. You can download libSDL -from http://www.libsdl.org/, or configure with --disable-sdl. Have a nice day. - " 1>&2; exit 1; } - fi -fi - -# Check whether --enable-directx or --disable-directx was given. -if test "${enable_directx+set}" = set; then - enableval="$enable_directx" - : -fi - -if test "x$enableval" != "xno" -then - if test $SYS = mingw32 - then - # Check whether --with-directx-path or --without-directx-path was given. -if test "${with_directx_path+set}" = set; then - withval="$with_directx_path" - : -fi - - if test "x$with_directx_path" = "x" - then - for ac_hdr in directx.h + CFLAGS_GTK="${CFLAGS_GTK} `${GTK_CONFIG} --cflags gtk`" + LIB_GTK="${LIB_GTK} `${GTK_CONFIG} --libs gtk | sed 's,-rdynamic,,'`" + # now look for the gtk.h header + saved_CPPFLAGS=$CPPFLAGS + CPPFLAGS="$CPPFLAGS $CFLAGS_GTK" + ac_cv_gtk_headers=yes + for ac_hdr in gtk/gtk.h glib.h gdk/gdk.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:7041: checking for $ac_hdr" >&5 +echo "configure:7230: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:7051: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7240: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -7067,104 +7256,24 @@ if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then cat >> confdefs.h <&6 +ac_cv_gtk_headers=no + echo "Cannot find gtk development headers." + fi done - else - echo $ac_n "checking for directX headers in ${withval}""... $ac_c" 1>&6 -echo "configure:7080: checking for directX headers in ${withval}" >&5 - if test -f ${withval}/include/directx.h - then - PLUGINS="${PLUGINS} directx" - LIB_DIRECTX="${LIB_DIRECTX} -L${withval}/lib -lgdi32" - INCLUDE="${INCLUDE} -I${withval}/include" - echo "$ac_t""yes" 1>&6 - else - echo "$ac_t""no" 1>&6 - { echo "configure: error: Cannot find ${withval}/include/directx.h!" 1>&2; exit 1; } - fi + if test "x$ac_cv_gtk_headers" = xyes + then + PLUGINS="${PLUGINS} gtk" + ALIASES="${ALIASES} gvlc" fi + CPPFLAGS=$saved_CPPFLAGS fi fi -# Check whether --enable-win32 or --disable-win32 was given. -if test "${enable_win32+set}" = set; then - enableval="$enable_win32" - if test "x$enableval" != "xno" - then - PLUGINS="${PLUGINS} win32" - fi -fi - - -# Check whether --with-glide or --without-glide was given. -if test "${with_glide+set}" = set; then - withval="$with_glide" - if test "x$withval" != "xno" - then - PLUGINS="${PLUGINS} glide" - if test "x$withval" != "xyes" - then - LIB_GLIDE="${LIB_GLIDE} -l$withval -lm" - else - LIB_GLIDE="${LIB_GLIDE} -lglide2x -lm" - fi - CFLAGS_GLIDE="${CFLAGS_GLIDE} -I/usr/include/glide" - fi -fi - - -# Check whether --enable-ncurses or --disable-ncurses was given. -if test "${enable_ncurses+set}" = set; then - enableval="$enable_ncurses" - if test x$enable_ncurses = xyes; then - PLUGINS="${PLUGINS} ncurses" - LIB_NCURSES="${LIB_NCURSES} -lncurses" - fi -fi - - -# Check whether --enable-qt or --disable-qt was given. -if test "${enable_qt+set}" = set; then - enableval="$enable_qt" - if test x$enable_qt = xyes; then - PLUGINS="${PLUGINS} qt" - ALIASES="${ALIASES} qvlc" - LIB_QT="${LIB_QT} -lqt -L${QTDIR}/lib" - CFLAGS_QT="${CFLAGS_QT} -I/usr/include/qt -I${QTDIR}/include" - if test -x ${QTDIR}/bin/moc - then - MOC=${QTDIR}/bin/moc - else - MOC=moc - fi - fi -fi - - -# Check whether --enable-kde or --disable-kde was given. -if test "${enable_kde+set}" = set; then - enableval="$enable_kde" - if test x$enable_kde = xyes; then - PLUGINS="${PLUGINS} kde" - ALIASES="${ALIASES} kvlc" - LIB_KDE="${LIB_KDE} -L${KDEDIR}/lib -lkfile" - CFLAGS_KDE="${CFLAGS_KDE} -I/usr/include/kde -I/usr/include/qt" - CFLAGS_KDE="${CFLAGS_KDE} -I${KDEDIR}/include -I${QTDIR}/include" - if test -x ${QTDIR}/bin/moc - then - MOC=${QTDIR}/bin/moc - else - MOC=moc - fi - fi -fi - - # Check whether --enable-gnome or --disable-gnome was given. if test "${enable_gnome+set}" = set; then enableval="$enable_gnome" @@ -7173,7 +7282,7 @@ if test "${enable_gnome+set}" = set; then # Extract the first word of "gnome-config", so it can be a program name with args. set dummy gnome-config; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:7177: checking for $ac_word" >&5 +echo "configure:7286: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_GNOME_CONFIG'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -7218,17 +7327,17 @@ fi do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:7222: checking for $ac_hdr" >&5 +echo "configure:7331: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:7232: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7341: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -7255,7 +7364,7 @@ EOF else echo "$ac_t""no" 1>&6 { echo "configure: error: Can't find gnome headers. Please install the gnome -developement librairie or remove the --enable-gnome option" 1>&2; exit 1; } +developement tools or remove the --enable-gnome option" 1>&2; exit 1; } fi done @@ -7266,89 +7375,69 @@ done fi -# Check whether --enable-gtk or --disable-gtk was given. -if test "${enable_gtk+set}" = set; then - enableval="$enable_gtk" - : +# Check whether --enable-qt or --disable-qt was given. +if test "${enable_qt+set}" = set; then + enableval="$enable_qt" + if test x$enable_qt = xyes; then + PLUGINS="${PLUGINS} qt" + ALIASES="${ALIASES} qvlc" + LIB_QT="${LIB_QT} -lqt -L${QTDIR}/lib" + CFLAGS_QT="${CFLAGS_QT} -I/usr/include/qt -I${QTDIR}/include" + if test -x ${QTDIR}/bin/moc + then + MOC=${QTDIR}/bin/moc + else + MOC=moc + fi + fi fi -if test x$enable_gtk != xno -then - GTK_PATH=$PATH - # Check whether --with-gtk-config-path or --without-gtk-config-path was given. -if test "${with_gtk_config_path+set}" = set; then - withval="$with_gtk_config_path" - if test "x$withval" != "xno" - then - GTK_PATH=$withval:$PATH - fi -fi - # look for gtk-config - # Extract the first word of "gtk-config", so it can be a program name with args. -set dummy gtk-config; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:7292: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_path_GTK_CONFIG'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - case "$GTK_CONFIG" in - /*) - ac_cv_path_GTK_CONFIG="$GTK_CONFIG" # Let the user override the test with a path. - ;; - ?:/*) - ac_cv_path_GTK_CONFIG="$GTK_CONFIG" # Let the user override the test with a dos path. - ;; - *) - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$GTK_PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_path_GTK_CONFIG="$ac_dir/$ac_word" - break - fi - done - IFS="$ac_save_ifs" - test -z "$ac_cv_path_GTK_CONFIG" && ac_cv_path_GTK_CONFIG="no" - ;; -esac -fi -GTK_CONFIG="$ac_cv_path_GTK_CONFIG" -if test -n "$GTK_CONFIG"; then - echo "$ac_t""$GTK_CONFIG" 1>&6 -else - echo "$ac_t""no" 1>&6 +# Check whether --enable-kde or --disable-kde was given. +if test "${enable_kde+set}" = set; then + enableval="$enable_kde" + if test x$enable_kde = xyes; then + PLUGINS="${PLUGINS} kde" + ALIASES="${ALIASES} kvlc" + LIB_KDE="${LIB_KDE} -L${KDEDIR}/lib -lkfile" + CFLAGS_KDE="${CFLAGS_KDE} -I/usr/include/kde -I/usr/include/qt" + CFLAGS_KDE="${CFLAGS_KDE} -I${KDEDIR}/include -I${QTDIR}/include" + if test -x ${QTDIR}/bin/moc + then + MOC=${QTDIR}/bin/moc + else + MOC=moc + fi + fi fi - if test -x ${GTK_CONFIG} - then - if expr 1.2.0 \> `$GTK_CONFIG --version` >/dev/null - then - { echo "configure: error: Your development package for Gtk+ is too old, you need at least version 1.2.0. Please upgrade and try again. Alternatively you can also configure with --disable-gtk." 1>&2; exit 1; } - fi - CFLAGS_GTK="${CFLAGS_GTK} `${GTK_CONFIG} --cflags gtk`" - LIB_GTK="${LIB_GTK} `${GTK_CONFIG} --libs gtk | sed 's,-rdynamic,,'`" - fi - # now look for the gtk.h header - saved_CPPFLAGS=$CPPFLAGS - CPPFLAGS="$CPPFLAGS $CFLAGS_GTK" - ac_cv_gtk_headers=yes - for ac_hdr in gtk/gtk.h glib.h gdk/gdk.h + +# Check whether --enable-macosx or --disable-macosx was given. +if test "${enable_macosx+set}" = set; then + enableval="$enable_macosx" + if test x$enable_macosx = xyes + then + BUILTINS="${BUILTINS} macosx" + LIB_MACOSX="${LIB_MACOSX} -framework CoreAudio -framework AudioToolbox -framework Cocoa -framework AGL -framework QuickTime -lobjc" + CFLAGS_MACOSX="${CFLAGS_MACOSX} -ObjC" + LIB_COMMON="${LIB_COMMON} -ObjC" + fi +else + for ac_hdr in Cocoa/Cocoa.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:7342: checking for $ac_hdr" >&5 +echo "configure:7431: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:7352: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7441: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -7368,54 +7457,42 @@ if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then cat >> confdefs.h <&6 -ac_cv_gtk_headers=no - echo "Cannot find gtk development headers." - fi done - if test "x$ac_cv_gtk_headers" = xyes - then - PLUGINS="${PLUGINS} gtk" - ALIASES="${ALIASES} gvlc" - fi - CPPFLAGS=$saved_CPPFLAGS fi -# Check whether --enable-x11 or --disable-x11 was given. -if test "${enable_x11+set}" = set; then - enableval="$enable_x11" + +# Check whether --enable-qnx or --disable-qnx was given. +if test "${enable_qnx+set}" = set; then + enableval="$enable_qnx" : fi -if test x$enable_x11 != xno && - (test $SYS != mingw32 || test x$enable_x11 = xyes); then - if test x$x_includes = xNONE; then - x_includes=/usr/X11R6/include - fi - if test x$x_libraries = xNONE; then - x_libraries=/usr/X11R6/lib - fi - saved_CPPFLAGS=$CPPFLAGS - CPPFLAGS="$CPPFLAGS -I$x_includes" - for ac_hdr in X11/Xlib.h + if test x$enable_qnx != xno + then + for ac_hdr in Ph.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:7409: checking for $ac_hdr" >&5 +echo "configure:7486: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:7419: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7496: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -7436,49 +7513,57 @@ if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then #define $ac_tr_hdr 1 EOF - PLUGINS="${PLUGINS} x11" - LIB_X11="${LIB_X11} -L$x_libraries -lX11 -lXext" - CFLAGS_X11="${CFLAGS_X11} -I$x_includes" - - CPPFLAGS=$saved_CPPFLAGS + PLUGINS="${PLUGINS} qnx" + LIB_QNX="${LIB_QNX} -lasound -lph" + else echo "$ac_t""no" 1>&6 fi done + fi + +# Check whether --enable-win32 or --disable-win32 was given. +if test "${enable_win32+set}" = set; then + enableval="$enable_win32" + if test "x$enableval" != "xno" + then + PLUGINS="${PLUGINS} win32" + fi +fi + + +# Check whether --enable-ncurses or --disable-ncurses was given. +if test "${enable_ncurses+set}" = set; then + enableval="$enable_ncurses" + if test x$enable_ncurses = xyes; then + PLUGINS="${PLUGINS} ncurses" + LIB_NCURSES="${LIB_NCURSES} -lncurses" + fi fi -# Check whether --enable-xvideo or --disable-xvideo was given. -if test "${enable_xvideo+set}" = set; then - enableval="$enable_xvideo" + +# Check whether --enable-lirc or --disable-lirc was given. +if test "${enable_lirc+set}" = set; then + enableval="$enable_lirc" : fi -if test x$enable_xvideo != xno && - (test $SYS != mingw32 || test x$enable_xvideo = xyes); then - if test x$x_includes = xNONE; then - x_includes=/usr/X11R6/include - fi - if test x$x_libraries = xNONE; then - x_libraries=/usr/X11R6/lib - fi - saved_CPPFLAGS=$CPPFLAGS - CPPFLAGS="$CPPFLAGS -I$x_includes" - for ac_hdr in X11/extensions/Xv.h -do -ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` -echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:7472: checking for $ac_hdr" >&5 +if test x$enable_lirc = xyes +then + ac_safe=`echo "lirc/lirc_client.h" | sed 'y%./+-%__p_%'` +echo $ac_n "checking for lirc/lirc_client.h""... $ac_c" 1>&6 +echo "configure:7557: checking for lirc/lirc_client.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < +#include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:7482: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7567: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -7494,34 +7579,27 @@ rm -f conftest* fi if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then echo "$ac_t""yes" 1>&6 - ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` - cat >> confdefs.h <&6 -echo "configure:7506: checking for XvSetPortAttribute in -lXv_pic" >&5 -ac_lib_var=`echo Xv_pic'_'XvSetPortAttribute | sed 'y%./+-%__p_%'` + echo $ac_n "checking for lirc_init in -llirc_client""... $ac_c" 1>&6 +echo "configure:7584: checking for lirc_init in -llirc_client" >&5 +ac_lib_var=`echo lirc_client'_'lirc_init | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_save_LIBS="$LIBS" -LIBS="-lXv_pic $LIBS" +LIBS="-llirc_client $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7603: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -7536,78 +7614,226 @@ LIBS="$ac_save_LIBS" fi if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then echo "$ac_t""yes" 1>&6 - # We have Xv_pic, that's good, we can build an xvideo.so plugin ! - PLUGINS="${PLUGINS} xvideo" - LIB_XVIDEO="${LIB_XVIDEO} -L$x_libraries -lX11 -lXext -lXv_pic" - CFLAGS_XVIDEO="${CFLAGS_XVIDEO} -I$x_includes" + have_lirc="true" else echo "$ac_t""no" 1>&6 -# We don't have Xv_pic, let's make xvideo.a as builtin - BUILTINS="${BUILTINS} xvideo" - LIB_XVIDEO="${LIB_XVIDEO} -L$x_libraries -lX11 -lXext -lXv" - CFLAGS_XVIDEO="${CFLAGS_XVIDEO} -I$x_includes" +have_lirc="false" fi - CFLAGS=$saved_CFLAGS - - CPPFLAGS=$saved_CPPFLAGS else echo "$ac_t""no" 1>&6 +have_lirc="false" fi -done + if test x$have_lirc = xtrue + then + PLUGINS="${PLUGINS} lirc" + LIB_LIRC="${LIB_LIRC} -llirc_client" + fi fi -# Check whether --enable-alsa or --disable-alsa was given. -if test "${enable_alsa+set}" = set; then - enableval="$enable_alsa" - if test x$enable_alsa = xyes - then - ac_safe=`echo "alsa/asoundlib.h" | sed 'y%./+-%__p_%'` -echo $ac_n "checking for alsa/asoundlib.h""... $ac_c" 1>&6 -echo "configure:7569: checking for alsa/asoundlib.h" >&5 -if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then +fi + +# Check whether --with- or --without- was given. +if test "${with_+set}" = set; then + withval="$with_" + : +fi + + +# Check whether --with-words or --without-words was given. +if test "${with_words+set}" = set; then + withval="$with_words" + : +fi + + case "x$withval" in + xbig) + ac_cv_c_bigendian=yes + ;; + xlittle) + ac_cv_c_bigendian=no + ;; + *) + echo $ac_n "checking whether the byte order is big-endian""... $ac_c" 1>&6 +echo "configure:7660: checking whether the byte order is big-endian" >&5 +if eval "test \"`echo '$''{'ac_cv_c_bigendian'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else - cat > conftest.$ac_ext <conftest.c <config.log 2>&1 \ + && test -f conftest.o + then + if test "`strings conftest.o | grep BIGenDianSyS`" + then + ac_cv_c_bigendian=yes + fi + if test "`strings conftest.o | grep LiTTleEnDian`" + then + ac_cv_c_bigendian=no + fi + fi + fi + +fi + +echo "$ac_t""$ac_cv_c_bigendian" 1>&6 + if test x$ac_cv_c_bigendian = xunknown + then + { echo "configure: error: Could not guess endianness, please use --with-words" 1>&2; exit 1; } + fi + ;; + esac +if test $ac_cv_c_bigendian = yes +then + cat >> confdefs.h <<\EOF +#define WORDS_BIGENDIAN 1 +EOF + +fi + +DLL_PATH=. +# Check whether --with-dll-path or --without-dll-path was given. +if test "${with_dll_path+set}" = set; then + withval="$with_dll_path" + if test "x$withval" != "xno" + then + DLL_PATH=$withval + fi +fi + + +GPROF=0 +# Check whether --enable-gprof or --disable-gprof was given. +if test "${enable_gprof+set}" = set; then + enableval="$enable_gprof" + if test x$enableval = xyes; then GPROF=1; fi +fi + + +CPROF=0 +# Check whether --enable-cprof or --disable-cprof was given. +if test "${enable_cprof+set}" = set; then + enableval="$enable_cprof" + if test x$enableval = xyes; + then + LIB_COMMON="${LIB_COMMON} -lcprof" + CPROF=1 + fi + +fi + + +# Check whether --enable-pth or --disable-pth was given. +if test "${enable_pth+set}" = set; then + enableval="$enable_pth" + if test x$enableval = xyes; then + echo $ac_n "checking for pth_init in -lpth""... $ac_c" 1>&6 +echo "configure:7745: checking for pth_init in -lpth" >&5 +ac_lib_var=`echo pth'_'pth_init | sed 'y%./+-%__p_%'` +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + ac_save_LIBS="$LIBS" +LIBS="-lpth $LIBS" +cat > conftest.$ac_ext < +/* Override any gcc2 internal prototype to avoid an error. */ +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char pth_init(); + +int main() { +pth_init() +; return 0; } EOF -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:7579: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` -if test -z "$ac_err"; then +if { (eval echo configure:7764: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* - eval "ac_cv_header_$ac_safe=yes" + eval "ac_cv_lib_$ac_lib_var=yes" else - echo "$ac_err" >&5 echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 rm -rf conftest* - eval "ac_cv_header_$ac_safe=no" + eval "ac_cv_lib_$ac_lib_var=no" fi rm -f conftest* +LIBS="$ac_save_LIBS" + fi -if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then echo "$ac_t""yes" 1>&6 - echo $ac_n "checking for main in -lasound""... $ac_c" 1>&6 -echo "configure:7596: checking for main in -lasound" >&5 -ac_lib_var=`echo asound'_'main | sed 'y%./+-%__p_%'` + ac_tr_lib=HAVE_LIB`echo pth | sed -e 's/[^a-zA-Z0-9_]/_/g' \ + -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` + cat >> confdefs.h <&6 +fi + + cat > conftest.$ac_ext < +EOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + egrep "pth_init" >/dev/null 2>&1; then + rm -rf conftest* + + cat >> confdefs.h <<\EOF +#define PTH_INIT_IN_PTH_H 1 +EOF + + THREAD_LIB="-lpth" + fi +fi +rm -f conftest* + + +fi + + +# Check whether --enable-st or --disable-st was given. +if test "${enable_st+set}" = set; then + enableval="$enable_st" + if test x$enableval = xyes; then + echo $ac_n "checking for st_init in -lst""... $ac_c" 1>&6 +echo "configure:7818: checking for st_init in -lst" >&5 +ac_lib_var=`echo st'_'st_init | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_save_LIBS="$LIBS" -LIBS="-lasound $LIBS" +LIBS="-lst $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7837: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -7622,28 +7848,42 @@ LIBS="$ac_save_LIBS" fi if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then echo "$ac_t""yes" 1>&6 - have_alsa="true" -else - echo "$ac_t""no" 1>&6 -have_alsa="false" -fi + ac_tr_lib=HAVE_LIB`echo st | sed -e 's/[^a-zA-Z0-9_]/_/g' \ + -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` + cat >> confdefs.h <&6 -have_alsa="false" fi - if test x$have_alsa = xtrue - then - PLUGINS="${PLUGINS} alsa" - LIB_ALSA="${LIB_ALSA} -lasound -lm -ldl" - fi - fi + cat > conftest.$ac_ext < +EOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + egrep "st_init" >/dev/null 2>&1; then + rm -rf conftest* + + cat >> confdefs.h <<\EOF +#define ST_INIT_IN_ST_H 1 +EOF + + THREAD_LIB="-lst" + fi fi +rm -f conftest* fi + +LIB_COMMON="${LIB_COMMON} ${THREAD_LIB}" + # Check whether --enable-plugins or --disable-plugins was given. if test "${enable_plugins+set}" = set; then enableval="$enable_plugins" @@ -7655,27 +7895,24 @@ if test "${enable_plugins+set}" = set; then fi -DLL_PATH=. -# Check whether --with-dll-path or --without-dll-path was given. -if test "${with_dll_path+set}" = set; then - withval="$with_dll_path" - if test "x$withval" != "xno" - then - DLL_PATH=$withval - fi +if test x$ac_cv_header_dlfcn_h = xno -a x$ac_cv_header_image_h = xno -a x$SYS != xmingw32 +then + echo "*** Your system doesn't have plug-in support. All plug-ins will be compiled" + echo "as built-in" + BUILTINS="${BUILTINS} ${PLUGINS}" + PLUGINS= fi - cat >> confdefs.h <> confdefs.h <> confdefs.h <