From: Unknown Date: Fri, 5 Mar 2004 15:20:51 +0000 (+0000) Subject: This commit was manufactured by cvs2svn to create tag 'v0_4_4'. X-Git-Tag: 0.4.4~1 X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=5c77dc27115c869f15fd04d777db272466bd0106;p=vlc This commit was manufactured by cvs2svn to create tag 'v0_4_4'. --- diff --git a/AUTHORS b/AUTHORS index 04cfadccc0..abffc0f3ea 100644 --- a/AUTHORS +++ b/AUTHORS @@ -176,6 +176,10 @@ E: alexis.guillard@bt.com D: IPv6 S: United Kingdom +N: Roine Gustafsson +E: roine@popstar.com +D: spudec bug fixes + N: Shane Harper E: shanegh@optusnet.com.au D: SDL plugin fixes and enhancements @@ -299,6 +303,10 @@ D: Many ports (Mac OS X, iPAQ, *BSD, Solaris...) D: documentation S: France +N: Benjamin Mironer +E: bmironer@noos.fr +D: Mac OS X fixes + N: Arkadiusz Miskiewicz E: misiek@pld.ORG.PL D: autoconf and Makefile patches @@ -320,6 +328,11 @@ E: pomel@via.ecp.fr C: pomel S: France +N: Remco Poortinga +E: poortinga@telin.nl +D: IPv6 multicast patch +S: Netherlands + N: Jean-Paul Saman E: jpsaman@wxs.nl D: libmad plug-in diff --git a/BUGS b/BUGS index e0539322fc..c754a71978 100644 --- a/BUGS +++ b/BUGS @@ -1,4 +1,4 @@ -List of known vlc bugs $Id: BUGS,v 1.13 2002/05/20 22:30:19 sam Exp $ +List of known vlc bugs $Id: BUGS,v 1.13.2.1 2002/07/11 07:58:53 tcastley Exp $ Please try to keep this file up to date. Also, grep for FIXME in the source files for more and more bugs to fix. @@ -36,6 +36,9 @@ Video output: * On-the-fly resizing when using a chroma transformation doesn't work for all plugins. Currently it is only implemented for x11 and SDL. + * The SPU decoder does not respect the pitch of the output buffer. This + causes distortion of subtitles on GeForce cards in BeOS (and Windows I think). + Chroma transformations: * Most chroma transformation modules completely ignore margins. diff --git a/ChangeLog b/ChangeLog index 39cce05722..caf56826ea 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,9 +2,188 @@ # ChangeLog for vlc # #===================# -HEAD +0.4.4 +Sun, 11 Aug 2002 01:18:13 +0200 - * Nothing yet. + * ./src/misc/messages.c: fixed an extremely old buffer overflow. + * ./plugins/spudec/spu_decoder.c: fixed a moronic endianness bug. + * ./plugins/dvd/dvd.c: added a --dvd-css-method config option to the dvd + plugin. + * ./include/threads_funcs.h: fixed the --fast-mutex option. + * ./plugins/directx/vout_directx.*: the directx vout plugin now uses the + IID_IDirectDrawSurface2 interface, this shouldn't break anything and we + should now support WinNT4+DirectX3. Added support for YUY2 overlays because + a few graphics cards only support this. Some code cleanup too. + * ./plugins/directx/vout_events.c: small bugfix. + * ./plugins/network/ipv6.c: attempt to fix the win32 IPv6 implementation. + Multicast should even work (untested) although we'll need to find a way to + replace if_nametoindex() tohave a fully functionnal win32 port. + * ./include/threads.h, ./include/threads_funcs.h: reverted Win32 pthread + implementation to the old code. Fixed vlc_cond_broadcast() for WinNT/2K/XP. + Additional vlc_cond_* implementations for Win9x. + * ./src/interface/main.c: renamed --fast_pthread option into --fast-mutex. + Added a--win9x-cv-method option to choose which vlc_cond_* implementation + we want on Win9x. + * ./plugins/avi/avi.c: kludge to play AVI files created by ffmpeg. + +0.4.3 +Fri, 26 Jul 2002 00:03:13 +0200 + + * ./README.MacOSX.rtf : updated README. + * ./plugins/macosx/vout_macosx.c : additional QuickTime fix, thanks to + David Eldred from Apple. + * ./include/threads_funcs.h: Win32 compilation fix. + * ./plugins/macosx/vout_macosx.m : fixed _the_ bug with QuickTime 6. + * ./plugins/access/http.c: we are now parsing the http return code and + failing cleanly if it is >= 400. + * ./plugins/mpeg_system/mpeg_es.c, ./src/input/input_ext-dec.c: fixed + a deadlock issue with demuxers waiting on p_fifo->data_lock. + * ./src/input/input_ext-plugins.c: fixed a memory leak. + * ./plugins/access/http.c: fixed a bug with HTTP/1.0 servers. + * ./src/interface/main.c: new --mtu option. + * ./configure.in: fixed nanosleep detection on some platforms. + * ./plugins/beos/*: created a wrapper class for VLC functions and + interaction, improved file and disk opening, fixed drag and drop, added + right click menu and always on top mode. + * ./plugins/beos/VideoWindow.h: fixed pop-up menu's radio mode. + * ./plugins/beos/VideoWindow.h: fixed changing workspaces problem. + * ./plugins/beos/VideoWindow.h: added a popup menu to enable changing. + +0.4.2 +Sun, 7 Jul 2002 22:15:33 +0200 + + * ./plugins/beos/VideoWindow.h: changed default bitmap to 16bit to fix + green distortion problem. + * ./plugins/network/ipv6.c: enabled IPv6 multicast support. + * ./plugins/dvd/dvd_es.c: error in selecting SPU stream. + * ./plugins/spudec/spu_decoder.c: endianness fix for subtitles colour. + * ./plugins/spudec/spu_decoder.c: little hack for preventing blank alpha + palette. + * ./plugins/spudec/spu_decoder.c: subtitle transparency support. + * ./plugins/macosx: new controls for audio output, and deinterlacing + support. + * ./plugins/macosx: fixed a bug with language and subtitle menus. + * ./plugins/access/http.c: should be more tolerant with old servers and + non-seekable streams. + * ./plugins/filter/deinterlace.c: backported new deinterlacing routines. + * ./include/threads.h, ./include/threads_funcs.h: backported the new Win32 + cond_wait implementation from MAIN. + * ./plugins/gtk/gnome_callbacks.c: fixed a crash when activating preferences + from the popup menu. + +0.4.1 +Mon, 3 Jun 2002 23:43:35 +0200 + + * ./plugins/gtk/gnome.glade: added lines this #@%$! Glade had munched, fixes + a segfault in the Gnome popup menu when toggling the interface. + * ./configure.in, ./plugins/mpeg_system/mpeg_ts.c: fixed libdvbpsi handling. + * ./src/misc/configuration.c: fixed the --nofoo option handling. + * ./src/interface/main.c: fixed two compilation warnings under Solaris. + * ./plugins/avi/avi.c, ./plugins/mpeg_system/mpeg_audio.c: ES will be + selected only once. + * ./plugins/win32/waveout.c: waveOutUnprepareHeader() was never being + called. This should fix the memory leak some people reported when using + the waveout plugin. + * ./src/misc/netutils.c: factored code common to the interfaces into the + network_ChannelJoin function. + * ./plugins/mga/xmga.c, ./plugins/x11/xcommon.c, ./plugins/sdl/vout_sdl.c, + ./plugins/directx/vout_events.c: we can now use keys F1 to F12 to switch + channels from the video output window. + * ./plugins/motion/motionmmx.c: MMX motion optimizations courtesy of + Vladimir Chernyshov . + * ./plugins/dvdread/dvdread.c: disabled the dvdread plugin because it + currently sucks. + * ./src/misc/configuration.c, ./src/interface/main.c: we now accept --nofoo + and --no-foo as negations for --foo. Also, the --help output is nicer. + * ./plugins/macosx/*: rewrote the net panel for OS X + * ./plugins/qnx/vout_qnx.c: QNX compilation fix. + * ./plugins/spudec/spu_decoder.c: fixed a margin bug in the SPU renderer + which caused subtitles to appear slanted in odd width windows. + * ./plugins/gtk/gtk_display.c, ./plugins/win32/mainframe.cpp: we deactivate + popup menus when no stream is being played, even in network mode. + * ./src/input/mpeg_system.c: removed unnecessarily verbose message. + * ./src/video_output/video_output.c: fixed the "picture has invalid status" + bug which might have been the cause of crashes. + * ./plugins/filter/crop.c: attempt at an automatic border cropping filter, + using "--filter crop --autocrop". + * ./vlc.spec: added missing filters to the RPM generation. + * ./plugins/macosx/*: channel change support on Mac OS X. + * ./extras/MacOSX/Resources/vlc.icns: new OS X icon, courtesy of Benjamin + Mironer . + * ./plugins/filter/crop.c: crop filter. Usage examples: + --filter crop --crop-geometry 640x480 + --filter crop --crop-geometry 320x200+10+10 + * ./plugins/macosx/intf_vlc_wrapper.m: fixed a bug in the chapter handling. + * ./plugins/macosx/vout_vlc_wrapper.m: more keystrokes. + * ./plugins/chroma/i420_yuy2.h: simplified the chroma code. Please test + under BeOS and QNX. + * ./plugins/macosx/intf_vlc_wrapper.m: fix for non-ASCII filenames in the + MacOS X interface, courtesy of Watanabe Go . + * ./plugins/chroma/i420_yuy2.h: fixed an old overflow bug spotted by + Rudolf Cornelissen. + * ./plugins/chroma/i420_rgb16.c: fix for skewed display in software RV32 + mode, courtesy of Pascal Levesque. + * ./plugins/beos/InterfaceWindow.h: stopped more than one playlist being + opened. + * ./plugins/beos/InterfaceWindow.cpp: fixed segfault on exit with playlist + open. + * ./plugins/beos/vout_beos.cpp: corrected size of output window. + * ./plugins/a52/a52.c, ./plugins/satellite/satellite_tools.c: compilation + fixes for Solaris. + * ./plugins/sdl/aout_sdl.c: fixed an endianness issue created by a + brain-dead developer :p + * ./plugins/win32/mainframe.cpp: the "Eject" button is enabled only after we + played a dvd or vcd. + * ./plugins/win32/mainframe.cpp: the toolbar is now flat and less cubist. + * ./plugins/win32/mainframe.cpp: got rid of the ugly slider with some winXP + skins. + * ./plugins/win32/messages.cpp: added a config option to limit the number of + messages in the log window (default is set to 500). + * ./plugins/mpeg_vdec/vpar_headers.c: don't try to deference a null + pointer. + * ./plugins/gtk/gnome.c: compilation fix. + * ./src/misc/netutils.c: removed the obsolete artificial delay when switching + channels. + * ./src/interface/intf_eject.c: added ejection code for Win32. + * ./plugins/win32/*: enabled the "Eject" button (thanks Ipkiss). + * ./include/configuration.h: changed ADD_BOOL and ADD_BOOL_WITH_SHORT config + macros to accept a default value as an argument. + * ./src/misc/configuration.c: modified the command line parsing to accept + --foo and --no-foo when a "foo" boolean config option is defined. + * ./src/interface/main.c: modified the help menu to indicate whether the + option is enabled or disabled by default. + * ./src/video_output/video_output.c: when the video output hasn't received + a new picture for a while, it redisplays the last displayed one. This will + be useful for DVD menus, but also solves the "picture becomes black when + vlc is paused" issue. + * ./plugins/dummy/dummy.c: added a CATEGORY_HINT to the config. + * ./plugins/x11/xcommon.c: small change to the ToggleFullscreen routine + to avoid a flickering during the switch. + * ./plugins/filters/*: fixed inconsistencies. + * ./plugins/win32/mainframe.dfm: new icons for the toolbar buttons. + * ./plugins/win32/network.cpp: URL can now start with "http://" in the + Network dialog box. + * ./plugins/win32/about.dfm: updated the About dialog box. + * ./include/video.h: added a b_force flag to picture_t so that we can force + the display of an image even if it is late. + * ./plugins/filter/*: filters are now configurable through the configuration + system. Patch from Sigmund Augdal . + * ./po/vlc.pot: updated potfile. + * ./po/pl.po: polish translation, courtesy of Arkadiusz Lipiec + . + * ./debian/control: updated Debian package descriptions. + * ./plugins/aa/aa.c: removed all palette code as it was unused. + * ./plugins/aa/aa.c: moved the aa_fastrender call from vout_Display to + vout_Render. + * ./plugins/aa/aa.c: added support for resizing and right-click menu. + * ./src/input/mpeg_system.c: in order to make ac3 working in avi file, moved + some code from ac3 decoder to mpeg_system.c. (skip 3 bytes is now done in + mpeg_system.c and no longer in ac3 audio decoder). + * src/misc/netutils.c: tests if message from vlcs begins with 'E:' or 'I:' + instead of testing 'E: ' and 'I: ' (to simplify miniVLCS). + * ./plugins/avi/avi.c, ./plugins/avi/libioRIFF.c: added more safety tests. + * ./include/inpu_ext-dec.h: added a check to fifo->b_die after the call + to BitstreamNextDataPacket() in GetChunk(). 0.4.0 Thu, 23 May 2002 01:27:05 +0200 diff --git a/Makefile b/Makefile index 469a6659fa..52778ca03d 100644 --- a/Makefile +++ b/Makefile @@ -102,6 +102,7 @@ PLUGINS_TARGETS := a52/a52 \ filter/filter_distort \ filter/filter_wall \ filter/filter_clone \ + filter/filter_crop \ fx/fx_scope \ ggi/ggi \ glide/glide \ @@ -368,7 +369,7 @@ dist: for i in Makefile.in.in POTFILES.in ; do cp po/$$i tmp/vlc/po ; done # Copy misc files cp FAQ AUTHORS COPYING TODO todo.pl ChangeLog* README* INSTALL* \ - ABOUT-NLS BUGS MODULES vlc.spec \ + ABOUT-NLS BUGS plugins/LIST vlc.spec \ Makefile Makefile.*.in Makefile.dep Makefile.modules \ configure configure.in install-sh install-win32 macosx-dmg \ config.sub config.guess aclocal.m4 mkinstalldirs \ diff --git a/README.MacOSX.rtf b/README.MacOSX.rtf index f0efcc283a..674c74b6d4 100644 --- a/README.MacOSX.rtf +++ b/README.MacOSX.rtf @@ -1 +1,77 @@ -{\rtf1\mac\ansicpg10000\cocoartf100 {\fonttbl\f0\fswiss\fcharset77 Helvetica;\f1\fswiss\fcharset77 Helvetica-Bold;\f2\fmodern\fcharset77 Courier; } {\colortbl;\red255\green255\blue255;} \margl1440\margr1440\vieww11240\viewh10380\viewkind0 \hyphauto1\hyphfactor90 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc \f0\fs48 \cf0 VideoLAN Client (VLC) version 0.4\ Mac OS X-specific information \fs24 \ \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural \cf0 \ \ \pard\tx1440\tx2880\tx4320\tx5760\tx7200\qj \cf0 Welcome to the VideoLAN Client ! VLC is a multi-purpose mutimedia tool : it can play DVDs and VCDs, or read a stream from the network. It also supports DivX/MPEG-4 files and is unaffected by the dreaded .avi bug which can cause choppy sound when playing DivX in Quicktime. VLC has originally been developed for GNU/Linux systems, but has been ported to numerous operating systems, including Mac OS X and Win32. The Mac OS X port is a bit young and immature, as you will notice, and there are many caveats. We are working hard to improve it, and if you think you can help us in any way, please drop us a line.\ \ You may find the following frequentely asked questions useful :\ \ \f1\b \ul 1. How do I install ? \f0\b0 \ulnone \ When you download VLC, you will end up with a vlc-0.4.0.dmg file. Doubleclick, or drop it on the application Disk Copy, to open this file. An icon will now appear on your Desktop, right beside your drive(s). Open it and drag the vlc application from the resulting window to the place where you want to install it. Most often this is /Applications.\ \ \ \f1\b \ul 2. How do use VLC? \f0\b0 \ulnone \ To use VLC, you will need to open the application first and then from the "File" menu open the file or disk, you would like to view. Doubleclicking a file will result in Quicktime trying to open it and Quicktime can not benefit from the advantages VLC brings.\ \f1\b \ul \ \ 3. How do I read an SVCD ? \f0\b0 \ulnone \ VLC is currently unable to read SVCD directly from the drive. SVCDs contain plain MPEG-2 files which can be directly read. Just copy the .dat files in the SVCD onto your hard drive, and use the "Open File" menu item in VLC (drag and drop doesn't work yet).\ \ \ \f1\b \ul 4. The video is choppy ! It's like we're dropping frames\ \f0\b0 \ulnone That's the normal behavior when the CPU isn't fast enough to decode all frames. Though there is some room for improvement, do never expect VLC to be able to decode MPEG-2 streams on a low-end G3 machine. Apple DVD player uses specific hardware accelerations from the video board of those systems, and we currently lack documentation to do the same. If you think you have information which might help us, please contact us, otherwise please don't complain about this.\ \ If VLC is slow on your G4 system, try and quit or hide all running applications. See with \f2 top -u \f0 in a terminal window which applications take the CPU. Minimizing the VLC controller window might help, too. Be aware of bouncing icons in the dock. Bounces seriously effect the performance of VLC. The same goes for any time interval process (Checking mail every 2 minutes).\ \ \ \f1\b \ul 5. I only get a black picture !\ \f0\b0 \ulnone We haven't found the reason why some people get this problem. However, users have indicated a workaround : switch your screen depth to thousands of colors instead of millions. If you think you have information to help us find the bug, please drop us a mail.\ \ \ \f1\b \ul 6. How do I hide the mouse cursor ? \f0\b0 \ulnone \ Just double-click on the movie.\ \ \ \f1\b \ul 7. How do remove VLC ? \f0\b0 \ulnone \ Simply drag VLC from the place where you have installed it, to the Trash.\ \ \ Thanks for reading this file. For additional information, subscribe to the vlc mailing list on \ul http://www.videolan.org/.\ulnone \ -- \ Christophe Massiot , for the VideoLAN team.\ $Id: README.MacOSX.rtf,v 1.3 2002/05/23 21:42:43 massiot Exp $} \ No newline at end of file +{\rtf1\mac\ansicpg10000\cocoartf100 +{\fonttbl\f0\fswiss\fcharset77 Helvetica;\f1\fswiss\fcharset77 Helvetica-Bold;\f2\fmodern\fcharset77 Courier; +} +{\colortbl;\red255\green255\blue255;} +\margl1440\margr1440\vieww11240\viewh10380\viewkind0 +\hyphauto1\hyphfactor90 +\pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc + +\f0\fs48 \cf0 VideoLAN Client (VLC) version 0.4\ +Mac OS X-specific information +\fs24 \ +\pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural +\cf0 \ +\ +\pard\tx1440\tx2880\tx4320\tx5760\tx7200\qj +\cf0 Welcome to the VideoLAN Client ! VLC is a multi-purpose mutimedia tool : it can play DVDs and VCDs, or read a stream from the network. It also supports DivX/MPEG-4 files and is unaffected by the dreaded .avi bug which can cause choppy sound when playing DivX in Quicktime. VLC has originally been developed for GNU/Linux systems, but has been ported to numerous operating systems, including Mac OS X and Win32. The Mac OS X port is a bit young and immature, as you will notice, and there are many caveats. We are working hard to improve it, and if you think you can help us in any way, please drop us a line.\ +\ +You may find the following frequentely asked questions useful :\ +\ + +\f1\b \ul 1. How do I install ? +\f0\b0 \ulnone \ +When you download VLC, you will end up with a vlc-0.4.3.dmg file. Double-click, or drop it on the application Disk Copy, to open this file. An icon will now appear on your Desktop, right beside your drive(s). Open it and drag the vlc application from the resulting window to the place where you want to install it. Most often this is /Applications.\ +\ +\ + +\f1\b \ul 2. How do use VLC? +\f0\b0 \ulnone \ +To use VLC, you will need to open the application first and then from the "File" menu open the file or disk, you would like to view. Doubleclicking a file will result in QuickTime Player trying to open it and QuickTime Player can not benefit from the advantages VLC brings.\ + +\f1\b \ul \ +\ +3. How do I read an SVCD ? +\f0\b0 \ulnone \ +VLC is currently unable to read SVCD directly from the drive. SVCDs contain plain MPEG-2 files which can be directly read. Just copy the .dat files in the SVCD onto your hard drive, and use the "Open File" menu item in VLC (drag and drop doesn't work yet). Some SVCDs can be read if you tell VLC they're VCDs, in the "Open Disc" dialog.\ +\ +\ + +\f1\b \ul 4. The video is choppy ! It's like we're dropping frames\ + +\f0\b0 \ulnone That's the normal behavior when the CPU isn't fast enough to decode all frames. Though there is some room for improvement, do never expect VLC to be able to decode MPEG-2 streams on a low-end G3 machine. Apple DVD player uses specific hardware accelerations from the video board of those systems, and we currently lack documentation to do the same. If you think you have information which might help us, please contact us, otherwise please don't complain about this.\ +\ +If VLC is slow on your G4 system, try and quit or hide all running applications. See with +\f2 top -u +\f0 in a terminal window which applications take the CPU. Minimizing the VLC controller window might help, too. Be aware of bouncing icons in the dock. Bounces seriously effect the performance of VLC. The same goes for any time interval process (Checking mail every 2 minutes).\ +\ +\ + +\f1\b \ul 5. How do I hide the mouse cursor ? +\f0\b0 \ulnone \ +Just double-click on the movie.\ +\ +\ + +\f1\b \ul 6. How do I remove VLC ? +\f0\b0 \ulnone \ +Simply drag VLC from the place where you have installed it, to the Trash.\ +\ +\ + +\f1\b \ul 7. Where can I find an older version for Mac OS 9 ?\ + +\f0\b0 \ulnone There is no version for Mac OS 9. VLC is originally a UNIX application and has never been ported to Mac OS 9. Considering the amount of differences between Mac OS 9 and modern systems, it would require a tremendous work to port VLC. We do not plan to do it. So please don't ask.\ +\ +\ + +\f1\b \ul 8. How do I enable deinterlacing ?\ + +\f0\b0 \ulnone You must select the "Deinterlace" menu item +\f1\b before +\f0\b0 opening any file. If the item is selected while reading a file, nothing will happen. This is a known issue, please do not report it.\ +\ +\ +Thanks for reading this file. For additional information, subscribe to the vlc mailing list on \ul http://www.videolan.org/.\ulnone \ +-- \ +Christophe Massiot , for the VideoLAN team.\ +$Id: README.MacOSX.rtf,v 1.3.2.4 2002/07/25 22:46:26 massiot Exp $} \ No newline at end of file diff --git a/TODO b/TODO index 3545c770d1..2b424a5aee 100644 --- a/TODO +++ b/TODO @@ -47,7 +47,7 @@ Urgency: Wishlist Description: Share stream information between vlc and vls vls should send misc TS packets to let us know what the stream PID contain, such as the language, or the subtitle palette. -Status: Todo +Status: Done (collective work) Task: 0x59 Difficulty: Hard @@ -137,7 +137,7 @@ Description: Fix all known DVD playback issues A few DVDs are still reported not to work at all. Try to find what is causing this, have a more robust DVD input, and list all discs reported to work flawlessly to prevent bug regression. -Status: Todo +Status: Done (collective work) Task: 0x4e Difficulty: Hard @@ -169,7 +169,7 @@ Urgency: Normal Description: Write AVI input plugin .avi files can use MPEG codec, if this is the case it shouldn't be hard to read those files -> Meuuh -Status: Todo +Status: Done 23 Apr 2002 (fenrir) Task: 0x4a Difficulty: Medium @@ -459,7 +459,7 @@ Difficulty: Hard Urgency: Wishlist Description: MP3 support The vlc cannot play MPEG1/2 layer 3 yet. It might be nice to fix that. -Status: Todo +Status: Done 10 May 2002 (fenrir) Task: 0x25 Difficulty: Hard diff --git a/configure b/configure index 4177fe5564..9522967f22 100755 --- a/configure +++ b/configure @@ -48,6 +48,8 @@ ac_help="$ac_help --enable-dvbpsi dvbpsi ts demux module (default disabled)" ac_help="$ac_help --with-dvbpsi=PATH libdvbpsi headers and libraries" +ac_help="$ac_help + --with-dvbpsi-tree=PATH libdvbpsi tree for static linking" ac_help="$ac_help --enable-vcd VCD support for Linux, FreeBSD and MacOS X (default enabled)" ac_help="$ac_help @@ -710,7 +712,7 @@ else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; } fi echo $ac_n "checking host system type""... $ac_c" 1>&6 -echo "configure:714: checking host system type" >&5 +echo "configure:716: checking host system type" >&5 host_alias=$host case "$host_alias" in @@ -731,7 +733,7 @@ host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` echo "$ac_t""$host" 1>&6 echo $ac_n "checking target system type""... $ac_c" 1>&6 -echo "configure:735: checking target system type" >&5 +echo "configure:737: checking target system type" >&5 target_alias=$target case "$target_alias" in @@ -749,7 +751,7 @@ target_os=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` echo "$ac_t""$target" 1>&6 echo $ac_n "checking build system type""... $ac_c" 1>&6 -echo "configure:753: checking build system type" >&5 +echo "configure:755: checking build system type" >&5 build_alias=$build case "$build_alias" in @@ -773,7 +775,7 @@ test "$host_alias" != "$target_alias" && PACKAGE="vlc" -VERSION="0.4.0" +VERSION="0.4.4" CODENAME=Ourumov save_CFLAGS="${CFLAGS}" @@ -781,7 +783,7 @@ save_CPPFLAGS="${CPPFLAGS}" save_LDFLAGS="${LDFLAGS}" echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6 -echo "configure:785: checking whether ${MAKE-make} sets \${MAKE}" >&5 +echo "configure:787: 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 @@ -810,7 +812,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:814: checking for $ac_word" >&5 +echo "configure:816: 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 @@ -840,7 +842,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:844: checking for $ac_word" >&5 +echo "configure:846: 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 @@ -891,7 +893,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:895: checking for $ac_word" >&5 +echo "configure:897: 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 @@ -923,7 +925,7 @@ fi fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:927: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:929: 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. @@ -934,12 +936,12 @@ cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext << EOF -#line 938 "configure" +#line 940 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:943: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:945: \"$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 @@ -965,12 +967,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:969: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:971: 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:974: checking whether we are using GNU C" >&5 +echo "configure:976: 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 @@ -979,7 +981,7 @@ else yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:983: \"$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:985: \"$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 @@ -998,7 +1000,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:1002: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:1004: 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 @@ -1030,7 +1032,7 @@ else fi echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:1034: checking how to run the C preprocessor" >&5 +echo "configure:1036: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -1045,13 +1047,13 @@ else # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1055: \"$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 : @@ -1062,13 +1064,13 @@ else rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1072: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1074: \"$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 : @@ -1079,13 +1081,13 @@ else rm -rf conftest* CPP="${CC-cc} -nologo -E" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1089: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1091: \"$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 : @@ -1119,7 +1121,7 @@ fi # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. set dummy ${ac_tool_prefix}ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1123: checking for $ac_word" >&5 +echo "configure:1125: 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 @@ -1151,7 +1153,7 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1155: checking for $ac_word" >&5 +echo "configure:1157: 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 @@ -1186,7 +1188,7 @@ fi # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. set dummy ${ac_tool_prefix}strip; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1190: checking for $ac_word" >&5 +echo "configure:1192: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1218,7 +1220,7 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "strip", so it can be a program name with args. set dummy strip; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1222: checking for $ac_word" >&5 +echo "configure:1224: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1254,7 +1256,7 @@ fi # Extract the first word of "gmake", so it can be a program name with args. set dummy gmake; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1258: checking for $ac_word" >&5 +echo "configure:1260: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_GMAKE'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1289,7 +1291,7 @@ fi if test "x$GMAKE" = "xno"; then echo $ac_n "checking whether GNU make is installed""... $ac_c" 1>&6 -echo "configure:1293: checking whether GNU make is installed" >&5 +echo "configure:1295: checking whether GNU make is installed" >&5 if eval "test \"`echo '$''{'ac_cv_gmake'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1321,7 +1323,7 @@ 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:1325: checking for $ac_word" >&5 +echo "configure:1327: 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 @@ -1350,7 +1352,7 @@ fi echo $ac_n "checking for strerror in -lcposix""... $ac_c" 1>&6 -echo "configure:1354: checking for strerror in -lcposix" >&5 +echo "configure:1356: 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 @@ -1358,7 +1360,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lcposix $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1375: \"$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 @@ -1392,12 +1394,12 @@ fi echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:1396: checking for ANSI C header files" >&5 +echo "configure:1398: checking for ANSI C header files" >&5 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -1405,7 +1407,7 @@ else #include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1409: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1411: \"$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* @@ -1422,7 +1424,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 @@ -1440,7 +1442,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 @@ -1461,7 +1463,7 @@ if test "$cross_compiling" = yes; then : else cat > conftest.$ac_ext < #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -1472,7 +1474,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2); exit (0); } EOF -if { (eval echo configure:1476: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:1478: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -1496,12 +1498,12 @@ EOF fi echo $ac_n "checking for working const""... $ac_c" 1>&6 -echo "configure:1500: checking for working const" >&5 +echo "configure:1502: checking for working const" >&5 if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1556: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_const=yes else @@ -1571,21 +1573,21 @@ EOF fi echo $ac_n "checking for inline""... $ac_c" 1>&6 -echo "configure:1575: checking for inline" >&5 +echo "configure:1577: checking for inline" >&5 if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_cv_c_inline=no for ac_kw in inline __inline__ __inline; do cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1591: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_inline=$ac_kw; break else @@ -1611,12 +1613,12 @@ EOF esac echo $ac_n "checking for off_t""... $ac_c" 1>&6 -echo "configure:1615: checking for off_t" >&5 +echo "configure:1617: checking for off_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_off_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -1644,12 +1646,12 @@ EOF fi echo $ac_n "checking for size_t""... $ac_c" 1>&6 -echo "configure:1648: checking for size_t" >&5 +echo "configure:1650: checking for size_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -1679,19 +1681,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:1683: checking for working alloca.h" >&5 +echo "configure:1685: checking for working alloca.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_alloca_h'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { char *p = alloca(2 * sizeof(int)); ; return 0; } EOF -if { (eval echo configure:1695: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1697: \"$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 @@ -1712,12 +1714,12 @@ EOF fi echo $ac_n "checking for alloca""... $ac_c" 1>&6 -echo "configure:1716: checking for alloca" >&5 +echo "configure:1718: checking for alloca" >&5 if eval "test \"`echo '$''{'ac_cv_func_alloca_works'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1751: \"$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 @@ -1777,12 +1779,12 @@ EOF echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6 -echo "configure:1781: checking whether alloca needs Cray hooks" >&5 +echo "configure:1783: checking whether alloca needs Cray hooks" >&5 if eval "test \"`echo '$''{'ac_cv_os_cray'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&6 if test $ac_cv_os_cray = yes; then for ac_func in _getb67 GETB67 getb67; do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:1811: checking for $ac_func" >&5 +echo "configure:1813: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1841: \"$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 @@ -1862,7 +1864,7 @@ done fi echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6 -echo "configure:1866: checking stack direction for C alloca" >&5 +echo "configure:1868: 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 @@ -1870,7 +1872,7 @@ else ac_cv_c_stack_direction=0 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:1895: \"$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 @@ -1914,17 +1916,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:1918: checking for $ac_hdr" >&5 +echo "configure:1920: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1928: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1930: \"$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* @@ -1953,12 +1955,12 @@ done for ac_func in getpagesize do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:1957: checking for $ac_func" >&5 +echo "configure:1959: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1987: \"$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 @@ -2006,7 +2008,7 @@ fi done echo $ac_n "checking for working mmap""... $ac_c" 1>&6 -echo "configure:2010: checking for working mmap" >&5 +echo "configure:2012: 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 @@ -2014,7 +2016,7 @@ else ac_cv_func_mmap_fixed_mapped=no else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2160: \"$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 @@ -2178,12 +2180,12 @@ fi echo $ac_n "checking whether we are using the GNU C Library 2.1 or newer""... $ac_c" 1>&6 -echo "configure:2182: checking whether we are using the GNU C Library 2.1 or newer" >&5 +echo "configure:2184: 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 < @@ -2219,17 +2221,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:2223: checking for $ac_hdr" >&5 +echo "configure:2225: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2233: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2235: \"$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* @@ -2260,12 +2262,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:2264: checking for $ac_func" >&5 +echo "configure:2266: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2294: \"$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 @@ -2328,7 +2330,7 @@ fi echo $ac_n "checking for iconv""... $ac_c" 1>&6 -echo "configure:2332: checking for iconv" >&5 +echo "configure:2334: checking for iconv" >&5 if eval "test \"`echo '$''{'am_cv_func_iconv'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2336,7 +2338,7 @@ else am_cv_func_iconv="no, consider installing GNU libiconv" am_cv_lib_iconv=no cat > conftest.$ac_ext < #include @@ -2346,7 +2348,7 @@ iconv_t cd = iconv_open("",""); iconv_close(cd); ; return 0; } EOF -if { (eval echo configure:2350: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2352: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* am_cv_func_iconv=yes else @@ -2358,7 +2360,7 @@ rm -f conftest* am_save_LIBS="$LIBS" LIBS="$LIBS -liconv" cat > conftest.$ac_ext < #include @@ -2368,7 +2370,7 @@ iconv_t cd = iconv_open("",""); iconv_close(cd); ; 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:2374: \"$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 @@ -2389,13 +2391,13 @@ echo "$ac_t""$am_cv_func_iconv" 1>&6 EOF echo $ac_n "checking for iconv declaration""... $ac_c" 1>&6 -echo "configure:2393: checking for iconv declaration" >&5 +echo "configure:2395: 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 < @@ -2414,7 +2416,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:2418: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2420: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* am_cv_proto_iconv_arg1="" else @@ -2443,19 +2445,19 @@ EOF echo $ac_n "checking for nl_langinfo and CODESET""... $ac_c" 1>&6 -echo "configure:2447: checking for nl_langinfo and CODESET" >&5 +echo "configure:2449: checking for nl_langinfo and CODESET" >&5 if eval "test \"`echo '$''{'am_cv_langinfo_codeset'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { char* cs = nl_langinfo(CODESET); ; return 0; } EOF -if { (eval echo configure:2459: \"$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* am_cv_langinfo_codeset=yes else @@ -2478,19 +2480,19 @@ EOF if test $ac_cv_header_locale_h = yes; then echo $ac_n "checking for LC_MESSAGES""... $ac_c" 1>&6 -echo "configure:2482: checking for LC_MESSAGES" >&5 +echo "configure:2484: checking for LC_MESSAGES" >&5 if eval "test \"`echo '$''{'am_cv_val_LC_MESSAGES'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { return LC_MESSAGES ; return 0; } EOF -if { (eval echo configure:2494: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2496: \"$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 @@ -2511,7 +2513,7 @@ EOF fi fi echo $ac_n "checking whether NLS is requested""... $ac_c" 1>&6 -echo "configure:2515: checking whether NLS is requested" >&5 +echo "configure:2517: 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" @@ -2533,7 +2535,7 @@ fi EOF echo $ac_n "checking whether included gettext is requested""... $ac_c" 1>&6 -echo "configure:2537: checking whether included gettext is requested" >&5 +echo "configure:2539: 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" @@ -2553,17 +2555,17 @@ fi ac_safe=`echo "libintl.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for libintl.h""... $ac_c" 1>&6 -echo "configure:2557: checking for libintl.h" >&5 +echo "configure:2559: checking for libintl.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2567: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2569: \"$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* @@ -2580,12 +2582,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:2584: checking for GNU gettext in libc" >&5 +echo "configure:2586: checking for GNU gettext in libc" >&5 if eval "test \"`echo '$''{'gt_cv_func_gnugettext1_libc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < extern int _nl_msg_cat_cntr; @@ -2594,7 +2596,7 @@ bindtextdomain ("", ""); return (int) gettext ("") + _nl_msg_cat_cntr ; return 0; } EOF -if { (eval echo configure:2598: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2600: \"$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 @@ -2610,14 +2612,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:2614: checking for GNU gettext in libintl" >&5 +echo "configure:2616: checking for GNU gettext in libintl" >&5 if eval "test \"`echo '$''{'gt_cv_func_gnugettext1_libintl'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else gt_save_LIBS="$LIBS" LIBS="$LIBS -lintl $LIBICONV" cat > conftest.$ac_ext < extern int _nl_msg_cat_cntr; @@ -2626,7 +2628,7 @@ bindtextdomain ("", ""); return (int) gettext ("") + _nl_msg_cat_cntr ; return 0; } EOF -if { (eval echo configure:2630: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2632: \"$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 @@ -2659,12 +2661,12 @@ EOF for ac_func in dcgettext do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:2663: checking for $ac_func" >&5 +echo "configure:2665: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2693: \"$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 @@ -2716,7 +2718,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:2720: checking for $ac_word" >&5 +echo "configure:2722: 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 @@ -2750,7 +2752,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:2754: checking for $ac_word" >&5 +echo "configure:2756: 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 @@ -2787,7 +2789,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:2791: checking for $ac_word" >&5 +echo "configure:2793: 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 @@ -2837,7 +2839,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:2841: checking for $ac_word" >&5 +echo "configure:2843: 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 @@ -2871,7 +2873,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:2875: checking for $ac_word" >&5 +echo "configure:2877: 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 @@ -2907,7 +2909,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:2911: checking for $ac_word" >&5 +echo "configure:2913: 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 @@ -2978,7 +2980,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:2982: checking for $ac_word" >&5 +echo "configure:2984: 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 @@ -3011,7 +3013,7 @@ done ac_verc_fail=yes else echo $ac_n "checking version of bison""... $ac_c" 1>&6 -echo "configure:3015: checking version of bison" >&5 +echo "configure:3017: 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;; @@ -3058,7 +3060,7 @@ echo "configure:3015: checking version of bison" >&5 LINGUAS= else echo $ac_n "checking for catalogs to be installed""... $ac_c" 1>&6 -echo "configure:3062: checking for catalogs to be installed" >&5 +echo "configure:3064: checking for catalogs to be installed" >&5 NEW_LINGUAS= for presentlang in $ALL_LINGUAS; do useit=no @@ -3110,7 +3112,7 @@ echo "configure:3062: 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:3114: checking for a BSD compatible install" >&5 +echo "configure:3116: 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 @@ -3189,7 +3191,7 @@ case x"${target_os}" in # 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:3193: checking for $ac_word" >&5 +echo "configure:3195: 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 @@ -3221,7 +3223,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:3225: checking for $ac_word" >&5 +echo "configure:3227: 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 @@ -3288,15 +3290,15 @@ fi save_CFLAGS="${save_CFLAGS} -DSYS_`echo ${SYS} | sed -e 's/-.*//' | tr 'abcdefghijklmnopqrstuvwxyz.' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ_'`" -for ac_func in gettimeofday select strerror strtod strtol isatty vasprintf swab sigrelse getpwuid memalign posix_memalign gethostbyname2 +for ac_func in gettimeofday select strerror strtod strtol isatty vasprintf swab sigrelse getpwuid memalign posix_memalign gethostbyname2 atoll do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:3295: checking for $ac_func" >&5 +echo "configure:3297: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3325: \"$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 @@ -3345,12 +3347,12 @@ done echo $ac_n "checking for connect""... $ac_c" 1>&6 -echo "configure:3349: checking for connect" >&5 +echo "configure:3351: checking for connect" >&5 if eval "test \"`echo '$''{'ac_cv_func_connect'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3379: \"$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 @@ -3392,7 +3394,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6 -echo "configure:3396: checking for connect in -lsocket" >&5 +echo "configure:3398: 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 @@ -3400,7 +3402,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lsocket $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3417: \"$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 @@ -3436,12 +3438,12 @@ fi fi echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6 -echo "configure:3440: checking for gethostbyname" >&5 +echo "configure:3442: checking for gethostbyname" >&5 if eval "test \"`echo '$''{'ac_cv_func_gethostbyname'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3470: \"$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 @@ -3483,7 +3485,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6 -echo "configure:3487: checking for gethostbyname in -lnsl" >&5 +echo "configure:3489: 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 @@ -3491,7 +3493,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lnsl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3508: \"$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 @@ -3526,12 +3528,12 @@ fi fi echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6 -echo "configure:3530: checking for gethostbyname" >&5 +echo "configure:3532: checking for gethostbyname" >&5 if eval "test \"`echo '$''{'ac_cv_func_gethostbyname'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3560: \"$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 @@ -3573,7 +3575,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for gethostbyname in -lbind""... $ac_c" 1>&6 -echo "configure:3577: checking for gethostbyname in -lbind" >&5 +echo "configure:3579: checking for gethostbyname in -lbind" >&5 ac_lib_var=`echo bind'_'gethostbyname | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3581,7 +3583,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lbind $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3598: \"$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 @@ -3615,60 +3617,56 @@ fi fi -for ac_func in nanosleep -do -echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:3622: checking for $ac_func" >&5 -if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then +have_nanosleep=0 +echo $ac_n "checking for nanosleep""... $ac_c" 1>&6 +echo "configure:3623: 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 < /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ -char $ac_func(); +char nanosleep(); int main() { /* The GNU C library defines this for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ -#if defined (__stub_$ac_func) || defined (__stub___$ac_func) +#if defined (__stub_nanosleep) || defined (__stub___nanosleep) choke me #else -$ac_func(); +nanosleep(); #endif ; return 0; } EOF -if { (eval echo configure:3650: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3651: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* - eval "ac_cv_func_$ac_func=yes" + eval "ac_cv_func_nanosleep=yes" else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 rm -rf conftest* - eval "ac_cv_func_$ac_func=no" + eval "ac_cv_func_nanosleep=no" fi rm -f conftest* fi -if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then +if eval "test \"`echo '$ac_cv_func_'nanosleep`\" = yes"; then echo "$ac_t""yes" 1>&6 - ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` - cat >> confdefs.h <&6 -echo $ac_n "checking for nanosleep in -lrt""... $ac_c" 1>&6 -echo "configure:3672: checking for nanosleep in -lrt" >&5 + + echo $ac_n "checking for nanosleep in -lrt""... $ac_c" 1>&6 +echo "configure:3670: 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 @@ -3676,7 +3674,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lrt $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3689: \"$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 @@ -3702,11 +3700,11 @@ LIBS="$ac_save_LIBS" fi if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then echo "$ac_t""yes" 1>&6 - vlc_LDFLAGS="${vlc_LDFLAGS} -lrt" + vlc_LDFLAGS="${vlc_LDFLAGS} -lrt"; have_nanosleep=1 else echo "$ac_t""no" 1>&6 echo $ac_n "checking for nanosleep in -lposix4""... $ac_c" 1>&6 -echo "configure:3710: checking for nanosleep in -lposix4" >&5 +echo "configure:3708: 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 @@ -3714,7 +3712,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lposix4 $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3727: \"$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 @@ -3740,7 +3738,7 @@ LIBS="$ac_save_LIBS" fi if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then echo "$ac_t""yes" 1>&6 - vlc_LDFLAGS="${vlc_LDFLAGS} -lposix4" + vlc_LDFLAGS="${vlc_LDFLAGS} -lposix4"; have_nanosleep=1 else echo "$ac_t""no" 1>&6 fi @@ -3750,15 +3748,20 @@ fi fi -done +if test x$have_nanosleep = x1; then + cat >> confdefs.h <<\EOF +#define HAVE_NANOSLEEP 1 +EOF + +fi echo $ac_n "checking for inet_aton""... $ac_c" 1>&6 -echo "configure:3757: checking for inet_aton" >&5 +echo "configure:3760: 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 <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3788: \"$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 @@ -3800,7 +3803,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for inet_aton in -lresolv""... $ac_c" 1>&6 -echo "configure:3804: checking for inet_aton in -lresolv" >&5 +echo "configure:3807: 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 @@ -3808,7 +3811,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lresolv $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3826: \"$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 @@ -3843,12 +3846,12 @@ fi fi echo $ac_n "checking for textdomain""... $ac_c" 1>&6 -echo "configure:3847: checking for textdomain" >&5 +echo "configure:3850: checking for textdomain" >&5 if eval "test \"`echo '$''{'ac_cv_func_textdomain'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3878: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_textdomain=yes" else @@ -3890,7 +3893,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for textdomain in -lintl""... $ac_c" 1>&6 -echo "configure:3894: checking for textdomain in -lintl" >&5 +echo "configure:3897: checking for textdomain in -lintl" >&5 ac_lib_var=`echo intl'_'textdomain | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3898,7 +3901,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lintl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3916: \"$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 @@ -3935,12 +3938,12 @@ fi NEED_GETOPT=0 echo $ac_n "checking for getopt_long""... $ac_c" 1>&6 -echo "configure:3939: checking for getopt_long" >&5 +echo "configure:3942: checking for getopt_long" >&5 if eval "test \"`echo '$''{'ac_cv_func_getopt_long'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3970: \"$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 @@ -3985,7 +3988,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:3989: checking for getopt_long in -lgnugetopt" >&5 +echo "configure:3992: 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 @@ -3993,7 +3996,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lgnugetopt $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4011: \"$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 @@ -4032,12 +4035,12 @@ fi echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6 -echo "configure:4036: checking return type of signal handlers" >&5 +echo "configure:4039: checking return type of signal handlers" >&5 if eval "test \"`echo '$''{'ac_cv_type_signal'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -4054,7 +4057,7 @@ int main() { int i; ; return 0; } EOF -if { (eval echo configure:4058: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4061: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_type_signal=void else @@ -4073,7 +4076,7 @@ EOF echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6 -echo "configure:4077: checking for dlopen in -ldl" >&5 +echo "configure:4080: 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 @@ -4081,7 +4084,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ldl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4099: \"$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 @@ -4113,7 +4116,7 @@ else fi echo $ac_n "checking for cos in -lm""... $ac_c" 1>&6 -echo "configure:4117: checking for cos in -lm" >&5 +echo "configure:4120: 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 @@ -4121,7 +4124,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lm $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4139: \"$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 @@ -4154,7 +4157,7 @@ else fi echo $ac_n "checking for pow in -lm""... $ac_c" 1>&6 -echo "configure:4158: checking for pow in -lm" >&5 +echo "configure:4161: 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 @@ -4162,7 +4165,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lm $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4180: \"$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 @@ -4201,7 +4204,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:4205: checking for pthread_attr_init in -lpthread" >&5 +echo "configure:4208: 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 @@ -4209,7 +4212,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lpthread $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4227: \"$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 @@ -4243,7 +4246,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:4247: checking for pthread_attr_init in -lpthreads" >&5 +echo "configure:4250: 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 @@ -4251,7 +4254,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lpthreads $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4269: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4285,7 +4288,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:4289: checking for pthread_attr_init in -lc_r" >&5 +echo "configure:4292: 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 @@ -4293,7 +4296,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lc_r $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4311: \"$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 @@ -4327,12 +4330,12 @@ fi fi if test "x${THREAD_LIB}" = xerror; then echo $ac_n "checking for pthread_attr_init""... $ac_c" 1>&6 -echo "configure:4331: checking for pthread_attr_init" >&5 +echo "configure:4334: checking for pthread_attr_init" >&5 if eval "test \"`echo '$''{'ac_cv_func_pthread_attr_init'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4362: \"$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 @@ -4378,7 +4381,7 @@ fi fi echo $ac_n "checking for cthread_fork in -lthreads""... $ac_c" 1>&6 -echo "configure:4382: checking for cthread_fork in -lthreads" >&5 +echo "configure:4385: 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 @@ -4386,7 +4389,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lthreads $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4404: \"$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 @@ -4419,7 +4422,7 @@ fi cat > conftest.$ac_ext < EOF @@ -4435,7 +4438,7 @@ fi rm -f conftest* cat > conftest.$ac_ext < EOF @@ -4451,21 +4454,21 @@ fi rm -f conftest* -for ac_hdr in getopt.h strings.h +for ac_hdr in stdint.h getopt.h strings.h inttypes.h sys/int_types.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:4459: checking for $ac_hdr" >&5 +echo "configure:4462: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4469: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4472: \"$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* @@ -4495,17 +4498,17 @@ for ac_hdr in sys/sockio.h fcntl.h sys/types.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:4499: checking for $ac_hdr" >&5 +echo "configure:4502: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4509: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4512: \"$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* @@ -4535,17 +4538,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:4539: checking for $ac_hdr" >&5 +echo "configure:4542: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4549: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4552: \"$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* @@ -4575,17 +4578,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:4579: checking for $ac_hdr" >&5 +echo "configure:4582: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4589: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4592: \"$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* @@ -4615,17 +4618,17 @@ for ac_hdr in machine/param.h sys/shm.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:4619: checking for $ac_hdr" >&5 +echo "configure:4622: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4629: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4632: \"$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* @@ -4655,17 +4658,17 @@ for ac_hdr in linux/version.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:4659: checking for $ac_hdr" >&5 +echo "configure:4662: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4669: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4672: \"$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* @@ -4693,12 +4696,12 @@ done echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6 -echo "configure:4697: checking whether time.h and sys/time.h may both be included" >&5 +echo "configure:4700: checking whether time.h and sys/time.h may both be included" >&5 if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -4707,7 +4710,7 @@ int main() { struct tm *tp; ; return 0; } EOF -if { (eval echo configure:4711: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4714: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_header_time=yes else @@ -4729,7 +4732,7 @@ fi cat > conftest.$ac_ext < EOF @@ -4747,7 +4750,7 @@ rm -f conftest* cat > conftest.$ac_ext < EOF @@ -4768,17 +4771,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:4772: checking for $ac_hdr" >&5 +echo "configure:4775: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4782: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4785: \"$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* @@ -4818,17 +4821,17 @@ then do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:4822: checking for $ac_hdr" >&5 +echo "configure:4825: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4832: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4835: \"$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* @@ -4850,7 +4853,7 @@ if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then EOF cat > conftest.$ac_ext < EOF @@ -4876,20 +4879,20 @@ done fi echo $ac_n "checking for ntohl in sys/param.h""... $ac_c" 1>&6 -echo "configure:4880: checking for ntohl in sys/param.h" >&5 +echo "configure:4883: checking for ntohl in sys/param.h" >&5 if eval "test \"`echo '$''{'ac_cv_c_ntohl_sys_param_h'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else CFLAGS="${save_CFLAGS} -Wall -Werror" cat > conftest.$ac_ext < int main() { void foo() { int meuh; ntohl(meuh); } ; return 0; } EOF -if { (eval echo configure:4893: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4896: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_ntohl_sys_param_h=yes else @@ -4910,20 +4913,20 @@ EOF fi echo $ac_n "checking if \$CC accepts -finline-limit""... $ac_c" 1>&6 -echo "configure:4914: checking if \$CC accepts -finline-limit" >&5 +echo "configure:4917: checking if \$CC accepts -finline-limit" >&5 if eval "test \"`echo '$''{'ac_cv_c_inline_limit'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else CFLAGS="${save_CFLAGS} -finline-limit-30000" cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4930: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_inline_limit=yes else @@ -4941,20 +4944,20 @@ if test x"$ac_cv_c_inline_limit" != x"no"; then fi echo $ac_n "checking if \$CC accepts -Wall -Winline""... $ac_c" 1>&6 -echo "configure:4945: checking if \$CC accepts -Wall -Winline" >&5 +echo "configure:4948: checking if \$CC accepts -Wall -Winline" >&5 if eval "test \"`echo '$''{'ac_cv_c_Wall_Winline'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else CFLAGS="${save_CFLAGS} -Wall -Winline" cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4961: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_Wall_Winline=yes else @@ -4971,20 +4974,20 @@ if test x"$ac_cv_c_Wall_Winline" != x"no"; then save_CFLAGS="${save_CFLAGS} -Wall -Winline" else echo $ac_n "checking if \$CC accepts -wall -winline""... $ac_c" 1>&6 -echo "configure:4975: checking if \$CC accepts -wall -winline" >&5 +echo "configure:4978: checking if \$CC accepts -wall -winline" >&5 if eval "test \"`echo '$''{'ac_cv_c_wall_winline'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else CFLAGS="${save_CFLAGS} -wall -winline" cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4991: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_wall_winline=yes else @@ -5003,20 +5006,20 @@ echo "$ac_t""$ac_cv_c_wall_winline" 1>&6 fi echo $ac_n "checking if \$CC accepts -pipe""... $ac_c" 1>&6 -echo "configure:5007: checking if \$CC accepts -pipe" >&5 +echo "configure:5010: checking if \$CC accepts -pipe" >&5 if eval "test \"`echo '$''{'ac_cv_c_pipe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else CFLAGS="${save_CFLAGS} -pipe" cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5023: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_pipe=yes else @@ -5034,20 +5037,20 @@ if test x"$ac_cv_c_pipe" != x"no"; then fi echo $ac_n "checking if \$CC accepts -O3""... $ac_c" 1>&6 -echo "configure:5038: checking if \$CC accepts -O3" >&5 +echo "configure:5041: checking if \$CC accepts -O3" >&5 if eval "test \"`echo '$''{'ac_cv_c_o3'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else CFLAGS="${save_CFLAGS} -O3" cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5054: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_o3=yes else @@ -5064,20 +5067,20 @@ if test x"$ac_cv_c_o3" != x"no"; then CFLAGS_OPTIM="${CFLAGS_OPTIM} -O3" else echo $ac_n "checking if \$CC accepts -O2""... $ac_c" 1>&6 -echo "configure:5068: checking if \$CC accepts -O2" >&5 +echo "configure:5071: checking if \$CC accepts -O2" >&5 if eval "test \"`echo '$''{'ac_cv_c_o2'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else CFLAGS="${save_CFLAGS} -O2" cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5084: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_o2=yes else @@ -5094,20 +5097,20 @@ echo "$ac_t""$ac_cv_c_o2" 1>&6 CFLAGS_OPTIM="${CFLAGS_OPTIM} -O2" else echo $ac_n "checking if \$CC accepts -O""... $ac_c" 1>&6 -echo "configure:5098: checking if \$CC accepts -O" >&5 +echo "configure:5101: checking if \$CC accepts -O" >&5 if eval "test \"`echo '$''{'ac_cv_c_o'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else CFLAGS="${save_CFLAGS} -O" cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5114: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_o=yes else @@ -5127,20 +5130,20 @@ echo "$ac_t""$ac_cv_c_o" 1>&6 fi echo $ac_n "checking if \$CC accepts -ffast-math""... $ac_c" 1>&6 -echo "configure:5131: checking if \$CC accepts -ffast-math" >&5 +echo "configure:5134: checking if \$CC accepts -ffast-math" >&5 if eval "test \"`echo '$''{'ac_cv_c_fast_math'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else CFLAGS="${save_CFLAGS} -ffast-math" cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5147: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_fast_math=yes else @@ -5158,20 +5161,20 @@ if test x"$ac_cv_c_fast_math" != x"no"; then fi echo $ac_n "checking if \$CC accepts -funroll-loops""... $ac_c" 1>&6 -echo "configure:5162: checking if \$CC accepts -funroll-loops" >&5 +echo "configure:5165: checking if \$CC accepts -funroll-loops" >&5 if eval "test \"`echo '$''{'ac_cv_c_unroll_loops'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else CFLAGS="${save_CFLAGS} -funroll-loops" cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5178: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_unroll_loops=yes else @@ -5189,20 +5192,20 @@ if test x"$ac_cv_c_unroll_loops" != x"no"; then fi echo $ac_n "checking if \$CC accepts -fomit-frame-pointer""... $ac_c" 1>&6 -echo "configure:5193: checking if \$CC accepts -fomit-frame-pointer" >&5 +echo "configure:5196: checking if \$CC accepts -fomit-frame-pointer" >&5 if eval "test \"`echo '$''{'ac_cv_c_omit_frame_pointer'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else CFLAGS="${save_CFLAGS} -fomit-frame-pointer" cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5209: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_omit_frame_pointer=yes else @@ -5220,20 +5223,20 @@ if test x"$ac_cv_c_omit_frame_pointer" != x"no"; then fi echo $ac_n "checking if \$CC accepts -bundle -undefined error -lcc_dynamic""... $ac_c" 1>&6 -echo "configure:5224: checking if \$CC accepts -bundle -undefined error -lcc_dynamic" >&5 +echo "configure:5227: checking if \$CC accepts -bundle -undefined error -lcc_dynamic" >&5 if eval "test \"`echo '$''{'ac_cv_ld_darwin'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else CFLAGS="${save_CFLAGS} -bundle -undefined error -lcc_dynamic" cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5240: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_ld_darwin=yes else @@ -5251,20 +5254,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:5255: checking if \$CC accepts -shared" >&5 +echo "configure:5258: checking if \$CC accepts -shared" >&5 if eval "test \"`echo '$''{'ac_cv_ld_plugins'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else CFLAGS="${save_CFLAGS} -shared" cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5271: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_ld_plugins=yes else @@ -5282,13 +5285,13 @@ if test x"$ac_cv_ld_plugins" != x"no"; then fi echo $ac_n "checking for variadic cpp macros""... $ac_c" 1>&6 -echo "configure:5286: checking for variadic cpp macros" >&5 +echo "configure:5289: checking for variadic cpp macros" >&5 if eval "test \"`echo '$''{'ac_cv_cpp_variadic_macros'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else CFLAGS="${save_CFLAGS}" cat > conftest.$ac_ext < #define a(b,c...) printf(b,##c) @@ -5296,7 +5299,7 @@ int main() { a("foo");a("%s","bar");a("%s%s","baz","quux"); ; return 0; } EOF -if { (eval echo configure:5300: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5303: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_cpp_variadic_macros=yes else @@ -5317,7 +5320,7 @@ EOF fi echo $ac_n "checking __attribute__ ((aligned ())) support""... $ac_c" 1>&6 -echo "configure:5321: checking __attribute__ ((aligned ())) support" >&5 +echo "configure:5324: 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 @@ -5325,14 +5328,14 @@ else CFLAGS="${save_CFLAGS} -Werror" for ac_cv_c_attr_align_try in 2 4 8 16 32 64; do cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5339: \"$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 @@ -5356,19 +5359,19 @@ CPPFLAGS="${save_CPPFLAGS}" LDFLAGS="${save_LDFLAGS}" echo $ac_n "checking for boolean_t in sys/types.h""... $ac_c" 1>&6 -echo "configure:5360: checking for boolean_t in sys/types.h" >&5 +echo "configure:5363: checking for boolean_t in sys/types.h" >&5 if eval "test \"`echo '$''{'ac_cv_c_boolean_t_sys_types_h'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { boolean_t foo; ; return 0; } EOF -if { (eval echo configure:5372: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5375: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_boolean_t_sys_types_h=yes else @@ -5389,19 +5392,19 @@ EOF fi echo $ac_n "checking for boolean_t in pthread.h""... $ac_c" 1>&6 -echo "configure:5393: checking for boolean_t in pthread.h" >&5 +echo "configure:5396: checking for boolean_t in pthread.h" >&5 if eval "test \"`echo '$''{'ac_cv_c_boolean_t_pthread_h'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { boolean_t foo; ; return 0; } EOF -if { (eval echo configure:5405: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5408: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_boolean_t_pthread_h=yes else @@ -5422,19 +5425,19 @@ EOF fi echo $ac_n "checking for boolean_t in cthreads.h""... $ac_c" 1>&6 -echo "configure:5426: checking for boolean_t in cthreads.h" >&5 +echo "configure:5429: checking for boolean_t in cthreads.h" >&5 if eval "test \"`echo '$''{'ac_cv_c_boolean_t_cthreads_h'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { boolean_t foo; ; return 0; } EOF -if { (eval echo configure:5438: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5441: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_boolean_t_cthreads_h=yes else @@ -5464,7 +5467,7 @@ case x"${target_cpu}" in esac BUILTINS="${BUILTINS} idct idctclassic motion imdct downmix chroma_i420_rgb chroma_i420_yuy2 chroma_i422_yuy2 chroma_i420_ymga mpeg_adec ac3_adec mpeg_vdec" -PLUGINS="${PLUGINS} dummy null rc logger mpeg_es mpeg_ps mpeg_ts mpeg_audio file udp http ipv4 memcpy lpcm_adec ac3_spdif spudec filter_deinterlace filter_invert filter_wall filter_transform filter_distort filter_clone fx_scope" +PLUGINS="${PLUGINS} dummy null rc logger mpeg_es mpeg_ps mpeg_ts mpeg_audio file udp http ipv4 memcpy lpcm_adec ac3_spdif spudec filter_deinterlace filter_invert filter_wall filter_transform filter_distort filter_clone filter_crop fx_scope" MMX_MODULES="memcpymmx idctmmx motionmmx chroma_i420_rgb_mmx chroma_i420_yuy2_mmx chroma_i422_yuy2_mmx chroma_i420_ymga_mmx" MMXEXT_MODULES="memcpymmxext idctmmxext motionmmxext" @@ -5473,19 +5476,19 @@ SSE_MODULES="imdctsse downmixsse" ALTIVEC_MODULES="idctaltivec motionaltivec memcpyaltivec" echo $ac_n "checking if \$CC groks MMX inline assembly""... $ac_c" 1>&6 -echo "configure:5477: checking if \$CC groks MMX inline assembly" >&5 +echo "configure:5480: checking if \$CC groks MMX inline assembly" >&5 if eval "test \"`echo '$''{'ac_cv_mmx_inline'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5492: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_mmx_inline=yes else @@ -5503,19 +5506,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:5507: checking if \$CC groks MMX EXT inline assembly" >&5 +echo "configure:5510: checking if \$CC groks MMX EXT inline assembly" >&5 if eval "test \"`echo '$''{'ac_cv_mmxext_inline'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5522: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_mmxext_inline=yes else @@ -5533,19 +5536,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:5537: checking if \$CC groks 3D Now! inline assembly" >&5 +echo "configure:5540: checking if \$CC groks 3D Now! inline assembly" >&5 if eval "test \"`echo '$''{'ac_cv_3dnow_inline'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5552: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_3dnow_inline=yes else @@ -5567,19 +5570,19 @@ EOF fi echo $ac_n "checking if \$CC groks SSE inline assembly""... $ac_c" 1>&6 -echo "configure:5571: checking if \$CC groks SSE inline assembly" >&5 +echo "configure:5574: checking if \$CC groks SSE inline assembly" >&5 if eval "test \"`echo '$''{'ac_cv_sse_inline'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5586: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_sse_inline=yes else @@ -5604,19 +5607,19 @@ fi # we should be able to remove this test with future versions of mingw32 if test x$SYS != xmingw32; then echo $ac_n "checking if \$CC groks Altivec inline assembly""... $ac_c" 1>&6 -echo "configure:5608: checking if \$CC groks Altivec inline assembly" >&5 +echo "configure:5611: checking if \$CC groks Altivec inline assembly" >&5 if eval "test \"`echo '$''{'ac_cv_altivec_inline'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5623: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_altivec_inline=yes else @@ -5626,14 +5629,14 @@ else save_CFLAGS=$CFLAGS CFLAGS="$CFLAGS -Wa,-m7400" cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5640: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_altivec_inline="-Wa,-m7400" else @@ -5665,7 +5668,7 @@ EOF fi echo $ac_n "checking if \$CC groks Altivec C extensions""... $ac_c" 1>&6 -echo "configure:5669: checking if \$CC groks Altivec C extensions" >&5 +echo "configure:5672: 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 @@ -5673,14 +5676,14 @@ else CFLAGS="$CFLAGS -faltivec" # Darwin test cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5687: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_altivec=-faltivec else @@ -5691,14 +5694,14 @@ else # Linux/PPC test CFLAGS="$save_CFLAGS $idctaltivec_CFLAGS -fvec" cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5705: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_altivec="-fvec" else @@ -5729,21 +5732,21 @@ EOF fi echo $ac_n "checking if linker needs -framework vecLib""... $ac_c" 1>&6 -echo "configure:5733: checking if linker needs -framework vecLib" >&5 +echo "configure:5736: checking if linker needs -framework vecLib" >&5 if eval "test \"`echo '$''{'ac_cv_ld_altivec'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else save_LDFLAGS=$LDFLAGS LDFLAGS="$LDFLAGS -framework vecLib" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5750: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_ld_altivec=yes else @@ -5875,17 +5878,17 @@ fi do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:5879: checking for $ac_hdr" >&5 +echo "configure:5882: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5889: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5892: \"$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* @@ -5916,7 +5919,7 @@ done else echo $ac_n "checking for libdvdcss.a in ${with_dvdcss_tree}""... $ac_c" 1>&6 -echo "configure:5920: checking for libdvdcss.a in ${with_dvdcss_tree}" >&5 +echo "configure:5923: checking for libdvdcss.a in ${with_dvdcss_tree}" >&5 real_dvdcss_tree="`cd ${with_dvdcss_tree} 2>/dev/null && pwd`" if test "x$real_dvdcss_tree" = x then @@ -5942,7 +5945,7 @@ echo "configure:5920: checking for libdvdcss.a in ${with_dvdcss_tree}" >&5 ;; *) echo $ac_n "checking for dvdcss headers in ${with_dvdcss}""... $ac_c" 1>&6 -echo "configure:5946: checking for dvdcss headers in ${with_dvdcss}" >&5 +echo "configure:5949: checking for dvdcss headers in ${with_dvdcss}" >&5 if test -f ${with_dvdcss}/include/dvdcss/dvdcss.h then echo "$ac_t""yes" 1>&6 @@ -5984,17 +5987,17 @@ fi do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:5988: checking for $ac_hdr" >&5 +echo "configure:5991: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5998: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:6001: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -6016,14 +6019,14 @@ if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then EOF cat > conftest.$ac_ext < int main() { void foo() { int i=DVD_VIDEO_LB_LEN; } ; return 0; } EOF -if { (eval echo configure:6027: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6030: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* PLUGINS="${PLUGINS} dvdread" @@ -6075,28 +6078,31 @@ if test "${with_dvbpsi+set}" = set; then : fi - if test "x$with_dvbpsi" = x - then - test_LDFLAGS="" - test_CFLAGS="" - else - test_LDFLAGS="-L${with_dvbpsi}/lib" - test_CFLAGS="-I${with_dvbpsi}/include" - fi - CPPFLAGS="$save_CPPFLAGS $test_CFLAGS" - ac_safe=`echo "dvbpsi/dr.h" | sed 'y%./+-%__p_%'` -echo $ac_n "checking for dvbpsi/dr.h""... $ac_c" 1>&6 -echo "configure:6090: checking for dvbpsi/dr.h" >&5 + # Check whether --with-dvbpsi or --without-dvbpsi was given. +if test "${with_dvbpsi+set}" = set; then + withval="$with_dvbpsi" + : +fi + + case "x$with_dvbpsi" in + x|xyes) + if test "x$with_dvbpsi_tree" = x + then + for ac_hdr in dvbpsi/dr.h +do +ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` +echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 +echo "configure:6096: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < +#include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:6100: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:6106: \"$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* @@ -6112,24 +6118,100 @@ rm -f conftest* fi if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then echo "$ac_t""yes" 1>&6 - - PLUGINS="${PLUGINS} mpeg_ts_dvbpsi" - mpeg_ts_dvbpsi_LDFLAGS="${mpeg_ts_dvbpsi_LDFLAGS} ${test_LDFLAGS} -ldvbpsi" - mpeg_ts_dvbpsi_CFLAGS="${mpeg_ts_dvbpsi_CFLAGS} ${test_CFLAGS}" - + ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` + cat >> confdefs.h <&6 +fi +done - if test "x$enable_dvbpsi" != x + else + echo $ac_n "checking for libdvbpsi.a in ${with_dvbpsi_tree}""... $ac_c" 1>&6 +echo "configure:6135: checking for libdvbpsi.a in ${with_dvbpsi_tree}" >&5 + real_dvbpsi_tree="`cd ${with_dvbpsi_tree} 2>/dev/null && pwd`" + if test "x$real_dvbpsi_tree" = x + then + echo "$ac_t""no" 1>&6 + { echo "configure: error: cannot cd to ${with_dvbpsi_tree}" 1>&2; exit 1; } + fi + if test -f "${real_dvbpsi_tree}/src/.libs/libdvbpsi.a" + then + echo "$ac_t""${real_dvbpsi_tree}/src/.libs/libdvbpsi.a" 1>&6 + BUILTINS="${BUILTINS} mpeg_ts_dvbpsi" + mpeg_ts_dvbpsi_LDFLAGS="${mpeg_ts_dvbpsi_LDFLAGS} ${real_dvbpsi_tree}/src/.libs/libdvbpsi.a" + mpeg_ts_dvbpsi_CFLAGS="${mpeg_ts_dvbpsi_CFLAGS} -I${real_dvbpsi_tree}/src" + else + echo "$ac_t""no" 1>&6 + { echo "configure: error: cannot find ${real_dvbpsi_tree}/src/.libs/libdvbpsi.a, make sure you compiled libdvbpsi in ${with_dvbpsi_tree}" 1>&2; exit 1; } + fi + fi + ;; + xno) + ;; + *) + echo $ac_n "checking for dvbpsi headers in ${with_dvbpsi}""... $ac_c" 1>&6 +echo "configure:6158: checking for dvbpsi headers in ${with_dvbpsi}" >&5 + if test "x$with_dvbpsi" = x then - { echo "configure: error: Could not find libdvbpsi on your system: you may get it from www.videolan.org, you'll need at least version 0.1.1" 1>&2; exit 1; } + test_LDFLAGS="" + test_CFLAGS="" + else + test_LDFLAGS="-L${with_dvbpsi}/lib" + test_CFLAGS="-I${with_dvbpsi}/include" fi + CPPFLAGS="$save_CPPFLAGS $test_CFLAGS" + ac_safe=`echo "dvbpsi/dr.h" | sed 'y%./+-%__p_%'` +echo $ac_n "checking for dvbpsi/dr.h""... $ac_c" 1>&6 +echo "configure:6170: checking for dvbpsi/dr.h" >&5 +if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + cat > conftest.$ac_ext < +EOF +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +{ (eval echo configure:6180: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` +if test -z "$ac_err"; then + rm -rf conftest* + eval "ac_cv_header_$ac_safe=yes" +else + echo "$ac_err" >&5 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_header_$ac_safe=no" +fi +rm -f conftest* +fi +if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then + echo "$ac_t""yes" 1>&6 + PLUGINS="${PLUGINS} mpeg_ts_dvbpsi" + mpeg_ts_dvbpsi_LDFLAGS="${mpeg_ts_dvbpsi_LDFLAGS} ${test_LDFLAGS} -ldvbpsi" + mpeg_ts_dvbpsi_CFLAGS="${mpeg_ts_dvbpsi_CFLAGS} ${test_CFLAGS}" + +else + echo "$ac_t""no" 1>&6 + + if test "x$enable_dvbpsi" != x + then + { echo "configure: error: Could not find libdvbpsi on your system: you may get it from www.videolan.org, you'll need at least version 0.1.1" 1>&2; exit 1; } + fi + fi - CPPFLAGS="$save_CPPFLAGS" + CPPFLAGS="$save_CPPFLAGS" + ;; + esac fi - + # Check whether --enable-vcd or --disable-vcd was given. if test "${enable_vcd+set}" = set; then enableval="$enable_vcd" @@ -6140,7 +6222,7 @@ fi if test x$enable_vcd != xno then cat > conftest.$ac_ext < EOF @@ -6155,7 +6237,7 @@ rm -f conftest* cat > conftest.$ac_ext < EOF @@ -6198,12 +6280,12 @@ fi if test x$SYS != xnto && test "x$SYS" != "xmingw32" then echo $ac_n "checking for inet_pton""... $ac_c" 1>&6 -echo "configure:6202: checking for inet_pton" >&5 +echo "configure:6284: checking for inet_pton" >&5 if eval "test \"`echo '$''{'ac_cv_func_inet_pton'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6312: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_inet_pton=yes" else @@ -6249,9 +6331,9 @@ fi if test "x$SYS" = "xmingw32" then echo $ac_n "checking for getaddrinfo in ws2tcpip.h""... $ac_c" 1>&6 -echo "configure:6253: checking for getaddrinfo in ws2tcpip.h" >&5 +echo "configure:6335: checking for getaddrinfo in ws2tcpip.h" >&5 cat > conftest.$ac_ext < EOF @@ -6322,7 +6404,7 @@ fi { echo "configure: error: ${with_mad_tree} directory doesn't exist" 1>&2; exit 1; } fi echo $ac_n "checking for mad.h in ${real_mad_tree}/libmad""... $ac_c" 1>&6 -echo "configure:6326: checking for mad.h in ${real_mad_tree}/libmad" >&5 +echo "configure:6408: checking for mad.h in ${real_mad_tree}/libmad" >&5 if test -f ${real_mad_tree}/libmad/mad.h then echo "$ac_t""yes" 1>&6 @@ -6331,7 +6413,7 @@ echo "configure:6326: checking for mad.h in ${real_mad_tree}/libmad" >&5 save_LDFLAGS=$LDFLAGS LDFLAGS=$mad_LDFLAGS echo $ac_n "checking for mad_bit_init in -lmad""... $ac_c" 1>&6 -echo "configure:6335: checking for mad_bit_init in -lmad" >&5 +echo "configure:6417: 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 @@ -6339,7 +6421,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lmad $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6436: \"$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 @@ -6389,17 +6471,17 @@ fi do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:6393: checking for $ac_hdr" >&5 +echo "configure:6475: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:6403: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:6485: \"$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* @@ -6427,7 +6509,7 @@ fi done echo $ac_n "checking for mad_bit_init in -lmad""... $ac_c" 1>&6 -echo "configure:6431: checking for mad_bit_init in -lmad" >&5 +echo "configure:6513: 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 @@ -6435,7 +6517,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lmad $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6532: \"$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 @@ -6503,7 +6585,7 @@ fi if test "x$with_ffmpeg_tree" != "x" then echo $ac_n "checking for libavcodec.a in ${with_ffmpeg_tree}""... $ac_c" 1>&6 -echo "configure:6507: checking for libavcodec.a in ${with_ffmpeg_tree}" >&5 +echo "configure:6589: checking for libavcodec.a in ${with_ffmpeg_tree}" >&5 real_ffmpeg_tree="`cd ${with_ffmpeg_tree} 2>/dev/null && pwd`" if test "x$real_ffmpeg_tree" = x then @@ -6526,7 +6608,7 @@ echo "configure:6507: checking for libavcodec.a in ${with_ffmpeg_tree}" >&5 CFLAGS="$CFLAGS $ffmpeg_CFLAGS" LDFLAGS="$LDFLAGS $ffmpeg_LDFLAGS -lm" echo $ac_n "checking for avcodec_init in -lavcodec""... $ac_c" 1>&6 -echo "configure:6530: checking for avcodec_init in -lavcodec" >&5 +echo "configure:6612: checking for avcodec_init in -lavcodec" >&5 ac_lib_var=`echo avcodec'_'avcodec_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 @@ -6534,7 +6616,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lavcodec $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6631: \"$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 @@ -6602,7 +6684,7 @@ fi { echo "configure: error: ${with_a52_tree} directory doesn't exist" 1>&2; exit 1; } fi echo $ac_n "checking for a52.h in ${real_a52_tree}/include""... $ac_c" 1>&6 -echo "configure:6606: checking for a52.h in ${real_a52_tree}/include" >&5 +echo "configure:6688: checking for a52.h in ${real_a52_tree}/include" >&5 if test -f ${real_a52_tree}/include/a52.h then echo "$ac_t""yes" 1>&6 @@ -6611,7 +6693,7 @@ echo "configure:6606: checking for a52.h in ${real_a52_tree}/include" >&5 save_LDFLAGS=$LDFLAGS LDFLAGS="$a52_LDFLAGS $LDFLAGS" echo $ac_n "checking for a52_free in -la52""... $ac_c" 1>&6 -echo "configure:6615: checking for a52_free in -la52" >&5 +echo "configure:6697: checking for a52_free in -la52" >&5 ac_lib_var=`echo a52'_'a52_free | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -6619,7 +6701,7 @@ else ac_save_LIBS="$LIBS" LIBS="-la52 -lm $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6716: \"$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 @@ -6671,17 +6753,17 @@ fi do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:6675: checking for $ac_hdr" >&5 +echo "configure:6757: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:6685: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:6767: \"$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* @@ -6703,7 +6785,7 @@ if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then EOF echo $ac_n "checking for a52_free in -la52""... $ac_c" 1>&6 -echo "configure:6707: checking for a52_free in -la52" >&5 +echo "configure:6789: checking for a52_free in -la52" >&5 ac_lib_var=`echo a52'_'a52_free | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -6711,7 +6793,7 @@ else ac_save_LIBS="$LIBS" LIBS="-la52 -lm $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6808: \"$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 @@ -6767,17 +6849,17 @@ then do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:6771: checking for $ac_hdr" >&5 +echo "configure:6853: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:6781: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:6863: \"$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* @@ -6835,17 +6917,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:6839: checking for $ac_hdr" >&5 +echo "configure:6921: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:6849: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:6931: \"$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* @@ -6898,17 +6980,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:6902: checking for $ac_hdr" >&5 +echo "configure:6984: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:6912: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:6994: \"$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* @@ -6932,7 +7014,7 @@ EOF save_CFLAGS=$CFLAGS CFLAGS="$CFLAGS -L$x_libraries -lX11 -lXext" echo $ac_n "checking for XvSetPortAttribute in -lXv_pic""... $ac_c" 1>&6 -echo "configure:6936: checking for XvSetPortAttribute in -lXv_pic" >&5 +echo "configure:7018: checking for XvSetPortAttribute in -lXv_pic" >&5 ac_lib_var=`echo Xv_pic'_'XvSetPortAttribute | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -6940,7 +7022,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lXv_pic $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7037: \"$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 @@ -7009,7 +7091,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:7013: checking for $ac_word" >&5 +echo "configure:7095: 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 @@ -7049,7 +7131,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:7053: checking for $ac_word" >&5 +echo "configure:7135: 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 @@ -7090,7 +7172,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:7094: checking for $ac_word" >&5 +echo "configure:7176: 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 @@ -7135,17 +7217,17 @@ fi do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:7139: checking for $ac_hdr" >&5 +echo "configure:7221: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:7149: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7231: \"$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* @@ -7215,17 +7297,17 @@ fi do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:7219: checking for $ac_hdr" >&5 +echo "configure:7301: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:7229: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7311: \"$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* @@ -7254,7 +7336,7 @@ done else echo $ac_n "checking for directX headers in ${with_directx}""... $ac_c" 1>&6 -echo "configure:7258: checking for directX headers in ${with_directx}" >&5 +echo "configure:7340: checking for directX headers in ${with_directx}" >&5 if test -f ${with_directx}/ddraw.h then PLUGINS="${PLUGINS} directx" @@ -7281,17 +7363,17 @@ fi do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:7285: checking for $ac_hdr" >&5 +echo "configure:7367: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:7295: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7377: \"$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* @@ -7386,17 +7468,17 @@ if test x$enable_aa = xyes then ac_safe=`echo "aalib.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for aalib.h""... $ac_c" 1>&6 -echo "configure:7390: checking for aalib.h" >&5 +echo "configure:7472: checking for aalib.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:7400: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7482: \"$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* @@ -7447,17 +7529,17 @@ then do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:7451: checking for $ac_hdr" >&5 +echo "configure:7533: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:7461: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7543: \"$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* @@ -7480,7 +7562,7 @@ EOF PLUGINS="${PLUGINS} dsp" echo $ac_n "checking for main in -lossaudio""... $ac_c" 1>&6 -echo "configure:7484: checking for main in -lossaudio" >&5 +echo "configure:7566: checking for main in -lossaudio" >&5 ac_lib_var=`echo ossaudio'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -7488,14 +7570,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lossaudio $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7581: \"$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 @@ -7531,7 +7613,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:7535: checking for $ac_word" >&5 +echo "configure:7617: 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 @@ -7582,7 +7664,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:7586: checking for $ac_word" >&5 +echo "configure:7668: 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 @@ -7632,17 +7714,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:7636: checking for alsa/asoundlib.h" >&5 +echo "configure:7718: 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 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:7646: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7728: \"$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* @@ -7659,7 +7741,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:7663: checking for main in -lasound" >&5 +echo "configure:7745: 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 @@ -7667,14 +7749,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lasound $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7760: \"$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 @@ -7751,7 +7833,7 @@ fi # Extract the first word of "gtk12-config", so it can be a program name with args. set dummy gtk12-config; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:7755: checking for $ac_word" >&5 +echo "configure:7837: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_GTK12_CONFIG'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -7790,7 +7872,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:7794: checking for $ac_word" >&5 +echo "configure:7876: 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 @@ -7839,17 +7921,17 @@ fi do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:7843: checking for $ac_hdr" >&5 +echo "configure:7925: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:7853: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7935: \"$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* @@ -7895,7 +7977,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:7899: checking for $ac_word" >&5 +echo "configure:7981: 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 @@ -7939,17 +8021,17 @@ fi do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:7943: checking for $ac_hdr" >&5 +echo "configure:8025: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:7953: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8035: \"$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* @@ -8036,17 +8118,17 @@ else do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:8040: checking for $ac_hdr" >&5 +echo "configure:8122: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:8050: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8132: \"$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* @@ -8089,17 +8171,17 @@ fi do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:8093: checking for $ac_hdr" >&5 +echo "configure:8175: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:8103: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8185: \"$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* @@ -8170,17 +8252,17 @@ if test x$enable_lirc = xyes then ac_safe=`echo "lirc/lirc_client.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for lirc/lirc_client.h""... $ac_c" 1>&6 -echo "configure:8174: checking for lirc/lirc_client.h" >&5 +echo "configure:8256: checking for lirc/lirc_client.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:8184: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8266: \"$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* @@ -8197,7 +8279,7 @@ fi if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then echo "$ac_t""yes" 1>&6 echo $ac_n "checking for lirc_init in -llirc_client""... $ac_c" 1>&6 -echo "configure:8201: checking for lirc_init in -llirc_client" >&5 +echo "configure:8283: checking for lirc_init in -llirc_client" >&5 ac_lib_var=`echo lirc_client'_'lirc_init | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -8205,7 +8287,7 @@ else ac_save_LIBS="$LIBS" LIBS="-llirc_client $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8302: \"$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 @@ -8271,7 +8353,7 @@ fi ;; *) echo $ac_n "checking whether the byte order is big-endian""... $ac_c" 1>&6 -echo "configure:8275: checking whether the byte order is big-endian" >&5 +echo "configure:8357: checking whether the byte order is big-endian" >&5 if eval "test \"`echo '$''{'ac_cv_c_bigendian'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -8345,7 +8427,7 @@ if test "${enable_pth+set}" = set; then enableval="$enable_pth" if test "x$enable_pth" = "xyes"; then echo $ac_n "checking for pth_init in -lpth""... $ac_c" 1>&6 -echo "configure:8349: checking for pth_init in -lpth" >&5 +echo "configure:8431: 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 @@ -8353,7 +8435,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lpth $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8450: \"$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 @@ -8392,7 +8474,7 @@ else fi cat > conftest.$ac_ext < EOF @@ -8418,7 +8500,7 @@ if test "${enable_st+set}" = set; then enableval="$enable_st" if test "x$enable_st" = "xyes"; then echo $ac_n "checking for st_init in -lst""... $ac_c" 1>&6 -echo "configure:8422: checking for st_init in -lst" >&5 +echo "configure:8504: checking for st_init in -lst" >&5 ac_lib_var=`echo st'_'st_init | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -8426,7 +8508,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lst $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8523: \"$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 @@ -8465,7 +8547,7 @@ else fi cat > conftest.$ac_ext < EOF diff --git a/configure.in b/configure.in index c26b9f84b8..f51015f857 100644 --- a/configure.in +++ b/configure.in @@ -4,7 +4,7 @@ AC_CONFIG_HEADER(include/defs.h) AC_CANONICAL_SYSTEM PACKAGE="vlc" -VERSION="0.4.0" +VERSION="0.4.4" CODENAME=Ourumov dnl Save CFLAGS and LDFLAGS @@ -113,7 +113,7 @@ dnl The -DSYS_FOO flag save_CFLAGS="${save_CFLAGS} -DSYS_`echo ${SYS} | sed -e 's/-.*//' | tr 'abcdefghijklmnopqrstuvwxyz.' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ_'`" dnl Check for system libs needed -AC_CHECK_FUNCS(gettimeofday select strerror strtod strtol isatty vasprintf swab sigrelse getpwuid memalign posix_memalign gethostbyname2) +AC_CHECK_FUNCS(gettimeofday select strerror strtod strtol isatty vasprintf swab sigrelse getpwuid memalign posix_memalign gethostbyname2 atoll) AC_CHECK_FUNC(connect,,[ AC_CHECK_LIB(socket,connect, @@ -126,13 +126,18 @@ AC_CHECK_FUNC(gethostbyname,,[ AC_CHECK_FUNC(gethostbyname,,[ AC_CHECK_LIB(bind,gethostbyname,ipv4_LDFLAGS="${ipv4_LDFLAGS} -lbind") ]) -AC_CHECK_FUNCS(nanosleep,,[ +have_nanosleep=0 +AC_CHECK_FUNC(nanosleep,have_nanosleep=1,[ AC_CHECK_LIB(rt,nanosleep, - [vlc_LDFLAGS="${vlc_LDFLAGS} -lrt"], + [vlc_LDFLAGS="${vlc_LDFLAGS} -lrt"; have_nanosleep=1], [AC_CHECK_LIB(posix4,nanosleep, - [vlc_LDFLAGS="${vlc_LDFLAGS} -lposix4"])] + [vlc_LDFLAGS="${vlc_LDFLAGS} -lposix4"; have_nanosleep=1])] ) ]) +if test x$have_nanosleep = x1; then + AC_DEFINE(HAVE_NANOSLEEP, 1, + Define if nanosleep is available.) +fi AC_CHECK_FUNC(inet_aton,,[ AC_CHECK_LIB(resolv,inet_aton,ipv4_LDFLAGS="${ipv4_LDFLAGS} -lresolv") ]) @@ -188,7 +193,7 @@ AC_EGREP_HEADER(strncasecmp,strings.h,[ Define if defines strncasecmp.)]) dnl Check for headers -AC_CHECK_HEADERS(getopt.h strings.h) +AC_CHECK_HEADERS(stdint.h getopt.h strings.h inttypes.h sys/int_types.h) AC_CHECK_HEADERS(sys/sockio.h fcntl.h sys/types.h sys/time.h sys/times.h) AC_CHECK_HEADERS(dlfcn.h image.h) AC_CHECK_HEADERS(arpa/inet.h net/if.h netinet/in.h sys/socket.h) @@ -422,7 +427,7 @@ dnl dnl default modules dnl BUILTINS="${BUILTINS} idct idctclassic motion imdct downmix chroma_i420_rgb chroma_i420_yuy2 chroma_i422_yuy2 chroma_i420_ymga mpeg_adec ac3_adec mpeg_vdec" -PLUGINS="${PLUGINS} dummy null rc logger mpeg_es mpeg_ps mpeg_ts mpeg_audio file udp http ipv4 memcpy lpcm_adec ac3_spdif spudec filter_deinterlace filter_invert filter_wall filter_transform filter_distort filter_clone fx_scope" +PLUGINS="${PLUGINS} dummy null rc logger mpeg_es mpeg_ps mpeg_ts mpeg_audio file udp http ipv4 memcpy lpcm_adec ac3_spdif spudec filter_deinterlace filter_invert filter_wall filter_transform filter_distort filter_clone filter_crop fx_scope" dnl dnl Accelerated modules @@ -719,28 +724,68 @@ if test "x$enable_dvbpsi" != "xno" then AC_ARG_WITH(dvbpsi, [ --with-dvbpsi=PATH libdvbpsi headers and libraries]) - if test "x$with_dvbpsi" = x - then - test_LDFLAGS="" - test_CFLAGS="" - else - test_LDFLAGS="-L${with_dvbpsi}/lib" - test_CFLAGS="-I${with_dvbpsi}/include" - fi - CPPFLAGS="$save_CPPFLAGS $test_CFLAGS" - AC_CHECK_HEADER([dvbpsi/dr.h],[ - PLUGINS="${PLUGINS} mpeg_ts_dvbpsi" - mpeg_ts_dvbpsi_LDFLAGS="${mpeg_ts_dvbpsi_LDFLAGS} ${test_LDFLAGS} -ldvbpsi" - mpeg_ts_dvbpsi_CFLAGS="${mpeg_ts_dvbpsi_CFLAGS} ${test_CFLAGS}" - ],[ - if test "x$enable_dvbpsi" != x + AC_ARG_WITH(dvbpsi, + [ --with-dvbpsi-tree=PATH libdvbpsi tree for static linking]) + case "x$with_dvbpsi" in + x|xyes) + if test "x$with_dvbpsi_tree" = x then - AC_MSG_ERROR([Could not find libdvbpsi on your system: you may get it from www.videolan.org, you'll need at least version 0.1.1]) + AC_CHECK_HEADERS(dvbpsi/dr.h, + [ PLUGINS="${PLUGINS} mpeg_ts_dvbpsi" + mpeg_ts_dvbpsi_LDFLAGS="${mpeg_ts_dvbpsi_LDFLAGS} -ldvbpsi" ], [], + [ AC_MSG_ERROR([cannot find libdvbpsi headers]) ]) + else + AC_MSG_CHECKING(for libdvbpsi.a in ${with_dvbpsi_tree}) + real_dvbpsi_tree="`cd ${with_dvbpsi_tree} 2>/dev/null && pwd`" + if test "x$real_dvbpsi_tree" = x + then + dnl The given directory can't be found + AC_MSG_RESULT(no) + AC_MSG_ERROR([cannot cd to ${with_dvbpsi_tree}]) + fi + if test -f "${real_dvbpsi_tree}/src/.libs/libdvbpsi.a" + then + dnl Use a custom libdvbpsi + AC_MSG_RESULT(${real_dvbpsi_tree}/src/.libs/libdvbpsi.a) + BUILTINS="${BUILTINS} mpeg_ts_dvbpsi" + mpeg_ts_dvbpsi_LDFLAGS="${mpeg_ts_dvbpsi_LDFLAGS} ${real_dvbpsi_tree}/src/.libs/libdvbpsi.a" + mpeg_ts_dvbpsi_CFLAGS="${mpeg_ts_dvbpsi_CFLAGS} -I${real_dvbpsi_tree}/src" + else + dnl The given libdvbpsi wasn't built + AC_MSG_RESULT(no) + AC_MSG_ERROR([cannot find ${real_dvbpsi_tree}/src/.libs/libdvbpsi.a, make sure you compiled libdvbpsi in ${with_dvbpsi_tree}]) + fi fi - ]) - CPPFLAGS="$save_CPPFLAGS" + ;; + xno) + dnl Compile without dvbpsi (dlopen version, works only under Linux) + ;; + *) + AC_MSG_CHECKING(for dvbpsi headers in ${with_dvbpsi}) + if test "x$with_dvbpsi" = x + then + test_LDFLAGS="" + test_CFLAGS="" + else + test_LDFLAGS="-L${with_dvbpsi}/lib" + test_CFLAGS="-I${with_dvbpsi}/include" + fi + CPPFLAGS="$save_CPPFLAGS $test_CFLAGS" + AC_CHECK_HEADER([dvbpsi/dr.h],[ + PLUGINS="${PLUGINS} mpeg_ts_dvbpsi" + mpeg_ts_dvbpsi_LDFLAGS="${mpeg_ts_dvbpsi_LDFLAGS} ${test_LDFLAGS} -ldvbpsi" + mpeg_ts_dvbpsi_CFLAGS="${mpeg_ts_dvbpsi_CFLAGS} ${test_CFLAGS}" + ],[ + if test "x$enable_dvbpsi" != x + then + AC_MSG_ERROR([Could not find libdvbpsi on your system: you may get it from www.videolan.org, you'll need at least version 0.1.1]) + fi + ]) + CPPFLAGS="$save_CPPFLAGS" + ;; + esac fi - + dnl dnl VCD module dnl diff --git a/extras/MacOSX/Resources/divx.icns b/extras/MacOSX/Resources/divx.icns new file mode 100644 index 0000000000..7e2ba65c38 Binary files /dev/null and b/extras/MacOSX/Resources/divx.icns differ diff --git a/extras/MacOSX/Resources/generic.icns b/extras/MacOSX/Resources/generic.icns new file mode 100644 index 0000000000..28dc564a3e Binary files /dev/null and b/extras/MacOSX/Resources/generic.icns differ diff --git a/extras/MacOSX/Resources/mpeg.icns b/extras/MacOSX/Resources/mpeg.icns new file mode 100644 index 0000000000..9af347afe7 Binary files /dev/null and b/extras/MacOSX/Resources/mpeg.icns differ diff --git a/extras/MacOSX/Resources/mpeg1.icns b/extras/MacOSX/Resources/mpeg1.icns new file mode 100644 index 0000000000..a09f3d0ec9 Binary files /dev/null and b/extras/MacOSX/Resources/mpeg1.icns differ diff --git a/extras/MacOSX/Resources/mpeg2.icns b/extras/MacOSX/Resources/mpeg2.icns new file mode 100644 index 0000000000..ae8649ed14 Binary files /dev/null and b/extras/MacOSX/Resources/mpeg2.icns differ diff --git a/extras/MacOSX/Resources/mpeg4.icns b/extras/MacOSX/Resources/mpeg4.icns new file mode 100644 index 0000000000..9da18bf909 Binary files /dev/null and b/extras/MacOSX/Resources/mpeg4.icns differ diff --git a/MODULES b/plugins/LIST similarity index 98% rename from MODULES rename to plugins/LIST index 29a8edb69b..ebd3851f29 100644 --- a/MODULES +++ b/plugins/LIST @@ -1,5 +1,5 @@ List of vlc plugins -$Id: MODULES,v 1.3 2002/01/30 00:09:49 sam Exp $ +$Id: LIST,v 1.1.2.1 2002/08/07 19:59:02 massiot Exp $ * ac3_adec: software AC3 decoder. diff --git a/plugins/beos/intf_vlc_wrapper.cpp b/plugins/beos/intf_vlc_wrapper.cpp new file mode 100644 index 0000000000..1ff0b9c4b1 --- /dev/null +++ b/plugins/beos/intf_vlc_wrapper.cpp @@ -0,0 +1,485 @@ +/***************************************************************************** + * intf_vlc_wrapper.h: BeOS plugin for vlc (derived from MacOS X port ) + ***************************************************************************** + * Copyright (C) 2001 VideoLAN + * $Id: intf_vlc_wrapper.cpp,v 1.1.2.1 2002/07/13 11:33:11 tcastley Exp $ + * + * Authors: Florian G. Pflug + * Jon Lech Johansen + * Tony Casltey + * + * This program is free software{} you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation{} either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY{} without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program{} if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. + *****************************************************************************/ +/* VLC headers */ +#include + +extern "C" +{ +#include + +#include "stream_control.h" +#include "input_ext-intf.h" + +#include "interface.h" +#include "intf_playlist.h" + +#include "audio_output.h" + +#include "video.h" +#include "video_output.h" + +} + +#include "intf_vlc_wrapper.h" + + +bool Intf_VLCWrapper::manage() +{ + p_main->p_intf->pf_manage( p_main->p_intf ); + + if ( p_main->p_intf->b_die ) + { + // exit the lot + return( 1 ); + } + + if ( p_input_bank->pp_input[0] != NULL ) + { + vlc_mutex_lock( &p_input_bank->pp_input[0]->stream.stream_lock ); + if( !p_input_bank->pp_input[0]->b_die ) + { + /* New input or stream map change */ + if( p_input_bank->pp_input[0]->stream.b_changed || + p_main->p_intf->p_sys->i_part != + p_input_bank->pp_input[0]->stream.p_selected_area->i_part ) + { + setupMenus(); + p_main->p_intf->p_sys->b_disabled_menus = 0; + } + } + vlc_mutex_unlock( &p_input_bank->pp_input[0]->stream.stream_lock ); + } + else if ( !p_main->p_intf->p_sys->b_disabled_menus ) + { + setupMenus(); + p_main->p_intf->p_sys->b_disabled_menus = 1; + } + return( 0 ); +} + +void Intf_VLCWrapper::quit() +{ + p_main->p_intf->b_die = 1; +} + +/* playlist control */ +bool Intf_VLCWrapper::playlistPlay() +{ + if( p_input_bank->pp_input[0] != NULL ) + { + input_SetStatus( p_input_bank->pp_input[0], INPUT_STATUS_PLAY ); + p_main->p_playlist->b_stopped = 0; + } + else + { + vlc_mutex_lock( &p_main->p_playlist->change_lock ); + + if( p_main->p_playlist->b_stopped ) + { + if( p_main->p_playlist->i_size ) + { + vlc_mutex_unlock( &p_main->p_playlist->change_lock ); + intf_PlaylistJumpto( p_main->p_playlist, + p_main->p_playlist->i_index ); + } + else + { + vlc_mutex_unlock( &p_main->p_playlist->change_lock ); + } + } + else + { + vlc_mutex_unlock( &p_main->p_playlist->change_lock ); + } + } + + return( true ); + +} + +void Intf_VLCWrapper::playlistPause() +{ + if ( p_input_bank->pp_input[0] != NULL ) + { + input_SetStatus( p_input_bank->pp_input[0], INPUT_STATUS_PAUSE ); + + vlc_mutex_lock( &p_main->p_playlist->change_lock ); + p_main->p_playlist->b_stopped = 0; + vlc_mutex_unlock( &p_main->p_playlist->change_lock ); + } +} + +void Intf_VLCWrapper::playlistStop() +{ + if( p_input_bank->pp_input[0] != NULL ) + { + /* end playing item */ + p_input_bank->pp_input[0]->b_eof = 1; + + /* update playlist */ + vlc_mutex_lock( &p_main->p_playlist->change_lock ); + + p_main->p_playlist->i_index--; + p_main->p_playlist->b_stopped = 1; + + vlc_mutex_unlock( &p_main->p_playlist->change_lock ); + } + +} + +void Intf_VLCWrapper::playlistNext() +{ + if( p_input_bank->pp_input[0] != NULL ) + { + p_input_bank->pp_input[0]->b_eof = 1; + } +} + +void Intf_VLCWrapper::playlistPrev() +{ + if( p_input_bank->pp_input[0] != NULL ) + { + /* FIXME: temporary hack */ + intf_PlaylistPrev( p_main->p_playlist ); + intf_PlaylistPrev( p_main->p_playlist ); + p_input_bank->pp_input[0]->b_eof = 1; + } +} + +//void Intf_VLCWrapper::channelNext() +//{ +// intf_thread_t * p_intf = p_main->p_intf; +// +// p_intf->p_sys->i_channel++; +// +// intf_WarnMsg( 3, "intf info: joining channel %d", p_intf->p_sys->i_channel ); +// +// vlc_mutex_lock( &p_intf->change_lock ); +// +// network_ChannelJoin( p_intf->p_sys->i_channel ); +// p_intf->pf_manage( p_intf ); +// +// vlc_mutex_unlock( &p_intf->change_lock ); +//} +// +//void Intf_VLCWrapper::channelPrev() +//{ +// intf_thread_t * p_intf = p_main->p_intf; +// +// if ( p_intf->p_sys->i_channel ) +// { +// p_intf->p_sys->i_channel--; +// } +// +// intf_WarnMsg( 3, "intf info: joining channel %d", p_intf->p_sys->i_channel ); +// +// vlc_mutex_lock( &p_intf->change_lock ); +// +// network_ChannelJoin( p_intf->p_sys->i_channel ); +// p_intf->pf_manage( p_intf ); +// +// vlc_mutex_unlock( &p_intf->change_lock ); +// +//} + +void Intf_VLCWrapper::loop() +{ + intf_thread_t * p_intf = p_main->p_intf; + + if ( p_intf->p_sys->b_loop ) + { + intf_PlaylistDelete( p_main->p_playlist, + p_main->p_playlist->i_size - 1 ); + } + else + { + intf_PlaylistAdd( p_main->p_playlist, PLAYLIST_END, + "vlc:loop" ); + } + p_intf->p_sys->b_loop = !p_intf->p_sys->b_loop; +} + + + /* playback control */ +void Intf_VLCWrapper::playSlower() +{ + if( p_input_bank->pp_input[0] != NULL ) + { + input_SetStatus( p_input_bank->pp_input[0], INPUT_STATUS_SLOWER ); + + vlc_mutex_lock( &p_main->p_playlist->change_lock ); + p_main->p_playlist->b_stopped = 0; + vlc_mutex_unlock( &p_main->p_playlist->change_lock ); + } +} + +void Intf_VLCWrapper::playFaster() +{ + if( p_input_bank->pp_input[0] != NULL ) + { + input_SetStatus( p_input_bank->pp_input[0], INPUT_STATUS_FASTER ); + + vlc_mutex_lock( &p_main->p_playlist->change_lock ); + p_main->p_playlist->b_stopped = 0; + vlc_mutex_unlock( &p_main->p_playlist->change_lock ); + } +} + +void Intf_VLCWrapper::volume_mute() +{ + if( p_aout_bank->pp_aout[0] == NULL ) return; + if( p_main->p_intf->p_sys->b_mute ) return; + p_main->p_intf->p_sys->i_saved_volume = + p_aout_bank->pp_aout[0]->i_volume; + p_aout_bank->pp_aout[0]->i_volume = 0; + p_main->p_intf->p_sys->b_mute = 1; +} + +void Intf_VLCWrapper::volume_restore() +{ + if( p_aout_bank->pp_aout[0] == NULL ) return; + + p_aout_bank->pp_aout[0]->i_volume = + p_main->p_intf->p_sys->i_saved_volume; + p_main->p_intf->p_sys->b_mute = 0; +} + +void Intf_VLCWrapper::toggle_mute() +{ + if( p_aout_bank->pp_aout[0] == NULL ) return; + if ( p_main->p_intf->p_sys->b_mute ) + { + Intf_VLCWrapper::volume_restore(); + } + else + { + Intf_VLCWrapper::volume_mute(); + } + p_main->p_intf->p_sys->b_mute = !p_main->p_intf->p_sys->b_mute; +} + +void Intf_VLCWrapper::maxvolume() +{ + if( p_aout_bank->pp_aout[0] == NULL ) return; + + if( p_main->p_intf->p_sys->b_mute ) + { + p_main->p_intf->p_sys->i_saved_volume = VOLUME_MAX; + } + else + { + p_aout_bank->pp_aout[0]->i_volume = VOLUME_MAX; + } +} + +//void Intf_VLCWrapper::fullscreen() +//{ +// if( p_vout_bank->pp_vout[0] != NULL ) +// { +// p_vout_bank->pp_vout[0]->i_changes |= VOUT_FULLSCREEN_CHANGE; +// } +//} + +void Intf_VLCWrapper::eject(){} + + /* playback info */ + +BString* Intf_VLCWrapper::getTimeAsString() +{ + static char psz_currenttime[ OFFSETTOTIME_MAX_SIZE ]; + + if( p_input_bank->pp_input[0] == NULL ) + { + return (new BString("00:00:00")); + } + + input_OffsetToTime( p_input_bank->pp_input[0], + psz_currenttime, + p_input_bank->pp_input[0]->stream.p_selected_area->i_tell ); + + return(new BString(psz_currenttime)); +} + +float Intf_VLCWrapper::getTimeAsFloat() +{ + float f_time = 0.0; + + if( p_input_bank->pp_input[0] != NULL ) + { + f_time = (float)p_input_bank->pp_input[0]->stream.p_selected_area->i_tell / + (float)p_input_bank->pp_input[0]->stream.p_selected_area->i_size; + } + + return( f_time ); +} + +void Intf_VLCWrapper::setTimeAsFloat(float f_position) +{ + if( p_input_bank->pp_input[0] != NULL ) + { + input_Seek( p_input_bank->pp_input[0], + (long long int)(p_input_bank->pp_input[0]->stream.p_selected_area->i_size * f_position) ); + } +} + +bool Intf_VLCWrapper::playlistPlaying() +{ + return( !p_main->p_playlist->b_stopped ); +} + +BList *Intf_VLCWrapper::playlistAsArray() +{ + int i; + BList* p_list = new BList(p_main->p_playlist->i_size); + + vlc_mutex_lock( &p_main->p_playlist->change_lock ); + + for( i = 0; i < p_main->p_playlist->i_size; i++ ) + { + p_list->AddItem(new BString(p_main->p_playlist->p_item[i].psz_name)); + } + + vlc_mutex_unlock( &p_main->p_playlist->change_lock ); + + return( p_list ); +} + + /* open file/disc/network */ +void Intf_VLCWrapper::openFiles(BList *o_files) +{ + BString *o_file; + int i_end = p_main->p_playlist->i_size; + intf_thread_t * p_intf = p_main->p_intf; + + if ( p_intf->p_sys->b_loop ) + { + intf_PlaylistDelete( p_main->p_playlist, + p_main->p_playlist->i_size - 1 ); + } + + while( ( o_file = (BString *)o_files->LastItem() ) ) + { + o_files->RemoveItem(o_files->CountItems() - 1); + intf_PlaylistAdd( p_main->p_playlist, PLAYLIST_END, + o_file->String() ); + delete o_file; + } + + /* end current item, select first added item */ + if( p_input_bank->pp_input[0] != NULL ) + { + p_input_bank->pp_input[0]->b_eof = 1; + } + + intf_PlaylistJumpto( p_main->p_playlist, i_end - 1 ); + + if ( p_intf->p_sys->b_loop ) + { + intf_PlaylistAdd( p_main->p_playlist, PLAYLIST_END, + "vlc:loop" ); + } +} + +void Intf_VLCWrapper::openDisc(BString o_type, BString o_device, int i_title, int i_chapter) +{ + BString o_source(""); + int i_end = p_main->p_playlist->i_size; + intf_thread_t * p_intf = p_main->p_intf; + + o_source << o_type << ":" << o_device ; + //i_title, i_chapter; + + if ( p_intf->p_sys->b_loop ) + { + intf_PlaylistDelete( p_main->p_playlist, + p_main->p_playlist->i_size - 1 ); + } + + intf_PlaylistAdd( p_main->p_playlist, PLAYLIST_END, + o_source.String() ); + + /* stop current item, select added item */ + if( p_input_bank->pp_input[0] != NULL ) + { + p_input_bank->pp_input[0]->b_eof = 1; + } + + intf_PlaylistJumpto( p_main->p_playlist, i_end - 1 ); + + if ( p_intf->p_sys->b_loop ) + { + intf_PlaylistAdd( p_main->p_playlist, PLAYLIST_END, + "vlc:loop" ); + } +} + +void Intf_VLCWrapper::openNet(BString o_addr, int i_port) +{ +} + +void Intf_VLCWrapper::openNetChannel(BString o_addr, int i_port) +{ +} + +void Intf_VLCWrapper::openNetHTTP(BString o_addr) +{ +} + + + /* menus management */ + void Intf_VLCWrapper::toggleProgram(int i_program){} + +void Intf_VLCWrapper::toggleTitle(int i_title) +{ + input_thread_t * p_input = p_input_bank->pp_input[0]; + + input_ChangeArea( p_input, + p_input->stream.pp_areas[i_title] ); + + vlc_mutex_lock( &p_input->stream.stream_lock ); + setupMenus(); + + vlc_mutex_unlock( &p_input->stream.stream_lock ); + input_SetStatus( p_input, INPUT_STATUS_PLAY ); +} + +void Intf_VLCWrapper::toggleChapter(int i_chapter) +{ + input_thread_t * p_input = p_input_bank->pp_input[0]; + p_input->stream.p_selected_area->i_part = i_chapter; + input_ChangeArea( p_input, + p_input->stream.p_selected_area ); + + vlc_mutex_lock( &p_input->stream.stream_lock ); + setupMenus(); + vlc_mutex_unlock( &p_input->stream.stream_lock ); + + input_SetStatus( p_input, INPUT_STATUS_PLAY ); +} + + void Intf_VLCWrapper::toggleLanguage(int i_language){} + void Intf_VLCWrapper::toggleSubtitle(int i_subtitle){} + void Intf_VLCWrapper::setupMenus(){} + diff --git a/plugins/beos/intf_vlc_wrapper.h b/plugins/beos/intf_vlc_wrapper.h new file mode 100644 index 0000000000..8ebddda58e --- /dev/null +++ b/plugins/beos/intf_vlc_wrapper.h @@ -0,0 +1,91 @@ +/***************************************************************************** + * intf_vlc_wrapper.h: BeOS plugin for vlc (derived from MacOS X port ) + ***************************************************************************** + * Copyright (C) 2001 VideoLAN + * $Id: intf_vlc_wrapper.h,v 1.1.2.1 2002/07/13 11:33:11 tcastley Exp $ + * + * Authors: Florian G. Pflug + * Jon Lech Johansen + * Tony Casltey + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. + *****************************************************************************/ +class InterfaceWindow; + +/***************************************************************************** + * intf_sys_t: description and status of FB interface + *****************************************************************************/ +typedef struct intf_sys_s +{ + InterfaceWindow * p_window; + char i_key; + int b_disabled_menus; + int i_part; + int i_saved_volume; + int b_loop; + int i_channel; + int b_mute; +} intf_sys_t; + +/* Intf_VLCWrapper is a singleton class + (only one instance at any time) */ +class Intf_VLCWrapper +{ +public: + static bool manage(); + static void quit(); + /* playlist control */ + static bool playlistPlay(); + static void playlistPause(); + static void playlistStop(); + static void playlistNext(); + static void playlistPrev(); +// static void channelNext(); +// static void channelPrev(); + static void loop(); + + /* playback control */ + static void playSlower(); + static void playFaster(); + static void volume_mute(); + static void volume_restore(); + static void toggle_mute(); + static void maxvolume(); +// static void fullscreen(); + static void eject(); + + /* playback info */ + static BString* getTimeAsString(); + static float getTimeAsFloat(); + static void setTimeAsFloat(float i_offset); + static bool playlistPlaying(); + static BList* playlistAsArray(); + + /* open file/disc/network */ + static void openFiles(BList *o_files); + static void openDisc(BString o_type, BString o_device, int i_title, int i_chapter); + static void openNet(BString o_addr, int i_port); + static void openNetChannel(BString o_addr, int i_port); + static void openNetHTTP(BString o_addr); + + /* menus management */ + static void toggleProgram(int i_program); + static void toggleTitle(int i_title); + static void toggleChapter(int i_chapter); + static void toggleLanguage(int i_language); + static void toggleSubtitle(int i_subtitle); + static void setupMenus(); +}; + diff --git a/plugins/filter/crop.c b/plugins/filter/crop.c new file mode 100644 index 0000000000..da94655160 --- /dev/null +++ b/plugins/filter/crop.c @@ -0,0 +1,502 @@ +/***************************************************************************** + * crop.c : Crop video plugin for vlc + ***************************************************************************** + * Copyright (C) 2002 VideoLAN + * $Id: crop.c,v 1.1.2.2 2002/06/02 02:04:37 sam Exp $ + * + * Authors: Samuel Hocevar + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. + *****************************************************************************/ + +/***************************************************************************** + * Preamble + *****************************************************************************/ +#include +#include /* malloc(), free() */ +#include + +#include + +#include "video.h" +#include "video_output.h" + +#include "filter_common.h" + +/***************************************************************************** + * Capabilities defined in the other files. + *****************************************************************************/ +static void vout_getfunctions( function_list_t * p_function_list ); + +/***************************************************************************** + * Build configuration tree. + *****************************************************************************/ +MODULE_CONFIG_START +ADD_CATEGORY_HINT( N_("Miscellaneous"), NULL ) +ADD_STRING ( "crop-geometry", NULL, NULL, N_("Crop geometry"), N_("Set the geometry of the zone to crop") ) +ADD_BOOL ( "autocrop", 0, NULL, N_("Automatic cropping"), N_("Activate automatic black border cropping") ) +MODULE_CONFIG_STOP + +MODULE_INIT_START + SET_DESCRIPTION( _("image crop video module") ) + /* Capability score set to 0 because we don't want to be spawned + * as a video output unless explicitly requested to */ + ADD_CAPABILITY( VOUT, 0 ) + ADD_SHORTCUT( "crop" ) +MODULE_INIT_STOP + +MODULE_ACTIVATE_START + vout_getfunctions( &p_module->p_functions->vout ); +MODULE_ACTIVATE_STOP + +MODULE_DEACTIVATE_START +MODULE_DEACTIVATE_STOP + +/***************************************************************************** + * vout_sys_t: Crop video output method descriptor + ***************************************************************************** + * This structure is part of the video output thread descriptor. + * It describes the Crop specific properties of an output thread. + *****************************************************************************/ +typedef struct vout_sys_s +{ + vout_thread_t *p_vout; + + unsigned int i_x, i_y; + unsigned int i_width, i_height, i_aspect; + + boolean_t b_autocrop; + + /* Autocrop specific variables */ + unsigned int i_lastchange; + boolean_t b_changed; + +} vout_sys_t; + +/***************************************************************************** + * Local prototypes + *****************************************************************************/ +static int vout_Create ( vout_thread_t * ); +static int vout_Init ( vout_thread_t * ); +static void vout_End ( vout_thread_t * ); +static void vout_Destroy ( vout_thread_t * ); +static int vout_Manage ( vout_thread_t * ); +static void vout_Render ( vout_thread_t *, picture_t * ); +static void vout_Display ( vout_thread_t *, picture_t * ); + +static void UpdateStats ( vout_thread_t *, picture_t * ); + +/***************************************************************************** + * Functions exported as capabilities. They are declared as static so that + * we don't pollute the namespace too much. + *****************************************************************************/ +static void vout_getfunctions( function_list_t * p_function_list ) +{ + p_function_list->functions.vout.pf_create = vout_Create; + p_function_list->functions.vout.pf_init = vout_Init; + p_function_list->functions.vout.pf_end = vout_End; + p_function_list->functions.vout.pf_destroy = vout_Destroy; + p_function_list->functions.vout.pf_manage = vout_Manage; + p_function_list->functions.vout.pf_render = vout_Render; + p_function_list->functions.vout.pf_display = vout_Display; +} + +/***************************************************************************** + * vout_Create: allocates Crop video thread output method + ***************************************************************************** + * This function allocates and initializes a Crop vout method. + *****************************************************************************/ +static int vout_Create( vout_thread_t *p_vout ) +{ + /* Allocate structure */ + p_vout->p_sys = malloc( sizeof( vout_sys_t ) ); + if( p_vout->p_sys == NULL ) + { + intf_ErrMsg( "vout error: out of memory" ); + return 1; + } + + return 0; +} + +/***************************************************************************** + * vout_Init: initialize Crop video thread output method + *****************************************************************************/ +static int vout_Init( vout_thread_t *p_vout ) +{ + int i_index; + char *psz_var; + picture_t *p_pic; + + I_OUTPUTPICTURES = 0; + + p_vout->p_sys->i_lastchange = 0; + p_vout->p_sys->b_changed = 0; + + /* Initialize the output structure */ + 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; + p_vout->output.i_aspect = p_vout->render.i_aspect; + + /* Shall we use autocrop ? */ + p_vout->p_sys->b_autocrop = config_GetIntVariable( "autocrop" ); + + /* Get geometry value from the user */ + psz_var = config_GetPszVariable( "crop-geometry" ); + if( psz_var ) + { + char *psz_parser, *psz_tmp; + + psz_parser = psz_tmp = psz_var; + while( *psz_tmp && *psz_tmp != 'x' ) psz_tmp++; + + if( *psz_tmp ) + { + psz_tmp[0] = '\0'; + p_vout->p_sys->i_width = atoi( psz_parser ); + + psz_parser = ++psz_tmp; + while( *psz_tmp && *psz_tmp != '+' ) psz_tmp++; + + if( *psz_tmp ) + { + psz_tmp[0] = '\0'; + p_vout->p_sys->i_height = atoi( psz_parser ); + + psz_parser = ++psz_tmp; + while( *psz_tmp && *psz_tmp != '+' ) psz_tmp++; + + if( *psz_tmp ) + { + psz_tmp[0] = '\0'; + p_vout->p_sys->i_x = atoi( psz_parser ); + p_vout->p_sys->i_y = atoi( ++psz_tmp ); + } + else + { + p_vout->p_sys->i_x = atoi( psz_parser ); + p_vout->p_sys->i_y = + ( p_vout->output.i_height - p_vout->p_sys->i_height ) / 2; + } + } + else + { + p_vout->p_sys->i_height = atoi( psz_parser ); + p_vout->p_sys->i_x = + ( p_vout->output.i_width - p_vout->p_sys->i_width ) / 2; + p_vout->p_sys->i_y = + ( p_vout->output.i_height - p_vout->p_sys->i_height ) / 2; + } + } + else + { + p_vout->p_sys->i_width = atoi( psz_parser ); + p_vout->p_sys->i_height = p_vout->output.i_height; + p_vout->p_sys->i_x = + ( p_vout->output.i_width - p_vout->p_sys->i_width ) / 2; + p_vout->p_sys->i_y = + ( p_vout->output.i_height - p_vout->p_sys->i_height ) / 2; + } + + /* Check for validity */ + if( p_vout->p_sys->i_x + p_vout->p_sys->i_width + > p_vout->output.i_width ) + { + p_vout->p_sys->i_x = 0; + if( p_vout->p_sys->i_width > p_vout->output.i_width ) + { + p_vout->p_sys->i_width = p_vout->output.i_width; + } + } + + if( p_vout->p_sys->i_y + p_vout->p_sys->i_height + > p_vout->output.i_height ) + { + p_vout->p_sys->i_y = 0; + if( p_vout->p_sys->i_height > p_vout->output.i_height ) + { + p_vout->p_sys->i_height = p_vout->output.i_height; + } + } + + free( psz_var ); + } + else + { + p_vout->p_sys->i_width = p_vout->output.i_width; + p_vout->p_sys->i_height = p_vout->output.i_height; + p_vout->p_sys->i_x = p_vout->p_sys->i_y = 0; + } + + /* Pheeew. Parsing done. */ + intf_WarnMsg( 3, "vout info: cropping at %ix%i+%i+%i, %sautocropping", + p_vout->p_sys->i_width, p_vout->p_sys->i_height, + p_vout->p_sys->i_x, p_vout->p_sys->i_y, + p_vout->p_sys->b_autocrop ? "" : "not " ); + + /* Set current output image properties */ + p_vout->p_sys->i_aspect = p_vout->output.i_aspect + * p_vout->output.i_height / p_vout->p_sys->i_height + * p_vout->p_sys->i_width / p_vout->output.i_width; + + /* Try to open the real video output */ + psz_var = config_GetPszVariable( "filter" ); + config_PutPszVariable( "filter", NULL ); + + intf_WarnMsg( 3, "vout info: spawning the real video outputs" ); + + p_vout->p_sys->p_vout = + vout_CreateThread( NULL, + p_vout->p_sys->i_width, p_vout->p_sys->i_height, + p_vout->render.i_chroma, p_vout->p_sys->i_aspect ); + if( p_vout->p_sys->p_vout == NULL ) + { + intf_ErrMsg( "vout error: failed to create vout" ); + config_PutPszVariable( "filter", psz_var ); + if( psz_var ) free( psz_var ); + return 0; + } + + config_PutPszVariable( "filter", psz_var ); + if( psz_var ) free( psz_var ); + + ALLOCATE_DIRECTBUFFERS( VOUT_MAX_PICTURES ); + + return 0; +} + +/***************************************************************************** + * vout_End: terminate Crop video thread output method + *****************************************************************************/ +static void vout_End( vout_thread_t *p_vout ) +{ + int i_index; + + /* Free the fake output buffers we allocated */ + for( i_index = I_OUTPUTPICTURES ; i_index ; ) + { + i_index--; + free( PP_OUTPUTPICTURE[ i_index ]->p_data_orig ); + } +} + +/***************************************************************************** + * vout_Destroy: destroy Crop video thread output method + ***************************************************************************** + * Terminate an output method created by CropCreateOutputMethod + *****************************************************************************/ +static void vout_Destroy( vout_thread_t *p_vout ) +{ + vout_DestroyThread( p_vout->p_sys->p_vout, NULL ); + free( p_vout->p_sys ); +} + +/***************************************************************************** + * vout_Manage: handle Crop events + ***************************************************************************** + * This function should be called regularly by video output thread. It manages + * console events. It returns a non null value on error. + *****************************************************************************/ +static int vout_Manage( vout_thread_t *p_vout ) +{ + if( !p_vout->p_sys->b_changed ) + { + return 0; + } + + vout_DestroyThread( p_vout->p_sys->p_vout, NULL ); + + p_vout->p_sys->p_vout = + vout_CreateThread( NULL, + p_vout->p_sys->i_width, p_vout->p_sys->i_height, + p_vout->render.i_chroma, p_vout->p_sys->i_aspect ); + if( p_vout->p_sys->p_vout == NULL ) + { + intf_ErrMsg( "vout error: failed to create vout" ); + return 1; + } + + p_vout->p_sys->b_changed = 0; + p_vout->p_sys->i_lastchange = 0; + + return 0; +} + +/***************************************************************************** + * vout_Render: display previously rendered output + ***************************************************************************** + * This function sends the currently rendered image to Crop image, waits + * until it is displayed and switches the two rendering buffers, preparing next + * frame. + *****************************************************************************/ +static void vout_Render( vout_thread_t *p_vout, picture_t *p_pic ) +{ + picture_t *p_outpic = NULL; + int i_plane; + + if( p_vout->p_sys->b_changed ) + { + return; + } + + while( ( p_outpic = + vout_CreatePicture( p_vout->p_sys->p_vout, 0, 0, 0 ) + ) == NULL ) + { + if( p_vout->b_die || p_vout->b_error ) + { + vout_DestroyPicture( p_vout->p_sys->p_vout, p_outpic ); + return; + } + + msleep( VOUT_OUTMEM_SLEEP ); + } + + vout_DatePicture( p_vout->p_sys->p_vout, p_outpic, p_pic->date ); + vout_LinkPicture( p_vout->p_sys->p_vout, p_outpic ); + + for( i_plane = 0 ; i_plane < p_pic->i_planes ; i_plane++ ) + { + u8 *p_in, *p_out, *p_out_end; + int i_in_pitch = p_pic->p[i_plane].i_pitch; + const int i_out_pitch = p_outpic->p[i_plane].i_pitch; + + p_in = p_pic->p[i_plane].p_pixels + /* Skip the right amount of lines */ + + i_in_pitch * ( p_pic->p[i_plane].i_lines * p_vout->p_sys->i_y + / p_vout->output.i_height ) + /* Skip the right amount of columns */ + + i_in_pitch * p_vout->p_sys->i_x / p_vout->output.i_width; + + p_out = p_outpic->p[i_plane].p_pixels; + p_out_end = p_out + i_out_pitch * p_outpic->p[i_plane].i_lines; + + while( p_out < p_out_end ) + { + FAST_MEMCPY( p_out, p_in, i_out_pitch ); + p_in += i_in_pitch; + p_out += i_out_pitch; + } + } + + vout_UnlinkPicture( p_vout->p_sys->p_vout, p_outpic ); + vout_DisplayPicture( p_vout->p_sys->p_vout, p_outpic ); + + /* The source image may still be in the cache ... parse it! */ + if( !p_vout->p_sys->b_autocrop ) + { + return; + } + + UpdateStats( p_vout, p_pic ); +} + +/***************************************************************************** + * vout_Display: displays previously rendered output + ***************************************************************************** + * This function send the currently rendered image to Invert image, waits + * until it is displayed and switch the two rendering buffers, preparing next + * frame. + *****************************************************************************/ +static void vout_Display( vout_thread_t *p_vout, picture_t *p_pic ) +{ + ; +} + +static void UpdateStats( vout_thread_t *p_vout, picture_t *p_pic ) +{ + u8 *p_in = p_pic->p[0].p_pixels; + int i_pitch = p_pic->p[0].i_pitch; + int i_lines = p_pic->p[0].i_lines; + int i_firstwhite = -1, i_lastwhite = -1, i; + + /* Determine where black borders are */ + switch( p_vout->output.i_chroma ) + { + case FOURCC_I420: + /* XXX: Do not laugh ! I know this is very naive. But it's just a + * proof of concept code snippet... */ + for( i = i_lines ; i-- ; ) + { + const int i_col = i * i_pitch / i_lines; + + if( p_in[i_col/2] > 40 + && p_in[i_pitch / 2] > 40 + && p_in[i_pitch/2 + i_col/2] > 40 ) + { + if( i_lastwhite == -1 ) + { + i_lastwhite = i; + } + i_firstwhite = i; + } + p_in += i_pitch; + } + break; + + default: + break; + } + + /* Decide whether it's worth changing the size */ + if( i_lastwhite == -1 ) + { + p_vout->p_sys->i_lastchange = 0; + return; + } + + if( i_lastwhite - i_firstwhite < p_vout->p_sys->i_height / 2 ) + { + p_vout->p_sys->i_lastchange = 0; + return; + } + + if( i_lastwhite - i_firstwhite < p_vout->p_sys->i_height + 16 + && i_lastwhite - i_firstwhite + 16 > p_vout->p_sys->i_height ) + { + p_vout->p_sys->i_lastchange = 0; + return; + } + + /* We need at least 25 images to make up our mind */ + p_vout->p_sys->i_lastchange++; + if( p_vout->p_sys->i_lastchange < 25 ) + { + return; + } + + /* Tune a few values */ + if( i_firstwhite & 1 ) + { + i_firstwhite--; + } + + if( !(i_lastwhite & 1) ) + { + i_lastwhite++; + } + + /* Change size */ + p_vout->p_sys->i_y = i_firstwhite; + p_vout->p_sys->i_height = i_lastwhite - i_firstwhite + 1; + + p_vout->p_sys->i_aspect = p_vout->output.i_aspect + * p_vout->output.i_height / p_vout->p_sys->i_height + * p_vout->p_sys->i_width / p_vout->output.i_width; + + p_vout->p_sys->b_changed = 1; +} + diff --git a/vlc.spec b/vlc.spec index 3ddbe2af0a..12acd634bb 100644 --- a/vlc.spec +++ b/vlc.spec @@ -1,7 +1,7 @@ %define name vlc -%define vlc_ver 0.4.0 +%define vlc_ver 0.4.4 %define version %vlc_ver %define cvs 0 @@ -287,6 +287,8 @@ rm -fr %buildroot %{_libdir}/videolan/vlc/filter_invert.so %{_libdir}/videolan/vlc/filter_transform.so %{_libdir}/videolan/vlc/filter_wall.so +%{_libdir}/videolan/vlc/filter_clone.so +%{_libdir}/videolan/vlc/filter_crop.so %{_libdir}/videolan/vlc/fx_scope.so %{_libdir}/videolan/vlc/http.so %{_libdir}/videolan/vlc/ipv4.so @@ -409,6 +411,18 @@ rm -fr %buildroot %{_libdir}/videolan/vlc/alsa.so %changelog +* Sun Aug 11 2002 Yves Duret 0.4.4-1mdk +- new upstream release + +* Fri Jul 26 2002 Yves Duret 0.4.3-1mdk +- new upstream release + +* Sun Jul 7 2002 Yves Duret 0.4.2-1mdk +- new upstream release + +* Mon Jun 3 2002 Yves Duret 0.4.1-1mdk +- new upstream release + * Thu May 23 2002 Yves Duret 0.4.0-1mdk - version 0.4.0 with MPEG4 (DivX) support thx ffmpeg. thus s/MPEG, MPEG2 and DVD/multimedia/g