diff --git a/ChangeLog b/ChangeLog index f5edf649dcf8200317f88937079b4e0e37ea3f62..a152ee1cd8cda966c3c95554202aab07a47083d3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3,11 +3,163 @@ #===================# HEAD - * Nothing yet + + * Fixed detection of the esd plugin. + * Fixed the ts plugin's input type detection. + * Fixed the BadCursor error in the x11 and xvideo plugins. For real this + time (unlike my 2001/08/03 fix :p). + * Made the wall filter work a bit better. It now spawns a 3x2 mosaic, + but this will eventually be configurable, � la `--filter wall:3x3'. + * Removed duplicate function checks from configure.in. + * Added extra magic to Makefile.modules so that the module Makefiles + are now ridiculously simple. And I mean *simple*. Check it! This will + make a possible switch to full autoconf/automake a lot easier. + * Added the vlc version name to the plugin symbols, to be sure we only load + plugins with the same version number. A nasty consequence is that you + need to rebuild your tree after midnight if you are using a CVS tree :-) + * Got rid of modules_export.h by #defining exported functions in the same + header as their prototype. + * Added modules_inner.h and other commonly used .h files to common.h so + there are less and less files to include, and renamed common.h to + <videolan/vlc.h>. + * First modifications to the module handling system towards my ultimate + goal to get rid of the *_Probe functions. Got rid of TestMethod and + TestCPU, as well as src/misc/tests.c. + * Wrote the chroma plugin handling functions. No YUV functions have been + ported yet because it'ls a lot of work, but the core system works, I + tried it with a naive yv12->rgb16 plugin (which will disappear when the + real functions are ready). + * Made a lot of functions in dvd_summary.c one-liners to avoid wasting + too many output lines. + * Fixed a segfault in input_dvd.c:DVDInit. + * Added a fixfiles.sh script in plugins/gtk to be run after Glade has + generated its C files. + * Did some work on the KDE interface to make it suck a bit less. It still + segfaults, but at least it runs and it looks less ugly. + * RGB SDL rendering works again, though in 16bpp only. + * Made plugins/vcd/linux_cdrom_tools.c independent of any vlc structure + so that it'll be easily put in a library. Maybe libdvdcss? + * Fixed VCD date display. + * Merged vout_xvideo.c, vout_x11.c and vout_common.c into xcommon.c. + * Wrote non-Shm XVideo output. + * Made X11 output work again. Still pretty unstable, only works for 16bpp. + * Additional french translation in po/fr.po. Any taker for the rest? + * Fixed a segfault in video_output.c when the allocated pictures were + not direct buffers. + * Replaced 48x48 .xpm images with 32x32 ones to conform to Debian policy + (Closes Debian bug #126939). + * Removed the automatic ./configure launch when running `make all' for + the first time. + * --filter distort:ripple (Ok, ok, I promise it's the last one !! :-) + * Fixed compilation with dvdcss disabled. + * Fixed compilation with plugins disabled. + * Removed useless variables in the VCD and DVD plugins. + * Fixed a function which was returning "struct foo" in the VCD plugin. + * Fixed the old � XVideo eats more and more CPU � bug I mistakenly + reintroduced in my first vout4 commit. + * We now stop at the first ':' when looking for a module name, to easily + pass information to the modules. Possible example: --vout sdl:software, + implementation of such an option is left as an exercise. + * Merged filter_bob and filter_bob422 into filter_bob. Use --filter bob + to deinterlace 422 into 420 as well. + * Factorized code common to most filters and the video output, optimized + a few filters by aligning data and reading 64 bits at a time. + * Two new absolutely useless, CPU-eating, resource-wasting, but fun + filters: enjoy `transform', which performs flips and 90� rotations, and + `distort', which performs animated image effects (currently only a naive + sine wave is implemented). Usage examples: --filter transform:hflip, + --filter transform:vflip, --filter transform:90, --filter transform:180, + --filter transform:270, --filter distort:wave. + * Added missing XSync() in the XVideo plugin. + * Pathetic attempt at a 4:2:2 renderer and deinterlacer, combining the + most awful line dropping techniques of both BOB and 422 to 420 + downscaling. Don't worry, it should only survive for a couple of days. + * New stupid plugin: "--filter wall" for split-image playback :-) + (will evolve into a real image wall plugin when I have time) + * Filter plugins. Not very polished (please don't look at how the dates are + calculated!), but worth a try. Use the following flags: + "--filter invert" for inverse video + "--filter bob" for BOB deinterlacing + * Buffer choice optimizations - vout4 should eat even less CPU now. + * Fixed aspect ratio handling. + * Additional fixes for OSes with no gettext (thanks to ej0). + * Don't try to use gettext if we don't have GNU gettext. This may change + in the future though (most GNU software seems to include a local copy of + gettext in case the operating system doesn't provide it). + * Added vlc-arts to the debian package generation. + * (very old) russian translation courtesy of Valek Filippov <frob@df.ru>. + * Fixed a charset issue in the french translation. + * Updated config.guess and config.sub from GNU's latest versions. + * Added vlc.pot skeleton for translators. + * Removed unused code (intf_channels.c, keystrokes.h). + * Put common_win32.h back into common.h -- it wasn't that big and we + should not multiply header files. + * Added gettext support by Thomas Graf <reeler@reeler.org>, may be + broken on other platforms but we'll only see it when I'm finished + with vout 4 :-) + * New video output version 4, featuring direct to YUV buffer decoding, + non-ugly subtitle blending, XVideo and SDL video output. + * Renamed spu_dec to spudec and mad_adec to mad to stay coherent with + other plugins. Also, renamed mpeg to mpeg_system. + * Added jobi to the AUTHORS file. + * Factored code common to vout_x11.c and vout_xvideo.c. 0.2.92 -Fri, 7 Dec 2001 20:18:56 +0100 +Mon, 31 Dec 2001 19:50:40 +0100 + * Added a missing call to DecoderError() in mpeg_adec.c. + * Fixed a segfault in the aRts plugin. + * Fixed a bug in DecoderError. + * Next Generation Buffer Manager. + * All decoders enter DecoderError() in case of error, even if they + haven't allocated all their data. This prevents the input from getting + stuck if a decoder has failed its initialization. + * Backported lool's fix for the Gtk+ playlist crash. + * If $DISPLAY isn't set, don't try to run the Gtk+ interface. + * Fixed a segfault in input_dvd.c:DVDInit. + * Fixed a PPC compilation issue. + * Mouse wheel seek patch for XVideo courtesy of Peter Surda. + * Ported to SDL. + * Backported a VCD crash fix from the main branch. + * Fixed compilation with dvdcss disabled. + * Bug fixes in the VCD input. + * The SDL plugin now says whether we are using software or hardware YUV + in its window title. + * Added --with-dll-path option for my automated Win32 package builds. + * Initialize SDL before opening the SDL audio output. + * Prevent two SDL video outputs or audio outputs to be spawned at the + same time to avoid ugly crashes. + * TS input: bugfix in DecodePAT and minor optimizations elsewhere. + * TS input: we now check that the contents of the PAT has changed + before updating it, instead of just relying on its version number. + * Disabled broken ALSA audio output. Closes Debian bugs #110869 and #119846. + * Fixed build dependencies on libasound2-dev. Closes Debian bug #121057. + * Changed configure.in so that libXv_pic is used instead of libXv.a when + available. Closes Debian bug #111790. + * CPU detection under BeOS. + * Fixed XVideo port selection. + * Fixed 4:2:2 software rendering. + * Removed cruft I forgot in aout_alsa.c. + * Minor compile fix under Hurd. + * Fixed a potential segfault if the subtitle stream was encountered + before the video stream. + * Fixed potential compilation issues under eg. BSD/OS. + * Fixed unnecessary target remake (recursive make is harmful !). + * Fixed a potential BeOS linking issue. + * Fixed a minor bug in input.c. + * Fixed an issue in Makefile.dep causing to rebuild unnecessary files + in the gtk/gnome plugins. + * Removed cruft from configure.in. + * Fixed major bugs in the PSI decoder. + * Fixed possible segfault with --input. + * Fix for EOF of ES-only streams. + * MPEG-1 aspect ratio patch, courtesy of Vladimir Chernyshov + <greengrass@writeme.com>. + * Seeking patch for X11, courtesy of Peter Surda + <shurdeek@panorama.sth.ac.at>. + * Fixed a segfault on exit when no fast_memcpy module was found. + * Workaround for a bug in the GLIBC dlopen() code. + * Fixed win32 compilation. * New libmad plug-in, courtesy of Jean-Paul Saman. We now have sound on iPAQ Familiar Linux. * Borrowed MPlayer's fast memcpy() routines. Best is autodetected, choose diff --git a/Makefile b/Makefile index 115692aad2e37823c16e31eac691976db1e68b7a..26b1a13ebc43ab259570f573556de9e6a9b72b97 100644 --- a/Makefile +++ b/Makefile @@ -244,7 +244,7 @@ distclean: clean -cd po && $(MAKE) maintainer-clean rm -f **/*.o **/*~ *.log rm -f Makefile.opts - rm -f include/defs.h include/config.h include/modules_builtin.h + rm -f include/defs.h include/modules_builtin.h rm -f src/misc/modules_builtin.h rm -f config*status config*cache config*log rm -f gmon.out core build-stamp @@ -432,7 +432,7 @@ package-beos: mv tmp/vlc tmp/vlc-${VLC_QUICKVERSION} (cd tmp ; find vlc-${VLC_QUICKVERSION} | \ zip -9 -@ vlc-${VLC_QUICKVERSION}-beos.zip ) - mv tmp/vlc-${VLC_QUICKVERSION}-beos.zip . + mv tmp/vlc-${VLC_QUICKVERSION}-BeOS-x86.zip . # Clean up rm -Rf tmp @@ -444,7 +444,7 @@ libdvdcss-snapshot: snapshot-common rm -Rf tmp/vlc/ipkg # Remove useless headers rm -f tmp/vlc/include/* - for file in defs.h.in config.h.in common.h int_types.h ; \ + for file in defs.h.in config.h common.h int_types.h ; \ do cp include/$$file tmp/vlc/include/ ; done # Remove misc files (??? - maybe not really needed) rm -f tmp/vlc/vlc.spec tmp/vlc/INSTALL-win32.txt diff --git a/Makefile.opts.in b/Makefile.opts.in index a539435be42bfc9a4b14fc425fec0b59ecc3f01f..788e435d1035356b6332fba6031afcf1d54331c8 100644 --- a/Makefile.opts.in +++ b/Makefile.opts.in @@ -182,6 +182,10 @@ DEFINE += -D_FILE_OFFSET_BITS=64 -D__USE_UNIX98 # Gettext support DEFINE += -DLOCALEDIR=\"$(datadir)/locale\" +# Data and plugin location +DEFINE += -DDATA_PATH=\"@prefix@/share/videolan\" +DEFINE += -DPLUGIN_PATH=\"@prefix@/lib/videolan/vlc\" + ############################################################################### # Tuning and other variables - do not change anything except if you know # exactly what you are doing diff --git a/acconfig.h b/acconfig.h index 70e734b0946676a0afe39b94695f3ec21e8c2ace..a219b3d1b8842719bbaaee2523c7386c4712fe3f 100644 --- a/acconfig.h +++ b/acconfig.h @@ -2,3 +2,7 @@ #undef VERSION #undef DVD_DEVICE #undef VCD_DEVICE +#undef COPYRIGHT_MESSAGE +#undef MODULE_SUFFIX +#undef MODULE_SYMBOL +#undef VERSION_MESSAGE diff --git a/configure b/configure index e14ac6ab67efb3264c62b4b2e429a89fe3313944..65a20c84617fe279ebd2be2ea0e29fe97eedaa73 100755 --- a/configure +++ b/configure @@ -729,9 +729,7 @@ 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 @@ -751,7 +749,7 @@ 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:753: 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 +778,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:782: 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 +808,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:812: 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 +859,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:863: 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 +891,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:895: 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 +902,12 @@ cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext << EOF -#line 908 "configure" +#line 906 "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:911: \"$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 +933,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:937: 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:942: 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 +947,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:951: \"$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 +966,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:970: 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 +998,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:1002: 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 +1013,13 @@ else # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext <<EOF -#line 1019 "configure" +#line 1017 "configure" #include "confdefs.h" #include <assert.h> 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:1023: \"$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 +1030,13 @@ else rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext <<EOF -#line 1036 "configure" +#line 1034 "configure" #include "confdefs.h" #include <assert.h> 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:1040: \"$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 +1047,13 @@ else rm -rf conftest* CPP="${CC-cc} -nologo -E" cat > conftest.$ac_ext <<EOF -#line 1053 "configure" +#line 1051 "configure" #include "confdefs.h" #include <assert.h> 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:1057: \"$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 : @@ -1081,21 +1079,19 @@ echo "$ac_t""$CPP" 1>&6 ALL_LINGUAS="de fr ru" -PACKAGE="vlc" -VERSION="$VLC_VERSION" cat >> confdefs.h <<EOF -#define PACKAGE "$PACKAGE" +#define PACKAGE "vlc" EOF cat >> confdefs.h <<EOF -#define VERSION "$VERSION" +#define VERSION "$VLC_VERSION" EOF # 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:1099: checking for $ac_word" >&5 +echo "configure:1095: 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 @@ -1124,7 +1120,7 @@ fi echo $ac_n "checking for strerror in -lcposix""... $ac_c" 1>&6 -echo "configure:1128: checking for strerror in -lcposix" >&5 +echo "configure:1124: 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 @@ -1132,7 +1128,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lcposix $LIBS" cat > conftest.$ac_ext <<EOF -#line 1136 "configure" +#line 1132 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -1143,7 +1139,7 @@ int main() { strerror() ; return 0; } EOF -if { (eval echo configure:1147: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1143: \"$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 @@ -1166,12 +1162,12 @@ fi echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:1170: checking for ANSI C header files" >&5 +echo "configure:1166: 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 <<EOF -#line 1175 "configure" +#line 1171 "configure" #include "confdefs.h" #include <stdlib.h> #include <stdarg.h> @@ -1179,7 +1175,7 @@ else #include <float.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1183: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1179: \"$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* @@ -1196,7 +1192,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 -#line 1200 "configure" +#line 1196 "configure" #include "confdefs.h" #include <string.h> EOF @@ -1214,7 +1210,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 -#line 1218 "configure" +#line 1214 "configure" #include "confdefs.h" #include <stdlib.h> EOF @@ -1235,7 +1231,7 @@ if test "$cross_compiling" = yes; then : else cat > conftest.$ac_ext <<EOF -#line 1239 "configure" +#line 1235 "configure" #include "confdefs.h" #include <ctype.h> #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -1246,7 +1242,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2); exit (0); } EOF -if { (eval echo configure:1250: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:1246: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -1270,12 +1266,12 @@ EOF fi echo $ac_n "checking for working const""... $ac_c" 1>&6 -echo "configure:1274: checking for working const" >&5 +echo "configure:1270: 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 <<EOF -#line 1279 "configure" +#line 1275 "configure" #include "confdefs.h" int main() { @@ -1324,7 +1320,7 @@ ccp = (char const *const *) p; ; return 0; } EOF -if { (eval echo configure:1328: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1324: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_const=yes else @@ -1345,21 +1341,21 @@ EOF fi echo $ac_n "checking for inline""... $ac_c" 1>&6 -echo "configure:1349: checking for inline" >&5 +echo "configure:1345: 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 <<EOF -#line 1356 "configure" +#line 1352 "configure" #include "confdefs.h" int main() { } $ac_kw foo() { ; return 0; } EOF -if { (eval echo configure:1363: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1359: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_inline=$ac_kw; break else @@ -1385,12 +1381,12 @@ EOF esac echo $ac_n "checking for off_t""... $ac_c" 1>&6 -echo "configure:1389: checking for off_t" >&5 +echo "configure:1385: 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 <<EOF -#line 1394 "configure" +#line 1390 "configure" #include "confdefs.h" #include <sys/types.h> #if STDC_HEADERS @@ -1418,12 +1414,12 @@ EOF fi echo $ac_n "checking for size_t""... $ac_c" 1>&6 -echo "configure:1422: checking for size_t" >&5 +echo "configure:1418: 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 <<EOF -#line 1427 "configure" +#line 1423 "configure" #include "confdefs.h" #include <sys/types.h> #if STDC_HEADERS @@ -1453,19 +1449,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:1457: checking for working alloca.h" >&5 +echo "configure:1453: 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 <<EOF -#line 1462 "configure" +#line 1458 "configure" #include "confdefs.h" #include <alloca.h> int main() { char *p = alloca(2 * sizeof(int)); ; return 0; } EOF -if { (eval echo configure:1469: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1465: \"$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 @@ -1486,12 +1482,12 @@ EOF fi echo $ac_n "checking for alloca""... $ac_c" 1>&6 -echo "configure:1490: checking for alloca" >&5 +echo "configure:1486: 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 <<EOF -#line 1495 "configure" +#line 1491 "configure" #include "confdefs.h" #ifdef __GNUC__ @@ -1519,7 +1515,7 @@ int main() { char *p = (char *) alloca(1); ; return 0; } EOF -if { (eval echo configure:1523: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1519: \"$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 @@ -1551,12 +1547,12 @@ EOF echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6 -echo "configure:1555: checking whether alloca needs Cray hooks" >&5 +echo "configure:1551: 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 <<EOF -#line 1560 "configure" +#line 1556 "configure" #include "confdefs.h" #if defined(CRAY) && ! defined(CRAY2) webecray @@ -1581,12 +1577,12 @@ echo "$ac_t""$ac_cv_os_cray" 1>&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:1585: checking for $ac_func" >&5 +echo "configure:1581: 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 <<EOF -#line 1590 "configure" +#line 1586 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -1609,7 +1605,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:1613: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1609: \"$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 @@ -1636,7 +1632,7 @@ done fi echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6 -echo "configure:1640: checking stack direction for C alloca" >&5 +echo "configure:1636: 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 @@ -1644,7 +1640,7 @@ else ac_cv_c_stack_direction=0 else cat > conftest.$ac_ext <<EOF -#line 1648 "configure" +#line 1644 "configure" #include "confdefs.h" find_stack_direction () { @@ -1663,7 +1659,7 @@ main () exit (find_stack_direction() < 0); } EOF -if { (eval echo configure:1667: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:1663: \"$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 @@ -1688,17 +1684,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:1692: checking for $ac_hdr" >&5 +echo "configure:1688: 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 -#line 1697 "configure" +#line 1693 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1702: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1698: \"$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* @@ -1727,12 +1723,12 @@ done for ac_func in getpagesize do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:1731: 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 <<EOF -#line 1736 "configure" +#line 1732 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -1755,7 +1751,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:1759: \"$ac_link\") 1>&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 @@ -1780,7 +1776,7 @@ fi done echo $ac_n "checking for working mmap""... $ac_c" 1>&6 -echo "configure:1784: checking for working mmap" >&5 +echo "configure:1780: 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 @@ -1788,7 +1784,7 @@ else ac_cv_func_mmap_fixed_mapped=no else cat > conftest.$ac_ext <<EOF -#line 1792 "configure" +#line 1788 "configure" #include "confdefs.h" /* Thanks to Mike Haertel and Jim Avera for this test. @@ -1928,7 +1924,7 @@ main() } EOF -if { (eval echo configure:1932: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:1928: \"$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 @@ -1952,12 +1948,12 @@ fi echo $ac_n "checking whether we are using the GNU C Library 2.1 or newer""... $ac_c" 1>&6 -echo "configure:1956: checking whether we are using the GNU C Library 2.1 or newer" >&5 +echo "configure:1952: 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 <<EOF -#line 1961 "configure" +#line 1957 "configure" #include "confdefs.h" #include <features.h> @@ -1993,17 +1989,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:1997: checking for $ac_hdr" >&5 +echo "configure:1993: 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 -#line 2002 "configure" +#line 1998 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2007: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2003: \"$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* @@ -2034,12 +2030,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:2038: checking for $ac_func" >&5 +echo "configure:2034: 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 <<EOF -#line 2043 "configure" +#line 2039 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -2062,7 +2058,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:2066: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2062: \"$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 @@ -2102,7 +2098,7 @@ fi echo $ac_n "checking for iconv""... $ac_c" 1>&6 -echo "configure:2106: checking for iconv" >&5 +echo "configure:2102: checking for iconv" >&5 if eval "test \"`echo '$''{'am_cv_func_iconv'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2110,7 +2106,7 @@ else am_cv_func_iconv="no, consider installing GNU libiconv" am_cv_lib_iconv=no cat > conftest.$ac_ext <<EOF -#line 2114 "configure" +#line 2110 "configure" #include "confdefs.h" #include <stdlib.h> #include <iconv.h> @@ -2120,7 +2116,7 @@ iconv_t cd = iconv_open("",""); iconv_close(cd); ; return 0; } EOF -if { (eval echo configure:2124: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2120: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* am_cv_func_iconv=yes else @@ -2132,7 +2128,7 @@ rm -f conftest* am_save_LIBS="$LIBS" LIBS="$LIBS -liconv" cat > conftest.$ac_ext <<EOF -#line 2136 "configure" +#line 2132 "configure" #include "confdefs.h" #include <stdlib.h> #include <iconv.h> @@ -2142,7 +2138,7 @@ iconv_t cd = iconv_open("",""); iconv_close(cd); ; return 0; } EOF -if { (eval echo configure:2146: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2142: \"$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 @@ -2163,13 +2159,13 @@ echo "$ac_t""$am_cv_func_iconv" 1>&6 EOF echo $ac_n "checking for iconv declaration""... $ac_c" 1>&6 -echo "configure:2167: checking for iconv declaration" >&5 +echo "configure:2163: 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 <<EOF -#line 2173 "configure" +#line 2169 "configure" #include "confdefs.h" #include <stdlib.h> @@ -2188,7 +2184,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:2192: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2188: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* am_cv_proto_iconv_arg1="" else @@ -2217,19 +2213,19 @@ EOF echo $ac_n "checking for nl_langinfo and CODESET""... $ac_c" 1>&6 -echo "configure:2221: checking for nl_langinfo and CODESET" >&5 +echo "configure:2217: 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 <<EOF -#line 2226 "configure" +#line 2222 "configure" #include "confdefs.h" #include <langinfo.h> int main() { char* cs = nl_langinfo(CODESET); ; return 0; } EOF -if { (eval echo configure:2233: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2229: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* am_cv_langinfo_codeset=yes else @@ -2252,19 +2248,19 @@ EOF if test $ac_cv_header_locale_h = yes; then echo $ac_n "checking for LC_MESSAGES""... $ac_c" 1>&6 -echo "configure:2256: checking for LC_MESSAGES" >&5 +echo "configure:2252: 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 <<EOF -#line 2261 "configure" +#line 2257 "configure" #include "confdefs.h" #include <locale.h> int main() { return LC_MESSAGES ; return 0; } EOF -if { (eval echo configure:2268: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2264: \"$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 @@ -2285,7 +2281,7 @@ EOF fi fi echo $ac_n "checking whether NLS is requested""... $ac_c" 1>&6 -echo "configure:2289: checking whether NLS is requested" >&5 +echo "configure:2285: 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" @@ -2307,7 +2303,7 @@ fi EOF echo $ac_n "checking whether included gettext is requested""... $ac_c" 1>&6 -echo "configure:2311: checking whether included gettext is requested" >&5 +echo "configure:2307: 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" @@ -2327,17 +2323,17 @@ fi ac_safe=`echo "libintl.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for libintl.h""... $ac_c" 1>&6 -echo "configure:2331: checking for libintl.h" >&5 +echo "configure:2327: 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 -#line 2336 "configure" +#line 2332 "configure" #include "confdefs.h" #include <libintl.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2341: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2337: \"$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* @@ -2354,12 +2350,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:2358: checking for GNU gettext in libc" >&5 +echo "configure:2354: 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 <<EOF -#line 2363 "configure" +#line 2359 "configure" #include "confdefs.h" #include <libintl.h> extern int _nl_msg_cat_cntr; @@ -2368,7 +2364,7 @@ bindtextdomain ("", ""); return (int) gettext ("") + _nl_msg_cat_cntr ; return 0; } EOF -if { (eval echo configure:2372: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2368: \"$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 @@ -2384,14 +2380,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:2388: checking for GNU gettext in libintl" >&5 +echo "configure:2384: 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 <<EOF -#line 2395 "configure" +#line 2391 "configure" #include "confdefs.h" #include <libintl.h> extern int _nl_msg_cat_cntr; @@ -2400,7 +2396,7 @@ bindtextdomain ("", ""); return (int) gettext ("") + _nl_msg_cat_cntr ; return 0; } EOF -if { (eval echo configure:2404: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2400: \"$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 @@ -2433,12 +2429,12 @@ EOF for ac_func in dcgettext do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:2437: checking for $ac_func" >&5 +echo "configure:2433: 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 <<EOF -#line 2442 "configure" +#line 2438 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -2461,7 +2457,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:2465: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2461: \"$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 @@ -2490,7 +2486,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:2494: checking for $ac_word" >&5 +echo "configure:2490: 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 @@ -2524,7 +2520,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:2528: checking for $ac_word" >&5 +echo "configure:2524: 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 @@ -2561,7 +2557,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:2565: checking for $ac_word" >&5 +echo "configure:2561: 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 @@ -2611,7 +2607,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:2615: checking for $ac_word" >&5 +echo "configure:2611: 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 @@ -2645,7 +2641,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:2649: checking for $ac_word" >&5 +echo "configure:2645: 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 @@ -2681,7 +2677,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:2685: checking for $ac_word" >&5 +echo "configure:2681: 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 @@ -2752,7 +2748,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:2756: checking for $ac_word" >&5 +echo "configure:2752: 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 @@ -2785,7 +2781,7 @@ done ac_verc_fail=yes else echo $ac_n "checking version of bison""... $ac_c" 1>&6 -echo "configure:2789: checking version of bison" >&5 +echo "configure:2785: 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;; @@ -2832,7 +2828,7 @@ echo "configure:2789: checking version of bison" >&5 LINGUAS= else echo $ac_n "checking for catalogs to be installed""... $ac_c" 1>&6 -echo "configure:2836: checking for catalogs to be installed" >&5 +echo "configure:2832: checking for catalogs to be installed" >&5 NEW_LINGUAS= for presentlang in $ALL_LINGUAS; do useit=no @@ -2884,7 +2880,7 @@ echo "configure:2836: 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:2888: checking for a BSD compatible install" >&5 +echo "configure:2884: 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 @@ -2953,7 +2949,7 @@ fi *) ac_cv_c_bigendian=unknown echo $ac_n "checking what the byte order looks to be""... $ac_c" 1>&6 -echo "configure:2957: checking what the byte order looks to be" >&5 +echo "configure:2953: checking what the byte order looks to be" >&5 cat >conftest.c <<EOF short am[] = { 0x4249, 0x4765, 0x6e44, 0x6961, 0x6e53, 0x7953, 0 }; short ai[] = { 0x694c, 0x5454, 0x656c, 0x6e45, 0x6944, 0x6e61, 0 }; @@ -2997,12 +2993,12 @@ EOF for ac_func in gettimeofday select strerror strtod strtol isatty do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:3001: checking for $ac_func" >&5 +echo "configure:2997: 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 <<EOF -#line 3006 "configure" +#line 3002 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -3025,7 +3021,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:3029: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3025: \"$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 @@ -3050,12 +3046,12 @@ fi done echo $ac_n "checking for connect""... $ac_c" 1>&6 -echo "configure:3054: checking for connect" >&5 +echo "configure:3050: 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 <<EOF -#line 3059 "configure" +#line 3055 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char connect(); below. */ @@ -3078,7 +3074,7 @@ connect(); ; return 0; } EOF -if { (eval echo configure:3082: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3078: \"$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 @@ -3097,7 +3093,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6 -echo "configure:3101: checking for connect in -lsocket" >&5 +echo "configure:3097: 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 @@ -3105,7 +3101,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lsocket $LIBS" cat > conftest.$ac_ext <<EOF -#line 3109 "configure" +#line 3105 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -3116,7 +3112,7 @@ int main() { connect() ; return 0; } EOF -if { (eval echo configure:3120: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3116: \"$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 @@ -3140,12 +3136,12 @@ fi fi echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6 -echo "configure:3144: checking for gethostbyname" >&5 +echo "configure:3140: 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 <<EOF -#line 3149 "configure" +#line 3145 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char gethostbyname(); below. */ @@ -3168,7 +3164,7 @@ gethostbyname(); ; return 0; } EOF -if { (eval echo configure:3172: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3168: \"$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 @@ -3187,7 +3183,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6 -echo "configure:3191: checking for gethostbyname in -lnsl" >&5 +echo "configure:3187: 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 @@ -3195,7 +3191,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lnsl $LIBS" cat > conftest.$ac_ext <<EOF -#line 3199 "configure" +#line 3195 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -3206,7 +3202,7 @@ int main() { gethostbyname() ; return 0; } EOF -if { (eval echo configure:3210: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3206: \"$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 @@ -3230,12 +3226,12 @@ fi fi echo $ac_n "checking for nanosleep""... $ac_c" 1>&6 -echo "configure:3234: checking for nanosleep" >&5 +echo "configure:3230: checking for nanosleep" >&5 if eval "test \"`echo '$''{'ac_cv_func_nanosleep'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 3239 "configure" +#line 3235 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char nanosleep(); below. */ @@ -3258,7 +3254,7 @@ nanosleep(); ; return 0; } EOF -if { (eval echo configure:3262: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3258: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_nanosleep=yes" else @@ -3277,7 +3273,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for nanosleep in -lrt""... $ac_c" 1>&6 -echo "configure:3281: checking for nanosleep in -lrt" >&5 +echo "configure:3277: 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 @@ -3285,7 +3281,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lrt $LIBS" cat > conftest.$ac_ext <<EOF -#line 3289 "configure" +#line 3285 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -3296,7 +3292,7 @@ int main() { nanosleep() ; return 0; } EOF -if { (eval echo configure:3300: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3296: \"$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 @@ -3316,7 +3312,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for nanosleep in -lposix4""... $ac_c" 1>&6 -echo "configure:3320: checking for nanosleep in -lposix4" >&5 +echo "configure:3316: 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 @@ -3324,7 +3320,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lposix4 $LIBS" cat > conftest.$ac_ext <<EOF -#line 3328 "configure" +#line 3324 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -3335,7 +3331,7 @@ int main() { nanosleep() ; return 0; } EOF -if { (eval echo configure:3339: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3335: \"$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 @@ -3364,12 +3360,12 @@ fi for ac_func in usleep do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:3368: checking for $ac_func" >&5 +echo "configure:3364: 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 <<EOF -#line 3373 "configure" +#line 3369 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -3392,7 +3388,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:3396: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3392: \"$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 @@ -3417,12 +3413,12 @@ fi done echo $ac_n "checking for inet_aton""... $ac_c" 1>&6 -echo "configure:3421: checking for inet_aton" >&5 +echo "configure:3417: 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 <<EOF -#line 3426 "configure" +#line 3422 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char inet_aton(); below. */ @@ -3445,7 +3441,7 @@ inet_aton(); ; return 0; } EOF -if { (eval echo configure:3449: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3445: \"$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" else @@ -3464,7 +3460,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for inet_aton in -lresolv""... $ac_c" 1>&6 -echo "configure:3468: checking for inet_aton in -lresolv" >&5 +echo "configure:3464: 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 @@ -3472,7 +3468,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lresolv $LIBS" cat > conftest.$ac_ext <<EOF -#line 3476 "configure" +#line 3472 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -3483,7 +3479,7 @@ int main() { inet_aton() ; return 0; } EOF -if { (eval echo configure:3487: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3483: \"$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 @@ -3509,12 +3505,12 @@ fi for ac_func in vasprintf do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:3513: checking for $ac_func" >&5 +echo "configure:3509: 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 <<EOF -#line 3518 "configure" +#line 3514 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -3537,7 +3533,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:3541: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3537: \"$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 @@ -3564,12 +3560,12 @@ done for ac_func in swab do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:3568: checking for $ac_func" >&5 +echo "configure:3564: 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 <<EOF -#line 3573 "configure" +#line 3569 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -3592,7 +3588,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:3596: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3592: \"$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 @@ -3619,12 +3615,12 @@ done for ac_func in memalign valloc do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:3623: checking for $ac_func" >&5 +echo "configure:3619: 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 <<EOF -#line 3628 "configure" +#line 3624 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -3647,7 +3643,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:3651: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3647: \"$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 @@ -3675,12 +3671,12 @@ done for ac_func in sigrelse do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:3679: checking for $ac_func" >&5 +echo "configure:3675: 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 <<EOF -#line 3684 "configure" +#line 3680 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -3703,7 +3699,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:3707: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3703: \"$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 @@ -3730,12 +3726,12 @@ done NEED_GETOPT=0 echo $ac_n "checking for getopt_long""... $ac_c" 1>&6 -echo "configure:3734: checking for getopt_long" >&5 +echo "configure:3730: 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 <<EOF -#line 3739 "configure" +#line 3735 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char getopt_long(); below. */ @@ -3758,7 +3754,7 @@ getopt_long(); ; return 0; } EOF -if { (eval echo configure:3762: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3758: \"$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 @@ -3780,7 +3776,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:3784: checking for getopt_long in -lgnugetopt" >&5 +echo "configure:3780: 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 @@ -3788,7 +3784,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lgnugetopt $LIBS" cat > conftest.$ac_ext <<EOF -#line 3792 "configure" +#line 3788 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -3799,7 +3795,7 @@ int main() { getopt_long() ; return 0; } EOF -if { (eval echo configure:3803: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3799: \"$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 @@ -3827,12 +3823,12 @@ fi echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6 -echo "configure:3831: checking return type of signal handlers" >&5 +echo "configure:3827: 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 <<EOF -#line 3836 "configure" +#line 3832 "configure" #include "confdefs.h" #include <sys/types.h> #include <signal.h> @@ -3849,7 +3845,7 @@ int main() { int i; ; return 0; } EOF -if { (eval echo configure:3853: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3849: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_type_signal=void else @@ -3868,7 +3864,7 @@ EOF echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6 -echo "configure:3872: checking for dlopen in -ldl" >&5 +echo "configure:3868: 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 @@ -3876,7 +3872,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ldl $LIBS" cat > conftest.$ac_ext <<EOF -#line 3880 "configure" +#line 3876 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -3887,7 +3883,7 @@ int main() { dlopen() ; return 0; } EOF -if { (eval echo configure:3891: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3887: \"$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 @@ -3908,7 +3904,7 @@ else fi echo $ac_n "checking for cos in -lm""... $ac_c" 1>&6 -echo "configure:3912: checking for cos in -lm" >&5 +echo "configure:3908: 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 @@ -3916,7 +3912,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lm $LIBS" cat > conftest.$ac_ext <<EOF -#line 3920 "configure" +#line 3916 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -3927,7 +3923,7 @@ int main() { cos() ; return 0; } EOF -if { (eval echo configure:3931: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3927: \"$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 @@ -3949,7 +3945,7 @@ else fi echo $ac_n "checking for pow in -lm""... $ac_c" 1>&6 -echo "configure:3953: checking for pow in -lm" >&5 +echo "configure:3949: 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 @@ -3957,7 +3953,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lm $LIBS" cat > conftest.$ac_ext <<EOF -#line 3961 "configure" +#line 3957 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -3968,7 +3964,7 @@ int main() { pow() ; return 0; } EOF -if { (eval echo configure:3972: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3968: \"$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 @@ -3995,7 +3991,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:3999: checking for pthread_attr_init in -lpthread" >&5 +echo "configure:3995: 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 @@ -4003,7 +3999,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lpthread $LIBS" cat > conftest.$ac_ext <<EOF -#line 4007 "configure" +#line 4003 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -4014,7 +4010,7 @@ int main() { pthread_attr_init() ; return 0; } EOF -if { (eval echo configure:4018: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4014: \"$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 @@ -4037,7 +4033,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:4041: checking for pthread_attr_init in -lpthreads" >&5 +echo "configure:4037: 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 @@ -4045,7 +4041,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lpthreads $LIBS" cat > conftest.$ac_ext <<EOF -#line 4049 "configure" +#line 4045 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -4056,7 +4052,7 @@ int main() { pthread_attr_init() ; return 0; } EOF -if { (eval echo configure:4060: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4056: \"$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 @@ -4079,7 +4075,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:4083: checking for pthread_attr_init in -lc_r" >&5 +echo "configure:4079: 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 @@ -4087,7 +4083,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lc_r $LIBS" cat > conftest.$ac_ext <<EOF -#line 4091 "configure" +#line 4087 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -4098,7 +4094,7 @@ int main() { pthread_attr_init() ; return 0; } EOF -if { (eval echo configure:4102: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4098: \"$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 @@ -4121,12 +4117,12 @@ fi fi if test "x${THREAD_LIB}" = xerror; then echo $ac_n "checking for pthread_attr_init""... $ac_c" 1>&6 -echo "configure:4125: checking for pthread_attr_init" >&5 +echo "configure:4121: 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 <<EOF -#line 4130 "configure" +#line 4126 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char pthread_attr_init(); below. */ @@ -4149,7 +4145,7 @@ pthread_attr_init(); ; return 0; } EOF -if { (eval echo configure:4153: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4149: \"$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 @@ -4172,7 +4168,7 @@ fi fi echo $ac_n "checking for cthread_fork in -lthreads""... $ac_c" 1>&6 -echo "configure:4176: checking for cthread_fork in -lthreads" >&5 +echo "configure:4172: 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 @@ -4180,7 +4176,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lthreads $LIBS" cat > conftest.$ac_ext <<EOF -#line 4184 "configure" +#line 4180 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -4191,7 +4187,7 @@ int main() { cthread_fork() ; return 0; } EOF -if { (eval echo configure:4195: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4191: \"$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 @@ -4213,7 +4209,7 @@ fi cat > conftest.$ac_ext <<EOF -#line 4217 "configure" +#line 4213 "configure" #include "confdefs.h" #include <pthread.h> EOF @@ -4229,7 +4225,7 @@ fi rm -f conftest* cat > conftest.$ac_ext <<EOF -#line 4233 "configure" +#line 4229 "configure" #include "confdefs.h" #include <strings.h> EOF @@ -4249,17 +4245,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:4253: checking for $ac_hdr" >&5 +echo "configure:4249: 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 -#line 4258 "configure" +#line 4254 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4263: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4259: \"$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* @@ -4289,17 +4285,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:4293: checking for $ac_hdr" >&5 +echo "configure:4289: 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 -#line 4298 "configure" +#line 4294 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4303: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4299: \"$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* @@ -4329,17 +4325,17 @@ for ac_hdr in 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:4333: checking for $ac_hdr" >&5 +echo "configure:4329: 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 -#line 4338 "configure" +#line 4334 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4343: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4339: \"$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* @@ -4369,17 +4365,17 @@ 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:4373: checking for $ac_hdr" >&5 +echo "configure:4369: 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 -#line 4378 "configure" +#line 4374 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4383: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4379: \"$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* @@ -4409,17 +4405,17 @@ 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:4413: checking for $ac_hdr" >&5 +echo "configure:4409: 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 -#line 4418 "configure" +#line 4414 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4423: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4419: \"$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* @@ -4449,17 +4445,17 @@ for ac_hdr in machine/param.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:4453: checking for $ac_hdr" >&5 +echo "configure:4449: 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 -#line 4458 "configure" +#line 4454 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4463: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4459: \"$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* @@ -4487,12 +4483,12 @@ done echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6 -echo "configure:4491: checking whether time.h and sys/time.h may both be included" >&5 +echo "configure:4487: 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 <<EOF -#line 4496 "configure" +#line 4492 "configure" #include "confdefs.h" #include <sys/types.h> #include <sys/time.h> @@ -4501,7 +4497,7 @@ int main() { struct tm *tp; ; return 0; } EOF -if { (eval echo configure:4505: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4501: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_header_time=yes else @@ -4526,17 +4522,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:4530: checking for $ac_hdr" >&5 +echo "configure:4526: 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 -#line 4535 "configure" +#line 4531 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4540: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4536: \"$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* @@ -4564,20 +4560,20 @@ done echo $ac_n "checking for ntohl in sys/param.h""... $ac_c" 1>&6 -echo "configure:4568: checking for ntohl in sys/param.h" >&5 +echo "configure:4564: 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 <<EOF -#line 4574 "configure" +#line 4570 "configure" #include "confdefs.h" #include <sys/param.h> int main() { void foo() { int meuh; ntohl(meuh); } ; return 0; } EOF -if { (eval echo configure:4581: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4577: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_ntohl_sys_param_h=yes else @@ -4598,20 +4594,20 @@ EOF fi echo $ac_n "checking if \$CC accepts -finline-limit""... $ac_c" 1>&6 -echo "configure:4602: checking if \$CC accepts -finline-limit" >&5 +echo "configure:4598: 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 <<EOF -#line 4608 "configure" +#line 4604 "configure" #include "confdefs.h" int main() { ; return 0; } EOF -if { (eval echo configure:4615: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4611: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_inline_limit=yes else @@ -4629,20 +4625,20 @@ if test x"$ac_cv_c_inline_limit" != x"no"; then fi echo $ac_n "checking if \$CC accepts -bundle -undefined error""... $ac_c" 1>&6 -echo "configure:4633: checking if \$CC accepts -bundle -undefined error" >&5 +echo "configure:4629: checking if \$CC accepts -bundle -undefined error" >&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" cat > conftest.$ac_ext <<EOF -#line 4639 "configure" +#line 4635 "configure" #include "confdefs.h" int main() { ; return 0; } EOF -if { (eval echo configure:4646: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4642: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_ld_darwin=yes else @@ -4660,20 +4656,20 @@ if test x"$ac_cv_ld_darwin" != x"no"; then fi echo $ac_n "checking if \$CC accepts -shared""... $ac_c" 1>&6 -echo "configure:4664: checking if \$CC accepts -shared" >&5 +echo "configure:4660: 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 <<EOF -#line 4670 "configure" +#line 4666 "configure" #include "confdefs.h" int main() { ; return 0; } EOF -if { (eval echo configure:4677: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4673: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_ld_plugins=yes else @@ -4692,7 +4688,7 @@ fi if test x"${SOFLAGS}" = x; then echo $ac_n "checking for soname setting""... $ac_c" 1>&6 -echo "configure:4696: checking for soname setting" >&5 +echo "configure:4692: 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 @@ -4701,14 +4697,14 @@ else try_SOFLAGS="-Wl,-soname -Wl," LDFLAGS="${save_LDFLAGS} ${try_SOFLAGS}foo.so.0" cat > conftest.$ac_ext <<EOF -#line 4705 "configure" +#line 4701 "configure" #include "confdefs.h" int main() { ; return 0; } EOF -if { (eval echo configure:4712: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4708: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_ld_soname="${try_SOFLAGS}" else @@ -4720,14 +4716,14 @@ else try_SOFLAGS="-Wl,-h -Wl," LDFLAGS="${save_LDFLAGS} ${try_SOFLAGS}foo.so.0" cat > conftest.$ac_ext <<EOF -#line 4724 "configure" +#line 4720 "configure" #include "confdefs.h" int main() { ; return 0; } EOF -if { (eval echo configure:4731: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4727: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_ld_soname="${try_SOFLAGS}" else @@ -4756,7 +4752,7 @@ have problems using libdvdcss. fi echo $ac_n "checking __attribute__ ((aligned ())) support""... $ac_c" 1>&6 -echo "configure:4760: checking __attribute__ ((aligned ())) support" >&5 +echo "configure:4756: 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 @@ -4764,14 +4760,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 <<EOF -#line 4768 "configure" +#line 4764 "configure" #include "confdefs.h" int main() { static char c __attribute__ ((aligned($ac_cv_c_attr_align_try))) = 0; return c; ; return 0; } EOF -if { (eval echo configure:4775: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4771: \"$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 @@ -4794,19 +4790,19 @@ CFLAGS="${save_CFLAGS}" LDFLAGS="${save_LDFLAGS}" echo $ac_n "checking for boolean_t in sys/types.h""... $ac_c" 1>&6 -echo "configure:4798: checking for boolean_t in sys/types.h" >&5 +echo "configure:4794: 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 <<EOF -#line 4803 "configure" +#line 4799 "configure" #include "confdefs.h" #include <sys/types.h> int main() { boolean_t foo; ; return 0; } EOF -if { (eval echo configure:4810: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4806: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_boolean_t_sys_types_h=yes else @@ -4827,19 +4823,19 @@ EOF fi echo $ac_n "checking for boolean_t in pthread.h""... $ac_c" 1>&6 -echo "configure:4831: checking for boolean_t in pthread.h" >&5 +echo "configure:4827: 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 <<EOF -#line 4836 "configure" +#line 4832 "configure" #include "confdefs.h" #include <pthread.h> int main() { boolean_t foo; ; return 0; } EOF -if { (eval echo configure:4843: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4839: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_boolean_t_pthread_h=yes else @@ -4860,19 +4856,19 @@ EOF fi echo $ac_n "checking for boolean_t in cthreads.h""... $ac_c" 1>&6 -echo "configure:4864: checking for boolean_t in cthreads.h" >&5 +echo "configure:4860: 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 <<EOF -#line 4869 "configure" +#line 4865 "configure" #include "confdefs.h" #include <cthreads.h> int main() { boolean_t foo; ; return 0; } EOF -if { (eval echo configure:4876: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4872: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_boolean_t_cthreads_h=yes else @@ -4904,19 +4900,19 @@ SSE_MODULES="imdctsse downmixsse" ALTIVEC_MODULES="idctaltivec motionaltivec" echo $ac_n "checking if \$CC groks MMX inline assembly""... $ac_c" 1>&6 -echo "configure:4908: checking if \$CC groks MMX inline assembly" >&5 +echo "configure:4904: 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 <<EOF -#line 4913 "configure" +#line 4909 "configure" #include "confdefs.h" int main() { void *p;asm volatile("packuswb %%mm1,%%mm2"::"r"(p)); ; return 0; } EOF -if { (eval echo configure:4920: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4916: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_mmx_inline=yes else @@ -4934,19 +4930,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:4938: checking if \$CC groks MMX EXT inline assembly" >&5 +echo "configure:4934: 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 <<EOF -#line 4943 "configure" +#line 4939 "configure" #include "confdefs.h" int main() { void *p;asm volatile("maskmovq %%mm1,%%mm2"::"r"(p)); ; return 0; } EOF -if { (eval echo configure:4950: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4946: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_mmxext_inline=yes else @@ -4964,19 +4960,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:4968: checking if \$CC groks 3D Now! inline assembly" >&5 +echo "configure:4964: 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 <<EOF -#line 4973 "configure" +#line 4969 "configure" #include "confdefs.h" int main() { void *p;asm volatile("pfadd %%mm1,%%mm2"::"r"(p)); ; return 0; } EOF -if { (eval echo configure:4980: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4976: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_3dnow_inline=yes else @@ -4998,19 +4994,19 @@ EOF fi echo $ac_n "checking if \$CC groks SSE inline assembly""... $ac_c" 1>&6 -echo "configure:5002: checking if \$CC groks SSE inline assembly" >&5 +echo "configure:4998: 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 <<EOF -#line 5007 "configure" +#line 5003 "configure" #include "confdefs.h" int main() { void *p;asm volatile("xorps %%xmm1,%%xmm2"::"r"(p)); ; return 0; } EOF -if { (eval echo configure:5014: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5010: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_sse_inline=yes else @@ -5032,19 +5028,19 @@ EOF fi echo $ac_n "checking if \$CC groks Altivec inline assembly""... $ac_c" 1>&6 -echo "configure:5036: checking if \$CC groks Altivec inline assembly" >&5 +echo "configure:5032: 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 <<EOF -#line 5041 "configure" +#line 5037 "configure" #include "confdefs.h" int main() { asm volatile("vperm 0,1,2,3"); ; return 0; } EOF -if { (eval echo configure:5048: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5044: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_altivec_inline=yes else @@ -5054,14 +5050,14 @@ else save_CFLAGS=$CFLAGS CFLAGS="$CFLAGS -Wa,-m7400" cat > conftest.$ac_ext <<EOF -#line 5058 "configure" +#line 5054 "configure" #include "confdefs.h" int main() { asm volatile("vperm 0,1,2,3"); ; return 0; } EOF -if { (eval echo configure:5065: \"$ac_compile\") 1>&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_altivec_inline="-Wa,-m7400" else @@ -5092,7 +5088,7 @@ EOF fi echo $ac_n "checking if \$CC groks Altivec C extensions""... $ac_c" 1>&6 -echo "configure:5096: checking if \$CC groks Altivec C extensions" >&5 +echo "configure:5092: 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 @@ -5100,14 +5096,14 @@ else CFLAGS="$CFLAGS -faltivec" # Darwin test cat > conftest.$ac_ext <<EOF -#line 5104 "configure" +#line 5100 "configure" #include "confdefs.h" int main() { vec_mtvscr((vector unsigned int)(0)); ; return 0; } EOF -if { (eval echo configure:5111: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5107: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_altivec=-faltivec else @@ -5118,14 +5114,14 @@ else # Linux/PPC test CFLAGS="$save_CFLAGS $CFLAGS_IDCTALTIVEC -fvec" cat > conftest.$ac_ext <<EOF -#line 5122 "configure" +#line 5118 "configure" #include "confdefs.h" int main() { vec_mtvscr((vector unsigned int)(0)); ; return 0; } EOF -if { (eval echo configure:5129: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5125: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_altivec="-fvec" else @@ -5155,21 +5151,21 @@ EOF fi echo $ac_n "checking if linker needs -framework vecLib""... $ac_c" 1>&6 -echo "configure:5159: checking if linker needs -framework vecLib" >&5 +echo "configure:5155: 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 <<EOF -#line 5166 "configure" +#line 5162 "configure" #include "confdefs.h" int main() { ; return 0; } EOF -if { (eval echo configure:5173: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5169: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_ld_altivec=yes else @@ -5210,7 +5206,7 @@ fi # 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:5214: checking for $ac_word" >&5 +echo "configure:5210: 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 @@ -5242,7 +5238,7 @@ 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:5246: checking for $ac_word" >&5 +echo "configure:5242: 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 @@ -5321,17 +5317,17 @@ for ac_hdr in winioctl.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:5325: checking for $ac_hdr" >&5 +echo "configure:5321: 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 -#line 5330 "configure" +#line 5326 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5335: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5331: \"$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* @@ -5364,17 +5360,17 @@ for ac_hdr in sys/ioctl.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:5368: checking for $ac_hdr" >&5 +echo "configure:5364: 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 -#line 5373 "configure" +#line 5369 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5378: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5374: \"$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* @@ -5400,17 +5396,17 @@ EOF do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:5404: checking for $ac_hdr" >&5 +echo "configure:5400: 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 -#line 5409 "configure" +#line 5405 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5414: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5410: \"$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* @@ -5440,7 +5436,7 @@ done LINUX_DVD_STRUCT=0 OPENBSD_DVD_STRUCT=0 cat > conftest.$ac_ext <<EOF -#line 5444 "configure" +#line 5440 "configure" #include "confdefs.h" #include <sys/cdio.h> EOF @@ -5453,7 +5449,7 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | EOF cat > conftest.$ac_ext <<EOF -#line 5457 "configure" +#line 5453 "configure" #include "confdefs.h" #include <sys/cdio.h> EOF @@ -5473,7 +5469,7 @@ fi rm -f conftest* cat > conftest.$ac_ext <<EOF -#line 5477 "configure" +#line 5473 "configure" #include "confdefs.h" #include <sys/dvdio.h> EOF @@ -5486,7 +5482,7 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | EOF cat > conftest.$ac_ext <<EOF -#line 5490 "configure" +#line 5486 "configure" #include "confdefs.h" #include <sys/dvdio.h> EOF @@ -5506,7 +5502,7 @@ fi rm -f conftest* cat > conftest.$ac_ext <<EOF -#line 5510 "configure" +#line 5506 "configure" #include "confdefs.h" #include <linux/cdrom.h> EOF @@ -5525,7 +5521,7 @@ rm -f conftest* NEED_BSDI_LIBDVD=0 cat > conftest.$ac_ext <<EOF -#line 5529 "configure" +#line 5525 "configure" #include "confdefs.h" #include <dvd.h> EOF @@ -5547,17 +5543,17 @@ else do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:5551: checking for $ac_hdr" >&5 +echo "configure:5547: 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 -#line 5556 "configure" +#line 5552 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5561: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5557: \"$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* @@ -5597,17 +5593,17 @@ 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:5601: checking for sys/scsi/scsi_types.h" >&5 +echo "configure:5597: checking for sys/scsi/scsi_types.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 -#line 5606 "configure" +#line 5602 "configure" #include "confdefs.h" #include <sys/scsi/scsi_types.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5611: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5607: \"$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* @@ -5626,17 +5622,17 @@ if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then 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:5630: checking for sys/scsi/impl/uscsi.h" >&5 +echo "configure:5626: checking for sys/scsi/impl/uscsi.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 -#line 5635 "configure" +#line 5631 "configure" #include "confdefs.h" #include <sys/scsi/impl/uscsi.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5640: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5636: \"$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* @@ -5669,17 +5665,17 @@ fi ac_safe=`echo "sys/scsi.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for sys/scsi.h""... $ac_c" 1>&6 -echo "configure:5673: checking for sys/scsi.h" >&5 +echo "configure:5669: checking for sys/scsi.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 -#line 5678 "configure" +#line 5674 "configure" #include "confdefs.h" #include <sys/scsi.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5683: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5679: \"$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* @@ -5697,7 +5693,7 @@ if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then echo "$ac_t""yes" 1>&6 cat > conftest.$ac_ext <<EOF -#line 5701 "configure" +#line 5697 "configure" #include "confdefs.h" #include <sys/scsi.h> EOF @@ -5769,9 +5765,6 @@ else fi -VLC_SYMBOL="`echo ${VLC_VERSION} | tr .- __`" - - # Check whether --enable-mmx or --disable-mmx was given. if test "${enable_mmx+set}" = set; then enableval="$enable_mmx" @@ -5845,7 +5838,7 @@ 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:5849: checking for pth_init in -lpth" >&5 +echo "configure:5842: 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 @@ -5853,7 +5846,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lpth $LIBS" cat > conftest.$ac_ext <<EOF -#line 5857 "configure" +#line 5850 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -5864,7 +5857,7 @@ int main() { pth_init() ; return 0; } EOF -if { (eval echo configure:5868: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5861: \"$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 @@ -5892,7 +5885,7 @@ else fi cat > conftest.$ac_ext <<EOF -#line 5896 "configure" +#line 5889 "configure" #include "confdefs.h" #include <pth.h> EOF @@ -6020,7 +6013,7 @@ fi if test x$enable_vcd != xno then cat > conftest.$ac_ext <<EOF -#line 6024 "configure" +#line 6017 "configure" #include "confdefs.h" #include <linux/cdrom.h> EOF @@ -6094,17 +6087,17 @@ if test "${with_mad+set}" = set; then do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:6098: checking for $ac_hdr" >&5 +echo "configure:6091: 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 -#line 6103 "configure" +#line 6096 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:6108: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:6101: \"$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* @@ -6134,7 +6127,7 @@ fi done echo $ac_n "checking for mad_bit_init in -lmad""... $ac_c" 1>&6 -echo "configure:6138: checking for mad_bit_init in -lmad" >&5 +echo "configure:6131: 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 @@ -6142,7 +6135,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lmad $LIBS" cat > conftest.$ac_ext <<EOF -#line 6146 "configure" +#line 6139 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -6153,7 +6146,7 @@ int main() { mad_bit_init() ; return 0; } EOF -if { (eval echo configure:6157: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6150: \"$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 @@ -6220,7 +6213,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:6224: checking for $ac_word" >&5 +echo "configure:6217: 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 @@ -6271,7 +6264,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:6275: checking for $ac_word" >&5 +echo "configure:6268: 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 @@ -6329,17 +6322,17 @@ else do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:6333: checking for $ac_hdr" >&5 +echo "configure:6326: 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 -#line 6338 "configure" +#line 6331 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:6343: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:6336: \"$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* @@ -6384,17 +6377,17 @@ fi do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:6388: checking for $ac_hdr" >&5 +echo "configure:6381: 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 -#line 6393 "configure" +#line 6386 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:6398: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:6391: \"$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* @@ -6472,7 +6465,7 @@ 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:6476: checking for $ac_word" >&5 +echo "configure:6469: 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 @@ -6512,7 +6505,7 @@ fi # 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:6516: checking for $ac_word" >&5 +echo "configure:6509: 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 @@ -6553,7 +6546,7 @@ fi # 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:6557: checking for $ac_word" >&5 +echo "configure:6550: 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 @@ -6599,17 +6592,17 @@ fi do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:6603: checking for $ac_hdr" >&5 +echo "configure:6596: 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 -#line 6608 "configure" +#line 6601 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:6613: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:6606: \"$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* @@ -6679,17 +6672,17 @@ fi do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:6683: checking for $ac_hdr" >&5 +echo "configure:6676: 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 -#line 6688 "configure" +#line 6681 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:6693: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:6686: \"$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* @@ -6718,7 +6711,7 @@ done else echo $ac_n "checking for directX headers in ${withval}""... $ac_c" 1>&6 -echo "configure:6722: checking for directX headers in ${withval}" >&5 +echo "configure:6715: checking for directX headers in ${withval}" >&5 if test -f ${withval}/include/directx.h then PLUGINS="${PLUGINS} directx" @@ -6805,7 +6798,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:6809: checking for $ac_word" >&5 +echo "configure:6802: 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 @@ -6850,17 +6843,17 @@ fi do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:6854: checking for $ac_hdr" >&5 +echo "configure:6847: 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 -#line 6859 "configure" +#line 6852 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:6864: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:6857: \"$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* @@ -6920,7 +6913,7 @@ fi # 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:6924: checking for $ac_word" >&5 +echo "configure:6917: 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 @@ -6966,17 +6959,17 @@ fi do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:6970: checking for $ac_hdr" >&5 +echo "configure:6963: 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 -#line 6975 "configure" +#line 6968 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:6980: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:6973: \"$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* @@ -7033,17 +7026,17 @@ if test x$enable_x11 != xno && do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:7037: checking for $ac_hdr" >&5 +echo "configure:7030: 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 -#line 7042 "configure" +#line 7035 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:7047: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7040: \"$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* @@ -7096,17 +7089,17 @@ if test x$enable_xvideo != xno && do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:7100: checking for $ac_hdr" >&5 +echo "configure:7093: 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 -#line 7105 "configure" +#line 7098 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:7110: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7103: \"$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* @@ -7146,17 +7139,17 @@ if test "${enable_alsa+set}" = set; then then ac_safe=`echo "alsa/asoundlib.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for alsa/asoundlib.h""... $ac_c" 1>&6 -echo "configure:7150: checking for alsa/asoundlib.h" >&5 +echo "configure:7143: 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 <<EOF -#line 7155 "configure" +#line 7148 "configure" #include "confdefs.h" #include <alsa/asoundlib.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:7160: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7153: \"$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* @@ -7173,7 +7166,7 @@ fi if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then echo "$ac_t""yes" 1>&6 echo $ac_n "checking for main in -lasound""... $ac_c" 1>&6 -echo "configure:7177: checking for main in -lasound" >&5 +echo "configure:7170: 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 @@ -7181,14 +7174,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lasound $LIBS" cat > conftest.$ac_ext <<EOF -#line 7185 "configure" +#line 7178 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:7192: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7185: \"$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 @@ -7247,6 +7240,30 @@ if test "${with_dll_path+set}" = set; then fi +cat >> confdefs.h <<EOF +#define VERSION_MESSAGE "vlc $VLC_VERSION $VLC_CODENAME Copyright 1996-2001 VideoLAN\n" +EOF + +cat >> confdefs.h <<EOF +#define COPYRIGHT_MESSAGE "VideoLAN Client - version $VLC_VERSION $VLC_CODENAME - (c) 1996-2002 VideoLAN" +EOF + + +VLC_SYMBOL="`echo ${VLC_VERSION} | tr .- __`" +cat >> confdefs.h <<EOF +#define MODULE_SUFFIX "__MODULE_$VLC_SYMBOL" +EOF + +cat >> confdefs.h <<EOF +#define MODULE_SYMBOL $VLC_SYMBOL +EOF + + +DATA_PATH="${ac_tool_prefix}/share/videolan" + +PLUGIN_PATH="${ac_tool_prefix}/share/videolan" + + @@ -7434,7 +7451,7 @@ done ac_given_srcdir=$srcdir ac_given_INSTALL="$INSTALL" -trap 'rm -fr `echo "Makefile.opts include/config.h po/Makefile.in include/defs.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15 +trap 'rm -fr `echo "Makefile.opts po/Makefile.in include/defs.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15 EOF cat >> $CONFIG_STATUS <<EOF @@ -7481,8 +7498,6 @@ s%@build_alias@%$build_alias%g s%@build_cpu@%$build_cpu%g s%@build_vendor@%$build_vendor%g s%@build_os@%$build_os%g -s%@VLC_VERSION@%$VLC_VERSION%g -s%@VLC_CODENAME@%$VLC_CODENAME%g s%@LIBDVDCSS_VERSION@%$LIBDVDCSS_VERSION%g s%@SET_MAKE@%$SET_MAKE%g s%@CC@%$CC%g @@ -7514,7 +7529,6 @@ s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g s%@INSTALL_DATA@%$INSTALL_DATA%g s%@WINDRES@%$WINDRES%g -s%@VLC_SYMBOL@%$VLC_SYMBOL%g s%@ESD_CONFIG@%$ESD_CONFIG%g s%@ARTS_CONFIG@%$ARTS_CONFIG%g s%@SDL12_CONFIG@%$SDL12_CONFIG%g @@ -7522,6 +7536,8 @@ s%@SDL11_CONFIG@%$SDL11_CONFIG%g s%@SDL_CONFIG@%$SDL_CONFIG%g s%@GNOME_CONFIG@%$GNOME_CONFIG%g s%@GTK_CONFIG@%$GTK_CONFIG%g +s%@DATA_PATH@%$DATA_PATH%g +s%@PLUGIN_PATH@%$PLUGIN_PATH%g s%@SYS@%$SYS%g s%@ARCH@%$ARCH%g s%@PLUGINS@%$PLUGINS%g @@ -7641,7 +7657,7 @@ EOF cat >> $CONFIG_STATUS <<EOF -CONFIG_FILES=\${CONFIG_FILES-"Makefile.opts include/config.h po/Makefile.in"} +CONFIG_FILES=\${CONFIG_FILES-"Makefile.opts po/Makefile.in"} EOF cat >> $CONFIG_STATUS <<\EOF for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then diff --git a/configure.in b/configure.in index cc8e613b8f6859df8489528a50c54d07f6f1b98e..f0b40bae047cf59ad109fb2ee3f39156b42c0940 100644 --- a/configure.in +++ b/configure.in @@ -8,9 +8,7 @@ HAVE_VLC=0 if test -r src/interface/main.c; then HAVE_VLC=1 VLC_VERSION="0.2.92-dev" - AC_SUBST(VLC_VERSION) VLC_CODENAME=Ourumov - AC_SUBST(VLC_CODENAME) fi HAVE_LIBDVDCSS=0 @@ -34,11 +32,9 @@ AC_PROG_CPP dnl Gettext stuff ALL_LINGUAS="de fr ru" -PACKAGE="vlc" -VERSION="$VLC_VERSION" -AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE") -AC_DEFINE_UNQUOTED(VERSION, "$VERSION") +AC_DEFINE_UNQUOTED(PACKAGE, "vlc") +AC_DEFINE_UNQUOTED(VERSION, "$VLC_VERSION") AM_GNU_GETTEXT dnl AM_PROG_LIBTOOL @@ -579,9 +575,6 @@ AC_ARG_ENABLE(release, [ VLC_VERSION="${VLC_VERSION}_`date +%Y-%m-%d`"; LIBDVDCSS_VERSION="${LIBDVDCSS_VERSION}_`date +%Y-%m-%d`"; ]) -VLC_SYMBOL="`echo ${VLC_VERSION} | tr .- __`" -AC_SUBST(VLC_SYMBOL) - dnl dnl MMX acceleration dnl @@ -1256,6 +1249,21 @@ AC_ARG_WITH(dll-path, DLL_PATH=$withval fi ]) +dnl +dnl Stuff used by the program +dnl +AC_DEFINE_UNQUOTED(VERSION_MESSAGE, "vlc $VLC_VERSION $VLC_CODENAME Copyright 1996-2001 VideoLAN\n") +AC_DEFINE_UNQUOTED(COPYRIGHT_MESSAGE, "VideoLAN Client - version $VLC_VERSION $VLC_CODENAME - (c) 1996-2002 VideoLAN") + +VLC_SYMBOL="`echo ${VLC_VERSION} | tr .- __`" +AC_DEFINE_UNQUOTED(MODULE_SUFFIX, "__MODULE_$VLC_SYMBOL") +AC_DEFINE_UNQUOTED(MODULE_SYMBOL, $VLC_SYMBOL) + +DATA_PATH="${ac_tool_prefix}/share/videolan" +AC_SUBST(DATA_PATH) +PLUGIN_PATH="${ac_tool_prefix}/share/videolan" +AC_SUBST(PLUGIN_PATH) + dnl dnl Configuration is finished dnl @@ -1345,7 +1353,7 @@ AC_SUBST(SRC_DVDCSS_EXTRA) AC_SUBST(NEED_GETOPT) AC_SUBST(NEED_LIBDVDCSS) -AC_OUTPUT([Makefile.opts include/config.h po/Makefile.in]) +AC_OUTPUT([Makefile.opts po/Makefile.in]) echo " global configuration diff --git a/include/config.h.in b/include/config.h similarity index 94% rename from include/config.h.in rename to include/config.h index 607ba57b02379fb671c00a1f9a04f15b6b00419e..a984a85fac32325c4dbac57ecc4851c6c4e2246e 100644 --- a/include/config.h.in +++ b/include/config.h @@ -36,21 +36,6 @@ * */ -/***************************************************************************** - * Program information - *****************************************************************************/ - -/* Program version and copyright message */ -#define VERSION_MESSAGE "vlc @VLC_VERSION@ @VLC_CODENAME@ " \ - /* "(" PROGRAM_BUILD ") (" PROGRAM_OPTIONS ")\n" */ \ - "Copyright 1996-2001 VideoLAN\n" -#define COPYRIGHT_MESSAGE "VideoLAN Client - version @VLC_VERSION@" \ - " @VLC_CODENAME@ - (C)1996-2001 VideoLAN" - -#define VLC_VERSION "@VLC_VERSION@" -#define MODULE_SUFFIX "__MODULE_@VLC_SYMBOL@" -#define MODULE_SYMBOL @VLC_SYMBOL@ - /***************************************************************************** * Debugging options - define or undefine symbols *****************************************************************************/ @@ -99,9 +84,6 @@ * Paths */ -#define DATA_PATH "@prefix@/share/videolan" -#define PLUGIN_PATH "@prefix@/lib/videolan/vlc" - #define MAX_PLUGIN_COUNT 32 /***************************************************************************** @@ -218,7 +200,6 @@ /* DVD defaults */ #define INPUT_DVD_DEVICE_VAR "vlc_dvd_device" -#define INPUT_DVD_DEVICE_DEFAULT "@DVD_DEVICE@" #define INPUT_TITLE_VAR "vlc_input_title" #define INPUT_CHAPTER_VAR "vlc_input_chapter" @@ -229,7 +210,6 @@ /* VCD defaults */ #define INPUT_VCD_DEVICE_VAR "vlc_vcd_device" -#define INPUT_VCD_DEVICE_DEFAULT "@VCD_DEVICE@" /***************************************************************************** * Audio configuration @@ -419,7 +399,7 @@ #define VOUT_OUTMEM_SLEEP ((int)(0.020*CLOCK_FREQ)) /* The default video output window title */ -#define VOUT_TITLE "VideoLAN Client @VLC_VERSION@" +#define VOUT_TITLE "VideoLAN Client " VERSION /* Environment variable for framebuffer device, and default value */ #define VOUT_FB_DEV_VAR "vlc_fb_dev" diff --git a/include/defs.h.in b/include/defs.h.in index ac371569d00fb1b05fc6bbcbdda82de72f92b50c..1be03b1a248c4c870ded723367aaf4c070736b56 100644 --- a/include/defs.h.in +++ b/include/defs.h.in @@ -50,6 +50,10 @@ #undef VERSION #undef DVD_DEVICE #undef VCD_DEVICE +#undef COPYRIGHT_MESSAGE +#undef MODULE_SUFFIX +#undef MODULE_SYMBOL +#undef VERSION_MESSAGE /* Define if you have the __argz_count function. */ #undef HAVE___ARGZ_COUNT diff --git a/include/video.h b/include/video.h index a4c686aa05d6270097c52023b92ad622ee3c0c83..16d248a624b5e171caf814ec7e38012a84b93948 100644 --- a/include/video.h +++ b/include/video.h @@ -4,7 +4,7 @@ * includes all common video types and constants. ***************************************************************************** * Copyright (C) 1999, 2000 VideoLAN - * $Id: video.h,v 1.37 2001/12/31 04:53:33 sam Exp $ + * $Id: video.h,v 1.38 2002/01/02 14:37:42 sam Exp $ * * Authors: Vincent Seguin <seguin@via.ecp.fr> * @@ -105,7 +105,7 @@ typedef struct picture_heap_s * and should NOT be modified */ int i_width; /* picture width */ int i_height; /* picture height */ - int i_chroma; /* picture chroma */ + u64 i_chroma; /* picture chroma */ int i_aspect; /* aspect ratio */ /* Real pictures */ @@ -113,6 +113,10 @@ typedef struct picture_heap_s } picture_heap_t; +/***************************************************************************** + * Flags used to describe the status of a picture + *****************************************************************************/ + /* Picture type */ #define EMPTY_PICTURE 0 /* empty buffer */ #define MEMORY_PICTURE 100 /* heap-allocated buffer */ @@ -127,24 +131,34 @@ typedef struct picture_heap_s #define DISPLAYED_PICTURE 5 /* been displayed but is linked */ #define DESTROYED_PICTURE 6 /* allocated but no more used */ -/* Picture chroma */ -#define EMPTY_PICTURE 0 /* picture slot is empty and available */ -#define YUV_420_PICTURE 100 /* 4:2:0 YUV picture */ -#define YUV_422_PICTURE 101 /* 4:2:2 YUV picture */ -#define YUV_444_PICTURE 102 /* 4:4:4 YUV picture */ -#define RGB_8BPP_PICTURE 200 /* RGB 8bpp picture */ -#define RGB_16BPP_PICTURE 201 /* RGB 16bpp picture */ -#define RGB_32BPP_PICTURE 202 /* RGB 32bpp picture */ - -/* Aspect ratio (ISO/IEC 13818-2 section 6.3.3, table 6-3) */ -#define AR_SQUARE_PICTURE 1 /* square pixels */ -#define AR_3_4_PICTURE 2 /* 3:4 picture (TV) */ -#define AR_16_9_PICTURE 3 /* 16:9 picture (wide screen) */ -#define AR_221_1_PICTURE 4 /* 2.21:1 picture (movie) */ +/***************************************************************************** + * Flags used to describe the format of a picture + *****************************************************************************/ + +#define ONLY_FOURCC(i_chroma) ((i_chroma)&0x00000000ffffffff) +#define ONLY_EXTRA(i_chroma) ((i_chroma)&0xffffffff00000000) + +/* Picture chroma - see http://www.webartz.com/fourcc/ */ +#define FOURCC_BI_RGB 0x00000000 /* Planar RGB, for 8bpp */ +#define FOURCC_RGB 0x32424752 /* alias for BI_RGB */ +#define FOURCC_BI_BITFIELDS 0x00000003 /* Planar RGB, for 16, 24, 32bpp */ +#define FOURCC_I420 0x30323449 /* Planar 4:2:0, Y:U:V */ +#define FOURCC_IYUV 0x56555949 /* alias for I420 */ +#define FOURCC_YV12 0x32315659 /* Planar 4:2:0, Y:V:U */ + +/* Custom formats which we use but which don't exist in the fourcc database */ +#define FOURCC_I422 0x32323449 +#define FOURCC_I444 0x34343449 + +/* Picture format - gives more precise information than the chroma */ +#define DEPTH_8BPP ((u64)0x00000008<<32) +#define DEPTH_15BPP ((u64)0x00000015<<32) +#define DEPTH_16BPP ((u64)0x00000016<<32) +#define DEPTH_24BPP ((u64)0x00000024<<32) +#define DEPTH_32BPP ((u64)0x00000032<<32) /* Plane indices */ -#define YUV_PLANE 0 -#define RGB_PLANE 0 +#define MAIN_PLANE 0 #define Y_PLANE 0 #define U_PLANE 1 #define V_PLANE 2 @@ -155,6 +169,7 @@ typedef struct picture_heap_s #define B_PLANE 2 /* Shortcuts */ +#define P_MAIN planes[ MAIN_PLANE ].p_data #define P_Y planes[ Y_PLANE ].p_data #define P_U planes[ U_PLANE ].p_data #define P_V planes[ V_PLANE ].p_data diff --git a/include/video_output.h b/include/video_output.h index fb0fdb9969fd2b858f6ba823e9ec2cc6bc4088da..273f82721651b5125691b4767bf955ffb2c7efde 100644 --- a/include/video_output.h +++ b/include/video_output.h @@ -5,7 +5,7 @@ * thread, and destroy a previously oppenned video output thread. ***************************************************************************** * Copyright (C) 1999, 2000 VideoLAN - * $Id: video_output.h,v 1.68 2001/12/30 07:09:54 sam Exp $ + * $Id: video_output.h,v 1.69 2002/01/02 14:37:42 sam Exp $ * * Authors: Vincent Seguin <seguin@via.ecp.fr> * @@ -191,7 +191,7 @@ typedef struct vout_thread_s void vout_InitBank ( void ); void vout_EndBank ( void ); -vout_thread_t * vout_CreateThread ( int *pi_status, int, int, int, int ); +vout_thread_t * vout_CreateThread ( int *pi_status, int, int, u64, int ); void vout_DestroyThread ( vout_thread_t *, int *pi_status ); vout_fifo_t * vout_CreateFifo ( void ); diff --git a/include/videolan/vlc.h b/include/videolan/vlc.h index 161f2232a0e6f446f5a4789c9bfd08f2b75bdfce..d92df71374192f11c618640628fd1870cd17aa58 100644 --- a/include/videolan/vlc.h +++ b/include/videolan/vlc.h @@ -3,7 +3,7 @@ * Collection of useful common types and macros definitions ***************************************************************************** * Copyright (C) 1998, 1999, 2000 VideoLAN - * $Id: vlc.h,v 1.1 2001/12/30 07:09:54 sam Exp $ + * $Id: vlc.h,v 1.2 2002/01/02 14:37:42 sam Exp $ * * Authors: Samuel Hocevar <sam@via.ecp.fr> * Vincent Seguin <seguin@via.ecp.fr> @@ -147,6 +147,7 @@ typedef struct aout_sys_s * p_aout_sys_t; struct vout_thread_s; struct vout_font_s; struct vout_sys_s; +struct chroma_sys_s; struct vdec_thread_s; struct vpar_thread_s; struct video_parser_s; @@ -547,7 +548,7 @@ typedef struct module_symbols_s ( int, int, long, long, long, void * ); void ( * aout_DestroyFifo ) ( struct aout_fifo_s * ); - struct vout_thread_s * (* vout_CreateThread) ( int *, int, int, int, int ); + struct vout_thread_s * (* vout_CreateThread) ( int *, int, int, u64, int ); void ( * vout_DestroyThread ) ( struct vout_thread_s *, int * ); struct picture_s * ( * vout_CreatePicture ) diff --git a/plugins/chroma/yv12_rgb16.c b/plugins/chroma/yv12_rgb16.c index a8763f386f8e70a765f1029a00b06a4798ee0ec1..81dbf56df020cfe79fd1a44ce2191a23f8e46bd8 100644 --- a/plugins/chroma/yv12_rgb16.c +++ b/plugins/chroma/yv12_rgb16.c @@ -2,7 +2,7 @@ * yv12_rgb16.c : YUV to paletted RGB16 conversion module for vlc ***************************************************************************** * Copyright (C) 2000 VideoLAN - * $Id: yv12_rgb16.c,v 1.2 2001/12/31 04:53:33 sam Exp $ + * $Id: yv12_rgb16.c,v 1.3 2002/01/02 14:37:42 sam Exp $ * * Authors: Samuel Hocevar <sam@zoy.org> * @@ -100,13 +100,26 @@ void _M( chroma_getfunctions )( function_list_t * p_function_list ) *****************************************************************************/ static int chroma_Probe( probedata_t *p_data ) { - if( p_data->chroma.p_render->i_chroma != YUV_420_PICTURE - || p_data->chroma.p_output->i_chroma != RGB_16BPP_PICTURE ) + switch( p_data->chroma.p_render->i_chroma ) { - return 0; + case FOURCC_YV12: + case FOURCC_I420: + case FOURCC_IYUV: + switch( ONLY_FOURCC( p_data->chroma.p_output->i_chroma ) ) + { + case FOURCC_BI_BITFIELDS: + break; + + default: + return 0; + } + break; + + default: + return 0; } - return( 100 ); + return 100; } /***************************************************************************** @@ -116,12 +129,34 @@ static int chroma_Probe( probedata_t *p_data ) *****************************************************************************/ static int chroma_Init( vout_thread_t *p_vout ) { - if( p_vout->render.i_chroma != YUV_420_PICTURE - || p_vout->output.i_chroma != RGB_16BPP_PICTURE ) + switch( p_vout->render.i_chroma ) { - return -1; - } + case FOURCC_YV12: + case FOURCC_I420: + case FOURCC_IYUV: + switch( ONLY_FOURCC( p_vout->output.i_chroma ) ) + { + case FOURCC_BI_BITFIELDS: + switch( ONLY_EXTRA( p_vout->output.i_chroma ) ) + { + case DEPTH_16BPP: + p_vout->chroma.pf_convert = ConvertYUV420RGB16; + break; + + default: + return -1; + } + break; + + default: + return -1; + } + break; + default: + return -1; + } + #if 0 p_vout->chroma.p_sys = malloc( sizeof( chroma_sys_t ) ); if( p_vout->chroma.p_sys == NULL ) @@ -131,7 +166,6 @@ static int chroma_Init( vout_thread_t *p_vout ) #endif /* FIXME: this is really suboptimal ! */ - p_vout->chroma.pf_convert = ConvertYUV420RGB16; return 0; } @@ -170,16 +204,16 @@ static void ConvertYUV420RGB16( vout_thread_t *p_vout, picture_t *p_source, pixel_data_t *p_in, *p_in_end, *p_out, *p_out_end; - p_in = p_source->planes[ Y_PLANE ].p_data; + p_in = p_source->P_Y; p_in_end = p_in + p_source->planes[ Y_PLANE ].i_bytes; - p_out = p_dest->planes[ RGB_PLANE ].p_data; - p_out_end = p_out + p_dest->planes[ RGB_PLANE ].i_bytes; + p_out = p_dest->P_MAIN; + p_out_end = p_out + p_dest->planes[ MAIN_PLANE ].i_bytes; while( p_in < p_in_end && p_out < p_out_end ) { int i_src = p_source->planes[ Y_PLANE ].i_line_bytes; - int i_dst = p_dest->planes[ RGB_PLANE ].i_line_bytes / 2; + int i_dst = p_dest->planes[ MAIN_PLANE ].i_line_bytes / 2; /* Masks: 0xf800 0x07e0 0x001f */ #define RED ((u16*)p_out)[--i_dst] = (u16)(p_in[--i_src]>>3) << 11; @@ -195,7 +229,7 @@ static void ConvertYUV420RGB16( vout_thread_t *p_vout, picture_t *p_source, } p_in += p_source->planes[ Y_PLANE ].i_line_bytes; - p_out += p_dest->planes[ RGB_PLANE ].i_line_bytes; + p_out += p_dest->planes[ MAIN_PLANE ].i_line_bytes; if( p_in >= p_in_end || p_out >= p_out_end ) { @@ -203,7 +237,7 @@ static void ConvertYUV420RGB16( vout_thread_t *p_vout, picture_t *p_source, } i_src = p_source->planes[ Y_PLANE ].i_line_bytes; - i_dst = p_dest->planes[ RGB_PLANE ].i_line_bytes / 2; + i_dst = p_dest->planes[ MAIN_PLANE ].i_line_bytes / 2; while( i_src && i_dst ) { @@ -212,7 +246,7 @@ static void ConvertYUV420RGB16( vout_thread_t *p_vout, picture_t *p_source, } p_in += p_source->planes[ Y_PLANE ].i_line_bytes; - p_out += p_dest->planes[ RGB_PLANE ].i_line_bytes; + p_out += p_dest->planes[ MAIN_PLANE ].i_line_bytes; } /********************************************************************** diff --git a/plugins/chroma/yv12_rgb8.c b/plugins/chroma/yv12_rgb8.c index 3585cda3829efa5ca100415b53a5fd9c1f871465..2c04c0e7578c799a5edc48d39e213add2d8da65c 100644 --- a/plugins/chroma/yv12_rgb8.c +++ b/plugins/chroma/yv12_rgb8.c @@ -2,7 +2,7 @@ * yv12_rgb8.c : YUV to paletted RGB8 conversion module for vlc ***************************************************************************** * Copyright (C) 2000 VideoLAN - * $Id: yv12_rgb8.c,v 1.3 2001/12/30 07:09:54 sam Exp $ + * $Id: yv12_rgb8.c,v 1.4 2002/01/02 14:37:42 sam Exp $ * * Authors: Samuel Hocevar <sam@zoy.org> * @@ -259,7 +259,7 @@ static void ConvertYUV420RGB8( vout_thread_t *p_vout, picture_t *p_source, u8* p_y = p_source->planes[ Y_PLANE ].p_data; u8* p_u = p_source->planes[ U_PLANE ].p_data; u8* p_v = p_source->planes[ V_PLANE ].p_data; - u8* p_pic = p_dest->planes[ RGB_PLANE ].p_data; + u8* p_pic = p_dest->planes[ MAIN_PLANE ].p_data; /* * The dithering matrices diff --git a/plugins/dummy/vout_dummy.c b/plugins/dummy/vout_dummy.c index 23e057dfc4e95b5881b3abc64db12d8469bf8f42..6656120f99a8e92c8b1050a53cab2c3eadef7e4f 100644 --- a/plugins/dummy/vout_dummy.c +++ b/plugins/dummy/vout_dummy.c @@ -2,7 +2,7 @@ * vout_dummy.c: Dummy video output display method for testing purposes ***************************************************************************** * Copyright (C) 2000, 2001 VideoLAN - * $Id: vout_dummy.c,v 1.13 2001/12/30 07:09:55 sam Exp $ + * $Id: vout_dummy.c,v 1.14 2002/01/02 14:37:42 sam Exp $ * * Authors: Samuel Hocevar <sam@zoy.org> * @@ -117,7 +117,9 @@ static int vout_Init( vout_thread_t *p_vout ) /* Initialize the output structure */ switch( p_vout->render.i_chroma ) { - case YUV_420_PICTURE: + case FOURCC_I420: + case FOURCC_IYUV: + case FOURCC_YV12: p_vout->output.i_chroma = p_vout->render.i_chroma; p_vout->output.i_width = p_vout->render.i_width; p_vout->output.i_height = p_vout->render.i_height; @@ -125,7 +127,7 @@ static int vout_Init( vout_thread_t *p_vout ) break; default: - p_vout->output.i_chroma = RGB_16BPP_PICTURE; + p_vout->output.i_chroma = FOURCC_BI_BITFIELDS | DEPTH_16BPP; p_vout->output.i_width = p_vout->render.i_width; p_vout->output.i_height = p_vout->render.i_height; p_vout->output.i_aspect = p_vout->render.i_aspect; @@ -233,24 +235,26 @@ static int DummyNewPicture( vout_thread_t *p_vout, picture_t *p_pic ) { /* We know this chroma, allocate a buffer which will be used * directly by the decoder */ - case YUV_420_PICTURE: + case FOURCC_I420: + case FOURCC_IYUV: + case FOURCC_YV12: /* Allocate the memory buffer */ i_luma_bytes = i_width * i_height * sizeof(pixel_data_t); i_chroma_bytes = i_width * ( i_height / 2 ) * sizeof(pixel_data_t); /* Y buffer */ - p_pic->planes[ Y_PLANE ].p_data = malloc( i_luma_bytes + 2 * i_chroma_bytes ); + p_pic->P_Y = malloc( i_luma_bytes + 2 * i_chroma_bytes ); p_pic->planes[ Y_PLANE ].i_bytes = i_luma_bytes; p_pic->planes[ Y_PLANE ].i_line_bytes = i_width * sizeof(pixel_data_t); /* U buffer */ - p_pic->planes[ U_PLANE ].p_data = p_pic->planes[ Y_PLANE ].p_data + i_height * i_width; + p_pic->P_U = p_pic->P_Y + i_height * i_width; p_pic->planes[ U_PLANE ].i_bytes = i_chroma_bytes / 2; p_pic->planes[ U_PLANE ].i_line_bytes = i_width / 2 * sizeof(pixel_data_t); /* V buffer */ - p_pic->planes[ V_PLANE ].p_data = p_pic->planes[ U_PLANE ].p_data + i_height * i_width / 2; + p_pic->P_V = p_pic->P_U + i_height * i_width / 2; p_pic->planes[ V_PLANE ].i_bytes = i_chroma_bytes / 2; p_pic->planes[ V_PLANE ].i_line_bytes = i_width / 2 * sizeof(pixel_data_t); @@ -262,21 +266,30 @@ static int DummyNewPicture( vout_thread_t *p_vout, picture_t *p_pic ) /* Unknown chroma, allocate an RGB buffer, the video output's job * will be to do the chroma->RGB conversion */ - /* XXX FIXME this is BROKEN ! See how the other plugins do it */ - default: + case FOURCC_BI_BITFIELDS | DEPTH_16BPP: /* Precalculate some values */ i_luma_bytes = sizeof(u16) * i_width * i_height; /* Allocate the memory buffer */ - p_pic->planes[ RGB_PLANE ].p_data = malloc( i_luma_bytes ); - p_pic->planes[ RGB_PLANE ].i_bytes = i_luma_bytes; + p_pic->P_MAIN = malloc( i_luma_bytes ); + p_pic->planes[ MAIN_PLANE ].i_bytes = i_luma_bytes; + + /* Fill important structures */ + p_pic->planes[ MAIN_PLANE ].i_red_mask = 0xf800; + p_pic->planes[ MAIN_PLANE ].i_green_mask = 0x07e0; + p_pic->planes[ MAIN_PLANE ].i_blue_mask = 0x001f; /* We allocated 1 plane */ p_pic->i_planes = 1; return( 0 ); break; + + default: + p_pic->i_planes = 0; + return( 0 ); + break; } } diff --git a/plugins/dvdread/input_dvdread.c b/plugins/dvdread/input_dvdread.c index 68f5915c61dffde39bff895fc9fc8bfb03f12fe8..1b43220d882bd148ed8ee345a86f630f50829e8a 100644 --- a/plugins/dvdread/input_dvdread.c +++ b/plugins/dvdread/input_dvdread.c @@ -6,7 +6,7 @@ * It depends on: libdvdread for ifo files and block reading. ***************************************************************************** * Copyright (C) 2001 VideoLAN - * $Id: input_dvdread.c,v 1.14 2001/12/31 01:13:12 massiot Exp $ + * $Id: input_dvdread.c,v 1.15 2002/01/02 14:37:42 sam Exp $ * * Author: St�phane Borel <stef@via.ecp.fr> * @@ -779,7 +779,7 @@ static int DvdReadRead( input_thread_t * p_input, { thread_dvd_data_t * p_dvd; u8 p_data[DVD_VIDEO_LB_LEN]; - struct iovec p_vec[DVD_DATA_BLOCK_ONCE]; + struct iovec p_vec[DVD_BLOCK_READ_ONCE]; u8 * pi_cur; int i_blocks; int i_read; diff --git a/plugins/filter/deinterlace.c b/plugins/filter/deinterlace.c index 8a40a6b1540e3b4e5596e369874ee667403884fe..6e9590c64573db87ded8fca097ab0fef628c9154 100644 --- a/plugins/filter/deinterlace.c +++ b/plugins/filter/deinterlace.c @@ -2,7 +2,7 @@ * deinterlace.c : deinterlacer plugin for vlc ***************************************************************************** * Copyright (C) 2000, 2001 VideoLAN - * $Id: deinterlace.c,v 1.1 2001/12/30 07:09:55 sam Exp $ + * $Id: deinterlace.c,v 1.2 2002/01/02 14:37:42 sam Exp $ * * Authors: Samuel Hocevar <sam@zoy.org> * @@ -172,8 +172,10 @@ static int vout_Init( vout_thread_t *p_vout ) * the decoder to output directly to our structures. */ switch( p_vout->render.i_chroma ) { - case YUV_420_PICTURE: - case YUV_422_PICTURE: + case FOURCC_I420: + case FOURCC_IYUV: + case FOURCC_YV12: + case FOURCC_I422: p_vout->output.i_chroma = p_vout->render.i_chroma; p_vout->output.i_width = p_vout->render.i_width; p_vout->output.i_height = p_vout->render.i_height; @@ -193,7 +195,9 @@ static int vout_Init( vout_thread_t *p_vout ) switch( p_vout->render.i_chroma ) { - case YUV_420_PICTURE: + case FOURCC_I420: + case FOURCC_IYUV: + case FOURCC_YV12: switch( p_vout->p_sys->i_mode ) { case DEINTERLACE_MODE_BOB: @@ -212,11 +216,11 @@ static int vout_Init( vout_thread_t *p_vout ) } break; - case YUV_422_PICTURE: + case FOURCC_I422: p_vout->p_sys->p_vout = vout_CreateThread( NULL, p_vout->output.i_width, p_vout->output.i_height, - YUV_420_PICTURE, p_vout->output.i_aspect ); + FOURCC_I420, p_vout->output.i_aspect ); break; default: @@ -320,7 +324,9 @@ static void vout_Display( vout_thread_t *p_vout, picture_t *p_pic ) switch( p_vout->render.i_chroma ) { - case YUV_420_PICTURE: + case FOURCC_I420: + case FOURCC_IYUV: + case FOURCC_YV12: switch( p_vout->p_sys->i_mode ) { @@ -378,7 +384,7 @@ static void vout_Display( vout_thread_t *p_vout, picture_t *p_pic ) } break; - case YUV_422_PICTURE: + case FOURCC_I422: i_increment = 2 * p_pic->planes[ i_index ].i_line_bytes; diff --git a/plugins/filter/distort.c b/plugins/filter/distort.c index ed64f2a3af4b88920e8b137f251611ced3c15013..bbefa08b570550cb158ccf9aa4326bb0d19fb65a 100644 --- a/plugins/filter/distort.c +++ b/plugins/filter/distort.c @@ -2,7 +2,7 @@ * distort.c : Misc video effects plugin for vlc ***************************************************************************** * Copyright (C) 2000, 2001 VideoLAN - * $Id: distort.c,v 1.3 2001/12/30 07:09:55 sam Exp $ + * $Id: distort.c,v 1.4 2002/01/02 14:37:42 sam Exp $ * * Authors: Samuel Hocevar <sam@zoy.org> * @@ -180,7 +180,11 @@ static int vout_Init( vout_thread_t *p_vout ) /* Initialize the output structure */ switch( p_vout->render.i_chroma ) { - case YUV_420_PICTURE: + case FOURCC_I420: + case FOURCC_IYUV: + case FOURCC_YV12: + case FOURCC_I422: + case FOURCC_I444: p_vout->output.i_chroma = p_vout->render.i_chroma; p_vout->output.i_width = p_vout->render.i_width; p_vout->output.i_height = p_vout->render.i_height; diff --git a/plugins/filter/invert.c b/plugins/filter/invert.c index 7f78932072fa464b7b3d82dfa66bfffeb4aee82e..77f161fb90151801940a8a79a8560989bddee4ae 100644 --- a/plugins/filter/invert.c +++ b/plugins/filter/invert.c @@ -2,7 +2,7 @@ * invert.c : Invert video plugin for vlc ***************************************************************************** * Copyright (C) 2000, 2001 VideoLAN - * $Id: invert.c,v 1.3 2001/12/30 07:09:55 sam Exp $ + * $Id: invert.c,v 1.4 2002/01/02 14:37:42 sam Exp $ * * Authors: Samuel Hocevar <sam@zoy.org> * @@ -140,7 +140,11 @@ static int vout_Init( vout_thread_t *p_vout ) /* Initialize the output structure */ switch( p_vout->render.i_chroma ) { - case YUV_420_PICTURE: + case FOURCC_I420: + case FOURCC_IYUV: + case FOURCC_YV12: + case FOURCC_I422: + case FOURCC_I444: p_vout->output.i_chroma = p_vout->render.i_chroma; p_vout->output.i_width = p_vout->render.i_width; p_vout->output.i_height = p_vout->render.i_height; diff --git a/plugins/filter/transform.c b/plugins/filter/transform.c index 9b08b83c2b5ee023d89477a471945f2a014434f7..5bb8316467dad83a653d19b18796f4b81ce553ca 100644 --- a/plugins/filter/transform.c +++ b/plugins/filter/transform.c @@ -2,7 +2,7 @@ * transform.c : transform image plugin for vlc ***************************************************************************** * Copyright (C) 2000, 2001 VideoLAN - * $Id: transform.c,v 1.2 2001/12/30 07:09:55 sam Exp $ + * $Id: transform.c,v 1.3 2002/01/02 14:37:42 sam Exp $ * * Authors: Samuel Hocevar <sam@zoy.org> * @@ -191,7 +191,11 @@ static int vout_Init( vout_thread_t *p_vout ) /* Initialize the output structure */ switch( p_vout->render.i_chroma ) { - case YUV_420_PICTURE: + case FOURCC_I420: + case FOURCC_IYUV: + case FOURCC_YV12: + case FOURCC_I422: + case FOURCC_I444: p_vout->output.i_chroma = p_vout->render.i_chroma; p_vout->output.i_width = p_vout->render.i_width; p_vout->output.i_height = p_vout->render.i_height; diff --git a/plugins/filter/wall.c b/plugins/filter/wall.c index eef1811a2ad3aed7edc7b2b4152f0b61a782de57..1999db16c2ad50b1ac69f2759cdbf7d06f1ba23d 100644 --- a/plugins/filter/wall.c +++ b/plugins/filter/wall.c @@ -2,7 +2,7 @@ * wall.c : Wall video plugin for vlc ***************************************************************************** * Copyright (C) 2000, 2001 VideoLAN - * $Id: wall.c,v 1.4 2001/12/31 04:53:33 sam Exp $ + * $Id: wall.c,v 1.5 2002/01/02 14:37:42 sam Exp $ * * Authors: Samuel Hocevar <sam@zoy.org> * @@ -164,7 +164,11 @@ static int vout_Init( vout_thread_t *p_vout ) /* Initialize the output structure */ switch( p_vout->render.i_chroma ) { - case YUV_420_PICTURE: + case FOURCC_I420: + case FOURCC_IYUV: + case FOURCC_YV12: + case FOURCC_I422: + case FOURCC_I444: p_vout->output.i_chroma = p_vout->render.i_chroma; p_vout->output.i_width = p_vout->render.i_width; p_vout->output.i_height = p_vout->render.i_height; diff --git a/plugins/gtk/gnome.c b/plugins/gtk/gnome.c index 4f24c39bcad04df9312285d9c21092c6049db770..98d05fd3c433776e556da9c31a918e706d99caab 100644 --- a/plugins/gtk/gnome.c +++ b/plugins/gtk/gnome.c @@ -2,7 +2,7 @@ * gnome.c : Gnome plugin for vlc ***************************************************************************** * Copyright (C) 2000 VideoLAN - * $Id: gnome.c,v 1.4 2001/12/30 07:09:55 sam Exp $ + * $Id: gnome.c,v 1.5 2002/01/02 14:37:42 sam Exp $ * * Authors: Samuel Hocevar <sam@zoy.org> * @@ -209,7 +209,7 @@ static void intf_Run( intf_thread_t *p_intf ) }; /* Initialize Gnome */ - gnome_init( p_main->psz_arg0, VLC_VERSION, i_args, p_args ); + gnome_init( p_main->psz_arg0, VERSION, i_args, p_args ); /* Create some useful widgets that will certainly be used */ p_intf->p_sys->p_window = create_intf_window( ); diff --git a/plugins/gtk/gtk_open.c b/plugins/gtk/gtk_open.c index 6a4d1a22407fc4b547bf150db826c31e2ad7757f..227dbfd9bb4aaba50f0afd29feb872df7e283c1e 100644 --- a/plugins/gtk/gtk_open.c +++ b/plugins/gtk/gtk_open.c @@ -2,7 +2,7 @@ * gtk_open.c : functions to handle file/disc/network open widgets. ***************************************************************************** * Copyright (C) 2000, 2001 VideoLAN - * $Id: gtk_open.c,v 1.12 2001/12/30 07:09:55 sam Exp $ + * $Id: gtk_open.c,v 1.13 2002/01/02 14:37:42 sam Exp $ * * Authors: Samuel Hocevar <sam@zoy.org> * St�phane Borel <stef@via.ecp.fr> @@ -150,7 +150,7 @@ void GtkDiscOpenDvd( GtkToggleButton * togglebutton, gpointer user_data ) { gtk_entry_set_text( GTK_ENTRY( lookup_widget( GTK_WIDGET(togglebutton), "disc_name" ) ), - main_GetPszVariable( INPUT_DVD_DEVICE_VAR, INPUT_DVD_DEVICE_DEFAULT ) + main_GetPszVariable( INPUT_DVD_DEVICE_VAR, DVD_DEVICE ) ); } } @@ -161,7 +161,7 @@ void GtkDiscOpenVcd( GtkToggleButton * togglebutton, gpointer user_data ) { gtk_entry_set_text( GTK_ENTRY( lookup_widget( GTK_WIDGET(togglebutton), "disc_name" ) ), - main_GetPszVariable( INPUT_VCD_DEVICE_VAR, INPUT_VCD_DEVICE_DEFAULT ) + main_GetPszVariable( INPUT_VCD_DEVICE_VAR, VCD_DEVICE ) ); } } diff --git a/plugins/gtk/gtk_preferences.c b/plugins/gtk/gtk_preferences.c index 504897b2f1c667f0c2b00ca533104643d8655a94..f7cd18e36a3b61c5441d9cf3e457efbd4fa82c31 100644 --- a/plugins/gtk/gtk_preferences.c +++ b/plugins/gtk/gtk_preferences.c @@ -2,7 +2,7 @@ * gtk_control.c : functions to handle stream control buttons. ***************************************************************************** * Copyright (C) 2000, 2001 VideoLAN - * $Id: gtk_preferences.c,v 1.9 2001/12/30 07:09:55 sam Exp $ + * $Id: gtk_preferences.c,v 1.10 2002/01/02 14:37:42 sam Exp $ * * Authors: Samuel Hocevar <sam@zoy.org> * St�phane Borel <stef@via.ecp.fr> @@ -89,11 +89,11 @@ gboolean GtkPreferencesShow( GtkWidget *widget, "preferences_file_path_entry" ); /* Default DVD */ - ASSIGN_PSZ_ENTRY( INPUT_DVD_DEVICE_VAR,INPUT_DVD_DEVICE_DEFAULT, + ASSIGN_PSZ_ENTRY( INPUT_DVD_DEVICE_VAR,DVD_DEVICE, "preferences_disc_dvd_entry" ); /* Default VCD */ - ASSIGN_PSZ_ENTRY( INPUT_VCD_DEVICE_VAR, INPUT_VCD_DEVICE_DEFAULT, + ASSIGN_PSZ_ENTRY( INPUT_VCD_DEVICE_VAR, VCD_DEVICE, "preferences_disc_vcd_entry" ); /* Default server */ diff --git a/plugins/kde/kde.cpp b/plugins/kde/kde.cpp index 53c19f66e80fd660c736e2323445f7c18a6b4327..3f885a536c9582904b81239fdf8f20daa9b1ab8f 100644 --- a/plugins/kde/kde.cpp +++ b/plugins/kde/kde.cpp @@ -2,7 +2,7 @@ * kde.cpp : KDE plugin for vlc ***************************************************************************** * Copyright (C) 2001 VideoLAN - * $Id: kde.cpp,v 1.5 2001/12/30 07:09:55 sam Exp $ + * $Id: kde.cpp,v 1.6 2002/01/02 14:37:42 sam Exp $ * * Authors: Andres Krapf <dae@chez.com> Sun Mar 25 2001 * @@ -111,8 +111,7 @@ KThread::KThread(intf_thread_t *p_intf) this->p_intf = p_intf; p_intf->p_sys->p_about = - new KAboutData( "VideoLAN Client", I18N_NOOP("Kvlc"), - VLC_VERSION, + new KAboutData( "VideoLAN Client", I18N_NOOP("Kvlc"), VERSION, "This is the VideoLAN client, a DVD and MPEG player. It can play MPEG and MPEG 2 files from a file or from a network source.", KAboutData::License_GPL, "(C) 1996, 1997, 1998, 1999, 2000, 2001 - the VideoLAN Team", 0, 0, "dae@chez.com"); diff --git a/plugins/mpeg_vdec/video_parser.h b/plugins/mpeg_vdec/video_parser.h index 9facbea7314babd1364b28b902730e719175f089..34fb3adf187a48bcf0b3446800cbce756e86ad50 100644 --- a/plugins/mpeg_vdec/video_parser.h +++ b/plugins/mpeg_vdec/video_parser.h @@ -2,7 +2,7 @@ * video_parser.h : video parser thread ***************************************************************************** * Copyright (C) 1999, 2000 VideoLAN - * $Id: video_parser.h,v 1.2 2001/12/13 12:47:17 sam Exp $ + * $Id: video_parser.h,v 1.3 2002/01/02 14:37:42 sam Exp $ * * Authors: Christophe Massiot <massiot@via.ecp.fr> * Jean-Marc Dressler <polux@via.ecp.fr> @@ -221,6 +221,12 @@ typedef struct picture_parsing_s #define BOTTOM_FIELD 2 #define FRAME_STRUCTURE 3 +/* Aspect ratio (ISO/IEC 13818-2 section 6.3.3, table 6-3) */ +#define AR_SQUARE_PICTURE 1 /* square pixels */ +#define AR_3_4_PICTURE 2 /* 3:4 picture (TV) */ +#define AR_16_9_PICTURE 3 /* 16:9 picture (wide screen) */ +#define AR_221_1_PICTURE 4 /* 2.21:1 picture (movie) */ + /***************************************************************************** * Prototypes *****************************************************************************/ diff --git a/plugins/mpeg_vdec/vpar_headers.c b/plugins/mpeg_vdec/vpar_headers.c index 931432234dcef69538c1058ad1cfc62d6078cc11..2bd676c1855a762519c415105e7e5147aad2aea7 100644 --- a/plugins/mpeg_vdec/vpar_headers.c +++ b/plugins/mpeg_vdec/vpar_headers.c @@ -2,7 +2,7 @@ * vpar_headers.c : headers parsing ***************************************************************************** * Copyright (C) 1999-2001 VideoLAN - * $Id: vpar_headers.c,v 1.8 2001/12/30 07:09:56 sam Exp $ + * $Id: vpar_headers.c,v 1.9 2002/01/02 14:37:42 sam Exp $ * * Authors: Christophe Massiot <massiot@via.ecp.fr> * St�phane Borel <stef@via.ecp.fr> @@ -210,6 +210,28 @@ static __inline__ void LinkMatrix( quant_matrix_t * p_matrix, u8 * pi_array ) p_matrix->pi_matrix = pi_array; } +/***************************************************************************** + * ChromaToFourCC: Return a FourCC value used by the video output. + *****************************************************************************/ +static __inline__ u64 ChromaToFourCC( int i_chroma ) +{ + switch( i_chroma ) + { + case CHROMA_420: + return FOURCC_I420; + + case CHROMA_422: + return FOURCC_I422; + + case CHROMA_444: + return FOURCC_I444; + + default: + /* This can't happen */ + return 0xdeadbeef; + } +} + /* * Exported functions. */ @@ -475,11 +497,11 @@ static void SequenceHeader( vpar_thread_t * p_vpar ) { intf_WarnMsg( 1, "vpar: no vout present, spawning one" ); - p_vpar->p_vout = - vout_CreateThread( NULL, p_vpar->sequence.i_width, - p_vpar->sequence.i_height, - 99 + p_vpar->sequence.i_chroma_format, - p_vpar->sequence.i_aspect ); + p_vpar->p_vout = vout_CreateThread( + NULL, p_vpar->sequence.i_width, + p_vpar->sequence.i_height, + ChromaToFourCC( p_vpar->sequence.i_chroma_format ), + p_vpar->sequence.i_aspect ); /* Everything failed */ if( p_vpar->p_vout == NULL ) diff --git a/plugins/sdl/vout_sdl.c b/plugins/sdl/vout_sdl.c index b2cf77f4c3dea97c8bd8692546cf561cd0c73726..1105c1362b00677b6ce88005553457122af0bf2e 100644 --- a/plugins/sdl/vout_sdl.c +++ b/plugins/sdl/vout_sdl.c @@ -2,7 +2,7 @@ * vout_sdl.c: SDL video output display method ***************************************************************************** * Copyright (C) 1998-2001 VideoLAN - * $Id: vout_sdl.c,v 1.74 2001/12/30 07:09:56 sam Exp $ + * $Id: vout_sdl.c,v 1.75 2002/01/02 14:37:42 sam Exp $ * * Authors: Samuel Hocevar <sam@zoy.org> * Pierre Baillet <oct@zoy.org> @@ -227,7 +227,9 @@ static int vout_Init( vout_thread_t *p_vout ) /* Initialize the output structure */ switch( p_vout->render.i_chroma ) { - case YUV_420_PICTURE: + case FOURCC_I420: + case FOURCC_IYUV: + case FOURCC_YV12: p_vout->output.i_chroma = p_vout->render.i_chroma; p_vout->output.i_width = p_vout->render.i_width; p_vout->output.i_height = p_vout->render.i_height; @@ -237,7 +239,7 @@ static int vout_Init( vout_thread_t *p_vout ) default: /* All we have is a 16bpp image with square pixels */ /* FIXME: and if screen depth != 16 ?! */ - p_vout->output.i_chroma = RGB_16BPP_PICTURE; + p_vout->output.i_chroma = FOURCC_BI_BITFIELDS | DEPTH_16BPP; p_vout->output.i_width = p_vout->p_sys->i_width; p_vout->output.i_height = p_vout->p_sys->i_height; p_vout->output.i_aspect = p_vout->p_sys->i_width @@ -297,17 +299,17 @@ static void vout_End( vout_thread_t *p_vout ) i_index--; switch( p_vout->output.i_chroma ) { - case YUV_420_PICTURE: + case FOURCC_I420: + case FOURCC_IYUV: + case FOURCC_YV12: SDL_UnlockYUVOverlay( PP_OUTPUTPICTURE[ i_index ]->p_sys->p_overlay ); SDL_FreeYUVOverlay( PP_OUTPUTPICTURE[ i_index ]->p_sys->p_overlay ); break; - case RGB_16BPP_PICTURE: - break; - default: + /* RGB picture */ break; } free( PP_OUTPUTPICTURE[ i_index ]->p_sys ); @@ -534,17 +536,17 @@ static void vout_Display( vout_thread_t *p_vout, picture_t *p_pic ) switch( p_vout->output.i_chroma ) { - case RGB_16BPP_PICTURE: - SDL_Flip(p_vout->p_sys->p_display); - break; - - case YUV_420_PICTURE: + case FOURCC_I420: + case FOURCC_IYUV: + case FOURCC_YV12: SDL_UnlockYUVOverlay( p_pic->p_sys->p_overlay); SDL_DisplayYUVOverlay( p_pic->p_sys->p_overlay , &disp ); SDL_LockYUVOverlay( p_pic->p_sys->p_overlay); break; default: + /* RGB picture */ + SDL_Flip(p_vout->p_sys->p_display); break; } } @@ -640,31 +642,9 @@ static int SDLNewPicture( vout_thread_t *p_vout, picture_t *p_pic ) switch( p_vout->output.i_chroma ) { - case RGB_16BPP_PICTURE: - if( p_vout->p_sys->i_surfaces ) - { - /* We already allocated this surface, return */ - return -1; - } - - p_pic->p_sys = malloc( sizeof( picture_sys_t ) ); - - if( p_pic->p_sys == NULL ) - { - return -1; - } - - P[ RGB_PLANE ].p_data = p_vout->p_sys->p_display->pixels; - P[ RGB_PLANE ].i_bytes = 2 * i_width * i_height; - P[ RGB_PLANE ].i_line_bytes = 2 * i_width; - - p_vout->p_sys->i_surfaces++; - - p_pic->i_planes = 1; - - return 0; - - case YUV_420_PICTURE: + case FOURCC_I420: + case FOURCC_IYUV: + case FOURCC_YV12: p_pic->p_sys = malloc( sizeof( picture_sys_t ) ); if( p_pic->p_sys == NULL ) @@ -702,6 +682,30 @@ static int SDLNewPicture( vout_thread_t *p_vout, picture_t *p_pic ) return 0; + case FOURCC_BI_BITFIELDS | DEPTH_16BPP: + if( p_vout->p_sys->i_surfaces ) + { + /* We already allocated this surface, return */ + return -1; + } + + p_pic->p_sys = malloc( sizeof( picture_sys_t ) ); + + if( p_pic->p_sys == NULL ) + { + return -1; + } + + P[ MAIN_PLANE ].p_data = p_vout->p_sys->p_display->pixels; + P[ MAIN_PLANE ].i_bytes = 2 * i_width * i_height; + P[ MAIN_PLANE ].i_line_bytes = 2 * i_width; + + p_vout->p_sys->i_surfaces++; + + p_pic->i_planes = 1; + + return 0; + default: /* Unknown chroma, tell the guy to get lost */ p_pic->i_planes = 0; diff --git a/plugins/x11/xcommon.c b/plugins/x11/xcommon.c index d2f5b69244e5cbd0644288be75cf5145896b8265..392aabb9311c3e6b4217989bb0a9f7b05ec02393 100644 --- a/plugins/x11/xcommon.c +++ b/plugins/x11/xcommon.c @@ -2,7 +2,7 @@ * xcommon.c: Functions common to the X11 and XVideo plugins ***************************************************************************** * Copyright (C) 1998-2001 VideoLAN - * $Id: xcommon.c,v 1.3 2002/01/02 06:46:02 gbazin Exp $ + * $Id: xcommon.c,v 1.4 2002/01/02 14:37:42 sam Exp $ * * Authors: Vincent Seguin <seguin@via.ecp.fr> * Samuel Hocevar <sam@zoy.org> @@ -69,14 +69,13 @@ # define IMAGE_TYPE XvImage # define EXTRA_ARGS int i_xvport, int i_format # define EXTRA_ARGS_SHM int i_xvport, int i_format, XShmSegmentInfo *p_shm -# define DATA_SIZE p_image->data_size - /* There is nothing like XvDestroyImage */ -# define IMAGE_FREE XFree +# define DATA_SIZE(p) (p)->data_size +# define IMAGE_FREE XFree /* There is nothing like XvDestroyImage */ #else # define IMAGE_TYPE XImage # define EXTRA_ARGS Visual *p_visual, int i_depth, int i_bytes_per_pixel # define EXTRA_ARGS_SHM Visual *p_visual, int i_depth, XShmSegmentInfo *p_shm -# define DATA_SIZE (p_image->bytes_per_line * p_image->height) +# define DATA_SIZE(p) ((p)->bytes_per_line * (p)->height) # define IMAGE_FREE XDestroyImage #endif @@ -425,7 +424,9 @@ static int vout_Init( vout_thread_t *p_vout ) /* Initialize the output structure */ switch( p_vout->render.i_chroma ) { - case YUV_420_PICTURE: + case FOURCC_I420: + case FOURCC_IYUV: + case FOURCC_YV12: p_vout->output.i_chroma = p_vout->render.i_chroma; p_vout->output.i_width = p_vout->render.i_width; p_vout->output.i_height = p_vout->render.i_height; @@ -438,9 +439,27 @@ static int vout_Init( vout_thread_t *p_vout ) #else /* Initialize the output structure: RGB with square pixels, whatever * the input format is, since it's the only format we know */ - p_vout->output.i_chroma = RGB_16BPP_PICTURE; + switch( p_vout->p_sys->i_screen_depth ) + { + case 8: /* FIXME: set the palette */ + p_vout->output.i_chroma = FOURCC_BI_RGB | DEPTH_8BPP; break; + case 15: + p_vout->output.i_chroma = FOURCC_BI_BITFIELDS | DEPTH_15BPP; break; + case 16: + p_vout->output.i_chroma = FOURCC_BI_BITFIELDS | DEPTH_16BPP; break; + case 24: + p_vout->output.i_chroma = FOURCC_BI_BITFIELDS | DEPTH_24BPP; break; + case 32: + p_vout->output.i_chroma = FOURCC_BI_BITFIELDS | DEPTH_32BPP; break; + default: + intf_ErrMsg( "vout error: unknown screen depth" ); + return( 0 ); + } + p_vout->output.i_width = p_vout->p_sys->i_width; p_vout->output.i_height = p_vout->p_sys->i_height; + + /* Assume we have square pixels */ p_vout->output.i_aspect = p_vout->p_sys->i_width * VOUT_ASPECT_FACTOR / p_vout->p_sys->i_height; #endif @@ -1119,10 +1138,10 @@ static int NewPicture( vout_thread_t *p_vout, picture_t *p_pic ) int i_width = p_vout->output.i_width; int i_height = p_vout->output.i_height; - switch( p_vout->output.i_chroma ) + switch( ONLY_FOURCC( p_vout->output.i_chroma ) ) { #ifdef MODULE_NAME_IS_xvideo - case YUV_420_PICTURE: + case FOURCC_I420: /* We know this chroma, allocate a buffer which will be used * directly by the decoder */ p_pic->p_sys = malloc( sizeof( picture_sys_t ) ); @@ -1179,7 +1198,7 @@ static int NewPicture( vout_thread_t *p_vout, picture_t *p_pic ) #endif #ifdef MODULE_NAME_IS_x11 - case RGB_16BPP_PICTURE: + case FOURCC_BI_BITFIELDS: p_pic->p_sys = malloc( sizeof( picture_sys_t ) ); if( p_pic->p_sys == NULL ) @@ -1213,9 +1232,15 @@ static int NewPicture( vout_thread_t *p_vout, picture_t *p_pic ) } /* FIXME: try to get the right i_bytes value from p_image */ - P[ RGB_PLANE ].p_data = p_pic->p_sys->p_image->data; - P[ RGB_PLANE ].i_bytes = 2 * i_width * i_height; - P[ RGB_PLANE ].i_line_bytes = 2 * i_width; + P[ MAIN_PLANE ].p_data = p_pic->p_sys->p_image->data; + P[ MAIN_PLANE ].i_bytes = p_vout->p_sys->i_bytes_per_pixel + * i_width * i_height; + P[ MAIN_PLANE ].i_line_bytes = p_vout->p_sys->i_bytes_per_pixel + * i_width; + + P[ MAIN_PLANE ].i_red_mask = p_vout->p_sys->i_red_mask; + P[ MAIN_PLANE ].i_green_mask = p_vout->p_sys->i_green_mask; + P[ MAIN_PLANE ].i_blue_mask = p_vout->p_sys->i_blue_mask; p_pic->i_planes = 1; @@ -1241,11 +1266,11 @@ static int NewPicture( vout_thread_t *p_vout, picture_t *p_pic ) *****************************************************************************/ static void FreePicture( vout_thread_t *p_vout, picture_t *p_pic ) { - /* FIXME: check the operation order */ - + /* The order of operations is correct */ if( p_vout->p_sys->b_shm ) { XShmDetach( p_vout->p_sys->p_display, &p_pic->p_sys->shminfo ); + IMAGE_FREE( p_pic->p_sys->p_image ); shmctl( p_pic->p_sys->shminfo.shmid, IPC_RMID, 0 ); if( shmdt( p_pic->p_sys->shminfo.shmaddr ) ) @@ -1254,9 +1279,12 @@ static void FreePicture( vout_thread_t *p_vout, picture_t *p_pic ) strerror(errno) ); } } + else + { + IMAGE_FREE( p_pic->p_sys->p_image ); + } XSync( p_vout->p_sys->p_display, False ); - IMAGE_FREE( p_pic->p_sys->p_image ); free( p_pic->p_sys ); } @@ -1679,12 +1707,12 @@ static int XVideoGetPort( Display *dpy, int i_id ) { if( i_requested_adaptor == -1 ) { - intf_WarnMsg( 3, "vout: no free XVideo port found for YV12" ); + intf_WarnMsg( 3, "vout: no free XVideo port found for %i", i_id ); } else { intf_WarnMsg( 3, "vout: XVideo adaptor %i does not have a free " - "XVideo port for YV12", i_requested_adaptor ); + "XVideo port for %i", i_requested_adaptor, i_id ); } } @@ -1817,7 +1845,7 @@ static int InitDisplay( vout_thread_t *p_vout ) * Prepare an XImage or XvImage for display function. * The order of the operations respects the recommandations of the mit-shm * document by J.Corbet and K.Packard. Most of the parameters were copied from - * there. + * there. See http://ftp.xfree86.org/pub/XFree86/4.0/doc/mit-shm.TXT *****************************************************************************/ static IMAGE_TYPE * CreateShmImage( Display* p_display, EXTRA_ARGS_SHM, int i_width, int i_height ) @@ -1840,7 +1868,7 @@ static IMAGE_TYPE * CreateShmImage( Display* p_display, EXTRA_ARGS_SHM, /* Allocate shared memory segment - 0776 set the access permission * rights (like umask), they are not yet supported by all X servers */ - p_shm->shmid = shmget( IPC_PRIVATE, DATA_SIZE, IPC_CREAT | 0776 ); + p_shm->shmid = shmget( IPC_PRIVATE, DATA_SIZE(p_image), IPC_CREAT | 0776 ); if( p_shm->shmid < 0 ) { intf_ErrMsg( "vout error: cannot allocate shared image data (%s)", @@ -1852,22 +1880,24 @@ static IMAGE_TYPE * CreateShmImage( Display* p_display, EXTRA_ARGS_SHM, /* Attach shared memory segment to process (read/write) */ p_shm->shmaddr = p_image->data = shmat( p_shm->shmid, 0, 0 ); if(! p_shm->shmaddr ) - { /* error */ + { intf_ErrMsg( "vout error: cannot attach shared memory (%s)", strerror(errno)); - shmctl( p_shm->shmid, IPC_RMID, 0 ); /* free shared memory */ IMAGE_FREE( p_image ); + shmctl( p_shm->shmid, IPC_RMID, 0 ); return( NULL ); } + /* Read-only data. We won't be using XShmGetImage */ + p_shm->readOnly = True; + /* Attach shared memory segment to X server */ - p_shm->readOnly = True; /* the X server doesn't need to write to our shm */ if( XShmAttach( p_display, p_shm ) == False ) { intf_ErrMsg( "vout error: cannot attach shared memory to X server" ); + IMAGE_FREE( p_image ); shmctl( p_shm->shmid, IPC_RMID, 0 ); shmdt( p_shm->shmaddr ); - IMAGE_FREE( p_image ); return( NULL ); } diff --git a/src/video_output/video_output.c b/src/video_output/video_output.c index 7091c69b56ce53b740a9452e47f83e719d50ebb3..9af7a3a43dc8750da885d89d01c9b6e0a7461904 100644 --- a/src/video_output/video_output.c +++ b/src/video_output/video_output.c @@ -5,7 +5,7 @@ * thread, and destroy a previously oppened video output thread. ***************************************************************************** * Copyright (C) 2000-2001 VideoLAN - * $Id: video_output.c,v 1.150 2001/12/31 04:53:33 sam Exp $ + * $Id: video_output.c,v 1.151 2002/01/02 14:37:42 sam Exp $ * * Authors: Vincent Seguin <seguin@via.ecp.fr> * @@ -89,7 +89,7 @@ void vout_EndBank ( void ) *****************************************************************************/ vout_thread_t * vout_CreateThread ( int *pi_status, int i_width, int i_height, - int i_chroma, int i_aspect ) + u64 i_chroma, int i_aspect ) { vout_thread_t * p_vout; /* thread descriptor */ int i_status; /* thread status */ @@ -275,14 +275,14 @@ static int InitThread( vout_thread_t *p_vout ) intf_WarnMsg( 1, "vout info: got %i direct buffer(s)", I_OUTPUTPICTURES ); i_pgcd = ReduceHeight( p_vout->render.i_aspect ); - intf_WarnMsg( 1, "vout info: picture in %ix%i, chroma %i, " + intf_WarnMsg( 1, "vout info: picture in %ix%i, chroma 0x%.16llx, " "aspect ratio %i:%i", p_vout->render.i_width, p_vout->render.i_height, p_vout->render.i_chroma, p_vout->render.i_aspect / i_pgcd, VOUT_ASPECT_FACTOR / i_pgcd ); i_pgcd = ReduceHeight( p_vout->output.i_aspect ); - intf_WarnMsg( 1, "vout info: picture out %ix%i, chroma %i, " + intf_WarnMsg( 1, "vout info: picture out %ix%i, chroma 0x%.16llx, " "aspect ratio %i:%i", p_vout->output.i_width, p_vout->output.i_height, p_vout->output.i_chroma, p_vout->output.i_aspect / i_pgcd, diff --git a/src/video_output/vout_pictures.c b/src/video_output/vout_pictures.c index 78ff003f69fbf5c6eb834cad13e58f1b6b1289bf..0eb310b077e9a77df52e964a7ee54fdd5ed851d5 100644 --- a/src/video_output/vout_pictures.c +++ b/src/video_output/vout_pictures.c @@ -2,7 +2,7 @@ * vout_pictures.c : picture management functions ***************************************************************************** * Copyright (C) 2000 VideoLAN - * $Id: vout_pictures.c,v 1.6 2001/12/30 07:09:56 sam Exp $ + * $Id: vout_pictures.c,v 1.7 2002/01/02 14:37:42 sam Exp $ * * Authors: Vincent Seguin <seguin@via.ecp.fr> * Samuel Hocevar <sam@zoy.org> @@ -457,7 +457,9 @@ void vout_AllocatePicture( picture_t *p_picture, /* Calculate coordinates */ switch( i_chroma ) { - case YUV_420_PICTURE: /* YUV 420: 1,1/4,1/4 samples per pixel */ + case FOURCC_YV12: /* YUV 420: 1,1/4,1/4 samples per pixel */ + case FOURCC_I420: + case FOURCC_IYUV: P[ Y_PLANE ].i_bytes = i_width * i_height; P[ Y_PLANE ].i_line_bytes = i_width; P[ U_PLANE ].i_bytes = i_width * i_height / 4; @@ -467,7 +469,7 @@ void vout_AllocatePicture( picture_t *p_picture, p_picture->i_planes = 3; break; - case YUV_422_PICTURE: /* YUV 422: 1,1/2,1/2 samples per pixel */ + case FOURCC_I422: /* YUV 422: 1,1/2,1/2 samples per pixel */ P[ Y_PLANE ].i_bytes = i_width * i_height; P[ Y_PLANE ].i_line_bytes = i_width; P[ U_PLANE ].i_bytes = i_width * i_height / 2; @@ -477,7 +479,7 @@ void vout_AllocatePicture( picture_t *p_picture, p_picture->i_planes = 3; break; - case YUV_444_PICTURE: /* YUV 444: 1,1,1 samples per pixel */ + case FOURCC_I444: /* YUV 444: 1,1,1 samples per pixel */ P[ Y_PLANE ].i_bytes = i_width * i_height; P[ Y_PLANE ].i_line_bytes = i_width; P[ U_PLANE ].i_bytes = i_width * i_height; diff --git a/src/video_output/vout_subpictures.c b/src/video_output/vout_subpictures.c index 99147692b78bb188540a56c8ffc43166e597102f..d533ce38228989ba02bf73a207b84b36f2ecc576 100644 --- a/src/video_output/vout_subpictures.c +++ b/src/video_output/vout_subpictures.c @@ -2,7 +2,7 @@ * vout_subpictures.c : subpicture management functions ***************************************************************************** * Copyright (C) 2000 VideoLAN - * $Id: vout_subpictures.c,v 1.3 2001/12/30 07:09:56 sam Exp $ + * $Id: vout_subpictures.c,v 1.4 2002/01/02 14:37:42 sam Exp $ * * Authors: Vincent Seguin <seguin@via.ecp.fr> * Samuel Hocevar <sam@zoy.org> @@ -530,7 +530,7 @@ static void vout_RenderYUVSPU( const vout_thread_t *p_vout, picture_t *p_pic, int i_x, i_y; - u8 *p_dest = p_pic->planes[ Y_PLANE ].p_data + p_spu->i_x + p_spu->i_width + u8 *p_dest = p_pic->P_Y + p_spu->i_x + p_spu->i_width + p_vout->output.i_width * ( p_spu->i_y + p_spu->i_height ); /* Draw until we reach the bottom of the subtitle */