From a4d6ff5f458f5cc472c846de706306e47b12e89e Mon Sep 17 00:00:00 2001 From: Unknown Date: Fri, 5 Mar 2004 15:21:15 +0000 Subject: [PATCH] This commit was manufactured by cvs2svn to create tag 'v0_4_6'. --- AUTHORS | 25 + BUGS | 5 +- ChangeLog | 242 +- FAQ | 102 +- INSTALL.win32 | 6 +- Makefile | 17 +- Makefile.modules | 2 +- Makefile.opts.in | 6 + README.MacOSX.rtf | 78 +- TODO | 8 +- configure | 18134 +++++++++++++++++------- configure.in | 330 +- extras/MacOSX/Resources/divx.icns | Bin 0 -> 48233 bytes extras/MacOSX/Resources/generic.icns | Bin 0 -> 47409 bytes extras/MacOSX/Resources/mpeg.icns | Bin 0 -> 47878 bytes extras/MacOSX/Resources/mpeg1.icns | Bin 0 -> 48220 bytes extras/MacOSX/Resources/mpeg2.icns | Bin 0 -> 48212 bytes extras/MacOSX/Resources/mpeg4.icns | Bin 0 -> 48018 bytes ipkg/control | 4 +- ipkg/control.gpe | 16 + ipkg/control.opie | 16 + ipkg/postinst.gpe | 13 + ipkg/postinst.opie | 5 + ipkg/postrm.gpe | 11 + ipkg/postrm.opie | 4 + ipkg/rules | 2 +- ipkg/{patch => sdl.patch} | 0 ipkg/vlc.desktop | 5 + ipkg/vlc.gpe | 9 + ipkg/vlc.opie | 4 + MODULES => plugins/LIST | 6 +- plugins/access/rtp.c | 338 + plugins/beos/ListViews.cpp | 641 + plugins/beos/ListViews.h | 115 + plugins/beos/intf_vlc_wrapper.cpp | 852 ++ plugins/beos/intf_vlc_wrapper.h | 114 + plugins/familiar/Makefile | 1 + plugins/familiar/familiar.c | 301 + plugins/familiar/familiar.glade | 560 + plugins/familiar/familiar.h | 48 + plugins/familiar/familiar_callbacks.c | 617 + plugins/familiar/familiar_callbacks.h | 100 + plugins/familiar/familiar_interface.c | 499 + plugins/familiar/familiar_interface.h | 5 + plugins/familiar/familiar_support.c | 162 + plugins/familiar/familiar_support.h | 61 + plugins/filter/crop.c | 502 + plugins/qte/Makefile | 3 + plugins/qte/qte.c | 54 + plugins/qte/qte.cpp | 593 + share/familiar-forwardb16x16.xpm | 21 + share/familiar-openb16x16.xpm | 21 + share/familiar-pauseb16x16.xpm | 21 + share/familiar-playb16x16.xpm | 21 + share/familiar-preferencesb16x16.xpm | 21 + share/familiar-rewindb16x16.xpm | 21 + share/familiar-stopb16x16.xpm | 21 + share/vlc16x16.xpm | 90 + vlc.spec | 51 +- 59 files changed, 19500 insertions(+), 5404 deletions(-) create mode 100644 extras/MacOSX/Resources/divx.icns create mode 100644 extras/MacOSX/Resources/generic.icns create mode 100644 extras/MacOSX/Resources/mpeg.icns create mode 100644 extras/MacOSX/Resources/mpeg1.icns create mode 100644 extras/MacOSX/Resources/mpeg2.icns create mode 100644 extras/MacOSX/Resources/mpeg4.icns create mode 100644 ipkg/control.gpe create mode 100644 ipkg/control.opie create mode 100755 ipkg/postinst.gpe create mode 100755 ipkg/postinst.opie create mode 100755 ipkg/postrm.gpe create mode 100755 ipkg/postrm.opie rename ipkg/{patch => sdl.patch} (100%) create mode 100644 ipkg/vlc.desktop create mode 100755 ipkg/vlc.gpe create mode 100755 ipkg/vlc.opie rename MODULES => plugins/LIST (95%) create mode 100644 plugins/access/rtp.c create mode 100644 plugins/beos/ListViews.cpp create mode 100644 plugins/beos/ListViews.h create mode 100644 plugins/beos/intf_vlc_wrapper.cpp create mode 100644 plugins/beos/intf_vlc_wrapper.h create mode 100644 plugins/familiar/Makefile create mode 100644 plugins/familiar/familiar.c create mode 100644 plugins/familiar/familiar.glade create mode 100644 plugins/familiar/familiar.h create mode 100644 plugins/familiar/familiar_callbacks.c create mode 100644 plugins/familiar/familiar_callbacks.h create mode 100644 plugins/familiar/familiar_interface.c create mode 100644 plugins/familiar/familiar_interface.h create mode 100644 plugins/familiar/familiar_support.c create mode 100644 plugins/familiar/familiar_support.h create mode 100644 plugins/filter/crop.c create mode 100644 plugins/qte/Makefile create mode 100644 plugins/qte/qte.c create mode 100644 plugins/qte/qte.cpp create mode 100644 share/familiar-forwardb16x16.xpm create mode 100644 share/familiar-openb16x16.xpm create mode 100644 share/familiar-pauseb16x16.xpm create mode 100644 share/familiar-playb16x16.xpm create mode 100644 share/familiar-preferencesb16x16.xpm create mode 100644 share/familiar-rewindb16x16.xpm create mode 100644 share/familiar-stopb16x16.xpm create mode 100644 share/vlc16x16.xpm diff --git a/AUTHORS b/AUTHORS index 04cfadccc0..f2a24b87fa 100644 --- a/AUTHORS +++ b/AUTHORS @@ -87,6 +87,12 @@ C: tcastley D: BeOS interface, BeOS Video S: Australia +N: Stephan Assmus +E: +C: stippi +D: BeOS interface, BeOS video +S: + N: Rudolf Cornelissen E: rag.cornelissen@inter.nl.net D: BeOS fixes @@ -176,6 +182,15 @@ E: alexis.guillard@bt.com D: IPv6 S: United Kingdom +N: Roine Gustafsson +E: roine@popstar.com +D: spudec bug fixes + +N: Gerald Hansink +E: gerald.hansink@ordina.nl +D: Qt Embedded Video Output +S: Netherlands + N: Shane Harper E: shanegh@optusnet.com.au D: SDL plugin fixes and enhancements @@ -299,6 +314,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,10 +339,16 @@ 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 D: iPAQ port +D: Familiar Linux interface S: Netherlands N: Steven M. Schultz 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..dbcb07ccdc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,9 +2,247 @@ # ChangeLog for vlc # #===================# -HEAD +0.4.6 +Wed, 13 Nov 2002 23:41:00 +0200 - * Nothing yet. + * FAQ: changed Debian repository location to HTTP (for better upload + stats estimations on our side). + * plugins/a52/a52.c: is now the default ac3/a52 decoder (because it has a + nicer audio quality than ac3_adec). + * configure, Makefile.modules, configure.in: --enable-familiar accepts now: + --with-sdl-prefix=[PATH], --enable-gtk-prefix=[PATH] and + --enable-gpe-prefix=[PATH] to enable cross-compiling. + * plugins/familiar/familiar_callbacks.c: Bug in ReadDirectory() it results + in empty file/directory names in the user interface. + * configure.in: Added GPE support to familiar interface. + Use --with-gpe-prefix= to enable it. + * ipkg/*: GPE is integrated in familiar files. + * ipkg/*: Familiar packaging files. + * include/defs.h.in: Added HAVE_GPE_INIT_H define for autodetection of + libgpewidget and GPE headerfiles. + * ALL: changes to reflect the fact that libdvdcss now needs a colon after + the DVD drive letter. + * src/misc/modules.c: plugin extension check is now case unsensitive. + * plugins/dsp/aout_dsp.c: replaced O_NONBLOCK by O_NDELAY, and put the + device back in blocking mode once open. + * plugins/network/ipv4.c: fixed a crash with multicast addresses when no + interface address is given. + * plugins/directx/vout_directx.c: fixed a nasty segfault on initialization. + * plugins/dsp/aout_dsp.c: Added O_NONBLOCK flag to the open command, + so that if /dev/dsp is used, vlc tries with other plugins (like esd). + +0.4.5 +Fri, 11 Oct 2002 15:37:41 +0200 + + * src/interface/main.c, src/misc/modules.c: added a quick hack for a + --plugin-path command line option. + * INSTALL.win32: removed note about running in administrator mode to play + a DVD. + * ./plugins/beos/InterfaceWindow.cpp: user can now drop a DVD disk icon + onto the interface or playlist window to open a DVD. + * ./plugins/x11/xcommon.c: we include Xmd.h before dpms.h (compilation fix + for Solaris). + * ALL: many BeOS fixes and enhancements. + * ALL: VLC is now compliant with MPEG-2 TS standards embedding A/52 + audio. It can still read from the old VLS with --vls-backwards-compat. + * ./plugins/familiar: interface for familiar Linux. + * ./plugins/qte: Qt/embedded video output. + * ./plugins/network/ipv4.c: added a --iface-addr option to select which + interface to use for multicast sockets. + * configure.in, configure: use -mms-bitfields instead of -fnative-struct + for mingw32 gcc-3.x. + * include/interface.h, plugins/dummy/intf_dummy.c, plugins/text/logger.c, + plugins/text/rc.c: display message on Win32 explaining how to get back + to the GUI mode. + * include/threads_funcs.h, src/misc/win32_specific.c: ignore the + win9x-cv-method config option on WinNT when fast-mutex is not enabled. + * plugins/access/rtp.c: backported RTP access module from HEAD. + * plugins/access/http.c: fixed a compile issue in the HTTP plug-in. + * configure.in: fixed bug with $(QTDIR). + * plugins/filter/deinterlace.c: fixed an issue with the linear method. + +0.4.4 +Sun, 11 Aug 2002 01:18:13 +0200 + + * ./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/FAQ b/FAQ index d4f335baa1..4b02a51616 100644 --- a/FAQ +++ b/FAQ @@ -1,5 +1,5 @@ Frequentely Asked Questions for VideoLAN Client -$Id: FAQ,v 1.6 2002/05/02 23:06:27 massiot Exp $ +$Id: FAQ,v 1.6.2.3 2002/11/13 09:45:50 sam Exp $ 1. Using VLC @@ -41,7 +41,7 @@ more information. ----------------------------------------------------- If you don't know what is a raw device, don't even read this answer :-). There is an experimental support for raw devices in libdvdcss. It needs -that you set up a raw device pointing to your DVD device (under Linux, +that you set up a raw device pointing to your DVD device (under Linux, use the "raw" utility). Then pass the raw device as second argument, for instance : vlc dvd:/dev/dvd@/dev/raw0 @@ -55,6 +55,41 @@ You shouldn't need any option. If you're paranoid and want to control everything, here is the exact syntax : vlc udp:[[:]][@[][:]] +1.8 How do I uninstall / reinstall VLC ? +-------------------------------------- +Why would you want to ? ;) + +If you're using a source distribution of VLC, for example a tarball or +the CVS, then you have probably used "make install" to install the +compiled VLC. To remove it just "make uninstall". If you want to +install a newer version than the currently installed one, you should +first uninstall the first one. If you deleted the original source tree, +a "make uninstall" in the newer tree should still work. + +For binary packages, remove old packages first and install the new ones +(normally this should be handled automagically by your sytem). + +1.9 Debian: what should I put in my sources.list for videolan ? +------------------------------------------------------------- +deb http://www.videolan.org/pub/videolan/debian $(ARCH)/ +deb-src http://www.videolan.org/pub/videolan/debian sources/ + +1.10 How can I save my VLC configuration ? +---------------------------------------- +Currently, the only way to save the configuration options in VLC is through +the preferences menu in one of the graphical user interface plugins. + +1.11 Where does VLC store it's config file ? +------------------------------------------ +Currently, a config file is created on a per user basis (there is no global +configuration file). If you modify the available options in VLC and save the +new configuration, then a configuration file will be created in your user +directory. The precise location of this file depends on the Operating System +you are running: + +- Unices (linux, etc...): "~/.videolan/vlcrc" +- Windows: "Application Data\videolan\vlcrc" + 2. Troubleshooting @@ -118,7 +153,48 @@ is being investigated. 2.9 Sound volume is too low ---------------------------- -You can raise it with --volume commandline switch. +You can raise it with --volume commandline switch or in the preferences +window of your graphical interface. + +2.10 I have no image under DirectX +---------------------------------- +Check that your video card drivers are in their latest version and that +your DirectX is up-to-date. + +2.11 VLC crashes +---------------- +Increase the verbosity level (either in the preferences or with a +"-vvvv" command-line option) and look at the debug messages (on the +terminal or in the Messages window). + +2.12 I can only play a DVD as root +---------------------------------- +Check that as user you have write access to your DVD drive / device. + +2.13 I'm stuck with option xxx, how do I reset options ? +------------------------------------------------------ +Under unices, remove your ~/.videolan/vlcrc; for Windows, remove vlcrc +in the videolan subfolder of your "Application Data" directory. + +2.14 I don't have access to the GUI anymore +------------------------------------------- +If you change the default interface module in the preferences menu to a non +GUI module (ie. to a command line interface) and then save the configuration, +the only way to get VLC to show a GUI again is to run it directly from the +command line. +For instance on Windows, you need to open a dos command box, go to the +directory where you installed VLC (usually +c:\Program Files\VideoLAN\VideoLAN Client) and then type "vlc --intf win32" +You will then be able to modify the configuration again and save it. + +2.15 I have just upgraded to VLC 0.4.5, and now I don't have any sound +with the streams coming from the VLS ! +--------------------------------------------------------------------------- +This is a known problem. VLC 0.4.5 and later are now compliant to general +usage regarding A/52 sound, and the new behavior is incompatible with the +previous one. VLS version 0.4.0 and later now fixes this problem. If, for +a reason or another, you wish to keep VLS 0.3.3, you can still read those +streams if you launch VLC (0.4.5 or later) with --vls-backwards-compat. 3. Ports and features @@ -130,6 +206,9 @@ You can raise it with --volume commandline switch. Currently it doesn't. We'd be glad to support them, but we lack technical information on them. +3.1.2 [REMOVED] +--------------- + 3.2 Win32 port 3.2.2 When moving the focus to another window, VLC network input stops @@ -137,3 +216,20 @@ working properly ! --------------------------------------------------------------------------- This is a known problem with Win 95-class systems. Upgrade to an NT-class system. + +3.3 Planned ports + +3.3.1 Do you have plans for a MacOS 9 / OS/2 / &{#!@}~ port ? +-------------------------------------------------------- +No, nobody reported to be actually working on a MacOS 9 port. If you +feel like you could write it, we would of course welcome it. Currently, +the developers are more interested in supporting the latest Operating +Systems and completing the functionalities. + +3.3.2 Does VLC have dxr2 / dxr3 cards support ? +--------------------------------------------- +This support is currently being developed. + +3.3.3 Does VLC support RTP ? +-------------------------- +Yes. Just use vlc rtp:@:. diff --git a/INSTALL.win32 b/INSTALL.win32 index bc0bd9f04e..a0e5926110 100644 --- a/INSTALL.win32 +++ b/INSTALL.win32 @@ -14,10 +14,8 @@ To store a debug log of the current vlc session, you can use disable the GUI. You will end-up with a vlc.log file in your current directory. If you want to play a DVD, run vlc and click on the Disc option in the -interface. You then have to type your drive letter in the 'Device name' -box (eg. 'D' if this is the letter for your dvdrom drive). -( !WARNING: you have to be in administrator mode (for now) on Win2k/XP or the - DVD won't play. ) +interface. You then have to type your drive letter followed by a colon in +the 'Device name' box (eg. 'D:' if this is the letter for your dvdrom drive). Building VideoLAN Client from the source code ============================================= diff --git a/Makefile b/Makefile index 469a6659fa..c93fcbf843 100644 --- a/Makefile +++ b/Makefile @@ -33,6 +33,7 @@ PLUGINS_DIR := a52 \ dvd \ dvdread \ esd \ + familiar \ fb \ ffmpeg \ filter \ @@ -55,8 +56,10 @@ PLUGINS_DIR := a52 \ mpeg_vdec \ network \ ogg \ + opie \ qnx \ qt \ + qte \ satellite \ sdl \ spudec \ @@ -71,6 +74,7 @@ PLUGINS_TARGETS := a52/a52 \ ac3_spdif/ac3_spdif \ access/file \ access/udp \ + access/rtp \ access/http \ alsa/alsa \ arts/arts \ @@ -94,6 +98,7 @@ PLUGINS_TARGETS := a52/a52 \ dvd/dvd \ dvdread/dvdread \ esd/esd \ + familiar/familiar \ fb/fb \ ffmpeg/ffmpeg \ filter/filter_deinterlace \ @@ -102,6 +107,7 @@ PLUGINS_TARGETS := a52/a52 \ filter/filter_distort \ filter/filter_wall \ filter/filter_clone \ + filter/filter_crop \ fx/fx_scope \ ggi/ggi \ glide/glide \ @@ -142,8 +148,10 @@ PLUGINS_TARGETS := a52/a52 \ network/ipv4 \ network/ipv6 \ ogg/vorbis \ + opie/opie \ qnx/qnx \ qt/qt \ + qte/qte \ satellite/satellite \ sdl/sdl \ spudec/spudec \ @@ -342,7 +350,7 @@ dist: echo "OK."; mkdir tmp; \ fi # Copy directory structure in tmp - find -type d | grep -v '\(\.dep\|snapshot\|CVS\)' | while read i ; \ + find . -type d | grep -v '\(\.dep\|snapshot\|CVS\)' | while read i ; \ do mkdir -p tmp/vlc/$$i ; \ done rm -Rf tmp/vlc/tmp @@ -368,7 +376,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 \ @@ -379,8 +387,8 @@ dist: for file in control changelog rules ; do \ cp debian/$$file tmp/vlc/debian/ ; done # Copy ipkg control files - for file in control rules patch ; do \ - cp ipkg/$$file tmp/vlc/ipkg/ ; done + for file in ipkg/* ; do \ + cp $$file tmp/vlc/ipkg/ ; done # Copy fonts and icons for file in share/*vlc* share/*psf; do \ cp $$file tmp/vlc/share ; done @@ -437,6 +445,7 @@ package-beos: # Copy relevant files cp vlc tmp/vlc/ strip tmp/vlc/vlc + xres -o tmp/vlc/vlc ./share/vlc_beos.rsrc cp AUTHORS COPYING ChangeLog README FAQ TODO tmp/vlc/ for file in default8x16.psf default8x9.psf ; \ do cp share/$$file tmp/vlc/share/ ; done diff --git a/Makefile.modules b/Makefile.modules index d6c33f1641..553c0c1d00 100644 --- a/Makefile.modules +++ b/Makefile.modules @@ -89,7 +89,7 @@ ifeq (,$($(module_name)_CUSTOM)) ../$(module_name).a: $(EXTRA_DEP) $(OBJ_ALL) rm -f $@ - ar rc $@ $(OBJ_ALL) + $(AR) rc $@ $(OBJ_ALL) $(RANLIB) $@ endif diff --git a/Makefile.opts.in b/Makefile.opts.in index 908fa1ce79..8500d1a600 100644 --- a/Makefile.opts.in +++ b/Makefile.opts.in @@ -63,6 +63,7 @@ dvdread_CFLAGS = @dvdread_CFLAGS@ mpeg_ts_dvbpsi_CFLAGS = @mpeg_ts_dvbpsi_CFLAGS@ directx_CFLAGS = @directx_CFLAGS@ esd_CFLAGS = @esd_CFLAGS@ +familiar_CFLAGS = @familiar_CFLAGS@ ffmpeg_CFLAGS = @ffmpeg_CFLAGS@ glide_CFLAGS = @glide_CFLAGS@ gnome_CFLAGS = @gnome_CFLAGS@ @@ -72,7 +73,9 @@ idctaltivec_CFLAGS = @idctaltivec_CFLAGS@ mad_CFLAGS = @mad_CFLAGS@ memcpyaltivec_CFLAGS = @memcpyaltivec_CFLAGS@ motionaltivec_CFLAGS = @motionaltivec_CFLAGS@ +opie_CFLAGS = @opie_CFLAGS@ qt_CFLAGS = @qt_CFLAGS@ +qte_CFLAGS = @qte_CFLAGS@ sdl_CFLAGS = @sdl_CFLAGS@ x11_CFLAGS = @x11_CFLAGS@ xvideo_CFLAGS = @xvideo_CFLAGS@ @@ -96,6 +99,7 @@ dvd_LDFLAGS = @dvd_LDFLAGS@ dvdread_LDFLAGS = @dvdread_LDFLAGS@ mpeg_ts_dvbpsi_LDFLAGS = @mpeg_ts_dvbpsi_LDFLAGS@ esd_LDFLAGS = @esd_LDFLAGS@ +familiar_LDFLAGS = @familiar_LDFLAGS@ filter_distort_LDFLAGS = @filter_distort_LDFLAGS@ ffmpeg_LDFLAGS = @ffmpeg_LDFLAGS@ ggi_LDFLAGS = @ggi_LDFLAGS@ @@ -116,8 +120,10 @@ mad_LDFLAGS = @mad_LDFLAGS@ memcpyaltivec_LDFLAGS = @memcpyaltivec_LDFLAGS@ motionaltivec_LDFLAGS = @motionaltivec_LDFLAGS@ ncurses_LDFLAGS = @ncurses_LDFLAGS@ +opie_LDFLAGS = @opie_LDFLAGS@ qnx_LDFLAGS = @qnx_LDFLAGS@ qt_LDFLAGS = @qt_LDFLAGS@ +qte_LDFLAGS = @qte_LDFLAGS@ rc_LDFLAGS = @rc_LDFLAGS@ sdl_LDFLAGS = @sdl_LDFLAGS@ vcd_LDFLAGS = @vcd_LDFLAGS@ diff --git a/README.MacOSX.rtf b/README.MacOSX.rtf index f0efcc283a..13a08498c5 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\cocoartf102 +{\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.5.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.5 2002/10/13 22:34:21 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..b7f1f10e82 100755 --- a/configure +++ b/configure @@ -1,167 +1,310 @@ #! /bin/sh - # Guess values for system-dependent variables and create Makefiles. -# Generated automatically using autoconf version 2.13 -# Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc. +# Generated by GNU Autoconf 2.53. # +# Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002 +# Free Software Foundation, Inc. # This configure script is free software; the Free Software Foundation # gives unlimited permission to copy, distribute and modify it. -# Defaults: -ac_help= +if expr a : '\(a\)' >/dev/null 2>&1; then + as_expr=expr +else + as_expr=false +fi + + +## --------------------- ## +## M4sh Initialization. ## +## --------------------- ## + +# Be Bourne compatible +if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then + emulate sh + NULLCMD=: +elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then + set -o posix +fi + +# NLS nuisances. +# Support unset when possible. +if (FOO=FOO; unset FOO) >/dev/null 2>&1; then + as_unset=unset +else + as_unset=false +fi + +(set +x; test -n "`(LANG=C; export LANG) 2>&1`") && + { $as_unset LANG || test "${LANG+set}" != set; } || + { LANG=C; export LANG; } +(set +x; test -n "`(LC_ALL=C; export LC_ALL) 2>&1`") && + { $as_unset LC_ALL || test "${LC_ALL+set}" != set; } || + { LC_ALL=C; export LC_ALL; } +(set +x; test -n "`(LC_TIME=C; export LC_TIME) 2>&1`") && + { $as_unset LC_TIME || test "${LC_TIME+set}" != set; } || + { LC_TIME=C; export LC_TIME; } +(set +x; test -n "`(LC_CTYPE=C; export LC_CTYPE) 2>&1`") && + { $as_unset LC_CTYPE || test "${LC_CTYPE+set}" != set; } || + { LC_CTYPE=C; export LC_CTYPE; } +(set +x; test -n "`(LANGUAGE=C; export LANGUAGE) 2>&1`") && + { $as_unset LANGUAGE || test "${LANGUAGE+set}" != set; } || + { LANGUAGE=C; export LANGUAGE; } +(set +x; test -n "`(LC_COLLATE=C; export LC_COLLATE) 2>&1`") && + { $as_unset LC_COLLATE || test "${LC_COLLATE+set}" != set; } || + { LC_COLLATE=C; export LC_COLLATE; } +(set +x; test -n "`(LC_NUMERIC=C; export LC_NUMERIC) 2>&1`") && + { $as_unset LC_NUMERIC || test "${LC_NUMERIC+set}" != set; } || + { LC_NUMERIC=C; export LC_NUMERIC; } +(set +x; test -n "`(LC_MESSAGES=C; export LC_MESSAGES) 2>&1`") && + { $as_unset LC_MESSAGES || test "${LC_MESSAGES+set}" != set; } || + { LC_MESSAGES=C; export LC_MESSAGES; } + + +# Name of the executable. +as_me=`(basename "$0") 2>/dev/null || +$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ + X"$0" : 'X\(//\)$' \| \ + X"$0" : 'X\(/\)$' \| \ + . : '\(.\)' 2>/dev/null || +echo X/"$0" | + sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; } + /^X\/\(\/\/\)$/{ s//\1/; q; } + /^X\/\(\/\).*/{ s//\1/; q; } + s/.*/./; q'` + +# PATH needs CR, and LINENO needs CR and PATH. +# Avoid depending upon Character Ranges. +as_cr_letters='abcdefghijklmnopqrstuvwxyz' +as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' +as_cr_Letters=$as_cr_letters$as_cr_LETTERS +as_cr_digits='0123456789' +as_cr_alnum=$as_cr_Letters$as_cr_digits + +# The user is always right. +if test "${PATH_SEPARATOR+set}" != set; then + echo "#! /bin/sh" >conftest.sh + echo "exit 0" >>conftest.sh + chmod +x conftest.sh + if (PATH=".;."; conftest.sh) >/dev/null 2>&1; then + PATH_SEPARATOR=';' + else + PATH_SEPARATOR=: + fi + rm -f conftest.sh +fi + + + as_lineno_1=$LINENO + as_lineno_2=$LINENO + as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` + test "x$as_lineno_1" != "x$as_lineno_2" && + test "x$as_lineno_3" = "x$as_lineno_2" || { + # Find who we are. Look in the path if we contain no path at all + # relative or not. + case $0 in + *[\\/]* ) as_myself=$0 ;; + *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break +done + + ;; + esac + # We did not find ourselves, most probably we were run as `sh COMMAND' + # in which case we are not to be found in the path. + if test "x$as_myself" = x; then + as_myself=$0 + fi + if test ! -f "$as_myself"; then + { echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2 + { (exit 1); exit 1; }; } + fi + case $CONFIG_SHELL in + '') + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for as_base in sh bash ksh sh5; do + case $as_dir in + /*) + if ("$as_dir/$as_base" -c ' + as_lineno_1=$LINENO + as_lineno_2=$LINENO + as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` + test "x$as_lineno_1" != "x$as_lineno_2" && + test "x$as_lineno_3" = "x$as_lineno_2" ') 2>/dev/null; then + CONFIG_SHELL=$as_dir/$as_base + export CONFIG_SHELL + exec "$CONFIG_SHELL" "$0" ${1+"$@"} + fi;; + esac + done +done +;; + esac + + # Create $as_me.lineno as a copy of $as_myself, but with $LINENO + # uniformly replaced by the line number. The first 'sed' inserts a + # line-number line before each line; the second 'sed' does the real + # work. The second script uses 'N' to pair each line-number line + # with the numbered line, and appends trailing '-' during + # substitution so that $LINENO is not a special case at line end. + # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the + # second 'sed' script. Blame Lee E. McMahon for sed's syntax. :-) + sed '=' <$as_myself | + sed ' + N + s,$,-, + : loop + s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3, + t loop + s,-$,, + s,^['$as_cr_digits']*\n,, + ' >$as_me.lineno && + chmod +x $as_me.lineno || + { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 + { (exit 1); exit 1; }; } + + # Don't try to exec as it changes $[0], causing all sort of problems + # (the dirname of $[0] is not the place where we might find the + # original and so on. Autoconf is especially sensible to this). + . ./$as_me.lineno + # Exit status is that of the last command. + exit +} + + +case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in + *c*,-n*) ECHO_N= ECHO_C=' +' ECHO_T=' ' ;; + *c*,* ) ECHO_N=-n ECHO_C= ECHO_T= ;; + *) ECHO_N= ECHO_C='\c' ECHO_T= ;; +esac + +if expr a : '\(a\)' >/dev/null 2>&1; then + as_expr=expr +else + as_expr=false +fi + +rm -f conf$$ conf$$.exe conf$$.file +echo >conf$$.file +if ln -s conf$$.file conf$$ 2>/dev/null; then + # We could just check for DJGPP; but this test a) works b) is more generic + # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04). + if test -f conf$$.exe; then + # Don't use ln at all; we don't have any links + as_ln_s='cp -p' + else + as_ln_s='ln -s' + fi +elif ln conf$$.file conf$$ 2>/dev/null; then + as_ln_s=ln +else + as_ln_s='cp -p' +fi +rm -f conf$$ conf$$.exe conf$$.file + +as_executable_p="test -f" + +# Sed expression to map a string onto a valid CPP name. +as_tr_cpp="sed y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g" + +# Sed expression to map a string onto a valid variable name. +as_tr_sh="sed y%*+%pp%;s%[^_$as_cr_alnum]%_%g" + + +# IFS +# We need space, tab and new line, in precisely that order. +as_nl=' +' +IFS=" $as_nl" + +# CDPATH. +$as_unset CDPATH || test "${CDPATH+set}" != set || { CDPATH=$PATH_SEPARATOR; export CDPATH; } + + +# Name of the host. +# hostname on some systems (SVR3.2, Linux) returns a bogus exit status, +# so uname gets run too. +ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q` + +exec 6>&1 + +# +# Initializations. +# ac_default_prefix=/usr/local -# Any additions from configure.in: -ac_help="$ac_help - --with-libiconv-prefix=DIR search for libiconv in DIR/include and DIR/lib" -ac_help="$ac_help - --disable-nls do not use Native Language Support" -ac_help="$ac_help - --with-included-gettext use the GNU gettext library included here" -ac_help="$ac_help -" -ac_help="$ac_help -Optimization options:" -ac_help="$ac_help - --with-tuning=ARCH enable special tuning for an architecture - (default i686 on IA-32 and 750 on PPC)" -ac_help="$ac_help - --disable-optimizations disable compiler optimizations (default enabled)" -ac_help="$ac_help - --disable-altivec disable altivec optimizations (default enabled on PPC)" -ac_help="$ac_help - --enable-debug debug mode (default disabled)" -ac_help="$ac_help - --enable-release activate extra optimizations (default disabled)" -ac_help="$ac_help -Input plugins:" -ac_help="$ac_help - --enable-dvd DVD input module (default enabled)" -ac_help="$ac_help - --with-dvdcss=PATH libdvdcss headers and libraries" -ac_help="$ac_help - --with-dvdcss-tree=PATH libdvdcss tree for static linking" -ac_help="$ac_help - --enable-dvdread dvdread input module (default disabled)" -ac_help="$ac_help - --with-dvdread=PATH libdvdread headers and libraries" -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 - --enable-vcd VCD support for Linux, FreeBSD and MacOS X (default enabled)" -ac_help="$ac_help - --enable-satellite satellite card support (default disabled)" -ac_help="$ac_help - --enable-avi AVI demux module (default enabled)" -ac_help="$ac_help -Codec plugins:" -ac_help="$ac_help - --enable-mad libmad module (default disabled)" -ac_help="$ac_help - --with-mad=PATH path to libmad" -ac_help="$ac_help - --with-mad-tree=PATH mad tree for static linking" -ac_help="$ac_help - --enable-ffmpeg ffmpeg codec (default disabled)" -ac_help="$ac_help - --with-ffmpeg=PATH path to ffmpeg installation" -ac_help="$ac_help - --with-ffmpeg-tree=PATH ffmpeg tree for static linking" -ac_help="$ac_help - --enable-a52 AC3 support with liba52 (default enabled)" -ac_help="$ac_help - --with-a52-tree=PATH a52dec tree for static linking " -ac_help="$ac_help - --enable-vorbis Ogg/Vorbis decoder support (default enabled)" -ac_help="$ac_help -Video plugins:" -ac_help="$ac_help - --enable-x11 X11 support (default enabled)" -ac_help="$ac_help - --enable-xvideo XVideo support (default enabled)" -ac_help="$ac_help - --enable-sdl SDL support (default enabled)" -ac_help="$ac_help - --with-sdl-config-path=PATH sdl-config path (default search in \$PATH)" -ac_help="$ac_help - --enable-directx Win32 DirectX support (default enabled on Win32)" -ac_help="$ac_help - --with-directx=PATH Win32 DirectX headers and libraries" -ac_help="$ac_help - --enable-fb Linux framebuffer support (default enabled on Linux)" -ac_help="$ac_help - --enable-mga Linux kernel Matrox support (default disabled)" -ac_help="$ac_help - --enable-ggi GGI support (default disabled)" -ac_help="$ac_help - --with-ggi=PATH path to libggi" -ac_help="$ac_help - --enable-glide Glide (3dfx) support (default disabled)" -ac_help="$ac_help - --with-glide=PATH path to libglide" -ac_help="$ac_help - --enable-aa aalib output (default disabled)" -ac_help="$ac_help -Audio plugins:" -ac_help="$ac_help - --enable-dsp Linux /dev/dsp support (enabled on Linux)" -ac_help="$ac_help - --enable-esd Esound library support (default disabled)" -ac_help="$ac_help - --enable-arts aRts sound server (default disabled)" -ac_help="$ac_help - --enable-alsa ALSA sound support for Linux (default disabled)" -ac_help="$ac_help - --enable-waveout Win32 waveOut module (default enabled on Win32)" -ac_help="$ac_help -Interface plugins:" -ac_help="$ac_help - --enable-gtk Gtk+ support (default enabled)" -ac_help="$ac_help - --with-gtk-config-path=PATH gtk-config path (default search in \$PATH)" -ac_help="$ac_help - --enable-gnome Gnome interface support (default disabled)" -ac_help="$ac_help - --enable-qt Qt interface support (default disabled)" -ac_help="$ac_help - --enable-kde KDE interface support (default disabled)" -ac_help="$ac_help - --enable-macosx MacOS X support (default enabled on MacOS X)" -ac_help="$ac_help - --enable-qnx QNX RTOS support (default enabled on QNX RTOS)" -ac_help="$ac_help - --enable-intfwin Win32 interface support (default disabled)" -ac_help="$ac_help - --with-bcbuilder=PATH Borland C++ Builder installation path" -ac_help="$ac_help - --enable-ncurses ncurses interface support (default disabled)" -ac_help="$ac_help - --enable-lirc lirc support (default disabled)" -ac_help="$ac_help -Misc options:" -ac_help="$ac_help - --with-words=endianness set endianness (big or little)" -ac_help="$ac_help - --enable-gprof gprof profiling (default disabled)" -ac_help="$ac_help - --enable-cprof cprof profiling (default disabled)" -ac_help="$ac_help - --enable-pth GNU Pth support (default disabled)" -ac_help="$ac_help - --enable-st State Threads (default disabled)" -ac_help="$ac_help - --disable-plugins make all plug-ins built-in (default plug-ins enabled)" +cross_compiling=no +subdirs= +MFLAGS= +MAKEFLAGS= +SHELL=${CONFIG_SHELL-/bin/sh} + +# Maximum number of lines to put in a shell here document. +# This variable seems obsolete. It should probably be removed, and +# only ac_max_sed_lines should be used. +: ${ac_max_here_lines=38} + +# Identity of this package. +PACKAGE_NAME= +PACKAGE_TARNAME= +PACKAGE_VERSION= +PACKAGE_STRING= +PACKAGE_BUGREPORT= + +ac_unique_file="include/main.h" +# Factoring default headers for most tests. +ac_includes_default="\ +#include +#if HAVE_SYS_TYPES_H +# include +#endif +#if HAVE_SYS_STAT_H +# include +#endif +#if STDC_HEADERS +# include +# include +#else +# if HAVE_STDLIB_H +# include +# endif +#endif +#if HAVE_STRING_H +# if !STDC_HEADERS && HAVE_MEMORY_H +# include +# endif +# include +#endif +#if HAVE_STRINGS_H +# include +#endif +#if HAVE_INTTYPES_H +# include +#else +# if HAVE_STDINT_H +# include +# endif +#endif +#if HAVE_UNISTD_H +# include +#endif" + # Initialize some variables set by options. +ac_init_help= +ac_init_version=false # The variables have the same names as the options, with # dashes changed to underlines. -build=NONE -cache_file=./config.cache +cache_file=/dev/null exec_prefix=NONE -host=NONE no_create= -nonopt=NONE no_recursion= prefix=NONE program_prefix=NONE @@ -170,10 +313,15 @@ program_transform_name=s,x,x, silent= site= srcdir= -target=NONE verbose= x_includes=NONE x_libraries=NONE + +# Installation directory options. +# These are left unexpanded so users can "make install exec_prefix=/foo" +# and all the variables that are supposed to be based on exec_prefix +# by default will actually change. +# Use braces instead of parens because sh, perl, etc. also accept them. bindir='${exec_prefix}/bin' sbindir='${exec_prefix}/sbin' libexecdir='${exec_prefix}/libexec' @@ -187,17 +335,9 @@ oldincludedir='/usr/include' infodir='${prefix}/info' mandir='${prefix}/man' -# Initialize some other variables. -subdirs= -MFLAGS= MAKEFLAGS= -SHELL=${CONFIG_SHELL-/bin/sh} -# Maximum number of lines to put in a shell here document. -ac_max_here_lines=12 - ac_prev= for ac_option do - # If the previous option needs an argument, assign it. if test -n "$ac_prev"; then eval "$ac_prev=\$ac_option" @@ -205,59 +345,59 @@ do continue fi - case "$ac_option" in - -*=*) ac_optarg=`echo "$ac_option" | sed 's/[-_a-zA-Z0-9]*=//'` ;; - *) ac_optarg= ;; - esac + ac_optarg=`expr "x$ac_option" : 'x[^=]*=\(.*\)'` # Accept the important Cygnus configure options, so we can diagnose typos. - case "$ac_option" in + case $ac_option in -bindir | --bindir | --bindi | --bind | --bin | --bi) ac_prev=bindir ;; -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*) - bindir="$ac_optarg" ;; + bindir=$ac_optarg ;; -build | --build | --buil | --bui | --bu) - ac_prev=build ;; + ac_prev=build_alias ;; -build=* | --build=* | --buil=* | --bui=* | --bu=*) - build="$ac_optarg" ;; + build_alias=$ac_optarg ;; -cache-file | --cache-file | --cache-fil | --cache-fi \ | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c) ac_prev=cache_file ;; -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \ | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*) - cache_file="$ac_optarg" ;; + cache_file=$ac_optarg ;; + + --config-cache | -C) + cache_file=config.cache ;; -datadir | --datadir | --datadi | --datad | --data | --dat | --da) ac_prev=datadir ;; -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \ | --da=*) - datadir="$ac_optarg" ;; + datadir=$ac_optarg ;; -disable-* | --disable-*) - ac_feature=`echo $ac_option|sed -e 's/-*disable-//'` + ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'` # Reject names that are not valid shell variable names. - if test -n "`echo $ac_feature| sed 's/[-a-zA-Z0-9_]//g'`"; then - { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; } - fi - ac_feature=`echo $ac_feature| sed 's/-/_/g'` - eval "enable_${ac_feature}=no" ;; + expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null && + { echo "$as_me: error: invalid feature name: $ac_feature" >&2 + { (exit 1); exit 1; }; } + ac_feature=`echo $ac_feature | sed 's/-/_/g'` + eval "enable_$ac_feature=no" ;; -enable-* | --enable-*) - ac_feature=`echo $ac_option|sed -e 's/-*enable-//' -e 's/=.*//'` + ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` # Reject names that are not valid shell variable names. - if test -n "`echo $ac_feature| sed 's/[-_a-zA-Z0-9]//g'`"; then - { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; } - fi - ac_feature=`echo $ac_feature| sed 's/-/_/g'` - case "$ac_option" in - *=*) ;; + expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null && + { echo "$as_me: error: invalid feature name: $ac_feature" >&2 + { (exit 1); exit 1; }; } + ac_feature=`echo $ac_feature | sed 's/-/_/g'` + case $ac_option in + *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;; *) ac_optarg=yes ;; esac - eval "enable_${ac_feature}='$ac_optarg'" ;; + eval "enable_$ac_feature='$ac_optarg'" ;; -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \ | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \ @@ -266,95 +406,47 @@ do -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \ | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \ | --exec=* | --exe=* | --ex=*) - exec_prefix="$ac_optarg" ;; + exec_prefix=$ac_optarg ;; -gas | --gas | --ga | --g) # Obsolete; use --with-gas. with_gas=yes ;; - -help | --help | --hel | --he) - # Omit some internal or obsolete options to make the list less imposing. - # This message is too long to be a string in the A/UX 3.1 sh. - cat << EOF -Usage: configure [options] [host] -Options: [defaults in brackets after descriptions] -Configuration: - --cache-file=FILE cache test results in FILE - --help print this message - --no-create do not create output files - --quiet, --silent do not print \`checking...' messages - --version print the version of autoconf that created configure -Directory and file names: - --prefix=PREFIX install architecture-independent files in PREFIX - [$ac_default_prefix] - --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX - [same as prefix] - --bindir=DIR user executables in DIR [EPREFIX/bin] - --sbindir=DIR system admin executables in DIR [EPREFIX/sbin] - --libexecdir=DIR program executables in DIR [EPREFIX/libexec] - --datadir=DIR read-only architecture-independent data in DIR - [PREFIX/share] - --sysconfdir=DIR read-only single-machine data in DIR [PREFIX/etc] - --sharedstatedir=DIR modifiable architecture-independent data in DIR - [PREFIX/com] - --localstatedir=DIR modifiable single-machine data in DIR [PREFIX/var] - --libdir=DIR object code libraries in DIR [EPREFIX/lib] - --includedir=DIR C header files in DIR [PREFIX/include] - --oldincludedir=DIR C header files for non-gcc in DIR [/usr/include] - --infodir=DIR info documentation in DIR [PREFIX/info] - --mandir=DIR man documentation in DIR [PREFIX/man] - --srcdir=DIR find the sources in DIR [configure dir or ..] - --program-prefix=PREFIX prepend PREFIX to installed program names - --program-suffix=SUFFIX append SUFFIX to installed program names - --program-transform-name=PROGRAM - run sed PROGRAM on installed program names -EOF - cat << EOF -Host type: - --build=BUILD configure for building on BUILD [BUILD=HOST] - --host=HOST configure for HOST [guessed] - --target=TARGET configure for TARGET [TARGET=HOST] -Features and packages: - --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) - --enable-FEATURE[=ARG] include FEATURE [ARG=yes] - --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] - --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) - --x-includes=DIR X include files are in DIR - --x-libraries=DIR X library files are in DIR -EOF - if test -n "$ac_help"; then - echo "--enable and --with options recognized:$ac_help" - fi - exit 0 ;; + -help | --help | --hel | --he | -h) + ac_init_help=long ;; + -help=r* | --help=r* | --hel=r* | --he=r* | -hr*) + ac_init_help=recursive ;; + -help=s* | --help=s* | --hel=s* | --he=s* | -hs*) + ac_init_help=short ;; -host | --host | --hos | --ho) - ac_prev=host ;; + ac_prev=host_alias ;; -host=* | --host=* | --hos=* | --ho=*) - host="$ac_optarg" ;; + host_alias=$ac_optarg ;; -includedir | --includedir | --includedi | --included | --include \ | --includ | --inclu | --incl | --inc) ac_prev=includedir ;; -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \ | --includ=* | --inclu=* | --incl=* | --inc=*) - includedir="$ac_optarg" ;; + includedir=$ac_optarg ;; -infodir | --infodir | --infodi | --infod | --info | --inf) ac_prev=infodir ;; -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*) - infodir="$ac_optarg" ;; + infodir=$ac_optarg ;; -libdir | --libdir | --libdi | --libd) ac_prev=libdir ;; -libdir=* | --libdir=* | --libdi=* | --libd=*) - libdir="$ac_optarg" ;; + libdir=$ac_optarg ;; -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \ | --libexe | --libex | --libe) ac_prev=libexecdir ;; -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \ | --libexe=* | --libex=* | --libe=*) - libexecdir="$ac_optarg" ;; + libexecdir=$ac_optarg ;; -localstatedir | --localstatedir | --localstatedi | --localstated \ | --localstate | --localstat | --localsta | --localst \ @@ -363,19 +455,19 @@ EOF -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \ | --localstate=* | --localstat=* | --localsta=* | --localst=* \ | --locals=* | --local=* | --loca=* | --loc=* | --lo=*) - localstatedir="$ac_optarg" ;; + localstatedir=$ac_optarg ;; -mandir | --mandir | --mandi | --mand | --man | --ma | --m) ac_prev=mandir ;; -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*) - mandir="$ac_optarg" ;; + mandir=$ac_optarg ;; -nfp | --nfp | --nf) # Obsolete; use --without-fp. with_fp=no ;; -no-create | --no-create | --no-creat | --no-crea | --no-cre \ - | --no-cr | --no-c) + | --no-cr | --no-c | -n) no_create=yes ;; -no-recursion | --no-recursion | --no-recursio | --no-recursi \ @@ -389,26 +481,26 @@ EOF -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \ | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \ | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*) - oldincludedir="$ac_optarg" ;; + oldincludedir=$ac_optarg ;; -prefix | --prefix | --prefi | --pref | --pre | --pr | --p) ac_prev=prefix ;; -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*) - prefix="$ac_optarg" ;; + prefix=$ac_optarg ;; -program-prefix | --program-prefix | --program-prefi | --program-pref \ | --program-pre | --program-pr | --program-p) ac_prev=program_prefix ;; -program-prefix=* | --program-prefix=* | --program-prefi=* \ | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*) - program_prefix="$ac_optarg" ;; + program_prefix=$ac_optarg ;; -program-suffix | --program-suffix | --program-suffi | --program-suff \ | --program-suf | --program-su | --program-s) ac_prev=program_suffix ;; -program-suffix=* | --program-suffix=* | --program-suffi=* \ | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*) - program_suffix="$ac_optarg" ;; + program_suffix=$ac_optarg ;; -program-transform-name | --program-transform-name \ | --program-transform-nam | --program-transform-na \ @@ -425,7 +517,7 @@ EOF | --program-transfo=* | --program-transf=* \ | --program-trans=* | --program-tran=* \ | --progr-tra=* | --program-tr=* | --program-t=*) - program_transform_name="$ac_optarg" ;; + program_transform_name=$ac_optarg ;; -q | -quiet | --quiet | --quie | --qui | --qu | --q \ | -silent | --silent | --silen | --sile | --sil) @@ -435,7 +527,7 @@ EOF ac_prev=sbindir ;; -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ | --sbi=* | --sb=*) - sbindir="$ac_optarg" ;; + sbindir=$ac_optarg ;; -sharedstatedir | --sharedstatedir | --sharedstatedi \ | --sharedstated | --sharedstate | --sharedstat | --sharedsta \ @@ -446,58 +538,57 @@ EOF | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \ | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \ | --sha=* | --sh=*) - sharedstatedir="$ac_optarg" ;; + sharedstatedir=$ac_optarg ;; -site | --site | --sit) ac_prev=site ;; -site=* | --site=* | --sit=*) - site="$ac_optarg" ;; + site=$ac_optarg ;; -srcdir | --srcdir | --srcdi | --srcd | --src | --sr) ac_prev=srcdir ;; -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*) - srcdir="$ac_optarg" ;; + srcdir=$ac_optarg ;; -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \ | --syscon | --sysco | --sysc | --sys | --sy) ac_prev=sysconfdir ;; -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \ | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*) - sysconfdir="$ac_optarg" ;; + sysconfdir=$ac_optarg ;; -target | --target | --targe | --targ | --tar | --ta | --t) - ac_prev=target ;; + ac_prev=target_alias ;; -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*) - target="$ac_optarg" ;; + target_alias=$ac_optarg ;; -v | -verbose | --verbose | --verbos | --verbo | --verb) verbose=yes ;; - -version | --version | --versio | --versi | --vers) - echo "configure generated by autoconf version 2.13" - exit 0 ;; + -version | --version | --versio | --versi | --vers | -V) + ac_init_version=: ;; -with-* | --with-*) - ac_package=`echo $ac_option|sed -e 's/-*with-//' -e 's/=.*//'` + ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` # Reject names that are not valid shell variable names. - if test -n "`echo $ac_package| sed 's/[-_a-zA-Z0-9]//g'`"; then - { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; } - fi + expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null && + { echo "$as_me: error: invalid package name: $ac_package" >&2 + { (exit 1); exit 1; }; } ac_package=`echo $ac_package| sed 's/-/_/g'` - case "$ac_option" in - *=*) ;; + case $ac_option in + *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;; *) ac_optarg=yes ;; esac - eval "with_${ac_package}='$ac_optarg'" ;; + eval "with_$ac_package='$ac_optarg'" ;; -without-* | --without-*) - ac_package=`echo $ac_option|sed -e 's/-*without-//'` + ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'` # Reject names that are not valid shell variable names. - if test -n "`echo $ac_package| sed 's/[-a-zA-Z0-9_]//g'`"; then - { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; } - fi - ac_package=`echo $ac_package| sed 's/-/_/g'` - eval "with_${ac_package}=no" ;; + expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null && + { echo "$as_me: error: invalid package name: $ac_package" >&2 + { (exit 1); exit 1; }; } + ac_package=`echo $ac_package | sed 's/-/_/g'` + eval "with_$ac_package=no" ;; --x) # Obsolete; use --with-x. @@ -508,99 +599,110 @@ EOF ac_prev=x_includes ;; -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \ | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*) - x_includes="$ac_optarg" ;; + x_includes=$ac_optarg ;; -x-libraries | --x-libraries | --x-librarie | --x-librari \ | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l) ac_prev=x_libraries ;; -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \ | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*) - x_libraries="$ac_optarg" ;; + x_libraries=$ac_optarg ;; - -*) { echo "configure: error: $ac_option: invalid option; use --help to show usage" 1>&2; exit 1; } + -*) { echo "$as_me: error: unrecognized option: $ac_option +Try \`$0 --help' for more information." >&2 + { (exit 1); exit 1; }; } ;; + *=*) + ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='` + # Reject names that are not valid shell variable names. + expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null && + { echo "$as_me: error: invalid variable name: $ac_envvar" >&2 + { (exit 1); exit 1; }; } + ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` + eval "$ac_envvar='$ac_optarg'" + export $ac_envvar ;; + *) - if test -n "`echo $ac_option| sed 's/[-a-z0-9.]//g'`"; then - echo "configure: warning: $ac_option: invalid host type" 1>&2 - fi - if test "x$nonopt" != xNONE; then - { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; } - fi - nonopt="$ac_option" + # FIXME: should be removed in autoconf 3.0. + echo "$as_me: WARNING: you should use --build, --host, --target" >&2 + expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null && + echo "$as_me: WARNING: invalid host type: $ac_option" >&2 + : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option} ;; esac done if test -n "$ac_prev"; then - { echo "configure: error: missing argument to --`echo $ac_prev | sed 's/_/-/g'`" 1>&2; exit 1; } -fi - -trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15 - -# File descriptor usage: -# 0 standard input -# 1 file creation -# 2 errors and warnings -# 3 some systems may open it to /dev/tty -# 4 used on the Kubota Titan -# 6 checking for... messages and results -# 5 compiler messages saved in config.log -if test "$silent" = yes; then - exec 6>/dev/null -else - exec 6>&1 + ac_option=--`echo $ac_prev | sed 's/_/-/g'` + { echo "$as_me: error: missing argument to $ac_option" >&2 + { (exit 1); exit 1; }; } fi -exec 5>./config.log -echo "\ -This file contains any messages produced by compilers while -running configure, to aid debugging if configure makes a mistake. -" 1>&5 +# Be sure to have absolute paths. +for ac_var in exec_prefix prefix +do + eval ac_val=$`echo $ac_var` + case $ac_val in + [\\/$]* | ?:[\\/]* | NONE | '' ) ;; + *) { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 + { (exit 1); exit 1; }; };; + esac +done -# Strip out --no-create and --no-recursion so they do not pile up. -# Also quote any args containing shell metacharacters. -ac_configure_args= -for ac_arg +# Be sure to have absolute paths. +for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \ + localstatedir libdir includedir oldincludedir infodir mandir do - case "$ac_arg" in - -no-create | --no-create | --no-creat | --no-crea | --no-cre \ - | --no-cr | --no-c) ;; - -no-recursion | --no-recursion | --no-recursio | --no-recursi \ - | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) ;; - *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?]*) - ac_configure_args="$ac_configure_args '$ac_arg'" ;; - *) ac_configure_args="$ac_configure_args $ac_arg" ;; + eval ac_val=$`echo $ac_var` + case $ac_val in + [\\/$]* | ?:[\\/]* ) ;; + *) { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 + { (exit 1); exit 1; }; };; esac done -# NLS nuisances. -# Only set these to C if already set. These must not be set unconditionally -# because not all systems understand e.g. LANG=C (notably SCO). -# Fixing LC_MESSAGES prevents Solaris sh from translating var values in `set'! -# Non-C LC_CTYPE values break the ctype check. -if test "${LANG+set}" = set; then LANG=C; export LANG; fi -if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi -if test "${LC_MESSAGES+set}" = set; then LC_MESSAGES=C; export LC_MESSAGES; fi -if test "${LC_CTYPE+set}" = set; then LC_CTYPE=C; export LC_CTYPE; fi +# There might be people who depend on the old broken behavior: `$host' +# used to hold the argument of --host etc. +# FIXME: To remove some day. +build=$build_alias +host=$host_alias +target=$target_alias + +# FIXME: To remove some day. +if test "x$host_alias" != x; then + if test "x$build_alias" = x; then + cross_compiling=maybe + echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host. + If a cross compiler is detected then cross compile mode will be used." >&2 + elif test "x$build_alias" != "x$host_alias"; then + cross_compiling=yes + fi +fi -# confdefs.h avoids OS command line length limits that DEFS can exceed. -rm -rf conftest* confdefs.h -# AIX cpp loses on an empty file, so make sure it contains at least a newline. -echo > confdefs.h +ac_tool_prefix= +test -n "$host_alias" && ac_tool_prefix=$host_alias- + +test "$silent" = yes && exec 6>/dev/null -# A filename unique to this package, relative to the directory that -# configure is in, which we can look for to find out if srcdir is correct. -ac_unique_file=include/main.h # Find the source files, if location was not specified. if test -z "$srcdir"; then ac_srcdir_defaulted=yes # Try the directory containing this script, then its parent. - ac_prog=$0 - ac_confdir=`echo $ac_prog|sed 's%/[^/][^/]*$%%'` - test "x$ac_confdir" = "x$ac_prog" && ac_confdir=. + ac_confdir=`(dirname "$0") 2>/dev/null || +$as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$0" : 'X\(//\)[^/]' \| \ + X"$0" : 'X\(//\)$' \| \ + X"$0" : 'X\(/\)' \| \ + . : '\(.\)' 2>/dev/null || +echo X"$0" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } + /^X\(\/\/\)[^/].*/{ s//\1/; q; } + /^X\(\/\/\)$/{ s//\1/; q; } + /^X\(\/\).*/{ s//\1/; q; } + s/.*/./; q'` srcdir=$ac_confdir if test ! -r $srcdir/$ac_unique_file; then srcdir=.. @@ -610,13 +712,458 @@ else fi if test ! -r $srcdir/$ac_unique_file; then if test "$ac_srcdir_defaulted" = yes; then - { echo "configure: error: can not find sources in $ac_confdir or .." 1>&2; exit 1; } + { echo "$as_me: error: cannot find sources ($ac_unique_file) in $ac_confdir or .." >&2 + { (exit 1); exit 1; }; } else - { echo "configure: error: can not find sources in $srcdir" 1>&2; exit 1; } + { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2 + { (exit 1); exit 1; }; } fi fi -srcdir=`echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'` +srcdir=`echo "$srcdir" | sed 's%\([^\\/]\)[\\/]*$%\1%'` +ac_env_build_alias_set=${build_alias+set} +ac_env_build_alias_value=$build_alias +ac_cv_env_build_alias_set=${build_alias+set} +ac_cv_env_build_alias_value=$build_alias +ac_env_host_alias_set=${host_alias+set} +ac_env_host_alias_value=$host_alias +ac_cv_env_host_alias_set=${host_alias+set} +ac_cv_env_host_alias_value=$host_alias +ac_env_target_alias_set=${target_alias+set} +ac_env_target_alias_value=$target_alias +ac_cv_env_target_alias_set=${target_alias+set} +ac_cv_env_target_alias_value=$target_alias +ac_env_CC_set=${CC+set} +ac_env_CC_value=$CC +ac_cv_env_CC_set=${CC+set} +ac_cv_env_CC_value=$CC +ac_env_CFLAGS_set=${CFLAGS+set} +ac_env_CFLAGS_value=$CFLAGS +ac_cv_env_CFLAGS_set=${CFLAGS+set} +ac_cv_env_CFLAGS_value=$CFLAGS +ac_env_LDFLAGS_set=${LDFLAGS+set} +ac_env_LDFLAGS_value=$LDFLAGS +ac_cv_env_LDFLAGS_set=${LDFLAGS+set} +ac_cv_env_LDFLAGS_value=$LDFLAGS +ac_env_CPPFLAGS_set=${CPPFLAGS+set} +ac_env_CPPFLAGS_value=$CPPFLAGS +ac_cv_env_CPPFLAGS_set=${CPPFLAGS+set} +ac_cv_env_CPPFLAGS_value=$CPPFLAGS +ac_env_CPP_set=${CPP+set} +ac_env_CPP_value=$CPP +ac_cv_env_CPP_set=${CPP+set} +ac_cv_env_CPP_value=$CPP + +# +# Report the --help message. +# +if test "$ac_init_help" = "long"; then + # Omit some internal or obsolete options to make the list less imposing. + # This message is too long to be a string in the A/UX 3.1 sh. + cat <<_ACEOF +\`configure' configures this package to adapt to many kinds of systems. + +Usage: $0 [OPTION]... [VAR=VALUE]... + +To assign environment variables (e.g., CC, CFLAGS...), specify them as +VAR=VALUE. See below for descriptions of some of the useful variables. + +Defaults for the options are specified in brackets. + +Configuration: + -h, --help display this help and exit + --help=short display options specific to this package + --help=recursive display the short help of all the included packages + -V, --version display version information and exit + -q, --quiet, --silent do not print \`checking...' messages + --cache-file=FILE cache test results in FILE [disabled] + -C, --config-cache alias for \`--cache-file=config.cache' + -n, --no-create do not create output files + --srcdir=DIR find the sources in DIR [configure dir or \`..'] + +_ACEOF + + cat <<_ACEOF +Installation directories: + --prefix=PREFIX install architecture-independent files in PREFIX + [$ac_default_prefix] + --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX + [PREFIX] + +By default, \`make install' will install all the files in +\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc. You can specify +an installation prefix other than \`$ac_default_prefix' using \`--prefix', +for instance \`--prefix=\$HOME'. + +For better control, use the options below. + +Fine tuning of the installation directories: + --bindir=DIR user executables [EPREFIX/bin] + --sbindir=DIR system admin executables [EPREFIX/sbin] + --libexecdir=DIR program executables [EPREFIX/libexec] + --datadir=DIR read-only architecture-independent data [PREFIX/share] + --sysconfdir=DIR read-only single-machine data [PREFIX/etc] + --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] + --localstatedir=DIR modifiable single-machine data [PREFIX/var] + --libdir=DIR object code libraries [EPREFIX/lib] + --includedir=DIR C header files [PREFIX/include] + --oldincludedir=DIR C header files for non-gcc [/usr/include] + --infodir=DIR info documentation [PREFIX/info] + --mandir=DIR man documentation [PREFIX/man] +_ACEOF + + cat <<\_ACEOF + +System types: + --build=BUILD configure for building on BUILD [guessed] + --host=HOST cross-compile to build programs to run on HOST [BUILD] + --target=TARGET configure for building compilers for TARGET [HOST] +_ACEOF +fi + +if test -n "$ac_init_help"; then + + cat <<\_ACEOF + +Optional Features: + --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) + --enable-FEATURE[=ARG] include FEATURE [ARG=yes] + --disable-nls do not use Native Language Support + --disable-optimizations disable compiler optimizations (default enabled) + --disable-altivec disable altivec optimizations (default enabled on PPC) + --enable-debug debug mode (default disabled) + --enable-release activate extra optimizations (default disabled) + --enable-dvd DVD input module (default enabled) + --enable-dvdread dvdread input module (default disabled) + --enable-dvbpsi dvbpsi ts demux module (default disabled) + --enable-vcd VCD support for Linux, FreeBSD and MacOS X (default enabled) + --enable-satellite satellite card support (default disabled) + --enable-avi AVI demux module (default enabled) + --enable-mad libmad module (default disabled) + --enable-ffmpeg ffmpeg codec (default disabled) + --enable-a52 AC3 support with liba52 (default enabled) + --enable-vorbis Ogg/Vorbis decoder support (default enabled) + --enable-x11 X11 support (default enabled) + --enable-xvideo XVideo support (default enabled) + --enable-sdl SDL support (default enabled) + --enable-qte QT Embedded support (default disabled) + --enable-directx Win32 DirectX support (default enabled on Win32) + --enable-fb Linux framebuffer support (default enabled on Linux) + --enable-mga Linux kernel Matrox support (default disabled) + --enable-ggi GGI support (default disabled) + --enable-glide Glide (3dfx) support (default disabled) + --enable-aa aalib output (default disabled) + --enable-dsp Linux /dev/dsp support (enabled on Linux) + --enable-esd Esound library support (default disabled) + --enable-arts aRts sound server (default disabled) + --enable-alsa ALSA sound support for Linux (default disabled) + --enable-waveout Win32 waveOut module (default enabled on Win32) + --enable-gtk Gtk+ support (default enabled) + --enable-familiar Familiar Gtk+ support (default disabled) + --enable-gnome Gnome interface support (default disabled) + --enable-qt Qt interface support (default disabled) + --enable-kde KDE interface support (default disabled) + --enable-opie Qt embedded interface support (default disabled) + --enable-macosx MacOS X support (default enabled on MacOS X) + --enable-qnx QNX RTOS support (default enabled on QNX RTOS) + --enable-intfwin Win32 interface support (default disabled) + --enable-ncurses ncurses interface support (default disabled) + --enable-lirc lirc support (default disabled) + --enable-gprof gprof profiling (default disabled) + --enable-cprof cprof profiling (default disabled) + --enable-pth GNU Pth support (default disabled) + --enable-st State Threads (default disabled) + --disable-plugins make all plug-ins built-in (default plug-ins enabled) + +Optional Packages: + --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] + --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) + --with-libiconv-prefix=DIR search for libiconv in DIR/include and DIR/lib + --with-included-gettext use the GNU gettext library included here + +Optimization options: + --with-tuning=ARCH enable special tuning for an architecture + (default i686 on IA-32 and 750 on PPC) +Input plugins: + --with-dvdcss=PATH libdvdcss headers and libraries + --with-dvdcss-tree=PATH libdvdcss tree for static linking + --with-dvdread=PATH libdvdread headers and libraries + --with-dvbpsi=PATH libdvbpsi headers and libraries + --with-dvbpsi-tree=PATH libdvbpsi tree for static linking +Codec plugins: + --with-mad=PATH path to libmad + --with-mad-tree=PATH mad tree for static linking + --with-ffmpeg=PATH path to ffmpeg installation + --with-ffmpeg-tree=PATH ffmpeg tree for static linking + --with-a52-tree=PATH a52dec tree for static linking +Video plugins: + --with-sdl-config-path=PATH sdl-config path (default search in \$PATH) + --with-sdl-prefix=PATH path to libsdl (needed for cross-compiling), + e.g use as: + --with-sdl-prefix=/usr/local/arm/2.95.3/arm-linux/usr) + --with-qte=PATH Qt Embedded headers and libraries + --with-directx=PATH Win32 DirectX headers and libraries + --with-ggi=PATH path to libggi + --with-glide=PATH path to libglide +Audio plugins: +Interface plugins: + --with-gtk-config-path=PATH gtk-config path (default search in \$PATH) + --with-gtk-prefix=PATH path to libgtk (needed for cross-compiling), + e.g use as: + --with-gtk-prefix=/usr/local/arm/2.95.3/arm-linux/usr) + --with-gpe-prefix=PATH gpe installation path prefix (default search in \$PATH) + --with-bcbuilder=PATH Borland C++ Builder installation path +Misc options: + --with-words=endianness set endianness (big or little) + +Some influential environment variables: + CC C compiler command + CFLAGS C compiler flags + LDFLAGS linker flags, e.g. -L if you have libraries in a + nonstandard directory + CPPFLAGS C/C++ preprocessor flags, e.g. -I if you have + headers in a nonstandard directory + CPP C preprocessor + +Use these variables to override the choices made by `configure' or to help +it to find libraries and programs with nonstandard names/locations. + +_ACEOF +fi + +if test "$ac_init_help" = "recursive"; then + # If there are subdirs, report their specific --help. + ac_popdir=`pwd` + for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue + test -d $ac_dir || continue + ac_builddir=. + +if test "$ac_dir" != .; then + ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'` + # A "../" for each directory in $ac_dir_suffix. + ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'` +else + ac_dir_suffix= ac_top_builddir= +fi + +case $srcdir in + .) # No --srcdir option. We are building in place. + ac_srcdir=. + if test -z "$ac_top_builddir"; then + ac_top_srcdir=. + else + ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'` + fi ;; + [\\/]* | ?:[\\/]* ) # Absolute path. + ac_srcdir=$srcdir$ac_dir_suffix; + ac_top_srcdir=$srcdir ;; + *) # Relative path. + ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix + ac_top_srcdir=$ac_top_builddir$srcdir ;; +esac +# Don't blindly perform a `cd "$ac_dir"/$ac_foo && pwd` since $ac_foo can be +# absolute. +ac_abs_builddir=`cd "$ac_dir" && cd $ac_builddir && pwd` +ac_abs_top_builddir=`cd "$ac_dir" && cd $ac_top_builddir && pwd` +ac_abs_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd` +ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd` + + cd $ac_dir + # Check for guested configure; otherwise get Cygnus style configure. + if test -f $ac_srcdir/configure.gnu; then + echo + $SHELL $ac_srcdir/configure.gnu --help=recursive + elif test -f $ac_srcdir/configure; then + echo + $SHELL $ac_srcdir/configure --help=recursive + elif test -f $ac_srcdir/configure.ac || + test -f $ac_srcdir/configure.in; then + echo + $ac_configure --help + else + echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 + fi + cd $ac_popdir + done +fi + +test -n "$ac_init_help" && exit 0 +if $ac_init_version; then + cat <<\_ACEOF + +Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002 +Free Software Foundation, Inc. +This configure script is free software; the Free Software Foundation +gives unlimited permission to copy, distribute and modify it. +_ACEOF + exit 0 +fi +exec 5>config.log +cat >&5 <<_ACEOF +This file contains any messages produced by compilers while +running configure, to aid debugging if configure makes a mistake. + +It was created by $as_me, which was +generated by GNU Autoconf 2.53. Invocation command line was + + $ $0 $@ + +_ACEOF +{ +cat <<_ASUNAME +## --------- ## +## Platform. ## +## --------- ## + +hostname = `(hostname || uname -n) 2>/dev/null | sed 1q` +uname -m = `(uname -m) 2>/dev/null || echo unknown` +uname -r = `(uname -r) 2>/dev/null || echo unknown` +uname -s = `(uname -s) 2>/dev/null || echo unknown` +uname -v = `(uname -v) 2>/dev/null || echo unknown` + +/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown` +/bin/uname -X = `(/bin/uname -X) 2>/dev/null || echo unknown` + +/bin/arch = `(/bin/arch) 2>/dev/null || echo unknown` +/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null || echo unknown` +/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown` +hostinfo = `(hostinfo) 2>/dev/null || echo unknown` +/bin/machine = `(/bin/machine) 2>/dev/null || echo unknown` +/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null || echo unknown` +/bin/universe = `(/bin/universe) 2>/dev/null || echo unknown` + +_ASUNAME + +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + echo "PATH: $as_dir" +done + +} >&5 + +cat >&5 <<_ACEOF + + +## ----------- ## +## Core tests. ## +## ----------- ## + +_ACEOF + + +# Keep a trace of the command line. +# Strip out --no-create and --no-recursion so they do not pile up. +# Also quote any args containing shell meta-characters. +ac_configure_args= +ac_sep= +for ac_arg +do + case $ac_arg in + -no-create | --no-create | --no-creat | --no-crea | --no-cre \ + | --no-cr | --no-c | -n ) continue ;; + -no-recursion | --no-recursion | --no-recursio | --no-recursi \ + | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) + continue ;; + *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*) + ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; + esac + case " $ac_configure_args " in + *" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy. + *) ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'" + ac_sep=" " ;; + esac + # Get rid of the leading space. +done + +# When interrupted or exit'd, cleanup temporary files, and complete +# config.log. We remove comments because anyway the quotes in there +# would cause problems or look ugly. +# WARNING: Be sure not to use single quotes in there, as some shells, +# such as our DU 5.0 friend, will then `close' the trap. +trap 'exit_status=$? + # Save into config.log some information that might help in debugging. + { + echo + cat <<\_ASBOX +## ---------------- ## +## Cache variables. ## +## ---------------- ## +_ASBOX + echo + # The following way of writing the cache mishandles newlines in values, +{ + (set) 2>&1 | + case `(ac_space='"'"' '"'"'; set | grep ac_space) 2>&1` in + *ac_space=\ *) + sed -n \ + "s/'"'"'/'"'"'\\\\'"'"''"'"'/g; + s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='"'"'\\2'"'"'/p" + ;; + *) + sed -n \ + "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p" + ;; + esac; +} + echo + if test -s confdefs.h; then + cat <<\_ASBOX +## ----------- ## +## confdefs.h. ## +## ----------- ## +_ASBOX + echo + sed "/^$/d" confdefs.h + echo + fi + test "$ac_signal" != 0 && + echo "$as_me: caught signal $ac_signal" + echo "$as_me: exit $exit_status" + } >&5 + rm -f core core.* *.core && + rm -rf conftest* confdefs* conf$$* $ac_clean_files && + exit $exit_status + ' 0 +for ac_signal in 1 2 13 15; do + trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal +done +ac_signal=0 + +# confdefs.h avoids OS command line length limits that DEFS can exceed. +rm -rf conftest* confdefs.h +# AIX cpp loses on an empty file, so make sure it contains at least a newline. +echo >confdefs.h +# Predefined preprocessor variables. + +cat >>confdefs.h <<_ACEOF +#define PACKAGE_NAME "$PACKAGE_NAME" +_ACEOF + + +cat >>confdefs.h <<_ACEOF +#define PACKAGE_TARNAME "$PACKAGE_TARNAME" +_ACEOF + + +cat >>confdefs.h <<_ACEOF +#define PACKAGE_VERSION "$PACKAGE_VERSION" +_ACEOF + + +cat >>confdefs.h <<_ACEOF +#define PACKAGE_STRING "$PACKAGE_STRING" +_ACEOF + + +cat >>confdefs.h <<_ACEOF +#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT" +_ACEOF + + +# Let the site file select an alternate cache file if it wants to. # Prefer explicitly selected file to automatically selected ones. if test -z "$CONFIG_SITE"; then if test "x$prefix" != xNONE; then @@ -627,42 +1174,106 @@ if test -z "$CONFIG_SITE"; then fi for ac_site_file in $CONFIG_SITE; do if test -r "$ac_site_file"; then - echo "loading site script $ac_site_file" + { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5 +echo "$as_me: loading site script $ac_site_file" >&6;} + sed 's/^/| /' "$ac_site_file" >&5 . "$ac_site_file" fi done if test -r "$cache_file"; then - echo "loading cache $cache_file" - . $cache_file + # Some versions of bash will fail to source /dev/null (special + # files actually), so we avoid doing that. + if test -f "$cache_file"; then + { echo "$as_me:$LINENO: loading cache $cache_file" >&5 +echo "$as_me: loading cache $cache_file" >&6;} + case $cache_file in + [\\/]* | ?:[\\/]* ) . $cache_file;; + *) . ./$cache_file;; + esac + fi else - echo "creating cache $cache_file" - > $cache_file + { echo "$as_me:$LINENO: creating cache $cache_file" >&5 +echo "$as_me: creating cache $cache_file" >&6;} + >$cache_file +fi + +# Check that the precious variables saved in the cache have kept the same +# value. +ac_cache_corrupted=false +for ac_var in `(set) 2>&1 | + sed -n 's/^ac_env_\([a-zA-Z_0-9]*\)_set=.*/\1/p'`; do + eval ac_old_set=\$ac_cv_env_${ac_var}_set + eval ac_new_set=\$ac_env_${ac_var}_set + eval ac_old_val="\$ac_cv_env_${ac_var}_value" + eval ac_new_val="\$ac_env_${ac_var}_value" + case $ac_old_set,$ac_new_set in + set,) + { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 +echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} + ac_cache_corrupted=: ;; + ,set) + { echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5 +echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} + ac_cache_corrupted=: ;; + ,);; + *) + if test "x$ac_old_val" != "x$ac_new_val"; then + { echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5 +echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} + { echo "$as_me:$LINENO: former value: $ac_old_val" >&5 +echo "$as_me: former value: $ac_old_val" >&2;} + { echo "$as_me:$LINENO: current value: $ac_new_val" >&5 +echo "$as_me: current value: $ac_new_val" >&2;} + ac_cache_corrupted=: + fi;; + esac + # Pass precious variables to config.status. + if test "$ac_new_set" = set; then + case $ac_new_val in + *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*) + ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; + *) ac_arg=$ac_var=$ac_new_val ;; + esac + case " $ac_configure_args " in + *" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy. + *) ac_configure_args="$ac_configure_args '$ac_arg'" ;; + esac + fi +done +if $ac_cache_corrupted; then + { echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5 +echo "$as_me: error: changes in the environment can compromise the build" >&2;} + { { echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5 +echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;} + { (exit 1); exit 1; }; } fi ac_ext=c -# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. ac_cpp='$CPP $CPPFLAGS' -ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' -ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' -cross_compiling=$ac_cv_prog_cc_cross - -ac_exeext= -ac_objext=o -if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then - # Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu. - if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then - ac_n= ac_c=' -' ac_t=' ' - else - ac_n=-n ac_c= ac_t= - fi -else - ac_n= ac_c='\c' ac_t= -fi +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + + + + + + + + + + + + + + + +ac_config_headers="$ac_config_headers include/defs.h" + ac_aux_dir= for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do if test -f $ac_dir/install-sh; then @@ -673,348 +1284,763 @@ for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do ac_aux_dir=$ac_dir ac_install_sh="$ac_aux_dir/install.sh -c" break + elif test -f $ac_dir/shtool; then + ac_aux_dir=$ac_dir + ac_install_sh="$ac_aux_dir/shtool install -c" + break fi done if test -z "$ac_aux_dir"; then - { echo "configure: error: can not find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." 1>&2; exit 1; } + { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5 +echo "$as_me: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&2;} + { (exit 1); exit 1; }; } fi -ac_config_guess=$ac_aux_dir/config.guess -ac_config_sub=$ac_aux_dir/config.sub -ac_configure=$ac_aux_dir/configure # This should be Cygnus configure. +ac_config_guess="$SHELL $ac_aux_dir/config.guess" +ac_config_sub="$SHELL $ac_aux_dir/config.sub" +ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure. +# Make sure we can run config.sub. +$ac_config_sub sun4 >/dev/null 2>&1 || + { { echo "$as_me:$LINENO: error: cannot run $ac_config_sub" >&5 +echo "$as_me: error: cannot run $ac_config_sub" >&2;} + { (exit 1); exit 1; }; } + +echo "$as_me:$LINENO: checking build system type" >&5 +echo $ECHO_N "checking build system type... $ECHO_C" >&6 +if test "${ac_cv_build+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_cv_build_alias=$build_alias +test -z "$ac_cv_build_alias" && + ac_cv_build_alias=`$ac_config_guess` +test -z "$ac_cv_build_alias" && + { { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5 +echo "$as_me: error: cannot guess build type; you must specify one" >&2;} + { (exit 1); exit 1; }; } +ac_cv_build=`$ac_config_sub $ac_cv_build_alias` || + { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_build_alias failed" >&5 +echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed" >&2;} + { (exit 1); exit 1; }; } + +fi +echo "$as_me:$LINENO: result: $ac_cv_build" >&5 +echo "${ECHO_T}$ac_cv_build" >&6 +build=$ac_cv_build +build_cpu=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` +build_vendor=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` +build_os=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` + + +echo "$as_me:$LINENO: checking host system type" >&5 +echo $ECHO_N "checking host system type... $ECHO_C" >&6 +if test "${ac_cv_host+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_cv_host_alias=$host_alias +test -z "$ac_cv_host_alias" && + ac_cv_host_alias=$ac_cv_build_alias +ac_cv_host=`$ac_config_sub $ac_cv_host_alias` || + { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_host_alias failed" >&5 +echo "$as_me: error: $ac_config_sub $ac_cv_host_alias failed" >&2;} + { (exit 1); exit 1; }; } + +fi +echo "$as_me:$LINENO: result: $ac_cv_host" >&5 +echo "${ECHO_T}$ac_cv_host" >&6 +host=$ac_cv_host +host_cpu=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` +host_vendor=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` +host_os=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` + + +echo "$as_me:$LINENO: checking target system type" >&5 +echo $ECHO_N "checking target system type... $ECHO_C" >&6 +if test "${ac_cv_target+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_cv_target_alias=$target_alias +test "x$ac_cv_target_alias" = "x" && + ac_cv_target_alias=$ac_cv_host_alias +ac_cv_target=`$ac_config_sub $ac_cv_target_alias` || + { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_target_alias failed" >&5 +echo "$as_me: error: $ac_config_sub $ac_cv_target_alias failed" >&2;} + { (exit 1); exit 1; }; } + +fi +echo "$as_me:$LINENO: result: $ac_cv_target" >&5 +echo "${ECHO_T}$ac_cv_target" >&6 +target=$ac_cv_target +target_cpu=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` +target_vendor=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` +target_os=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` -# Do some error checking and defaulting for the host and target type. -# The inputs are: -# configure --host=HOST --target=TARGET --build=BUILD NONOPT -# -# The rules are: -# 1. You are not allowed to specify --host, --target, and nonopt at the -# same time. -# 2. Host defaults to nonopt. -# 3. If nonopt is not specified, then host defaults to the current host, -# as determined by config.guess. -# 4. Target and build default to nonopt. -# 5. If nonopt is not specified, then target and build default to host. # The aliases save the names the user supplied, while $host etc. # will get canonicalized. -case $host---$target---$nonopt in -NONE---*---* | *---NONE---* | *---*---NONE) ;; -*) { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; } ;; -esac - - -# Make sure we can run config.sub. -if ${CONFIG_SHELL-/bin/sh} $ac_config_sub sun4 >/dev/null 2>&1; then : -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 - -host_alias=$host -case "$host_alias" in -NONE) - case $nonopt in - NONE) - if host_alias=`${CONFIG_SHELL-/bin/sh} $ac_config_guess`; then : - else { echo "configure: error: can not guess host type; you must specify one" 1>&2; exit 1; } - fi ;; - *) host_alias=$nonopt ;; - esac ;; -esac - -host=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $host_alias` -host_cpu=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` -host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` -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 - -target_alias=$target -case "$target_alias" in -NONE) - case $nonopt in - NONE) target_alias=$host_alias ;; - *) target_alias=$nonopt ;; - esac ;; -esac - -target=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $target_alias` -target_cpu=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` -target_vendor=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` -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 - -build_alias=$build -case "$build_alias" in -NONE) - case $nonopt in - NONE) build_alias=$host_alias ;; - *) build_alias=$nonopt ;; - esac ;; -esac - -build=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $build_alias` -build_cpu=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` -build_vendor=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` -build_os=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` -echo "$ac_t""$build" 1>&6 - -test "$host_alias" != "$target_alias" && +test -n "$target_alias" && test "$program_prefix$program_suffix$program_transform_name" = \ NONENONEs,x,x, && program_prefix=${target_alias}- - PACKAGE="vlc" -VERSION="0.4.0" +VERSION="0.4.6" CODENAME=Ourumov save_CFLAGS="${CFLAGS}" 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 -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 +echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \${MAKE}" >&5 +echo $ECHO_N "checking whether ${MAKE-make} sets \${MAKE}... $ECHO_C" >&6 +set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,./+-,__p_,'` +if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat > conftestmake <<\EOF + cat >conftest.make <<\_ACEOF all: @echo 'ac_maketemp="${MAKE}"' -EOF +_ACEOF # GNU make sometimes prints "make[1]: Entering...", which would confuse us. -eval `${MAKE-make} -f conftestmake 2>/dev/null | grep temp=` +eval `${MAKE-make} -f conftest.make 2>/dev/null | grep temp=` if test -n "$ac_maketemp"; then eval ac_cv_prog_make_${ac_make}_set=yes else eval ac_cv_prog_make_${ac_make}_set=no fi -rm -f conftestmake +rm -f conftest.make fi if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then - echo "$ac_t""yes" 1>&6 + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 SET_MAKE= else - echo "$ac_t""no" 1>&6 + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 SET_MAKE="MAKE=${MAKE-make}" 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 -if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu +if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. +set dummy ${ac_tool_prefix}gcc; ac_word=$2 +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_prog_CC+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_prog_CC="gcc" - break - fi - done - IFS="$ac_save_ifs" +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_CC="${ac_tool_prefix}gcc" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done + fi fi -CC="$ac_cv_prog_CC" +CC=$ac_cv_prog_CC if test -n "$CC"; then - echo "$ac_t""$CC" 1>&6 + echo "$as_me:$LINENO: result: $CC" >&5 +echo "${ECHO_T}$CC" >&6 +else + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi + +fi +if test -z "$ac_cv_prog_CC"; then + ac_ct_CC=$CC + # Extract the first word of "gcc", so it can be a program name with args. +set dummy gcc; ac_word=$2 +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_prog_ac_ct_CC+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test -n "$ac_ct_CC"; then + ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_CC="gcc" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done + +fi +fi +ac_ct_CC=$ac_cv_prog_ac_ct_CC +if test -n "$ac_ct_CC"; then + echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 +echo "${ECHO_T}$ac_ct_CC" >&6 +else + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi + + CC=$ac_ct_CC else - echo "$ac_t""no" 1>&6 + CC="$ac_cv_prog_CC" fi if test -z "$CC"; then + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. +set dummy ${ac_tool_prefix}cc; ac_word=$2 +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_prog_CC+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_CC="${ac_tool_prefix}cc" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done + +fi +fi +CC=$ac_cv_prog_CC +if test -n "$CC"; then + echo "$as_me:$LINENO: result: $CC" >&5 +echo "${ECHO_T}$CC" >&6 +else + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi + +fi +if test -z "$ac_cv_prog_CC"; then + ac_ct_CC=$CC # 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 -if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_prog_ac_ct_CC+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test -n "$ac_ct_CC"; then + ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_CC="cc" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done + +fi +fi +ac_ct_CC=$ac_cv_prog_ac_ct_CC +if test -n "$ac_ct_CC"; then + echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 +echo "${ECHO_T}$ac_ct_CC" >&6 +else + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi + + CC=$ac_ct_CC +else + CC="$ac_cv_prog_CC" +fi + +fi +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 "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_prog_CC+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" ac_prog_rejected=no - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then - ac_prog_rejected=yes - continue - fi - ac_cv_prog_CC="cc" - break - fi - done - IFS="$ac_save_ifs" +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then + ac_prog_rejected=yes + continue + fi + ac_cv_prog_CC="cc" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done + if test $ac_prog_rejected = yes; then # We found a bogon in the path, so make sure we never use it. set dummy $ac_cv_prog_CC shift - if test $# -gt 0; then + if test $# != 0; then # We chose a different compiler from the bogus one. # However, it has the same basename, so the bogon will be chosen # first if we set CC to just the basename; use the full file name. shift - set dummy "$ac_dir/$ac_word" "$@" + set dummy "$as_dir/$ac_word" ${1+"$@"} shift ac_cv_prog_CC="$@" fi fi fi fi -CC="$ac_cv_prog_CC" +CC=$ac_cv_prog_CC if test -n "$CC"; then - echo "$ac_t""$CC" 1>&6 + echo "$as_me:$LINENO: result: $CC" >&5 +echo "${ECHO_T}$CC" >&6 else - echo "$ac_t""no" 1>&6 + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi - if test -z "$CC"; then - case "`uname -s`" in - *win32* | *WIN32*) - # 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 -if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +fi +if test -z "$CC"; then + if test -n "$ac_tool_prefix"; then + for ac_prog in cl + do + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. +set dummy $ac_tool_prefix$ac_prog; ac_word=$2 +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_prog_CC+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_prog_CC="cl" - break - fi - done - IFS="$ac_save_ifs" +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_CC="$ac_tool_prefix$ac_prog" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done + fi fi -CC="$ac_cv_prog_CC" +CC=$ac_cv_prog_CC if test -n "$CC"; then - echo "$ac_t""$CC" 1>&6 + echo "$as_me:$LINENO: result: $CC" >&5 +echo "${ECHO_T}$CC" >&6 else - echo "$ac_t""no" 1>&6 + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi - ;; - esac + + test -n "$CC" && break + done +fi +if test -z "$CC"; then + ac_ct_CC=$CC + for ac_prog in cl +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 "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_prog_ac_ct_CC+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test -n "$ac_ct_CC"; then + ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_CC="$ac_prog" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 fi - test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; } +done +done + +fi +fi +ac_ct_CC=$ac_cv_prog_ac_ct_CC +if test -n "$ac_ct_CC"; then + echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 +echo "${ECHO_T}$ac_ct_CC" >&6 +else + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 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 + test -n "$ac_ct_CC" && break +done -ac_ext=c -# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. -ac_cpp='$CPP $CPPFLAGS' -ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' -ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' -cross_compiling=$ac_cv_prog_cc_cross + CC=$ac_ct_CC +fi + +fi + + +test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH" >&5 +echo "$as_me: error: no acceptable C compiler found in \$PATH" >&2;} + { (exit 1); exit 1; }; } -cat > conftest.$ac_ext << EOF +# Provide some information about the compiler. +echo "$as_me:$LINENO:" \ + "checking for C compiler version" >&5 +ac_compiler=`set X $ac_compile; echo $2` +{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version &5\"") >&5 + (eval $ac_compiler --version &5) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } +{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v &5\"") >&5 + (eval $ac_compiler -v &5) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } +{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V &5\"") >&5 + (eval $ac_compiler -V &5) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } -#line 938 "configure" +cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "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 - 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 - ac_cv_prog_cc_cross=no +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } +#endif +int +main () +{ + + ; + return 0; +} +_ACEOF +ac_clean_files_save=$ac_clean_files +ac_clean_files="$ac_clean_files a.out a.exe" +# Try to create an executable without -o first, disregard a.out. +# It will help us diagnose broken compilers, and finding out an intuition +# of exeext. +echo "$as_me:$LINENO: checking for C compiler default output" >&5 +echo $ECHO_N "checking for C compiler default output... $ECHO_C" >&6 +ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` +if { (eval echo "$as_me:$LINENO: \"$ac_link_default\"") >&5 + (eval $ac_link_default) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + # Find the output, starting from the most likely. This scheme is +# not robust to junk in `.', hence go to wildcards (a.*) only as a last +# resort. + +# Be careful to initialize this variable, since it used to be cached. +# Otherwise an old cache value of `no' led to `EXEEXT = no' in a Makefile. +ac_cv_exeext= +for ac_file in `ls a_out.exe a.exe conftest.exe 2>/dev/null; + ls a.out conftest 2>/dev/null; + ls a.* conftest.* 2>/dev/null`; do + case $ac_file in + *.$ac_ext | *.o | *.obj | *.xcoff | *.tds | *.d | *.pdb | *.xSYM ) ;; + a.out ) # We found the default executable, but exeext='' is most + # certainly right. + break;; + *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` + # FIXME: I believe we export ac_cv_exeext for Libtool --akim. + export ac_cv_exeext + break;; + * ) break;; + esac +done +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +{ { echo "$as_me:$LINENO: error: C compiler cannot create executables" >&5 +echo "$as_me: error: C compiler cannot create executables" >&2;} + { (exit 77); exit 77; }; } +fi + +ac_exeext=$ac_cv_exeext +echo "$as_me:$LINENO: result: $ac_file" >&5 +echo "${ECHO_T}$ac_file" >&6 + +# Check the compiler produces executables we can run. If not, either +# the compiler is broken, or we cross compile. +echo "$as_me:$LINENO: checking whether the C compiler works" >&5 +echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6 +# FIXME: These cross compiler hacks should be removed for Autoconf 3.0 +# If not cross compiling, check that we can run a simple program. +if test "$cross_compiling" != yes; then + if { ac_try='./$ac_file' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cross_compiling=no else - ac_cv_prog_cc_cross=yes + if test "$cross_compiling" = maybe; then + cross_compiling=yes + else + { { echo "$as_me:$LINENO: error: cannot run C compiled programs. +If you meant to cross compile, use \`--host'." >&5 +echo "$as_me: error: cannot run C compiled programs. +If you meant to cross compile, use \`--host'." >&2;} + { (exit 1); exit 1; }; } + fi fi +fi +echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 + +rm -f a.out a.exe conftest$ac_cv_exeext +ac_clean_files=$ac_clean_files_save +# Check the compiler produces executables we can run. If not, either +# the compiler is broken, or we cross compile. +echo "$as_me:$LINENO: checking whether we are cross compiling" >&5 +echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6 +echo "$as_me:$LINENO: result: $cross_compiling" >&5 +echo "${ECHO_T}$cross_compiling" >&6 + +echo "$as_me:$LINENO: checking for suffix of executables" >&5 +echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + # If both `conftest.exe' and `conftest' are `present' (well, observable) +# catch `conftest.exe'. For instance with Cygwin, `ls conftest' will +# work properly (i.e., refer to `conftest.exe'), while it won't with +# `rm'. +for ac_file in `(ls conftest.exe; ls conftest; ls conftest.*) 2>/dev/null`; do + case $ac_file in + *.$ac_ext | *.o | *.obj | *.xcoff | *.tds | *.d | *.pdb ) ;; + *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` + export ac_cv_exeext + break;; + * ) break;; + esac +done else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - ac_cv_prog_cc_works=no + { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link" >&5 +echo "$as_me: error: cannot compute suffix of executables: cannot compile and link" >&2;} + { (exit 1); exit 1; }; } fi -rm -fr conftest* -ac_ext=c -# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. -ac_cpp='$CPP $CPPFLAGS' -ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' -ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' -cross_compiling=$ac_cv_prog_cc_cross -echo "$ac_t""$ac_cv_prog_cc_works" 1>&6 -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 "$ac_t""$ac_cv_prog_cc_cross" 1>&6 -cross_compiling=$ac_cv_prog_cc_cross +rm -f conftest$ac_cv_exeext +echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5 +echo "${ECHO_T}$ac_cv_exeext" >&6 -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 -if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +rm -f conftest.$ac_ext +EXEEXT=$ac_cv_exeext +ac_exeext=$EXEEXT +echo "$as_me:$LINENO: checking for suffix of object files" >&5 +echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6 +if test "${ac_cv_objext+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat > conftest.c <conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" +#include "confdefs.h" + +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } #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 - ac_cv_prog_gcc=yes +int +main () +{ + + ; + return 0; +} +_ACEOF +rm -f conftest.o conftest.obj +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do + case $ac_file in + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb ) ;; + *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'` + break;; + esac +done else - ac_cv_prog_gcc=no + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +{ { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile" >&5 +echo "$as_me: error: cannot compute suffix of object files: cannot compile" >&2;} + { (exit 1); exit 1; }; } fi + +rm -f conftest.$ac_cv_objext conftest.$ac_ext fi +echo "$as_me:$LINENO: result: $ac_cv_objext" >&5 +echo "${ECHO_T}$ac_cv_objext" >&6 +OBJEXT=$ac_cv_objext +ac_objext=$OBJEXT +echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5 +echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6 +if test "${ac_cv_c_compiler_gnu+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" +#include "confdefs.h" -echo "$ac_t""$ac_cv_prog_gcc" 1>&6 +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } +#endif +int +main () +{ +#ifndef __GNUC__ + choke me +#endif -if test $ac_cv_prog_gcc = yes; then - GCC=yes -else - GCC= -fi + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_compiler_gnu=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_compiler_gnu=no +fi +rm -f conftest.$ac_objext conftest.$ac_ext +ac_cv_c_compiler_gnu=$ac_compiler_gnu + +fi +echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5 +echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6 +GCC=`test $ac_compiler_gnu = yes && echo yes` +ac_test_CFLAGS=${CFLAGS+set} +ac_save_CFLAGS=$CFLAGS +CFLAGS="-g" +echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5 +echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6 +if test "${ac_cv_prog_cc_g+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" +#include "confdefs.h" -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 -if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - echo 'void f(){}' > conftest.c -if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } +#endif +int +main () +{ + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_cv_prog_cc_g=yes else - ac_cv_prog_cc_g=no + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_prog_cc_g=no fi -rm -f conftest* - +rm -f conftest.$ac_objext conftest.$ac_ext fi - -echo "$ac_t""$ac_cv_prog_cc_g" 1>&6 +echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5 +echo "${ECHO_T}$ac_cv_prog_cc_g" >&6 if test "$ac_test_CFLAGS" = set; then - CFLAGS="$ac_save_CFLAGS" + CFLAGS=$ac_save_CFLAGS elif test $ac_cv_prog_cc_g = yes; then if test "$GCC" = yes; then CFLAGS="-g -O2" @@ -1028,270 +2054,696 @@ else CFLAGS= fi fi +# Some people use a C++ compiler to compile C. Since we use `exit', +# in C++ we need to declare it. In case someone uses the same compiler +# for both compiling C and C++ we need to have the C++ compiler decide +# the declaration of exit, since it's the most demanding environment. +cat >conftest.$ac_ext <<_ACEOF +#ifndef __cplusplus + choke me +#endif +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + for ac_declaration in \ + ''\ + '#include ' \ + 'extern "C" void std::exit (int) throw (); using std::exit;' \ + 'extern "C" void std::exit (int); using std::exit;' \ + 'extern "C" void exit (int) throw ();' \ + 'extern "C" void exit (int);' \ + 'void exit (int);' +do + cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" +#include "confdefs.h" +#include +$ac_declaration +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } +#endif +int +main () +{ +exit (42); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + : +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +continue +fi +rm -f conftest.$ac_objext conftest.$ac_ext + cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" +#include "confdefs.h" +$ac_declaration +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } +#endif +int +main () +{ +exit (42); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + break +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +fi +rm -f conftest.$ac_objext conftest.$ac_ext +done +rm -f conftest* +if test -n "$ac_declaration"; then + echo '#ifdef __cplusplus' >>confdefs.h + echo $ac_declaration >>confdefs.h + echo '#endif' >>confdefs.h +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 +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +fi +rm -f conftest.$ac_objext conftest.$ac_ext +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu +echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5 +echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= fi if test -z "$CPP"; then -if eval "test \"`echo '$''{'ac_cv_prog_CPP'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - # This must be in double quotes, not single quotes, because CPP may get - # substituted into the Makefile and "${CC-cc}" will confuse make. - CPP="${CC-cc} -E" + if test "${ac_cv_prog_CPP+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + # Double quotes because CPP needs to be expanded + for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp" + do + ac_preproc_ok=false +for ac_c_preproc_warn_flag in '' yes +do + # Use a header file that comes with gcc, so configuring glibc + # with a fresh cross-compiler works. # On the NeXT, cc -E runs the code through the compiler's parser, - # not just through cpp. - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" #include "confdefs.h" #include -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; } -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` -if test -z "$ac_err"; then + Syntax error +_ACEOF +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + egrep -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then : else - echo "$ac_err" >&5 - echo "configure: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 - rm -rf conftest* - CPP="${CC-cc} -E -traditional-cpp" - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" #include "confdefs.h" -#include -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; } -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` -if test -z "$ac_err"; then - : +#include +_ACEOF +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + egrep -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + else + ac_cpp_err= + fi else - echo "$ac_err" >&5 - echo "configure: failed program was:" >&5 + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then + # Broken: success on invalid input. +continue +else + echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 - rm -rf conftest* - CPP="${CC-cc} -nologo -E" - cat > conftest.$ac_ext <&5 +echo "${ECHO_T}$CPP" >&6 +ac_preproc_ok=false +for ac_c_preproc_warn_flag in '' yes +do + # Use a header file that comes with gcc, so configuring glibc + # with a fresh cross-compiler works. + # On the NeXT, cc -E runs the code through the compiler's parser, + # not just through cpp. "Syntax error" is here to catch this case. + cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" #include "confdefs.h" #include -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; } -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` -if test -z "$ac_err"; then + Syntax error +_ACEOF +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + egrep -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then : else - echo "$ac_err" >&5 - echo "configure: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 - rm -rf conftest* - CPP=/lib/cpp + # Broken: fails on valid input. +continue fi -rm -f conftest* +rm -f conftest.err conftest.$ac_ext + + # OK, works on sane cases. Now check whether non-existent headers + # can be detected and how. + cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" +#include "confdefs.h" +#include +_ACEOF +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + egrep -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes fi -rm -f conftest* +if test -z "$ac_cpp_err"; then + # Broken: success on invalid input. +continue +else + echo "$as_me: failed program was:" >&5 + cat conftest.$ac_ext >&5 + # Passes both tests. +ac_preproc_ok=: +break +fi +rm -f conftest.err conftest.$ac_ext + +done +# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. +rm -f conftest.err conftest.$ac_ext +if $ac_preproc_ok; then + : +else + { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check" >&5 +echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check" >&2;} + { (exit 1); exit 1; }; } +fi + +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + + +if test -n "$ac_tool_prefix"; then + # 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 "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_prog_RANLIB+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test -n "$RANLIB"; then + ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done + +fi +fi +RANLIB=$ac_cv_prog_RANLIB +if test -n "$RANLIB"; then + echo "$as_me:$LINENO: result: $RANLIB" >&5 +echo "${ECHO_T}$RANLIB" >&6 +else + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi + +fi +if test -z "$ac_cv_prog_RANLIB"; then + ac_ct_RANLIB=$RANLIB + # Extract the first word of "ranlib", so it can be a program name with args. +set dummy ranlib; ac_word=$2 +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test -n "$ac_ct_RANLIB"; then + ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_RANLIB="ranlib" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done + + test -z "$ac_cv_prog_ac_ct_RANLIB" && ac_cv_prog_ac_ct_RANLIB=":" fi -rm -f conftest* - ac_cv_prog_CPP="$CPP" fi - CPP="$ac_cv_prog_CPP" +ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB +if test -n "$ac_ct_RANLIB"; then + echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5 +echo "${ECHO_T}$ac_ct_RANLIB" >&6 else - ac_cv_prog_CPP="$CPP" + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi -echo "$ac_t""$CPP" 1>&6 - -if test $host != $build; then - ac_tool_prefix=${host_alias}- + RANLIB=$ac_ct_RANLIB else - ac_tool_prefix= + RANLIB="$ac_cv_prog_RANLIB" 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 -if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +if test -n "$ac_tool_prefix"; then + # 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 "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_prog_STRIP+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - if test -n "$RANLIB"; then - ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. + if test -n "$STRIP"; then + ac_cv_prog_STRIP="$STRIP" # Let the user override the test. else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" - break - fi - done - IFS="$ac_save_ifs" +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_STRIP="${ac_tool_prefix}strip" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done + fi fi -RANLIB="$ac_cv_prog_RANLIB" -if test -n "$RANLIB"; then - echo "$ac_t""$RANLIB" 1>&6 +STRIP=$ac_cv_prog_STRIP +if test -n "$STRIP"; then + echo "$as_me:$LINENO: result: $STRIP" >&5 +echo "${ECHO_T}$STRIP" >&6 else - echo "$ac_t""no" 1>&6 + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi - -if test -z "$ac_cv_prog_RANLIB"; then -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 -if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +fi +if test -z "$ac_cv_prog_STRIP"; then + ac_ct_STRIP=$STRIP + # Extract the first word of "strip", so it can be a program name with args. +set dummy strip; ac_word=$2 +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - if test -n "$RANLIB"; then - ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. + if test -n "$ac_ct_STRIP"; then + ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test. else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_prog_RANLIB="ranlib" - break - fi - done - IFS="$ac_save_ifs" - test -z "$ac_cv_prog_RANLIB" && ac_cv_prog_RANLIB=":" +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_STRIP="strip" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done + + test -z "$ac_cv_prog_ac_ct_STRIP" && ac_cv_prog_ac_ct_STRIP=":" fi fi -RANLIB="$ac_cv_prog_RANLIB" -if test -n "$RANLIB"; then - echo "$ac_t""$RANLIB" 1>&6 +ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP +if test -n "$ac_ct_STRIP"; then + echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5 +echo "${ECHO_T}$ac_ct_STRIP" >&6 else - echo "$ac_t""no" 1>&6 + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi + STRIP=$ac_ct_STRIP else - RANLIB=":" + STRIP="$ac_cv_prog_STRIP" +fi + +if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. +set dummy ${ac_tool_prefix}ar; ac_word=$2 +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_prog_AR+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test -n "$AR"; then + ac_cv_prog_AR="$AR" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_AR="${ac_tool_prefix}ar" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done + +fi fi +AR=$ac_cv_prog_AR +if test -n "$AR"; then + echo "$as_me:$LINENO: result: $AR" >&5 +echo "${ECHO_T}$AR" >&6 +else + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 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 -if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +fi +if test -z "$ac_cv_prog_AR"; then + ac_ct_AR=$AR + # Extract the first word of "ar", so it can be a program name with args. +set dummy ar; ac_word=$2 +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_prog_ac_ct_AR+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - if test -n "$STRIP"; then - ac_cv_prog_STRIP="$STRIP" # Let the user override the test. + if test -n "$ac_ct_AR"; then + ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test. else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_prog_STRIP="${ac_tool_prefix}strip" - break - fi - done - IFS="$ac_save_ifs" +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_AR="ar" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done + + test -z "$ac_cv_prog_ac_ct_AR" && ac_cv_prog_ac_ct_AR=":" fi fi -STRIP="$ac_cv_prog_STRIP" -if test -n "$STRIP"; then - echo "$ac_t""$STRIP" 1>&6 +ac_ct_AR=$ac_cv_prog_ac_ct_AR +if test -n "$ac_ct_AR"; then + echo "$as_me:$LINENO: result: $ac_ct_AR" >&5 +echo "${ECHO_T}$ac_ct_AR" >&6 else - echo "$ac_t""no" 1>&6 + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi + AR=$ac_ct_AR +else + AR="$ac_cv_prog_AR" +fi -if test -z "$ac_cv_prog_STRIP"; then 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 -if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + # Extract the first word of "${ac_tool_prefix}ld", so it can be a program name with args. +set dummy ${ac_tool_prefix}ld; ac_word=$2 +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_prog_LD+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test -n "$LD"; then + ac_cv_prog_LD="$LD" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_LD="${ac_tool_prefix}ld" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done + +fi +fi +LD=$ac_cv_prog_LD +if test -n "$LD"; then + echo "$as_me:$LINENO: result: $LD" >&5 +echo "${ECHO_T}$LD" >&6 else - if test -n "$STRIP"; then - ac_cv_prog_STRIP="$STRIP" # Let the user override the test. + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi + +fi +if test -z "$ac_cv_prog_LD"; then + ac_ct_LD=$LD + # Extract the first word of "ld", so it can be a program name with args. +set dummy ld; ac_word=$2 +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_prog_ac_ct_LD+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_prog_STRIP="strip" - break - fi - done - IFS="$ac_save_ifs" - test -z "$ac_cv_prog_STRIP" && ac_cv_prog_STRIP=":" + if test -n "$ac_ct_LD"; then + ac_cv_prog_ac_ct_LD="$ac_ct_LD" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_LD="ld" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done + + test -z "$ac_cv_prog_ac_ct_LD" && ac_cv_prog_ac_ct_LD=":" fi fi -STRIP="$ac_cv_prog_STRIP" -if test -n "$STRIP"; then - echo "$ac_t""$STRIP" 1>&6 +ac_ct_LD=$ac_cv_prog_ac_ct_LD +if test -n "$ac_ct_LD"; then + echo "$as_me:$LINENO: result: $ac_ct_LD" >&5 +echo "${ECHO_T}$ac_ct_LD" >&6 else - echo "$ac_t""no" 1>&6 + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi + LD=$ac_ct_LD else - STRIP=":" -fi + LD="$ac_cv_prog_LD" 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 -if eval "test \"`echo '$''{'ac_cv_path_GMAKE'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_path_GMAKE+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - case "$GMAKE" in - /*) + case $GMAKE in + [\\/]* | ?:[\\/]*) ac_cv_path_GMAKE="$GMAKE" # Let the user override the test with a path. ;; - ?:/*) - ac_cv_path_GMAKE="$GMAKE" # Let the user override the test with a dos path. - ;; *) - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_path_GMAKE="$ac_dir/$ac_word" - break - fi - done - IFS="$ac_save_ifs" + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_GMAKE="$as_dir/$ac_word$ac_exec_ext" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done + test -z "$ac_cv_path_GMAKE" && ac_cv_path_GMAKE="no" ;; esac fi -GMAKE="$ac_cv_path_GMAKE" +GMAKE=$ac_cv_path_GMAKE + if test -n "$GMAKE"; then - echo "$ac_t""$GMAKE" 1>&6 + echo "$as_me:$LINENO: result: $GMAKE" >&5 +echo "${ECHO_T}$GMAKE" >&6 else - echo "$ac_t""no" 1>&6 + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 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 -if eval "test \"`echo '$''{'ac_cv_gmake'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + echo "$as_me:$LINENO: checking whether GNU make is installed" >&5 +echo $ECHO_N "checking whether GNU make is installed... $ECHO_C" >&6 +if test "${ac_cv_gmake+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else if make --version | grep -q -i gnu; then ac_cv_gmake="yes" @@ -1301,8 +2753,8 @@ else exit fi fi - -echo "$ac_t""$ac_cv_gmake" 1>&6 +echo "$as_me:$LINENO: result: $ac_cv_gmake" >&5 +echo "${ECHO_T}$ac_cv_gmake" >&6 VLC_MAKE="make" else VLC_MAKE="gmake" @@ -1310,127 +2762,211 @@ fi ALL_LINGUAS="de en_GB fr ja no ru nl pl" -cat >> confdefs.h <>confdefs.h <<_ACEOF #define VLC_PACKAGE "$PACKAGE" -EOF +_ACEOF -cat >> confdefs.h <>confdefs.h <<_ACEOF #define VLC_VERSION "$VERSION" -EOF +_ACEOF -# 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 -if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +if test -n "$ac_tool_prefix"; then + # 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 "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_prog_RANLIB+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else if test -n "$RANLIB"; then ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_prog_RANLIB="ranlib" - break - fi - done - IFS="$ac_save_ifs" - test -z "$ac_cv_prog_RANLIB" && ac_cv_prog_RANLIB=":" +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done + fi fi -RANLIB="$ac_cv_prog_RANLIB" +RANLIB=$ac_cv_prog_RANLIB if test -n "$RANLIB"; then - echo "$ac_t""$RANLIB" 1>&6 + echo "$as_me:$LINENO: result: $RANLIB" >&5 +echo "${ECHO_T}$RANLIB" >&6 else - echo "$ac_t""no" 1>&6 + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi - - echo $ac_n "checking for strerror in -lcposix""... $ac_c" 1>&6 -echo "configure:1354: 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 +fi +if test -z "$ac_cv_prog_RANLIB"; then + ac_ct_RANLIB=$RANLIB + # Extract the first word of "ranlib", so it can be a program name with args. +set dummy ranlib; ac_word=$2 +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_save_LIBS="$LIBS" -LIBS="-lcposix $LIBS" -cat > conftest.$ac_ext <&5 + break 2 + fi +done +done -int main() { -strerror() -; return 0; } -EOF -if { (eval echo configure:1373: \"$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" + test -z "$ac_cv_prog_ac_ct_RANLIB" && ac_cv_prog_ac_ct_RANLIB=":" +fi +fi +ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB +if test -n "$ac_ct_RANLIB"; then + echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5 +echo "${ECHO_T}$ac_ct_RANLIB" >&6 else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi -rm -f conftest* -LIBS="$ac_save_LIBS" + RANLIB=$ac_ct_RANLIB +else + RANLIB="$ac_cv_prog_RANLIB" fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - LIBS="$LIBS -lcposix" + + + + echo "$as_me:$LINENO: checking for strerror in -lcposix" >&5 +echo $ECHO_N "checking for strerror in -lcposix... $ECHO_C" >&6 +if test "${ac_cv_lib_cposix_strerror+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - echo "$ac_t""no" 1>&6 + ac_check_lib_save_LIBS=$LIBS +LIBS="-lcposix $LIBS" +cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" +#include "confdefs.h" + +/* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char strerror (); +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } +#endif +int +main () +{ +strerror (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_cposix_strerror=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_lib_cposix_strerror=no +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:$LINENO: result: $ac_cv_lib_cposix_strerror" >&5 +echo "${ECHO_T}$ac_cv_lib_cposix_strerror" >&6 +if test $ac_cv_lib_cposix_strerror = yes; then + LIBS="$LIBS -lcposix" fi - -echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:1396: 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 + + +echo "$as_me:$LINENO: checking for ANSI C header files" >&5 +echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6 +if test "${ac_cv_header_stdc+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" #include "confdefs.h" #include #include #include #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; } -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` -if test -z "$ac_err"; then - rm -rf conftest* + +_ACEOF +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + egrep -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then ac_cv_header_stdc=yes else - echo "$ac_err" >&5 - echo "configure: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 - rm -rf conftest* ac_cv_header_stdc=no fi -rm -f conftest* +rm -f conftest.err conftest.$ac_ext if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. -cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" #include "confdefs.h" #include -EOF + +_ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | egrep "memchr" >/dev/null 2>&1; then : else - rm -rf conftest* ac_cv_header_stdc=no fi rm -f conftest* @@ -1439,16 +2975,16 @@ 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 <conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" #include "confdefs.h" #include -EOF + +_ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | egrep "free" >/dev/null 2>&1; then : else - rm -rf conftest* ac_cv_header_stdc=no fi rm -f conftest* @@ -1457,269 +2993,553 @@ fi if test $ac_cv_header_stdc = yes; then # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. -if test "$cross_compiling" = yes; then + if test "$cross_compiling" = yes; then : else - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" #include "confdefs.h" #include -#define ISLOWER(c) ('a' <= (c) && (c) <= 'z') -#define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) -#define XOR(e, f) (((e) && !(f)) || (!(e) && (f))) -int main () { int i; for (i = 0; i < 256; i++) -if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2); -exit (0); } +#if ((' ' & 0x0FF) == 0x020) +# define ISLOWER(c) ('a' <= (c) && (c) <= 'z') +# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) +#else +# define ISLOWER(c) (('a' <= (c) && (c) <= 'i') \ + || ('j' <= (c) && (c) <= 'r') \ + || ('s' <= (c) && (c) <= 'z')) +# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c)) +#endif -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 -then +#define XOR(e, f) (((e) && !(f)) || (!(e) && (f))) +int +main () +{ + int i; + for (i = 0; i < 256; i++) + if (XOR (islower (i), ISLOWER (i)) + || toupper (i) != TOUPPER (i)) + exit(2); + exit (0); +} +_ACEOF +rm -f conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then : else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -fr conftest* - ac_cv_header_stdc=no + echo "$as_me: program exited with status $ac_status" >&5 +echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +( exit $ac_status ) +ac_cv_header_stdc=no fi -rm -fr conftest* +rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi - fi fi - -echo "$ac_t""$ac_cv_header_stdc" 1>&6 +echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5 +echo "${ECHO_T}$ac_cv_header_stdc" >&6 if test $ac_cv_header_stdc = yes; then - cat >> confdefs.h <<\EOF + +cat >>confdefs.h <<\_ACEOF #define STDC_HEADERS 1 -EOF +_ACEOF fi -echo $ac_n "checking for working const""... $ac_c" 1>&6 -echo "configure:1500: 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 +echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6 +if test "${ac_cv_prog_cc_stdc+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_cv_prog_cc_stdc=no +ac_save_CC=$CC +cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" +#include "confdefs.h" +#include +#include +#include +#include +/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ +struct buf { int x; }; +FILE * (*rcsopen) (struct buf *, struct stat *, int); +static char *e (p, i) + char **p; + int i; +{ + return p[i]; } -{ /* AIX XL C 1.02.0.0 rejects this saying - "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */ - struct s { int j; const int *ap[3]; }; - struct s *b; b->j = 5; +static char *f (char * (*g) (char **, int), char **p, ...) +{ + char *s; + va_list v; + va_start (v,p); + s = g (p, va_arg (v,int)); + va_end (v); + return s; } -{ /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */ - const int foo = 10; +int test (int i, double x); +struct s1 {int (*f) (int a);}; +struct s2 {int (*f) (double a);}; +int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int); +int argc; +char **argv; +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } +#endif +int +main () +{ +return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]; + ; + return 0; } +_ACEOF +# Don't try gcc -ansi; that turns off useful extensions and +# breaks some systems' header files. +# AIX -qlanglvl=ansi +# Ultrix and OSF/1 -std1 +# HP-UX 10.20 and later -Ae +# HP-UX older versions -Aa -D_HPUX_SOURCE +# SVR4 -Xc -D__EXTENSIONS__ +for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" +do + CC="$ac_save_CC $ac_arg" + rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_prog_cc_stdc=$ac_arg +break +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +fi +rm -f conftest.$ac_objext +done +rm -f conftest.$ac_ext conftest.$ac_objext +CC=$ac_save_CC -; return 0; } -EOF -if { (eval echo configure:1554: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* +fi + +case "x$ac_cv_prog_cc_stdc" in + x|xno) + echo "$as_me:$LINENO: result: none needed" >&5 +echo "${ECHO_T}none needed" >&6 ;; + *) + echo "$as_me:$LINENO: result: $ac_cv_prog_cc_stdc" >&5 +echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6 + CC="$CC $ac_cv_prog_cc_stdc" ;; +esac + +echo "$as_me:$LINENO: checking for an ANSI C-conforming const" >&5 +echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6 +if test "${ac_cv_c_const+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" +#include "confdefs.h" + +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } +#endif +int +main () +{ +/* FIXME: Include the comments suggested by Paul. */ +#ifndef __cplusplus + /* Ultrix mips cc rejects this. */ + typedef int charset[2]; + const charset x; + /* SunOS 4.1.1 cc rejects this. */ + char const *const *ccp; + char **p; + /* NEC SVR4.0.2 mips cc rejects this. */ + struct point {int x, y;}; + static struct point const zero = {0,0}; + /* AIX XL C 1.02.0.0 rejects this. + It does not let you subtract one const X* pointer from another in + an arm of an if-expression whose if-part is not a constant + expression */ + const char *g = "string"; + ccp = &g + (g ? g-g : 0); + /* HPUX 7.0 cc rejects these. */ + ++ccp; + p = (char**) ccp; + ccp = (char const *const *) p; + { /* SCO 3.2v4 cc rejects this. */ + char *t; + char const *s = 0 ? (char *) 0 : (char const *) 0; + + *t++ = 0; + } + { /* Someone thinks the Sun supposedly-ANSI compiler will reject this. */ + int x[] = {25, 17}; + const int *foo = &x[0]; + ++foo; + } + { /* Sun SC1.0 ANSI compiler rejects this -- but not the above. */ + typedef const int *iptr; + iptr p = 0; + ++p; + } + { /* AIX XL C 1.02.0.0 rejects this saying + "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */ + struct s { int j; const int *ap[3]; }; + struct s *b; b->j = 5; + } + { /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */ + const int foo = 10; + } +#endif + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_cv_c_const=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - ac_cv_c_const=no + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_c_const=no fi -rm -f conftest* +rm -f conftest.$ac_objext conftest.$ac_ext fi - -echo "$ac_t""$ac_cv_c_const" 1>&6 +echo "$as_me:$LINENO: result: $ac_cv_c_const" >&5 +echo "${ECHO_T}$ac_cv_c_const" >&6 if test $ac_cv_c_const = no; then - cat >> confdefs.h <<\EOF -#define const -EOF + +cat >>confdefs.h <<\_ACEOF +#define const +_ACEOF fi -echo $ac_n "checking for inline""... $ac_c" 1>&6 -echo "configure:1575: checking for inline" >&5 -if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +echo "$as_me:$LINENO: checking for inline" >&5 +echo $ECHO_N "checking for inline... $ECHO_C" >&6 +if test "${ac_cv_c_inline+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_cv_c_inline=no for ac_kw in inline __inline__ __inline; do - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" #include "confdefs.h" +#ifndef __cplusplus +static $ac_kw int static_foo () {return 0; } +$ac_kw int foo () {return 0; } +#endif -int main() { -} $ac_kw foo() { -; return 0; } -EOF -if { (eval echo configure:1589: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_cv_c_inline=$ac_kw; break else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 fi -rm -f conftest* +rm -f conftest.$ac_objext conftest.$ac_ext done fi - -echo "$ac_t""$ac_cv_c_inline" 1>&6 -case "$ac_cv_c_inline" in +echo "$as_me:$LINENO: result: $ac_cv_c_inline" >&5 +echo "${ECHO_T}$ac_cv_c_inline" >&6 +case $ac_cv_c_inline in inline | yes) ;; - no) cat >> confdefs.h <<\EOF -#define inline -EOF + no) +cat >>confdefs.h <<\_ACEOF +#define inline +_ACEOF ;; - *) cat >> confdefs.h <>confdefs.h <<_ACEOF #define inline $ac_cv_c_inline -EOF +_ACEOF ;; esac -echo $ac_n "checking for off_t""... $ac_c" 1>&6 -echo "configure:1615: 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 +# On IRIX 5.3, sys/types and inttypes.h are conflicting. + + + + + + + + + +for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ + inttypes.h stdint.h unistd.h +do +as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 +if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" +#include "confdefs.h" +$ac_includes_default + +#include <$ac_header> +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + eval "$as_ac_Header=yes" +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +eval "$as_ac_Header=no" +fi +rm -f conftest.$ac_objext conftest.$ac_ext +fi +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +if test `eval echo '${'$as_ac_Header'}'` = yes; then + cat >>confdefs.h <<_ACEOF +#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF + +fi + +done + + +echo "$as_me:$LINENO: checking for off_t" >&5 +echo $ECHO_N "checking for off_t... $ECHO_C" >&6 +if test "${ac_cv_type_off_t+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" #include "confdefs.h" -#include -#if STDC_HEADERS -#include -#include +$ac_includes_default +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } #endif -EOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - egrep "(^|[^a-zA-Z_0-9])off_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then - rm -rf conftest* +int +main () +{ +if ((off_t *) 0) + return 0; +if (sizeof (off_t)) + return 0; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_cv_type_off_t=yes else - rm -rf conftest* - ac_cv_type_off_t=no + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_type_off_t=no fi -rm -f conftest* - +rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$ac_t""$ac_cv_type_off_t" 1>&6 -if test $ac_cv_type_off_t = no; then - cat >> confdefs.h <<\EOF +echo "$as_me:$LINENO: result: $ac_cv_type_off_t" >&5 +echo "${ECHO_T}$ac_cv_type_off_t" >&6 +if test $ac_cv_type_off_t = yes; then + : +else + +cat >>confdefs.h <<_ACEOF #define off_t long -EOF +_ACEOF fi -echo $ac_n "checking for size_t""... $ac_c" 1>&6 -echo "configure:1648: 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 +echo "$as_me:$LINENO: checking for size_t" >&5 +echo $ECHO_N "checking for size_t... $ECHO_C" >&6 +if test "${ac_cv_type_size_t+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" #include "confdefs.h" -#include -#if STDC_HEADERS -#include -#include +$ac_includes_default +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } #endif -EOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - egrep "(^|[^a-zA-Z_0-9])size_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then - rm -rf conftest* +int +main () +{ +if ((size_t *) 0) + return 0; +if (sizeof (size_t)) + return 0; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_cv_type_size_t=yes else - rm -rf conftest* - ac_cv_type_size_t=no + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_type_size_t=no fi -rm -f conftest* - +rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$ac_t""$ac_cv_type_size_t" 1>&6 -if test $ac_cv_type_size_t = no; then - cat >> confdefs.h <<\EOF +echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5 +echo "${ECHO_T}$ac_cv_type_size_t" >&6 +if test $ac_cv_type_size_t = yes; then + : +else + +cat >>confdefs.h <<_ACEOF #define size_t unsigned -EOF +_ACEOF 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 -if eval "test \"`echo '$''{'ac_cv_header_alloca_h'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +echo "$as_me:$LINENO: checking for working alloca.h" >&5 +echo $ECHO_N "checking for working alloca.h... $ECHO_C" >&6 +if test "${ac_cv_working_alloca_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" #include "confdefs.h" #include -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 - rm -rf conftest* - ac_cv_header_alloca_h=yes -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - ac_cv_header_alloca_h=no -fi -rm -f conftest* -fi - -echo "$ac_t""$ac_cv_header_alloca_h" 1>&6 -if test $ac_cv_header_alloca_h = yes; then - cat >> confdefs.h <<\EOF +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } +#endif +int +main () +{ +char *p = (char *) alloca (2 * sizeof (int)); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_working_alloca_h=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_working_alloca_h=no +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +fi +echo "$as_me:$LINENO: result: $ac_cv_working_alloca_h" >&5 +echo "${ECHO_T}$ac_cv_working_alloca_h" >&6 +if test $ac_cv_working_alloca_h = yes; then + +cat >>confdefs.h <<\_ACEOF #define HAVE_ALLOCA_H 1 -EOF +_ACEOF fi -echo $ac_n "checking for alloca""... $ac_c" 1>&6 -echo "configure:1716: checking for alloca" >&5 -if eval "test \"`echo '$''{'ac_cv_func_alloca_works'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +echo "$as_me:$LINENO: checking for alloca" >&5 +echo $ECHO_N "checking for alloca... $ECHO_C" >&6 +if test "${ac_cv_func_alloca_works+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" #include "confdefs.h" - #ifdef __GNUC__ # define alloca __builtin_alloca #else @@ -1741,48 +3561,69 @@ char *alloca (); # endif #endif -int main() { -char *p = (char *) alloca(1); -; return 0; } -EOF -if { (eval echo configure:1749: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } +#endif +int +main () +{ +char *p = (char *) alloca (1); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_cv_func_alloca_works=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - ac_cv_func_alloca_works=no + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_func_alloca_works=no fi -rm -f conftest* +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi +echo "$as_me:$LINENO: result: $ac_cv_func_alloca_works" >&5 +echo "${ECHO_T}$ac_cv_func_alloca_works" >&6 -echo "$ac_t""$ac_cv_func_alloca_works" 1>&6 if test $ac_cv_func_alloca_works = yes; then - cat >> confdefs.h <<\EOF -#define HAVE_ALLOCA 1 -EOF -fi +cat >>confdefs.h <<\_ACEOF +#define HAVE_ALLOCA 1 +_ACEOF -if test $ac_cv_func_alloca_works = no; then +else # The SVR3 libPW and SVR4 libucb both contain incompatible functions - # that cause trouble. Some versions do not even contain alloca or - # contain a buggy version. If you still want to use their alloca, - # use ar to extract alloca.o from them instead of compiling alloca.c. - ALLOCA=alloca.${ac_objext} - cat >> confdefs.h <<\EOF +# that cause trouble. Some versions do not even contain alloca or +# contain a buggy version. If you still want to use their alloca, +# use ar to extract alloca.o from them instead of compiling alloca.c. + +ALLOCA=alloca.$ac_objext + +cat >>confdefs.h <<\_ACEOF #define C_ALLOCA 1 -EOF +_ACEOF -echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6 -echo "configure:1781: 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 +echo "$as_me:$LINENO: checking whether \`alloca.c' needs Cray hooks" >&5 +echo $ECHO_N "checking whether \`alloca.c' needs Cray hooks... $ECHO_C" >&6 +if test "${ac_cv_os_cray+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" #include "confdefs.h" #if defined(CRAY) && ! defined(CRAY2) webecray @@ -1790,88 +3631,109 @@ webecray wenotbecray #endif -EOF +_ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | egrep "webecray" >/dev/null 2>&1; then - rm -rf conftest* ac_cv_os_cray=yes else - rm -rf conftest* ac_cv_os_cray=no fi rm -f conftest* fi - -echo "$ac_t""$ac_cv_os_cray" 1>&6 +echo "$as_me:$LINENO: result: $ac_cv_os_cray" >&5 +echo "${ECHO_T}$ac_cv_os_cray" >&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 -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 +echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 +if eval "test \"\${$as_ac_var+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func(); below. */ + which can conflict with char $ac_func (); below. */ #include /* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif /* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char $ac_func(); - -int main() { + builtin and then its argument prototype would still apply. */ +char $ac_func (); +char (*f) (); +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } +#endif +int +main () +{ /* The GNU C library defines this for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ #if defined (__stub_$ac_func) || defined (__stub___$ac_func) choke me #else -$ac_func(); +f = $ac_func; #endif -; return 0; } -EOF -if { (eval echo configure:1839: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_$ac_func=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_func_$ac_func=no" -fi -rm -f conftest* -fi - -if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then - echo "$ac_t""yes" 1>&6 - cat >> confdefs.h <&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + eval "$as_ac_var=yes" +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +eval "$as_ac_var=no" +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +fi +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 +if test `eval echo '${'$as_ac_var'}'` = yes; then + +cat >>confdefs.h <<_ACEOF #define CRAY_STACKSEG_END $ac_func -EOF +_ACEOF - break -else - echo "$ac_t""no" 1>&6 + break fi -done + 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 -if eval "test \"`echo '$''{'ac_cv_c_stack_direction'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +echo "$as_me:$LINENO: checking stack direction for C alloca" >&5 +echo $ECHO_N "checking stack direction for C alloca... $ECHO_C" >&6 +if test "${ac_cv_c_stack_direction+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else if test "$cross_compiling" = yes; then ac_cv_c_stack_direction=0 else - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" #include "confdefs.h" +int find_stack_direction () { static char *addr = 0; @@ -1884,138 +3746,250 @@ find_stack_direction () else return (&dummy > addr) ? 1 : -1; } + +int main () { - exit (find_stack_direction() < 0); + exit (find_stack_direction () < 0); } -EOF -if { (eval echo configure:1893: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -then +_ACEOF +rm -f conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_cv_c_stack_direction=1 else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -fr conftest* - ac_cv_c_stack_direction=-1 + echo "$as_me: program exited with status $ac_status" >&5 +echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +( exit $ac_status ) +ac_cv_c_stack_direction=-1 fi -rm -fr conftest* +rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi - fi +echo "$as_me:$LINENO: result: $ac_cv_c_stack_direction" >&5 +echo "${ECHO_T}$ac_cv_c_stack_direction" >&6 -echo "$ac_t""$ac_cv_c_stack_direction" 1>&6 -cat >> confdefs.h <>confdefs.h <<_ACEOF #define STACK_DIRECTION $ac_cv_c_stack_direction -EOF +_ACEOF + fi -for ac_hdr in unistd.h + + +for ac_header in stdlib.h 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 -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 <&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 +if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +fi +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +else + # Is the header compilable? +echo "$as_me:$LINENO: checking $ac_header usability" >&5 +echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" #include "confdefs.h" -#include <$ac_hdr> -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; } -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 +$ac_includes_default +#include <$ac_header> +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_header_compiler=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_header_compiler=no +fi +rm -f conftest.$ac_objext conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6 + +# Is the header present? +echo "$as_me:$LINENO: checking $ac_header presence" >&5 +echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" +#include "confdefs.h" +#include <$ac_header> +_ACEOF +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + egrep -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then + ac_header_preproc=yes +else + echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_header_$ac_safe=no" + ac_header_preproc=no +fi +rm -f conftest.err conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6 + +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc in + yes:no ) + { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};; + no:yes ) + { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 +echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};; +esac +echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 +if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + eval "$as_ac_Header=$ac_header_preproc" fi -rm -f conftest* +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 + fi -if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then - echo "$ac_t""yes" 1>&6 - ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` - cat >> confdefs.h <&6 +if test `eval echo '${'$as_ac_Header'}'` = yes; then + cat >>confdefs.h <<_ACEOF +#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF + fi + 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 -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 +echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 +if eval "test \"\${$as_ac_var+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func(); below. */ + which can conflict with char $ac_func (); below. */ #include /* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif /* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char $ac_func(); - -int main() { + builtin and then its argument prototype would still apply. */ +char $ac_func (); +char (*f) (); +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } +#endif +int +main () +{ /* The GNU C library defines this for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ #if defined (__stub_$ac_func) || defined (__stub___$ac_func) choke me #else -$ac_func(); +f = $ac_func; #endif -; return 0; } -EOF -if { (eval echo configure:1985: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_$ac_func=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_func_$ac_func=no" -fi -rm -f conftest* -fi + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + eval "$as_ac_var=yes" +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +eval "$as_ac_var=no" +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +fi +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 +if test `eval echo '${'$as_ac_var'}'` = yes; then + cat >>confdefs.h <<_ACEOF +#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 +_ACEOF -if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then - echo "$ac_t""yes" 1>&6 - ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` - cat >> confdefs.h <&6 fi done -echo $ac_n "checking for working mmap""... $ac_c" 1>&6 -echo "configure:2010: 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 +echo "$as_me:$LINENO: checking for working mmap" >&5 +echo $ECHO_N "checking for working mmap... $ECHO_C" >&6 +if test "${ac_cv_func_mmap_fixed_mapped+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else if test "$cross_compiling" = yes; then ac_cv_func_mmap_fixed_mapped=no else - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" #include "confdefs.h" +$ac_includes_default +/* malloc might have been renamed as rpl_malloc. */ +#undef malloc /* Thanks to Mike Haertel and Jim Avera for this test. Here is a matrix of mmap possibilities: @@ -2029,34 +4003,34 @@ else back from the file, nor mmap's back from the file at a different address. (There have been systems where private was not correctly implemented like the infamous i386 svr4.0, and systems where the - VM page cache was not coherent with the filesystem buffer cache + VM page cache was not coherent with the file system buffer cache like early versions of FreeBSD and possibly contemporary NetBSD.) For shared mappings, we should conversely verify that changes get - propogated back to all the places they're supposed to be. + propagated back to all the places they're supposed to be. Grep wants private fixed already mapped. The main things grep needs to know about mmap are: * does it exist and is it safe to write into the mmap'd area * how to use it (BSD variants) */ -#include + #include #include -/* This mess was copied from the GNU getpagesize.h. */ -#ifndef HAVE_GETPAGESIZE -# ifdef HAVE_UNISTD_H -# include -# endif +#if !STDC_HEADERS && !HAVE_STDLIB_H +char *malloc (); +#endif +/* This mess was copied from the GNU getpagesize.h. */ +#if !HAVE_GETPAGESIZE /* Assume that all systems that can run configure have sys/param.h. */ -# ifndef HAVE_SYS_PARAM_H +# if !HAVE_SYS_PARAM_H # define HAVE_SYS_PARAM_H 1 # endif # ifdef _SC_PAGESIZE # define getpagesize() sysconf(_SC_PAGESIZE) # else /* no _SC_PAGESIZE */ -# ifdef HAVE_SYS_PARAM_H +# if HAVE_SYS_PARAM_H # include # ifdef EXEC_PAGESIZE # define getpagesize() EXEC_PAGESIZE @@ -2083,107 +4057,104 @@ else #endif /* no HAVE_GETPAGESIZE */ -#ifdef __cplusplus -extern "C" { void *malloc(unsigned); } -#else -char *malloc(); -#endif - int -main() +main () { - char *data, *data2, *data3; - int i, pagesize; - int fd; - - pagesize = getpagesize(); - - /* - * First, make a file with some known garbage in it. - */ - data = malloc(pagesize); - if (!data) - exit(1); - for (i = 0; i < pagesize; ++i) - *(data + i) = rand(); - umask(0); - fd = creat("conftestmmap", 0600); - if (fd < 0) - exit(1); - if (write(fd, data, pagesize) != pagesize) - exit(1); - close(fd); - - /* - * Next, try to mmap the file at a fixed address which - * already has something else allocated at it. If we can, - * also make sure that we see the same garbage. - */ - fd = open("conftestmmap", O_RDWR); - if (fd < 0) - exit(1); - data2 = malloc(2 * pagesize); - if (!data2) - exit(1); - data2 += (pagesize - ((int) data2 & (pagesize - 1))) & (pagesize - 1); - if (data2 != mmap(data2, pagesize, PROT_READ | PROT_WRITE, - MAP_PRIVATE | MAP_FIXED, fd, 0L)) - exit(1); - for (i = 0; i < pagesize; ++i) - if (*(data + i) != *(data2 + i)) - exit(1); - - /* - * Finally, make sure that changes to the mapped area - * do not percolate back to the file as seen by read(). - * (This is a bug on some variants of i386 svr4.0.) - */ - for (i = 0; i < pagesize; ++i) - *(data2 + i) = *(data2 + i) + 1; - data3 = malloc(pagesize); - if (!data3) - exit(1); - if (read(fd, data3, pagesize) != pagesize) - exit(1); - for (i = 0; i < pagesize; ++i) - if (*(data + i) != *(data3 + i)) - exit(1); - close(fd); - unlink("conftestmmap"); - exit(0); + char *data, *data2, *data3; + int i, pagesize; + int fd; + + pagesize = getpagesize (); + + /* First, make a file with some known garbage in it. */ + data = (char *) malloc (pagesize); + if (!data) + exit (1); + for (i = 0; i < pagesize; ++i) + *(data + i) = rand (); + umask (0); + fd = creat ("conftest.mmap", 0600); + if (fd < 0) + exit (1); + if (write (fd, data, pagesize) != pagesize) + exit (1); + close (fd); + + /* Next, try to mmap the file at a fixed address which already has + something else allocated at it. If we can, also make sure that + we see the same garbage. */ + fd = open ("conftest.mmap", O_RDWR); + if (fd < 0) + exit (1); + data2 = (char *) malloc (2 * pagesize); + if (!data2) + exit (1); + data2 += (pagesize - ((int) data2 & (pagesize - 1))) & (pagesize - 1); + if (data2 != mmap (data2, pagesize, PROT_READ | PROT_WRITE, + MAP_PRIVATE | MAP_FIXED, fd, 0L)) + exit (1); + for (i = 0; i < pagesize; ++i) + if (*(data + i) != *(data2 + i)) + exit (1); + + /* Finally, make sure that changes to the mapped area do not + percolate back to the file as seen by read(). (This is a bug on + some variants of i386 svr4.0.) */ + for (i = 0; i < pagesize; ++i) + *(data2 + i) = *(data2 + i) + 1; + data3 = (char *) malloc (pagesize); + if (!data3) + exit (1); + if (read (fd, data3, pagesize) != pagesize) + exit (1); + for (i = 0; i < pagesize; ++i) + if (*(data + i) != *(data3 + i)) + exit (1); + close (fd); + exit (0); } - -EOF -if { (eval echo configure:2158: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -then +_ACEOF +rm -f conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_cv_func_mmap_fixed_mapped=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -fr conftest* - ac_cv_func_mmap_fixed_mapped=no + echo "$as_me: program exited with status $ac_status" >&5 +echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +( exit $ac_status ) +ac_cv_func_mmap_fixed_mapped=no fi -rm -fr conftest* +rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi - fi - -echo "$ac_t""$ac_cv_func_mmap_fixed_mapped" 1>&6 +echo "$as_me:$LINENO: result: $ac_cv_func_mmap_fixed_mapped" >&5 +echo "${ECHO_T}$ac_cv_func_mmap_fixed_mapped" >&6 if test $ac_cv_func_mmap_fixed_mapped = yes; then - cat >> confdefs.h <<\EOF + +cat >>confdefs.h <<\_ACEOF #define HAVE_MMAP 1 -EOF +_ACEOF fi +rm -f conftest.mmap - 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 -if eval "test \"`echo '$''{'ac_cv_gnu_library_2_1'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + echo "$as_me:$LINENO: checking whether we are using the GNU C Library 2.1 or newer" >&5 +echo $ECHO_N "checking whether we are using the GNU C Library 2.1 or newer... $ECHO_C" >&6 +if test "${ac_cv_gnu_library_2_1+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" #include "confdefs.h" #include @@ -2192,210 +4163,373 @@ else Lucky GNU user #endif #endif - -EOF + +_ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | egrep "Lucky GNU user" >/dev/null 2>&1; then - rm -rf conftest* ac_cv_gnu_library_2_1=yes else - rm -rf conftest* ac_cv_gnu_library_2_1=no fi rm -f conftest* - - + + fi +echo "$as_me:$LINENO: result: $ac_cv_gnu_library_2_1" >&5 +echo "${ECHO_T}$ac_cv_gnu_library_2_1" >&6 -echo "$ac_t""$ac_cv_gnu_library_2_1" 1>&6 - GLIBC21="$ac_cv_gnu_library_2_1" - - - for ac_hdr in argz.h limits.h locale.h nl_types.h malloc.h stddef.h \ + + + + + + + + + + + + +for ac_header in argz.h limits.h locale.h nl_types.h malloc.h stddef.h \ 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 -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 <&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 +if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +fi +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +else + # Is the header compilable? +echo "$as_me:$LINENO: checking $ac_header usability" >&5 +echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" #include "confdefs.h" -#include <$ac_hdr> -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; } -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 +$ac_includes_default +#include <$ac_header> +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_header_compiler=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_header_compiler=no +fi +rm -f conftest.$ac_objext conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6 + +# Is the header present? +echo "$as_me:$LINENO: checking $ac_header presence" >&5 +echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" +#include "confdefs.h" +#include <$ac_header> +_ACEOF +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + egrep -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then + ac_header_preproc=yes +else + echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_header_$ac_safe=no" + ac_header_preproc=no +fi +rm -f conftest.err conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6 + +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc in + yes:no ) + { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};; + no:yes ) + { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 +echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};; +esac +echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 +if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + eval "$as_ac_Header=$ac_header_preproc" fi -rm -f conftest* +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 + fi -if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then - echo "$ac_t""yes" 1>&6 - ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` - cat >> confdefs.h <&6 +if test `eval echo '${'$as_ac_Header'}'` = yes; then + cat >>confdefs.h <<_ACEOF +#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF + fi + done - for ac_func in feof_unlocked fgets_unlocked getcwd getegid geteuid \ + + + + + + + + + + + + + + + + + + + + + +for ac_func in feof_unlocked fgets_unlocked getcwd getegid geteuid \ 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 -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 +echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 +if eval "test \"\${$as_ac_var+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func(); below. */ + which can conflict with char $ac_func (); below. */ #include /* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif /* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char $ac_func(); - -int main() { + builtin and then its argument prototype would still apply. */ +char $ac_func (); +char (*f) (); +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } +#endif +int +main () +{ /* The GNU C library defines this for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ #if defined (__stub_$ac_func) || defined (__stub___$ac_func) choke me #else -$ac_func(); +f = $ac_func; #endif -; return 0; } -EOF -if { (eval echo configure:2292: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_$ac_func=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_func_$ac_func=no" -fi -rm -f conftest* -fi + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + eval "$as_ac_var=yes" +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +eval "$as_ac_var=no" +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +fi +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 +if test `eval echo '${'$as_ac_var'}'` = yes; then + cat >>confdefs.h <<_ACEOF +#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 +_ACEOF -if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then - echo "$ac_t""yes" 1>&6 - ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` - cat >> confdefs.h <&6 fi done - - - # Check whether --with-libiconv-prefix or --without-libiconv-prefix was given. + + + +# Check whether --with-libiconv-prefix or --without-libiconv-prefix was given. if test "${with_libiconv_prefix+set}" = set; then withval="$with_libiconv_prefix" - + for dir in `echo "$withval" | tr : ' '`; do if test -d $dir/include; then CPPFLAGS="$CPPFLAGS -I$dir/include"; fi if test -d $dir/lib; then LDFLAGS="$LDFLAGS -L$dir/lib"; fi done - -fi +fi; - echo $ac_n "checking for iconv""... $ac_c" 1>&6 -echo "configure:2332: checking for iconv" >&5 -if eval "test \"`echo '$''{'am_cv_func_iconv'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + echo "$as_me:$LINENO: checking for iconv" >&5 +echo $ECHO_N "checking for iconv... $ECHO_C" >&6 +if test "${am_cv_func_iconv+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - + am_cv_func_iconv="no, consider installing GNU libiconv" am_cv_lib_iconv=no - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" #include "confdefs.h" #include #include -int main() { +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } +#endif +int +main () +{ iconv_t cd = iconv_open("",""); iconv(cd,NULL,NULL,NULL,NULL); 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 - rm -rf conftest* + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then am_cv_func_iconv=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 fi -rm -f conftest* +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext if test "$am_cv_func_iconv" != yes; then am_save_LIBS="$LIBS" LIBS="$LIBS -liconv" - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" #include "confdefs.h" #include #include -int main() { +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } +#endif +int +main () +{ iconv_t cd = iconv_open("",""); iconv(cd,NULL,NULL,NULL,NULL); 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 - rm -rf conftest* + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then am_cv_lib_iconv=yes am_cv_func_iconv=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 fi -rm -f conftest* +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS="$am_save_LIBS" fi - -fi -echo "$ac_t""$am_cv_func_iconv" 1>&6 +fi +echo "$as_me:$LINENO: result: $am_cv_func_iconv" >&5 +echo "${ECHO_T}$am_cv_func_iconv" >&6 if test "$am_cv_func_iconv" = yes; then - cat >> confdefs.h <<\EOF + +cat >>confdefs.h <<\_ACEOF #define HAVE_ICONV 1 -EOF +_ACEOF - echo $ac_n "checking for iconv declaration""... $ac_c" 1>&6 -echo "configure:2393: checking for iconv declaration" >&5 - if eval "test \"`echo '$''{'am_cv_proto_iconv'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + echo "$as_me:$LINENO: checking for iconv declaration" >&5 +echo $ECHO_N "checking for iconv declaration... $ECHO_C" >&6 + if test "${am_cv_proto_iconv+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" #include "confdefs.h" #include @@ -2410,244 +4544,421 @@ size_t iconv (iconv_t cd, char * *inbuf, size_t *inbytesleft, char * *outbuf, si size_t iconv(); #endif -int main() { +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } +#endif +int +main () +{ -; return 0; } -EOF -if { (eval echo configure:2418: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then am_cv_proto_iconv_arg1="" else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - am_cv_proto_iconv_arg1="const" + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +am_cv_proto_iconv_arg1="const" fi -rm -f conftest* +rm -f conftest.$ac_objext conftest.$ac_ext am_cv_proto_iconv="extern size_t iconv (iconv_t cd, $am_cv_proto_iconv_arg1 char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);" fi am_cv_proto_iconv=`echo "$am_cv_proto_iconv" | tr -s ' ' | sed -e 's/( /(/'` - echo "$ac_t""${ac_t:- - }$am_cv_proto_iconv" 1>&6 - cat >> confdefs.h <&5 +echo "${ECHO_T}${ac_t:- + }$am_cv_proto_iconv" >&6 + +cat >>confdefs.h <<_ACEOF #define ICONV_CONST $am_cv_proto_iconv_arg1 -EOF +_ACEOF fi LIBICONV= if test "$am_cv_lib_iconv" = yes; then LIBICONV="-liconv" fi - - - echo $ac_n "checking for nl_langinfo and CODESET""... $ac_c" 1>&6 -echo "configure:2447: 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 + + + echo "$as_me:$LINENO: checking for nl_langinfo and CODESET" >&5 +echo $ECHO_N "checking for nl_langinfo and CODESET... $ECHO_C" >&6 +if test "${am_cv_langinfo_codeset+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" #include "confdefs.h" #include -int main() { +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } +#endif +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 - rm -rf conftest* + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then am_cv_langinfo_codeset=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - am_cv_langinfo_codeset=no -fi -rm -f conftest* - + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +am_cv_langinfo_codeset=no fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -echo "$ac_t""$am_cv_langinfo_codeset" 1>&6 +fi +echo "$as_me:$LINENO: result: $am_cv_langinfo_codeset" >&5 +echo "${ECHO_T}$am_cv_langinfo_codeset" >&6 if test $am_cv_langinfo_codeset = yes; then - cat >> confdefs.h <<\EOF + +cat >>confdefs.h <<\_ACEOF #define HAVE_LANGINFO_CODESET 1 -EOF +_ACEOF fi 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 -if eval "test \"`echo '$''{'am_cv_val_LC_MESSAGES'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + echo "$as_me:$LINENO: checking for LC_MESSAGES" >&5 +echo $ECHO_N "checking for LC_MESSAGES... $ECHO_C" >&6 +if test "${am_cv_val_LC_MESSAGES+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" #include "confdefs.h" #include -int main() { +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } +#endif +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 - rm -rf conftest* + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then am_cv_val_LC_MESSAGES=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - am_cv_val_LC_MESSAGES=no + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +am_cv_val_LC_MESSAGES=no fi -rm -f conftest* +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi - -echo "$ac_t""$am_cv_val_LC_MESSAGES" 1>&6 +echo "$as_me:$LINENO: result: $am_cv_val_LC_MESSAGES" >&5 +echo "${ECHO_T}$am_cv_val_LC_MESSAGES" >&6 if test $am_cv_val_LC_MESSAGES = yes; then - cat >> confdefs.h <<\EOF + +cat >>confdefs.h <<\_ACEOF #define HAVE_LC_MESSAGES 1 -EOF +_ACEOF fi fi - echo $ac_n "checking whether NLS is requested""... $ac_c" 1>&6 -echo "configure:2515: checking whether NLS is requested" >&5 + echo "$as_me:$LINENO: checking whether NLS is requested" >&5 +echo $ECHO_N "checking whether NLS is requested... $ECHO_C" >&6 # Check whether --enable-nls or --disable-nls was given. if test "${enable_nls+set}" = set; then enableval="$enable_nls" USE_NLS=$enableval else USE_NLS=yes -fi +fi; + echo "$as_me:$LINENO: result: $USE_NLS" >&5 +echo "${ECHO_T}$USE_NLS" >&6 - echo "$ac_t""$USE_NLS" 1>&6 - BUILD_INCLUDED_LIBINTL=no USE_INCLUDED_LIBINTL=no INTLLIBS= if test "$USE_NLS" = "yes"; then - cat >> confdefs.h <<\EOF + +cat >>confdefs.h <<\_ACEOF #define ENABLE_NLS 1 -EOF +_ACEOF + + echo "$as_me:$LINENO: checking whether included gettext is requested" >&5 +echo $ECHO_N "checking whether included gettext is requested... $ECHO_C" >&6 - echo $ac_n "checking whether included gettext is requested""... $ac_c" 1>&6 -echo "configure:2537: checking whether included gettext is requested" >&5 - # Check whether --with-included-gettext or --without-included-gettext was given. +# Check whether --with-included-gettext or --without-included-gettext was given. if test "${with_included_gettext+set}" = set; then withval="$with_included_gettext" nls_cv_force_use_gnu_gettext=$withval else nls_cv_force_use_gnu_gettext=no -fi - - echo "$ac_t""$nls_cv_force_use_gnu_gettext" 1>&6 +fi; + echo "$as_me:$LINENO: result: $nls_cv_force_use_gnu_gettext" >&5 +echo "${ECHO_T}$nls_cv_force_use_gnu_gettext" >&6 nls_cv_use_gnu_gettext="$nls_cv_force_use_gnu_gettext" if test "$nls_cv_force_use_gnu_gettext" != "yes"; then CATOBJEXT=NONE - - - 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 -if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + + + if test "${ac_cv_header_libintl_h+set}" = set; then + echo "$as_me:$LINENO: checking for libintl.h" >&5 +echo $ECHO_N "checking for libintl.h... $ECHO_C" >&6 +if test "${ac_cv_header_libintl_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +fi +echo "$as_me:$LINENO: result: $ac_cv_header_libintl_h" >&5 +echo "${ECHO_T}$ac_cv_header_libintl_h" >&6 else - cat > conftest.$ac_ext <&5 +echo $ECHO_N "checking libintl.h usability... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" #include "confdefs.h" +$ac_includes_default #include -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; } -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 +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_header_compiler=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_header_compiler=no +fi +rm -f conftest.$ac_objext conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6 + +# Is the header present? +echo "$as_me:$LINENO: checking libintl.h presence" >&5 +echo $ECHO_N "checking libintl.h presence... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" +#include "confdefs.h" +#include +_ACEOF +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + egrep -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then + ac_header_preproc=yes +else + echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_header_$ac_safe=no" + ac_header_preproc=no +fi +rm -f conftest.err conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6 + +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc in + yes:no ) + { echo "$as_me:$LINENO: WARNING: libintl.h: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: libintl.h: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: libintl.h: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: libintl.h: proceeding with the preprocessor's result" >&2;};; + no:yes ) + { echo "$as_me:$LINENO: WARNING: libintl.h: present but cannot be compiled" >&5 +echo "$as_me: WARNING: libintl.h: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: libintl.h: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: libintl.h: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: libintl.h: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: libintl.h: proceeding with the preprocessor's result" >&2;};; +esac +echo "$as_me:$LINENO: checking for libintl.h" >&5 +echo $ECHO_N "checking for libintl.h... $ECHO_C" >&6 +if test "${ac_cv_header_libintl_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_cv_header_libintl_h=$ac_header_preproc fi -rm -f conftest* +echo "$as_me:$LINENO: result: $ac_cv_header_libintl_h" >&5 +echo "${ECHO_T}$ac_cv_header_libintl_h" >&6 + 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 -if eval "test \"`echo '$''{'gt_cv_func_gnugettext1_libc'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +if test $ac_cv_header_libintl_h = yes; then + echo "$as_me:$LINENO: checking for GNU gettext in libc" >&5 +echo $ECHO_N "checking for GNU gettext in libc... $ECHO_C" >&6 +if test "${gt_cv_func_gnugettext1_libc+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" #include "confdefs.h" #include extern int _nl_msg_cat_cntr; -int main() { +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } +#endif +int +main () +{ 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 - rm -rf conftest* + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then gt_cv_func_gnugettext1_libc=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - gt_cv_func_gnugettext1_libc=no + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +gt_cv_func_gnugettext1_libc=no fi -rm -f conftest* +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi - -echo "$ac_t""$gt_cv_func_gnugettext1_libc" 1>&6 +echo "$as_me:$LINENO: result: $gt_cv_func_gnugettext1_libc" >&5 +echo "${ECHO_T}$gt_cv_func_gnugettext1_libc" >&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 -if eval "test \"`echo '$''{'gt_cv_func_gnugettext1_libintl'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + echo "$as_me:$LINENO: checking for GNU gettext in libintl" >&5 +echo $ECHO_N "checking for GNU gettext in libintl... $ECHO_C" >&6 +if test "${gt_cv_func_gnugettext1_libintl+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else gt_save_LIBS="$LIBS" LIBS="$LIBS -lintl $LIBICONV" - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" #include "confdefs.h" #include extern int _nl_msg_cat_cntr; -int main() { +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } +#endif +int +main () +{ 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 - rm -rf conftest* + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then gt_cv_func_gnugettext1_libintl=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - gt_cv_func_gnugettext1_libintl=no + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +gt_cv_func_gnugettext1_libintl=no fi -rm -f conftest* +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS="$gt_save_LIBS" fi - -echo "$ac_t""$gt_cv_func_gnugettext1_libintl" 1>&6 +echo "$as_me:$LINENO: result: $gt_cv_func_gnugettext1_libintl" >&5 +echo "${ECHO_T}$gt_cv_func_gnugettext1_libintl" >&6 fi if test "$gt_cv_func_gnugettext1_libc" = "yes" \ || { test "$gt_cv_func_gnugettext1_libintl" = "yes" \ && test "$PACKAGE" != gettext; }; then - cat >> confdefs.h <<\EOF + +cat >>confdefs.h <<\_ACEOF #define HAVE_GETTEXT 1 -EOF +_ACEOF if test "$gt_cv_func_gnugettext1_libintl" = "yes"; then @@ -2656,58 +4967,79 @@ EOF gt_save_LIBS="$LIBS" LIBS="$LIBS $INTLLIBS" - for ac_func in dcgettext + +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 -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 +echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 +if eval "test \"\${$as_ac_var+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func(); below. */ + which can conflict with char $ac_func (); below. */ #include /* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif /* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char $ac_func(); - -int main() { + builtin and then its argument prototype would still apply. */ +char $ac_func (); +char (*f) (); +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } +#endif +int +main () +{ /* The GNU C library defines this for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ #if defined (__stub_$ac_func) || defined (__stub___$ac_func) choke me #else -$ac_func(); +f = $ac_func; #endif -; return 0; } -EOF -if { (eval echo configure:2691: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_$ac_func=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_func_$ac_func=no" -fi -rm -f conftest* -fi + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + eval "$as_ac_var=yes" +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +eval "$as_ac_var=no" +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +fi +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 +if test `eval echo '${'$as_ac_var'}'` = yes; then + cat >>confdefs.h <<_ACEOF +#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 +_ACEOF -if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then - echo "$ac_t""yes" 1>&6 - ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` - cat >> confdefs.h <&6 fi done @@ -2715,10 +5047,10 @@ 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 -if eval "test \"`echo '$''{'ac_cv_path_MSGFMT'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_path_MSGFMT+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else case "$MSGFMT" in /*) @@ -2742,54 +5074,60 @@ esac fi MSGFMT="$ac_cv_path_MSGFMT" if test "$MSGFMT" != ":"; then - echo "$ac_t""$MSGFMT" 1>&6 + echo "$as_me:$LINENO: result: $MSGFMT" >&5 +echo "${ECHO_T}$MSGFMT" >&6 else - echo "$ac_t""no" 1>&6 + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 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 -if eval "test \"`echo '$''{'ac_cv_path_GMSGFMT'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_path_GMSGFMT+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - case "$GMSGFMT" in - /*) + case $GMSGFMT in + [\\/]* | ?:[\\/]*) ac_cv_path_GMSGFMT="$GMSGFMT" # Let the user override the test with a path. ;; - ?:/*) - ac_cv_path_GMSGFMT="$GMSGFMT" # Let the user override the test with a dos path. - ;; *) - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_path_GMSGFMT="$ac_dir/$ac_word" - break - fi - done - IFS="$ac_save_ifs" + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done + test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT" ;; esac fi -GMSGFMT="$ac_cv_path_GMSGFMT" +GMSGFMT=$ac_cv_path_GMSGFMT + if test -n "$GMSGFMT"; then - echo "$ac_t""$GMSGFMT" 1>&6 + echo "$as_me:$LINENO: result: $GMSGFMT" >&5 +echo "${ECHO_T}$GMSGFMT" >&6 else - echo "$ac_t""no" 1>&6 + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 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 -if eval "test \"`echo '$''{'ac_cv_path_XGETTEXT'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_path_XGETTEXT+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else case "$XGETTEXT" in /*) @@ -2813,20 +5151,21 @@ esac fi XGETTEXT="$ac_cv_path_XGETTEXT" if test "$XGETTEXT" != ":"; then - echo "$ac_t""$XGETTEXT" 1>&6 + echo "$as_me:$LINENO: result: $XGETTEXT" >&5 +echo "${ECHO_T}$XGETTEXT" >&6 else - echo "$ac_t""no" 1>&6 + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi CATOBJEXT=.gmo fi - -else - echo "$ac_t""no" 1>&6 + fi + if test "$CATOBJEXT" = "NONE"; then nls_cv_use_gnu_gettext=yes fi @@ -2836,10 +5175,10 @@ fi INTLOBJS="\$(GETTOBJS)" # 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 -if eval "test \"`echo '$''{'ac_cv_path_MSGFMT'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_path_MSGFMT+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else case "$MSGFMT" in /*) @@ -2863,53 +5202,59 @@ esac fi MSGFMT="$ac_cv_path_MSGFMT" if test "$MSGFMT" != ":"; then - echo "$ac_t""$MSGFMT" 1>&6 + echo "$as_me:$LINENO: result: $MSGFMT" >&5 +echo "${ECHO_T}$MSGFMT" >&6 else - echo "$ac_t""no" 1>&6 + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 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 -if eval "test \"`echo '$''{'ac_cv_path_GMSGFMT'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_path_GMSGFMT+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - case "$GMSGFMT" in - /*) + case $GMSGFMT in + [\\/]* | ?:[\\/]*) ac_cv_path_GMSGFMT="$GMSGFMT" # Let the user override the test with a path. ;; - ?:/*) - ac_cv_path_GMSGFMT="$GMSGFMT" # Let the user override the test with a dos path. - ;; *) - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_path_GMSGFMT="$ac_dir/$ac_word" - break - fi - done - IFS="$ac_save_ifs" + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done + test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT" ;; esac fi -GMSGFMT="$ac_cv_path_GMSGFMT" +GMSGFMT=$ac_cv_path_GMSGFMT + if test -n "$GMSGFMT"; then - echo "$ac_t""$GMSGFMT" 1>&6 + echo "$as_me:$LINENO: result: $GMSGFMT" >&5 +echo "${ECHO_T}$GMSGFMT" >&6 else - echo "$ac_t""no" 1>&6 + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 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 -if eval "test \"`echo '$''{'ac_cv_path_XGETTEXT'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_path_XGETTEXT+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else case "$XGETTEXT" in /*) @@ -2933,12 +5278,14 @@ esac fi XGETTEXT="$ac_cv_path_XGETTEXT" if test "$XGETTEXT" != ":"; then - echo "$ac_t""$XGETTEXT" 1>&6 + echo "$as_me:$LINENO: result: $XGETTEXT" >&5 +echo "${ECHO_T}$XGETTEXT" >&6 else - echo "$ac_t""no" 1>&6 + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi - + BUILD_INCLUDED_LIBINTL=yes USE_INCLUDED_LIBINTL=yes CATOBJEXT=.gmo @@ -2950,7 +5297,8 @@ fi if $GMSGFMT --statistics /dev/null >/dev/null 2>&1; then : ; else - echo "$ac_t""found msgfmt program is not GNU msgfmt; ignore it" 1>&6 + echo "$as_me:$LINENO: result: found msgfmt program is not GNU msgfmt; ignore it" >&5 +echo "${ECHO_T}found msgfmt program is not GNU msgfmt; ignore it" >&6 GMSGFMT=":" fi fi @@ -2959,14 +5307,16 @@ fi if $XGETTEXT --omit-header /dev/null >/dev/null 2>&1; then : ; else - echo "$ac_t""found xgettext program is not GNU xgettext; ignore it" 1>&6 + echo "$as_me:$LINENO: result: found xgettext program is not GNU xgettext; ignore it" >&5 +echo "${ECHO_T}found xgettext program is not GNU xgettext; ignore it" >&6 XGETTEXT=":" fi fi POSUB=po fi - + ac_config_commands="$ac_config_commands default-1" + if test "$PACKAGE" = gettext; then @@ -2975,43 +5325,49 @@ fi for ac_prog in bison do -# Extract the first word of "$ac_prog", so it can be a program name with args. + # 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 -if eval "test \"`echo '$''{'ac_cv_prog_INTLBISON'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_prog_INTLBISON+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else if test -n "$INTLBISON"; then ac_cv_prog_INTLBISON="$INTLBISON" # Let the user override the test. else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_prog_INTLBISON="$ac_prog" - break - fi - done - IFS="$ac_save_ifs" +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_INTLBISON="$ac_prog" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done + fi fi -INTLBISON="$ac_cv_prog_INTLBISON" +INTLBISON=$ac_cv_prog_INTLBISON if test -n "$INTLBISON"; then - echo "$ac_t""$INTLBISON" 1>&6 + echo "$as_me:$LINENO: result: $INTLBISON" >&5 +echo "${ECHO_T}$INTLBISON" >&6 else - echo "$ac_t""no" 1>&6 + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi -test -n "$INTLBISON" && break + test -n "$INTLBISON" && break done if test -z "$INTLBISON"; then 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 "$as_me:$LINENO: checking version of bison" >&5 +echo $ECHO_N "checking version of bison... $ECHO_C" >&6 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;; @@ -3019,7 +5375,8 @@ echo "configure:3015: checking version of bison" >&5 ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;; *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;; esac - echo "$ac_t""$ac_prog_version" 1>&6 + echo "$as_me:$LINENO: result: $ac_prog_version" >&5 +echo "${ECHO_T}$ac_prog_version" >&6 fi if test $ac_verc_fail = yes; then INTLBISON=: @@ -3030,35 +5387,35 @@ echo "configure:3015: checking version of bison" >&5 POFILES="$POFILES $lang.po" done - - - - - - - - - + + + + + + + + + nls_cv_header_intl= nls_cv_header_libgt= DATADIRNAME=share - + INSTOBJEXT=.mo - + GENCAT=gencat - - + + if test "x$CATOBJEXT" != "x"; then if test "x$ALL_LINGUAS" = "x"; then 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 "$as_me:$LINENO: checking for catalogs to be installed" >&5 +echo $ECHO_N "checking for catalogs to be installed... $ECHO_C" >&6 NEW_LINGUAS= for presentlang in $ALL_LINGUAS; do useit=no @@ -3077,7 +5434,8 @@ echo "configure:3062: checking for catalogs to be installed" >&5 fi done LINGUAS=$NEW_LINGUAS - echo "$ac_t""$LINGUAS" 1>&6 + echo "$as_me:$LINENO: result: $LINGUAS" >&5 +echo "${ECHO_T}$LINGUAS" >&6 fi if test -n "$LINGUAS"; then @@ -3092,11 +5450,11 @@ echo "configure:3062: checking for catalogs to be installed" >&5 if test -z "$MKINSTALLDIRS"; then MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs" fi - + INTL_LIBTOOL_SUFFIX_PREFIX= - - + + # Find a good install program. We prefer a C program (faster), # so one script is as good as another. But avoid the broken or @@ -3105,60 +5463,73 @@ echo "configure:3062: checking for catalogs to be installed" >&5 # SunOS /usr/etc/install # IRIX /sbin/install # AIX /bin/install +# AmigaOS /C/install, which installs bootblocks on floppy discs # AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag # AFS /usr/afsws/bin/install, which mishandles nonexistent args # 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 "$as_me:$LINENO: checking for a BSD-compatible install" >&5 +echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6 if test -z "$INSTALL"; then -if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +if test "${ac_cv_path_install+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - IFS="${IFS= }"; ac_save_IFS="$IFS"; IFS=":" - for ac_dir in $PATH; do - # Account for people who put trailing slashes in PATH elements. - case "$ac_dir/" in - /|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;; - *) - # OSF1 and SCO ODT 3.0 have their own names for install. - # Don't use installbsd from OSF since it installs stuff as root - # by default. - for ac_prog in ginstall scoinst install; do - if test -f $ac_dir/$ac_prog; then - if test $ac_prog = install && - grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then - # AIX install. It has an incompatible calling convention. - : - else - ac_cv_path_install="$ac_dir/$ac_prog -c" - break 2 - fi - fi + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + # Account for people who put trailing slashes in PATH elements. +case $as_dir/ in + ./ | .// | /cC/* | \ + /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \ + /usr/ucb/* ) ;; + *) + # OSF1 and SCO ODT 3.0 have their own names for install. + # Don't use installbsd from OSF since it installs stuff as root + # by default. + for ac_prog in ginstall scoinst install; do + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then + if test $ac_prog = install && + grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then + # AIX install. It has an incompatible calling convention. + : + elif test $ac_prog = install && + grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then + # program-specific install script used by HP pwplus--don't use. + : + else + ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c" + break 3 + fi + fi done - ;; - esac - done - IFS="$ac_save_IFS" + done + ;; +esac +done + fi if test "${ac_cv_path_install+set}" = set; then - INSTALL="$ac_cv_path_install" + INSTALL=$ac_cv_path_install else # As a last resort, use the slow shell script. We don't cache a # path for INSTALL within a source directory, because that will # break other packages using the cache if that directory is # removed, or if the path is relative. - INSTALL="$ac_install_sh" + INSTALL=$ac_install_sh fi fi -echo "$ac_t""$INSTALL" 1>&6 +echo "$as_me:$LINENO: result: $INSTALL" >&5 +echo "${ECHO_T}$INSTALL" >&6 # Use test -z because SunOS4 sh mishandles braces in ${var-val}. # It thinks the first close brace ends the variable substitution. test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}' -test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}' +test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}' test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' @@ -3186,747 +5557,1178 @@ case x"${target_os}" in ;; x*mingw32*) SYS=mingw32 - # Extract the first word of "${ac_tool_prefix}windres", so it can be a program name with args. + if test -n "$ac_tool_prefix"; then + # 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 -if eval "test \"`echo '$''{'ac_cv_prog_WINDRES'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_prog_WINDRES+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else if test -n "$WINDRES"; then ac_cv_prog_WINDRES="$WINDRES" # Let the user override the test. else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_prog_WINDRES="${ac_tool_prefix}windres" - break - fi - done - IFS="$ac_save_ifs" +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_WINDRES="${ac_tool_prefix}windres" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done + fi fi -WINDRES="$ac_cv_prog_WINDRES" +WINDRES=$ac_cv_prog_WINDRES if test -n "$WINDRES"; then - echo "$ac_t""$WINDRES" 1>&6 + echo "$as_me:$LINENO: result: $WINDRES" >&5 +echo "${ECHO_T}$WINDRES" >&6 else - echo "$ac_t""no" 1>&6 + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi - +fi if test -z "$ac_cv_prog_WINDRES"; then -if test -n "$ac_tool_prefix"; then + ac_ct_WINDRES=$WINDRES # 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 -if eval "test \"`echo '$''{'ac_cv_prog_WINDRES'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_prog_ac_ct_WINDRES+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - if test -n "$WINDRES"; then - ac_cv_prog_WINDRES="$WINDRES" # Let the user override the test. + if test -n "$ac_ct_WINDRES"; then + ac_cv_prog_ac_ct_WINDRES="$ac_ct_WINDRES" # Let the user override the test. else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_prog_WINDRES="windres" - break - fi - done - IFS="$ac_save_ifs" - test -z "$ac_cv_prog_WINDRES" && ac_cv_prog_WINDRES=":" +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_WINDRES="windres" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done + + test -z "$ac_cv_prog_ac_ct_WINDRES" && ac_cv_prog_ac_ct_WINDRES=":" +fi +fi +ac_ct_WINDRES=$ac_cv_prog_ac_ct_WINDRES +if test -n "$ac_ct_WINDRES"; then + echo "$as_me:$LINENO: result: $ac_ct_WINDRES" >&5 +echo "${ECHO_T}$ac_ct_WINDRES" >&6 +else + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi + + WINDRES=$ac_ct_WINDRES +else + WINDRES="$ac_cv_prog_WINDRES" +fi + + save_CFLAGS="${save_CFLAGS} -D_OFF_T_ -D_off_t=long" + vlc_LDFLAGS="${vlc_LDFLAGS} -mwindows -Xlinker --force-exe-suffix" + vlc_LDFLAGS="${vlc_LDFLAGS} -lws2_32 -lnetapi32" + ipv4_LDFLAGS="${ipv4_LDFLAGS} -lws2_32" + ipv6_LDFLAGS="${ipv6_LDFLAGS} -lws2_32" + http_LDFLAGS="${http_LDFLAGS} -lws2_32" + rc_LDFLAGS="${rc_LDFLAGS} -lws2_32" + ;; + x*nto*) + SYS=nto + x11_LDFLAGS="${x11_LDFLAGS} -lsocket" + xvideo_LDFLAGS="${xvideo_LDFLAGS} -lsocket" + ;; + xbeos) + SYS=beos + save_CFLAGS="${save_CFLAGS} -Wno-multichar -Wno-ctor-dtor-privacy -Woverloaded-virtual" + vlc_LDFLAGS="${vlc_LDFLAGS} -lbe" + plugins_LDFLAGS="${plugins_LDFLAGS} -nostart" + beos_LDFLAGS="${beos_LDFLAGS} -lbe -lgame -lroot -ltracker -ltranslation -lstdc++.r4" + ipv4_LDFLAGS="${ipv4_LDFLAGS} -lbind" + ;; + x*) + SYS="${target_os}" + ;; +esac + +if test x"${SYS}" != xmingw32; then + plugins_CFLAGS="${plugins_CFLAGS} -fPIC" +fi + +if test x$SYS = xmingw32 +then + echo "$as_me:$LINENO: checking for opendir in -lmingwex" >&5 +echo $ECHO_N "checking for opendir in -lmingwex... $ECHO_C" >&6 +if test "${ac_cv_lib_mingwex_opendir+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lmingwex $LIBS" +cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" +#include "confdefs.h" + +/* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char opendir (); +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } +#endif +int +main () +{ +opendir (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_mingwex_opendir=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_lib_mingwex_opendir=no +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:$LINENO: result: $ac_cv_lib_mingwex_opendir" >&5 +echo "${ECHO_T}$ac_cv_lib_mingwex_opendir" >&6 +if test $ac_cv_lib_mingwex_opendir = yes; then + echo "$as_me:$LINENO: checking for opendir in -lmingw32" >&5 +echo $ECHO_N "checking for opendir in -lmingw32... $ECHO_C" >&6 +if test "${ac_cv_lib_mingw32_opendir+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lmingw32 $LIBS" +cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" +#include "confdefs.h" + +/* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char opendir (); +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } +#endif +int +main () +{ +opendir (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_mingw32_opendir=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_lib_mingw32_opendir=no fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS fi -WINDRES="$ac_cv_prog_WINDRES" -if test -n "$WINDRES"; then - echo "$ac_t""$WINDRES" 1>&6 +echo "$as_me:$LINENO: result: $ac_cv_lib_mingw32_opendir" >&5 +echo "${ECHO_T}$ac_cv_lib_mingw32_opendir" >&6 +if test $ac_cv_lib_mingw32_opendir = yes; then + vlc_LDFLAGS="${vlc_LDFLAGS}" else - echo "$ac_t""no" 1>&6 + vlc_LDFLAGS="${vlc_LDFLAGS} -lmingwex" + gtk_LDFLAGS="${gtk_LDFLAGS} -lmingwex" fi -else - WINDRES=":" -fi -fi - save_CFLAGS="${save_CFLAGS} -fnative-struct -D_OFF_T_ -D_off_t=long" - vlc_LDFLAGS="${vlc_LDFLAGS} -mwindows -Xlinker --force-exe-suffix" - vlc_LDFLAGS="${vlc_LDFLAGS} -lws2_32 -lnetapi32" - ipv4_LDFLAGS="${ipv4_LDFLAGS} -lws2_32" - ipv6_LDFLAGS="${ipv6_LDFLAGS} -lws2_32" - http_LDFLAGS="${http_LDFLAGS} -lws2_32" - rc_LDFLAGS="${rc_LDFLAGS} -lws2_32" - ;; - x*nto*) - SYS=nto - x11_LDFLAGS="${x11_LDFLAGS} -lsocket" - xvideo_LDFLAGS="${xvideo_LDFLAGS} -lsocket" - ;; - xbeos) - SYS=beos - save_CFLAGS="${save_CFLAGS} -Wno-multichar -Wno-ctor-dtor-privacy -Woverloaded-virtual" - vlc_LDFLAGS="${vlc_LDFLAGS} -lbe" - plugins_LDFLAGS="${plugins_LDFLAGS} -nostart" - beos_LDFLAGS="${beos_LDFLAGS} -lbe -lgame -lroot -ltracker" - ipv4_LDFLAGS="${ipv4_LDFLAGS} -lbind" - ;; - x*) - SYS="${target_os}" - ;; -esac +fi -if test x"${SYS}" = xmingw32 -then - plugins_CFLAGS="${plugins_CFLAGS} -fnative-struct" -else - plugins_CFLAGS="${plugins_CFLAGS} -fPIC" 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 -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 +echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 +if eval "test \"\${$as_ac_var+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func(); below. */ + which can conflict with char $ac_func (); below. */ #include /* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif /* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char $ac_func(); - -int main() { + builtin and then its argument prototype would still apply. */ +char $ac_func (); +char (*f) (); +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } +#endif +int +main () +{ /* The GNU C library defines this for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ #if defined (__stub_$ac_func) || defined (__stub___$ac_func) choke me #else -$ac_func(); +f = $ac_func; #endif -; return 0; } -EOF -if { (eval echo configure:3323: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_$ac_func=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_func_$ac_func=no" -fi -rm -f conftest* -fi + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + eval "$as_ac_var=yes" +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +eval "$as_ac_var=no" +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +fi +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 +if test `eval echo '${'$as_ac_var'}'` = yes; then + cat >>confdefs.h <<_ACEOF +#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 +_ACEOF -if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then - echo "$ac_t""yes" 1>&6 - ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` - cat >> confdefs.h <&6 fi done -echo $ac_n "checking for connect""... $ac_c" 1>&6 -echo "configure:3349: checking for connect" >&5 -if eval "test \"`echo '$''{'ac_cv_func_connect'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +echo "$as_me:$LINENO: checking for connect" >&5 +echo $ECHO_N "checking for connect... $ECHO_C" >&6 +if test "${ac_cv_func_connect+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char connect(); below. */ + which can conflict with char connect (); below. */ #include /* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif /* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char connect(); - -int main() { + builtin and then its argument prototype would still apply. */ +char connect (); +char (*f) (); +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } +#endif +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_connect) || defined (__stub___connect) choke me #else -connect(); +f = connect; #endif -; return 0; } -EOF -if { (eval echo configure:3377: \"$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 - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_func_connect=no" -fi -rm -f conftest* -fi - -if eval "test \"`echo '$ac_cv_func_'connect`\" = yes"; then - echo "$ac_t""yes" 1>&6 + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_func_connect=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_func_connect=no +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +fi +echo "$as_me:$LINENO: result: $ac_cv_func_connect" >&5 +echo "${ECHO_T}$ac_cv_func_connect" >&6 +if test $ac_cv_func_connect = yes; then : 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 -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 + echo "$as_me:$LINENO: checking for connect in -lsocket" >&5 +echo $ECHO_N "checking for connect in -lsocket... $ECHO_C" >&6 +if test "${ac_cv_lib_socket_connect+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-lsocket $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" #include "confdefs.h" + /* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif /* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char connect(); - -int main() { -connect() -; return 0; } -EOF -if { (eval echo configure:3415: \"$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 - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -f conftest* -LIBS="$ac_save_LIBS" - -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 + builtin and then its argument prototype would still apply. */ +char connect (); +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } +#endif +int +main () +{ +connect (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_socket_connect=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_lib_socket_connect=no +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:$LINENO: result: $ac_cv_lib_socket_connect" >&5 +echo "${ECHO_T}$ac_cv_lib_socket_connect" >&6 +if test $ac_cv_lib_socket_connect = yes; then ipv4_LDFLAGS="${ipv4_LDFLAGS} -lsocket" vlc_LDFLAGS="${vlc_LDFLAGS} -lsocket" -else - echo "$ac_t""no" 1>&6 fi fi -echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6 -echo "configure:3440: checking for gethostbyname" >&5 -if eval "test \"`echo '$''{'ac_cv_func_gethostbyname'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +echo "$as_me:$LINENO: checking for gethostbyname" >&5 +echo $ECHO_N "checking for gethostbyname... $ECHO_C" >&6 +if test "${ac_cv_func_gethostbyname+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char gethostbyname(); below. */ + which can conflict with char gethostbyname (); below. */ #include /* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif /* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char gethostbyname(); - -int main() { + builtin and then its argument prototype would still apply. */ +char gethostbyname (); +char (*f) (); +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } +#endif +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_gethostbyname) || defined (__stub___gethostbyname) choke me #else -gethostbyname(); +f = gethostbyname; #endif -; return 0; } -EOF -if { (eval echo configure:3468: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_gethostbyname=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_func_gethostbyname=no" -fi -rm -f conftest* -fi - -if eval "test \"`echo '$ac_cv_func_'gethostbyname`\" = yes"; then - echo "$ac_t""yes" 1>&6 + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_func_gethostbyname=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_func_gethostbyname=no +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +fi +echo "$as_me:$LINENO: result: $ac_cv_func_gethostbyname" >&5 +echo "${ECHO_T}$ac_cv_func_gethostbyname" >&6 +if test $ac_cv_func_gethostbyname = yes; then : 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 -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 + echo "$as_me:$LINENO: checking for gethostbyname in -lnsl" >&5 +echo $ECHO_N "checking for gethostbyname in -lnsl... $ECHO_C" >&6 +if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-lnsl $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" #include "confdefs.h" + /* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif /* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char gethostbyname(); - -int main() { -gethostbyname() -; return 0; } -EOF -if { (eval echo configure:3506: \"$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 - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -f conftest* -LIBS="$ac_save_LIBS" - -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 + builtin and then its argument prototype would still apply. */ +char gethostbyname (); +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } +#endif +int +main () +{ +gethostbyname (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_nsl_gethostbyname=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_lib_nsl_gethostbyname=no +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_gethostbyname" >&5 +echo "${ECHO_T}$ac_cv_lib_nsl_gethostbyname" >&6 +if test $ac_cv_lib_nsl_gethostbyname = yes; then ipv4_LDFLAGS="${ipv4_LDFLAGS} -lnsl" -else - echo "$ac_t""no" 1>&6 fi fi -echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6 -echo "configure:3530: checking for gethostbyname" >&5 -if eval "test \"`echo '$''{'ac_cv_func_gethostbyname'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +echo "$as_me:$LINENO: checking for gethostbyname" >&5 +echo $ECHO_N "checking for gethostbyname... $ECHO_C" >&6 +if test "${ac_cv_func_gethostbyname+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char gethostbyname(); below. */ + which can conflict with char gethostbyname (); below. */ #include /* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif /* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char gethostbyname(); - -int main() { + builtin and then its argument prototype would still apply. */ +char gethostbyname (); +char (*f) (); +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } +#endif +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_gethostbyname) || defined (__stub___gethostbyname) choke me #else -gethostbyname(); +f = gethostbyname; #endif -; return 0; } -EOF -if { (eval echo configure:3558: \"$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 - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_func_gethostbyname=no" -fi -rm -f conftest* -fi - -if eval "test \"`echo '$ac_cv_func_'gethostbyname`\" = yes"; then - echo "$ac_t""yes" 1>&6 + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_func_gethostbyname=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_func_gethostbyname=no +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +fi +echo "$as_me:$LINENO: result: $ac_cv_func_gethostbyname" >&5 +echo "${ECHO_T}$ac_cv_func_gethostbyname" >&6 +if test $ac_cv_func_gethostbyname = yes; then : 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 -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 + echo "$as_me:$LINENO: checking for gethostbyname in -lbind" >&5 +echo $ECHO_N "checking for gethostbyname in -lbind... $ECHO_C" >&6 +if test "${ac_cv_lib_bind_gethostbyname+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-lbind $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" #include "confdefs.h" + /* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif /* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char gethostbyname(); - -int main() { -gethostbyname() -; return 0; } -EOF -if { (eval echo configure:3596: \"$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 - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -f conftest* -LIBS="$ac_save_LIBS" - -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 + builtin and then its argument prototype would still apply. */ +char gethostbyname (); +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } +#endif +int +main () +{ +gethostbyname (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_bind_gethostbyname=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_lib_bind_gethostbyname=no +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:$LINENO: result: $ac_cv_lib_bind_gethostbyname" >&5 +echo "${ECHO_T}$ac_cv_lib_bind_gethostbyname" >&6 +if test $ac_cv_lib_bind_gethostbyname = yes; then ipv4_LDFLAGS="${ipv4_LDFLAGS} -lbind" -else - echo "$ac_t""no" 1>&6 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 - echo $ac_n "(cached) $ac_c" 1>&6 +have_nanosleep=0 +echo "$as_me:$LINENO: checking for nanosleep" >&5 +echo $ECHO_N "checking for nanosleep... $ECHO_C" >&6 +if test "${ac_cv_func_nanosleep+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func(); below. */ + which can conflict with char nanosleep (); below. */ #include /* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif /* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char $ac_func(); - -int main() { + builtin and then its argument prototype would still apply. */ +char nanosleep (); +char (*f) (); +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } +#endif +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(); +f = 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 - rm -rf conftest* - eval "ac_cv_func_$ac_func=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_func_$ac_func=no" -fi -rm -f conftest* -fi - -if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = 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 -ac_lib_var=`echo rt'_'nanosleep | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - ac_save_LIBS="$LIBS" + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_func_nanosleep=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_func_nanosleep=no +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +fi +echo "$as_me:$LINENO: result: $ac_cv_func_nanosleep" >&5 +echo "${ECHO_T}$ac_cv_func_nanosleep" >&6 +if test $ac_cv_func_nanosleep = yes; then + have_nanosleep=1 +else + + echo "$as_me:$LINENO: checking for nanosleep in -lrt" >&5 +echo $ECHO_N "checking for nanosleep in -lrt... $ECHO_C" >&6 +if test "${ac_cv_lib_rt_nanosleep+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_lib_save_LIBS=$LIBS LIBS="-lrt $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" #include "confdefs.h" + /* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif /* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char nanosleep(); - -int main() { -nanosleep() -; return 0; } -EOF -if { (eval echo configure:3691: \"$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 - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -f conftest* -LIBS="$ac_save_LIBS" - -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - vlc_LDFLAGS="${vlc_LDFLAGS} -lrt" -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 -ac_lib_var=`echo posix4'_'nanosleep | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - ac_save_LIBS="$LIBS" + builtin and then its argument prototype would still apply. */ +char nanosleep (); +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } +#endif +int +main () +{ +nanosleep (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_rt_nanosleep=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_lib_rt_nanosleep=no +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:$LINENO: result: $ac_cv_lib_rt_nanosleep" >&5 +echo "${ECHO_T}$ac_cv_lib_rt_nanosleep" >&6 +if test $ac_cv_lib_rt_nanosleep = yes; then + vlc_LDFLAGS="${vlc_LDFLAGS} -lrt"; have_nanosleep=1 +else + echo "$as_me:$LINENO: checking for nanosleep in -lposix4" >&5 +echo $ECHO_N "checking for nanosleep in -lposix4... $ECHO_C" >&6 +if test "${ac_cv_lib_posix4_nanosleep+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_lib_save_LIBS=$LIBS LIBS="-lposix4 $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" #include "confdefs.h" + /* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif /* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char nanosleep(); - -int main() { -nanosleep() -; return 0; } -EOF -if { (eval echo configure:3729: \"$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" + builtin and then its argument prototype would still apply. */ +char nanosleep (); +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } +#endif +int +main () +{ +nanosleep (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_posix4_nanosleep=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_lib_posix4_nanosleep=no fi -rm -f conftest* -LIBS="$ac_save_LIBS" - +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_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" -else - echo "$ac_t""no" 1>&6 +echo "$as_me:$LINENO: result: $ac_cv_lib_posix4_nanosleep" >&5 +echo "${ECHO_T}$ac_cv_lib_posix4_nanosleep" >&6 +if test $ac_cv_lib_posix4_nanosleep = yes; then + vlc_LDFLAGS="${vlc_LDFLAGS} -lposix4"; have_nanosleep=1 fi - + fi fi -done -echo $ac_n "checking for inet_aton""... $ac_c" 1>&6 -echo "configure:3757: 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 +if test x$have_nanosleep = x1; then + +cat >>confdefs.h <<\_ACEOF +#define HAVE_NANOSLEEP 1 +_ACEOF + +fi +echo "$as_me:$LINENO: checking for inet_aton" >&5 +echo $ECHO_N "checking for inet_aton... $ECHO_C" >&6 +if test "${ac_cv_func_inet_aton+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char inet_aton(); below. */ + which can conflict with char inet_aton (); below. */ #include /* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif /* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char inet_aton(); - -int main() { + builtin and then its argument prototype would still apply. */ +char inet_aton (); +char (*f) (); +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } +#endif +int +main () +{ /* The GNU C library defines this for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ #if defined (__stub_inet_aton) || defined (__stub___inet_aton) choke me #else -inet_aton(); +f = inet_aton; #endif -; return 0; } -EOF -if { (eval echo configure:3785: \"$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 - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_func_inet_aton=no" -fi -rm -f conftest* -fi - -if eval "test \"`echo '$ac_cv_func_'inet_aton`\" = yes"; then - echo "$ac_t""yes" 1>&6 + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_func_inet_aton=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_func_inet_aton=no +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +fi +echo "$as_me:$LINENO: result: $ac_cv_func_inet_aton" >&5 +echo "${ECHO_T}$ac_cv_func_inet_aton" >&6 +if test $ac_cv_func_inet_aton = yes; then : 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 -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 + echo "$as_me:$LINENO: checking for inet_aton in -lresolv" >&5 +echo $ECHO_N "checking for inet_aton in -lresolv... $ECHO_C" >&6 +if test "${ac_cv_lib_resolv_inet_aton+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-lresolv $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" #include "confdefs.h" -/* Override any gcc2 internal prototype to avoid an error. */ -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char inet_aton(); - -int main() { -inet_aton() -; return 0; } -EOF -if { (eval echo configure:3823: \"$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 - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -f conftest* -LIBS="$ac_save_LIBS" -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 +/* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char inet_aton (); +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } +#endif +int +main () +{ +inet_aton (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_resolv_inet_aton=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_lib_resolv_inet_aton=no +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:$LINENO: result: $ac_cv_lib_resolv_inet_aton" >&5 +echo "${ECHO_T}$ac_cv_lib_resolv_inet_aton" >&6 +if test $ac_cv_lib_resolv_inet_aton = yes; then ipv4_LDFLAGS="${ipv4_LDFLAGS} -lresolv" -else - echo "$ac_t""no" 1>&6 fi fi -echo $ac_n "checking for textdomain""... $ac_c" 1>&6 -echo "configure:3847: checking for textdomain" >&5 -if eval "test \"`echo '$''{'ac_cv_func_textdomain'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +echo "$as_me:$LINENO: checking for textdomain" >&5 +echo $ECHO_N "checking for textdomain... $ECHO_C" >&6 +if test "${ac_cv_func_textdomain+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char textdomain(); below. */ + which can conflict with char textdomain (); below. */ #include /* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif /* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char textdomain(); - -int main() { + builtin and then its argument prototype would still apply. */ +char textdomain (); +char (*f) (); +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } +#endif +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_textdomain) || defined (__stub___textdomain) choke me #else -textdomain(); +f = textdomain; #endif -; return 0; } -EOF -if { (eval echo configure:3875: \"$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 - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_func_textdomain=no" -fi -rm -f conftest* -fi - -if eval "test \"`echo '$ac_cv_func_'textdomain`\" = yes"; then - echo "$ac_t""yes" 1>&6 + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_func_textdomain=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_func_textdomain=no +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +fi +echo "$as_me:$LINENO: result: $ac_cv_func_textdomain" >&5 +echo "${ECHO_T}$ac_cv_func_textdomain" >&6 +if test $ac_cv_func_textdomain = yes; then : 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 -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 + echo "$as_me:$LINENO: checking for textdomain in -lintl" >&5 +echo $ECHO_N "checking for textdomain in -lintl... $ECHO_C" >&6 +if test "${ac_cv_lib_intl_textdomain+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-lintl $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" #include "confdefs.h" + /* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif /* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char textdomain(); - -int main() { -textdomain() -; return 0; } -EOF -if { (eval echo configure:3913: \"$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 - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -f conftest* -LIBS="$ac_save_LIBS" - -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 + builtin and then its argument prototype would still apply. */ +char textdomain (); +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } +#endif +int +main () +{ +textdomain (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_intl_textdomain=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_lib_intl_textdomain=no +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:$LINENO: result: $ac_cv_lib_intl_textdomain" >&5 +echo "${ECHO_T}$ac_cv_lib_intl_textdomain" >&6 +if test $ac_cv_lib_intl_textdomain = yes; then save_LDFLAGS="${save_LDFLAGS} -lintl" -else - echo "$ac_t""no" 1>&6 fi @@ -3934,115 +6736,158 @@ fi NEED_GETOPT=0 -echo $ac_n "checking for getopt_long""... $ac_c" 1>&6 -echo "configure:3939: 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 +echo "$as_me:$LINENO: checking for getopt_long" >&5 +echo $ECHO_N "checking for getopt_long... $ECHO_C" >&6 +if test "${ac_cv_func_getopt_long+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char getopt_long(); below. */ + which can conflict with char getopt_long (); below. */ #include /* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif /* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char getopt_long(); - -int main() { + builtin and then its argument prototype would still apply. */ +char getopt_long (); +char (*f) (); +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } +#endif +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_getopt_long) || defined (__stub___getopt_long) choke me #else -getopt_long(); +f = getopt_long; #endif -; return 0; } -EOF -if { (eval echo configure:3967: \"$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 - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_func_getopt_long=no" -fi -rm -f conftest* -fi - -if eval "test \"`echo '$ac_cv_func_'getopt_long`\" = yes"; then - echo "$ac_t""yes" 1>&6 - cat >> confdefs.h <<\EOF + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_func_getopt_long=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_func_getopt_long=no +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +fi +echo "$as_me:$LINENO: result: $ac_cv_func_getopt_long" >&5 +echo "${ECHO_T}$ac_cv_func_getopt_long" >&6 +if test $ac_cv_func_getopt_long = yes; then + +cat >>confdefs.h <<\_ACEOF #define HAVE_GETOPT_LONG 1 -EOF +_ACEOF 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 -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 + # FreeBSD has a gnugetopt library for this: + echo "$as_me:$LINENO: checking for getopt_long in -lgnugetopt" >&5 +echo $ECHO_N "checking for getopt_long in -lgnugetopt... $ECHO_C" >&6 +if test "${ac_cv_lib_gnugetopt_getopt_long+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-lgnugetopt $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" #include "confdefs.h" + /* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif /* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char getopt_long(); - -int main() { -getopt_long() -; return 0; } -EOF -if { (eval echo configure:4008: \"$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 - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -f conftest* -LIBS="$ac_save_LIBS" - -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - cat >> confdefs.h <<\EOF + builtin and then its argument prototype would still apply. */ +char getopt_long (); +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } +#endif +int +main () +{ +getopt_long (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_gnugetopt_getopt_long=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_lib_gnugetopt_getopt_long=no +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:$LINENO: result: $ac_cv_lib_gnugetopt_getopt_long" >&5 +echo "${ECHO_T}$ac_cv_lib_gnugetopt_getopt_long" >&6 +if test $ac_cv_lib_gnugetopt_getopt_long = yes; then + +cat >>confdefs.h <<\_ACEOF #define HAVE_GETOPT_LONG 1 -EOF +_ACEOF vlc_LDFLAGS="${vlc_LDFLAGS} -lgnugetopt" else - echo "$ac_t""no" 1>&6 -NEED_GETOPT=1 + NEED_GETOPT=1 fi fi -echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6 -echo "configure:4036: 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 +echo "$as_me:$LINENO: checking return type of signal handlers" >&5 +echo $ECHO_N "checking return type of signal handlers... $ECHO_C" >&6 +if test "${ac_cv_type_signal+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" #include "confdefs.h" #include #include #ifdef signal -#undef signal +# undef signal #endif #ifdef __cplusplus extern "C" void (*signal (int, void (*)(int)))(int); @@ -4050,758 +6895,1488 @@ extern "C" void (*signal (int, void (*)(int)))(int); void (*signal ()) (); #endif -int main() { +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } +#endif +int +main () +{ int i; -; return 0; } -EOF -if { (eval echo configure:4058: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_cv_type_signal=void else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - ac_cv_type_signal=int + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_type_signal=int fi -rm -f conftest* +rm -f conftest.$ac_objext conftest.$ac_ext fi +echo "$as_me:$LINENO: result: $ac_cv_type_signal" >&5 +echo "${ECHO_T}$ac_cv_type_signal" >&6 -echo "$ac_t""$ac_cv_type_signal" 1>&6 -cat >> confdefs.h <>confdefs.h <<_ACEOF #define RETSIGTYPE $ac_cv_type_signal -EOF +_ACEOF -echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6 -echo "configure:4077: 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 +echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5 +echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6 +if test "${ac_cv_lib_dl_dlopen+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-ldl $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" #include "confdefs.h" + /* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif /* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char dlopen(); - -int main() { -dlopen() -; return 0; } -EOF -if { (eval echo configure:4096: \"$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 - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -f conftest* -LIBS="$ac_save_LIBS" - -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 + builtin and then its argument prototype would still apply. */ +char dlopen (); +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } +#endif +int +main () +{ +dlopen (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_dl_dlopen=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_lib_dl_dlopen=no +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 +echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6 +if test $ac_cv_lib_dl_dlopen = yes; then vlc_LDFLAGS="${vlc_LDFLAGS} -ldl" -else - echo "$ac_t""no" 1>&6 fi -echo $ac_n "checking for cos in -lm""... $ac_c" 1>&6 -echo "configure:4117: 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 +echo "$as_me:$LINENO: checking for cos in -lm" >&5 +echo $ECHO_N "checking for cos in -lm... $ECHO_C" >&6 +if test "${ac_cv_lib_m_cos+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-lm $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" #include "confdefs.h" + /* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif /* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char cos(); - -int main() { -cos() -; return 0; } -EOF -if { (eval echo configure:4136: \"$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 - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -f conftest* -LIBS="$ac_save_LIBS" - -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 + builtin and then its argument prototype would still apply. */ +char cos (); +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } +#endif +int +main () +{ +cos (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_m_cos=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_lib_m_cos=no +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:$LINENO: result: $ac_cv_lib_m_cos" >&5 +echo "${ECHO_T}$ac_cv_lib_m_cos" >&6 +if test $ac_cv_lib_m_cos = yes; then imdct_LDFLAGS="${imdct_LDFLAGS} -lm" filter_distort_LDFLAGS="${filter_distort_LDFLAGS} -lm" -else - echo "$ac_t""no" 1>&6 fi -echo $ac_n "checking for pow in -lm""... $ac_c" 1>&6 -echo "configure:4158: 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 +echo "$as_me:$LINENO: checking for pow in -lm" >&5 +echo $ECHO_N "checking for pow in -lm... $ECHO_C" >&6 +if test "${ac_cv_lib_m_pow+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-lm $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" #include "confdefs.h" + /* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif /* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char pow(); - -int main() { -pow() -; return 0; } -EOF -if { (eval echo configure:4177: \"$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 - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -f conftest* -LIBS="$ac_save_LIBS" - -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 + builtin and then its argument prototype would still apply. */ +char pow (); +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } +#endif +int +main () +{ +pow (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_m_pow=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_lib_m_pow=no +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:$LINENO: result: $ac_cv_lib_m_pow" >&5 +echo "${ECHO_T}$ac_cv_lib_m_pow" >&6 +if test $ac_cv_lib_m_pow = yes; then imdct_LDFLAGS="${imdct_LDFLAGS} -lm" imdct3dn_LDFLAGS="${imdct3dn_LDFLAGS} -lm" imdctsse_LDFLAGS="${imdctsse_LDFLAGS} -lm" chroma_i420_rgb_LDFLAGS="${chroma_i420_rgb_LDFLAGS} -lm" -else - echo "$ac_t""no" 1>&6 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 -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 + echo "$as_me:$LINENO: checking for pthread_attr_init in -lpthread" >&5 +echo $ECHO_N "checking for pthread_attr_init in -lpthread... $ECHO_C" >&6 +if test "${ac_cv_lib_pthread_pthread_attr_init+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-lpthread $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" #include "confdefs.h" + /* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif /* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char pthread_attr_init(); - -int main() { -pthread_attr_init() -; return 0; } -EOF -if { (eval echo configure:4224: \"$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 - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -f conftest* -LIBS="$ac_save_LIBS" - -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 + builtin and then its argument prototype would still apply. */ +char pthread_attr_init (); +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } +#endif +int +main () +{ +pthread_attr_init (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_pthread_pthread_attr_init=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_lib_pthread_pthread_attr_init=no +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_pthread_attr_init" >&5 +echo "${ECHO_T}$ac_cv_lib_pthread_pthread_attr_init" >&6 +if test $ac_cv_lib_pthread_pthread_attr_init = yes; then THREAD_LIB="-lpthread" -else - echo "$ac_t""no" 1>&6 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 -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 + echo "$as_me:$LINENO: checking for pthread_attr_init in -lpthreads" >&5 +echo $ECHO_N "checking for pthread_attr_init in -lpthreads... $ECHO_C" >&6 +if test "${ac_cv_lib_pthreads_pthread_attr_init+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-lpthreads $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" #include "confdefs.h" + /* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif /* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char pthread_attr_init(); - -int main() { -pthread_attr_init() -; return 0; } -EOF -if { (eval echo configure:4266: \"$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 - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -f conftest* -LIBS="$ac_save_LIBS" - -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 + builtin and then its argument prototype would still apply. */ +char pthread_attr_init (); +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } +#endif +int +main () +{ +pthread_attr_init (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_pthreads_pthread_attr_init=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_lib_pthreads_pthread_attr_init=no +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:$LINENO: result: $ac_cv_lib_pthreads_pthread_attr_init" >&5 +echo "${ECHO_T}$ac_cv_lib_pthreads_pthread_attr_init" >&6 +if test $ac_cv_lib_pthreads_pthread_attr_init = yes; then THREAD_LIB="-lpthreads" -else - echo "$ac_t""no" 1>&6 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 -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 + echo "$as_me:$LINENO: checking for pthread_attr_init in -lc_r" >&5 +echo $ECHO_N "checking for pthread_attr_init in -lc_r... $ECHO_C" >&6 +if test "${ac_cv_lib_c_r_pthread_attr_init+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-lc_r $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" #include "confdefs.h" + /* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif /* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char pthread_attr_init(); - -int main() { -pthread_attr_init() -; return 0; } -EOF -if { (eval echo configure:4308: \"$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 - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -f conftest* -LIBS="$ac_save_LIBS" - -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 + builtin and then its argument prototype would still apply. */ +char pthread_attr_init (); +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } +#endif +int +main () +{ +pthread_attr_init (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_c_r_pthread_attr_init=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_lib_c_r_pthread_attr_init=no +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:$LINENO: result: $ac_cv_lib_c_r_pthread_attr_init" >&5 +echo "${ECHO_T}$ac_cv_lib_c_r_pthread_attr_init" >&6 +if test $ac_cv_lib_c_r_pthread_attr_init = yes; then THREAD_LIB="-lc_r" -else - echo "$ac_t""no" 1>&6 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 -if eval "test \"`echo '$''{'ac_cv_func_pthread_attr_init'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + echo "$as_me:$LINENO: checking for pthread_attr_init" >&5 +echo $ECHO_N "checking for pthread_attr_init... $ECHO_C" >&6 +if test "${ac_cv_func_pthread_attr_init+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char pthread_attr_init(); below. */ + which can conflict with char pthread_attr_init (); below. */ #include /* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif /* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char pthread_attr_init(); - -int main() { + builtin and then its argument prototype would still apply. */ +char pthread_attr_init (); +char (*f) (); +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } +#endif +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_pthread_attr_init) || defined (__stub___pthread_attr_init) choke me #else -pthread_attr_init(); +f = pthread_attr_init; #endif -; return 0; } -EOF -if { (eval echo configure:4359: \"$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 - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_func_pthread_attr_init=no" -fi -rm -f conftest* -fi - -if eval "test \"`echo '$ac_cv_func_'pthread_attr_init`\" = yes"; then - echo "$ac_t""yes" 1>&6 - : -else - echo "$ac_t""no" 1>&6 -fi + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_func_pthread_attr_init=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_func_pthread_attr_init=no +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +fi +echo "$as_me:$LINENO: result: $ac_cv_func_pthread_attr_init" >&5 +echo "${ECHO_T}$ac_cv_func_pthread_attr_init" >&6 THREAD_LIB="" fi -echo $ac_n "checking for cthread_fork in -lthreads""... $ac_c" 1>&6 -echo "configure:4382: 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 +echo "$as_me:$LINENO: checking for cthread_fork in -lthreads" >&5 +echo $ECHO_N "checking for cthread_fork in -lthreads... $ECHO_C" >&6 +if test "${ac_cv_lib_threads_cthread_fork+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-lthreads $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" #include "confdefs.h" + /* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif /* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char cthread_fork(); - -int main() { -cthread_fork() -; return 0; } -EOF -if { (eval echo configure:4401: \"$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 - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -f conftest* -LIBS="$ac_save_LIBS" - -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 + builtin and then its argument prototype would still apply. */ +char cthread_fork (); +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } +#endif +int +main () +{ +cthread_fork (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_threads_cthread_fork=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_lib_threads_cthread_fork=no +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:$LINENO: result: $ac_cv_lib_threads_cthread_fork" >&5 +echo "${ECHO_T}$ac_cv_lib_threads_cthread_fork" >&6 +if test $ac_cv_lib_threads_cthread_fork = yes; then THREAD_LIB="-lthreads" -else - echo "$ac_t""no" 1>&6 fi -cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" #include "confdefs.h" #include -EOF + +_ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | egrep "pthread_cond_t" >/dev/null 2>&1; then - rm -rf conftest* - - cat >> confdefs.h <<\EOF + + +cat >>confdefs.h <<\_ACEOF #define PTHREAD_COND_T_IN_PTHREAD_H 1 -EOF +_ACEOF fi rm -f conftest* -cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" #include "confdefs.h" #include -EOF + +_ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | egrep "strncasecmp" >/dev/null 2>&1; then - rm -rf conftest* - - cat >> confdefs.h <<\EOF + + +cat >>confdefs.h <<\_ACEOF #define STRNCASECMP_IN_STRINGS_H 1 -EOF +_ACEOF fi rm -f conftest* -for ac_hdr in getopt.h strings.h + + + + + +for ac_header 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 -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 <&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 +if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +fi +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +else + # Is the header compilable? +echo "$as_me:$LINENO: checking $ac_header usability" >&5 +echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" #include "confdefs.h" -#include <$ac_hdr> -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; } -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 +$ac_includes_default +#include <$ac_header> +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_header_compiler=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_header_compiler=no +fi +rm -f conftest.$ac_objext conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6 + +# Is the header present? +echo "$as_me:$LINENO: checking $ac_header presence" >&5 +echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" +#include "confdefs.h" +#include <$ac_header> +_ACEOF +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + egrep -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then + ac_header_preproc=yes +else + echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_header_$ac_safe=no" + ac_header_preproc=no +fi +rm -f conftest.err conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6 + +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc in + yes:no ) + { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};; + no:yes ) + { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 +echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};; +esac +echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 +if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + eval "$as_ac_Header=$ac_header_preproc" fi -rm -f conftest* +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 + fi -if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then - echo "$ac_t""yes" 1>&6 - ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` - cat >> confdefs.h <&6 +if test `eval echo '${'$as_ac_Header'}'` = yes; then + cat >>confdefs.h <<_ACEOF +#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF + fi + done -for ac_hdr in sys/sockio.h fcntl.h sys/types.h sys/time.h sys/times.h + + + + + +for ac_header 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 -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 <&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 +if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +fi +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +else + # Is the header compilable? +echo "$as_me:$LINENO: checking $ac_header usability" >&5 +echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" #include "confdefs.h" -#include <$ac_hdr> -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; } -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 +$ac_includes_default +#include <$ac_header> +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_header_compiler=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_header_compiler=no +fi +rm -f conftest.$ac_objext conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6 + +# Is the header present? +echo "$as_me:$LINENO: checking $ac_header presence" >&5 +echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" +#include "confdefs.h" +#include <$ac_header> +_ACEOF +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + egrep -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then + ac_header_preproc=yes +else + echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_header_$ac_safe=no" + ac_header_preproc=no +fi +rm -f conftest.err conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6 + +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc in + yes:no ) + { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};; + no:yes ) + { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 +echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};; +esac +echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 +if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + eval "$as_ac_Header=$ac_header_preproc" fi -rm -f conftest* +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 + fi -if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then - echo "$ac_t""yes" 1>&6 - ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` - cat >> confdefs.h <&6 +if test `eval echo '${'$as_ac_Header'}'` = yes; then + cat >>confdefs.h <<_ACEOF +#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF + fi + done -for ac_hdr in dlfcn.h image.h + + +for ac_header 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 -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 <&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 +if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +fi +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +else + # Is the header compilable? +echo "$as_me:$LINENO: checking $ac_header usability" >&5 +echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" #include "confdefs.h" -#include <$ac_hdr> -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; } -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 +$ac_includes_default +#include <$ac_header> +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_header_compiler=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_header_compiler=no +fi +rm -f conftest.$ac_objext conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6 + +# Is the header present? +echo "$as_me:$LINENO: checking $ac_header presence" >&5 +echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" +#include "confdefs.h" +#include <$ac_header> +_ACEOF +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + egrep -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then + ac_header_preproc=yes +else + echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_header_$ac_safe=no" + ac_header_preproc=no +fi +rm -f conftest.err conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6 + +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc in + yes:no ) + { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};; + no:yes ) + { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 +echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};; +esac +echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 +if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + eval "$as_ac_Header=$ac_header_preproc" fi -rm -f conftest* +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 + fi -if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then - echo "$ac_t""yes" 1>&6 - ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` - cat >> confdefs.h <&6 +if test `eval echo '${'$as_ac_Header'}'` = yes; then + cat >>confdefs.h <<_ACEOF +#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF + fi + done -for ac_hdr in arpa/inet.h net/if.h netinet/in.h sys/socket.h + + + + +for ac_header 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 -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 <&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 +if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +fi +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +else + # Is the header compilable? +echo "$as_me:$LINENO: checking $ac_header usability" >&5 +echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" #include "confdefs.h" -#include <$ac_hdr> -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; } -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 +$ac_includes_default +#include <$ac_header> +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_header_compiler=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_header_compiler=no +fi +rm -f conftest.$ac_objext conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6 + +# Is the header present? +echo "$as_me:$LINENO: checking $ac_header presence" >&5 +echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" +#include "confdefs.h" +#include <$ac_header> +_ACEOF +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + egrep -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then + ac_header_preproc=yes +else + echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_header_$ac_safe=no" + ac_header_preproc=no +fi +rm -f conftest.err conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6 + +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc in + yes:no ) + { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};; + no:yes ) + { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 +echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};; +esac +echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 +if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + eval "$as_ac_Header=$ac_header_preproc" fi -rm -f conftest* +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 + fi -if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then - echo "$ac_t""yes" 1>&6 - ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` - cat >> confdefs.h <&6 +if test `eval echo '${'$as_ac_Header'}'` = yes; then + cat >>confdefs.h <<_ACEOF +#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF + fi + done -for ac_hdr in machine/param.h sys/shm.h + + +for ac_header 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 -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 <&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 +if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +fi +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +else + # Is the header compilable? +echo "$as_me:$LINENO: checking $ac_header usability" >&5 +echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" #include "confdefs.h" -#include <$ac_hdr> -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; } -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 +$ac_includes_default +#include <$ac_header> +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_header_compiler=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_header_compiler=no +fi +rm -f conftest.$ac_objext conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6 + +# Is the header present? +echo "$as_me:$LINENO: checking $ac_header presence" >&5 +echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" +#include "confdefs.h" +#include <$ac_header> +_ACEOF +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + egrep -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then + ac_header_preproc=yes +else + echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_header_$ac_safe=no" + ac_header_preproc=no +fi +rm -f conftest.err conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6 + +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc in + yes:no ) + { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};; + no:yes ) + { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 +echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};; +esac +echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 +if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + eval "$as_ac_Header=$ac_header_preproc" fi -rm -f conftest* +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 + fi -if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then - echo "$ac_t""yes" 1>&6 - ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` - cat >> confdefs.h <&6 +if test `eval echo '${'$as_ac_Header'}'` = yes; then + cat >>confdefs.h <<_ACEOF +#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF + fi + done -for ac_hdr in linux/version.h + +for ac_header 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 -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 <&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 +if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +fi +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +else + # Is the header compilable? +echo "$as_me:$LINENO: checking $ac_header usability" >&5 +echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" #include "confdefs.h" -#include <$ac_hdr> -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; } -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 +$ac_includes_default +#include <$ac_header> +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_header_compiler=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_header_compiler=no +fi +rm -f conftest.$ac_objext conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6 + +# Is the header present? +echo "$as_me:$LINENO: checking $ac_header presence" >&5 +echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" +#include "confdefs.h" +#include <$ac_header> +_ACEOF +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + egrep -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then + ac_header_preproc=yes +else + echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_header_$ac_safe=no" + ac_header_preproc=no +fi +rm -f conftest.err conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6 + +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc in + yes:no ) + { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};; + no:yes ) + { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 +echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};; +esac +echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 +if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + eval "$as_ac_Header=$ac_header_preproc" fi -rm -f conftest* +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 + fi -if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then - echo "$ac_t""yes" 1>&6 - ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` - cat >> confdefs.h <&6 +if test `eval echo '${'$as_ac_Header'}'` = yes; then + cat >>confdefs.h <<_ACEOF +#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF + fi + 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 -if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +echo "$as_me:$LINENO: checking whether time.h and sys/time.h may both be included" >&5 +echo $ECHO_N "checking whether time.h and sys/time.h may both be included... $ECHO_C" >&6 +if test "${ac_cv_header_time+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" #include "confdefs.h" #include #include #include -int main() { -struct tm *tp; -; return 0; } -EOF -if { (eval echo configure:4711: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* + +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } +#endif +int +main () +{ +if ((struct tm *) 0) +return 0; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_cv_header_time=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - ac_cv_header_time=no + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_header_time=no fi -rm -f conftest* +rm -f conftest.$ac_objext conftest.$ac_ext fi - -echo "$ac_t""$ac_cv_header_time" 1>&6 +echo "$as_me:$LINENO: result: $ac_cv_header_time" >&5 +echo "${ECHO_T}$ac_cv_header_time" >&6 if test $ac_cv_header_time = yes; then - cat >> confdefs.h <<\EOF + +cat >>confdefs.h <<\_ACEOF #define TIME_WITH_SYS_TIME 1 -EOF +_ACEOF fi -cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" #include "confdefs.h" #include -EOF + +_ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | egrep "nanosleep" >/dev/null 2>&1; then - rm -rf conftest* - - cat >> confdefs.h <<\EOF + + +cat >>confdefs.h <<\_ACEOF #define HAVE_DECL_NANOSLEEP 1 -EOF +_ACEOF fi rm -f conftest* -cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" #include "confdefs.h" #include -EOF + +_ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | egrep "timespec" >/dev/null 2>&1; then - rm -rf conftest* - - cat >> confdefs.h <<\EOF + + +cat >>confdefs.h <<\_ACEOF #define HAVE_STRUCT_TIMESPEC 1 -EOF +_ACEOF fi rm -f conftest* -for ac_hdr in cthreads.h pthread.h kernel/scheduler.h kernel/OS.h + + + + +for ac_header 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 -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 <&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 +if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +fi +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +else + # Is the header compilable? +echo "$as_me:$LINENO: checking $ac_header usability" >&5 +echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" #include "confdefs.h" -#include <$ac_hdr> -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; } -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 +$ac_includes_default +#include <$ac_header> +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_header_compiler=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_header_compiler=no +fi +rm -f conftest.$ac_objext conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6 + +# Is the header present? +echo "$as_me:$LINENO: checking $ac_header presence" >&5 +echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" +#include "confdefs.h" +#include <$ac_header> +_ACEOF +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + egrep -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then + ac_header_preproc=yes +else + echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_header_$ac_safe=no" + ac_header_preproc=no +fi +rm -f conftest.err conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6 + +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc in + yes:no ) + { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};; + no:yes ) + { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 +echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};; +esac +echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 +if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + eval "$as_ac_Header=$ac_header_preproc" fi -rm -f conftest* +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 + fi -if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then - echo "$ac_t""yes" 1>&6 - ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` - cat >> confdefs.h <&6 +if test `eval echo '${'$as_ac_Header'}'` = yes; then + cat >>confdefs.h <<_ACEOF +#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF + fi + done @@ -4814,540 +8389,961 @@ then x_libraries=/usr/X11R6/lib fi CPPFLAGS="$save_CPPFLAGS -I$x_includes" - for ac_hdr in X11/extensions/dpms.h + +for ac_header in X11/extensions/dpms.h do -ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` -echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:4822: 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 <&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 +if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +fi +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +else + # Is the header compilable? +echo "$as_me:$LINENO: checking $ac_header usability" >&5 +echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" #include "confdefs.h" -#include <$ac_hdr> -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; } -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 +$ac_includes_default +#include <$ac_header> +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_header_compiler=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_header_compiler=no +fi +rm -f conftest.$ac_objext conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6 + +# Is the header present? +echo "$as_me:$LINENO: checking $ac_header presence" >&5 +echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" +#include "confdefs.h" +#include <$ac_header> +_ACEOF +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + egrep -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then + ac_header_preproc=yes +else + echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_header_$ac_safe=no" + ac_header_preproc=no +fi +rm -f conftest.err conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6 + +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc in + yes:no ) + { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};; + no:yes ) + { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 +echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};; +esac +echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 +if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + eval "$as_ac_Header=$ac_header_preproc" fi -rm -f conftest* +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 + fi -if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then - echo "$ac_t""yes" 1>&6 - ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` - cat >> confdefs.h < conftest.$ac_ext <>confdefs.h <<_ACEOF +#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF + + cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" #include "confdefs.h" #include -EOF + +_ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | egrep "DPMSInfo" >/dev/null 2>&1; then - rm -rf conftest* - - cat >> confdefs.h <<\EOF + + +cat >>confdefs.h <<\_ACEOF #define DPMSINFO_IN_DPMS_H 1 -EOF +_ACEOF + - fi rm -f conftest* - -else - echo "$ac_t""no" 1>&6 + fi + done CPPFLAGS="$save_CPPFLAGS" 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 -if eval "test \"`echo '$''{'ac_cv_c_ntohl_sys_param_h'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +echo "$as_me:$LINENO: checking for ntohl in sys/param.h" >&5 +echo $ECHO_N "checking for ntohl in sys/param.h... $ECHO_C" >&6 +if test "${ac_cv_c_ntohl_sys_param_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else CFLAGS="${save_CFLAGS} -Wall -Werror" - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" #include "confdefs.h" #include -int main() { +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } +#endif +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 - rm -rf conftest* + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_cv_c_ntohl_sys_param_h=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - ac_cv_c_ntohl_sys_param_h=no + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_c_ntohl_sys_param_h=no fi -rm -f conftest* +rm -f conftest.$ac_objext conftest.$ac_ext fi - -echo "$ac_t""$ac_cv_c_ntohl_sys_param_h" 1>&6 +echo "$as_me:$LINENO: result: $ac_cv_c_ntohl_sys_param_h" >&5 +echo "${ECHO_T}$ac_cv_c_ntohl_sys_param_h" >&6 if test x"$ac_cv_c_ntohl_sys_param_h" != x"no"; then - cat >> confdefs.h <<\EOF + +cat >>confdefs.h <<\_ACEOF #define NTOHL_IN_SYS_PARAM_H 1 -EOF +_ACEOF fi -echo $ac_n "checking if \$CC accepts -finline-limit""... $ac_c" 1>&6 -echo "configure:4914: 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 +echo "$as_me:$LINENO: checking if \$CC accepts -finline-limit" >&5 +echo $ECHO_N "checking if \$CC accepts -finline-limit... $ECHO_C" >&6 +if test "${ac_cv_c_inline_limit+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else CFLAGS="${save_CFLAGS} -finline-limit-30000" - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" #include "confdefs.h" -int main() { +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } +#endif +int +main () +{ -; return 0; } -EOF -if { (eval echo configure:4927: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_cv_c_inline_limit=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - ac_cv_c_inline_limit=no + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_c_inline_limit=no fi -rm -f conftest* +rm -f conftest.$ac_objext conftest.$ac_ext fi - -echo "$ac_t""$ac_cv_c_inline_limit" 1>&6 +echo "$as_me:$LINENO: result: $ac_cv_c_inline_limit" >&5 +echo "${ECHO_T}$ac_cv_c_inline_limit" >&6 if test x"$ac_cv_c_inline_limit" != x"no"; then save_CFLAGS="${save_CFLAGS} -finline-limit-30000" fi -echo $ac_n "checking if \$CC accepts -Wall -Winline""... $ac_c" 1>&6 -echo "configure:4945: 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 +echo "$as_me:$LINENO: checking if \$CC accepts -Wall -Winline" >&5 +echo $ECHO_N "checking if \$CC accepts -Wall -Winline... $ECHO_C" >&6 +if test "${ac_cv_c_Wall_Winline+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else CFLAGS="${save_CFLAGS} -Wall -Winline" - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" #include "confdefs.h" -int main() { +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } +#endif +int +main () +{ -; return 0; } -EOF -if { (eval echo configure:4958: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_cv_c_Wall_Winline=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - ac_cv_c_Wall_Winline=no + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_c_Wall_Winline=no fi -rm -f conftest* +rm -f conftest.$ac_objext conftest.$ac_ext fi - -echo "$ac_t""$ac_cv_c_Wall_Winline" 1>&6 +echo "$as_me:$LINENO: result: $ac_cv_c_Wall_Winline" >&5 +echo "${ECHO_T}$ac_cv_c_Wall_Winline" >&6 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 -if eval "test \"`echo '$''{'ac_cv_c_wall_winline'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + echo "$as_me:$LINENO: checking if \$CC accepts -wall -winline" >&5 +echo $ECHO_N "checking if \$CC accepts -wall -winline... $ECHO_C" >&6 +if test "${ac_cv_c_wall_winline+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else CFLAGS="${save_CFLAGS} -wall -winline" - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" #include "confdefs.h" -int main() { +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } +#endif +int +main () +{ -; return 0; } -EOF -if { (eval echo configure:4988: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_cv_c_wall_winline=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - ac_cv_c_wall_winline=no + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_c_wall_winline=no fi -rm -f conftest* +rm -f conftest.$ac_objext conftest.$ac_ext fi - -echo "$ac_t""$ac_cv_c_wall_winline" 1>&6 +echo "$as_me:$LINENO: result: $ac_cv_c_wall_winline" >&5 +echo "${ECHO_T}$ac_cv_c_wall_winline" >&6 if test x"$ac_cv_c_wall_winline" != x"no"; then save_CFLAGS="${save_CFLAGS} -wall -winline" fi fi -echo $ac_n "checking if \$CC accepts -pipe""... $ac_c" 1>&6 -echo "configure:5007: 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 +echo "$as_me:$LINENO: checking if \$CC accepts -pipe" >&5 +echo $ECHO_N "checking if \$CC accepts -pipe... $ECHO_C" >&6 +if test "${ac_cv_c_pipe+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else CFLAGS="${save_CFLAGS} -pipe" - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" #include "confdefs.h" -int main() { +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } +#endif +int +main () +{ -; return 0; } -EOF -if { (eval echo configure:5020: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_cv_c_pipe=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - ac_cv_c_pipe=no + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_c_pipe=no fi -rm -f conftest* +rm -f conftest.$ac_objext conftest.$ac_ext fi - -echo "$ac_t""$ac_cv_c_pipe" 1>&6 +echo "$as_me:$LINENO: result: $ac_cv_c_pipe" >&5 +echo "${ECHO_T}$ac_cv_c_pipe" >&6 if test x"$ac_cv_c_pipe" != x"no"; then save_CFLAGS="${save_CFLAGS} -pipe" fi -echo $ac_n "checking if \$CC accepts -O3""... $ac_c" 1>&6 -echo "configure:5038: 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 +echo "$as_me:$LINENO: checking if \$CC accepts -O3" >&5 +echo $ECHO_N "checking if \$CC accepts -O3... $ECHO_C" >&6 +if test "${ac_cv_c_o3+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else CFLAGS="${save_CFLAGS} -O3" - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" #include "confdefs.h" -int main() { +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } +#endif +int +main () +{ -; return 0; } -EOF -if { (eval echo configure:5051: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_cv_c_o3=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - ac_cv_c_o3=no + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_c_o3=no fi -rm -f conftest* +rm -f conftest.$ac_objext conftest.$ac_ext fi - -echo "$ac_t""$ac_cv_c_o3" 1>&6 +echo "$as_me:$LINENO: result: $ac_cv_c_o3" >&5 +echo "${ECHO_T}$ac_cv_c_o3" >&6 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 -if eval "test \"`echo '$''{'ac_cv_c_o2'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + echo "$as_me:$LINENO: checking if \$CC accepts -O2" >&5 +echo $ECHO_N "checking if \$CC accepts -O2... $ECHO_C" >&6 +if test "${ac_cv_c_o2+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else CFLAGS="${save_CFLAGS} -O2" - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" #include "confdefs.h" -int main() { +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } +#endif +int +main () +{ -; return 0; } -EOF -if { (eval echo configure:5081: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_cv_c_o2=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - ac_cv_c_o2=no + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_c_o2=no fi -rm -f conftest* +rm -f conftest.$ac_objext conftest.$ac_ext fi - -echo "$ac_t""$ac_cv_c_o2" 1>&6 +echo "$as_me:$LINENO: result: $ac_cv_c_o2" >&5 +echo "${ECHO_T}$ac_cv_c_o2" >&6 if test x"$ac_cv_c_o2" != x"no"; then 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 -if eval "test \"`echo '$''{'ac_cv_c_o'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + echo "$as_me:$LINENO: checking if \$CC accepts -O" >&5 +echo $ECHO_N "checking if \$CC accepts -O... $ECHO_C" >&6 +if test "${ac_cv_c_o+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else CFLAGS="${save_CFLAGS} -O" - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" #include "confdefs.h" -int main() { +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } +#endif +int +main () +{ -; return 0; } -EOF -if { (eval echo configure:5111: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_cv_c_o=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - ac_cv_c_o=no + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_c_o=no fi -rm -f conftest* +rm -f conftest.$ac_objext conftest.$ac_ext fi - -echo "$ac_t""$ac_cv_c_o" 1>&6 +echo "$as_me:$LINENO: result: $ac_cv_c_o" >&5 +echo "${ECHO_T}$ac_cv_c_o" >&6 if test x"$ac_cv_c_o" != x"no"; then CFLAGS_OPTIM="${CFLAGS_OPTIM} -O" fi fi fi -echo $ac_n "checking if \$CC accepts -ffast-math""... $ac_c" 1>&6 -echo "configure:5131: 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 +echo "$as_me:$LINENO: checking if \$CC accepts -ffast-math" >&5 +echo $ECHO_N "checking if \$CC accepts -ffast-math... $ECHO_C" >&6 +if test "${ac_cv_c_fast_math+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else CFLAGS="${save_CFLAGS} -ffast-math" - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" #include "confdefs.h" -int main() { +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } +#endif +int +main () +{ -; return 0; } -EOF -if { (eval echo configure:5144: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_cv_c_fast_math=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - ac_cv_c_fast_math=no + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_c_fast_math=no fi -rm -f conftest* +rm -f conftest.$ac_objext conftest.$ac_ext fi - -echo "$ac_t""$ac_cv_c_fast_math" 1>&6 +echo "$as_me:$LINENO: result: $ac_cv_c_fast_math" >&5 +echo "${ECHO_T}$ac_cv_c_fast_math" >&6 if test x"$ac_cv_c_fast_math" != x"no"; then CFLAGS_OPTIM="${CFLAGS_OPTIM} -ffast-math" fi -echo $ac_n "checking if \$CC accepts -funroll-loops""... $ac_c" 1>&6 -echo "configure:5162: 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 +echo "$as_me:$LINENO: checking if \$CC accepts -funroll-loops" >&5 +echo $ECHO_N "checking if \$CC accepts -funroll-loops... $ECHO_C" >&6 +if test "${ac_cv_c_unroll_loops+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else CFLAGS="${save_CFLAGS} -funroll-loops" - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" #include "confdefs.h" -int main() { +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } +#endif +int +main () +{ -; return 0; } -EOF -if { (eval echo configure:5175: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_cv_c_unroll_loops=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - ac_cv_c_unroll_loops=no + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_c_unroll_loops=no fi -rm -f conftest* +rm -f conftest.$ac_objext conftest.$ac_ext fi - -echo "$ac_t""$ac_cv_c_unroll_loops" 1>&6 +echo "$as_me:$LINENO: result: $ac_cv_c_unroll_loops" >&5 +echo "${ECHO_T}$ac_cv_c_unroll_loops" >&6 if test x"$ac_cv_c_unroll_loops" != x"no"; then CFLAGS_OPTIM="${CFLAGS_OPTIM} -funroll-loops" 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 -if eval "test \"`echo '$''{'ac_cv_c_omit_frame_pointer'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +echo "$as_me:$LINENO: checking if \$CC accepts -fomit-frame-pointer" >&5 +echo $ECHO_N "checking if \$CC accepts -fomit-frame-pointer... $ECHO_C" >&6 +if test "${ac_cv_c_omit_frame_pointer+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else CFLAGS="${save_CFLAGS} -fomit-frame-pointer" - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" #include "confdefs.h" -int main() { +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } +#endif +int +main () +{ -; return 0; } -EOF -if { (eval echo configure:5206: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_cv_c_omit_frame_pointer=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - ac_cv_c_omit_frame_pointer=no + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_c_omit_frame_pointer=no fi -rm -f conftest* +rm -f conftest.$ac_objext conftest.$ac_ext fi - -echo "$ac_t""$ac_cv_c_omit_frame_pointer" 1>&6 +echo "$as_me:$LINENO: result: $ac_cv_c_omit_frame_pointer" >&5 +echo "${ECHO_T}$ac_cv_c_omit_frame_pointer" >&6 if test x"$ac_cv_c_omit_frame_pointer" != x"no"; then CFLAGS_OPTIM_NODEBUG="${CFLAGS_OPTIM_NODEBUG} -fomit-frame-pointer" fi -echo $ac_n "checking if \$CC accepts -bundle -undefined error -lcc_dynamic""... $ac_c" 1>&6 -echo "configure:5224: 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 +if test x$SYS = xmingw32 +then + echo "$as_me:$LINENO: checking if \$CC accepts -mms-bitfields" >&5 +echo $ECHO_N "checking if \$CC accepts -mms-bitfields... $ECHO_C" >&6 +if test "${ac_cv_c_mms_bitfields+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + CFLAGS="${save_CFLAGS} -mms-bitfields" + cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" +#include "confdefs.h" + +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } +#endif +int +main () +{ + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_c_mms_bitfields=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_c_mms_bitfields=no +fi +rm -f conftest.$ac_objext conftest.$ac_ext +fi +echo "$as_me:$LINENO: result: $ac_cv_c_mms_bitfields" >&5 +echo "${ECHO_T}$ac_cv_c_mms_bitfields" >&6 + if test x"$ac_cv_c_mms_bitfields" != x"no"; then + save_CFLAGS="${save_CFLAGS} -mms-bitfields" + plugins_CFLAGS="${plugins_CFLAGS} -mms-bitfields" + else + save_CFLAGS="${save_CFLAGS} -fnative-struct" + plugins_CFLAGS="${plugins_CFLAGS} -fnative-struct" + fi +fi + +echo "$as_me:$LINENO: checking if \$CC accepts -bundle -undefined error -lcc_dynamic" >&5 +echo $ECHO_N "checking if \$CC accepts -bundle -undefined error -lcc_dynamic... $ECHO_C" >&6 +if test "${ac_cv_ld_darwin+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else CFLAGS="${save_CFLAGS} -bundle -undefined error -lcc_dynamic" - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" #include "confdefs.h" -int main() { +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } +#endif +int +main () +{ -; return 0; } -EOF -if { (eval echo configure:5237: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_cv_ld_darwin=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - ac_cv_ld_darwin=no + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_ld_darwin=no fi -rm -f conftest* +rm -f conftest.$ac_objext conftest.$ac_ext fi - -echo "$ac_t""$ac_cv_ld_darwin" 1>&6 +echo "$as_me:$LINENO: result: $ac_cv_ld_darwin" >&5 +echo "${ECHO_T}$ac_cv_ld_darwin" >&6 if test x"$ac_cv_ld_darwin" != x"no"; then plugins_LDFLAGS="${plugins_LDFLAGS} -bundle -undefined error -lcc_dynamic" fi -echo $ac_n "checking if \$CC accepts -shared""... $ac_c" 1>&6 -echo "configure:5255: 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 +echo "$as_me:$LINENO: checking if \$CC accepts -shared" >&5 +echo $ECHO_N "checking if \$CC accepts -shared... $ECHO_C" >&6 +if test "${ac_cv_ld_plugins+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else CFLAGS="${save_CFLAGS} -shared" - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" #include "confdefs.h" -int main() { +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } +#endif +int +main () +{ -; return 0; } -EOF -if { (eval echo configure:5268: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_cv_ld_plugins=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - ac_cv_ld_plugins=no + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_ld_plugins=no fi -rm -f conftest* +rm -f conftest.$ac_objext conftest.$ac_ext fi - -echo "$ac_t""$ac_cv_ld_plugins" 1>&6 +echo "$as_me:$LINENO: result: $ac_cv_ld_plugins" >&5 +echo "${ECHO_T}$ac_cv_ld_plugins" >&6 if test x"$ac_cv_ld_plugins" != x"no"; then plugins_LDFLAGS="${plugins_LDFLAGS} -shared" fi - -echo $ac_n "checking for variadic cpp macros""... $ac_c" 1>&6 -echo "configure:5286: 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 + +echo "$as_me:$LINENO: checking for variadic cpp macros" >&5 +echo $ECHO_N "checking for variadic cpp macros... $ECHO_C" >&6 +if test "${ac_cv_cpp_variadic_macros+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else CFLAGS="${save_CFLAGS}" - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" #include "confdefs.h" #include #define a(b,c...) printf(b,##c) -int main() { +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } +#endif +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 - rm -rf conftest* + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_cv_cpp_variadic_macros=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - ac_cv_cpp_variadic_macros=no + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_cpp_variadic_macros=no fi -rm -f conftest* +rm -f conftest.$ac_objext conftest.$ac_ext fi - -echo "$ac_t""$ac_cv_cpp_variadic_macros" 1>&6 +echo "$as_me:$LINENO: result: $ac_cv_cpp_variadic_macros" >&5 +echo "${ECHO_T}$ac_cv_cpp_variadic_macros" >&6 if test x"$ac_cv_cpp_variadic_macros" != x"no"; then - cat >> confdefs.h <<\EOF + +cat >>confdefs.h <<\_ACEOF #define HAVE_VARIADIC_MACROS 1 -EOF +_ACEOF fi -echo $ac_n "checking __attribute__ ((aligned ())) support""... $ac_c" 1>&6 -echo "configure:5321: 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 +echo "$as_me:$LINENO: checking __attribute__ ((aligned ())) support" >&5 +echo $ECHO_N "checking __attribute__ ((aligned ())) support... $ECHO_C" >&6 +if test "${ac_cv_c_attribute_aligned+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_cv_c_attribute_aligned=0 CFLAGS="${save_CFLAGS} -Werror" for ac_cv_c_attr_align_try in 2 4 8 16 32 64; do - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" #include "confdefs.h" -int main() { +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } +#endif +int +main () +{ static char c __attribute__ ((aligned($ac_cv_c_attr_align_try))) = 0; return c; -; return 0; } -EOF -if { (eval echo configure:5336: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_cv_c_attribute_aligned=$ac_cv_c_attr_align_try else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 fi -rm -f conftest* +rm -f conftest.$ac_objext conftest.$ac_ext done fi - -echo "$ac_t""$ac_cv_c_attribute_aligned" 1>&6 +echo "$as_me:$LINENO: result: $ac_cv_c_attribute_aligned" >&5 +echo "${ECHO_T}$ac_cv_c_attribute_aligned" >&6 if test x"$ac_cv_c_attribute_aligned" != x"0"; then - cat >> confdefs.h <>confdefs.h <<_ACEOF #define ATTRIBUTE_ALIGNED_MAX $ac_cv_c_attribute_aligned -EOF +_ACEOF fi @@ -5355,102 +9351,162 @@ CFLAGS="${save_CFLAGS}" 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 -if eval "test \"`echo '$''{'ac_cv_c_boolean_t_sys_types_h'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +echo "$as_me:$LINENO: checking for boolean_t in sys/types.h" >&5 +echo $ECHO_N "checking for boolean_t in sys/types.h... $ECHO_C" >&6 +if test "${ac_cv_c_boolean_t_sys_types_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" #include "confdefs.h" #include -int main() { +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } +#endif +int +main () +{ boolean_t foo; -; return 0; } -EOF -if { (eval echo configure:5372: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_cv_c_boolean_t_sys_types_h=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - ac_cv_c_boolean_t_sys_types_h=no + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_c_boolean_t_sys_types_h=no fi -rm -f conftest* +rm -f conftest.$ac_objext conftest.$ac_ext fi - -echo "$ac_t""$ac_cv_c_boolean_t_sys_types_h" 1>&6 +echo "$as_me:$LINENO: result: $ac_cv_c_boolean_t_sys_types_h" >&5 +echo "${ECHO_T}$ac_cv_c_boolean_t_sys_types_h" >&6 if test x"$ac_cv_c_boolean_t_sys_types_h" != x"no"; then - cat >> confdefs.h <<\EOF + +cat >>confdefs.h <<\_ACEOF #define BOOLEAN_T_IN_SYS_TYPES_H 1 -EOF +_ACEOF 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 -if eval "test \"`echo '$''{'ac_cv_c_boolean_t_pthread_h'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +echo "$as_me:$LINENO: checking for boolean_t in pthread.h" >&5 +echo $ECHO_N "checking for boolean_t in pthread.h... $ECHO_C" >&6 +if test "${ac_cv_c_boolean_t_pthread_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" #include "confdefs.h" #include -int main() { +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } +#endif +int +main () +{ boolean_t foo; -; return 0; } -EOF -if { (eval echo configure:5405: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_cv_c_boolean_t_pthread_h=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - ac_cv_c_boolean_t_pthread_h=no + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_c_boolean_t_pthread_h=no fi -rm -f conftest* +rm -f conftest.$ac_objext conftest.$ac_ext fi - -echo "$ac_t""$ac_cv_c_boolean_t_pthread_h" 1>&6 +echo "$as_me:$LINENO: result: $ac_cv_c_boolean_t_pthread_h" >&5 +echo "${ECHO_T}$ac_cv_c_boolean_t_pthread_h" >&6 if test x"$ac_cv_c_boolean_t_pthread_h" != x"no"; then - cat >> confdefs.h <<\EOF + +cat >>confdefs.h <<\_ACEOF #define BOOLEAN_T_IN_PTHREAD_H 1 -EOF +_ACEOF 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 -if eval "test \"`echo '$''{'ac_cv_c_boolean_t_cthreads_h'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +echo "$as_me:$LINENO: checking for boolean_t in cthreads.h" >&5 +echo $ECHO_N "checking for boolean_t in cthreads.h... $ECHO_C" >&6 +if test "${ac_cv_c_boolean_t_cthreads_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" #include "confdefs.h" #include -int main() { +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } +#endif +int +main () +{ boolean_t foo; -; return 0; } -EOF -if { (eval echo configure:5438: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_cv_c_boolean_t_cthreads_h=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - ac_cv_c_boolean_t_cthreads_h=no + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_c_boolean_t_cthreads_h=no fi -rm -f conftest* +rm -f conftest.$ac_objext conftest.$ac_ext fi - -echo "$ac_t""$ac_cv_c_boolean_t_cthreads_h" 1>&6 +echo "$as_me:$LINENO: result: $ac_cv_c_boolean_t_cthreads_h" >&5 +echo "${ECHO_T}$ac_cv_c_boolean_t_cthreads_h" >&6 if test x"$ac_cv_c_boolean_t_cthreads_h" != x"no"; then - cat >> confdefs.h <<\EOF + +cat >>confdefs.h <<\_ACEOF #define BOOLEAN_T_IN_CTHREADS_H 1 -EOF +_ACEOF fi @@ -5464,7 +9520,9 @@ 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 memcpy lpcm_adec ac3_spdif spudec filter_deinterlace filter_invert filter_wall filter_transform filter_distort filter_clone filter_crop fx_scope" + +NETWORK_MODULES="udp http rtp ipv4" 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" @@ -5472,130 +9530,213 @@ THREEDNOW_MODULES="memcpy3dn imdct3dn downmix3dn" 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 -if eval "test \"`echo '$''{'ac_cv_mmx_inline'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +if test x$SYS != xbeos +then + PLUGINS="${PLUGINS} ${NETWORK_MODULES}" +fi + +echo "$as_me:$LINENO: checking if \$CC groks MMX inline assembly" >&5 +echo $ECHO_N "checking if \$CC groks MMX inline assembly... $ECHO_C" >&6 +if test "${ac_cv_mmx_inline+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" #include "confdefs.h" -int main() { +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } +#endif +int +main () +{ void *p;asm volatile("packuswb %%mm1,%%mm2"::"r"(p)); -; return 0; } -EOF -if { (eval echo configure:5489: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_cv_mmx_inline=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - ac_cv_mmx_inline=no + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_mmx_inline=no fi -rm -f conftest* +rm -f conftest.$ac_objext conftest.$ac_ext fi - -echo "$ac_t""$ac_cv_mmx_inline" 1>&6 +echo "$as_me:$LINENO: result: $ac_cv_mmx_inline" >&5 +echo "${ECHO_T}$ac_cv_mmx_inline" >&6 if test x"$ac_cv_mmx_inline" != x"no"; then ACCEL_MODULES="${ACCEL_MODULES} ${MMX_MODULES}" 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 -if eval "test \"`echo '$''{'ac_cv_mmxext_inline'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +echo "$as_me:$LINENO: checking if \$CC groks MMX EXT inline assembly" >&5 +echo $ECHO_N "checking if \$CC groks MMX EXT inline assembly... $ECHO_C" >&6 +if test "${ac_cv_mmxext_inline+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" #include "confdefs.h" -int main() { +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } +#endif +int +main () +{ void *p;asm volatile("maskmovq %%mm1,%%mm2"::"r"(p)); -; return 0; } -EOF -if { (eval echo configure:5519: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_cv_mmxext_inline=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - ac_cv_mmxext_inline=no + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_mmxext_inline=no fi -rm -f conftest* +rm -f conftest.$ac_objext conftest.$ac_ext fi - -echo "$ac_t""$ac_cv_mmxext_inline" 1>&6 +echo "$as_me:$LINENO: result: $ac_cv_mmxext_inline" >&5 +echo "${ECHO_T}$ac_cv_mmxext_inline" >&6 if test x"$ac_cv_mmxext_inline" != x"no"; then ACCEL_MODULES="${ACCEL_MODULES} ${MMXEXT_MODULES}" 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 -if eval "test \"`echo '$''{'ac_cv_3dnow_inline'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +echo "$as_me:$LINENO: checking if \$CC groks 3D Now! inline assembly" >&5 +echo $ECHO_N "checking if \$CC groks 3D Now! inline assembly... $ECHO_C" >&6 +if test "${ac_cv_3dnow_inline+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" #include "confdefs.h" -int main() { +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } +#endif +int +main () +{ void *p;asm volatile("pfadd %%mm1,%%mm2"::"r"(p)); -; return 0; } -EOF -if { (eval echo configure:5549: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_cv_3dnow_inline=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - ac_cv_3dnow_inline=no + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_3dnow_inline=no fi -rm -f conftest* +rm -f conftest.$ac_objext conftest.$ac_ext fi - -echo "$ac_t""$ac_cv_3dnow_inline" 1>&6 +echo "$as_me:$LINENO: result: $ac_cv_3dnow_inline" >&5 +echo "${ECHO_T}$ac_cv_3dnow_inline" >&6 if test x"$ac_cv_3dnow_inline" != x"no"; then - cat >> confdefs.h <<\EOF + +cat >>confdefs.h <<\_ACEOF #define CAN_COMPILE_3DNOW 1 -EOF +_ACEOF ACCEL_MODULES="${ACCEL_MODULES} ${THREEDNOW_MODULES}" 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 -if eval "test \"`echo '$''{'ac_cv_sse_inline'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +echo "$as_me:$LINENO: checking if \$CC groks SSE inline assembly" >&5 +echo $ECHO_N "checking if \$CC groks SSE inline assembly... $ECHO_C" >&6 +if test "${ac_cv_sse_inline+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" #include "confdefs.h" -int main() { +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } +#endif +int +main () +{ void *p;asm volatile("xorps %%xmm1,%%xmm2"::"r"(p)); -; return 0; } -EOF -if { (eval echo configure:5583: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_cv_sse_inline=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - ac_cv_sse_inline=no + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_sse_inline=no fi -rm -f conftest* +rm -f conftest.$ac_objext conftest.$ac_ext fi - -echo "$ac_t""$ac_cv_sse_inline" 1>&6 +echo "$as_me:$LINENO: result: $ac_cv_sse_inline" >&5 +echo "${ECHO_T}$ac_cv_sse_inline" >&6 if test x"$ac_cv_sse_inline" != x"no" -a x$SYS != xmingw32; then - cat >> confdefs.h <<\EOF + +cat >>confdefs.h <<\_ACEOF #define CAN_COMPILE_SSE 1 -EOF +_ACEOF ACCEL_MODULES="${ACCEL_MODULES} ${SSE_MODULES}" fi @@ -5603,57 +9744,96 @@ fi # don't try to grok altivec with native mingw32 it doesn't work right now # we should be able to remove this test with future versions of mingw32 if test x$SYS != xmingw32; then -echo $ac_n "checking if \$CC groks Altivec inline assembly""... $ac_c" 1>&6 -echo "configure:5608: 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 +echo "$as_me:$LINENO: checking if \$CC groks Altivec inline assembly" >&5 +echo $ECHO_N "checking if \$CC groks Altivec inline assembly... $ECHO_C" >&6 +if test "${ac_cv_altivec_inline+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" #include "confdefs.h" -int main() { +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } +#endif +int +main () +{ asm volatile("vperm 0,1,2,3"); -; return 0; } -EOF -if { (eval echo configure:5620: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_cv_altivec_inline=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - save_CFLAGS=$CFLAGS + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +save_CFLAGS=$CFLAGS CFLAGS="$CFLAGS -Wa,-m7400" - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" #include "confdefs.h" -int main() { +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } +#endif +int +main () +{ asm volatile("vperm 0,1,2,3"); -; return 0; } -EOF -if { (eval echo configure:5637: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_cv_altivec_inline="-Wa,-m7400" else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - ac_cv_altivec_inline=no + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_altivec_inline=no fi -rm -f conftest* +rm -f conftest.$ac_objext conftest.$ac_ext CFLAGS=$save_CFLAGS - + fi -rm -f conftest* +rm -f conftest.$ac_objext conftest.$ac_ext fi - -echo "$ac_t""$ac_cv_altivec_inline" 1>&6 +echo "$as_me:$LINENO: result: $ac_cv_altivec_inline" >&5 +echo "${ECHO_T}$ac_cv_altivec_inline" >&6 if test x"$ac_cv_altivec_inline" != x"no"; then - cat >> confdefs.h <<\EOF + +cat >>confdefs.h <<\_ACEOF #define CAN_COMPILE_ALTIVEC 1 -EOF +_ACEOF if test x"$ac_cv_altivec_inline" != x"yes"; then idctaltivec_CFLAGS="$idctaltivec_CFLAGS $ac_cv_altivec_inline" @@ -5664,62 +9844,101 @@ EOF ACCEL_MODULES="${ACCEL_MODULES} ${ALTIVEC_MODULES}" 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 -if eval "test \"`echo '$''{'ac_cv_c_altivec'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +echo "$as_me:$LINENO: checking if \$CC groks Altivec C extensions" >&5 +echo $ECHO_N "checking if \$CC groks Altivec C extensions... $ECHO_C" >&6 +if test "${ac_cv_c_altivec+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else save_CFLAGS=$CFLAGS CFLAGS="$CFLAGS -faltivec" # Darwin test - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" #include "confdefs.h" -int main() { +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } +#endif +int +main () +{ vec_mtvscr((vector unsigned int)(0)); -; return 0; } -EOF -if { (eval echo configure:5684: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_cv_c_altivec=-faltivec else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 + # Linux/PPC test CFLAGS="$save_CFLAGS $idctaltivec_CFLAGS -fvec" - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" #include "confdefs.h" -int main() { +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } +#endif +int +main () +{ vec_mtvscr((vector unsigned int)(0)); -; return 0; } -EOF -if { (eval echo configure:5702: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_cv_c_altivec="-fvec" else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - ac_cv_c_altivec=no + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_c_altivec=no fi -rm -f conftest* - +rm -f conftest.$ac_objext conftest.$ac_ext + fi -rm -f conftest* +rm -f conftest.$ac_objext conftest.$ac_ext CFLAGS=$save_CFLAGS - -fi -echo "$ac_t""$ac_cv_c_altivec" 1>&6 +fi +echo "$as_me:$LINENO: result: $ac_cv_c_altivec" >&5 +echo "${ECHO_T}$ac_cv_c_altivec" >&6 if test x"$ac_cv_c_altivec" != x"no"; then - cat >> confdefs.h <<\EOF + +cat >>confdefs.h <<\_ACEOF #define CAN_COMPILE_C_ALTIVEC 1 -EOF +_ACEOF idctaltivec_CFLAGS="$idctaltivec_CFLAGS $ac_cv_c_altivec" motionaltivec_CFLAGS="$motionaltivec_CFLAGS $ac_cv_c_altivec" @@ -5728,36 +9947,55 @@ EOF ACCEL_MODULES="${ACCEL_MODULES} ${ALTIVEC_MODULES}" fi -echo $ac_n "checking if linker needs -framework vecLib""... $ac_c" 1>&6 -echo "configure:5733: 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 +echo "$as_me:$LINENO: checking if linker needs -framework vecLib" >&5 +echo $ECHO_N "checking if linker needs -framework vecLib... $ECHO_C" >&6 +if test "${ac_cv_ld_altivec+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else save_LDFLAGS=$LDFLAGS LDFLAGS="$LDFLAGS -framework vecLib" - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" #include "confdefs.h" -int main() { +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } +#endif +int +main () +{ -; return 0; } -EOF -if { (eval echo configure:5747: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_cv_ld_altivec=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - ac_cv_ld_altivec=no + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_ld_altivec=no fi -rm -f conftest* +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LDFLAGS=$save_LDFLAGS - -fi -echo "$ac_t""$ac_cv_ld_altivec" 1>&6 +fi +echo "$as_me:$LINENO: result: $ac_cv_ld_altivec" >&5 +echo "${ECHO_T}$ac_cv_ld_altivec" >&6 if test x"$ac_cv_ld_altivec" != x"no"; then idctaltivec_LDFLAGS="${idctaltivec_LDFLAGS} -framework vecLib" motionaltivec_LDFLAGS="${motionaltivec_LDFLAGS} -framework vecLib" @@ -5767,25 +10005,25 @@ fi fi # end if mingw32 + # Check whether --with- or --without- was given. if test "${with_+set}" = set; then withval="$with_" - : -fi + +fi; # Check whether --with- or --without- was given. if test "${with_+set}" = set; then withval="$with_" - : -fi + +fi; # Check whether --with-tuning or --without-tuning was given. if test "${with_tuning+set}" = set; then withval="$with_tuning" - : -fi +fi; if test "x$with_tuning" != "x"; then TUNING="$with_tuning" else @@ -5804,134 +10042,214 @@ fi # Check whether --enable-optimizations or --disable-optimizations was given. if test "${enable_optimizations+set}" = set; then enableval="$enable_optimizations" - if test x$enable_optimizations = xno; then OPTIMS=0; fi + if test x$enable_optimizations = xno; then OPTIMS=0; fi else - OPTIMS=1 -fi - + OPTIMS=1 +fi; # Check whether --enable-altivec or --disable-altivec was given. if test "${enable_altivec+set}" = set; then enableval="$enable_altivec" if test x$enable_altivec = xyes; then ARCH="${ARCH} altivec"; - BUILTINS="${BUILTINS} ${ACCEL_MODULES}"; fi + BUILTINS="${BUILTINS} ${ACCEL_MODULES}"; fi else if test x${target_cpu} = xpowerpc; then ARCH="${ARCH} altivec"; - BUILTINS="${BUILTINS} ${ACCEL_MODULES}"; fi -fi - + BUILTINS="${BUILTINS} ${ACCEL_MODULES}"; fi +fi; DEBUG=0 # Check whether --enable-debug or --disable-debug was given. if test "${enable_debug+set}" = set; then enableval="$enable_debug" - if test x$enable_debug = xyes; then DEBUG=1; fi -fi - + if test x$enable_debug = xyes; then DEBUG=1; fi +fi; RELEASE=0 # Check whether --enable-release or --disable-release was given. if test "${enable_release+set}" = set; then enableval="$enable_release" - if test x$enable_release = xyes; then RELEASE=1; fi + if test x$enable_release = xyes; then RELEASE=1; fi else - VERSION="${VERSION}_`date +%Y-%m-%d`" -fi + VERSION="${VERSION}_`date +%Y-%m-%d`" +fi; # Check whether --with- or --without- was given. if test "${with_+set}" = set; then withval="$with_" - : -fi +fi; # Check whether --enable-dvd or --disable-dvd was given. if test "${enable_dvd+set}" = set; then enableval="$enable_dvd" - : -fi +fi; if test "x$enable_dvd" != "xno" then - # Check whether --with-dvdcss or --without-dvdcss was given. + +# Check whether --with-dvdcss or --without-dvdcss was given. if test "${with_dvdcss+set}" = set; then withval="$with_dvdcss" - : -fi - # Check whether --with-dvdcss-tree or --without-dvdcss-tree was given. +fi; + +# Check whether --with-dvdcss-tree or --without-dvdcss-tree was given. if test "${with_dvdcss_tree+set}" = set; then withval="$with_dvdcss_tree" - : -fi +fi; case "x$with_dvdcss" in x|xyes) if test "x$with_dvdcss_tree" = x then - for ac_hdr in dvdcss/dvdcss.h + +for ac_header in dvdcss/dvdcss.h 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 -if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 +if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +fi +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +else + # Is the header compilable? +echo "$as_me:$LINENO: checking $ac_header usability" >&5 +echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" +#include "confdefs.h" +$ac_includes_default +#include <$ac_header> +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_header_compiler=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_header_compiler=no +fi +rm -f conftest.$ac_objext conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6 + +# Is the header present? +echo "$as_me:$LINENO: checking $ac_header presence" >&5 +echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" +#include "confdefs.h" +#include <$ac_header> +_ACEOF +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + egrep -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + else + ac_cpp_err= + fi 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; } -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 + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then + ac_header_preproc=yes +else + echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_header_$ac_safe=no" + ac_header_preproc=no +fi +rm -f conftest.err conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6 + +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc in + yes:no ) + { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};; + no:yes ) + { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 +echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};; +esac +echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 +if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + eval "$as_ac_Header=$ac_header_preproc" fi -rm -f conftest* +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 + fi -if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then - echo "$ac_t""yes" 1>&6 - ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` - cat >> confdefs.h <>confdefs.h <<_ACEOF +#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF PLUGINS="${PLUGINS} dvd" - dvd_LDFLAGS="${dvd_LDFLAGS} -ldvdcss" + dvd_LDFLAGS="${dvd_LDFLAGS} -ldvdcss" else - echo "$ac_t""no" 1>&6 -echo "configure: warning: libdvdcss is no longer provided with vlc; please get libdvdcss from http://www.videolan.org/libdvdcss/ and build it. Then either use --with-dvdcss= for dynamic linking (recommended under Unix) or --with-dvdcss-tree= for static linking (recommended under BeOS, Windows, MacOS X). Alternatively you can use --disable-dvd to disable the DVD plugin." 1>&2 - { echo "configure: error: cannot find libdvdcss headers" 1>&2; exit 1; } + { echo "$as_me:$LINENO: WARNING: libdvdcss is no longer provided with vlc; please get libdvdcss from http://www.videolan.org/libdvdcss/ and build it. Then either use --with-dvdcss= for dynamic linking (recommended under Unix) or --with-dvdcss-tree= for static linking (recommended under BeOS, Windows, MacOS X). Alternatively you can use --disable-dvd to disable the DVD plugin." >&5 +echo "$as_me: WARNING: libdvdcss is no longer provided with vlc; please get libdvdcss from http://www.videolan.org/libdvdcss/ and build it. Then either use --with-dvdcss= for dynamic linking (recommended under Unix) or --with-dvdcss-tree= for static linking (recommended under BeOS, Windows, MacOS X). Alternatively you can use --disable-dvd to disable the DVD plugin." >&2;} + { { echo "$as_me:$LINENO: error: cannot find libdvdcss headers" >&5 +echo "$as_me: error: cannot find libdvdcss headers" >&2;} + { (exit 1); exit 1; }; } fi + 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 "$as_me:$LINENO: checking for libdvdcss.a in ${with_dvdcss_tree}" >&5 +echo $ECHO_N "checking for libdvdcss.a in ${with_dvdcss_tree}... $ECHO_C" >&6 real_dvdcss_tree="`cd ${with_dvdcss_tree} 2>/dev/null && pwd`" if test "x$real_dvdcss_tree" = x then - echo "$ac_t""no" 1>&6 - { echo "configure: error: cannot cd to ${with_dvdcss_tree}" 1>&2; exit 1; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 + { { echo "$as_me:$LINENO: error: cannot cd to ${with_dvdcss_tree}" >&5 +echo "$as_me: error: cannot cd to ${with_dvdcss_tree}" >&2;} + { (exit 1); exit 1; }; } fi if test -f "${real_dvdcss_tree}/src/.libs/libdvdcss.a" then - echo "$ac_t""${real_dvdcss_tree}/src/.libs/libdvdcss.a" 1>&6 + echo "$as_me:$LINENO: result: ${real_dvdcss_tree}/src/.libs/libdvdcss.a" >&5 +echo "${ECHO_T}${real_dvdcss_tree}/src/.libs/libdvdcss.a" >&6 BUILTINS="${BUILTINS} dvd" dvd_LDFLAGS="${dvd_LDFLAGS} ${real_dvdcss_tree}/src/.libs/libdvdcss.a" dvd_CFLAGS="${dvd_CFLAGS} -I${real_dvdcss_tree}/src" else - echo "$ac_t""no" 1>&6 - { echo "configure: error: cannot find ${real_dvdcss_tree}/src/.libs/libdvdcss.a, make sure you compiled libdvdcss in ${with_dvdcss_tree}" 1>&2; exit 1; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 + { { echo "$as_me:$LINENO: error: cannot find ${real_dvdcss_tree}/src/.libs/libdvdcss.a, make sure you compiled libdvdcss in ${with_dvdcss_tree}" >&5 +echo "$as_me: error: cannot find ${real_dvdcss_tree}/src/.libs/libdvdcss.a, make sure you compiled libdvdcss in ${with_dvdcss_tree}" >&2;} + { (exit 1); exit 1; }; } fi fi ;; @@ -5941,17 +10259,21 @@ echo "configure:5920: checking for libdvdcss.a in ${with_dvdcss_tree}" >&5 dvd_LDFLAGS="${dvd_LDFLAGS} -ldl" ;; *) - 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 "$as_me:$LINENO: checking for dvdcss headers in ${with_dvdcss}" >&5 +echo $ECHO_N "checking for dvdcss headers in ${with_dvdcss}... $ECHO_C" >&6 if test -f ${with_dvdcss}/include/dvdcss/dvdcss.h then - echo "$ac_t""yes" 1>&6 + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 PLUGINS="${PLUGINS} dvd" dvd_LDFLAGS="${dvd_LDFLAGS} -L${with_dvdcss}/lib -ldvdcss" dvd_CFLAGS="${dvd_CFLAGS} -I${with_dvdcss}/include" else - echo "$ac_t""no" 1>&6 - { echo "configure: error: cannot find ${with_dvdcss}/include/dvdcss/dvdcss.h" 1>&2; exit 1; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 + { { echo "$as_me:$LINENO: error: cannot find ${with_dvdcss}/include/dvdcss/dvdcss.h" >&5 +echo "$as_me: error: cannot find ${with_dvdcss}/include/dvdcss/dvdcss.h" >&2;} + { (exit 1); exit 1; }; } fi ;; esac @@ -5960,17 +10282,16 @@ fi # Check whether --enable-dvdread or --disable-dvdread was given. if test "${enable_dvdread+set}" = set; then enableval="$enable_dvdread" - : -fi +fi; if test "x$enable_dvdread" != "xno" then - # Check whether --with-dvdread or --without-dvdread was given. + +# Check whether --with-dvdread or --without-dvdread was given. if test "${with_dvdread+set}" = set; then withval="$with_dvdread" - : -fi +fi; if test "x$with_dvdread" = x then test_LDFLAGS="" @@ -5980,82 +10301,183 @@ fi test_CFLAGS="-I${with_dvdread}/include" fi CPPFLAGS="$save_CPPFLAGS $test_CFLAGS" - for ac_hdr in dvdread/dvd_reader.h + +for ac_header in dvdread/dvd_reader.h do -ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` -echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:5988: 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 <&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 +if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +fi +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +else + # Is the header compilable? +echo "$as_me:$LINENO: checking $ac_header usability" >&5 +echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" #include "confdefs.h" -#include <$ac_hdr> -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; } -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 +$ac_includes_default +#include <$ac_header> +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_header_compiler=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_header_compiler=no +fi +rm -f conftest.$ac_objext conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6 + +# Is the header present? +echo "$as_me:$LINENO: checking $ac_header presence" >&5 +echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" +#include "confdefs.h" +#include <$ac_header> +_ACEOF +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + egrep -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then + ac_header_preproc=yes +else + echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_header_$ac_safe=no" + ac_header_preproc=no +fi +rm -f conftest.err conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6 + +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc in + yes:no ) + { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};; + no:yes ) + { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 +echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};; +esac +echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 +if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + eval "$as_ac_Header=$ac_header_preproc" fi -rm -f conftest* +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 + fi -if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then - echo "$ac_t""yes" 1>&6 - ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` - cat >> confdefs.h < conftest.$ac_ext <>confdefs.h <<_ACEOF +#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF + + cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" #include "confdefs.h" #include -int main() { +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } +#endif +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 - rm -rf conftest* - + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + PLUGINS="${PLUGINS} dvdread" dvdread_LDFLAGS="${dvdread_LDFLAGS} ${test_LDFLAGS} -ldvdread" dvdread_CFLAGS="${dvdread_CFLAGS} ${test_CFLAGS}" - + else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 + if test "x$enable_dvdread" != x then - { echo "configure: error: Cannot find DVD_VIDEO_LB_LEN in dvdread/dvd_reader.h, please install libdvdread version 0.9.2 or later" 1>&2; exit 1; } + { { echo "$as_me:$LINENO: error: Cannot find DVD_VIDEO_LB_LEN in dvdread/dvd_reader.h, please install libdvdread version 0.9.2 or later" >&5 +echo "$as_me: error: Cannot find DVD_VIDEO_LB_LEN in dvdread/dvd_reader.h, please install libdvdread version 0.9.2 or later" >&2;} + { (exit 1); exit 1; }; } fi - + fi -rm -f conftest* - +rm -f conftest.$ac_objext conftest.$ac_ext + else - echo "$ac_t""no" 1>&6 -if test "x$enable_dvdread" != x + + if test "x$enable_dvdread" != x then if test "x$with_dvdread" != x then - { echo "configure: error: Cannot find dvdread/dvd_reader.h in ${with_dvdread}/include" 1>&2; exit 1; } + { { echo "$as_me:$LINENO: error: Cannot find dvdread/dvd_reader.h in ${with_dvdread}/include" >&5 +echo "$as_me: error: Cannot find dvdread/dvd_reader.h in ${with_dvdread}/include" >&2;} + { (exit 1); exit 1; }; } else - { echo "configure: error: Cannot find dvdread/dvd_reader.h" 1>&2; exit 1; } + { { echo "$as_me:$LINENO: error: Cannot find dvdread/dvd_reader.h" >&5 +echo "$as_me: error: Cannot find dvdread/dvd_reader.h" >&2;} + { (exit 1); exit 1; }; } fi fi - + fi + done CPPFLAGS="$save_CPPFLAGS" @@ -6064,115 +10486,285 @@ fi # Check whether --enable-dvbpsi or --disable-dvbpsi was given. if test "${enable_dvbpsi+set}" = set; then enableval="$enable_dvbpsi" - : -fi +fi; if test "x$enable_dvbpsi" != "xno" then - # Check whether --with-dvbpsi or --without-dvbpsi was given. + +# Check whether --with-dvbpsi or --without-dvbpsi was given. if test "${with_dvbpsi+set}" = set; then withval="$with_dvbpsi" - : + +fi; + +# 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_header in dvbpsi/dr.h +do +as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 +if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" +#include "confdefs.h" + { { echo "$as_me:$LINENO: error: cannot find libdvbpsi headers" >&5 +echo "$as_me: error: cannot find libdvbpsi headers" >&2;} + { (exit 1); exit 1; }; } + +#include <$ac_header> +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + eval "$as_ac_Header=yes" +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +eval "$as_ac_Header=no" +fi +rm -f conftest.$ac_objext conftest.$ac_ext +fi +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +if test `eval echo '${'$as_ac_Header'}'` = yes; then + cat >>confdefs.h <<_ACEOF +#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF + PLUGINS="${PLUGINS} mpeg_ts_dvbpsi" + mpeg_ts_dvbpsi_LDFLAGS="${mpeg_ts_dvbpsi_LDFLAGS} -ldvbpsi" fi - if test "x$with_dvbpsi" = x - then - test_LDFLAGS="" - test_CFLAGS="" +done + + else + echo "$as_me:$LINENO: checking for libdvbpsi.a in ${with_dvbpsi_tree}" >&5 +echo $ECHO_N "checking for libdvbpsi.a in ${with_dvbpsi_tree}... $ECHO_C" >&6 + real_dvbpsi_tree="`cd ${with_dvbpsi_tree} 2>/dev/null && pwd`" + if test "x$real_dvbpsi_tree" = x + then + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 + { { echo "$as_me:$LINENO: error: cannot cd to ${with_dvbpsi_tree}" >&5 +echo "$as_me: error: cannot cd to ${with_dvbpsi_tree}" >&2;} + { (exit 1); exit 1; }; } + fi + if test -f "${real_dvbpsi_tree}/src/.libs/libdvbpsi.a" + then + echo "$as_me:$LINENO: result: ${real_dvbpsi_tree}/src/.libs/libdvbpsi.a" >&5 +echo "${ECHO_T}${real_dvbpsi_tree}/src/.libs/libdvbpsi.a" >&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 "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 + { { echo "$as_me:$LINENO: error: cannot find ${real_dvbpsi_tree}/src/.libs/libdvbpsi.a, make sure you compiled libdvbpsi in ${with_dvbpsi_tree}" >&5 +echo "$as_me: error: cannot find ${real_dvbpsi_tree}/src/.libs/libdvbpsi.a, make sure you compiled libdvbpsi in ${with_dvbpsi_tree}" >&2;} + { (exit 1); exit 1; }; } + fi + fi + ;; + xno) + ;; + *) + echo "$as_me:$LINENO: checking for dvbpsi headers in ${with_dvbpsi}" >&5 +echo $ECHO_N "checking for dvbpsi headers in ${with_dvbpsi}... $ECHO_C" >&6 + 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" + if test "${ac_cv_header_dvbpsi_dr_h+set}" = set; then + echo "$as_me:$LINENO: checking for dvbpsi/dr.h" >&5 +echo $ECHO_N "checking for dvbpsi/dr.h... $ECHO_C" >&6 +if test "${ac_cv_header_dvbpsi_dr_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +fi +echo "$as_me:$LINENO: result: $ac_cv_header_dvbpsi_dr_h" >&5 +echo "${ECHO_T}$ac_cv_header_dvbpsi_dr_h" >&6 +else + # Is the header compilable? +echo "$as_me:$LINENO: checking dvbpsi/dr.h usability" >&5 +echo $ECHO_N "checking dvbpsi/dr.h usability... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" +#include "confdefs.h" +$ac_includes_default +#include +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_header_compiler=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_header_compiler=no +fi +rm -f conftest.$ac_objext conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6 + +# Is the header present? +echo "$as_me:$LINENO: checking dvbpsi/dr.h presence" >&5 +echo $ECHO_N "checking dvbpsi/dr.h presence... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" +#include "confdefs.h" +#include +_ACEOF +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + egrep -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag else - test_LDFLAGS="-L${with_dvbpsi}/lib" - test_CFLAGS="-I${with_dvbpsi}/include" + ac_cpp_err= 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 -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:6100: \"$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 + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then + ac_header_preproc=yes +else + echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_header_$ac_safe=no" + ac_header_preproc=no +fi +rm -f conftest.err conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6 + +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc in + yes:no ) + { echo "$as_me:$LINENO: WARNING: dvbpsi/dr.h: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: dvbpsi/dr.h: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: dvbpsi/dr.h: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: dvbpsi/dr.h: proceeding with the preprocessor's result" >&2;};; + no:yes ) + { echo "$as_me:$LINENO: WARNING: dvbpsi/dr.h: present but cannot be compiled" >&5 +echo "$as_me: WARNING: dvbpsi/dr.h: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: dvbpsi/dr.h: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: dvbpsi/dr.h: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: dvbpsi/dr.h: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: dvbpsi/dr.h: proceeding with the preprocessor's result" >&2;};; +esac +echo "$as_me:$LINENO: checking for dvbpsi/dr.h" >&5 +echo $ECHO_N "checking for dvbpsi/dr.h... $ECHO_C" >&6 +if test "${ac_cv_header_dvbpsi_dr_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_cv_header_dvbpsi_dr_h=$ac_header_preproc fi -rm -f conftest* +echo "$as_me:$LINENO: result: $ac_cv_header_dvbpsi_dr_h" >&5 +echo "${ECHO_T}$ac_cv_header_dvbpsi_dr_h" >&6 + 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}" - +if test $ac_cv_header_dvbpsi_dr_h = yes; then + + 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 - + if test "x$enable_dvbpsi" != x + then + { { echo "$as_me:$LINENO: 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" >&5 +echo "$as_me: 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" >&2;} + { (exit 1); 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" - : -fi +fi; if test x$enable_vcd != xno then - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" #include "confdefs.h" #include -EOF + +_ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | egrep "cdrom_msf0" >/dev/null 2>&1; then - rm -rf conftest* - + PLUGINS="${PLUGINS} vcd" - + fi rm -f conftest* - - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" #include "confdefs.h" #include -EOF + +_ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | egrep "ioc_toc_header " >/dev/null 2>&1; then - rm -rf conftest* - + PLUGINS="${PLUGINS} vcd" - cat >> confdefs.h <<\EOF + +cat >>confdefs.h <<\_ACEOF #define HAVE_IOC_TOC_HEADER_IN_SYS_CDIO_H 1 -EOF +_ACEOF + - fi rm -f conftest* - + if test "x${SYS}" = "xbsdi" then PLUGINS="${PLUGINS} vcd" @@ -6180,8 +10772,8 @@ rm -f conftest* if test "x${SYS}" = "xdarwin" then - # No need to add vcd to PLUGINS, Darwin is already based on FreeBSD - vcd_LDFLAGS="${vcd_LDFLAGS} -framework IOKit -framework CoreFoundation" + PLUGINS="${PLUGINS} vcd" + vcd_LDFLAGS="${vcd_LDFLAGS} -framework IOKit -framework CoreFoundation" fi fi @@ -6192,77 +10784,97 @@ if test "${enable_satellite+set}" = set; then then PLUGINS="${PLUGINS} satellite" fi -fi - +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 -if eval "test \"`echo '$''{'ac_cv_func_inet_pton'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + echo "$as_me:$LINENO: checking for inet_pton" >&5 +echo $ECHO_N "checking for inet_pton... $ECHO_C" >&6 +if test "${ac_cv_func_inet_pton+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char inet_pton(); below. */ + which can conflict with char inet_pton (); below. */ #include /* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif /* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char inet_pton(); - -int main() { + builtin and then its argument prototype would still apply. */ +char inet_pton (); +char (*f) (); +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } +#endif +int +main () +{ /* The GNU C library defines this for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ #if defined (__stub_inet_pton) || defined (__stub___inet_pton) choke me #else -inet_pton(); +f = inet_pton; #endif -; return 0; } -EOF -if { (eval echo configure:6230: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_inet_pton=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_func_inet_pton=no" -fi -rm -f conftest* -fi - -if eval "test \"`echo '$ac_cv_func_'inet_pton`\" = yes"; then - echo "$ac_t""yes" 1>&6 + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_func_inet_pton=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_func_inet_pton=no +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +fi +echo "$as_me:$LINENO: result: $ac_cv_func_inet_pton" >&5 +echo "${ECHO_T}$ac_cv_func_inet_pton" >&6 +if test $ac_cv_func_inet_pton = yes; then PLUGINS="${PLUGINS} ipv6" -else - echo "$ac_t""no" 1>&6 fi 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 - cat > conftest.$ac_ext <&5 +echo $ECHO_N "checking for getaddrinfo in ws2tcpip.h... $ECHO_C" >&6 + cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" #include "confdefs.h" #include -EOF + +_ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | egrep "addrinfo" >/dev/null 2>&1; then - rm -rf conftest* - echo "$ac_t""yes" 1>&6 + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 PLUGINS="${PLUGINS} ipv6" else - rm -rf conftest* - echo "$ac_t""no" 1>&6 + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi rm -f conftest* @@ -6271,202 +10883,328 @@ fi # Check whether --enable-avi or --disable-avi was given. if test "${enable_avi+set}" = set; then enableval="$enable_avi" - : -fi +fi; if test x$enable_avi != xno then PLUGINS="${PLUGINS} avi" fi + # Check whether --with- or --without- was given. if test "${with_+set}" = set; then withval="$with_" - : -fi +fi; # Check whether --enable-mad or --disable-mad was given. if test "${enable_mad+set}" = set; then enableval="$enable_mad" - : -fi +fi; if test x$enable_mad = xyes then - # Check whether --with-mad or --without-mad was given. + +# Check whether --with-mad or --without-mad was given. if test "${with_mad+set}" = set; then withval="$with_mad" - : -fi +fi; if test "x$with_mad" != "xno" -a "x$with_mad" != "x" then mad_CFLAGS="${mad_CFLAGS} -I$with_mad/include" mad_LDFLAGS="${mad_LDFLAGS} -L$with_mad/lib" fi - # Check whether --with-mad-tree or --without-mad-tree was given. + +# Check whether --with-mad-tree or --without-mad-tree was given. if test "${with_mad_tree+set}" = set; then withval="$with_mad_tree" - : -fi +fi; if test "x$with_mad_tree" != "xno" -a "x$with_mad_tree" != "x" then real_mad_tree="`cd ${with_mad_tree} 2>/dev/null && pwd`" if test "x$real_mad_tree" = x then - echo "$ac_t""no" 1>&6 - { echo "configure: error: ${with_mad_tree} directory doesn't exist" 1>&2; exit 1; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 + { { echo "$as_me:$LINENO: error: ${with_mad_tree} directory doesn't exist" >&5 +echo "$as_me: error: ${with_mad_tree} directory doesn't exist" >&2;} + { (exit 1); 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 "$as_me:$LINENO: checking for mad.h in ${real_mad_tree}/libmad" >&5 +echo $ECHO_N "checking for mad.h in ${real_mad_tree}/libmad... $ECHO_C" >&6 if test -f ${real_mad_tree}/libmad/mad.h then - echo "$ac_t""yes" 1>&6 + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 mad_CFLAGS="${mad_CFLAGS} -I${real_mad_tree}/libmad" mad_LDFLAGS="${mad_LDFLAGS} -L${real_mad_tree}/libmad/.libs" 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 -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 + echo "$as_me:$LINENO: checking for mad_bit_init in -lmad" >&5 +echo $ECHO_N "checking for mad_bit_init in -lmad... $ECHO_C" >&6 +if test "${ac_cv_lib_mad_mad_bit_init+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-lmad $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" #include "confdefs.h" + /* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif /* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char mad_bit_init(); - -int main() { -mad_bit_init() -; return 0; } -EOF -if { (eval echo configure:6354: \"$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 - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -f conftest* -LIBS="$ac_save_LIBS" + builtin and then its argument prototype would still apply. */ +char mad_bit_init (); +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } +#endif +int +main () +{ +mad_bit_init (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_mad_mad_bit_init=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_lib_mad_mad_bit_init=no +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:$LINENO: result: $ac_cv_lib_mad_mad_bit_init" >&5 +echo "${ECHO_T}$ac_cv_lib_mad_mad_bit_init" >&6 +if test $ac_cv_lib_mad_mad_bit_init = yes; then -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - BUILTINS="${BUILTINS} mad" mad_LDFLAGS="${mad_LDFLAGS} -lmad" - + else - echo "$ac_t""no" 1>&6 - { echo "configure: error: the specified tree hasn't been compiled " 1>&2; exit 1; } - + { { echo "$as_me:$LINENO: error: the specified tree hasn't been compiled " >&5 +echo "$as_me: error: the specified tree hasn't been compiled " >&2;} + { (exit 1); exit 1; }; } + fi LDFLAGS=$save_LDFLAGS else - echo "$ac_t""no" 1>&6 - { echo "configure: error: the specified tree doesn't have mad.h" 1>&2; exit 1; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 + { { echo "$as_me:$LINENO: error: the specified tree doesn't have mad.h" >&5 +echo "$as_me: error: the specified tree doesn't have mad.h" >&2;} + { (exit 1); exit 1; }; } fi else save_CFLAGS=$CFLAGS save_LDFLAGS=$LDFLAGS CFLAGS="$CFLAGS $mad_CFLAGS" LDFLAGS="$LDFLAGS $mad_LDFLAGS" - for ac_hdr in mad.h + +for ac_header in mad.h do -ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` -echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:6393: 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 <&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 +if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +fi +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +else + # Is the header compilable? +echo "$as_me:$LINENO: checking $ac_header usability" >&5 +echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" #include "confdefs.h" -#include <$ac_hdr> -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; } -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 +$ac_includes_default +#include <$ac_header> +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_header_compiler=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_header_compiler=no +fi +rm -f conftest.$ac_objext conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6 + +# Is the header present? +echo "$as_me:$LINENO: checking $ac_header presence" >&5 +echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" +#include "confdefs.h" +#include <$ac_header> +_ACEOF +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + egrep -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then + ac_header_preproc=yes +else + echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_header_$ac_safe=no" + ac_header_preproc=no +fi +rm -f conftest.err conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6 + +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc in + yes:no ) + { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};; + no:yes ) + { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 +echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};; +esac +echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 +if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + eval "$as_ac_Header=$ac_header_preproc" fi -rm -f conftest* +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 + fi -if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then - echo "$ac_t""yes" 1>&6 - ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` - cat >> confdefs.h <>confdefs.h <<_ACEOF +#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF + else - echo "$ac_t""no" 1>&6 -{ echo "configure: error: Cannot find development headers for libmad..." 1>&2; exit 1; } + { { echo "$as_me:$LINENO: error: Cannot find development headers for libmad..." >&5 +echo "$as_me: error: Cannot find development headers for libmad..." >&2;} + { (exit 1); exit 1; }; } 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 -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 + echo "$as_me:$LINENO: checking for mad_bit_init in -lmad" >&5 +echo $ECHO_N "checking for mad_bit_init in -lmad... $ECHO_C" >&6 +if test "${ac_cv_lib_mad_mad_bit_init+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-lmad $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" #include "confdefs.h" + /* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif /* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char mad_bit_init(); - -int main() { -mad_bit_init() -; return 0; } -EOF -if { (eval echo configure:6450: \"$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 - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -f conftest* -LIBS="$ac_save_LIBS" + builtin and then its argument prototype would still apply. */ +char mad_bit_init (); +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } +#endif +int +main () +{ +mad_bit_init (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_mad_mad_bit_init=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_lib_mad_mad_bit_init=no +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:$LINENO: result: $ac_cv_lib_mad_mad_bit_init" >&5 +echo "${ECHO_T}$ac_cv_lib_mad_mad_bit_init" >&6 +if test $ac_cv_lib_mad_mad_bit_init = yes; then -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - PLUGINS="${PLUGINS} mad" - mad_LDFLAGS="${mad_LDFLAGS} -lmad" + mad_LDFLAGS="${mad_LDFLAGS} -lmad" else - echo "$ac_t""no" 1>&6 - { echo "configure: error: Cannot find libmad library..." 1>&2; exit 1; } + { { echo "$as_me:$LINENO: error: Cannot find libmad library..." >&5 +echo "$as_me: error: Cannot find libmad library..." >&2;} + { (exit 1); exit 1; }; } fi CFLAGS=$save_CFLAGS @@ -6477,95 +11215,135 @@ fi # Check whether --enable-ffmpeg or --disable-ffmpeg was given. if test "${enable_ffmpeg+set}" = set; then enableval="$enable_ffmpeg" - : -fi +fi; if test "x$enable_ffmpeg" = "xyes" then - # Check whether --with-ffmpeg or --without-ffmpeg was given. + +# Check whether --with-ffmpeg or --without-ffmpeg was given. if test "${with_ffmpeg+set}" = set; then withval="$with_ffmpeg" - : -fi +fi; if test "x$with_ffmpeg" != "xno" -a "x$with_ffmpeg" != "x" then ffmpeg_CFLAGS="${ffmpeg_CFLAGS} -I$with_ffmpeg/include/libffmpeg" ffmpeg_LDFLAGS="${ffmpeg_LDFLAGS} -L$with_ffmpeg/lib" fi - # Check whether --with-ffmpeg-tree or --without-ffmpeg-tree was given. + +# Check whether --with-ffmpeg-tree or --without-ffmpeg-tree was given. if test "${with_ffmpeg_tree+set}" = set; then withval="$with_ffmpeg_tree" - : -fi +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 "$as_me:$LINENO: checking for libavcodec.a in ${with_ffmpeg_tree}" >&5 +echo $ECHO_N "checking for libavcodec.a in ${with_ffmpeg_tree}... $ECHO_C" >&6 real_ffmpeg_tree="`cd ${with_ffmpeg_tree} 2>/dev/null && pwd`" if test "x$real_ffmpeg_tree" = x then - echo "$ac_t""no" 1>&6 - { echo "configure: error: cannot cd to ${with_ffmpeg_tree}" 1>&2; exit 1; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 + { { echo "$as_me:$LINENO: error: cannot cd to ${with_ffmpeg_tree}" >&5 +echo "$as_me: error: cannot cd to ${with_ffmpeg_tree}" >&2;} + { (exit 1); exit 1; }; } fi if test -f "${real_ffmpeg_tree}/libavcodec/libavcodec.a" then - echo "$ac_t""${real_ffmpeg_tree}/libavcodec/libavcodec.a" 1>&6 + echo "$as_me:$LINENO: result: ${real_ffmpeg_tree}/libavcodec/libavcodec.a" >&5 +echo "${ECHO_T}${real_ffmpeg_tree}/libavcodec/libavcodec.a" >&6 BUILTINS="${BUILTINS} ffmpeg" - ffmpeg_LDFLAGS="${ffmpeg_LDFLAGS} ${real_ffmpeg_tree}/libavcodec/libavcodec.a -lm" + ffmpeg_LDFLAGS="${ffmpeg_LDFLAGS} ${real_ffmpeg_tree}/libavcodec/libavcodec.a" + if test x$SYS != xbeos + then + ffmpeg_LDFLAGS="${ffmpeg_LDFLAGS} -lm" + fi ffmpeg_CFLAGS="${ffmpeg_CFLAGS} -I${real_ffmpeg_tree}/libavcodec" else - echo "$ac_t""no" 1>&6 - { echo "configure: error: cannot find ${real_ffmpeg_tree}/libavcodec/libavcodec.a, make sure you compiled libavcodec in ${with_ffmpeg_tree}" 1>&2; exit 1; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 + { { echo "$as_me:$LINENO: error: cannot find ${real_ffmpeg_tree}/libavcodec/libavcodec.a, make sure you compiled libavcodec in ${with_ffmpeg_tree}" >&5 +echo "$as_me: error: cannot find ${real_ffmpeg_tree}/libavcodec/libavcodec.a, make sure you compiled libavcodec in ${with_ffmpeg_tree}" >&2;} + { (exit 1); exit 1; }; } fi else save_CFLAGS=$CFLAGS save_LDFLAGS=$LDFLAGS 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 -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 -else - ac_save_LIBS="$LIBS" + LDFLAGS="$LDFLAGS $ffmpeg_LDFLAGS" + if test x$SYS != xbeos + then + ffmpeg_LDFLAGS="${ffmpeg_LDFLAGS} -lm" + fi + echo "$as_me:$LINENO: checking for avcodec_init in -lavcodec" >&5 +echo $ECHO_N "checking for avcodec_init in -lavcodec... $ECHO_C" >&6 +if test "${ac_cv_lib_avcodec_avcodec_init+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_lib_save_LIBS=$LIBS LIBS="-lavcodec $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" #include "confdefs.h" + /* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif /* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char avcodec_init(); - -int main() { -avcodec_init() -; return 0; } -EOF -if { (eval echo configure:6549: \"$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 - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -f conftest* -LIBS="$ac_save_LIBS" + builtin and then its argument prototype would still apply. */ +char avcodec_init (); +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } +#endif +int +main () +{ +avcodec_init (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_avcodec_avcodec_init=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_lib_avcodec_avcodec_init=no +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:$LINENO: result: $ac_cv_lib_avcodec_avcodec_init" >&5 +echo "${ECHO_T}$ac_cv_lib_avcodec_avcodec_init" >&6 +if test $ac_cv_lib_avcodec_avcodec_init = yes; then -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - BUILTINS="${BUILTINS} ffmpeg" - ffmpeg_LDFLAGS="${ffmpeg_LDFLAGS} -lavcodec -lm" + ffmpeg_LDFLAGS="${ffmpeg_LDFLAGS} -lavcodec" + if test x$SYS != xbeos + then + ffmpeg_LDFLAGS="${ffmpeg_LDFLAGS} -lm" + fi else - echo "$ac_t""no" 1>&6 - { echo "configure: error: Cannot find libavcodec library..." 1>&2; exit 1; } + { { echo "$as_me:$LINENO: error: Cannot find libavcodec library..." >&5 +echo "$as_me: error: Cannot find libavcodec library..." >&2;} + { (exit 1); exit 1; }; } fi CFLAGS=$save_CFLAGS @@ -6582,174 +11360,297 @@ fi # Check whether --enable-a52 or --disable-a52 was given. if test "${enable_a52+set}" = set; then enableval="$enable_a52" - : -fi +fi; if test "x$enable_a52" != "xno" then - # Check whether --with-a52-tree or --without-a52-tree was given. + +# Check whether --with-a52-tree or --without-a52-tree was given. if test "${with_a52_tree+set}" = set; then withval="$with_a52_tree" - : -fi +fi; if test "x$with_a52_tree" != "xno" -a "x$with_a52_tree" != "x" then real_a52_tree="`cd ${with_a52_tree} 2>/dev/null && pwd`" if test "x$real_a52_tree" = x then - echo "$ac_t""no" 1>&6 - { echo "configure: error: ${with_a52_tree} directory doesn't exist" 1>&2; exit 1; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 + { { echo "$as_me:$LINENO: error: ${with_a52_tree} directory doesn't exist" >&5 +echo "$as_me: error: ${with_a52_tree} directory doesn't exist" >&2;} + { (exit 1); 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 "$as_me:$LINENO: checking for a52.h in ${real_a52_tree}/include" >&5 +echo $ECHO_N "checking for a52.h in ${real_a52_tree}/include... $ECHO_C" >&6 if test -f ${real_a52_tree}/include/a52.h then - echo "$ac_t""yes" 1>&6 + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 a52_CFLAGS="${a52_CFLAGS} -I${real_a52_tree}" a52_LDFLAGS="${a52_LDFLAGS} -L${real_a52_tree}/liba52/.libs" 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 -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 + echo "$as_me:$LINENO: checking for a52_free in -la52" >&5 +echo $ECHO_N "checking for a52_free in -la52... $ECHO_C" >&6 +if test "${ac_cv_lib_a52_a52_free+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-la52 -lm $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" #include "confdefs.h" + /* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif /* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char a52_free(); - -int main() { -a52_free() -; return 0; } -EOF -if { (eval echo configure:6634: \"$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 - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -f conftest* -LIBS="$ac_save_LIBS" + builtin and then its argument prototype would still apply. */ +char a52_free (); +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } +#endif +int +main () +{ +a52_free (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_a52_a52_free=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_lib_a52_a52_free=no +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:$LINENO: result: $ac_cv_lib_a52_a52_free" >&5 +echo "${ECHO_T}$ac_cv_lib_a52_a52_free" >&6 +if test $ac_cv_lib_a52_a52_free = yes; then -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - BUILTINS="${BUILTINS} a52" a52_LDFLAGS="${a52_LDFLAGS} -la52 -lm" a52_CFLAGS="${a52_CFLAGS} -DUSE_A52DEC_TREE" - + else - echo "$ac_t""no" 1>&6 if test -f ${real_a52_tree}/liba52/.libs/liba52.a then - { echo "configure: error: make sure you have at least a52dec-0.7.3" 1>&2; exit 1; } + { { echo "$as_me:$LINENO: error: make sure you have at least a52dec-0.7.3" >&5 +echo "$as_me: error: make sure you have at least a52dec-0.7.3" >&2;} + { (exit 1); exit 1; }; } else - { echo "configure: error: the specified tree hasn't been compiled" 1>&2; exit 1; } + { { echo "$as_me:$LINENO: error: the specified tree hasn't been compiled" >&5 +echo "$as_me: error: the specified tree hasn't been compiled" >&2;} + { (exit 1); exit 1; }; } fi - + fi LDFLAGS=$save_LDFLAGS else - echo "$ac_t""no" 1>&6 - { echo "configure: error: the specified tree doesn't have a52.h" 1>&2; exit 1; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 + { { echo "$as_me:$LINENO: error: the specified tree doesn't have a52.h" >&5 +echo "$as_me: error: the specified tree doesn't have a52.h" >&2;} + { (exit 1); exit 1; }; } fi - else for ac_hdr in a52dec/a52.h + else +for ac_header in a52dec/a52.h do -ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` -echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:6675: 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 <&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 +if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +fi +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +else + # Is the header compilable? +echo "$as_me:$LINENO: checking $ac_header usability" >&5 +echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" #include "confdefs.h" -#include <$ac_hdr> -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; } -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 +$ac_includes_default +#include <$ac_header> +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_header_compiler=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_header_compiler=no +fi +rm -f conftest.$ac_objext conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6 + +# Is the header present? +echo "$as_me:$LINENO: checking $ac_header presence" >&5 +echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" +#include "confdefs.h" +#include <$ac_header> +_ACEOF +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + egrep -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then + ac_header_preproc=yes +else + echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_header_$ac_safe=no" + ac_header_preproc=no +fi +rm -f conftest.err conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6 + +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc in + yes:no ) + { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};; + no:yes ) + { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 +echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};; +esac +echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 +if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + eval "$as_ac_Header=$ac_header_preproc" fi -rm -f conftest* +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 + fi -if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then - echo "$ac_t""yes" 1>&6 - ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` - cat >> confdefs.h <&6 -echo "configure:6707: 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 -else - ac_save_LIBS="$LIBS" +if test `eval echo '${'$as_ac_Header'}'` = yes; then + cat >>confdefs.h <<_ACEOF +#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF + + echo "$as_me:$LINENO: checking for a52_free in -la52" >&5 +echo $ECHO_N "checking for a52_free in -la52... $ECHO_C" >&6 +if test "${ac_cv_lib_a52_a52_free+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_lib_save_LIBS=$LIBS LIBS="-la52 -lm $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" #include "confdefs.h" + /* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif /* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char a52_free(); - -int main() { -a52_free() -; return 0; } -EOF -if { (eval echo configure:6726: \"$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 - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -f conftest* -LIBS="$ac_save_LIBS" + builtin and then its argument prototype would still apply. */ +char a52_free (); +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } +#endif +int +main () +{ +a52_free (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_a52_a52_free=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_lib_a52_a52_free=no +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:$LINENO: result: $ac_cv_lib_a52_a52_free" >&5 +echo "${ECHO_T}$ac_cv_lib_a52_a52_free" >&6 +if test $ac_cv_lib_a52_a52_free = yes; then -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - BUILTINS="${BUILTINS} a52" a52_LDFLAGS="${a52_LDFLAGS} -la52 -lm" a52_CFLAGS="${a52_CFLAGS}" - -else - echo "$ac_t""no" 1>&6 + fi - -else - echo "$ac_t""no" 1>&6 + fi + done fi @@ -6758,70 +11659,142 @@ fi # Check whether --enable-vorbis or --disable-vorbis was given. if test "${enable_vorbis+set}" = set; then enableval="$enable_vorbis" - : -fi +fi; if test "x$enable_vorbis" != "xno" then - for ac_hdr in ogg/ogg.h + +for ac_header in ogg/ogg.h do -ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` -echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:6771: 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 <&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 +if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +fi +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +else + # Is the header compilable? +echo "$as_me:$LINENO: checking $ac_header usability" >&5 +echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" #include "confdefs.h" -#include <$ac_hdr> -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; } -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 +$ac_includes_default +#include <$ac_header> +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_header_compiler=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_header_compiler=no +fi +rm -f conftest.$ac_objext conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6 + +# Is the header present? +echo "$as_me:$LINENO: checking $ac_header presence" >&5 +echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" +#include "confdefs.h" +#include <$ac_header> +_ACEOF +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + egrep -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then + ac_header_preproc=yes +else + echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_header_$ac_safe=no" + ac_header_preproc=no +fi +rm -f conftest.err conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6 + +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc in + yes:no ) + { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};; + no:yes ) + { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 +echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};; +esac +echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 +if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + eval "$as_ac_Header=$ac_header_preproc" fi -rm -f conftest* +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 + fi -if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then - echo "$ac_t""yes" 1>&6 - ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` - cat >> confdefs.h <>confdefs.h <<_ACEOF +#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF + #PLUGINS="${PLUGINS} vorbis" vorbis_LDFLAGS="${vorbis_LDFLAGS} -lvorbis" - -else - echo "$ac_t""no" 1>&6 + fi + done fi + # Check whether --with- or --without- was given. if test "${with_+set}" = set; then withval="$with_" - : -fi +fi; # Check whether --enable-x11 or --disable-x11 was given. if test "${enable_x11+set}" = set; then enableval="$enable_x11" - : -fi +fi; if test x$enable_x11 != xno && (test x$SYS != xmingw32 || test x$enable_x11 = xyes); then if test x$x_includes = xNONE; then @@ -6831,48 +11804,122 @@ if test x$enable_x11 != xno && x_libraries=/usr/X11R6/lib fi CPPFLAGS="$save_CPPFLAGS -I$x_includes" - for ac_hdr in X11/Xlib.h + +for ac_header in X11/Xlib.h do -ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` -echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:6839: 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 <&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 +if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +fi +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +else + # Is the header compilable? +echo "$as_me:$LINENO: checking $ac_header usability" >&5 +echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" #include "confdefs.h" -#include <$ac_hdr> -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; } -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 +$ac_includes_default +#include <$ac_header> +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_header_compiler=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_header_compiler=no +fi +rm -f conftest.$ac_objext conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6 + +# Is the header present? +echo "$as_me:$LINENO: checking $ac_header presence" >&5 +echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" +#include "confdefs.h" +#include <$ac_header> +_ACEOF +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + egrep -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then + ac_header_preproc=yes +else + echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_header_$ac_safe=no" + ac_header_preproc=no +fi +rm -f conftest.err conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6 + +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc in + yes:no ) + { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};; + no:yes ) + { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 +echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};; +esac +echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 +if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + eval "$as_ac_Header=$ac_header_preproc" fi -rm -f conftest* +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 + fi -if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then - echo "$ac_t""yes" 1>&6 - ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` - cat >> confdefs.h <>confdefs.h <<_ACEOF +#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF + PLUGINS="${PLUGINS} x11" x11_LDFLAGS="${x11_LDFLAGS} -L$x_libraries -lX11 -lXext" x11_CFLAGS="${x11_CFLAGS} -I$x_includes" - -else - echo "$ac_t""no" 1>&6 + fi + done CPPFLAGS="$save_CPPFLAGS" @@ -6881,9 +11928,8 @@ fi # Check whether --enable-xvideo or --disable-xvideo was given. if test "${enable_xvideo+set}" = set; then enableval="$enable_xvideo" - : -fi +fi; if test x$enable_xvideo != xno && (test x$SYS != xmingw32 || test x$enable_xvideo = xyes); then if test x$x_includes = xNONE; then @@ -6894,96 +11940,190 @@ if test x$enable_xvideo != xno && fi save_CPPFLAGS=$CPPFLAGS CPPFLAGS="$save_CPPFLAGS -I$x_includes" - for ac_hdr in X11/extensions/Xv.h + +for ac_header in X11/extensions/Xv.h do -ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` -echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:6902: 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 <&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 +if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +fi +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +else + # Is the header compilable? +echo "$as_me:$LINENO: checking $ac_header usability" >&5 +echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" #include "confdefs.h" -#include <$ac_hdr> -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; } -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 +$ac_includes_default +#include <$ac_header> +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_header_compiler=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_header_compiler=no +fi +rm -f conftest.$ac_objext conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6 + +# Is the header present? +echo "$as_me:$LINENO: checking $ac_header presence" >&5 +echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" +#include "confdefs.h" +#include <$ac_header> +_ACEOF +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + egrep -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then + ac_header_preproc=yes +else + echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_header_$ac_safe=no" + ac_header_preproc=no +fi +rm -f conftest.err conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6 + +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc in + yes:no ) + { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};; + no:yes ) + { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 +echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};; +esac +echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 +if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + eval "$as_ac_Header=$ac_header_preproc" fi -rm -f conftest* +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 + fi -if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then - echo "$ac_t""yes" 1>&6 - ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` - cat >> confdefs.h <>confdefs.h <<_ACEOF +#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF + 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 -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 + echo "$as_me:$LINENO: checking for XvSetPortAttribute in -lXv_pic" >&5 +echo $ECHO_N "checking for XvSetPortAttribute in -lXv_pic... $ECHO_C" >&6 +if test "${ac_cv_lib_Xv_pic_XvSetPortAttribute+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-lXv_pic $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" #include "confdefs.h" + /* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif /* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char XvSetPortAttribute(); - -int main() { -XvSetPortAttribute() -; return 0; } -EOF -if { (eval echo configure:6955: \"$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 - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -f conftest* -LIBS="$ac_save_LIBS" - -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 + builtin and then its argument prototype would still apply. */ +char XvSetPortAttribute (); +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } +#endif +int +main () +{ +XvSetPortAttribute (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_Xv_pic_XvSetPortAttribute=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_lib_Xv_pic_XvSetPortAttribute=no +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:$LINENO: result: $ac_cv_lib_Xv_pic_XvSetPortAttribute" >&5 +echo "${ECHO_T}$ac_cv_lib_Xv_pic_XvSetPortAttribute" >&6 +if test $ac_cv_lib_Xv_pic_XvSetPortAttribute = yes; then # We have Xv_pic, that's good, we can build an xvideo.so plugin ! PLUGINS="${PLUGINS} xvideo" xvideo_LDFLAGS="${xvideo_LDFLAGS} -L$x_libraries -lX11 -lXext -lXv_pic" xvideo_CFLAGS="${xvideo_CFLAGS} -I$x_includes" else - echo "$ac_t""no" 1>&6 -# We don't have Xv_pic, let's make xvideo.a as builtin + # We don't have Xv_pic, let's make xvideo.a as builtin BUILTINS="${BUILTINS} xvideo" xvideo_LDFLAGS="${xvideo_LDFLAGS} -L$x_libraries -lX11 -lXext -lXv" xvideo_CFLAGS="${xvideo_CFLAGS} -I$x_includes" fi CFLAGS="$save_CFLAGS" - + CPPFLAGS="$save_CPPFLAGS" -else - echo "$ac_t""no" 1>&6 fi + done fi @@ -6991,55 +12131,58 @@ fi # Check whether --enable-sdl or --disable-sdl was given. if test "${enable_sdl+set}" = set; then enableval="$enable_sdl" - : -fi +fi; if test "x$enable_sdl" != "xno" then SDL_PATH=$PATH - # Check whether --with-sdl-config-path or --without-sdl-config-path was given. + +# Check whether --with-sdl-config-path or --without-sdl-config-path was given. if test "${with_sdl_config_path+set}" = set; then withval="$with_sdl_config_path" if test "x$with_sdl_config_path" != "xno" then SDL_PATH="$with_sdl_config_path:$PATH" - fi -fi - + fi +fi; # Extract the first word of "sdl12-config", so it can be a program name with args. set dummy sdl12-config; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:7013: 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 +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_path_SDL12_CONFIG+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - case "$SDL12_CONFIG" in - /*) + case $SDL12_CONFIG in + [\\/]* | ?:[\\/]*) ac_cv_path_SDL12_CONFIG="$SDL12_CONFIG" # Let the user override the test with a path. ;; - ?:/*) - ac_cv_path_SDL12_CONFIG="$SDL12_CONFIG" # Let the user override the test with a dos path. - ;; *) - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$SDL_PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_path_SDL12_CONFIG="$ac_dir/$ac_word" - break - fi - done - IFS="$ac_save_ifs" + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $SDL_PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_SDL12_CONFIG="$as_dir/$ac_word$ac_exec_ext" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done + test -z "$ac_cv_path_SDL12_CONFIG" && ac_cv_path_SDL12_CONFIG="no" ;; esac fi -SDL12_CONFIG="$ac_cv_path_SDL12_CONFIG" +SDL12_CONFIG=$ac_cv_path_SDL12_CONFIG + if test -n "$SDL12_CONFIG"; then - echo "$ac_t""$SDL12_CONFIG" 1>&6 + echo "$as_me:$LINENO: result: $SDL12_CONFIG" >&5 +echo "${ECHO_T}$SDL12_CONFIG" >&6 else - echo "$ac_t""no" 1>&6 + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi SDL_CONFIG=${SDL12_CONFIG} @@ -7048,38 +12191,42 @@ fi then # Extract the first word of "sdl11-config", so it can be a program name with args. set dummy sdl11-config; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:7053: 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 +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_path_SDL11_CONFIG+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - case "$SDL11_CONFIG" in - /*) + case $SDL11_CONFIG in + [\\/]* | ?:[\\/]*) ac_cv_path_SDL11_CONFIG="$SDL11_CONFIG" # Let the user override the test with a path. ;; - ?:/*) - ac_cv_path_SDL11_CONFIG="$SDL11_CONFIG" # Let the user override the test with a dos path. - ;; *) - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$SDL_PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_path_SDL11_CONFIG="$ac_dir/$ac_word" - break - fi - done - IFS="$ac_save_ifs" + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $SDL_PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_SDL11_CONFIG="$as_dir/$ac_word$ac_exec_ext" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done + test -z "$ac_cv_path_SDL11_CONFIG" && ac_cv_path_SDL11_CONFIG="no" ;; esac fi -SDL11_CONFIG="$ac_cv_path_SDL11_CONFIG" +SDL11_CONFIG=$ac_cv_path_SDL11_CONFIG + if test -n "$SDL11_CONFIG"; then - echo "$ac_t""$SDL11_CONFIG" 1>&6 + echo "$as_me:$LINENO: result: $SDL11_CONFIG" >&5 +echo "${ECHO_T}$SDL11_CONFIG" >&6 else - echo "$ac_t""no" 1>&6 + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi SDL_CONFIG=${SDL11_CONFIG} @@ -7089,181 +12236,511 @@ fi then # Extract the first word of "sdl-config", so it can be a program name with args. set dummy sdl-config; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:7094: 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 +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_path_SDL_CONFIG+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - case "$SDL_CONFIG" in - /*) + case $SDL_CONFIG in + [\\/]* | ?:[\\/]*) ac_cv_path_SDL_CONFIG="$SDL_CONFIG" # Let the user override the test with a path. ;; - ?:/*) - ac_cv_path_SDL_CONFIG="$SDL_CONFIG" # Let the user override the test with a dos path. - ;; *) - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$SDL_PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_path_SDL_CONFIG="$ac_dir/$ac_word" - break - fi - done - IFS="$ac_save_ifs" + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $SDL_PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_SDL_CONFIG="$as_dir/$ac_word$ac_exec_ext" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done + test -z "$ac_cv_path_SDL_CONFIG" && ac_cv_path_SDL_CONFIG="no" ;; esac fi -SDL_CONFIG="$ac_cv_path_SDL_CONFIG" +SDL_CONFIG=$ac_cv_path_SDL_CONFIG + if test -n "$SDL_CONFIG"; then - echo "$ac_t""$SDL_CONFIG" 1>&6 + echo "$as_me:$LINENO: result: $SDL_CONFIG" >&5 +echo "${ECHO_T}$SDL_CONFIG" >&6 else - echo "$ac_t""no" 1>&6 + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi SDL_HEADER="SDL/SDL.h" fi + # check for cross-compiling + SDL_PREFIX= + +# Check whether --with-sdl or --without-sdl was given. +if test "${with_sdl+set}" = set; then + withval="$with_sdl" + +fi; + if test "x$with_sdl_prefix" != "xno" -a "x$with_sdl_prefix" != "x" + then + SDL_PREFIX="--prefix=$with_sdl_prefix" + fi if test x${SDL_CONFIG} != xno then PLUGINS="${PLUGINS} sdl" - sdl_CFLAGS="${sdl_CFLAGS} `${SDL_CONFIG} --cflags`" - sdl_LDFLAGS="${sdl_LDFLAGS} `${SDL_CONFIG} --libs | sed 's,-rdynamic,,'`" + sdl_CFLAGS="${sdl_CFLAGS} `${SDL_CONFIG} ${SDL_PREFIX} --cflags`" + sdl_LDFLAGS="${sdl_LDFLAGS} `${SDL_CONFIG} ${SDL_PREFIX} --libs | sed 's,-rdynamic,,'`" CPPFLAGS="$save_CPPFLAGS $sdl_CFLAGS" - for ac_hdr in ${SDL_HEADER} + +for ac_header in ${SDL_HEADER} do -ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` -echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:7139: 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 <&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 +if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +fi +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +else + # Is the header compilable? +echo "$as_me:$LINENO: checking $ac_header usability" >&5 +echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" #include "confdefs.h" -#include <$ac_hdr> -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; } -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 +$ac_includes_default +#include <$ac_header> +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_header_compiler=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_header_compiler=no +fi +rm -f conftest.$ac_objext conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6 + +# Is the header present? +echo "$as_me:$LINENO: checking $ac_header presence" >&5 +echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" +#include "confdefs.h" +#include <$ac_header> +_ACEOF +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + egrep -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then + ac_header_preproc=yes +else + echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_header_$ac_safe=no" + ac_header_preproc=no +fi +rm -f conftest.err conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6 + +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc in + yes:no ) + { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};; + no:yes ) + { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 +echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};; +esac +echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 +if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + eval "$as_ac_Header=$ac_header_preproc" fi -rm -f conftest* +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 + fi -if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then - echo "$ac_t""yes" 1>&6 - ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` - cat >> confdefs.h <> confdefs.h <>confdefs.h <<_ACEOF +#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF + +cat >>confdefs.h <<_ACEOF #define SDL_INCLUDE_FILE <${SDL_HEADER}> -EOF +_ACEOF else - echo "$ac_t""no" 1>&6 -{ echo "configure: error: The development package for SDL is not installed. -Please install it and try again. Alternatively you can also configure with ---disable-sdl." 1>&2; exit 1; } - + { { echo "$as_me:$LINENO: error: The development package for SDL is not installed. +Please install it and try again. Alternatively you can also configure with +--disable-sdl." >&5 +echo "$as_me: error: The development package for SDL is not installed. +Please install it and try again. Alternatively you can also configure with +--disable-sdl." >&2;} + { (exit 1); exit 1; }; } + fi + done CPPFLAGS="$save_CPPFLAGS" if expr 1.1.5 \> `$SDL_CONFIG --version` >/dev/null then - { echo "configure: error: The development package for SDL is not installed. + { { echo "$as_me:$LINENO: error: The development package for SDL is not installed. +Please install it and try again. Alternatively you can also configure with +--disable-sdl." >&5 +echo "$as_me: error: The development package for SDL is not installed. Please install it and try again. Alternatively you can also configure with ---disable-sdl." 1>&2; exit 1; } +--disable-sdl." >&2;} + { (exit 1); exit 1; }; } fi elif test "x$enable_sdl" = "xyes" then - { echo "configure: error: I couldn't find the SDL package. You can download libSDL + { { echo "$as_me:$LINENO: error: I couldn't find the SDL package. You can download libSDL from http://www.libsdl.org/, or configure with --disable-sdl. Have a nice day. - " 1>&2; exit 1; } + " >&5 +echo "$as_me: error: I couldn't find the SDL package. You can download libSDL +from http://www.libsdl.org/, or configure with --disable-sdl. Have a nice day. + " >&2;} + { (exit 1); exit 1; }; } + fi +fi + +# Check whether --enable-qte or --disable-qte was given. +if test "${enable_qte+set}" = set; then + enableval="$enable_qte" + +fi; +if test "x${enable_qte}" != "xno" +then + +# Check whether --with-qte or --without-qte was given. +if test "${with_qte+set}" = set; then + withval="$with_qte" + +fi; + if test "x${with_qte}" = "x" + then + test_LDFLAGS="-L${QTDIR}/lib" + test_CFLAGS="-I${QTDIR}/include" + else + test_LDFLAGS="-L${with_qte}/lib" + test_CFLAGS="-I${with_qte}/include" + fi + + CPPFLAGS="${save_CPPFLAGS} ${test_CFLAGS}" + +for ac_header in qt.h +do +as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 +if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +fi +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +else + # Is the header compilable? +echo "$as_me:$LINENO: checking $ac_header usability" >&5 +echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" +#include "confdefs.h" +$ac_includes_default +#include <$ac_header> +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_header_compiler=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_header_compiler=no +fi +rm -f conftest.$ac_objext conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6 + +# Is the header present? +echo "$as_me:$LINENO: checking $ac_header presence" >&5 +echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" +#include "confdefs.h" +#include <$ac_header> +_ACEOF +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + egrep -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + else + ac_cpp_err= fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then + ac_header_preproc=yes +else + echo "$as_me: failed program was:" >&5 + cat conftest.$ac_ext >&5 + ac_header_preproc=no +fi +rm -f conftest.err conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6 + +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc in + yes:no ) + { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};; + no:yes ) + { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 +echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};; +esac +echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 +if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + eval "$as_ac_Header=$ac_header_preproc" +fi +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 + +fi +if test `eval echo '${'$as_ac_Header'}'` = yes; then + cat >>confdefs.h <<_ACEOF +#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF + + qte_CFLAGS="${qte_CFLAGS} ${test_CFLAGS} -DQT_QWS_IPAQ -DQWS -fno-exceptions -fno-rtti" + qte_LDFLAGS="${qte_LDFLAGS} ${test_LDFLAGS} -lqpe -lqte" + if test "x${with_qte}" = "x" + then + PLUGINS="${PLUGINS} qte" + else + BUILTINS="${BUILTINS} qte" + fi + +fi + +done + + CPPFLAGS="${save_CPPFLAGS}" fi # Check whether --enable-directx or --disable-directx was given. if test "${enable_directx+set}" = set; then enableval="$enable_directx" - : -fi +fi; if test "x$enable_directx" != "xno" then if test x$SYS = xmingw32 then - # Check whether --with-directx or --without-directx was given. + +# Check whether --with-directx or --without-directx was given. if test "${with_directx+set}" = set; then withval="$with_directx" - : -fi +fi; if test "x$with_directx" = "x" then - for ac_hdr in ddraw.h + +for ac_header in ddraw.h do -ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` -echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:7219: 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 <&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 +if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +fi +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +else + # Is the header compilable? +echo "$as_me:$LINENO: checking $ac_header usability" >&5 +echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" #include "confdefs.h" -#include <$ac_hdr> -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; } -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 +$ac_includes_default +#include <$ac_header> +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_header_compiler=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_header_compiler=no +fi +rm -f conftest.$ac_objext conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6 + +# Is the header present? +echo "$as_me:$LINENO: checking $ac_header presence" >&5 +echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" +#include "confdefs.h" +#include <$ac_header> +_ACEOF +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + egrep -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then + ac_header_preproc=yes +else + echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_header_$ac_safe=no" + ac_header_preproc=no +fi +rm -f conftest.err conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6 + +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc in + yes:no ) + { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};; + no:yes ) + { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 +echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};; +esac +echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 +if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + eval "$as_ac_Header=$ac_header_preproc" fi -rm -f conftest* +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 + fi -if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then - echo "$ac_t""yes" 1>&6 - ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` - cat >> confdefs.h <>confdefs.h <<_ACEOF +#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF PLUGINS="${PLUGINS} directx" - directx_LDFLAGS="${directx_LDFLAGS} -lgdi32" -else - echo "$ac_t""no" 1>&6 + directx_LDFLAGS="${directx_LDFLAGS} -lgdi32" fi + 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 "$as_me:$LINENO: checking for directX headers in ${with_directx}" >&5 +echo $ECHO_N "checking for directX headers in ${with_directx}... $ECHO_C" >&6 if test -f ${with_directx}/ddraw.h then PLUGINS="${PLUGINS} directx" directx_LDFLAGS="${directx_LDFLAGS} -L${with_directx}/lib -lgdi32" directx_CFLAGS="${directx_CFLAGS} -I${with_directx}" - echo "$ac_t""yes" 1>&6 + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 else - echo "$ac_t""no" 1>&6 - { echo "configure: error: Cannot find ${with_directx}/ddraw.h!" 1>&2; exit 1; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 + { { echo "$as_me:$LINENO: error: Cannot find ${with_directx}/ddraw.h!" >&5 +echo "$as_me: error: Cannot find ${with_directx}/ddraw.h!" >&2;} + { (exit 1); exit 1; }; } fi fi fi @@ -7272,51 +12749,124 @@ fi # Check whether --enable-fb or --disable-fb was given. if test "${enable_fb+set}" = set; then enableval="$enable_fb" - : -fi +fi; if test x$enable_fb != xno then - for ac_hdr in linux/fb.h + +for ac_header in linux/fb.h do -ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` -echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:7285: 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 +as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 +if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +fi +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +else + # Is the header compilable? +echo "$as_me:$LINENO: checking $ac_header usability" >&5 +echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" +#include "confdefs.h" +$ac_includes_default +#include <$ac_header> +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_header_compiler=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_header_compiler=no +fi +rm -f conftest.$ac_objext conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6 + +# Is the header present? +echo "$as_me:$LINENO: checking $ac_header presence" >&5 +echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" +#include "confdefs.h" +#include <$ac_header> +_ACEOF +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + egrep -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then + ac_header_preproc=yes 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; } -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 + echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_header_$ac_safe=no" + ac_header_preproc=no +fi +rm -f conftest.err conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6 + +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc in + yes:no ) + { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};; + no:yes ) + { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 +echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};; +esac +echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 +if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + eval "$as_ac_Header=$ac_header_preproc" fi -rm -f conftest* +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 + fi -if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then - echo "$ac_t""yes" 1>&6 - ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` - cat >> confdefs.h <>confdefs.h <<_ACEOF +#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF + PLUGINS="${PLUGINS} fb" - -else - echo "$ac_t""no" 1>&6 + fi + done fi @@ -7327,97 +12877,167 @@ if test "${enable_mga+set}" = set; then if test x$enable_mga = xyes then PLUGINS="${PLUGINS} mga xmga" - fi -fi - + fi +fi; # Check whether --enable-ggi or --disable-ggi was given. if test "${enable_ggi+set}" = set; then enableval="$enable_ggi" - : -fi +fi; if test x$enable_ggi = xyes then PLUGINS="${PLUGINS} ggi" ggi_LDFLAGS="${ggi_LDFLAGS} -lggi" - # Check whether --with-ggi or --without-ggi was given. + +# Check whether --with-ggi or --without-ggi was given. if test "${with_ggi+set}" = set; then withval="$with_ggi" if test "x$with_ggi" != "xno" -a "x$with_ggi" != "x" then CFLAGS_GGI="${CFLAGS_GGI} -I$with_ggi/include" ggi_LDFLAGS="${ggi_LDFLAGS} -L$with_ggi/lib" - fi -fi - + fi +fi; fi # Check whether --enable-glide or --disable-glide was given. if test "${enable_glide+set}" = set; then enableval="$enable_glide" - : -fi +fi; if test x$enable_glide = xyes then PLUGINS="${PLUGINS} glide" glide_LDFLAGS="${glide_LDFLAGS} -lglide2x -lm" glide_CFLAGS="${glide_CFLAGS} -I/usr/include/glide" - # Check whether --with-glide or --without-glide was given. + +# Check whether --with-glide or --without-glide was given. if test "${with_glide+set}" = set; then withval="$with_glide" if test "x$with_glide" != "xno" -a "x$with_glide" != "x" then glide_CFLAGS="${glide_CFLAGS} -I$with_glide/include" glide_LDFLAGS="${glide_LDFLAGS} -L$with_glide/lib" - fi -fi - + fi +fi; fi # Check whether --enable-aa or --disable-aa was given. if test "${enable_aa+set}" = set; then enableval="$enable_aa" - : -fi +fi; 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 -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 <&5 +echo $ECHO_N "checking for aalib.h... $ECHO_C" >&6 +if test "${ac_cv_header_aalib_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +fi +echo "$as_me:$LINENO: result: $ac_cv_header_aalib_h" >&5 +echo "${ECHO_T}$ac_cv_header_aalib_h" >&6 +else + # Is the header compilable? +echo "$as_me:$LINENO: checking aalib.h usability" >&5 +echo $ECHO_N "checking aalib.h usability... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" #include "confdefs.h" +$ac_includes_default #include -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; } -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 +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_header_compiler=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_header_compiler=no +fi +rm -f conftest.$ac_objext conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6 + +# Is the header present? +echo "$as_me:$LINENO: checking aalib.h presence" >&5 +echo $ECHO_N "checking aalib.h presence... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" +#include "confdefs.h" +#include +_ACEOF +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + egrep -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then + ac_header_preproc=yes +else + echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_header_$ac_safe=no" + ac_header_preproc=no +fi +rm -f conftest.err conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6 + +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc in + yes:no ) + { echo "$as_me:$LINENO: WARNING: aalib.h: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: aalib.h: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: aalib.h: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: aalib.h: proceeding with the preprocessor's result" >&2;};; + no:yes ) + { echo "$as_me:$LINENO: WARNING: aalib.h: present but cannot be compiled" >&5 +echo "$as_me: WARNING: aalib.h: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: aalib.h: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: aalib.h: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: aalib.h: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: aalib.h: proceeding with the preprocessor's result" >&2;};; +esac +echo "$as_me:$LINENO: checking for aalib.h" >&5 +echo $ECHO_N "checking for aalib.h... $ECHO_C" >&6 +if test "${ac_cv_header_aalib_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_cv_header_aalib_h=$ac_header_preproc fi -rm -f conftest* +echo "$as_me:$LINENO: result: $ac_cv_header_aalib_h" >&5 +echo "${ECHO_T}$ac_cv_header_aalib_h" >&6 + fi -if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then - echo "$ac_t""yes" 1>&6 +if test $ac_cv_header_aalib_h = yes; then have_aa="true" else - echo "$ac_t""no" 1>&6 -have_aa="false" + have_aa="false" fi + if test x$have_aa = xtrue then PLUGINS="${PLUGINS} aa" @@ -7426,99 +13046,191 @@ fi fi + # Check whether --with- or --without- was given. if test "${with_+set}" = set; then withval="$with_" - : -fi +fi; # Check whether --enable-dsp or --disable-dsp was given. if test "${enable_dsp+set}" = set; then enableval="$enable_dsp" - : -fi +fi; if test x$enable_dsp != xno && (test x$SYS != xmingw32 || test x$enable_dsp = xyes) then - for ac_hdr in soundcard.h sys/soundcard.h machine/soundcard.h + + + +for ac_header in soundcard.h sys/soundcard.h machine/soundcard.h do -ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` -echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:7451: 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 <&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 +if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +fi +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +else + # Is the header compilable? +echo "$as_me:$LINENO: checking $ac_header usability" >&5 +echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" #include "confdefs.h" -#include <$ac_hdr> -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; } -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 +$ac_includes_default +#include <$ac_header> +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_header_compiler=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_header_compiler=no +fi +rm -f conftest.$ac_objext conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6 + +# Is the header present? +echo "$as_me:$LINENO: checking $ac_header presence" >&5 +echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" +#include "confdefs.h" +#include <$ac_header> +_ACEOF +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + egrep -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then + ac_header_preproc=yes +else + echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_header_$ac_safe=no" + ac_header_preproc=no +fi +rm -f conftest.err conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6 + +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc in + yes:no ) + { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};; + no:yes ) + { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 +echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};; +esac +echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 +if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + eval "$as_ac_Header=$ac_header_preproc" fi -rm -f conftest* +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 + fi -if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then - echo "$ac_t""yes" 1>&6 - ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` - cat >> confdefs.h <>confdefs.h <<_ACEOF +#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF + PLUGINS="${PLUGINS} dsp" - echo $ac_n "checking for main in -lossaudio""... $ac_c" 1>&6 -echo "configure:7484: 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 + echo "$as_me:$LINENO: checking for main in -lossaudio" >&5 +echo $ECHO_N "checking for main in -lossaudio... $ECHO_C" >&6 +if test "${ac_cv_lib_ossaudio_main+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-lossaudio $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" #include "confdefs.h" -int main() { -main() -; return 0; } -EOF -if { (eval echo configure:7499: \"$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 - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -f conftest* -LIBS="$ac_save_LIBS" -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } +#endif +int +main () +{ +main (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_ossaudio_main=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_lib_ossaudio_main=no +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:$LINENO: result: $ac_cv_lib_ossaudio_main" >&5 +echo "${ECHO_T}$ac_cv_lib_ossaudio_main" >&6 +if test $ac_cv_lib_ossaudio_main = yes; then dsp_LDFLAGS="${dsp_LDFLAGS} -lossaudio" -else - echo "$ac_t""no" 1>&6 fi - -else - echo "$ac_t""no" 1>&6 + fi + done fi @@ -7530,38 +13242,42 @@ if test "${enable_esd+set}" = set; then 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 -if eval "test \"`echo '$''{'ac_cv_path_ESD_CONFIG'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_path_ESD_CONFIG+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - case "$ESD_CONFIG" in - /*) + case $ESD_CONFIG in + [\\/]* | ?:[\\/]*) ac_cv_path_ESD_CONFIG="$ESD_CONFIG" # Let the user override the test with a path. ;; - ?:/*) - ac_cv_path_ESD_CONFIG="$ESD_CONFIG" # Let the user override the test with a dos path. - ;; *) - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_path_ESD_CONFIG="$ac_dir/$ac_word" - break - fi - done - IFS="$ac_save_ifs" + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_ESD_CONFIG="$as_dir/$ac_word$ac_exec_ext" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done + test -z "$ac_cv_path_ESD_CONFIG" && ac_cv_path_ESD_CONFIG="no" ;; esac fi -ESD_CONFIG="$ac_cv_path_ESD_CONFIG" +ESD_CONFIG=$ac_cv_path_ESD_CONFIG + if test -n "$ESD_CONFIG"; then - echo "$ac_t""$ESD_CONFIG" 1>&6 + echo "$as_me:$LINENO: result: $ESD_CONFIG" >&5 +echo "${ECHO_T}$ESD_CONFIG" >&6 else - echo "$ac_t""no" 1>&6 + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi if test x${ESD_CONFIG} != xno @@ -7571,8 +13287,7 @@ fi esd_LDFLAGS="${esd_LDFLAGS} `${ESD_CONFIG} --libs`" fi fi -fi - +fi; # Check whether --enable-arts or --disable-arts was given. if test "${enable_arts+set}" = set; then @@ -7581,38 +13296,42 @@ if test "${enable_arts+set}" = set; then 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 -if eval "test \"`echo '$''{'ac_cv_path_ARTS_CONFIG'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_path_ARTS_CONFIG+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - case "$ARTS_CONFIG" in - /*) + case $ARTS_CONFIG in + [\\/]* | ?:[\\/]*) ac_cv_path_ARTS_CONFIG="$ARTS_CONFIG" # Let the user override the test with a path. ;; - ?:/*) - ac_cv_path_ARTS_CONFIG="$ARTS_CONFIG" # Let the user override the test with a dos path. - ;; *) - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_path_ARTS_CONFIG="$ac_dir/$ac_word" - break - fi - done - IFS="$ac_save_ifs" + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_ARTS_CONFIG="$as_dir/$ac_word$ac_exec_ext" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done + test -z "$ac_cv_path_ARTS_CONFIG" && ac_cv_path_ARTS_CONFIG="no" ;; esac fi -ARTS_CONFIG="$ac_cv_path_ARTS_CONFIG" +ARTS_CONFIG=$ac_cv_path_ARTS_CONFIG + if test -n "$ARTS_CONFIG"; then - echo "$ac_t""$ARTS_CONFIG" 1>&6 + echo "$as_me:$LINENO: result: $ARTS_CONFIG" >&5 +echo "${ECHO_T}$ARTS_CONFIG" >&6 else - echo "$ac_t""no" 1>&6 + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi if test x${ARTS_CONFIG} != xno @@ -7622,99 +13341,188 @@ fi arts_LDFLAGS="${arts_LDFLAGS} `${ARTS_CONFIG} --libs `" fi fi -fi - +fi; # Check whether --enable-alsa or --disable-alsa was given. if test "${enable_alsa+set}" = set; then enableval="$enable_alsa" if test x$enable_alsa = xyes then - ac_safe=`echo "alsa/asoundlib.h" | sed 'y%./+-%__p_%'` -echo $ac_n "checking for alsa/asoundlib.h""... $ac_c" 1>&6 -echo "configure:7636: 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 <&5 +echo $ECHO_N "checking for alsa/asoundlib.h... $ECHO_C" >&6 +if test "${ac_cv_header_alsa_asoundlib_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +fi +echo "$as_me:$LINENO: result: $ac_cv_header_alsa_asoundlib_h" >&5 +echo "${ECHO_T}$ac_cv_header_alsa_asoundlib_h" >&6 +else + # Is the header compilable? +echo "$as_me:$LINENO: checking alsa/asoundlib.h usability" >&5 +echo $ECHO_N "checking alsa/asoundlib.h usability... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" #include "confdefs.h" +$ac_includes_default #include -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; } -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 +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_header_compiler=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_header_compiler=no +fi +rm -f conftest.$ac_objext conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6 + +# Is the header present? +echo "$as_me:$LINENO: checking alsa/asoundlib.h presence" >&5 +echo $ECHO_N "checking alsa/asoundlib.h presence... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" +#include "confdefs.h" +#include +_ACEOF +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + egrep -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then + ac_header_preproc=yes +else + echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_header_$ac_safe=no" + ac_header_preproc=no +fi +rm -f conftest.err conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6 + +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc in + yes:no ) + { echo "$as_me:$LINENO: WARNING: alsa/asoundlib.h: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: alsa/asoundlib.h: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: alsa/asoundlib.h: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: alsa/asoundlib.h: proceeding with the preprocessor's result" >&2;};; + no:yes ) + { echo "$as_me:$LINENO: WARNING: alsa/asoundlib.h: present but cannot be compiled" >&5 +echo "$as_me: WARNING: alsa/asoundlib.h: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: alsa/asoundlib.h: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: alsa/asoundlib.h: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: alsa/asoundlib.h: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: alsa/asoundlib.h: proceeding with the preprocessor's result" >&2;};; +esac +echo "$as_me:$LINENO: checking for alsa/asoundlib.h" >&5 +echo $ECHO_N "checking for alsa/asoundlib.h... $ECHO_C" >&6 +if test "${ac_cv_header_alsa_asoundlib_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_cv_header_alsa_asoundlib_h=$ac_header_preproc fi -rm -f conftest* +echo "$as_me:$LINENO: result: $ac_cv_header_alsa_asoundlib_h" >&5 +echo "${ECHO_T}$ac_cv_header_alsa_asoundlib_h" >&6 + 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 -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 +if test $ac_cv_header_alsa_asoundlib_h = yes; then + echo "$as_me:$LINENO: checking for main in -lasound" >&5 +echo $ECHO_N "checking for main in -lasound... $ECHO_C" >&6 +if test "${ac_cv_lib_asound_main+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-lasound $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" #include "confdefs.h" -int main() { -main() -; return 0; } -EOF -if { (eval echo configure:7678: \"$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 - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -f conftest* -LIBS="$ac_save_LIBS" -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } +#endif +int +main () +{ +main (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_asound_main=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_lib_asound_main=no +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:$LINENO: result: $ac_cv_lib_asound_main" >&5 +echo "${ECHO_T}$ac_cv_lib_asound_main" >&6 +if test $ac_cv_lib_asound_main = yes; then have_alsa="true" else - echo "$ac_t""no" 1>&6 -have_alsa="false" + have_alsa="false" fi else - echo "$ac_t""no" 1>&6 -have_alsa="false" + have_alsa="false" fi + if test x$have_alsa = xtrue then PLUGINS="${PLUGINS} alsa" alsa_LDFLAGS="${alsa_LDFLAGS} -lasound -lm -ldl" fi fi -fi - +fi; # Check whether --enable-waveout or --disable-waveout was given. if test "${enable_waveout+set}" = set; then enableval="$enable_waveout" - : -fi +fi; if test "x$enable_waveout" != "xno" -a x$SYS = xmingw32 then PLUGINS="${PLUGINS} waveout" @@ -7722,168 +13530,721 @@ if test "x$enable_waveout" != "xno" -a x$SYS = xmingw32 fi + # Check whether --with- or --without- was given. if test "${with_+set}" = set; then withval="$with_" - : -fi +fi; # Check whether --enable-gtk or --disable-gtk was given. if test "${enable_gtk+set}" = set; then enableval="$enable_gtk" - : -fi +fi; if test x$enable_gtk != xno then GTK_PATH=$PATH - # Check whether --with-gtk-config-path or --without-gtk-config-path was given. + +# Check whether --with-gtk-config-path or --without-gtk-config-path was given. if test "${with_gtk_config_path+set}" = set; then withval="$with_gtk_config_path" if test "x$with_gtk_config_path" != "xno" then GTK_PATH="$with_gtk_config_path:$PATH" - fi -fi - + fi +fi; # look for gtk-config # Extract the first word of "gtk12-config", so it can be a program name with args. set dummy gtk12-config; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:7755: 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 +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_path_GTK12_CONFIG+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - case "$GTK12_CONFIG" in - /*) + case $GTK12_CONFIG in + [\\/]* | ?:[\\/]*) ac_cv_path_GTK12_CONFIG="$GTK12_CONFIG" # Let the user override the test with a path. ;; - ?:/*) - ac_cv_path_GTK12_CONFIG="$GTK12_CONFIG" # Let the user override the test with a dos path. + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $GTK_PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_GTK12_CONFIG="$as_dir/$ac_word$ac_exec_ext" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done + + test -z "$ac_cv_path_GTK12_CONFIG" && ac_cv_path_GTK12_CONFIG="no" + ;; +esac +fi +GTK12_CONFIG=$ac_cv_path_GTK12_CONFIG + +if test -n "$GTK12_CONFIG"; then + echo "$as_me:$LINENO: result: $GTK12_CONFIG" >&5 +echo "${ECHO_T}$GTK12_CONFIG" >&6 +else + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi + + GTK_CONFIG=${GTK12_CONFIG} + if test x${GTK_CONFIG} = xno + then + # Extract the first word of "gtk-config", so it can be a program name with args. +set dummy gtk-config; ac_word=$2 +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_path_GTK_CONFIG+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + case $GTK_CONFIG in + [\\/]* | ?:[\\/]*) + ac_cv_path_GTK_CONFIG="$GTK_CONFIG" # Let the user override the test with a path. ;; *) - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$GTK_PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_path_GTK12_CONFIG="$ac_dir/$ac_word" - break + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $GTK_PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_GTK_CONFIG="$as_dir/$ac_word$ac_exec_ext" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done + + test -z "$ac_cv_path_GTK_CONFIG" && ac_cv_path_GTK_CONFIG="no" + ;; +esac +fi +GTK_CONFIG=$ac_cv_path_GTK_CONFIG + +if test -n "$GTK_CONFIG"; then + echo "$as_me:$LINENO: result: $GTK_CONFIG" >&5 +echo "${ECHO_T}$GTK_CONFIG" >&6 +else + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi + + fi + if test x${GTK_CONFIG} != xno + then + if expr 1.2.0 \> `$GTK_CONFIG --version` >/dev/null + then + { { echo "$as_me:$LINENO: error: Your development package for Gtk+ is too old, you need at least version 1.2.0. Please upgrade and try again. Alternatively you can also configure with --disable-gtk." >&5 +echo "$as_me: error: Your development package for Gtk+ is too old, you need at least version 1.2.0. Please upgrade and try again. Alternatively you can also configure with --disable-gtk." >&2;} + { (exit 1); exit 1; }; } fi - done - IFS="$ac_save_ifs" + gtk_CFLAGS="${gtk_CFLAGS} `${GTK_CONFIG} --cflags gtk`" + gtk_LDFLAGS="${gtk_LDFLAGS} `${GTK_CONFIG} --libs gtk | sed 's,-rdynamic,,'`" + # now look for the gtk.h header + CPPFLAGS="$save_CPPFLAGS $gtk_CFLAGS" + ac_cv_gtk_headers=yes + + + +for ac_header in gtk/gtk.h glib.h gdk/gdk.h +do +as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 +if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +fi +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +else + # Is the header compilable? +echo "$as_me:$LINENO: checking $ac_header usability" >&5 +echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" +#include "confdefs.h" +$ac_includes_default +#include <$ac_header> +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_header_compiler=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_header_compiler=no +fi +rm -f conftest.$ac_objext conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6 + +# Is the header present? +echo "$as_me:$LINENO: checking $ac_header presence" >&5 +echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" +#include "confdefs.h" +#include <$ac_header> +_ACEOF +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + egrep -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then + ac_header_preproc=yes +else + echo "$as_me: failed program was:" >&5 + cat conftest.$ac_ext >&5 + ac_header_preproc=no +fi +rm -f conftest.err conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6 + +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc in + yes:no ) + { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};; + no:yes ) + { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 +echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};; +esac +echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 +if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + eval "$as_ac_Header=$ac_header_preproc" +fi +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 + +fi +if test `eval echo '${'$as_ac_Header'}'` = yes; then + cat >>confdefs.h <<_ACEOF +#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF + +else + + ac_cv_gtk_headers=no + echo "Cannot find gtk development headers." + +fi + +done + + if test "x$ac_cv_gtk_headers" = xyes + then + PLUGINS="${PLUGINS} gtk" + ALIASES="${ALIASES} gvlc" + fi + CPPFLAGS="$save_CPPFLAGS" + fi +fi + +# Check whether --enable-familiar or --disable-familiar was given. +if test "${enable_familiar+set}" = set; then + enableval="$enable_familiar" + +fi; +if test "x${enable_familiar}" = "xyes" +then + GTK_PATH="${PATH}" + +# Check whether --with-gtk-config-path or --without-gtk-config-path was given. +if test "${with_gtk_config_path+set}" = set; then + withval="$with_gtk_config_path" + if test "x${with_gtk_config_path}" != "xno" + then + GTK_PATH="${with_gtk_config_path}:${PATH}" + fi +fi; + # look for gtk-config + # Extract the first word of "gtk12-config", so it can be a program name with args. +set dummy gtk12-config; ac_word=$2 +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_path_GTK12_CONFIG+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + case $GTK12_CONFIG in + [\\/]* | ?:[\\/]*) + ac_cv_path_GTK12_CONFIG="$GTK12_CONFIG" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in ${GTK_PATH} +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_GTK12_CONFIG="$as_dir/$ac_word$ac_exec_ext" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done + test -z "$ac_cv_path_GTK12_CONFIG" && ac_cv_path_GTK12_CONFIG="no" ;; esac fi -GTK12_CONFIG="$ac_cv_path_GTK12_CONFIG" +GTK12_CONFIG=$ac_cv_path_GTK12_CONFIG + if test -n "$GTK12_CONFIG"; then - echo "$ac_t""$GTK12_CONFIG" 1>&6 + echo "$as_me:$LINENO: result: $GTK12_CONFIG" >&5 +echo "${ECHO_T}$GTK12_CONFIG" >&6 else - echo "$ac_t""no" 1>&6 + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi GTK_CONFIG=${GTK12_CONFIG} - if test x${GTK_CONFIG} = xno + if test "x${GTK_CONFIG}" = "xno" then # 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 -if eval "test \"`echo '$''{'ac_cv_path_GTK_CONFIG'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_path_GTK_CONFIG+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - case "$GTK_CONFIG" in - /*) + case $GTK_CONFIG in + [\\/]* | ?:[\\/]*) ac_cv_path_GTK_CONFIG="$GTK_CONFIG" # Let the user override the test with a path. ;; - ?:/*) - ac_cv_path_GTK_CONFIG="$GTK_CONFIG" # Let the user override the test with a dos path. - ;; *) - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$GTK_PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_path_GTK_CONFIG="$ac_dir/$ac_word" - break - fi - done - IFS="$ac_save_ifs" + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in ${GTK_PATH} +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_GTK_CONFIG="$as_dir/$ac_word$ac_exec_ext" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done + test -z "$ac_cv_path_GTK_CONFIG" && ac_cv_path_GTK_CONFIG="no" ;; esac fi -GTK_CONFIG="$ac_cv_path_GTK_CONFIG" +GTK_CONFIG=$ac_cv_path_GTK_CONFIG + if test -n "$GTK_CONFIG"; then - echo "$ac_t""$GTK_CONFIG" 1>&6 + echo "$as_me:$LINENO: result: $GTK_CONFIG" >&5 +echo "${ECHO_T}$GTK_CONFIG" >&6 else - echo "$ac_t""no" 1>&6 + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi fi - if test x${GTK_CONFIG} != xno + # check for cross-compiling + GTK_PREFIX= + +# Check whether --with-gtk or --without-gtk was given. +if test "${with_gtk+set}" = set; then + withval="$with_gtk" + +fi; + if test "x$with_gtk_prefix" != "xno" -a "x$with_gtk_prefix" != "x" then - if expr 1.2.0 \> `$GTK_CONFIG --version` >/dev/null + GTK_PREFIX="--prefix=$with_gtk_prefix" + fi + if test "x${GTK_CONFIG}" != "xno" + then + if expr 1.2.0 \> `${GTK_CONFIG} --version` >/dev/null then - { echo "configure: error: Your development package for Gtk+ is too old, you need at least version 1.2.0. Please upgrade and try again. Alternatively you can also configure with --disable-gtk." 1>&2; exit 1; } + { { echo "$as_me:$LINENO: error: Your development package for Gtk+ is too old, you need at least version 1.2.0. Please upgrade and try again. Alternatively you can also configure with --disable-familiar." >&5 +echo "$as_me: error: Your development package for Gtk+ is too old, you need at least version 1.2.0. Please upgrade and try again. Alternatively you can also configure with --disable-familiar." >&2;} + { (exit 1); exit 1; }; } fi - gtk_CFLAGS="${gtk_CFLAGS} `${GTK_CONFIG} --cflags gtk`" - gtk_LDFLAGS="${gtk_LDFLAGS} `${GTK_CONFIG} --libs gtk | sed 's,-rdynamic,,'`" + familiar_CFLAGS="${familiar_CFLAGS} `${GTK_CONFIG} ${GTK_PREFIX} --cflags gtk gthread`" + familiar_LDFLAGS="${familiar_LDFLAGS} `${GTK_CONFIG} ${GTK_PREFIX} --libs gtk gthread | sed 's,-rdynamic,,'`" # now look for the gtk.h header - CPPFLAGS="$save_CPPFLAGS $gtk_CFLAGS" + CPPFLAGS="${save_CPPFLAGS} ${familiar_CFLAGS}" ac_cv_gtk_headers=yes - for ac_hdr in gtk/gtk.h glib.h gdk/gdk.h + + + +for ac_header in gtk/gtk.h glib.h gdk/gdk.h do -ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` -echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:7843: 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 <&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 +if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +fi +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +else + # Is the header compilable? +echo "$as_me:$LINENO: checking $ac_header usability" >&5 +echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" #include "confdefs.h" -#include <$ac_hdr> -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; } -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 +$ac_includes_default +#include <$ac_header> +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_header_compiler=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_header_compiler=no +fi +rm -f conftest.$ac_objext conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6 + +# Is the header present? +echo "$as_me:$LINENO: checking $ac_header presence" >&5 +echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" +#include "confdefs.h" +#include <$ac_header> +_ACEOF +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + egrep -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then + ac_header_preproc=yes +else + echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_header_$ac_safe=no" + ac_header_preproc=no +fi +rm -f conftest.err conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6 + +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc in + yes:no ) + { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};; + no:yes ) + { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 +echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};; +esac +echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 +if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + eval "$as_ac_Header=$ac_header_preproc" fi -rm -f conftest* +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 + fi -if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then - echo "$ac_t""yes" 1>&6 - ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` - cat >> confdefs.h <>confdefs.h <<_ACEOF +#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF + else - echo "$ac_t""no" 1>&6 -ac_cv_gtk_headers=no + + ac_cv_gtk_headers=no echo "Cannot find gtk development headers." - + fi + done - if test "x$ac_cv_gtk_headers" = xyes + + # now look for gpe support + +# Check whether --with-gpe-prefix or --without-gpe-prefix was given. +if test "${with_gpe_prefix+set}" = set; then + withval="$with_gpe_prefix" + +fi; + if test "x$with_gpe_prefix" != "xno" -a "x$with_gpe_prefix" != "x" then - PLUGINS="${PLUGINS} gtk" - ALIASES="${ALIASES} gvlc" + gpe_CFLAGS="-I$with_gpe_prefix/include" + gpe_LDFLAGS="-lXi -lgdk_pixbuf -L$with_gpe_prefix/lib" + + # now look for gpe/init.h header file + save_CFLAGS=$CFLAGS + save_LDFLAGS=$LDFLAGS +# CFLAGS="${familiar_CFLAGS} ${gpe_CFLAGS}" + LDFLAGS="${familiar_LDFLAGS} ${gpe_LDFLAGS}" + CPPFLAGS="${save_CPPFLAGS} ${familiar_CFLAGS} ${gpe_CFLAGS}" + ac_cv_gpe_headers=yes + +for ac_header in gpe/init.h +do +as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 +if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +fi +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +else + # Is the header compilable? +echo "$as_me:$LINENO: checking $ac_header usability" >&5 +echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" +#include "confdefs.h" +$ac_includes_default +#include <$ac_header> +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_header_compiler=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_header_compiler=no +fi +rm -f conftest.$ac_objext conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6 + +# Is the header present? +echo "$as_me:$LINENO: checking $ac_header presence" >&5 +echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" +#include "confdefs.h" +#include <$ac_header> +_ACEOF +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + egrep -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then + ac_header_preproc=yes +else + echo "$as_me: failed program was:" >&5 + cat conftest.$ac_ext >&5 + ac_header_preproc=no +fi +rm -f conftest.err conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6 + +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc in + yes:no ) + { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};; + no:yes ) + { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 +echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};; +esac +echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 +if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + eval "$as_ac_Header=$ac_header_preproc" +fi +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 + +fi +if test `eval echo '${'$as_ac_Header'}'` = yes; then + cat >>confdefs.h <<_ACEOF +#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF + +else + ac_cv_gpe_headers=no + { { echo "$as_me:$LINENO: error: Cannot find development headers for libgpewidget..." >&5 +echo "$as_me: error: Cannot find development headers for libgpewidget..." >&2;} + { (exit 1); exit 1; }; } +fi + +done + + echo "$as_me:$LINENO: checking for gpe_application_init in -lgpewidget" >&5 +echo $ECHO_N "checking for gpe_application_init in -lgpewidget... $ECHO_C" >&6 +if test "${ac_cv_lib_gpewidget_gpe_application_init+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lgpewidget $LIBS" +cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" +#include "confdefs.h" + +/* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char gpe_application_init (); +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } +#endif +int +main () +{ +gpe_application_init (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_gpewidget_gpe_application_init=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_lib_gpewidget_gpe_application_init=no +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:$LINENO: result: $ac_cv_lib_gpewidget_gpe_application_init" >&5 +echo "${ECHO_T}$ac_cv_lib_gpewidget_gpe_application_init" >&6 +if test $ac_cv_lib_gpewidget_gpe_application_init = yes; then + gpe_LDFLAGS="${gpe_LDFLAGS} -lgpewidget" +else + { { echo "$as_me:$LINENO: error: Cannot find libgpewidget library..." >&5 +echo "$as_me: error: Cannot find libgpewidget library..." >&2;} + { (exit 1); exit 1; }; } +fi + + CFLAGS=$save_CFLAGS + LDFLAGS=$save_LDFLAG + if test "x${ac_cv_gpe_headers}" = "xyes" + then + familiar_CFLAGS="${familiar_CFLAGS} ${gpe_CFLAGS}" + familiar_LDFLAGS="${familiar_LDFLAGS} ${gpe_LDFLAGS}" + fi fi - CPPFLAGS="$save_CPPFLAGS" + if test "x${ac_cv_gtk_headers}" = "xyes" + then + PLUGINS="${PLUGINS} familiar" + fi + CPPFLAGS="${save_CPPFLAGS}" fi fi @@ -7894,38 +14255,42 @@ if test "${enable_gnome+set}" = set; then # look for gnome-config # 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 -if eval "test \"`echo '$''{'ac_cv_path_GNOME_CONFIG'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_path_GNOME_CONFIG+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - case "$GNOME_CONFIG" in - /*) + case $GNOME_CONFIG in + [\\/]* | ?:[\\/]*) ac_cv_path_GNOME_CONFIG="$GNOME_CONFIG" # Let the user override the test with a path. ;; - ?:/*) - ac_cv_path_GNOME_CONFIG="$GNOME_CONFIG" # Let the user override the test with a dos path. - ;; *) - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_path_GNOME_CONFIG="$ac_dir/$ac_word" - break - fi - done - IFS="$ac_save_ifs" + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_GNOME_CONFIG="$as_dir/$ac_word$ac_exec_ext" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done + test -z "$ac_cv_path_GNOME_CONFIG" && ac_cv_path_GNOME_CONFIG="no" ;; esac fi -GNOME_CONFIG="$ac_cv_path_GNOME_CONFIG" +GNOME_CONFIG=$ac_cv_path_GNOME_CONFIG + if test -n "$GNOME_CONFIG"; then - echo "$ac_t""$GNOME_CONFIG" 1>&6 + echo "$as_me:$LINENO: result: $GNOME_CONFIG" >&5 +echo "${ECHO_T}$GNOME_CONFIG" >&6 else - echo "$ac_t""no" 1>&6 + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi if test -x ${GNOME_CONFIG} @@ -7935,56 +14300,134 @@ fi fi # now look for the gnome.h header CPPFLAGS="$save_CPPFLAGS $gnome_CFLAGS" - for ac_hdr in gnome.h + +for ac_header in gnome.h 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 -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 <&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 +if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +fi +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +else + # Is the header compilable? +echo "$as_me:$LINENO: checking $ac_header usability" >&5 +echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" #include "confdefs.h" -#include <$ac_hdr> -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; } -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 +$ac_includes_default +#include <$ac_header> +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_header_compiler=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_header_compiler=no +fi +rm -f conftest.$ac_objext conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6 + +# Is the header present? +echo "$as_me:$LINENO: checking $ac_header presence" >&5 +echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" +#include "confdefs.h" +#include <$ac_header> +_ACEOF +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + egrep -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then + ac_header_preproc=yes +else + echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_header_$ac_safe=no" + ac_header_preproc=no +fi +rm -f conftest.err conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6 + +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc in + yes:no ) + { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};; + no:yes ) + { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 +echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};; +esac +echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 +if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + eval "$as_ac_Header=$ac_header_preproc" fi -rm -f conftest* +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 + fi -if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then - echo "$ac_t""yes" 1>&6 - ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` - cat >> confdefs.h <>confdefs.h <<_ACEOF +#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF + PLUGINS="${PLUGINS} gnome" ALIASES="${ALIASES} gnome-vlc" - + else - echo "$ac_t""no" 1>&6 -{ echo "configure: error: Can't find gnome headers. Please install the gnome -developement tools or remove the --enable-gnome option" 1>&2; exit 1; } - + + { { echo "$as_me:$LINENO: error: Can't find gnome headers. Please install the gnome +developement tools or remove the --enable-gnome option" >&5 +echo "$as_me: error: Can't find gnome headers. Please install the gnome +developement tools or remove the --enable-gnome option" >&2;} + { (exit 1); exit 1; }; } + fi + done CPPFLAGS="$save_CPPFLAGS" fi -fi - +fi; # Check whether --enable-qt or --disable-qt was given. if test "${enable_qt+set}" = set; then @@ -8001,8 +14444,7 @@ if test "${enable_qt+set}" = set; then MOC=moc fi fi -fi - +fi; # Check whether --enable-kde or --disable-kde was given. if test "${enable_kde+set}" = set; then @@ -8020,8 +14462,38 @@ if test "${enable_kde+set}" = set; then MOC=moc fi fi -fi +fi; + +# Check whether --enable-opie or --disable-opie was given. +if test "${enable_opie+set}" = set; then + enableval="$enable_opie" + if test "x${enable_opie}" = "xyes"; then +# Check whether --with-qte or --without-qte was given. +if test "${with_qte+set}" = set; then + withval="$with_qte" + +fi; + if test "x${with_qte}" = "x" + then + test_LDFLAGS="-L${QTDIR}/lib" + test_CFLAGS="-I${QTDIR}/include" + else + test_LDFLAGS="-L${with_qte}/lib" + test_CFLAGS="-I${with_qte}/include" + fi + + PLUGINS="${PLUGINS} opie" + opie_LDFLAGS="${opie_LDFLAGS} ${test_LDFLAGS} -lqpe -lqte" + opie_CFLAGS="${opie_CFLAGS} ${test_CFLAGS}-DQT_QWS_IPAQ -DQWS -fno-exceptions -fno-rtti" + if test -x ${QTDIR}/bin/moc + then + MOC=${QTDIR}/bin/moc + else + MOC=moc + fi + fi +fi; # Check whether --enable-macosx or --disable-macosx was given. if test "${enable_macosx+set}" = set; then @@ -8032,100 +14504,246 @@ if test "${enable_macosx+set}" = set; then macosx_LDFLAGS="${macosx_LDFLAGS} -framework CoreAudio -framework AudioToolbox -framework IOKit -framework Cocoa -framework AGL -framework QuickTime -lobjc -ObjC" fi else - for ac_hdr in Cocoa/Cocoa.h + +for ac_header in Cocoa/Cocoa.h do -ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` -echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:8040: 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 <&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 +if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +fi +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +else + # Is the header compilable? +echo "$as_me:$LINENO: checking $ac_header usability" >&5 +echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" #include "confdefs.h" -#include <$ac_hdr> -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; } -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 +$ac_includes_default +#include <$ac_header> +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_header_compiler=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_header_compiler=no +fi +rm -f conftest.$ac_objext conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6 + +# Is the header present? +echo "$as_me:$LINENO: checking $ac_header presence" >&5 +echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" +#include "confdefs.h" +#include <$ac_header> +_ACEOF +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + egrep -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then + ac_header_preproc=yes +else + echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_header_$ac_safe=no" + ac_header_preproc=no +fi +rm -f conftest.err conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6 + +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc in + yes:no ) + { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};; + no:yes ) + { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 +echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};; +esac +echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 +if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + eval "$as_ac_Header=$ac_header_preproc" fi -rm -f conftest* +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 + fi -if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then - echo "$ac_t""yes" 1>&6 - ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` - cat >> confdefs.h <>confdefs.h <<_ACEOF +#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF BUILTINS="${BUILTINS} macosx" macosx_LDFLAGS="${macosx_LDFLAGS} -framework CoreAudio -framework AudioToolbox -framework IOKit -framework Cocoa -framework AGL -framework QuickTime -lobjc -ObjC" - -else - echo "$ac_t""no" 1>&6 -fi -done fi +done + +fi; # Check whether --enable-qnx or --disable-qnx was given. if test "${enable_qnx+set}" = set; then enableval="$enable_qnx" - : -fi +fi; if test x$enable_qnx != xno then - for ac_hdr in Ph.h + +for ac_header in Ph.h do -ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` -echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:8093: 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 <&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 +if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +fi +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +else + # Is the header compilable? +echo "$as_me:$LINENO: checking $ac_header usability" >&5 +echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" #include "confdefs.h" -#include <$ac_hdr> -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; } -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 +$ac_includes_default +#include <$ac_header> +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_header_compiler=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_header_compiler=no +fi +rm -f conftest.$ac_objext conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6 + +# Is the header present? +echo "$as_me:$LINENO: checking $ac_header presence" >&5 +echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" +#include "confdefs.h" +#include <$ac_header> +_ACEOF +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + egrep -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then + ac_header_preproc=yes +else + echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_header_$ac_safe=no" + ac_header_preproc=no +fi +rm -f conftest.err conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6 + +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc in + yes:no ) + { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};; + no:yes ) + { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 +echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};; +esac +echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 +if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + eval "$as_ac_Header=$ac_header_preproc" fi -rm -f conftest* +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 + fi -if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then - echo "$ac_t""yes" 1>&6 - ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` - cat >> confdefs.h <>confdefs.h <<_ACEOF +#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF + PLUGINS="${PLUGINS} qnx" qnx_LDFLAGS="${qnx_LDFLAGS} -lasound -lph" - -else - echo "$ac_t""no" 1>&6 + fi + done fi @@ -8135,20 +14753,19 @@ if test "${enable_intfwin+set}" = set; then enableval="$enable_intfwin" if test "x$enable_intfwin" != "xno" then - # Check whether --with-bcbuilder or --without-bcbuilder was given. + +# Check whether --with-bcbuilder or --without-bcbuilder was given. if test "${with_bcbuilder+set}" = set; then withval="$with_bcbuilder" - : -fi +fi; if test "x$with_bcbuilder" != "x" then BCBUILDER="$with_bcbuilder" fi PLUGINS="${PLUGINS} intfwin" - fi -fi - + fi +fi; # Check whether --enable-ncurses or --disable-ncurses was given. if test "${enable_ncurses+set}" = set; then @@ -8157,91 +14774,183 @@ if test "${enable_ncurses+set}" = set; then PLUGINS="${PLUGINS} ncurses" ncurses_LDFLAGS="${ncurses_LDFLAGS} -lncurses" fi -fi - +fi; # Check whether --enable-lirc or --disable-lirc was given. if test "${enable_lirc+set}" = set; then enableval="$enable_lirc" - : -fi +fi; 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 -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 <&5 +echo $ECHO_N "checking for lirc/lirc_client.h... $ECHO_C" >&6 +if test "${ac_cv_header_lirc_lirc_client_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +fi +echo "$as_me:$LINENO: result: $ac_cv_header_lirc_lirc_client_h" >&5 +echo "${ECHO_T}$ac_cv_header_lirc_lirc_client_h" >&6 +else + # Is the header compilable? +echo "$as_me:$LINENO: checking lirc/lirc_client.h usability" >&5 +echo $ECHO_N "checking lirc/lirc_client.h usability... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" #include "confdefs.h" +$ac_includes_default #include -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; } -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 +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_header_compiler=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_header_compiler=no +fi +rm -f conftest.$ac_objext conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6 + +# Is the header present? +echo "$as_me:$LINENO: checking lirc/lirc_client.h presence" >&5 +echo $ECHO_N "checking lirc/lirc_client.h presence... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" +#include "confdefs.h" +#include +_ACEOF +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + egrep -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then + ac_header_preproc=yes +else + echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_header_$ac_safe=no" + ac_header_preproc=no +fi +rm -f conftest.err conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6 + +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc in + yes:no ) + { echo "$as_me:$LINENO: WARNING: lirc/lirc_client.h: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: lirc/lirc_client.h: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: lirc/lirc_client.h: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: lirc/lirc_client.h: proceeding with the preprocessor's result" >&2;};; + no:yes ) + { echo "$as_me:$LINENO: WARNING: lirc/lirc_client.h: present but cannot be compiled" >&5 +echo "$as_me: WARNING: lirc/lirc_client.h: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: lirc/lirc_client.h: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: lirc/lirc_client.h: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: lirc/lirc_client.h: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: lirc/lirc_client.h: proceeding with the preprocessor's result" >&2;};; +esac +echo "$as_me:$LINENO: checking for lirc/lirc_client.h" >&5 +echo $ECHO_N "checking for lirc/lirc_client.h... $ECHO_C" >&6 +if test "${ac_cv_header_lirc_lirc_client_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_cv_header_lirc_lirc_client_h=$ac_header_preproc fi -rm -f conftest* +echo "$as_me:$LINENO: result: $ac_cv_header_lirc_lirc_client_h" >&5 +echo "${ECHO_T}$ac_cv_header_lirc_lirc_client_h" >&6 + 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 -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 +if test $ac_cv_header_lirc_lirc_client_h = yes; then + echo "$as_me:$LINENO: checking for lirc_init in -llirc_client" >&5 +echo $ECHO_N "checking for lirc_init in -llirc_client... $ECHO_C" >&6 +if test "${ac_cv_lib_lirc_client_lirc_init+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-llirc_client $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" #include "confdefs.h" + /* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif /* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char lirc_init(); - -int main() { -lirc_init() -; return 0; } -EOF -if { (eval echo configure:8220: \"$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 - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -f conftest* -LIBS="$ac_save_LIBS" - -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 + builtin and then its argument prototype would still apply. */ +char lirc_init (); +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } +#endif +int +main () +{ +lirc_init (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_lirc_client_lirc_init=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_lib_lirc_client_lirc_init=no +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:$LINENO: result: $ac_cv_lib_lirc_client_lirc_init" >&5 +echo "${ECHO_T}$ac_cv_lib_lirc_client_lirc_init" >&6 +if test $ac_cv_lib_lirc_client_lirc_init = yes; then have_lirc="true" else - echo "$ac_t""no" 1>&6 -have_lirc="false" + have_lirc="false" fi else - echo "$ac_t""no" 1>&6 -have_lirc="false" + have_lirc="false" fi + if test x$have_lirc = xtrue then PLUGINS="${PLUGINS} lirc" @@ -8249,19 +14958,19 @@ fi fi fi + # Check whether --with- or --without- was given. if test "${with_+set}" = set; then withval="$with_" - : -fi + +fi; # Check whether --with-words or --without-words was given. if test "${with_words+set}" = set; then withval="$with_words" - : -fi +fi; case "x$with_words" in xbig) ac_cv_c_bigendian=yes @@ -8270,10 +14979,10 @@ fi ac_cv_c_bigendian=no ;; *) - 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 -if eval "test \"`echo '$''{'ac_cv_c_bigendian'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + echo "$as_me:$LINENO: checking whether the byte order is big-endian" >&5 +echo $ECHO_N "checking whether the byte order is big-endian... $ECHO_C" >&6 +if test "${ac_cv_c_bigendian+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_cv_c_bigendian=unknown cat >conftest.c <config.log 2>&1 \ && test -f conftest.o then @@ -8301,21 +15010,24 @@ EOF fi fi fi - -fi -echo "$ac_t""$ac_cv_c_bigendian" 1>&6 +fi +echo "$as_me:$LINENO: result: $ac_cv_c_bigendian" >&5 +echo "${ECHO_T}$ac_cv_c_bigendian" >&6 if test x$ac_cv_c_bigendian = xunknown then - { echo "configure: error: Could not guess endianness, please use --with-words" 1>&2; exit 1; } + { { echo "$as_me:$LINENO: error: Could not guess endianness, please use --with-words" >&5 +echo "$as_me: error: Could not guess endianness, please use --with-words" >&2;} + { (exit 1); exit 1; }; } fi ;; esac if test $ac_cv_c_bigendian = yes then - cat >> confdefs.h <<\EOF + +cat >>confdefs.h <<\_ACEOF #define WORDS_BIGENDIAN 1 -EOF +_ACEOF fi @@ -8323,9 +15035,8 @@ GPROF=0 # Check whether --enable-gprof or --disable-gprof was given. if test "${enable_gprof+set}" = set; then enableval="$enable_gprof" - if test "x$enable_gprof" = "xyes"; then GPROF=1; fi -fi - + if test "x$enable_gprof" = "xyes"; then GPROF=1; fi +fi; CPROF=0 # Check whether --enable-cprof or --disable-cprof was given. @@ -8337,72 +15048,90 @@ if test "${enable_cprof+set}" = set; then CPROF=1 fi -fi - +fi; # Check whether --enable-pth or --disable-pth was given. 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 -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 + +echo "$as_me:$LINENO: checking for pth_init in -lpth" >&5 +echo $ECHO_N "checking for pth_init in -lpth... $ECHO_C" >&6 +if test "${ac_cv_lib_pth_pth_init+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-lpth $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" #include "confdefs.h" + /* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif /* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char pth_init(); - -int main() { -pth_init() -; return 0; } -EOF -if { (eval echo configure:8368: \"$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 - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -f conftest* -LIBS="$ac_save_LIBS" - -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - ac_tr_lib=HAVE_LIB`echo pth | sed -e 's/[^a-zA-Z0-9_]/_/g' \ - -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` - cat >> confdefs.h <&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_pth_pth_init=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_lib_pth_pth_init=no +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:$LINENO: result: $ac_cv_lib_pth_pth_init" >&5 +echo "${ECHO_T}$ac_cv_lib_pth_pth_init" >&6 +if test $ac_cv_lib_pth_pth_init = yes; then + cat >>confdefs.h <<_ACEOF +#define HAVE_LIBPTH 1 +_ACEOF LIBS="-lpth $LIBS" -else - echo "$ac_t""no" 1>&6 fi - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" #include "confdefs.h" #include -EOF + +_ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | egrep "pth_init" >/dev/null 2>&1; then - rm -rf conftest* - - cat >> confdefs.h <<\EOF + + +cat >>confdefs.h <<\_ACEOF #define PTH_INIT_IN_PTH_H 1 -EOF +_ACEOF THREAD_LIB="-lpth" fi @@ -8410,72 +15139,90 @@ fi rm -f conftest* -fi - +fi; # Check whether --enable-st or --disable-st was given. 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 -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 + +echo "$as_me:$LINENO: checking for st_init in -lst" >&5 +echo $ECHO_N "checking for st_init in -lst... $ECHO_C" >&6 +if test "${ac_cv_lib_st_st_init+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-lst $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" #include "confdefs.h" + /* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif /* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char st_init(); - -int main() { -st_init() -; return 0; } -EOF -if { (eval echo configure:8441: \"$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 - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -f conftest* -LIBS="$ac_save_LIBS" - -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - ac_tr_lib=HAVE_LIB`echo st | sed -e 's/[^a-zA-Z0-9_]/_/g' \ - -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` - cat >> confdefs.h <&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_st_st_init=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_lib_st_st_init=no +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:$LINENO: result: $ac_cv_lib_st_st_init" >&5 +echo "${ECHO_T}$ac_cv_lib_st_st_init" >&6 +if test $ac_cv_lib_st_st_init = yes; then + cat >>confdefs.h <<_ACEOF +#define HAVE_LIBST 1 +_ACEOF LIBS="-lst $LIBS" -else - echo "$ac_t""no" 1>&6 fi - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" #include "confdefs.h" #include -EOF + +_ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | egrep "st_init" >/dev/null 2>&1; then - rm -rf conftest* - - cat >> confdefs.h <<\EOF + + +cat >>confdefs.h <<\_ACEOF #define ST_INIT_IN_ST_H 1 -EOF +_ACEOF THREAD_LIB="-lst" fi @@ -8483,8 +15230,7 @@ fi rm -f conftest* -fi - +fi; LDFLAGS="${LDFLAGS} ${THREAD_LIB}" @@ -8496,8 +15242,7 @@ if test "${enable_plugins+set}" = set; then BUILTINS="${BUILTINS} ${PLUGINS}" PLUGINS= fi -fi - +fi; if test x$ac_cv_header_dlfcn_h = xno -a x$ac_cv_header_image_h = xno -a x$SYS != xmingw32 then @@ -8507,23 +15252,27 @@ then PLUGINS= fi -cat >> confdefs.h <>confdefs.h <<_ACEOF #define VERSION_MESSAGE "vlc $VERSION $CODENAME Copyright 1996-2002 VideoLAN" -EOF +_ACEOF -cat >> confdefs.h <>confdefs.h <<_ACEOF #define COPYRIGHT_MESSAGE "VideoLAN Client - version $VERSION $CODENAME - (c) 1996-2002 VideoLAN" -EOF +_ACEOF VLC_SYMBOL="`echo ${VERSION} | tr .- __`" -cat >> confdefs.h <>confdefs.h <<_ACEOF #define MODULE_SUFFIX "__MODULE_$VLC_SYMBOL" -EOF +_ACEOF -cat >> confdefs.h <>confdefs.h <<_ACEOF #define MODULE_SYMBOL $VLC_SYMBOL -EOF +_ACEOF DATA_PATH="${ac_tool_prefix}/share/videolan" @@ -8626,497 +15375,1215 @@ PLUGIN_PATH="${ac_tool_prefix}/share/videolan" -trap '' 1 2 15 -cat > confcache <<\EOF + + + + + + +ac_config_files="$ac_config_files Makefile.config Makefile.opts po/Makefile.in" +cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure # tests run on this system so they can be shared between configure -# scripts and configure runs. It is not useful on other systems. -# If it contains results you don't want to keep, you may remove or edit it. +# scripts and configure runs, see configure's option --config-cache. +# It is not useful on other systems. If it contains results you don't +# want to keep, you may remove or edit it. # -# By default, configure uses ./config.cache as the cache file, -# creating it if it does not exist already. You can give configure -# the --cache-file=FILE option to use a different cache file; that is -# what configure does when it calls configure scripts in -# subdirectories, so they share the cache. -# Giving --cache-file=/dev/null disables caching, for debugging configure. -# config.status only pays attention to the cache file if you give it the -# --recheck option to rerun configure. +# config.status only pays attention to the cache file if you give it +# the --recheck option to rerun configure. # -EOF +# `ac_cv_env_foo' variables (set or unset) will be overriden when +# loading this file, other *unset* `ac_cv_foo' will be assigned the +# following values. + +_ACEOF + # The following way of writing the cache mishandles newlines in values, # but we know of no workaround that is simple, portable, and efficient. # So, don't put newlines in cache variables' values. # Ultrix sh set writes to stderr and can't be redirected directly, # and sets the high bit in the cache file unless we assign to the vars. -(set) 2>&1 | - case `(ac_space=' '; set | grep ac_space) 2>&1` in - *ac_space=\ *) - # `set' does not quote correctly, so add quotes (double-quote substitution - # turns \\\\ into \\, and sed turns \\ into \). - sed -n \ - -e "s/'/'\\\\''/g" \ - -e "s/^\\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\\)=\\(.*\\)/\\1=\${\\1='\\2'}/p" - ;; - *) - # `set' quotes correctly as required by POSIX, so do not add quotes. - sed -n -e 's/^\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\)=\(.*\)/\1=${\1=\2}/p' - ;; - esac >> confcache -if cmp -s $cache_file confcache; then - : -else +{ + (set) 2>&1 | + case `(ac_space=' '; set | grep ac_space) 2>&1` in + *ac_space=\ *) + # `set' does not quote correctly, so add quotes (double-quote + # substitution turns \\\\ into \\, and sed turns \\ into \). + sed -n \ + "s/'/'\\\\''/g; + s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p" + ;; + *) + # `set' quotes correctly as required by POSIX, so do not add quotes. + sed -n \ + "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p" + ;; + esac; +} | + sed ' + t clear + : clear + s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/ + t end + /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ + : end' >>confcache +if cmp -s $cache_file confcache; then :; else if test -w $cache_file; then - echo "updating cache $cache_file" - cat confcache > $cache_file + test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file" + cat confcache >$cache_file else echo "not updating unwritable cache $cache_file" fi fi rm -f confcache -trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15 - test "x$prefix" = xNONE && prefix=$ac_default_prefix # Let make expand exec_prefix. test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' -# Any assignment to VPATH causes Sun make to only execute -# the first set of double-colon rules, so remove it if not needed. -# If there is a colon in the path, we need to keep it. +# VPATH may cause trouble with some makes, so we remove $(srcdir), +# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and +# trailing colons and then remove the whole line if VPATH becomes empty +# (actually we leave an empty line to preserve line numbers). if test "x$srcdir" = x.; then - ac_vpsub='/^[ ]*VPATH[ ]*=[^:]*$/d' + ac_vpsub='/^[ ]*VPATH[ ]*=/{ +s/:*\$(srcdir):*/:/; +s/:*\${srcdir}:*/:/; +s/:*@srcdir@:*/:/; +s/^\([^=]*=[ ]*\):*/\1/; +s/:*$//; +s/^[^=]*=[ ]*$//; +}' fi -trap 'rm -f $CONFIG_STATUS conftest*; exit 1' 1 2 15 - DEFS=-DHAVE_CONFIG_H -# Without the "./", some shells look in PATH for config.status. -: ${CONFIG_STATUS=./config.status} -echo creating $CONFIG_STATUS -rm -f $CONFIG_STATUS -cat > $CONFIG_STATUS <&5 +echo "$as_me: creating $CONFIG_STATUS" >&6;} +cat >$CONFIG_STATUS <<_ACEOF +#! $SHELL +# Generated by $as_me. # Run this file to recreate the current configuration. -# This directory was configured as follows, -# on host `(hostname || uname -n) 2>/dev/null | sed 1q`: -# -# $0 $ac_configure_args -# # Compiler output produced by configure, useful for debugging -# configure, is in ./config.log if it exists. +# configure, is in config.log if it exists. -ac_cs_usage="Usage: $CONFIG_STATUS [--recheck] [--version] [--help]" -for ac_option +debug=false +SHELL=\${CONFIG_SHELL-$SHELL} +_ACEOF + +cat >>$CONFIG_STATUS <<\_ACEOF + +## --------------------- ## +## M4sh Initialization. ## +## --------------------- ## + +# Be Bourne compatible +if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then + emulate sh + NULLCMD=: +elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then + set -o posix +fi + +# NLS nuisances. +# Support unset when possible. +if (FOO=FOO; unset FOO) >/dev/null 2>&1; then + as_unset=unset +else + as_unset=false +fi + +(set +x; test -n "`(LANG=C; export LANG) 2>&1`") && + { $as_unset LANG || test "${LANG+set}" != set; } || + { LANG=C; export LANG; } +(set +x; test -n "`(LC_ALL=C; export LC_ALL) 2>&1`") && + { $as_unset LC_ALL || test "${LC_ALL+set}" != set; } || + { LC_ALL=C; export LC_ALL; } +(set +x; test -n "`(LC_TIME=C; export LC_TIME) 2>&1`") && + { $as_unset LC_TIME || test "${LC_TIME+set}" != set; } || + { LC_TIME=C; export LC_TIME; } +(set +x; test -n "`(LC_CTYPE=C; export LC_CTYPE) 2>&1`") && + { $as_unset LC_CTYPE || test "${LC_CTYPE+set}" != set; } || + { LC_CTYPE=C; export LC_CTYPE; } +(set +x; test -n "`(LANGUAGE=C; export LANGUAGE) 2>&1`") && + { $as_unset LANGUAGE || test "${LANGUAGE+set}" != set; } || + { LANGUAGE=C; export LANGUAGE; } +(set +x; test -n "`(LC_COLLATE=C; export LC_COLLATE) 2>&1`") && + { $as_unset LC_COLLATE || test "${LC_COLLATE+set}" != set; } || + { LC_COLLATE=C; export LC_COLLATE; } +(set +x; test -n "`(LC_NUMERIC=C; export LC_NUMERIC) 2>&1`") && + { $as_unset LC_NUMERIC || test "${LC_NUMERIC+set}" != set; } || + { LC_NUMERIC=C; export LC_NUMERIC; } +(set +x; test -n "`(LC_MESSAGES=C; export LC_MESSAGES) 2>&1`") && + { $as_unset LC_MESSAGES || test "${LC_MESSAGES+set}" != set; } || + { LC_MESSAGES=C; export LC_MESSAGES; } + + +# Name of the executable. +as_me=`(basename "$0") 2>/dev/null || +$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ + X"$0" : 'X\(//\)$' \| \ + X"$0" : 'X\(/\)$' \| \ + . : '\(.\)' 2>/dev/null || +echo X/"$0" | + sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; } + /^X\/\(\/\/\)$/{ s//\1/; q; } + /^X\/\(\/\).*/{ s//\1/; q; } + s/.*/./; q'` + +# PATH needs CR, and LINENO needs CR and PATH. +# Avoid depending upon Character Ranges. +as_cr_letters='abcdefghijklmnopqrstuvwxyz' +as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' +as_cr_Letters=$as_cr_letters$as_cr_LETTERS +as_cr_digits='0123456789' +as_cr_alnum=$as_cr_Letters$as_cr_digits + +# The user is always right. +if test "${PATH_SEPARATOR+set}" != set; then + echo "#! /bin/sh" >conftest.sh + echo "exit 0" >>conftest.sh + chmod +x conftest.sh + if (PATH=".;."; conftest.sh) >/dev/null 2>&1; then + PATH_SEPARATOR=';' + else + PATH_SEPARATOR=: + fi + rm -f conftest.sh +fi + + + as_lineno_1=$LINENO + as_lineno_2=$LINENO + as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` + test "x$as_lineno_1" != "x$as_lineno_2" && + test "x$as_lineno_3" = "x$as_lineno_2" || { + # Find who we are. Look in the path if we contain no path at all + # relative or not. + case $0 in + *[\\/]* ) as_myself=$0 ;; + *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH do - case "\$ac_option" in - -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) - echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion" - exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;; - -version | --version | --versio | --versi | --vers | --ver | --ve | --v) - echo "$CONFIG_STATUS generated by autoconf version 2.13" - exit 0 ;; - -help | --help | --hel | --he | --h) - echo "\$ac_cs_usage"; exit 0 ;; - *) echo "\$ac_cs_usage"; exit 1 ;; + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break +done + + ;; esac + # We did not find ourselves, most probably we were run as `sh COMMAND' + # in which case we are not to be found in the path. + if test "x$as_myself" = x; then + as_myself=$0 + fi + if test ! -f "$as_myself"; then + { { echo "$as_me:$LINENO: error: cannot find myself; rerun with an absolute path" >&5 +echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2;} + { (exit 1); exit 1; }; } + fi + case $CONFIG_SHELL in + '') + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for as_base in sh bash ksh sh5; do + case $as_dir in + /*) + if ("$as_dir/$as_base" -c ' + as_lineno_1=$LINENO + as_lineno_2=$LINENO + as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` + test "x$as_lineno_1" != "x$as_lineno_2" && + test "x$as_lineno_3" = "x$as_lineno_2" ') 2>/dev/null; then + CONFIG_SHELL=$as_dir/$as_base + export CONFIG_SHELL + exec "$CONFIG_SHELL" "$0" ${1+"$@"} + fi;; + esac + done done +;; + esac -ac_given_srcdir=$srcdir -ac_given_INSTALL="$INSTALL" + # Create $as_me.lineno as a copy of $as_myself, but with $LINENO + # uniformly replaced by the line number. The first 'sed' inserts a + # line-number line before each line; the second 'sed' does the real + # work. The second script uses 'N' to pair each line-number line + # with the numbered line, and appends trailing '-' during + # substitution so that $LINENO is not a special case at line end. + # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the + # second 'sed' script. Blame Lee E. McMahon for sed's syntax. :-) + sed '=' <$as_myself | + sed ' + N + s,$,-, + : loop + s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3, + t loop + s,-$,, + s,^['$as_cr_digits']*\n,, + ' >$as_me.lineno && + chmod +x $as_me.lineno || + { { echo "$as_me:$LINENO: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&5 +echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2;} + { (exit 1); exit 1; }; } + + # Don't try to exec as it changes $[0], causing all sort of problems + # (the dirname of $[0] is not the place where we might find the + # original and so on. Autoconf is especially sensible to this). + . ./$as_me.lineno + # Exit status is that of the last command. + exit +} -trap 'rm -fr `echo "Makefile.config Makefile.opts po/Makefile.in include/defs.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15 -EOF -cat >> $CONFIG_STATUS < conftest.subs <<\\CEOF -$ac_vpsub -$extrasub -s%@SHELL@%$SHELL%g -s%@CFLAGS@%$CFLAGS%g -s%@CPPFLAGS@%$CPPFLAGS%g -s%@CXXFLAGS@%$CXXFLAGS%g -s%@FFLAGS@%$FFLAGS%g -s%@DEFS@%$DEFS%g -s%@LDFLAGS@%$LDFLAGS%g -s%@LIBS@%$LIBS%g -s%@exec_prefix@%$exec_prefix%g -s%@prefix@%$prefix%g -s%@program_transform_name@%$program_transform_name%g -s%@bindir@%$bindir%g -s%@sbindir@%$sbindir%g -s%@libexecdir@%$libexecdir%g -s%@datadir@%$datadir%g -s%@sysconfdir@%$sysconfdir%g -s%@sharedstatedir@%$sharedstatedir%g -s%@localstatedir@%$localstatedir%g -s%@libdir@%$libdir%g -s%@includedir@%$includedir%g -s%@oldincludedir@%$oldincludedir%g -s%@infodir@%$infodir%g -s%@mandir@%$mandir%g -s%@host@%$host%g -s%@host_alias@%$host_alias%g -s%@host_cpu@%$host_cpu%g -s%@host_vendor@%$host_vendor%g -s%@host_os@%$host_os%g -s%@target@%$target%g -s%@target_alias@%$target_alias%g -s%@target_cpu@%$target_cpu%g -s%@target_vendor@%$target_vendor%g -s%@target_os@%$target_os%g -s%@build@%$build%g -s%@build_alias@%$build_alias%g -s%@build_cpu@%$build_cpu%g -s%@build_vendor@%$build_vendor%g -s%@build_os@%$build_os%g -s%@SET_MAKE@%$SET_MAKE%g -s%@CC@%$CC%g -s%@CPP@%$CPP%g -s%@RANLIB@%$RANLIB%g -s%@STRIP@%$STRIP%g -s%@GMAKE@%$GMAKE%g -s%@ALLOCA@%$ALLOCA%g -s%@GLIBC21@%$GLIBC21%g -s%@LIBICONV@%$LIBICONV%g -s%@USE_NLS@%$USE_NLS%g -s%@MSGFMT@%$MSGFMT%g -s%@GMSGFMT@%$GMSGFMT%g -s%@XGETTEXT@%$XGETTEXT%g -s%@INTLBISON@%$INTLBISON%g -s%@BUILD_INCLUDED_LIBINTL@%$BUILD_INCLUDED_LIBINTL%g -s%@USE_INCLUDED_LIBINTL@%$USE_INCLUDED_LIBINTL%g -s%@CATALOGS@%$CATALOGS%g -s%@CATOBJEXT@%$CATOBJEXT%g -s%@GMOFILES@%$GMOFILES%g -s%@INTLLIBS@%$INTLLIBS%g -s%@INTLOBJS@%$INTLOBJS%g -s%@POFILES@%$POFILES%g -s%@POSUB@%$POSUB%g -s%@DATADIRNAME@%$DATADIRNAME%g -s%@INSTOBJEXT@%$INSTOBJEXT%g -s%@GENCAT@%$GENCAT%g -s%@MKINSTALLDIRS@%$MKINSTALLDIRS%g -s%@INTL_LIBTOOL_SUFFIX_PREFIX@%$INTL_LIBTOOL_SUFFIX_PREFIX%g -s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g -s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g -s%@INSTALL_DATA@%$INSTALL_DATA%g -s%@WINDRES@%$WINDRES%g -s%@SDL12_CONFIG@%$SDL12_CONFIG%g -s%@SDL11_CONFIG@%$SDL11_CONFIG%g -s%@SDL_CONFIG@%$SDL_CONFIG%g -s%@ESD_CONFIG@%$ESD_CONFIG%g -s%@ARTS_CONFIG@%$ARTS_CONFIG%g -s%@GTK12_CONFIG@%$GTK12_CONFIG%g -s%@GTK_CONFIG@%$GTK_CONFIG%g -s%@GNOME_CONFIG@%$GNOME_CONFIG%g -s%@DATA_PATH@%$DATA_PATH%g -s%@PLUGIN_PATH@%$PLUGIN_PATH%g -s%@SYS@%$SYS%g -s%@ARCH@%$ARCH%g -s%@PLUGINS@%$PLUGINS%g -s%@BUILTINS@%$BUILTINS%g -s%@ALIASES@%$ALIASES%g -s%@DEBUG@%$DEBUG%g -s%@ASM@%$ASM%g -s%@CPROF@%$CPROF%g -s%@GPROF@%$GPROF%g -s%@OPTIMS@%$OPTIMS%g -s%@TUNING@%$TUNING%g -s%@RELEASE@%$RELEASE%g -s%@MOC@%$MOC%g -s%@BCBUILDER@%$BCBUILDER%g -s%@PACKAGE@%$PACKAGE%g -s%@VERSION@%$VERSION%g -s%@NEED_GETOPT@%$NEED_GETOPT%g -s%@CFLAGS_OPTIM@%$CFLAGS_OPTIM%g -s%@CFLAGS_OPTIM_NODEBUG@%$CFLAGS_OPTIM_NODEBUG%g -s%@vlc_CFLAGS@%$vlc_CFLAGS%g -s%@plugins_CFLAGS@%$plugins_CFLAGS%g -s%@builtins_CFLAGS@%$builtins_CFLAGS%g -s%@a52_CFLAGS@%$a52_CFLAGS%g -s%@arts_CFLAGS@%$arts_CFLAGS%g -s%@dvd_CFLAGS@%$dvd_CFLAGS%g -s%@dvdread_CFLAGS@%$dvdread_CFLAGS%g -s%@mpeg_ts_dvbpsi_CFLAGS@%$mpeg_ts_dvbpsi_CFLAGS%g -s%@directx_CFLAGS@%$directx_CFLAGS%g -s%@esd_CFLAGS@%$esd_CFLAGS%g -s%@ffmpeg_CFLAGS@%$ffmpeg_CFLAGS%g -s%@glide_CFLAGS@%$glide_CFLAGS%g -s%@gnome_CFLAGS@%$gnome_CFLAGS%g -s%@gtk_CFLAGS@%$gtk_CFLAGS%g -s%@kde_CFLAGS@%$kde_CFLAGS%g -s%@idctaltivec_CFLAGS@%$idctaltivec_CFLAGS%g -s%@macosx_CFLAGS@%$macosx_CFLAGS%g -s%@mad_CFLAGS@%$mad_CFLAGS%g -s%@memcpyaltivec_CFLAGS@%$memcpyaltivec_CFLAGS%g -s%@motionaltivec_CFLAGS@%$motionaltivec_CFLAGS%g -s%@qt_CFLAGS@%$qt_CFLAGS%g -s%@sdl_CFLAGS@%$sdl_CFLAGS%g -s%@x11_CFLAGS@%$x11_CFLAGS%g -s%@xvideo_CFLAGS@%$xvideo_CFLAGS%g -s%@vlc_LDFLAGS@%$vlc_LDFLAGS%g -s%@plugins_LDFLAGS@%$plugins_LDFLAGS%g -s%@builtins_LDFLAGS@%$builtins_LDFLAGS%g -s%@a52_LDFLAGS@%$a52_LDFLAGS%g -s%@aa_LDFLAGS@%$aa_LDFLAGS%g -s%@alsa_LDFLAGS@%$alsa_LDFLAGS%g -s%@arts_LDFLAGS@%$arts_LDFLAGS%g -s%@beos_LDFLAGS@%$beos_LDFLAGS%g -s%@chroma_i420_rgb_LDFLAGS@%$chroma_i420_rgb_LDFLAGS%g -s%@directx_LDFLAGS@%$directx_LDFLAGS%g -s%@dsp_LDFLAGS@%$dsp_LDFLAGS%g -s%@dvd_LDFLAGS@%$dvd_LDFLAGS%g -s%@dvdread_LDFLAGS@%$dvdread_LDFLAGS%g -s%@mpeg_ts_dvbpsi_LDFLAGS@%$mpeg_ts_dvbpsi_LDFLAGS%g -s%@esd_LDFLAGS@%$esd_LDFLAGS%g -s%@filter_distort_LDFLAGS@%$filter_distort_LDFLAGS%g -s%@ffmpeg_LDFLAGS@%$ffmpeg_LDFLAGS%g -s%@ggi_LDFLAGS@%$ggi_LDFLAGS%g -s%@glide_LDFLAGS@%$glide_LDFLAGS%g -s%@gnome_LDFLAGS@%$gnome_LDFLAGS%g -s%@gtk_LDFLAGS@%$gtk_LDFLAGS%g -s%@http_LDFLAGS@%$http_LDFLAGS%g -s%@idctaltivec_LDFLAGS@%$idctaltivec_LDFLAGS%g -s%@imdct_LDFLAGS@%$imdct_LDFLAGS%g -s%@imdct3dn_LDFLAGS@%$imdct3dn_LDFLAGS%g -s%@imdctsse_LDFLAGS@%$imdctsse_LDFLAGS%g -s%@ipv4_LDFLAGS@%$ipv4_LDFLAGS%g -s%@ipv6_LDFLAGS@%$ipv6_LDFLAGS%g -s%@kde_LDFLAGS@%$kde_LDFLAGS%g -s%@lirc_LDFLAGS@%$lirc_LDFLAGS%g -s%@macosx_LDFLAGS@%$macosx_LDFLAGS%g -s%@mad_LDFLAGS@%$mad_LDFLAGS%g -s%@memcpyaltivec_LDFLAGS@%$memcpyaltivec_LDFLAGS%g -s%@motionaltivec_LDFLAGS@%$motionaltivec_LDFLAGS%g -s%@ncurses_LDFLAGS@%$ncurses_LDFLAGS%g -s%@qnx_LDFLAGS@%$qnx_LDFLAGS%g -s%@qt_LDFLAGS@%$qt_LDFLAGS%g -s%@rc_LDFLAGS@%$rc_LDFLAGS%g -s%@sdl_LDFLAGS@%$sdl_LDFLAGS%g -s%@vcd_LDFLAGS@%$vcd_LDFLAGS%g -s%@vorbis_LDFLAGS@%$vorbis_LDFLAGS%g -s%@waveout_LDFLAGS@%$waveout_LDFLAGS%g -s%@x11_LDFLAGS@%$x11_LDFLAGS%g -s%@xvideo_LDFLAGS@%$xvideo_LDFLAGS%g +case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in + *c*,-n*) ECHO_N= ECHO_C=' +' ECHO_T=' ' ;; + *c*,* ) ECHO_N=-n ECHO_C= ECHO_T= ;; + *) ECHO_N= ECHO_C='\c' ECHO_T= ;; +esac -CEOF -EOF +if expr a : '\(a\)' >/dev/null 2>&1; then + as_expr=expr +else + as_expr=false +fi -cat >> $CONFIG_STATUS <<\EOF - -# Split the substitutions into bite-sized pieces for seds with -# small command number limits, like on Digital OSF/1 and HP-UX. -ac_max_sed_cmds=90 # Maximum number of lines to put in a sed script. -ac_file=1 # Number of current file. -ac_beg=1 # First line for current file. -ac_end=$ac_max_sed_cmds # Line after last line for current file. -ac_more_lines=: -ac_sed_cmds="" -while $ac_more_lines; do - if test $ac_beg -gt 1; then - sed "1,${ac_beg}d; ${ac_end}q" conftest.subs > conftest.s$ac_file - else - sed "${ac_end}q" conftest.subs > conftest.s$ac_file - fi - if test ! -s conftest.s$ac_file; then - ac_more_lines=false - rm -f conftest.s$ac_file +rm -f conf$$ conf$$.exe conf$$.file +echo >conf$$.file +if ln -s conf$$.file conf$$ 2>/dev/null; then + # We could just check for DJGPP; but this test a) works b) is more generic + # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04). + if test -f conf$$.exe; then + # Don't use ln at all; we don't have any links + as_ln_s='cp -p' else - if test -z "$ac_sed_cmds"; then - ac_sed_cmds="sed -f conftest.s$ac_file" - else - ac_sed_cmds="$ac_sed_cmds | sed -f conftest.s$ac_file" - fi - ac_file=`expr $ac_file + 1` - ac_beg=$ac_end - ac_end=`expr $ac_end + $ac_max_sed_cmds` + as_ln_s='ln -s' fi -done -if test -z "$ac_sed_cmds"; then - ac_sed_cmds=cat +elif ln conf$$.file conf$$ 2>/dev/null; then + as_ln_s=ln +else + as_ln_s='cp -p' fi -EOF +rm -f conf$$ conf$$.exe conf$$.file -cat >> $CONFIG_STATUS <> $CONFIG_STATUS <<\EOF -for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then - # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in". - case "$ac_file" in - *:*) ac_file_in=`echo "$ac_file"|sed 's%[^:]*:%%'` - ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;; - *) ac_file_in="${ac_file}.in" ;; +# Sed expression to map a string onto a valid CPP name. +as_tr_cpp="sed y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g" + +# Sed expression to map a string onto a valid variable name. +as_tr_sh="sed y%*+%pp%;s%[^_$as_cr_alnum]%_%g" + + +# IFS +# We need space, tab and new line, in precisely that order. +as_nl=' +' +IFS=" $as_nl" + +# CDPATH. +$as_unset CDPATH || test "${CDPATH+set}" != set || { CDPATH=$PATH_SEPARATOR; export CDPATH; } + +exec 6>&1 + +# Open the log real soon, to keep \$[0] and so on meaningful, and to +# report actual input values of CONFIG_FILES etc. instead of their +# values after options handling. Logging --version etc. is OK. +exec 5>>config.log +{ + echo + sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX +## Running $as_me. ## +_ASBOX +} >&5 +cat >&5 <<_CSEOF + +This file was extended by $as_me, which was +generated by GNU Autoconf 2.53. Invocation command line was + + CONFIG_FILES = $CONFIG_FILES + CONFIG_HEADERS = $CONFIG_HEADERS + CONFIG_LINKS = $CONFIG_LINKS + CONFIG_COMMANDS = $CONFIG_COMMANDS + $ $0 $@ + +_CSEOF +echo "on `(hostname || uname -n) 2>/dev/null | sed 1q`" >&5 +echo >&5 +_ACEOF + +# Files that config.status was made for. +if test -n "$ac_config_files"; then + echo "config_files=\"$ac_config_files\"" >>$CONFIG_STATUS +fi + +if test -n "$ac_config_headers"; then + echo "config_headers=\"$ac_config_headers\"" >>$CONFIG_STATUS +fi + +if test -n "$ac_config_links"; then + echo "config_links=\"$ac_config_links\"" >>$CONFIG_STATUS +fi + +if test -n "$ac_config_commands"; then + echo "config_commands=\"$ac_config_commands\"" >>$CONFIG_STATUS +fi + +cat >>$CONFIG_STATUS <<\_ACEOF + +ac_cs_usage="\ +\`$as_me' instantiates files from templates according to the +current configuration. + +Usage: $0 [OPTIONS] [FILE]... + + -h, --help print this help, then exit + -V, --version print version number, then exit + -d, --debug don't remove temporary files + --recheck update $as_me by reconfiguring in the same conditions + --file=FILE[:TEMPLATE] + instantiate the configuration file FILE + --header=FILE[:TEMPLATE] + instantiate the configuration header FILE + +Configuration files: +$config_files + +Configuration headers: +$config_headers + +Configuration commands: +$config_commands + +Report bugs to ." +_ACEOF + +cat >>$CONFIG_STATUS <<_ACEOF +ac_cs_version="\\ +config.status +configured by $0, generated by GNU Autoconf 2.53, + with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" + +Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001 +Free Software Foundation, Inc. +This config.status script is free software; the Free Software Foundation +gives unlimited permission to copy, distribute and modify it." +srcdir=$srcdir +INSTALL="$INSTALL" +_ACEOF + +cat >>$CONFIG_STATUS <<\_ACEOF +# If no file are specified by the user, then we need to provide default +# value. By we need to know if files were specified by the user. +ac_need_defaults=: +while test $# != 0 +do + case $1 in + --*=*) + ac_option=`expr "x$1" : 'x\([^=]*\)='` + ac_optarg=`expr "x$1" : 'x[^=]*=\(.*\)'` + shift + set dummy "$ac_option" "$ac_optarg" ${1+"$@"} + shift + ;; + -*);; + *) # This is not an option, so the user has probably given explicit + # arguments. + ac_need_defaults=false;; esac - # Adjust a relative srcdir, top_srcdir, and INSTALL for subdirectories. + case $1 in + # Handling of the options. +_ACEOF +cat >>$CONFIG_STATUS <<_ACEOF + -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) + echo "running $SHELL $0 " $ac_configure_args " --no-create --no-recursion" + exec $SHELL $0 $ac_configure_args --no-create --no-recursion ;; +_ACEOF +cat >>$CONFIG_STATUS <<\_ACEOF + --version | --vers* | -V ) + echo "$ac_cs_version"; exit 0 ;; + --he | --h) + # Conflict between --help and --header + { { echo "$as_me:$LINENO: error: ambiguous option: $1 +Try \`$0 --help' for more information." >&5 +echo "$as_me: error: ambiguous option: $1 +Try \`$0 --help' for more information." >&2;} + { (exit 1); exit 1; }; };; + --help | --hel | -h ) + echo "$ac_cs_usage"; exit 0 ;; + --debug | --d* | -d ) + debug=: ;; + --file | --fil | --fi | --f ) + shift + CONFIG_FILES="$CONFIG_FILES $1" + ac_need_defaults=false;; + --header | --heade | --head | --hea ) + shift + CONFIG_HEADERS="$CONFIG_HEADERS $1" + ac_need_defaults=false;; + + # This is an error. + -*) { { echo "$as_me:$LINENO: error: unrecognized option: $1 +Try \`$0 --help' for more information." >&5 +echo "$as_me: error: unrecognized option: $1 +Try \`$0 --help' for more information." >&2;} + { (exit 1); exit 1; }; } ;; - # Remove last slash and all that follows it. Not all systems have dirname. - ac_dir=`echo $ac_file|sed 's%/[^/][^/]*$%%'` - if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then - # The file is in a subdirectory. - test ! -d "$ac_dir" && mkdir "$ac_dir" - ac_dir_suffix="/`echo $ac_dir|sed 's%^\./%%'`" - # A "../" for each directory in $ac_dir_suffix. - ac_dots=`echo $ac_dir_suffix|sed 's%/[^/]*%../%g'` - else - ac_dir_suffix= ac_dots= + *) ac_config_targets="$ac_config_targets $1" ;; + + esac + shift +done + +_ACEOF + +cat >>$CONFIG_STATUS <<_ACEOF +# +# INIT-COMMANDS section. +# + + + +_ACEOF + + + +cat >>$CONFIG_STATUS <<\_ACEOF +for ac_config_target in $ac_config_targets +do + case "$ac_config_target" in + # Handling of arguments. + "Makefile.config" ) CONFIG_FILES="$CONFIG_FILES Makefile.config" ;; + "Makefile.opts" ) CONFIG_FILES="$CONFIG_FILES Makefile.opts" ;; + "po/Makefile.in" ) CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;; + "default-1" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;; + "include/defs.h" ) CONFIG_HEADERS="$CONFIG_HEADERS include/defs.h" ;; + *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 +echo "$as_me: error: invalid argument: $ac_config_target" >&2;} + { (exit 1); exit 1; }; };; + esac +done + +# If the user did not use the arguments to specify the items to instantiate, +# then the envvar interface is used. Set only those that are not. +# We use the long form for the default assignment because of an extremely +# bizarre bug on SunOS 4.1.3. +if $ac_need_defaults; then + test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files + test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers + test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands +fi + +# Create a temporary directory, and hook for its removal unless debugging. +$debug || +{ + trap 'exit_status=$?; rm -rf $tmp && exit $exit_status' 0 + trap '{ (exit 1); exit 1; }' 1 2 13 15 +} + +# Create a (secure) tmp directory for tmp files. +: ${TMPDIR=/tmp} +{ + tmp=`(umask 077 && mktemp -d -q "$TMPDIR/csXXXXXX") 2>/dev/null` && + test -n "$tmp" && test -d "$tmp" +} || +{ + tmp=$TMPDIR/cs$$-$RANDOM + (umask 077 && mkdir $tmp) +} || +{ + echo "$me: cannot create a temporary directory in $TMPDIR" >&2 + { (exit 1); exit 1; } +} + +_ACEOF + +cat >>$CONFIG_STATUS <<_ACEOF + +# +# CONFIG_FILES section. +# + +# No need to generate the scripts if there are no CONFIG_FILES. +# This happens for instance when ./config.status config.h +if test -n "\$CONFIG_FILES"; then + # Protect against being on the right side of a sed subst in config.status. + sed 's/,@/@@/; s/@,/@@/; s/,;t t\$/@;t t/; /@;t t\$/s/[\\\\&,]/\\\\&/g; + s/@@/,@/; s/@@/@,/; s/@;t t\$/,;t t/' >\$tmp/subs.sed <<\\CEOF +s,@SHELL@,$SHELL,;t t +s,@PATH_SEPARATOR@,$PATH_SEPARATOR,;t t +s,@PACKAGE_NAME@,$PACKAGE_NAME,;t t +s,@PACKAGE_TARNAME@,$PACKAGE_TARNAME,;t t +s,@PACKAGE_VERSION@,$PACKAGE_VERSION,;t t +s,@PACKAGE_STRING@,$PACKAGE_STRING,;t t +s,@PACKAGE_BUGREPORT@,$PACKAGE_BUGREPORT,;t t +s,@exec_prefix@,$exec_prefix,;t t +s,@prefix@,$prefix,;t t +s,@program_transform_name@,$program_transform_name,;t t +s,@bindir@,$bindir,;t t +s,@sbindir@,$sbindir,;t t +s,@libexecdir@,$libexecdir,;t t +s,@datadir@,$datadir,;t t +s,@sysconfdir@,$sysconfdir,;t t +s,@sharedstatedir@,$sharedstatedir,;t t +s,@localstatedir@,$localstatedir,;t t +s,@libdir@,$libdir,;t t +s,@includedir@,$includedir,;t t +s,@oldincludedir@,$oldincludedir,;t t +s,@infodir@,$infodir,;t t +s,@mandir@,$mandir,;t t +s,@build_alias@,$build_alias,;t t +s,@host_alias@,$host_alias,;t t +s,@target_alias@,$target_alias,;t t +s,@DEFS@,$DEFS,;t t +s,@ECHO_C@,$ECHO_C,;t t +s,@ECHO_N@,$ECHO_N,;t t +s,@ECHO_T@,$ECHO_T,;t t +s,@LIBS@,$LIBS,;t t +s,@build@,$build,;t t +s,@build_cpu@,$build_cpu,;t t +s,@build_vendor@,$build_vendor,;t t +s,@build_os@,$build_os,;t t +s,@host@,$host,;t t +s,@host_cpu@,$host_cpu,;t t +s,@host_vendor@,$host_vendor,;t t +s,@host_os@,$host_os,;t t +s,@target@,$target,;t t +s,@target_cpu@,$target_cpu,;t t +s,@target_vendor@,$target_vendor,;t t +s,@target_os@,$target_os,;t t +s,@SET_MAKE@,$SET_MAKE,;t t +s,@CC@,$CC,;t t +s,@CFLAGS@,$CFLAGS,;t t +s,@LDFLAGS@,$LDFLAGS,;t t +s,@CPPFLAGS@,$CPPFLAGS,;t t +s,@ac_ct_CC@,$ac_ct_CC,;t t +s,@EXEEXT@,$EXEEXT,;t t +s,@OBJEXT@,$OBJEXT,;t t +s,@CPP@,$CPP,;t t +s,@RANLIB@,$RANLIB,;t t +s,@ac_ct_RANLIB@,$ac_ct_RANLIB,;t t +s,@STRIP@,$STRIP,;t t +s,@ac_ct_STRIP@,$ac_ct_STRIP,;t t +s,@AR@,$AR,;t t +s,@ac_ct_AR@,$ac_ct_AR,;t t +s,@LD@,$LD,;t t +s,@ac_ct_LD@,$ac_ct_LD,;t t +s,@GMAKE@,$GMAKE,;t t +s,@ALLOCA@,$ALLOCA,;t t +s,@GLIBC21@,$GLIBC21,;t t +s,@LIBICONV@,$LIBICONV,;t t +s,@USE_NLS@,$USE_NLS,;t t +s,@MSGFMT@,$MSGFMT,;t t +s,@GMSGFMT@,$GMSGFMT,;t t +s,@XGETTEXT@,$XGETTEXT,;t t +s,@INTLBISON@,$INTLBISON,;t t +s,@BUILD_INCLUDED_LIBINTL@,$BUILD_INCLUDED_LIBINTL,;t t +s,@USE_INCLUDED_LIBINTL@,$USE_INCLUDED_LIBINTL,;t t +s,@CATALOGS@,$CATALOGS,;t t +s,@CATOBJEXT@,$CATOBJEXT,;t t +s,@GMOFILES@,$GMOFILES,;t t +s,@INTLLIBS@,$INTLLIBS,;t t +s,@INTLOBJS@,$INTLOBJS,;t t +s,@POFILES@,$POFILES,;t t +s,@POSUB@,$POSUB,;t t +s,@DATADIRNAME@,$DATADIRNAME,;t t +s,@INSTOBJEXT@,$INSTOBJEXT,;t t +s,@GENCAT@,$GENCAT,;t t +s,@MKINSTALLDIRS@,$MKINSTALLDIRS,;t t +s,@INTL_LIBTOOL_SUFFIX_PREFIX@,$INTL_LIBTOOL_SUFFIX_PREFIX,;t t +s,@INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t +s,@INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t +s,@INSTALL_DATA@,$INSTALL_DATA,;t t +s,@WINDRES@,$WINDRES,;t t +s,@ac_ct_WINDRES@,$ac_ct_WINDRES,;t t +s,@SDL12_CONFIG@,$SDL12_CONFIG,;t t +s,@SDL11_CONFIG@,$SDL11_CONFIG,;t t +s,@SDL_CONFIG@,$SDL_CONFIG,;t t +s,@ESD_CONFIG@,$ESD_CONFIG,;t t +s,@ARTS_CONFIG@,$ARTS_CONFIG,;t t +s,@GTK12_CONFIG@,$GTK12_CONFIG,;t t +s,@GTK_CONFIG@,$GTK_CONFIG,;t t +s,@GNOME_CONFIG@,$GNOME_CONFIG,;t t +s,@DATA_PATH@,$DATA_PATH,;t t +s,@PLUGIN_PATH@,$PLUGIN_PATH,;t t +s,@SYS@,$SYS,;t t +s,@ARCH@,$ARCH,;t t +s,@PLUGINS@,$PLUGINS,;t t +s,@BUILTINS@,$BUILTINS,;t t +s,@ALIASES@,$ALIASES,;t t +s,@DEBUG@,$DEBUG,;t t +s,@ASM@,$ASM,;t t +s,@CPROF@,$CPROF,;t t +s,@GPROF@,$GPROF,;t t +s,@OPTIMS@,$OPTIMS,;t t +s,@TUNING@,$TUNING,;t t +s,@RELEASE@,$RELEASE,;t t +s,@MOC@,$MOC,;t t +s,@BCBUILDER@,$BCBUILDER,;t t +s,@PACKAGE@,$PACKAGE,;t t +s,@VERSION@,$VERSION,;t t +s,@NEED_GETOPT@,$NEED_GETOPT,;t t +s,@CFLAGS_OPTIM@,$CFLAGS_OPTIM,;t t +s,@CFLAGS_OPTIM_NODEBUG@,$CFLAGS_OPTIM_NODEBUG,;t t +s,@vlc_CFLAGS@,$vlc_CFLAGS,;t t +s,@plugins_CFLAGS@,$plugins_CFLAGS,;t t +s,@builtins_CFLAGS@,$builtins_CFLAGS,;t t +s,@a52_CFLAGS@,$a52_CFLAGS,;t t +s,@arts_CFLAGS@,$arts_CFLAGS,;t t +s,@dvd_CFLAGS@,$dvd_CFLAGS,;t t +s,@dvdread_CFLAGS@,$dvdread_CFLAGS,;t t +s,@mpeg_ts_dvbpsi_CFLAGS@,$mpeg_ts_dvbpsi_CFLAGS,;t t +s,@directx_CFLAGS@,$directx_CFLAGS,;t t +s,@esd_CFLAGS@,$esd_CFLAGS,;t t +s,@familiar_CFLAGS@,$familiar_CFLAGS,;t t +s,@ffmpeg_CFLAGS@,$ffmpeg_CFLAGS,;t t +s,@glide_CFLAGS@,$glide_CFLAGS,;t t +s,@gnome_CFLAGS@,$gnome_CFLAGS,;t t +s,@gtk_CFLAGS@,$gtk_CFLAGS,;t t +s,@kde_CFLAGS@,$kde_CFLAGS,;t t +s,@idctaltivec_CFLAGS@,$idctaltivec_CFLAGS,;t t +s,@macosx_CFLAGS@,$macosx_CFLAGS,;t t +s,@mad_CFLAGS@,$mad_CFLAGS,;t t +s,@memcpyaltivec_CFLAGS@,$memcpyaltivec_CFLAGS,;t t +s,@motionaltivec_CFLAGS@,$motionaltivec_CFLAGS,;t t +s,@opie_CFLAGS@,$opie_CFLAGS,;t t +s,@qt_CFLAGS@,$qt_CFLAGS,;t t +s,@qte_CFLAGS@,$qte_CFLAGS,;t t +s,@sdl_CFLAGS@,$sdl_CFLAGS,;t t +s,@x11_CFLAGS@,$x11_CFLAGS,;t t +s,@xvideo_CFLAGS@,$xvideo_CFLAGS,;t t +s,@vlc_LDFLAGS@,$vlc_LDFLAGS,;t t +s,@plugins_LDFLAGS@,$plugins_LDFLAGS,;t t +s,@builtins_LDFLAGS@,$builtins_LDFLAGS,;t t +s,@a52_LDFLAGS@,$a52_LDFLAGS,;t t +s,@aa_LDFLAGS@,$aa_LDFLAGS,;t t +s,@alsa_LDFLAGS@,$alsa_LDFLAGS,;t t +s,@arts_LDFLAGS@,$arts_LDFLAGS,;t t +s,@beos_LDFLAGS@,$beos_LDFLAGS,;t t +s,@chroma_i420_rgb_LDFLAGS@,$chroma_i420_rgb_LDFLAGS,;t t +s,@directx_LDFLAGS@,$directx_LDFLAGS,;t t +s,@dsp_LDFLAGS@,$dsp_LDFLAGS,;t t +s,@dvd_LDFLAGS@,$dvd_LDFLAGS,;t t +s,@dvdread_LDFLAGS@,$dvdread_LDFLAGS,;t t +s,@mpeg_ts_dvbpsi_LDFLAGS@,$mpeg_ts_dvbpsi_LDFLAGS,;t t +s,@esd_LDFLAGS@,$esd_LDFLAGS,;t t +s,@familiar_LDFLAGS@,$familiar_LDFLAGS,;t t +s,@filter_distort_LDFLAGS@,$filter_distort_LDFLAGS,;t t +s,@ffmpeg_LDFLAGS@,$ffmpeg_LDFLAGS,;t t +s,@ggi_LDFLAGS@,$ggi_LDFLAGS,;t t +s,@glide_LDFLAGS@,$glide_LDFLAGS,;t t +s,@gnome_LDFLAGS@,$gnome_LDFLAGS,;t t +s,@gtk_LDFLAGS@,$gtk_LDFLAGS,;t t +s,@http_LDFLAGS@,$http_LDFLAGS,;t t +s,@idctaltivec_LDFLAGS@,$idctaltivec_LDFLAGS,;t t +s,@imdct_LDFLAGS@,$imdct_LDFLAGS,;t t +s,@imdct3dn_LDFLAGS@,$imdct3dn_LDFLAGS,;t t +s,@imdctsse_LDFLAGS@,$imdctsse_LDFLAGS,;t t +s,@ipv4_LDFLAGS@,$ipv4_LDFLAGS,;t t +s,@ipv6_LDFLAGS@,$ipv6_LDFLAGS,;t t +s,@kde_LDFLAGS@,$kde_LDFLAGS,;t t +s,@lirc_LDFLAGS@,$lirc_LDFLAGS,;t t +s,@macosx_LDFLAGS@,$macosx_LDFLAGS,;t t +s,@mad_LDFLAGS@,$mad_LDFLAGS,;t t +s,@memcpyaltivec_LDFLAGS@,$memcpyaltivec_LDFLAGS,;t t +s,@motionaltivec_LDFLAGS@,$motionaltivec_LDFLAGS,;t t +s,@ncurses_LDFLAGS@,$ncurses_LDFLAGS,;t t +s,@opie_LDFLAGS@,$opie_LDFLAGS,;t t +s,@qnx_LDFLAGS@,$qnx_LDFLAGS,;t t +s,@qt_LDFLAGS@,$qt_LDFLAGS,;t t +s,@qte_LDFLAGS@,$qte_LDFLAGS,;t t +s,@rc_LDFLAGS@,$rc_LDFLAGS,;t t +s,@sdl_LDFLAGS@,$sdl_LDFLAGS,;t t +s,@vcd_LDFLAGS@,$vcd_LDFLAGS,;t t +s,@vorbis_LDFLAGS@,$vorbis_LDFLAGS,;t t +s,@waveout_LDFLAGS@,$waveout_LDFLAGS,;t t +s,@x11_LDFLAGS@,$x11_LDFLAGS,;t t +s,@xvideo_LDFLAGS@,$xvideo_LDFLAGS,;t t +CEOF + +_ACEOF + + cat >>$CONFIG_STATUS <<\_ACEOF + # Split the substitutions into bite-sized pieces for seds with + # small command number limits, like on Digital OSF/1 and HP-UX. + ac_max_sed_lines=48 + ac_sed_frag=1 # Number of current file. + ac_beg=1 # First line for current file. + ac_end=$ac_max_sed_lines # Line after last line for current file. + ac_more_lines=: + ac_sed_cmds= + while $ac_more_lines; do + if test $ac_beg -gt 1; then + sed "1,${ac_beg}d; ${ac_end}q" $tmp/subs.sed >$tmp/subs.frag + else + sed "${ac_end}q" $tmp/subs.sed >$tmp/subs.frag + fi + if test ! -s $tmp/subs.frag; then + ac_more_lines=false + else + # The purpose of the label and of the branching condition is to + # speed up the sed processing (if there are no `@' at all, there + # is no need to browse any of the substitutions). + # These are the two extra sed commands mentioned above. + (echo ':t + /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && cat $tmp/subs.frag) >$tmp/subs-$ac_sed_frag.sed + if test -z "$ac_sed_cmds"; then + ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed" + else + ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed" + fi + ac_sed_frag=`expr $ac_sed_frag + 1` + ac_beg=$ac_end + ac_end=`expr $ac_end + $ac_max_sed_lines` + fi + done + if test -z "$ac_sed_cmds"; then + ac_sed_cmds=cat fi +fi # test -n "$CONFIG_FILES" - case "$ac_given_srcdir" in - .) srcdir=. - if test -z "$ac_dots"; then top_srcdir=. - else top_srcdir=`echo $ac_dots|sed 's%/$%%'`; fi ;; - /*) srcdir="$ac_given_srcdir$ac_dir_suffix"; top_srcdir="$ac_given_srcdir" ;; - *) # Relative path. - srcdir="$ac_dots$ac_given_srcdir$ac_dir_suffix" - top_srcdir="$ac_dots$ac_given_srcdir" ;; +_ACEOF +cat >>$CONFIG_STATUS <<\_ACEOF +for ac_file in : $CONFIG_FILES; do test "x$ac_file" = x: && continue + # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in". + case $ac_file in + - | *:- | *:-:* ) # input from stdin + cat >$tmp/stdin + ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` + ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; + *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` + ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; + * ) ac_file_in=$ac_file.in ;; esac - case "$ac_given_INSTALL" in - [/$]*) INSTALL="$ac_given_INSTALL" ;; - *) INSTALL="$ac_dots$ac_given_INSTALL" ;; + # Compute @srcdir@, @top_srcdir@, and @INSTALL@ for subdirectories. + ac_dir=`(dirname "$ac_file") 2>/dev/null || +$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$ac_file" : 'X\(//\)[^/]' \| \ + X"$ac_file" : 'X\(//\)$' \| \ + X"$ac_file" : 'X\(/\)' \| \ + . : '\(.\)' 2>/dev/null || +echo X"$ac_file" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } + /^X\(\/\/\)[^/].*/{ s//\1/; q; } + /^X\(\/\/\)$/{ s//\1/; q; } + /^X\(\/\).*/{ s//\1/; q; } + s/.*/./; q'` + { case "$ac_dir" in + [\\/]* | ?:[\\/]* ) as_incr_dir=;; + *) as_incr_dir=.;; +esac +as_dummy="$ac_dir" +for as_mkdir_dir in `IFS='/\\'; set X $as_dummy; shift; echo "$@"`; do + case $as_mkdir_dir in + # Skip DOS drivespec + ?:) as_incr_dir=$as_mkdir_dir ;; + *) + as_incr_dir=$as_incr_dir/$as_mkdir_dir + test -d "$as_incr_dir" || + mkdir "$as_incr_dir" || + { { echo "$as_me:$LINENO: error: cannot create \"$ac_dir\"" >&5 +echo "$as_me: error: cannot create \"$ac_dir\"" >&2;} + { (exit 1); exit 1; }; } + ;; esac +done; } + + ac_builddir=. - echo creating "$ac_file" - rm -f "$ac_file" - configure_input="Generated automatically from `echo $ac_file_in|sed 's%.*/%%'` by configure." - case "$ac_file" in - *Makefile*) ac_comsub="1i\\ -# $configure_input" ;; - *) ac_comsub= ;; +if test "$ac_dir" != .; then + ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'` + # A "../" for each directory in $ac_dir_suffix. + ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'` +else + ac_dir_suffix= ac_top_builddir= +fi + +case $srcdir in + .) # No --srcdir option. We are building in place. + ac_srcdir=. + if test -z "$ac_top_builddir"; then + ac_top_srcdir=. + else + ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'` + fi ;; + [\\/]* | ?:[\\/]* ) # Absolute path. + ac_srcdir=$srcdir$ac_dir_suffix; + ac_top_srcdir=$srcdir ;; + *) # Relative path. + ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix + ac_top_srcdir=$ac_top_builddir$srcdir ;; +esac +# Don't blindly perform a `cd "$ac_dir"/$ac_foo && pwd` since $ac_foo can be +# absolute. +ac_abs_builddir=`cd "$ac_dir" && cd $ac_builddir && pwd` +ac_abs_top_builddir=`cd "$ac_dir" && cd $ac_top_builddir && pwd` +ac_abs_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd` +ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd` + + + case $INSTALL in + [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;; + *) ac_INSTALL=$ac_top_builddir$INSTALL ;; esac - ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"` - sed -e "$ac_comsub -s%@configure_input@%$configure_input%g -s%@srcdir@%$srcdir%g -s%@top_srcdir@%$top_srcdir%g -s%@INSTALL@%$INSTALL%g -" $ac_file_inputs | (eval "$ac_sed_cmds") > $ac_file -fi; done -rm -f conftest.s* + if test x"$ac_file" != x-; then + { echo "$as_me:$LINENO: creating $ac_file" >&5 +echo "$as_me: creating $ac_file" >&6;} + rm -f "$ac_file" + fi + # Let's still pretend it is `configure' which instantiates (i.e., don't + # use $as_me), people would be surprised to read: + # /* config.h. Generated by config.status. */ + if test x"$ac_file" = x-; then + configure_input= + else + configure_input="$ac_file. " + fi + configure_input=$configure_input"Generated from `echo $ac_file_in | + sed 's,.*/,,'` by configure." + + # First look for the input files in the build tree, otherwise in the + # src tree. + ac_file_inputs=`IFS=: + for f in $ac_file_in; do + case $f in + -) echo $tmp/stdin ;; + [\\/$]*) + # Absolute (can't be DOS-style, as IFS=:) + test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 +echo "$as_me: error: cannot find input file: $f" >&2;} + { (exit 1); exit 1; }; } + echo $f;; + *) # Relative + if test -f "$f"; then + # Build tree + echo $f + elif test -f "$srcdir/$f"; then + # Source tree + echo $srcdir/$f + else + # /dev/null tree + { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 +echo "$as_me: error: cannot find input file: $f" >&2;} + { (exit 1); exit 1; }; } + fi;; + esac + done` || { (exit 1); exit 1; } +_ACEOF +cat >>$CONFIG_STATUS <<_ACEOF + sed "$ac_vpsub +$extrasub +_ACEOF +cat >>$CONFIG_STATUS <<\_ACEOF +:t +/@[a-zA-Z_][a-zA-Z_0-9]*@/!b +s,@configure_input@,$configure_input,;t t +s,@srcdir@,$ac_srcdir,;t t +s,@abs_srcdir@,$ac_abs_srcdir,;t t +s,@top_srcdir@,$ac_top_srcdir,;t t +s,@abs_top_srcdir@,$ac_abs_top_srcdir,;t t +s,@builddir@,$ac_builddir,;t t +s,@abs_builddir@,$ac_abs_builddir,;t t +s,@top_builddir@,$ac_top_builddir,;t t +s,@abs_top_builddir@,$ac_abs_top_builddir,;t t +s,@INSTALL@,$ac_INSTALL,;t t +" $ac_file_inputs | (eval "$ac_sed_cmds") >$tmp/out + rm -f $tmp/stdin + if test x"$ac_file" != x-; then + mv $tmp/out $ac_file + else + cat $tmp/out + rm -f $tmp/out + fi + +done +_ACEOF +cat >>$CONFIG_STATUS <<\_ACEOF + +# +# CONFIG_HEADER section. +# # These sed commands are passed to sed as "A NAME B NAME C VALUE D", where # NAME is the cpp macro being defined and VALUE is the value it is being given. # # ac_d sets the value in "#define NAME VALUE" lines. -ac_dA='s%^\([ ]*\)#\([ ]*define[ ][ ]*\)' -ac_dB='\([ ][ ]*\)[^ ]*%\1#\2' -ac_dC='\3' -ac_dD='%g' -# ac_u turns "#undef NAME" with trailing blanks into "#define NAME VALUE". -ac_uA='s%^\([ ]*\)#\([ ]*\)undef\([ ][ ]*\)' -ac_uB='\([ ]\)%\1#\2define\3' +ac_dA='s,^\([ ]*\)#\([ ]*define[ ][ ]*\)' +ac_dB='[ ].*$,\1#\2' +ac_dC=' ' +ac_dD=',;t' +# ac_u turns "#undef NAME" without trailing blanks into "#define NAME VALUE". +ac_uA='s,^\([ ]*\)#\([ ]*\)undef\([ ][ ]*\)' +ac_uB='$,\1#\2define\3' ac_uC=' ' -ac_uD='\4%g' -# ac_e turns "#undef NAME" without trailing blanks into "#define NAME VALUE". -ac_eA='s%^\([ ]*\)#\([ ]*\)undef\([ ][ ]*\)' -ac_eB='$%\1#\2define\3' -ac_eC=' ' -ac_eD='%g' - -if test "${CONFIG_HEADERS+set}" != set; then -EOF -cat >> $CONFIG_STATUS <> $CONFIG_STATUS <<\EOF -fi -for ac_file in .. $CONFIG_HEADERS; do if test "x$ac_file" != x..; then +ac_uD=',;t' + +for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in". - case "$ac_file" in - *:*) ac_file_in=`echo "$ac_file"|sed 's%[^:]*:%%'` - ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;; - *) ac_file_in="${ac_file}.in" ;; + case $ac_file in + - | *:- | *:-:* ) # input from stdin + cat >$tmp/stdin + ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` + ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; + *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` + ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; + * ) ac_file_in=$ac_file.in ;; esac - echo creating $ac_file - - rm -f conftest.frag conftest.in conftest.out - ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"` - cat $ac_file_inputs > conftest.in - -EOF - -# Transform confdefs.h into a sed script conftest.vals that substitutes -# the proper values into config.h.in to produce config.h. And first: -# Protect against being on the right side of a sed subst in config.status. -# Protect against being in an unquoted here document in config.status. -rm -f conftest.vals -cat > conftest.hdr <<\EOF -s/[\\&%]/\\&/g -s%[\\$`]%\\&%g -s%#define \([A-Za-z_][A-Za-z0-9_]*\) *\(.*\)%${ac_dA}\1${ac_dB}\1${ac_dC}\2${ac_dD}%gp -s%ac_d%ac_u%gp -s%ac_u%ac_e%gp -EOF -sed -n -f conftest.hdr confdefs.h > conftest.vals -rm -f conftest.hdr + test x"$ac_file" != x- && { echo "$as_me:$LINENO: creating $ac_file" >&5 +echo "$as_me: creating $ac_file" >&6;} + + # First look for the input files in the build tree, otherwise in the + # src tree. + ac_file_inputs=`IFS=: + for f in $ac_file_in; do + case $f in + -) echo $tmp/stdin ;; + [\\/$]*) + # Absolute (can't be DOS-style, as IFS=:) + test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 +echo "$as_me: error: cannot find input file: $f" >&2;} + { (exit 1); exit 1; }; } + echo $f;; + *) # Relative + if test -f "$f"; then + # Build tree + echo $f + elif test -f "$srcdir/$f"; then + # Source tree + echo $srcdir/$f + else + # /dev/null tree + { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 +echo "$as_me: error: cannot find input file: $f" >&2;} + { (exit 1); exit 1; }; } + fi;; + esac + done` || { (exit 1); exit 1; } + # Remove the trailing spaces. + sed 's/[ ]*$//' $ac_file_inputs >$tmp/in + +_ACEOF + +# Transform confdefs.h into two sed scripts, `conftest.defines' and +# `conftest.undefs', that substitutes the proper values into +# config.h.in to produce config.h. The first handles `#define' +# templates, and the second `#undef' templates. +# And first: Protect against being on the right side of a sed subst in +# config.status. Protect against being in an unquoted here document +# in config.status. +rm -f conftest.defines conftest.undefs +# Using a here document instead of a string reduces the quoting nightmare. +# Putting comments in sed scripts is not portable. +# +# `end' is used to avoid that the second main sed command (meant for +# 0-ary CPP macros) applies to n-ary macro definitions. +# See the Autoconf documentation for `clear'. +cat >confdef2sed.sed <<\_ACEOF +s/[\\&,]/\\&/g +s,[\\$`],\\&,g +t clear +: clear +s,^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*\)\(([^)]*)\)[ ]*\(.*\)$,${ac_dA}\1${ac_dB}\1\2${ac_dC}\3${ac_dD},gp +t end +s,^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\)$,${ac_dA}\1${ac_dB}\1${ac_dC}\2${ac_dD},gp +: end +_ACEOF +# If some macros were called several times there might be several times +# the same #defines, which is useless. Nevertheless, we may not want to +# sort them, since we want the *last* AC-DEFINE to be honored. +uniq confdefs.h | sed -n -f confdef2sed.sed >conftest.defines +sed 's/ac_d/ac_u/g' conftest.defines >conftest.undefs +rm -f confdef2sed.sed # This sed command replaces #undef with comments. This is necessary, for # example, in the case of _POSIX_SOURCE, which is predefined and required # on some systems where configure will not decide to define it. -cat >> conftest.vals <<\EOF -s%^[ ]*#[ ]*undef[ ][ ]*[a-zA-Z_][a-zA-Z_0-9]*%/* & */% -EOF - -# Break up conftest.vals because some shells have a limit on -# the size of here documents, and old seds have small limits too. +cat >>conftest.undefs <<\_ACEOF +s,^[ ]*#[ ]*undef[ ][ ]*[a-zA-Z_][a-zA-Z_0-9]*,/* & */, +_ACEOF + +# Break up conftest.defines because some shells have a limit on the size +# of here documents, and old seds have small limits too (100 cmds). +echo ' # Handle all the #define templates only if necessary.' >>$CONFIG_STATUS +echo ' if egrep "^[ ]*#[ ]*define" $tmp/in >/dev/null; then' >>$CONFIG_STATUS +echo ' # If there are no defines, we may have an empty if/fi' >>$CONFIG_STATUS +echo ' :' >>$CONFIG_STATUS +rm -f conftest.tail +while grep . conftest.defines >/dev/null +do + # Write a limited-size here document to $tmp/defines.sed. + echo ' cat >$tmp/defines.sed <>$CONFIG_STATUS + # Speed up: don't consider the non `#define' lines. + echo '/^[ ]*#[ ]*define/!b' >>$CONFIG_STATUS + # Work around the forget-to-reset-the-flag bug. + echo 't clr' >>$CONFIG_STATUS + echo ': clr' >>$CONFIG_STATUS + sed ${ac_max_here_lines}q conftest.defines >>$CONFIG_STATUS + echo 'CEOF + sed -f $tmp/defines.sed $tmp/in >$tmp/out + rm -f $tmp/in + mv $tmp/out $tmp/in +' >>$CONFIG_STATUS + sed 1,${ac_max_here_lines}d conftest.defines >conftest.tail + rm -f conftest.defines + mv conftest.tail conftest.defines +done +rm -f conftest.defines +echo ' fi # egrep' >>$CONFIG_STATUS +echo >>$CONFIG_STATUS +# Break up conftest.undefs because some shells have a limit on the size +# of here documents, and old seds have small limits too (100 cmds). +echo ' # Handle all the #undef templates' >>$CONFIG_STATUS rm -f conftest.tail -while : +while grep . conftest.undefs >/dev/null do - ac_lines=`grep -c . conftest.vals` - # grep -c gives empty output for an empty file on some AIX systems. - if test -z "$ac_lines" || test "$ac_lines" -eq 0; then break; fi - # Write a limited-size here document to conftest.frag. - echo ' cat > conftest.frag <> $CONFIG_STATUS - sed ${ac_max_here_lines}q conftest.vals >> $CONFIG_STATUS + # Write a limited-size here document to $tmp/undefs.sed. + echo ' cat >$tmp/undefs.sed <>$CONFIG_STATUS + # Speed up: don't consider the non `#undef' + echo '/^[ ]*#[ ]*undef/!b' >>$CONFIG_STATUS + # Work around the forget-to-reset-the-flag bug. + echo 't clr' >>$CONFIG_STATUS + echo ': clr' >>$CONFIG_STATUS + sed ${ac_max_here_lines}q conftest.undefs >>$CONFIG_STATUS echo 'CEOF - sed -f conftest.frag conftest.in > conftest.out - rm -f conftest.in - mv conftest.out conftest.in -' >> $CONFIG_STATUS - sed 1,${ac_max_here_lines}d conftest.vals > conftest.tail - rm -f conftest.vals - mv conftest.tail conftest.vals -done -rm -f conftest.vals - -cat >> $CONFIG_STATUS <<\EOF - rm -f conftest.frag conftest.h - echo "/* $ac_file. Generated automatically by configure. */" > conftest.h - cat conftest.in >> conftest.h - rm -f conftest.in - if cmp -s $ac_file conftest.h 2>/dev/null; then - echo "$ac_file is unchanged" - rm -f conftest.h + sed -f $tmp/undefs.sed $tmp/in >$tmp/out + rm -f $tmp/in + mv $tmp/out $tmp/in +' >>$CONFIG_STATUS + sed 1,${ac_max_here_lines}d conftest.undefs >conftest.tail + rm -f conftest.undefs + mv conftest.tail conftest.undefs +done +rm -f conftest.undefs + +cat >>$CONFIG_STATUS <<\_ACEOF + # Let's still pretend it is `configure' which instantiates (i.e., don't + # use $as_me), people would be surprised to read: + # /* config.h. Generated by config.status. */ + if test x"$ac_file" = x-; then + echo "/* Generated by configure. */" >$tmp/config.h else - # Remove last slash and all that follows it. Not all systems have dirname. - ac_dir=`echo $ac_file|sed 's%/[^/][^/]*$%%'` - if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then - # The file is in a subdirectory. - test ! -d "$ac_dir" && mkdir "$ac_dir" - fi - rm -f $ac_file - mv conftest.h $ac_file + echo "/* $ac_file. Generated by configure. */" >$tmp/config.h fi -fi; done - -EOF -cat >> $CONFIG_STATUS <>$tmp/config.h + rm -f $tmp/in + if test x"$ac_file" != x-; then + if cmp -s $ac_file $tmp/config.h 2>/dev/null; then + { echo "$as_me:$LINENO: $ac_file is unchanged" >&5 +echo "$as_me: $ac_file is unchanged" >&6;} + else + ac_dir=`(dirname "$ac_file") 2>/dev/null || +$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$ac_file" : 'X\(//\)[^/]' \| \ + X"$ac_file" : 'X\(//\)$' \| \ + X"$ac_file" : 'X\(/\)' \| \ + . : '\(.\)' 2>/dev/null || +echo X"$ac_file" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } + /^X\(\/\/\)[^/].*/{ s//\1/; q; } + /^X\(\/\/\)$/{ s//\1/; q; } + /^X\(\/\).*/{ s//\1/; q; } + s/.*/./; q'` + { case "$ac_dir" in + [\\/]* | ?:[\\/]* ) as_incr_dir=;; + *) as_incr_dir=.;; +esac +as_dummy="$ac_dir" +for as_mkdir_dir in `IFS='/\\'; set X $as_dummy; shift; echo "$@"`; do + case $as_mkdir_dir in + # Skip DOS drivespec + ?:) as_incr_dir=$as_mkdir_dir ;; + *) + as_incr_dir=$as_incr_dir/$as_mkdir_dir + test -d "$as_incr_dir" || + mkdir "$as_incr_dir" || + { { echo "$as_me:$LINENO: error: cannot create \"$ac_dir\"" >&5 +echo "$as_me: error: cannot create \"$ac_dir\"" >&2;} + { (exit 1); exit 1; }; } + ;; + esac +done; } + rm -f $ac_file + mv $tmp/config.h $ac_file + fi + else + cat $tmp/config.h + rm -f $tmp/config.h + fi +done +_ACEOF +cat >>$CONFIG_STATUS <<\_ACEOF -EOF -cat >> $CONFIG_STATUS <<\EOF -for ac_file in $CONFIG_FILES; do +# +# CONFIG_COMMANDS section. +# +for ac_file in : $CONFIG_COMMANDS; do test "x$ac_file" = x: && continue + ac_dest=`echo "$ac_file" | sed 's,:.*,,'` + ac_source=`echo "$ac_file" | sed 's,[^:]*:,,'` + ac_dir=`(dirname "$ac_dest") 2>/dev/null || +$as_expr X"$ac_dest" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$ac_dest" : 'X\(//\)[^/]' \| \ + X"$ac_dest" : 'X\(//\)$' \| \ + X"$ac_dest" : 'X\(/\)' \| \ + . : '\(.\)' 2>/dev/null || +echo X"$ac_dest" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } + /^X\(\/\/\)[^/].*/{ s//\1/; q; } + /^X\(\/\/\)$/{ s//\1/; q; } + /^X\(\/\).*/{ s//\1/; q; } + s/.*/./; q'` + ac_builddir=. + +if test "$ac_dir" != .; then + ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'` + # A "../" for each directory in $ac_dir_suffix. + ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'` +else + ac_dir_suffix= ac_top_builddir= +fi + +case $srcdir in + .) # No --srcdir option. We are building in place. + ac_srcdir=. + if test -z "$ac_top_builddir"; then + ac_top_srcdir=. + else + ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'` + fi ;; + [\\/]* | ?:[\\/]* ) # Absolute path. + ac_srcdir=$srcdir$ac_dir_suffix; + ac_top_srcdir=$srcdir ;; + *) # Relative path. + ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix + ac_top_srcdir=$ac_top_builddir$srcdir ;; +esac +# Don't blindly perform a `cd "$ac_dir"/$ac_foo && pwd` since $ac_foo can be +# absolute. +ac_abs_builddir=`cd "$ac_dir" && cd $ac_builddir && pwd` +ac_abs_top_builddir=`cd "$ac_dir" && cd $ac_top_builddir && pwd` +ac_abs_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd` +ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd` + + + { echo "$as_me:$LINENO: executing $ac_dest commands" >&5 +echo "$as_me: executing $ac_dest commands" >&6;} + case $ac_dest in + default-1 ) for ac_file in $CONFIG_FILES; do # Support "outfile[:infile[:infile...]]" case "$ac_file" in *:*) ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;; @@ -9144,13 +16611,36 @@ for ac_file in $CONFIG_FILES; do fi ;; esac - done + done ;; + esac +done +_ACEOF -exit 0 -EOF +cat >>$CONFIG_STATUS <<\_ACEOF + +{ (exit 0); exit 0; } +_ACEOF chmod +x $CONFIG_STATUS -rm -fr confdefs* $ac_clean_files -test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1 +ac_clean_files=$ac_clean_files_save + + +# configure is writing to config.log, and then calls config.status. +# config.status does its own redirection, appending to config.log. +# Unfortunately, on DOS this fails, as config.log is still kept open +# by configure, so config.status won't be able to write to it; its +# output is simply discarded. So we exec the FD to /dev/null, +# effectively closing config.log, so it can be properly (re)opened and +# appended to by config.status. When coming back to configure, we +# need to make the FD available again. +if test "$no_create" != yes; then + ac_cs_success=: + exec 5>/dev/null + $SHELL $CONFIG_STATUS || ac_cs_success=false + exec 5>>config.log + # Use ||, not &&, to avoid exiting from the if with $? = 1, which + # would make configure fail if this is the last instruction. + $ac_cs_success || { (exit 1); exit 1; } +fi echo " diff --git a/configure.in b/configure.in index c26b9f84b8..6ae79edd11 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.6" CODENAME=Ourumov dnl Save CFLAGS and LDFLAGS @@ -20,6 +20,8 @@ AC_PROG_CPP dnl Find the right ranlib, even when cross-compiling AC_CHECK_TOOL(RANLIB, ranlib, :) AC_CHECK_TOOL(STRIP, strip, :) +AC_CHECK_TOOL(AR, ar, :) +AC_CHECK_TOOL(LD, ld, :) dnl Check for GNU make AC_PATH_PROG(GMAKE, gmake, no) @@ -75,7 +77,7 @@ case x"${target_os}" in x*mingw32*) SYS=mingw32 AC_CHECK_TOOL(WINDRES, windres, :) - save_CFLAGS="${save_CFLAGS} -fnative-struct -D_OFF_T_ -D_off_t=long" + save_CFLAGS="${save_CFLAGS} -D_OFF_T_ -D_off_t=long" vlc_LDFLAGS="${vlc_LDFLAGS} -mwindows -Xlinker --force-exe-suffix" vlc_LDFLAGS="${vlc_LDFLAGS} -lws2_32 -lnetapi32" ipv4_LDFLAGS="${ipv4_LDFLAGS} -lws2_32" @@ -93,7 +95,7 @@ case x"${target_os}" in save_CFLAGS="${save_CFLAGS} -Wno-multichar -Wno-ctor-dtor-privacy -Woverloaded-virtual" vlc_LDFLAGS="${vlc_LDFLAGS} -lbe" plugins_LDFLAGS="${plugins_LDFLAGS} -nostart" - beos_LDFLAGS="${beos_LDFLAGS} -lbe -lgame -lroot -ltracker" + beos_LDFLAGS="${beos_LDFLAGS} -lbe -lgame -lroot -ltracker -ltranslation -lstdc++.r4" ipv4_LDFLAGS="${ipv4_LDFLAGS} -lbind" ;; x*) @@ -102,18 +104,25 @@ case x"${target_os}" in esac dnl Flags for plugin compilation -if test x"${SYS}" = xmingw32 -then - plugins_CFLAGS="${plugins_CFLAGS} -fnative-struct" -else +if test x"${SYS}" != xmingw32; then plugins_CFLAGS="${plugins_CFLAGS} -fPIC" fi +dnl Check for the need to include the mingwex lib for mingw32 +if test x$SYS = xmingw32 +then + AC_CHECK_LIB(mingwex,opendir, + AC_CHECK_LIB(mingw32,opendir,vlc_LDFLAGS="${vlc_LDFLAGS}", + [vlc_LDFLAGS="${vlc_LDFLAGS} -lmingwex" + gtk_LDFLAGS="${gtk_LDFLAGS} -lmingwex"]) + ) +fi + 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 +135,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 +202,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) @@ -329,6 +343,23 @@ if test x"$ac_cv_c_omit_frame_pointer" != x"no"; then CFLAGS_OPTIM_NODEBUG="${CFLAGS_OPTIM_NODEBUG} -fomit-frame-pointer" fi +dnl Check for fnative-struct or mms-bitfields support for mingw32 +if test x$SYS = xmingw32 +then + AC_CACHE_CHECK([if \$CC accepts -mms-bitfields], + [ac_cv_c_mms_bitfields], + [CFLAGS="${save_CFLAGS} -mms-bitfields" + AC_TRY_COMPILE([],,ac_cv_c_mms_bitfields=yes, + ac_cv_c_mms_bitfields=no)]) + if test x"$ac_cv_c_mms_bitfields" != x"no"; then + save_CFLAGS="${save_CFLAGS} -mms-bitfields" + plugins_CFLAGS="${plugins_CFLAGS} -mms-bitfields" + else + save_CFLAGS="${save_CFLAGS} -fnative-struct" + plugins_CFLAGS="${plugins_CFLAGS} -fnative-struct" + fi +fi + dnl Check for Darwin plugin linking flags AC_CACHE_CHECK([if \$CC accepts -bundle -undefined error -lcc_dynamic], [ac_cv_ld_darwin], @@ -422,7 +453,12 @@ 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 memcpy lpcm_adec ac3_spdif spudec filter_deinterlace filter_invert filter_wall filter_transform filter_distort filter_clone filter_crop fx_scope" + +dnl +dnl Network modules +dnl +NETWORK_MODULES="udp http rtp ipv4" dnl dnl Accelerated modules @@ -433,6 +469,11 @@ THREEDNOW_MODULES="memcpy3dn imdct3dn downmix3dn" SSE_MODULES="imdctsse downmixsse" ALTIVEC_MODULES="idctaltivec motionaltivec memcpyaltivec" +if test x$SYS != xbeos +then + PLUGINS="${PLUGINS} ${NETWORK_MODULES}" +fi + AC_CACHE_CHECK([if \$CC groks MMX inline assembly], [ac_cv_mmx_inline], [AC_TRY_COMPILE(,[void *p;asm volatile("packuswb %%mm1,%%mm2"::"r"(p));], @@ -719,28 +760,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 @@ -765,7 +846,7 @@ then if test "x${SYS}" = "xdarwin" then - # No need to add vcd to PLUGINS, Darwin is already based on FreeBSD + PLUGINS="${PLUGINS} vcd" vcd_LDFLAGS="${vcd_LDFLAGS} -framework IOKit -framework CoreFoundation" fi fi @@ -903,7 +984,11 @@ then dnl Use a custom libffmpeg AC_MSG_RESULT(${real_ffmpeg_tree}/libavcodec/libavcodec.a) BUILTINS="${BUILTINS} ffmpeg" - ffmpeg_LDFLAGS="${ffmpeg_LDFLAGS} ${real_ffmpeg_tree}/libavcodec/libavcodec.a -lm" + ffmpeg_LDFLAGS="${ffmpeg_LDFLAGS} ${real_ffmpeg_tree}/libavcodec/libavcodec.a" + if test x$SYS != xbeos + then + ffmpeg_LDFLAGS="${ffmpeg_LDFLAGS} -lm" + fi ffmpeg_CFLAGS="${ffmpeg_CFLAGS} -I${real_ffmpeg_tree}/libavcodec" else dnl The given libavcodec wasn't built @@ -914,10 +999,18 @@ then save_CFLAGS=$CFLAGS save_LDFLAGS=$LDFLAGS CFLAGS="$CFLAGS $ffmpeg_CFLAGS" - LDFLAGS="$LDFLAGS $ffmpeg_LDFLAGS -lm" + LDFLAGS="$LDFLAGS $ffmpeg_LDFLAGS" + if test x$SYS != xbeos + then + ffmpeg_LDFLAGS="${ffmpeg_LDFLAGS} -lm" + fi AC_CHECK_LIB(avcodec, avcodec_init, [ BUILTINS="${BUILTINS} ffmpeg" - ffmpeg_LDFLAGS="${ffmpeg_LDFLAGS} -lavcodec -lm" ], + ffmpeg_LDFLAGS="${ffmpeg_LDFLAGS} -lavcodec" + if test x$SYS != xbeos + then + ffmpeg_LDFLAGS="${ffmpeg_LDFLAGS} -lm" + fi ], [ AC_MSG_ERROR([Cannot find libavcodec library...]) ]) CFLAGS=$save_CFLAGS LDFLAGS=$save_LDFLAGS @@ -1090,11 +1183,21 @@ then AC_PATH_PROG(SDL_CONFIG, sdl-config, no, $SDL_PATH) SDL_HEADER="SDL/SDL.h" fi + # check for cross-compiling + SDL_PREFIX= + AC_ARG_WITH(sdl, + [ --with-sdl-prefix=PATH path to libsdl (needed for cross-compiling), + e.g use as: + --with-sdl-prefix=/usr/local/arm/2.95.3/arm-linux/usr)],[],[]) + if test "x$with_sdl_prefix" != "xno" -a "x$with_sdl_prefix" != "x" + then + SDL_PREFIX="--prefix=$with_sdl_prefix" + fi if test x${SDL_CONFIG} != xno then PLUGINS="${PLUGINS} sdl" - sdl_CFLAGS="${sdl_CFLAGS} `${SDL_CONFIG} --cflags`" - sdl_LDFLAGS="${sdl_LDFLAGS} `${SDL_CONFIG} --libs | sed 's,-rdynamic,,'`" + sdl_CFLAGS="${sdl_CFLAGS} `${SDL_CONFIG} ${SDL_PREFIX} --cflags`" + sdl_LDFLAGS="${sdl_LDFLAGS} `${SDL_CONFIG} ${SDL_PREFIX} --libs | sed 's,-rdynamic,,'`" CPPFLAGS="$save_CPPFLAGS $sdl_CFLAGS" AC_CHECK_HEADERS(${SDL_HEADER}, AC_DEFINE_UNQUOTED(SDL_INCLUDE_FILE, <${SDL_HEADER}>, Indicate whether we should use SDL/SDL.h or SDL11/SDL.h), @@ -1117,6 +1220,39 @@ from http://www.libsdl.org/, or configure with --disable-sdl. Have a nice day. fi fi +dnl +dnl Qt Embedded module +dnl (disabled by default) +dnl +AC_ARG_ENABLE(qte, + [ --enable-qte QT Embedded support (default disabled)]) +if test "x${enable_qte}" != "xno" +then + AC_ARG_WITH(qte, + [ --with-qte=PATH Qt Embedded headers and libraries]) + if test "x${with_qte}" = "x" + then + test_LDFLAGS="-L${QTDIR}/lib" + test_CFLAGS="-I${QTDIR}/include" + else + test_LDFLAGS="-L${with_qte}/lib" + test_CFLAGS="-I${with_qte}/include" + fi + + CPPFLAGS="${save_CPPFLAGS} ${test_CFLAGS}" + AC_CHECK_HEADERS(qt.h, [ + qte_CFLAGS="${qte_CFLAGS} ${test_CFLAGS} -DQT_QWS_IPAQ -DQWS -fno-exceptions -fno-rtti" + qte_LDFLAGS="${qte_LDFLAGS} ${test_LDFLAGS} -lqpe -lqte" + if test "x${with_qte}" = "x" + then + PLUGINS="${PLUGINS} qte" + else + BUILTINS="${BUILTINS} qte" + fi + ]) + CPPFLAGS="${save_CPPFLAGS}" +fi + dnl dnl Windows DirectX module dnl @@ -1353,6 +1489,90 @@ then fi fi +dnl +dnl Familiar module uses Gtk+ library +dnl +AC_ARG_ENABLE(familiar, + [ --enable-familiar Familiar Gtk+ support (default disabled)]) +if test "x${enable_familiar}" = "xyes" +then + GTK_PATH="${PATH}" + AC_ARG_WITH(gtk-config-path, + [ --with-gtk-config-path=PATH gtk-config path (default search in \$PATH)], + [ if test "x${with_gtk_config_path}" != "xno" + then + GTK_PATH="${with_gtk_config_path}:${PATH}" + fi ]) + # look for gtk-config + AC_PATH_PROG(GTK12_CONFIG, gtk12-config, no, ${GTK_PATH}) + GTK_CONFIG=${GTK12_CONFIG} + if test "x${GTK_CONFIG}" = "xno" + then + AC_PATH_PROG(GTK_CONFIG, gtk-config, no, ${GTK_PATH}) + fi + # check for cross-compiling + GTK_PREFIX= + AC_ARG_WITH(gtk, + [ --with-gtk-prefix=PATH path to libgtk (needed for cross-compiling), + e.g use as: + --with-gtk-prefix=/usr/local/arm/2.95.3/arm-linux/usr)],[],[]) + if test "x$with_gtk_prefix" != "xno" -a "x$with_gtk_prefix" != "x" + then + GTK_PREFIX="--prefix=$with_gtk_prefix" + fi + if test "x${GTK_CONFIG}" != "xno" + then + if expr 1.2.0 \> `${GTK_CONFIG} --version` >/dev/null + then + AC_MSG_ERROR([Your development package for Gtk+ is too old, you need at least version 1.2.0. Please upgrade and try again. Alternatively you can also configure with --disable-familiar.]) + fi + familiar_CFLAGS="${familiar_CFLAGS} `${GTK_CONFIG} ${GTK_PREFIX} --cflags gtk gthread`" + familiar_LDFLAGS="${familiar_LDFLAGS} `${GTK_CONFIG} ${GTK_PREFIX} --libs gtk gthread | sed 's,-rdynamic,,'`" + # now look for the gtk.h header + CPPFLAGS="${save_CPPFLAGS} ${familiar_CFLAGS}" + ac_cv_gtk_headers=yes + AC_CHECK_HEADERS(gtk/gtk.h glib.h gdk/gdk.h, , [ + ac_cv_gtk_headers=no + echo "Cannot find gtk development headers." + ]) + + # now look for gpe support + AC_ARG_WITH(gpe-prefix, + [ --with-gpe-prefix=PATH gpe installation path prefix (default search in \$PATH)],[],[]) + if test "x$with_gpe_prefix" != "xno" -a "x$with_gpe_prefix" != "x" + then + gpe_CFLAGS="-I$with_gpe_prefix/include" + gpe_LDFLAGS="-lXi -lgdk_pixbuf -L$with_gpe_prefix/lib" + + # now look for gpe/init.h header file + save_CFLAGS=$CFLAGS + save_LDFLAGS=$LDFLAGS +# CFLAGS="${familiar_CFLAGS} ${gpe_CFLAGS}" + LDFLAGS="${familiar_LDFLAGS} ${gpe_LDFLAGS}" + CPPFLAGS="${save_CPPFLAGS} ${familiar_CFLAGS} ${gpe_CFLAGS}" + ac_cv_gpe_headers=yes + AC_CHECK_HEADERS(gpe/init.h, , + [ ac_cv_gpe_headers=no + AC_MSG_ERROR([Cannot find development headers for libgpewidget...]) ]) + AC_CHECK_LIB(gpewidget, gpe_application_init, + [ gpe_LDFLAGS="${gpe_LDFLAGS} -lgpewidget" ], + [ AC_MSG_ERROR([Cannot find libgpewidget library...]) ]) + CFLAGS=$save_CFLAGS + LDFLAGS=$save_LDFLAG + if test "x${ac_cv_gpe_headers}" = "xyes" + then + familiar_CFLAGS="${familiar_CFLAGS} ${gpe_CFLAGS}" + familiar_LDFLAGS="${familiar_LDFLAGS} ${gpe_LDFLAGS}" + fi + fi + if test "x${ac_cv_gtk_headers}" = "xyes" + then + PLUGINS="${PLUGINS} familiar" + fi + CPPFLAGS="${save_CPPFLAGS}" + fi +fi + dnl dnl Gnome module dnl @@ -1415,6 +1635,34 @@ AC_ARG_ENABLE(kde, fi fi]) +dnl +dnl Opie QT embedded module +dnl +AC_ARG_ENABLE(opie, + [ --enable-opie Qt embedded interface support (default disabled)], + [if test "x${enable_opie}" = "xyes"; then + AC_ARG_WITH(qte, + [ --with-qte=PATH Qt Embedded headers and libraries]) + if test "x${with_qte}" = "x" + then + test_LDFLAGS="-L${QTDIR}/lib" + test_CFLAGS="-I${QTDIR}/include" + else + test_LDFLAGS="-L${with_qte}/lib" + test_CFLAGS="-I${with_qte}/include" + fi + + PLUGINS="${PLUGINS} opie" + opie_LDFLAGS="${opie_LDFLAGS} ${test_LDFLAGS} -lqpe -lqte" + opie_CFLAGS="${opie_CFLAGS} ${test_CFLAGS}-DQT_QWS_IPAQ -DQWS -fno-exceptions -fno-rtti" + if test -x ${QTDIR}/bin/moc + then + MOC=${QTDIR}/bin/moc + else + MOC=moc + fi + fi]) + dnl dnl MacOS X module dnl @@ -1666,6 +1914,7 @@ AC_SUBST(dvdread_CFLAGS) AC_SUBST(mpeg_ts_dvbpsi_CFLAGS) AC_SUBST(directx_CFLAGS) AC_SUBST(esd_CFLAGS) +AC_SUBST(familiar_CFLAGS) AC_SUBST(ffmpeg_CFLAGS) AC_SUBST(glide_CFLAGS) AC_SUBST(gnome_CFLAGS) @@ -1676,7 +1925,9 @@ AC_SUBST(macosx_CFLAGS) AC_SUBST(mad_CFLAGS) AC_SUBST(memcpyaltivec_CFLAGS) AC_SUBST(motionaltivec_CFLAGS) +AC_SUBST(opie_CFLAGS) AC_SUBST(qt_CFLAGS) +AC_SUBST(qte_CFLAGS) AC_SUBST(sdl_CFLAGS) AC_SUBST(x11_CFLAGS) AC_SUBST(xvideo_CFLAGS) @@ -1697,6 +1948,7 @@ AC_SUBST(dvd_LDFLAGS) AC_SUBST(dvdread_LDFLAGS) AC_SUBST(mpeg_ts_dvbpsi_LDFLAGS) AC_SUBST(esd_LDFLAGS) +AC_SUBST(familiar_LDFLAGS) AC_SUBST(filter_distort_LDFLAGS) AC_SUBST(ffmpeg_LDFLAGS) AC_SUBST(ggi_LDFLAGS) @@ -1717,8 +1969,10 @@ AC_SUBST(mad_LDFLAGS) AC_SUBST(memcpyaltivec_LDFLAGS) AC_SUBST(motionaltivec_LDFLAGS) AC_SUBST(ncurses_LDFLAGS) +AC_SUBST(opie_LDFLAGS) AC_SUBST(qnx_LDFLAGS) AC_SUBST(qt_LDFLAGS) +AC_SUBST(qte_LDFLAGS) AC_SUBST(rc_LDFLAGS) AC_SUBST(sdl_LDFLAGS) AC_SUBST(vcd_LDFLAGS) diff --git a/extras/MacOSX/Resources/divx.icns b/extras/MacOSX/Resources/divx.icns new file mode 100644 index 0000000000000000000000000000000000000000..7e2ba65c3851d4a9d0f721f383e774422c1fb0e5 GIT binary patch literal 48233 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 JE%JvS{}0AF5Sah~ literal 0 HcmV?d00001 diff --git a/extras/MacOSX/Resources/generic.icns b/extras/MacOSX/Resources/generic.icns new file mode 100644 index 0000000000000000000000000000000000000000..28dc564a3e5ebeba5fb1f31de2a8baaf5fd1ce50 GIT binary patch literal 47409 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

lJ|Jv5Fsn+Sk> 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 CC~sZ> literal 0 HcmV?d00001 diff --git a/extras/MacOSX/Resources/mpeg.icns b/extras/MacOSX/Resources/mpeg.icns new file mode 100644 index 0000000000000000000000000000000000000000..9af347afe75929ece0a6cbece8471b9429ef4d7d GIT binary patch literal 47878 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 byPgn7zNaYP{1*&J3zz;;;EDdv5B~oEOZ6qn literal 0 HcmV?d00001 diff --git a/extras/MacOSX/Resources/mpeg1.icns b/extras/MacOSX/Resources/mpeg1.icns new file mode 100644 index 0000000000000000000000000000000000000000..a09f3d0ec92c4b06ecdc044c1c9e9a0818d0c184 GIT binary patch literal 48220 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%0A0m>@M>89f|3+1f9f}$8c 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 Q9{QsB_2FYie_r?h2O!|J!~g&Q literal 0 HcmV?d00001 diff --git a/extras/MacOSX/Resources/mpeg4.icns b/extras/MacOSX/Resources/mpeg4.icns new file mode 100644 index 0000000000000000000000000000000000000000..9da18bf90980a2adc30bb7ed3ec3168464d15847 GIT binary patch literal 48018 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 N?_Wc7w}t)R{~yNSmbm}` literal 0 HcmV?d00001 diff --git a/ipkg/control b/ipkg/control index 9f274bf71b..273cb4e3c3 100644 --- a/ipkg/control +++ b/ipkg/control @@ -1,11 +1,11 @@ Package: vlc Section: graphics Priority: optional -Version: 0.4.0 +Version: 0.4.6 Release: 1 Architecture: arm Maintainer: Jean-Paul Saman , Christophe Massiot -Depends: libc6, task-x +Depends: libc6, task-x, sdl, libgtk1.2, libgtk2.0 Copyright: GPL Description: VideoLAN Client is a free network-aware MPEG and DVD player. VideoLAN is a free MPEG1/2 software solution licensed under GPL. The original diff --git a/ipkg/control.gpe b/ipkg/control.gpe new file mode 100644 index 0000000000..a6aea84034 --- /dev/null +++ b/ipkg/control.gpe @@ -0,0 +1,16 @@ +Package: vlc +Section: graphics +Priority: optional +Version: 0.4.5 +Release: 1 +Architecture: arm +Maintainer: Jean-Paul Saman , Christophe Massiot +Depends: libc6, task-x, libsdl, libgpewidget0, libgtk1.2 +Copyright: GPL +Description: VideoLAN Client is a free network-aware MPEG and DVD player. + VideoLAN is a free MPEG1/2 software solution licensed under GPL. The original + source can be found on: + http://www.videolan.org/pub/videolan/vlc/ + The VideoLAN Client allows to play MPEG1, MPEG2 Transport Streams and + Program Streams from the network or from a file, as well as direct DVD + playback. diff --git a/ipkg/control.opie b/ipkg/control.opie new file mode 100644 index 0000000000..63a925665e --- /dev/null +++ b/ipkg/control.opie @@ -0,0 +1,16 @@ +Package: vlc +Section: graphics +Priority: optional +Version: 0.4.5 +Release: 1 +Architecture: arm +Maintainer: Jean-Paul Saman , Christophe Massiot +Depends: libc6 +Copyright: GPL +Description: VideoLAN Client is a free network-aware MPEG and DVD player. + VideoLAN is a free MPEG1/2 software solution licensed under GPL. The original + source can be found on: + http://www.videolan.org/pub/videolan/vlc/ + The VideoLAN Client allows to play MPEG1, MPEG2 Transport Streams and + Program Streams from the network or from a file, as well as direct DVD + playback. diff --git a/ipkg/postinst.gpe b/ipkg/postinst.gpe new file mode 100755 index 0000000000..424c665c83 --- /dev/null +++ b/ipkg/postinst.gpe @@ -0,0 +1,13 @@ +#!/bin/sh +# patch for gtk-1.2 installation +#if [ ! -x /usr/lib/libgtk.so ] ; then +# ln -s /usr/lib/libgtk-1.2.so.0.9.1 /usr/lib/libgtk.so +#fi +#if [ ! -x /usr/lib/libgdk.so ] ; then +# ln -s /usr/lib/libgdk-1.2.so.0.9.1 /usr/lib/libgdk.so +#fi +#ldconfig +# update menus +if [ -x /usr/bin/update-menus ] && [ ! /usr/bin/update-menus ] ; then + exit $?; +fi diff --git a/ipkg/postinst.opie b/ipkg/postinst.opie new file mode 100755 index 0000000000..b1d3ae2598 --- /dev/null +++ b/ipkg/postinst.opie @@ -0,0 +1,5 @@ +#!/bin/sh +if [ -x /usr/share/vlc ] ; then + ln -s /usr/share/vlc /opt/QtPalmtop/pics/vlc +fi +exit 0 diff --git a/ipkg/postrm.gpe b/ipkg/postrm.gpe new file mode 100755 index 0000000000..f42785d923 --- /dev/null +++ b/ipkg/postrm.gpe @@ -0,0 +1,11 @@ +#!/bin/sh +#if [ -x /usr/lib/libgtk.so ] ; then +# rm /usr/lib/libgtk.so +#fi +#if [ -x /usr/lib/libgdk.so ] ; then +# rm /usr/lib/libgdk.so +#fi +#ldconfig +if [ -x /usr/bin/update-menus ] && [ ! /usr/bin/update-menus ] ; then + exit $?; +fi diff --git a/ipkg/postrm.opie b/ipkg/postrm.opie new file mode 100755 index 0000000000..911eb8dc71 --- /dev/null +++ b/ipkg/postrm.opie @@ -0,0 +1,4 @@ +#!/bin/sh +[ -x /opt/QtPalmtop/pics/vlc ] || rm /opt/QtPalmtop/pics/vlc +exit 0 + diff --git a/ipkg/rules b/ipkg/rules index 9a9d543ea3..ab606d0c4a 100755 --- a/ipkg/rules +++ b/ipkg/rules @@ -19,7 +19,7 @@ build-stamp: $(shell echo $(CONFIG_FLAGS)) # This is ugly -- I know - patch -p 0 < ipkg/patch + patch -p 0 < ipkg/sdl.patch $(MAKE) diff --git a/ipkg/patch b/ipkg/sdl.patch similarity index 100% rename from ipkg/patch rename to ipkg/sdl.patch diff --git a/ipkg/vlc.desktop b/ipkg/vlc.desktop new file mode 100644 index 0000000000..5c2b37d4b2 --- /dev/null +++ b/ipkg/vlc.desktop @@ -0,0 +1,5 @@ +[Desktop Entry] +Comment=Multiplatform Multimedia Player +Exec=vlc.opie +Icon=vlc/vlc48x48.png +Name=VideoLAN Client diff --git a/ipkg/vlc.gpe b/ipkg/vlc.gpe new file mode 100755 index 0000000000..92848387a2 --- /dev/null +++ b/ipkg/vlc.gpe @@ -0,0 +1,9 @@ +?package(vlc): \ + needs=x11 \ + section=Graphics \ + logtitle="VideoLAN Client" \ + title="VideoLAN Client" \ + command="vlc" \ + icon48=/usr/share/videolan/vlc48x48.png \ + windowtitle="VideoLAN Client" + diff --git a/ipkg/vlc.opie b/ipkg/vlc.opie new file mode 100755 index 0000000000..df756d405e --- /dev/null +++ b/ipkg/vlc.opie @@ -0,0 +1,4 @@ +#!/bin/sh +export QTDIR=/opt/QtPalmtop +export LD_LIBRARY_PATH=.:/usr/X11R6/lib:/opt/QtPalmtop/lib:/lib/videolan/vlc +/usr/bin/vlc diff --git a/MODULES b/plugins/LIST similarity index 95% rename from MODULES rename to plugins/LIST index 29a8edb69b..05d585d038 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.2 2002/09/30 20:13:19 jpsaman Exp $ * ac3_adec: software AC3 decoder. @@ -41,6 +41,8 @@ $Id: MODULES,v 1.3 2002/01/30 00:09:49 sam Exp $ * esd: audio output module using the Esound sound daemon. + * familiar: interface for iPaq using the Gtk+ widget set. + * fb: video output module for the Linux framebuffer. * filter_deinterlace: naive deinterlacing filter. @@ -123,6 +125,8 @@ $Id: MODULES,v 1.3 2002/01/30 00:09:49 sam Exp $ * qt: interface module using the Qt widget set. + * qte: video output module for Qt Embedded. + * rc: interface module using stdio. * sdl: audio output and video output module using the SDL library. diff --git a/plugins/access/rtp.c b/plugins/access/rtp.c new file mode 100644 index 0000000000..4fd5067fa3 --- /dev/null +++ b/plugins/access/rtp.c @@ -0,0 +1,338 @@ +/***************************************************************************** + * rtp.c: RTP access plug-in + ***************************************************************************** + * Copyright (C) 2001, 2002 VideoLAN + * $Id: rtp.c,v 1.1.2.1 2002/10/03 22:14:58 massiot Exp $ + * + * Authors: Tristan Leteurtre + * + * 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 +#include +#include +#include +#include + +#include + +#ifdef HAVE_UNISTD_H +# include +#elif defined( _MSC_VER ) && defined( _WIN32 ) +# include +#endif + +#ifdef HAVE_ALLOCA_H +# include +#endif + +#include "stream_control.h" +#include "input_ext-intf.h" +#include "input_ext-dec.h" +#include "input_ext-plugins.h" + +#include "network.h" + +#define RTP_HEADER_LEN 12 + +/***************************************************************************** + * Local prototypes + *****************************************************************************/ +static void input_getfunctions( function_list_t * ); +static int Open ( struct input_thread_s * ); +static ssize_t RTPNetworkRead( input_thread_t *, byte_t *, size_t ); + +/***************************************************************************** + * Module descriptor + *****************************************************************************/ +MODULE_CONFIG_START +MODULE_CONFIG_STOP + +MODULE_INIT_START + SET_DESCRIPTION( _("RTP access module") ) + ADD_CAPABILITY( ACCESS, 0 ) + ADD_SHORTCUT( "rtp" ) + ADD_SHORTCUT( "rtpstream" ) + ADD_SHORTCUT( "rtp4" ) + ADD_SHORTCUT( "rtp6" ) +MODULE_INIT_STOP + +MODULE_ACTIVATE_START + input_getfunctions( &p_module->p_functions->access ); +MODULE_ACTIVATE_STOP + +MODULE_DEACTIVATE_START +MODULE_DEACTIVATE_STOP + +/***************************************************************************** + * Functions exported as capabilities. They are declared as static so that + * we don't pollute the namespace too much. + *****************************************************************************/ +static void input_getfunctions( function_list_t * p_function_list ) +{ +#define input p_function_list->functions.access + input.pf_open = Open; + input.pf_read = RTPNetworkRead; + input.pf_close = input_FDNetworkClose; + input.pf_set_program = input_SetProgram; + input.pf_set_area = NULL; + input.pf_seek = NULL; +#undef input +} + +/***************************************************************************** + * Open: open the socket + *****************************************************************************/ +static int Open( struct input_thread_s *p_this ) +{ + input_thread_t * p_input = (input_thread_t *)p_this; + input_socket_t * p_access_data; + module_t * p_network; + char * psz_network = ""; + char * psz_name = strdup(p_input->psz_name); + char * psz_parser = psz_name; + char * psz_server_addr = ""; + char * psz_server_port = ""; + char * psz_bind_addr = ""; + char * psz_bind_port = ""; + int i_bind_port = 0, i_server_port = 0; + network_socket_t socket_desc; + + if( config_GetIntVariable( "ipv4" ) ) + { + psz_network = "ipv4"; + } + if( config_GetIntVariable( "ipv6" ) ) + { + psz_network = "ipv6"; + } + + if( *p_input->psz_access ) + { + /* Find out which shortcut was used */ + if( !strncmp( p_input->psz_access, "rtp6", 5 ) ) + { + psz_network = "ipv6"; + } + else if( !strncmp( p_input->psz_access, "rtp4", 5 ) ) + { + psz_network = "ipv4"; + } + } + + /* Parse psz_name syntax : + * [serveraddr[:serverport]][@[bindaddr]:[bindport]] */ + + if( *psz_parser && *psz_parser != '@' ) + { + /* Found server */ + psz_server_addr = psz_parser; + + while( *psz_parser && *psz_parser != ':' && *psz_parser != '@' ) + { + if( *psz_parser == '[' ) + { + /* IPv6 address */ + while( *psz_parser && *psz_parser != ']' ) + { + psz_parser++; + } + } + psz_parser++; + } + + if( *psz_parser == ':' ) + { + /* Found server port */ + *psz_parser = '\0'; /* Terminate server name */ + psz_parser++; + psz_server_port = psz_parser; + + while( *psz_parser && *psz_parser != '@' ) + { + psz_parser++; + } + } + } + + if( *psz_parser == '@' ) + { + /* Found bind address or bind port */ + *psz_parser = '\0'; /* Terminate server port or name if necessary */ + psz_parser++; + + if( *psz_parser && *psz_parser != ':' ) + { + /* Found bind address */ + psz_bind_addr = psz_parser; + + while( *psz_parser && *psz_parser != ':' ) + { + if( *psz_parser == '[' ) + { + /* IPv6 address */ + while( *psz_parser && *psz_parser != ']' ) + { + psz_parser++; + } + } + psz_parser++; + } + } + + if( *psz_parser == ':' ) + { + /* Found bind port */ + *psz_parser = '\0'; /* Terminate bind address if necessary */ + psz_parser++; + + psz_bind_port = psz_parser; + } + } + + /* Convert ports format */ + if( *psz_server_port ) + { + i_server_port = strtol( psz_server_port, &psz_parser, 10 ); + if( *psz_parser ) + { + intf_ErrMsg( "cannot parse server port near %s", psz_parser ); + free(psz_name); + return( -1 ); + } + } + + if( *psz_bind_port ) + { + i_bind_port = strtol( psz_bind_port, &psz_parser, 10 ); + if( *psz_parser ) + { + intf_ErrMsg( "cannot parse bind port near %s", psz_parser ); + free(psz_name); + return( -1 ); + } + } + + vlc_mutex_lock( &p_input->stream.stream_lock ); + p_input->stream.b_pace_control = 0; + p_input->stream.b_seekable = 0; + p_input->stream.p_selected_area->i_tell = 0; + p_input->stream.i_method = INPUT_METHOD_NETWORK; + vlc_mutex_unlock( &p_input->stream.stream_lock ); + + if( *psz_server_addr || i_server_port ) + { + intf_ErrMsg( "this RTP syntax is deprecated; the server argument will be"); + intf_ErrMsg( "ignored (%s:%d). If you wanted to enter a multicast address", + psz_server_addr, i_server_port); + intf_ErrMsg( "or local port, type : %s:@%s:%d", + *p_input->psz_access ? p_input->psz_access : "udp", + psz_server_addr, i_server_port ); + + i_server_port = 0; + psz_server_addr = ""; + } + + intf_WarnMsg( 2, "opening server=%s:%d local=%s:%d", + psz_server_addr, i_server_port, psz_bind_addr, i_bind_port ); + + /* Prepare the network_socket_t structure */ + socket_desc.i_type = NETWORK_UDP; + socket_desc.psz_bind_addr = psz_bind_addr; + socket_desc.i_bind_port = i_bind_port; + socket_desc.psz_server_addr = psz_server_addr; + socket_desc.i_server_port = i_server_port; + + /* Find an appropriate network module */ + p_network = module_Need( MODULE_CAPABILITY_NETWORK, psz_network, + &socket_desc ); + free(psz_name); + if( p_network == NULL ) + { + return( -1 ); + } + module_Unneed( p_network ); + + p_access_data = malloc( sizeof(input_socket_t) ); + p_input->p_access_data = (void *)p_access_data; + + if( p_access_data == NULL ) + { + intf_ErrMsg( "out of memory" ); + return( -1 ); + } + + p_access_data->i_handle = socket_desc.i_handle; + p_input->i_mtu = socket_desc.i_mtu; + + p_input->psz_demux = "ts"; + + return( 0 ); +} + +/***************************************************************************** + * RTPNetworkRead : Read for the network, and parses the RTP header + *****************************************************************************/ +static ssize_t RTPNetworkRead( input_thread_t * p_input, byte_t * p_buffer, + size_t i_len ) +{ + int i_rtp_version; + int i_CSRC_count; + int i_payload_type; + + byte_t * p_tmp_buffer = alloca( p_input->i_mtu ); + + /* Get the raw data from the socket. + * We first assume that RTP header size is the classic RTP_HEADER_LEN. */ + ssize_t i_ret = input_FDNetworkRead( p_input, p_tmp_buffer, + p_input->i_mtu ); + + if (!i_ret) return 0; + + /* Parse the header and make some verifications. + * See RFC 1889 & RFC 2250. */ + + i_rtp_version = ( p_tmp_buffer[0] & 0xC0 ) >> 6; + i_CSRC_count = ( p_tmp_buffer[0] & 0x0F ); + i_payload_type = ( p_tmp_buffer[1] & 0x7F ); + + if ( i_rtp_version != 2 ) + intf_WarnMsg( 1, "RTP version is %u, should be 2", i_rtp_version ); + + if ( i_payload_type != 33 ) + intf_WarnMsg( 1, "RTP payload type is %u, only 33 (Mpeg2-TS) " \ + "is supported", i_payload_type ); + + /* Return the packet without the RTP header. */ + i_ret -= ( RTP_HEADER_LEN + 4 * i_CSRC_count ); + + if ( i_ret > i_len ) + { + /* This should NOT happen. */ + intf_WarnMsg( 1, "RTP input trashing %d bytes", i_ret - i_len ); + i_ret = i_len; + } + + FAST_MEMCPY( p_buffer, + p_tmp_buffer + RTP_HEADER_LEN + 4 * i_CSRC_count, + i_ret ); + + return i_ret; +} diff --git a/plugins/beos/ListViews.cpp b/plugins/beos/ListViews.cpp new file mode 100644 index 0000000000..843ae498cb --- /dev/null +++ b/plugins/beos/ListViews.cpp @@ -0,0 +1,641 @@ +/***************************************************************************** + * ListViews.h: BeOS interface list view class implementation + ***************************************************************************** + * Copyright (C) 1999, 2000, 2001 VideoLAN + * $Id: ListViews.cpp,v 1.1.2.1 2002/09/29 12:06:08 titer Exp $ + * + * Authors: Stephan Aßmus + * + * 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. + *****************************************************************************/ + +#include + +#include +#include + +extern "C" +{ +#include + +#include "stream_control.h" + +#include "interface.h" +#include "input_ext-intf.h" +} + +#include "InterfaceWindow.h" +#include "ListViews.h" +#include "MsgVals.h" +#include "intf_vlc_wrapper.h" + + +#define MAX_DRAG_HEIGHT 200.0 +#define ALPHA 170 +#define TEXT_OFFSET 20.0 + +/***************************************************************************** + * PlaylistItem class + *****************************************************************************/ +PlaylistItem::PlaylistItem( const char *name ) + : BStringItem( name ) +{ +} + +PlaylistItem::~PlaylistItem() +{ +} + +/***************************************************************************** + * PlaylistItem::DrawItem + *****************************************************************************/ +void +PlaylistItem::Draw( BView *owner, BRect frame, bool tintedLine, + bool active, bool playing ) +{ + rgb_color color = (rgb_color){ 255, 255, 255, 255 }; + if ( tintedLine ) + color = tint_color( color, 1.04 ); + // background + if ( IsSelected() ) + color = tint_color( color, B_DARKEN_2_TINT ); + owner->SetLowColor( color ); + owner->FillRect( frame, B_SOLID_LOW ); + // label + owner->SetHighColor( 0, 0, 0, 255 ); + font_height fh; + owner->GetFontHeight( &fh ); + BString truncatedString( Text() ); + owner->TruncateString( &truncatedString, B_TRUNCATE_MIDDLE, + frame.Width() - TEXT_OFFSET - 4.0 ); + owner->DrawString( truncatedString.String(), + BPoint( frame.left + TEXT_OFFSET, + frame.top + fh.ascent + 1.0 ) ); + // playmark + if ( active ) + { + rgb_color black = (rgb_color){ 0, 0, 0, 255 }; + rgb_color green = (rgb_color){ 0, 255, 0, 255 }; + BRect r( 0.0, 0.0, 10.0, 10.0 ); + r.OffsetTo( frame.left + 4.0, + ceilf( ( frame.top + frame.bottom ) / 2.0 ) - 5.0 ); + if ( !playing ) + green = tint_color( color, B_DARKEN_1_TINT ); + rgb_color lightGreen = tint_color( green, B_LIGHTEN_2_TINT ); + rgb_color darkGreen = tint_color( green, B_DARKEN_2_TINT ); + BPoint arrow[3]; + arrow[0] = r.LeftTop(); + arrow[1] = r.LeftBottom(); + arrow[2].x = r.right; + arrow[2].y = ( r.top + r.bottom ) / 2.0; + owner->BeginLineArray( 6 ); + // black outline + owner->AddLine( arrow[0], arrow[1], black ); + owner->AddLine( BPoint( arrow[1].x + 1.0, arrow[1].y - 1.0 ), + arrow[2], black ); + owner->AddLine( arrow[0], arrow[2], black ); + // inset arrow + arrow[0].x += 1.0; + arrow[0].y += 2.0; + arrow[1].x += 1.0; + arrow[1].y -= 2.0; + arrow[2].x -= 2.0; + // highlights and shadow + owner->AddLine( arrow[1], arrow[2], darkGreen ); + owner->AddLine( arrow[0], arrow[2], lightGreen ); + owner->AddLine( arrow[0], arrow[1], lightGreen ); + owner->EndLineArray(); + // fill green + arrow[0].x += 1.0; + arrow[0].y += 1.0; + arrow[1].x += 1.0; + arrow[1].y -= 1.0; + arrow[2].x -= 2.0; + owner->SetHighColor( green ); + owner->FillPolygon( arrow, 3 ); + } +} + +/***************************************************************************** + * DragSortableListView class + *****************************************************************************/ +DragSortableListView::DragSortableListView( BRect frame, const char* name, + list_view_type type, uint32 resizingMode, + uint32 flags ) + : BListView( frame, name, type, resizingMode, flags ), + fDropIndex( -1 ) +{ + SetViewColor( B_TRANSPARENT_32_BIT ); +} + +DragSortableListView::~DragSortableListView() +{ +} + +/***************************************************************************** + * DragSortableListView::Draw + *****************************************************************************/ +void +DragSortableListView::Draw( BRect updateRect ) +{ + int32 firstIndex = IndexOf( updateRect.LeftTop() ); + int32 lastIndex = IndexOf( updateRect.RightBottom() ); + if ( firstIndex >= 0 ) + { + if ( lastIndex < firstIndex ) + lastIndex = CountItems() - 1; + // update rect contains items + BRect r( updateRect ); + for ( int32 i = firstIndex; i <= lastIndex; i++) + { + r = ItemFrame( i ); + DrawListItem( this, i, r ); + } + updateRect.top = r.bottom + 1.0; + if ( updateRect.IsValid() ) + { + SetLowColor( 255, 255, 255, 255 ); + FillRect( updateRect, B_SOLID_LOW ); + } + } + else + { + SetLowColor( 255, 255, 255, 255 ); + FillRect( updateRect, B_SOLID_LOW ); + } +} + +/***************************************************************************** + * DragSortableListView::InitiateDrag + *****************************************************************************/ +bool +DragSortableListView::InitiateDrag( BPoint point, int32 index, bool ) +{ +return false; + bool success = false; + BListItem* item = ItemAt( CurrentSelection( 0 ) ); + if ( !item ) + { + // workarround a timing problem + Select( index ); + item = ItemAt( index ); + } + if ( item ) + { + // create drag message + BMessage msg( B_SIMPLE_DATA ); + MakeDragMessage( &msg ); + // figure out drag rect + float width = Bounds().Width(); + BRect dragRect(0.0, 0.0, width, -1.0); + // figure out, how many items fit into our bitmap + int32 numItems; + bool fade = false; + for (numItems = 0; BListItem* item = ItemAt( CurrentSelection( numItems ) ); numItems++) { + dragRect.bottom += item->Height(); + if ( dragRect.Height() > MAX_DRAG_HEIGHT ) { + fade = true; + dragRect.bottom = MAX_DRAG_HEIGHT; + numItems++; + break; + } + } + BBitmap* dragBitmap = new BBitmap( dragRect, B_RGB32, true ); + if ( dragBitmap && dragBitmap->IsValid() ) { + if ( BView *v = new BView( dragBitmap->Bounds(), "helper", B_FOLLOW_NONE, B_WILL_DRAW ) ) { + dragBitmap->AddChild( v ); + dragBitmap->Lock(); + BRect itemBounds( dragRect) ; + itemBounds.bottom = 0.0; + // let all selected items, that fit into our drag_bitmap, draw + for ( int32 i = 0; i < numItems; i++ ) { + int32 index = CurrentSelection( i ); + BListItem* item = ItemAt( index ); + itemBounds.bottom = itemBounds.top + item->Height() - 1.0; + if ( itemBounds.bottom > dragRect.bottom ) + itemBounds.bottom = dragRect.bottom; + DrawListItem( v, index, itemBounds ); + itemBounds.top = itemBounds.bottom + 1.0; + } + // make a black frame arround the edge + v->SetHighColor( 0, 0, 0, 255 ); + v->StrokeRect( v->Bounds() ); + v->Sync(); + + uint8 *bits = (uint8 *)dragBitmap->Bits(); + int32 height = (int32)dragBitmap->Bounds().Height() + 1; + int32 width = (int32)dragBitmap->Bounds().Width() + 1; + int32 bpr = dragBitmap->BytesPerRow(); + + if (fade) { + for ( int32 y = 0; y < height - ALPHA / 2; y++, bits += bpr ) { + uint8 *line = bits + 3; + for (uint8 *end = line + 4 * width; line < end; line += 4) + *line = ALPHA; + } + for ( int32 y = height - ALPHA / 2; y < height; y++, bits += bpr ) { + uint8 *line = bits + 3; + for (uint8 *end = line + 4 * width; line < end; line += 4) + *line = (height - y) << 1; + } + } else { + for ( int32 y = 0; y < height; y++, bits += bpr ) { + uint8 *line = bits + 3; + for (uint8 *end = line + 4 * width; line < end; line += 4) + *line = ALPHA; + } + } + dragBitmap->Unlock(); + success = true; + } + } + if (success) + DragMessage( &msg, dragBitmap, B_OP_ALPHA, BPoint( 0.0, 0.0 ) ); + else { + delete dragBitmap; + DragMessage( &msg, dragRect.OffsetToCopy( point ), this ); + } + } + return success; +} + +/***************************************************************************** + * DragSortableListView::WindowActivated + *****************************************************************************/ +void +DragSortableListView::WindowActivated( bool active ) +{ + // workarround for buggy focus indication of BScrollView + if ( BView* view = Parent() ) + view->Invalidate(); +} + +/***************************************************************************** + * DragSortableListView::MessageReceived + *****************************************************************************/ +void +DragSortableListView::MessageReceived(BMessage* message) +{ + BListItem *item = NULL; + DragSortableListView *list = NULL; + if ( message->FindPointer( "list", (void **)&list ) == B_OK + && list == this ) + { + int32 count = CountItems(); + if ( fDropIndex < 0 || fDropIndex > count ) + fDropIndex = count; + bool copy = ( modifiers() & B_SHIFT_KEY ); + for ( int32 i = 0; message->FindPointer( "item", i, (void **)&item ) == B_OK; i++ ) + { + + if ( HasItem( item ) ) + { + BListItem* itemToAdd = NULL; + int32 index = IndexOf( item ); + if ( copy ) + { + // add cloned item + itemToAdd = CloneItem( index ); + Deselect( IndexOf( item ) ); + } + else + { + // drag sort + if ( index < fDropIndex ) + fDropIndex--; + if ( RemoveItem( item ) ) + itemToAdd = item; + } + if ( itemToAdd ) + { + if ( AddItem( itemToAdd, fDropIndex ) ) + Select( IndexOf( itemToAdd ), true ); + else + delete itemToAdd; + } + } + fDropIndex++; + } + fDropIndex = -1; + } else + BListView::MessageReceived( message ); +} + +/***************************************************************************** + * DragSortableListView::MouseMoved + *****************************************************************************/ +void +DragSortableListView::MouseMoved(BPoint where, uint32 transit, const BMessage *msg) +{ + if ( msg && msg->what == B_SIMPLE_DATA ) + { + switch ( transit ) + { + case B_ENTERED_VIEW: + { + // draw drop mark + BRect r(ItemFrame(0L)); + where.y += r.Height() / 2.0; + int32 count = CountItems(); + bool found = false; + for (int32 index = 0; index <= count; index++) + { + r = ItemFrame(index); + if (r.Contains(where)) + { + SetHighColor(255, 0, 0, 255); + StrokeLine(r.LeftTop(), r.RightTop(), B_SOLID_HIGH); + r.top++; + StrokeLine(r.LeftTop(), r.RightTop(), B_SOLID_HIGH); + fDropIndex = index; + found = true; + break; + } + } + if (found) + break; + // mouse is after last item + fDropIndex = count; + r = Bounds(); + if (count > 0) + r.top = ItemFrame(count - 1).bottom + 1.0; + SetHighColor(255, 0, 0, 255); + StrokeLine(r.LeftTop(), r.RightTop(), B_SOLID_HIGH); + r.top++; + StrokeLine(r.LeftTop(), r.RightTop(), B_SOLID_HIGH); + break; + } + case B_INSIDE_VIEW: + { + // draw drop mark and invalidate previous drop mark + BRect r(ItemFrame(0L)); + where.y += r.Height() / 2.0; + int32 count = CountItems(); + // mouse still after last item? + if (fDropIndex == count) + { + r = Bounds(); + if (count > 0) + r.top = ItemFrame(count - 1).bottom + 1.0; + if (r.Contains(where)) + break; + else + { + r.bottom = r.top + 2.0; + Invalidate(r); + } + } + // mouse still over same item? + if (ItemFrame(fDropIndex).Contains(where)) + break; + else + InvalidateItem(fDropIndex); + + // mouse over new item + bool found = false; + for (int32 index = 0; index <= count; index++) + { + r = ItemFrame(index); + if (r.Contains(where)) + { + SetHighColor(255, 0, 0, 255); + StrokeLine(r.LeftTop(), r.RightTop(), B_SOLID_HIGH); + r.top++; + StrokeLine(r.LeftTop(), r.RightTop(), B_SOLID_HIGH); + fDropIndex = index; + found = true; + break; + } + } + if (found) + break; + // mouse is after last item + fDropIndex = count; + r = Bounds(); + if (count > 0) + r.top = ItemFrame(count - 1).bottom + 1.0; + SetHighColor(255, 0, 0, 255); + StrokeLine(r.LeftTop(), r.RightTop(), B_SOLID_HIGH); + r.top++; + StrokeLine(r.LeftTop(), r.RightTop(), B_SOLID_HIGH); + break; + } + case B_EXITED_VIEW: + { + int32 count = CountItems(); + if (count > 0) + { + if (fDropIndex == count) + { + BRect r(Bounds()); + r.top = ItemFrame(count - 1).bottom + 1.0; + r.bottom = r.top + 2.0; + Invalidate(r); + } + else + InvalidateItem(fDropIndex); + } + break; + } + case B_OUTSIDE_VIEW: + break; + } + } + else + BListView::MouseMoved(where, transit, msg); +} + +/***************************************************************************** + * DragSortableListView::MouseUp + *****************************************************************************/ +void +DragSortableListView::MouseUp( BPoint where ) +{ + // remove drop mark + if ( fDropIndex >= 0 && fDropIndex < CountItems() ) + InvalidateItem( fDropIndex ); + BListView::MouseUp( where ); +} + +/***************************************************************************** + * DragSortableListView::DrawItem + *****************************************************************************/ +void +DragSortableListView::DrawItem( BListItem *item, BRect itemFrame, bool complete ) +{ + DrawListItem( this, IndexOf( item ), itemFrame ); +} + + +/***************************************************************************** + * PlaylistView class + *****************************************************************************/ +PlaylistView::PlaylistView( BRect frame, InterfaceWindow* mainWindow ) + : DragSortableListView( frame, "playlist listview", + B_MULTIPLE_SELECTION_LIST, B_FOLLOW_ALL_SIDES, + B_WILL_DRAW | B_NAVIGABLE | B_PULSE_NEEDED + | B_FRAME_EVENTS | B_FULL_UPDATE_ON_RESIZE ), + fCurrentIndex( -1 ), + fPlaying( false ), + fMainWindow( mainWindow ) +{ +} + +PlaylistView::~PlaylistView() +{ +} + +/***************************************************************************** + * PlaylistView::AttachedToWindow + *****************************************************************************/ +void +PlaylistView::AttachedToWindow() +{ + // get pulse message every two frames + Window()->SetPulseRate(80000); +} + +/***************************************************************************** + * PlaylistView::MouseDown + *****************************************************************************/ +void +PlaylistView::MouseDown( BPoint where ) +{ + int32 clicks = 1; + Window()->CurrentMessage()->FindInt32( "clicks", &clicks ); + bool handled = false; + for ( int32 i = 0; PlaylistItem* item = (PlaylistItem*)ItemAt( i ); i++ ) + { + BRect r = ItemFrame( i ); + if ( r.Contains( where ) ) + { + if ( clicks == 2 ) + { + Intf_VLCWrapper::playlistJumpTo( i ); + handled = true; + } + else if ( i == fCurrentIndex ) + { + r.right = r.left + TEXT_OFFSET; + if ( r.Contains ( where ) ) + { + fMainWindow->PostMessage( PAUSE_PLAYBACK ); + InvalidateItem( i ); + handled = true; + } + } + break; + } + } + if ( !handled ) + DragSortableListView::MouseDown(where); +} + +/***************************************************************************** + * PlaylistView::KeyDown + *****************************************************************************/ +void +PlaylistView::KeyDown( const char* bytes, int32 numBytes ) +{ + if (numBytes < 1) + return; + + if ( ( bytes[0] == B_BACKSPACE ) || ( bytes[0] == B_DELETE ) ) + { + int32 i = CurrentSelection(); + if ( BListItem *item = ItemAt( i ) ) + { +/* if ( RemoveItem( item ) ) + { + delete item; + Select( i + 1 ); + }*/ + } + } + DragSortableListView::KeyDown( bytes, numBytes ); +} + +/***************************************************************************** + * PlaylistView::Pulse + *****************************************************************************/ +void +PlaylistView::Pulse() +{ + if (fMainWindow->IsStopped()) + SetPlaying( false ); +} + +/***************************************************************************** + * PlaylistView::CloneItem + *****************************************************************************/ +BListItem* +PlaylistView::CloneItem( int32 atIndex ) const +{ + BListItem* clone = NULL; + if ( PlaylistItem* item = dynamic_cast( ItemAt( atIndex ) ) ) + clone = new PlaylistItem( item->Text() ); + return clone; +} + +/***************************************************************************** + * PlaylistView::DrawListItem + *****************************************************************************/ +void +PlaylistView::DrawListItem( BView* owner, int32 index, BRect frame ) const +{ + if ( PlaylistItem* item = dynamic_cast( ItemAt( index ) ) ) + item->Draw( owner, frame, index % 2, index == fCurrentIndex, fPlaying ); +} + +/***************************************************************************** + * PlaylistView::MakeDragMessage + *****************************************************************************/ +void +PlaylistView::MakeDragMessage( BMessage* message ) const +{ + if ( message ) + { + message->AddPointer( "list", (void*)this ); + for ( int32 i = 0; BListItem* item = ItemAt( CurrentSelection( i ) ); i++ ) + message->AddPointer( "item", (void*)item ); + } +} + +/***************************************************************************** + * PlaylistView::SetCurrent + *****************************************************************************/ +void +PlaylistView::SetCurrent( int32 index ) +{ + if ( fCurrentIndex != index ) + { + InvalidateItem( fCurrentIndex ); + fCurrentIndex = index; + InvalidateItem( fCurrentIndex ); + } +} + +/***************************************************************************** + * PlaylistView::SetPlaying + *****************************************************************************/ +void +PlaylistView::SetPlaying( bool playing ) +{ + if ( fPlaying != playing ) + { + fPlaying = playing; + InvalidateItem( fCurrentIndex ); + } +} diff --git a/plugins/beos/ListViews.h b/plugins/beos/ListViews.h new file mode 100644 index 0000000000..5ed50e2837 --- /dev/null +++ b/plugins/beos/ListViews.h @@ -0,0 +1,115 @@ +/***************************************************************************** + * ListViews.h: BeOS interface list view class prototype + ***************************************************************************** + * Copyright (C) 1999, 2000, 2001 VideoLAN + * $Id: ListViews.h,v 1.1.2.1 2002/09/29 12:06:08 titer Exp $ + * + * Authors: Stephan Aßmus + * + * 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. + *****************************************************************************/ + +#ifndef LIST_VIEWS_H +#define LIST_VIEWS_H + +#include +#include + +class InterfaceWindow; + +// PlaylistItem +class PlaylistItem : public BStringItem +{ + public: + PlaylistItem( const char* name ); + virtual ~PlaylistItem(); + + virtual void Draw( BView* owner, BRect frame, + bool tintedLine, + bool active = false, + bool playing = false ); + +}; + +// DragSortableListView +class DragSortableListView : public BListView +{ + public: + DragSortableListView( BRect frame, + const char* name, + list_view_type type + = B_SINGLE_SELECTION_LIST, + uint32 resizingMode + = B_FOLLOW_LEFT + | B_FOLLOW_TOP, + uint32 flags + = B_WILL_DRAW + | B_NAVIGABLE + | B_FRAME_EVENTS ); + virtual ~DragSortableListView(); + + // BListView + virtual void Draw( BRect updateRect ); + virtual bool InitiateDrag( BPoint point, int32 index, + bool wasSelected ); + virtual void MessageReceived( BMessage* message ); + virtual void MouseMoved( BPoint where, uint32 transit, + const BMessage* dragMessage ); + virtual void MouseUp( BPoint where ); + virtual void WindowActivated( bool active ); + virtual void DrawItem( BListItem *item, BRect itemFrame, + bool complete = false); + + // DragSortableListView + virtual BListItem* CloneItem( int32 atIndex ) const = 0; + virtual void DrawListItem( BView* owner, int32 index, + BRect itemFrame ) const = 0; + virtual void MakeDragMessage( BMessage* message ) const = 0; + + private: + int32 fDropIndex; +}; + +// PlaylistView +class PlaylistView : public DragSortableListView +{ + public: + PlaylistView( BRect frame, + InterfaceWindow* mainWindow ); + ~PlaylistView(); + + // BListView + virtual void AttachedToWindow(); + virtual void MouseDown( BPoint where ); + virtual void KeyDown( const char* bytes, int32 numBytes ); + virtual void Pulse(); + + // DragSortableListView + virtual BListItem* CloneItem( int32 atIndex ) const; + virtual void DrawListItem( BView* owner, int32 index, + BRect itemFrame ) const; + virtual void MakeDragMessage( BMessage* message ) const; + + // PlaylistView + void SetCurrent( int32 index ); + void SetPlaying( bool playing ); + + private: + int32 fCurrentIndex; + bool fPlaying; + InterfaceWindow* fMainWindow; +}; + +#endif // LIST_VIEWS_H diff --git a/plugins/beos/intf_vlc_wrapper.cpp b/plugins/beos/intf_vlc_wrapper.cpp new file mode 100644 index 0000000000..4f90a724eb --- /dev/null +++ b/plugins/beos/intf_vlc_wrapper.cpp @@ -0,0 +1,852 @@ +/***************************************************************************** + * 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.4 2002/10/09 15:29:51 stippi Exp $ + * + * Authors: Florian G. Pflug + * Jon Lech Johansen + * Tony Casltey + * Stephan Aßmus + * + * 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 ); + + playlistLock(); + p_main->p_playlist->b_stopped = 0; + playlistUnlock(); + + p_main->p_intf->p_sys->b_mute = 0; + } + else + { + playlistLock(); + + if( p_main->p_playlist->b_stopped ) + { + if( p_main->p_playlist->i_size ) + { + playlistUnlock(); + intf_PlaylistJumpto( p_main->p_playlist, + p_main->p_playlist->i_index - 1 ); + p_main->p_intf->p_sys->b_mute = 0; + } + else + playlistUnlock(); + } + else + playlistUnlock(); + } + + 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 ); + + playlistLock(); + p_main->p_playlist->b_stopped = 0; + playlistUnlock(); + } +} + +void Intf_VLCWrapper::playlistStop() +{ + if( p_input_bank->pp_input[0] != NULL ) + { + /* end playing item */ + input_SetStatus( p_input_bank->pp_input[0], INPUT_STATUS_END ); + + /* update playlist */ + playlistLock(); + p_main->p_playlist->b_stopped = 1; + playlistUnlock(); + } + +} + +void Intf_VLCWrapper::playlistNext() +{ + playlistJumpTo( playlistCurrentPos() + 1 ); +} + +void Intf_VLCWrapper::playlistPrev() +{ + playlistJumpTo( playlistCurrentPos() - 1 ); +} + +void Intf_VLCWrapper::playlistJumpTo( int pos ) +{ + // sanity checks + if ( pos < 0 ) + pos = 0; + int size = playlistSize(); + if (pos >= size) + pos = size - 1; + // weird hack + if( p_input_bank->pp_input[0] != NULL ) + pos--; + // stop current stream + playlistStop(); + // modify current position in playlist + playlistLock(); + p_main->p_playlist->i_index = pos; + playlistUnlock(); + // start playing + playlistPlay(); +} + +int Intf_VLCWrapper::playlistCurrentPos() +{ + playlistLock(); + int pos = p_main->p_playlist->i_index; + playlistUnlock(); + return pos; +} + +int Intf_VLCWrapper::playlistSize() +{ + playlistLock(); + int size = p_main->p_playlist->i_size; + playlistUnlock(); + return size; +} + +void Intf_VLCWrapper::playlistLock() +{ + vlc_mutex_lock( &p_main->p_playlist->change_lock ); +} + +void Intf_VLCWrapper::playlistUnlock() +{ + vlc_mutex_unlock( &p_main->p_playlist->change_lock ); +} + +void Intf_VLCWrapper::getNavCapabilities( bool* canSkipPrev, + bool* canSkipNext ) +{ + if ( canSkipPrev && canSkipNext ) + { + // init the parameters + *canSkipPrev = false; + *canSkipNext = false; + // get playlist info + playlistLock(); + int pos = p_main->p_playlist->i_index; + int size = p_main->p_playlist->i_size; + playlistUnlock(); + + input_thread_s* input = p_input_bank->pp_input[0]; + // see if we have got a stream going + if ( input ) + { + vlc_mutex_lock( &input->stream.stream_lock ); + + bool hasTitles = input->stream.i_area_nb > 1; + int numChapters = input->stream.p_selected_area->i_part_nb; + bool hasChapters = numChapters > 1; + // first, look for chapters + if ( hasChapters ) + { + *canSkipPrev = input->stream.p_selected_area->i_part > 1; + *canSkipNext = input->stream.p_selected_area->i_part < + input->stream.p_selected_area->i_part_nb - 1; + } + // if one of the skip capabilities is false, + // make it depend on titles instead + if ( !*canSkipPrev && hasTitles ) + *canSkipPrev = input->stream.p_selected_area->i_id > 1; + if ( !*canSkipNext && hasTitles ) + *canSkipNext = input->stream.p_selected_area->i_id < input->stream.i_area_nb - 1; + + vlc_mutex_unlock( &input->stream.stream_lock ); + } + // last but not least, make capabilities depend on playlist + if ( !*canSkipPrev ) + *canSkipPrev = pos > 0; + if ( !*canSkipNext ) + *canSkipNext = pos < size - 1; + } +} + +void Intf_VLCWrapper::navigatePrev() +{ + bool hasSkiped = false; + + input_thread_s* input = p_input_bank->pp_input[0]; + // see if we have got a stream going + if ( input ) + { + // get information from stream (lock it while looking at it) + vlc_mutex_lock( &input->stream.stream_lock ); + + int currentTitle = input->stream.p_selected_area->i_id; + int currentChapter = input->stream.p_selected_area->i_part; + int numTitles = input->stream.i_area_nb; + bool hasTitles = numTitles > 1; + int numChapters = input->stream.p_selected_area->i_part_nb; + bool hasChapters = numChapters > 1; + + vlc_mutex_unlock( &input->stream.stream_lock ); + + // first, look for chapters + if ( hasChapters ) + { + // skip to the previous chapter + currentChapter--; + + if ( currentChapter >= 1 ) + { + toggleChapter( currentChapter ); + hasSkiped = true; + } + } + // if we couldn't skip chapters, try titles instead + if ( !hasSkiped && hasTitles ) + { + // skip to the previous title + currentTitle--; + // disallow area 0 since it is used for video_ts.vob + if( currentTitle > 0 ) + { + toggleTitle(currentTitle); + hasSkiped = true; + } + } + + } + // last but not least, skip to previous file + if ( !hasSkiped ) + playlistPrev(); +} + +void Intf_VLCWrapper::navigateNext() +{ + bool hasSkiped = false; + + input_thread_s* input = p_input_bank->pp_input[0]; + // see if we have got a stream going + if ( input ) + { + // get information from stream (lock it while looking at it) + vlc_mutex_lock( &input->stream.stream_lock ); + + int currentTitle = input->stream.p_selected_area->i_id; + int currentChapter = input->stream.p_selected_area->i_part; + int numTitles = input->stream.i_area_nb; + bool hasTitles = numTitles > 1; + int numChapters = input->stream.p_selected_area->i_part_nb; + bool hasChapters = numChapters > 1; + + vlc_mutex_unlock( &input->stream.stream_lock ); + + // first, look for chapters + if ( hasChapters ) + { + // skip to the next chapter + currentChapter++; + if ( currentChapter < numChapters ) + { + toggleChapter( currentChapter ); + hasSkiped = true; + } + } + // if we couldn't skip chapters, try titles instead + if ( !hasSkiped && hasTitles ) + { + // skip to the next title + currentTitle++; + // disallow area 0 since it is used for video_ts.vob + if ( currentTitle < numTitles - 1 ) + { + toggleTitle(currentTitle); + hasSkiped = true; + } + } + + } + // last but not least, skip to next file + if ( !hasSkiped ) + playlistNext(); +} + + +//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->i_count > 0 + && p_aout_bank->pp_aout[0] != NULL ) + { + if( !p_main->p_intf->p_sys->b_mute ) + { + 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->i_count > 0 + && p_aout_bank->pp_aout[0] != NULL ) + { + p_aout_bank->pp_aout[0]->i_volume = + p_main->p_intf->p_sys->i_saved_volume; + p_main->p_intf->p_sys->i_saved_volume = 0; + p_main->p_intf->p_sys->b_mute = 0; + } +} + +void Intf_VLCWrapper::set_volume(int value) +{ + if( p_aout_bank->i_count > 0 + && p_aout_bank->pp_aout[0] != NULL ) + { + // make sure value is within bounds + if (value < 0) + value = 0; + if (value > VOLUME_MAX) + value = VOLUME_MAX; + vlc_mutex_lock( &p_aout_bank->lock ); + // unmute volume if muted + if ( p_main->p_intf->p_sys->b_mute ) + p_main->p_intf->p_sys->b_mute = 0; + // set every stream to the given value + for ( int i = 0 ; i < p_aout_bank->i_count ; i++ ) + { + if ( p_aout_bank->pp_aout[i] ) + p_aout_bank->pp_aout[i]->i_volume = value; + } + vlc_mutex_unlock( &p_aout_bank->lock ); + } +} + +void Intf_VLCWrapper::toggle_mute() +{ + if( p_aout_bank->i_count > 0 + && p_aout_bank->pp_aout[0] != NULL ) + { + if ( p_main->p_intf->p_sys->b_mute ) + { + Intf_VLCWrapper::volume_restore(); + } + else + { + Intf_VLCWrapper::volume_mute(); + } + } +} + +bool Intf_VLCWrapper::is_muted() +{ + bool muted = true; + if ( p_aout_bank->i_count > 0 ) + { + vlc_mutex_lock( &p_aout_bank->lock ); + for ( int i = 0 ; i < p_aout_bank->i_count ; i++ ) + { + if ( p_aout_bank->pp_aout[i] + && p_aout_bank->pp_aout[i]->i_volume > 0 ) + { + muted = false; + break; + } + } + vlc_mutex_unlock( &p_aout_bank->lock ); +// unfortunately, this is not reliable! +// return p_main->p_intf->p_sys->b_mute; + } + return muted; +} + +bool Intf_VLCWrapper::is_playing() +{ + bool playing = false; + if ( p_input_bank->pp_input[0] ) + { + switch ( p_input_bank->pp_input[0]->stream.control.i_status ) + { + case PLAYING_S: + case FORWARD_S: + case BACKWARD_S: + case START_S: + playing = true; + break; + case PAUSE_S: + case UNDEF_S: + case NOT_STARTED_S: + default: + break; + } + } + return playing; +} + +void Intf_VLCWrapper::maxvolume() +{ + if( p_aout_bank->i_count > 0 + && p_aout_bank->pp_aout[0] != NULL ) + { + 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; + } + } +} + +bool Intf_VLCWrapper::has_audio() +{ + return (p_aout_bank->i_count > 0); +} + +//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 */ + +const char* +Intf_VLCWrapper::getTimeAsString() +{ + static char psz_currenttime[ OFFSETTOTIME_MAX_SIZE ]; + + if( p_input_bank->pp_input[0] == NULL ) + return ("-:--:--"); + + input_OffsetToTime( p_input_bank->pp_input[0], + psz_currenttime, + p_input_bank->pp_input[0]->stream.p_selected_area->i_tell ); + + return(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 ); +} + +// getPlaylistInfo +void +Intf_VLCWrapper::getPlaylistInfo( int32& currentIndex, int32& maxIndex ) +{ + currentIndex = -1; + maxIndex = -1; + if ( playlist_t* list = (playlist_t*)p_main->p_playlist ) + { + vlc_mutex_lock( &list->change_lock ); + + maxIndex = list->i_size; + if ( maxIndex > 0 ) + currentIndex = list->i_index + 1; + else + maxIndex = -1; + + vlc_mutex_unlock( &list->change_lock ); + } +} + +// getTitleInfo +void +Intf_VLCWrapper::getTitleInfo( int32& currentIndex, int32& maxIndex ) +{ + currentIndex = -1; + maxIndex = -1; + if ( input_thread_s* input = p_input_bank->pp_input[0] ) + { + vlc_mutex_lock( &input->stream.stream_lock ); + + maxIndex = input->stream.i_area_nb - 1; + if ( maxIndex > 0) + currentIndex = input->stream.p_selected_area->i_id; + else + maxIndex = -1; + + vlc_mutex_unlock( &input->stream.stream_lock ); + } +} + +// getChapterInfo +void +Intf_VLCWrapper::getChapterInfo( int32& currentIndex, int32& maxIndex ) +{ + currentIndex = -1; + maxIndex = -1; + if ( input_thread_s* input = p_input_bank->pp_input[0] ) + { + vlc_mutex_lock( &input->stream.stream_lock ); + + maxIndex = input->stream.p_selected_area->i_part_nb - 1; + if ( maxIndex > 0) + currentIndex = input->stream.p_selected_area->i_part; + else + maxIndex = -1; + + vlc_mutex_unlock( &input->stream.stream_lock ); + } +} + + + /* open file/disc/network */ +void Intf_VLCWrapper::openFiles( BList* o_files, bool replace ) +{ + BString *o_file; + int i_end = p_main->p_playlist->i_size; + intf_thread_t * p_intf = p_main->p_intf; + + // make sure we remove the "loop" item from the end before mucking arround + if ( p_intf->p_sys->b_loop ) + { + intf_PlaylistDelete( p_main->p_playlist, i_end - 1 ); + i_end--; + } + + // add the new files to the playlist + 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; + } + + if ( replace || i_end < 1 ) + { + // end current item + if ( p_input_bank->pp_input[0] != NULL ) + p_input_bank->pp_input[0]->b_eof = 1; + // remove everything that was in playlist before + for ( int i = 0; i < i_end; i++ ) + intf_PlaylistDelete( p_main->p_playlist, 0 ); + // jump to beginning and start playing + intf_PlaylistJumpto( p_main->p_playlist, -1 ); + } + + // if we were looping, add special "loop" item back to list + 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 ; + + 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 ) +{ + if ( input_thread_t * p_input = p_input_bank->pp_input[0] ) + { + if ( i_language == -1 ) + { + input_ChangeES( p_input, NULL, AUDIO_ES ); + } + else if ( i_language >= 0 + && i_language < p_input->stream.i_es_number ) + { + input_ChangeES( p_input, p_input->stream.pp_es[i_language], AUDIO_ES ); + } + } +} + +void Intf_VLCWrapper::toggleSubtitle(int i_subtitle) +{ + if ( input_thread_t * p_input = p_input_bank->pp_input[0] ) + { + if ( i_subtitle == -1 ) + { + input_ChangeES( p_input, NULL, SPU_ES ); + } + else if ( i_subtitle >= 0 + && i_subtitle < p_input->stream.i_es_number ) + { + input_ChangeES( p_input, p_input->stream.pp_es[i_subtitle], SPU_ES ); + } + } +} + + + 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..23062a1231 --- /dev/null +++ b/plugins/beos/intf_vlc_wrapper.h @@ -0,0 +1,114 @@ +/***************************************************************************** + * 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.4 2002/10/09 15:29:51 stippi Exp $ + * + * Authors: Florian G. Pflug + * Jon Lech Johansen + * Tony Casltey + * Stephan Aßmus + * + * 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 playlistJumpTo( int pos ); + static int playlistCurrentPos(); + static int playlistSize(); + static void playlistLock(); + static void playlistUnlock(); + + static void getNavCapabilities( bool* canSkipPrev, + bool* canSkipNext ); + static void navigatePrev(); + static void navigateNext(); + +// 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 set_volume(int value); + static void toggle_mute(); + static bool is_muted(); + static bool is_playing(); + static void maxvolume(); + static bool has_audio(); +// static void fullscreen(); + static void eject(); + + /* playback info */ + static const char* getTimeAsString(); + static float getTimeAsFloat(); + static void setTimeAsFloat( float i_offset ); + static bool playlistPlaying(); + static BList* playlistAsArray(); + static void getPlaylistInfo( int32& currentIndex, + int32& maxIndex ); + static void getTitleInfo( int32& currentIndex, + int32& maxIndex ); + static void getChapterInfo( int32& currentIndex, + int32& maxIndex ); + + /* open file/disc/network */ + static void openFiles( BList *o_files, bool replace = true ); + 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/familiar/Makefile b/plugins/familiar/Makefile new file mode 100644 index 0000000000..f81918f22c --- /dev/null +++ b/plugins/familiar/Makefile @@ -0,0 +1 @@ +familiar_SOURCES = familiar.c familiar_interface.c familiar_support.c familiar_callbacks.c diff --git a/plugins/familiar/familiar.c b/plugins/familiar/familiar.c new file mode 100644 index 0000000000..81ead1079a --- /dev/null +++ b/plugins/familiar/familiar.c @@ -0,0 +1,301 @@ +/***************************************************************************** + * familiar.c : familiar plugin for vlc + ***************************************************************************** + * Copyright (C) 2002 VideoLAN + * $Id: familiar.c,v 1.8.2.9 2002/10/29 20:53:30 jpsaman Exp $ + * + * Authors: Jean-Paul Saman + * + * 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 /* malloc(), free() */ +#include /* ENOMEM */ +#include /* strerror() */ +#include + +#include + +#include + +#ifdef HAVE_GPE_INIT_H +#include +#endif + +#include "stream_control.h" +#include "input_ext-intf.h" + +#include "interface.h" +#include "intf_playlist.h" + +#include "video.h" +#include "video_output.h" + +#include "familiar_callbacks.h" +#include "familiar_interface.h" +#include "familiar_support.h" +#include "familiar.h" + +/***************************************************************************** + * Local prototypes. + *****************************************************************************/ +static void intf_getfunctions ( function_list_t * p_function_list ); +static int Open ( intf_thread_t *p_intf ); +static void Close ( intf_thread_t *p_intf ); +static void Run ( intf_thread_t * ); + +static gint GtkManage ( gpointer p_data ); +void GtkAutoPlayFile( void ); + +/***************************************************************************** + * Module descriptor + *****************************************************************************/ +#define AUTOPLAYFILE_TEXT N_("autoplay selected file") +#define AUTOPLAYFILE_LONGTEXT N_("automatically play a file when selected in the "\ + "file selection list") + +MODULE_CONFIG_START +ADD_CATEGORY_HINT( N_("Miscellaneous"), NULL ) +ADD_BOOL( "familiar-autoplayfile", 1, GtkAutoPlayFile, AUTOPLAYFILE_TEXT, AUTOPLAYFILE_LONGTEXT) +MODULE_CONFIG_STOP + +MODULE_INIT_START + SET_DESCRIPTION( _("Familiar Linux Gtk+ interface module") ) +#ifndef WIN32 + if( getenv( "DISPLAY" ) == NULL ) + { + ADD_CAPABILITY( INTF, 10 ) + } + else +#endif + { + ADD_CAPABILITY( INTF, 70 ) + } +MODULE_INIT_STOP + +MODULE_ACTIVATE_START + intf_getfunctions( &p_module->p_functions->intf ); +MODULE_ACTIVATE_STOP + +MODULE_DEACTIVATE_START +MODULE_DEACTIVATE_STOP + +/***************************************************************************** + * g_atexit: kludge to avoid the Gtk+ thread to segfault at exit + ***************************************************************************** + * gtk_init() makes several calls to g_atexit() which calls atexit() to + * register tidying callbacks to be called at program exit. Since the Gtk+ + * plugin is likely to be unloaded at program exit, we have to export this + * symbol to intercept the g_atexit() calls. Talk about crude hack. + *****************************************************************************/ +void g_atexit( GVoidFunc func ) +{ + intf_thread_t *p_intf = p_main->p_intf; + int i_dummy; + + for( i_dummy = 0; + i_dummy < MAX_ATEXIT && p_intf->p_sys->pf_callback[i_dummy] != NULL; + i_dummy++ ) + { + ; + } + + if( i_dummy >= MAX_ATEXIT - 1 ) + { + intf_ErrMsg( "too many atexit() callbacks to register" ); + return; + } + + p_intf->p_sys->pf_callback[i_dummy] = func; + p_intf->p_sys->pf_callback[i_dummy + 1] = NULL; +} + +/***************************************************************************** + * Functions exported as capabilities. They are declared as static so that + * we don't pollute the namespace too much. + *****************************************************************************/ +static void intf_getfunctions( function_list_t * p_function_list ) +{ + p_function_list->functions.intf.pf_open = Open; + p_function_list->functions.intf.pf_close = Close; + p_function_list->functions.intf.pf_run = Run; +} + +/***************************************************************************** + * Open: initialize and create window + *****************************************************************************/ +static int Open( intf_thread_t *p_intf ) +{ + /* Allocate instance and initialize some members */ + p_intf->p_sys = malloc( sizeof( intf_sys_t ) ); + if( p_intf->p_sys == NULL ) + { + intf_ErrMsg("error: %s", strerror(ENOMEM)); + return (1); + } + + /* Initialize Gtk+ thread */ + p_intf->p_sys->b_autoplayfile = 1; + p_intf->p_sys->pf_callback[0] = NULL; + + p_intf->pf_run = Run; + + return (0); +} + +/***************************************************************************** + * Close: destroy interface window + *****************************************************************************/ +static void Close( intf_thread_t *p_intf ) +{ + /* Destroy structure */ + free( p_intf->p_sys ); +} + +/***************************************************************************** + * Run: Gtk+ thread + ***************************************************************************** + * this part of the interface is in a separate thread so that we can call + * gtk_main() from within it without annoying the rest of the program. + *****************************************************************************/ +static void Run( intf_thread_t *p_intf ) +{ + /* gtk_init needs to know the command line. We don't care, so we + * give it an empty one */ + char *p_args[] = { "" }; + char **pp_args = p_args; + int i_args = 1; + int i_dummy = 0; + +#ifdef HAVE_GPE_INIT_H + /* Initialize GPE interface */ + if (gpe_application_init(&i_args, &pp_args) == FALSE) + exit (1); +#else + /* Initialize Gtk+ */ + gtk_set_locale (); + + /* gtk_init will register stuff with g_atexit, so we need to take + * the global lock if we want to be able to intercept the calls */ + gtk_init( &i_args, &pp_args ); +#endif + + /* Create some useful widgets that will certainly be used */ +// FIXME: magic path + add_pixmap_directory("share"); + add_pixmap_directory("/usr/share/videolan"); + + p_intf->p_sys->p_window = create_familiar(); + if (p_intf->p_sys->p_window == NULL) + { + intf_ErrMsg( "unable to create familiar interface" ); + } + + /* Set the title of the main window */ + gtk_window_set_title( GTK_WINDOW(p_intf->p_sys->p_window), + VOUT_TITLE " (Familiar Linux interface)"); + + p_intf->p_sys->p_notebook = GTK_NOTEBOOK( gtk_object_get_data( + GTK_OBJECT( p_intf->p_sys->p_window ), "notebook" ) ); + + p_intf->p_sys->p_clist = GTK_CLIST( gtk_object_get_data( + GTK_OBJECT( p_intf->p_sys->p_window ), "clistmedia" ) ); + gtk_clist_set_column_visibility (GTK_CLIST (p_intf->p_sys->p_clist), 2, FALSE); + gtk_clist_set_column_visibility (GTK_CLIST (p_intf->p_sys->p_clist), 3, FALSE); + gtk_clist_set_column_visibility (GTK_CLIST (p_intf->p_sys->p_clist), 4, FALSE); + gtk_clist_column_titles_show (GTK_CLIST (p_intf->p_sys->p_clist)); + + /* Store p_intf to keep an eye on it */ + gtk_object_set_data( GTK_OBJECT(p_intf->p_sys->p_window), + "p_intf", p_intf ); + /* Show the control window */ + gtk_widget_show( p_intf->p_sys->p_window ); + ReadDirectory(p_intf->p_sys->p_clist, "/mnt"); +// OpenDirectory(p_intf->p_sys->p_clist, "/mnt"); + + /* Sleep to avoid using all CPU - since some interfaces needs to access + * keyboard events, a 100ms delay is a good compromise */ + i_dummy = gtk_timeout_add( INTF_IDLE_SLEEP / 1000, GtkManage, p_intf ); + + /* Enter Gtk mode */ + gtk_main(); + + /* Remove the timeout */ + gtk_timeout_remove( i_dummy ); + + /* Launch stored callbacks */ + for( i_dummy = 0; + i_dummy < MAX_ATEXIT && p_intf->p_sys->pf_callback[i_dummy] != NULL; + i_dummy++ ) + { + p_intf->p_sys->pf_callback[i_dummy](); + } +} + +/* following functions are local */ + +/***************************************************************************** + * GtkManage: manage main thread messages + ***************************************************************************** + * In this function, called approx. 10 times a second, we check what the + * main program wanted to tell us. + *****************************************************************************/ +static gint GtkManage( gpointer p_data ) +{ +#define p_intf ((intf_thread_t *)p_data) + vlc_mutex_lock( &p_intf->change_lock ); + + /* Manage core vlc functions through the callback */ + p_intf->pf_manage( p_intf ); + + if( p_intf->b_die ) + { + vlc_mutex_unlock( &p_intf->change_lock ); + + /* Prepare to die, young Skywalker */ + gtk_main_quit(); + + /* Just in case */ + return( FALSE ); + } + + vlc_mutex_unlock( &p_intf->change_lock ); + + return( TRUE ); + +#undef p_intf +} + +/***************************************************************************** + * GtkAutoplayFile: Autoplay file depending on configuration settings + ***************************************************************************** + * FIXME: we should get the intf as parameter + *****************************************************************************/ +void GtkAutoPlayFile( void ) +{ + GtkWidget *cbautoplay; + + cbautoplay = GTK_WIDGET( gtk_object_get_data( + GTK_OBJECT( p_main->p_intf->p_sys->p_window ), "cbautoplay" ) ); + if( !config_GetIntVariable( "familiar-autoplayfile" ) ) + p_main->p_intf->p_sys->b_autoplayfile=0; + else + p_main->p_intf->p_sys->b_autoplayfile=1; + + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON(cbautoplay),p_main->p_intf->p_sys->b_autoplayfile); +} diff --git a/plugins/familiar/familiar.glade b/plugins/familiar/familiar.glade new file mode 100644 index 0000000000..91f9b15715 --- /dev/null +++ b/plugins/familiar/familiar.glade @@ -0,0 +1,560 @@ + + + + + Familiar + familiar + + + ../../share + C + False + True + True + False + False + familiar_interface.c + familiar_interface.h + familiar_callbacks.c + familiar_callbacks.h + familiar_support.c + familiar_support.h + + + + GtkWindow + familiar + 240 + 300 + + delete_event + on_familiar_delete_event + Wed, 21 Aug 2002 19:12:40 GMT + + vlc (familiar) + GTK_WINDOW_TOPLEVEL + GTK_WIN_POS_NONE + False + True + True + True + + + GtkVBox + vbox + False + 0 + + + GtkToolbar + toolbar + 2 + 112 + 16 + GTK_ORIENTATION_HORIZONTAL + GTK_TOOLBAR_ICONS + 5 + GTK_TOOLBAR_SPACE_EMPTY + GTK_RELIEF_NORMAL + True + + 0 + True + True + + + + GtkButton + Toolbar:button + toolbar_open + Open file + + clicked + on_toolbar_open_clicked + Wed, 24 Jul 2002 18:28:31 GMT + + + familiar-openb16x16.xpm + + + + GtkButton + Toolbar:button + toolbar_preferences + Preferences + + clicked + on_toolbar_preferences_clicked + Wed, 24 Jul 2002 18:29:05 GMT + + + familiar-preferencesb16x16.xpm + + + + GtkButton + Toolbar:button + toolbar_rewind + Rewind stream + + clicked + on_toolbar_rewind_clicked + Wed, 24 Jul 2002 18:28:45 GMT + + + familiar-rewindb16x16.xpm + + True + + + + + GtkButton + Toolbar:button + toolbar_pause + Pause stream + + clicked + on_toolbar_pause_clicked + Wed, 24 Jul 2002 18:28:58 GMT + + + familiar-pauseb16x16.xpm + + + + GtkButton + Toolbar:button + toolbar_play + Play stream + + clicked + on_toolbar_play_clicked + Wed, 24 Jul 2002 18:29:12 GMT + + + familiar-playb16x16.xpm + + + + GtkButton + Toolbar:button + toolbar_stop + Stop stream + + clicked + on_toolbar_stop_clicked + Wed, 24 Jul 2002 18:29:18 GMT + + + familiar-stopb16x16.xpm + + + + GtkButton + Toolbar:button + toolbar_forward + Forward stream + + clicked + on_toolbar_forward_clicked + Wed, 24 Jul 2002 18:29:25 GMT + + + familiar-forwardb16x16.xpm + + + + GtkButton + Toolbar:button + toolbar_about + About + + clicked + on_toolbar_about_clicked + Wed, 24 Jul 2002 18:29:31 GMT + + + vlc16x16.xpm + + True + + + + + + GtkNotebook + notebook + True + True + True + GTK_POS_TOP + False + 2 + 2 + False + + 0 + True + True + + + + GtkFixed + fixedMedia + + + GtkLabel + labelUrl + 4 + 8 + 38 + 18 + + GTK_JUSTIFY_CENTER + False + 0.5 + 0.5 + 0 + 0 + + + + GtkScrolledWindow + scrolledwindow1 + 0 + 32 + 240 + 208 + GTK_POLICY_ALWAYS + GTK_POLICY_ALWAYS + GTK_UPDATE_CONTINUOUS + GTK_UPDATE_CONTINUOUS + + + GtkCList + clistmedia + True + + select_row + on_clistmedia_select_row + Sun, 18 Aug 2002 19:40:44 GMT + + + click_column + on_clistmedia_click_column + Sun, 18 Aug 2002 19:41:06 GMT + + 5 + 123,80,80,80,80 + GTK_SELECTION_SINGLE + True + GTK_SHADOW_IN + + + GtkLabel + CList:title + labelname + + GTK_JUSTIFY_CENTER + False + 0.5 + 0.5 + 0 + 0 + + + + GtkLabel + CList:title + labeltype + + GTK_JUSTIFY_CENTER + False + 0.5 + 0.5 + 0 + 0 + + + + GtkLabel + CList:title + labelsize + + GTK_JUSTIFY_CENTER + False + 0.5 + 0.5 + 0 + 0 + + + + GtkLabel + CList:title + labeluid + + GTK_JUSTIFY_CENTER + False + 0.5 + 0.5 + 0 + 0 + + + + GtkLabel + CList:title + labelgid + + GTK_JUSTIFY_CENTER + False + 0.5 + 0.5 + 0 + 0 + + + + + + GtkCombo + comboURL + 40 + 4 + 185 + 24 + False + True + False + True + False + /mnt +file:// +ftp:// +http:// +udp://@:1234 +udpstream://@:1234 + + + + GtkEntry + GtkCombo:entry + comboURL-entry + True + + changed + on_comboURL-entry_changed + Thu, 01 Aug 2002 19:37:06 GMT + + True + True + 0 + /mnt + + + + + + GtkLabel + Notebook:tab + media + + GTK_JUSTIFY_CENTER + False + 0.5 + 0.5 + 0 + 0 + + + + GtkFixed + fixedPreferences + + + GtkButton + buttonSave + 8 + 216 + 54 + 24 + True + + clicked + on_buttonSave_clicked + Tue, 01 Oct 2002 21:12:20 GMT + + + GTK_RELIEF_NORMAL + + + + GtkButton + buttonApply + 64 + 216 + 54 + 24 + True + + clicked + on_buttonApply_clicked + Tue, 01 Oct 2002 21:12:27 GMT + + + GTK_RELIEF_NORMAL + + + + GtkButton + buttonCancel + 176 + 216 + 54 + 24 + True + + clicked + on_buttonCancel_clicked + Tue, 01 Oct 2002 21:12:35 GMT + + + GTK_RELIEF_NORMAL + + + + GtkCheckButton + cbautoplay + 8 + 8 + 216 + 24 + True + + toggled + on_cbautoplay_toggled + Sun, 18 Aug 2002 20:00:52 GMT + + + True + True + + + + + GtkLabel + Notebook:tab + preferences + + GTK_JUSTIFY_CENTER + False + 0.5 + 0.5 + 0 + 0 + + + + GtkFixed + fixedAbout + + + GtkPixmap + logo + 8 + 0 + 50 + 50 + vlc32x32.xpm + 0.5 + 0.5 + 0 + 0 + True + + + + GtkLabel + labelVlc + 64 + 8 + 120 + 40 + + GTK_JUSTIFY_CENTER + True + 0.5 + 0.5 + 0 + 0 + + + + GtkLabel + labelCopyright + 16 + 56 + 200 + 18 + + GTK_JUSTIFY_CENTER + False + 0.5 + 0.5 + 0 + 0 + + + + GtkLabel + labelAuthors + 16 + 80 + 200 + 40 + + GTK_JUSTIFY_CENTER + True + 0.5 + 0.5 + 0 + 0 + + + + GtkLabel + labelAbout + 16 + 128 + 200 + 70 + + GTK_JUSTIFY_LEFT + True + 0.5 + 0.5 + 0 + 0 + + + + + GtkLabel + Notebook:tab + about + + GTK_JUSTIFY_CENTER + False + 0.5 + 0.5 + 0 + 0 + + + + + + diff --git a/plugins/familiar/familiar.h b/plugins/familiar/familiar.h new file mode 100644 index 0000000000..d910121288 --- /dev/null +++ b/plugins/familiar/familiar.h @@ -0,0 +1,48 @@ +/***************************************************************************** + * familiar.h: private Gtk+ interface description + ***************************************************************************** + * Copyright (C) 1999, 2000 VideoLAN + * $Id: familiar.h,v 1.6.2.3 2002/10/07 21:49:53 jpsaman Exp $ + * + * Authors: Jean-Paul Saman + * + * 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. + *****************************************************************************/ + +#define MAX_ATEXIT 10 + +/***************************************************************************** + * intf_sys_t: description and status of Gtk+ interface + *****************************************************************************/ +typedef struct intf_sys_s +{ + /* windows and widgets */ + GtkWidget * p_window; /* main window */ + GtkNotebook * p_notebook; + GtkCList * p_clist; +// GHashTable * config_hash_table; + boolean_t b_autoplayfile; + + /* XXX: Ugly kludge, see gtk.c */ + void ( *pf_callback[MAX_ATEXIT] ) ( void ); +} intf_sys_t; + +/***************************************************************************** + * Useful macro + ****************************************************************************/ +#define GtkGetIntf( widget ) __GtkGetIntf( GTK_WIDGET( widget ) ) +void * __GtkGetIntf( GtkWidget * ); + + diff --git a/plugins/familiar/familiar_callbacks.c b/plugins/familiar/familiar_callbacks.c new file mode 100644 index 0000000000..7501867102 --- /dev/null +++ b/plugins/familiar/familiar_callbacks.c @@ -0,0 +1,617 @@ +/***************************************************************************** + * familiar_callbacks.c : Callbacks for the Familiar Linux Gtk+ plugin. + ***************************************************************************** + * Copyright (C) 2000, 2001 VideoLAN + * $Id: familiar_callbacks.c,v 1.6.2.12 2002/10/30 22:42:26 jpsaman Exp $ + * + * Authors: Jean-Paul Saman + * + * 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 +#include +#include +#include /* off_t */ +#include +#include + +#include + +#include "stream_control.h" +#include "input_ext-intf.h" + +#include "interface.h" +#include "intf_playlist.h" + +#include "video.h" +#include "video_output.h" + +#ifdef HAVE_CONFIG_H +# include +#endif + +#include + +#include "familiar_callbacks.h" +#include "familiar_interface.h" +#include "familiar_support.h" +#include "familiar.h" + +#include "netutils.h" + +static void MediaURLOpenChanged( GtkWidget *widget, gchar *psz_url ); +static char* get_file_perm(const char *path); + +/***************************************************************************** + * Useful function to retrieve p_intf + ****************************************************************************/ +void * __GtkGetIntf( GtkWidget * widget ) +{ + void *p_data; + + if( GTK_IS_MENU_ITEM( widget ) ) + { + /* Look for a GTK_MENU */ + while( widget->parent && !GTK_IS_MENU( widget ) ) + { + widget = widget->parent; + } + + /* Maybe this one has the data */ + p_data = gtk_object_get_data( GTK_OBJECT( widget ), "p_intf" ); + if( p_data ) + { + return p_data; + } + + /* Otherwise, the parent widget has it */ + widget = gtk_menu_get_attach_widget( GTK_MENU( widget ) ); + } + + /* We look for the top widget */ + widget = gtk_widget_get_toplevel( GTK_WIDGET( widget ) ); + + p_data = gtk_object_get_data( GTK_OBJECT( widget ), "p_intf" ); + + return p_data; +} + +/***************************************************************************** + * Helper functions for URL changes in Media and Preferences notebook pages. + ****************************************************************************/ +static void MediaURLOpenChanged( GtkWidget *widget, gchar *psz_url ) +{ + intf_thread_t *p_intf = GtkGetIntf( widget ); + int i_end = p_main->p_playlist->i_size; + + // Add p_url to playlist .... but how ? + if( p_main->p_playlist ) + { + intf_PlaylistAdd( p_main->p_playlist, PLAYLIST_END, (char*)psz_url ); + } + + if (p_intf->p_sys->b_autoplayfile) + { + /* end 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_input_bank->pp_input[0] != NULL ) + { + input_SetStatus( p_input_bank->pp_input[0], INPUT_STATUS_PLAY ); + p_main->p_playlist->b_stopped = 0; + } + } +} + +/***************************************************************** + * Read directory helper function. + ****************************************************************/ +void ReadDirectory( GtkCList *clist, char *psz_dir ) +{ + intf_thread_t *p_intf = GtkGetIntf( clist ); + struct dirent **namelist; + int n=-1; + int status=-1; + + printf( "Read directory: %s\n", psz_dir ); + if (psz_dir) + { + status = chdir(psz_dir); + if (status<0) + intf_ErrMsg("File is not a directory."); + } + n = scandir(psz_dir, &namelist, 0, NULL); + + printf( "n=%d\n", n); + if (n<0) + perror("scandir"); + else + { + gchar *ppsz_text[2]; + int i; + + gtk_clist_freeze( p_intf->p_sys->p_clist ); + gtk_clist_clear( p_intf->p_sys->p_clist ); + for (i=0; id_name; + ppsz_text[1] = get_file_perm(namelist[i]->d_name); + printf( "Entry: %s, %s\n", namelist[i]->d_name, ppsz_text[1] ); + gtk_clist_insert( p_intf->p_sys->p_clist, i, ppsz_text ); + free(namelist[i]); + } + gtk_clist_thaw( p_intf->p_sys->p_clist ); + free(namelist); + } +} + +void OpenDirectory( GtkCList *clist, char *psz_dir ) +{ + intf_thread_t *p_intf = GtkGetIntf( clist ); + gchar *ppsz_text[2]; + int row=0; + + char* dir_path; + DIR* dir; + struct dirent* entry=NULL; + char entry_path[PATH_MAX+1]; + size_t path_len; + + if (psz_dir) + dir_path = psz_dir; + else + dir_path = "."; + + strncpy( &entry_path[0], dir_path, sizeof(entry_path) ); + /* always force end of string */ + entry_path[PATH_MAX+1]='\0'; + path_len = strlen(dir_path); + /* Make sure we do not run over our buffer here */ + if (path_len > PATH_MAX) + path_len = PATH_MAX; + /* Add backslash to directory path */ + if (entry_path[path_len-1] != '/') + { + entry_path[path_len] = '/'; + entry_path[path_len+1] = '\0'; + ++path_len; + } + printf( "path_len=%d\n", path_len ); + printf( "entry_path=%s\n", entry_path); + + if( p_intf->p_sys->p_clist == NULL ) + intf_ErrMsg("OpenDirectory - ERROR p_intf->p_sys->p_clist == NULL"); + gtk_clist_freeze( p_intf->p_sys->p_clist ); + gtk_clist_clear( p_intf->p_sys->p_clist ); + + dir = opendir(dir_path); + if (!dir) perror("opendir"); + while( (entry = readdir(dir))!=NULL ) + { + if (!entry) perror("readdir"); + printf( "sizeof(entry->d_name)=%d\n",sizeof(&(entry)->d_name[0]) ); + printf( "entry->d_name=%s\n",&(entry->d_name)[0] ); + + strncpy( entry_path + path_len, &(entry)->d_name[0], sizeof(entry_path) - path_len ); + /* always force end of string */ + entry_path[PATH_MAX+1]='\0'; + /* This is a list of strings. */ + ppsz_text[0] = &(entry)->d_name[0]; + ppsz_text[1] = get_file_perm(entry_path); + printf( "%-18s %s\n", ppsz_text[1], &(entry)->d_name[0] ); +// gtk_clist_insert( p_intf->p_sys->p_clist, row, ppsz_text ); + row++; + } + closedir(dir); + + gtk_clist_thaw( p_intf->p_sys->p_clist ); +} + +static char* get_file_perm(const char *path) +{ + struct stat st; + char *perm; + + perm = (char *) malloc(sizeof(char)*10); + strncpy( perm, "----------", sizeof("----------")); + if (lstat(path, &st)==0) + { + if (S_ISLNK(st.st_mode)) + perm[0]= 'l'; + else if (S_ISDIR(st.st_mode)) + perm[0]= 'd'; + else if (S_ISCHR(st.st_mode)) + perm[0]= 'c'; + else if (S_ISBLK(st.st_mode)) + perm[0]= 'b'; + else if (S_ISFIFO(st.st_mode)) + perm[0]= 'f'; + else if (S_ISSOCK(st.st_mode)) + perm[0]= 's'; + else if (S_ISREG(st.st_mode)) + perm[0]= '-'; + else /* Unknown type is an error */ + perm[0]= '?'; + /* Get file permissions */ + /* User */ + if (st.st_mode & S_IRUSR) + perm[1]= 'r'; + if (st.st_mode & S_IWUSR) + perm[2]= 'w'; + if (st.st_mode & S_IXUSR) + { + if (st.st_mode & S_ISUID) + perm[3] = 's'; + else + perm[3]= 'x'; + } + else if (st.st_mode & S_ISUID) + perm[3] = 'S'; + /* Group */ + if (st.st_mode & S_IRGRP) + perm[4]= 'r'; + if (st.st_mode & S_IWGRP) + perm[5]= 'w'; + if (st.st_mode & S_IXGRP) + { + if (st.st_mode & S_ISGID) + perm[6] = 's'; + else + perm[6]= 'x'; + } + else if (st.st_mode & S_ISGID) + perm[6] = 'S'; + /* Other */ + if (st.st_mode & S_IROTH) + perm[7]= 'r'; + if (st.st_mode & S_IWOTH) + perm[8]= 'w'; + if (st.st_mode & S_IXOTH) + { + // 'sticky' bit + if (st.st_mode &S_ISVTX) + perm[9] = 't'; + else + perm[9]= 'x'; + } + else if (st.st_mode &S_ISVTX) + perm[9]= 'T'; + } + return perm; +} + +/* + * Main interface callbacks + */ + +gboolean GtkExit( GtkWidget *widget, + gpointer user_data ) +{ + intf_thread_t *p_intf = GtkGetIntf( widget ); + + vlc_mutex_lock( &p_intf->change_lock ); + p_intf->b_die = 1; + vlc_mutex_unlock( &p_intf->change_lock ); + + return TRUE; +} + +void +on_toolbar_open_clicked (GtkButton *button, + gpointer user_data) +{ + intf_thread_t *p_intf = GtkGetIntf( button ); + + if (p_intf->p_sys->p_notebook) + { + gtk_widget_show( GTK_WIDGET(p_intf->p_sys->p_notebook) ); + gtk_notebook_set_page(p_intf->p_sys->p_notebook,0); + } + gdk_window_raise( p_intf->p_sys->p_window->window ); + if (p_intf->p_sys->p_clist) + { + ReadDirectory(p_intf->p_sys->p_clist, "."); +// OpenDirectory(p_intf->p_sys->p_clist, "."); + } +} + + +void +on_toolbar_preferences_clicked (GtkButton *button, + gpointer user_data) +{ + intf_thread_t *p_intf = GtkGetIntf( button ); + + if (p_intf->p_sys->p_notebook) + { + gtk_widget_show( GTK_WIDGET(p_intf->p_sys->p_notebook) ); + gtk_notebook_set_page(p_intf->p_sys->p_notebook,1); + } + gdk_window_raise( p_intf->p_sys->p_window->window ); +} + + +void +on_toolbar_rewind_clicked (GtkButton *button, + gpointer user_data) +{ +// intf_thread_t * p_intf = GtkGetIntf( button ); + + if( p_input_bank->pp_input[0] != NULL ) + { + input_SetStatus( p_input_bank->pp_input[0], INPUT_STATUS_SLOWER ); + } +} + + +void +on_toolbar_pause_clicked (GtkButton *button, + gpointer user_data) +{ +// intf_thread_t * p_intf = GtkGetIntf( button ); + + if( p_input_bank->pp_input[0] != NULL ) + { + input_SetStatus( p_input_bank->pp_input[0], INPUT_STATUS_PAUSE ); + } +} + + +void +on_toolbar_play_clicked (GtkButton *button, + gpointer user_data) +{ + intf_thread_t * p_intf = GtkGetIntf( button ); + + 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; + gdk_window_lower( p_intf->p_sys->p_window->window ); + } + 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 ); + /* simulate on open button click */ + on_toolbar_open_clicked(button,user_data); + } + } + else + { + vlc_mutex_unlock( &p_main->p_playlist->change_lock ); + } + } +} + + +void +on_toolbar_stop_clicked (GtkButton *button, + gpointer user_data) +{ + intf_thread_t * p_intf = GtkGetIntf( button ); + + 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 ); + gdk_window_raise( p_intf->p_sys->p_window->window ); + } +} + + +void +on_toolbar_forward_clicked (GtkButton *button, + gpointer user_data) +{ +// intf_thread_t * p_intf = GtkGetIntf( button ); + + if( p_input_bank->pp_input[0] != NULL ) + { + input_SetStatus( p_input_bank->pp_input[0], INPUT_STATUS_FASTER ); + } +} + + +void +on_toolbar_about_clicked (GtkButton *button, + gpointer user_data) +{ + intf_thread_t *p_intf = GtkGetIntf( button ); + + // Toggle notebook + if (p_intf->p_sys->p_notebook) + { + gtk_widget_show( GTK_WIDGET(p_intf->p_sys->p_notebook) ); + gtk_notebook_set_page(p_intf->p_sys->p_notebook,2); + } + gdk_window_raise( p_intf->p_sys->p_window->window ); +} + + +void +on_comboURL_entry_changed (GtkEditable *editable, + gpointer user_data) +{ + intf_thread_t * p_intf = GtkGetIntf( editable ); + gchar * psz_url; + struct stat st; + + psz_url = gtk_entry_get_text(GTK_ENTRY(editable)); + if( (strncmp("file://",(const char *) psz_url,7)==0) || + (strncmp("udp://",(const char *) psz_url,6)==0) || + (strncmp("udp4://",(const char *) psz_url,7)==0) || + (strncmp("udp6://",(const char *) psz_url,7)==0) || + (strncmp("udpstream://",(const char *) psz_url,12)==0) || + (strncmp("rtp://",(const char *) psz_url,6)==0) || + (strncmp("rtp4://",(const char *) psz_url,7)==0) || + (strncmp("rtp6://",(const char *) psz_url,7)==0) || + (strncmp("rtpstream://",(const char *) psz_url,12)==0) || + (strncmp("ftp://",(const char *) psz_url,6)==0) || + (strncmp("http://",(const char *) psz_url,7)==0) ) + { + MediaURLOpenChanged(GTK_WIDGET(editable), psz_url); + } + else if (lstat((char*)psz_url, &st)==0) + { + if (S_ISDIR(st.st_mode)) + ReadDirectory(p_intf->p_sys->p_clist, psz_url); +// OpenDirectory(p_intf->p_sys->p_clist, psz_url); + else if( (S_ISLNK(st.st_mode)) || (S_ISCHR(st.st_mode)) || + (S_ISBLK(st.st_mode)) || (S_ISFIFO(st.st_mode))|| + (S_ISSOCK(st.st_mode))|| (S_ISREG(st.st_mode)) ) + { + MediaURLOpenChanged(GTK_WIDGET(editable), psz_url); + } + } +} + +void +on_clistmedia_click_column (GtkCList *clist, + gint column, + gpointer user_data) +{ + static GtkSortType sort_type = GTK_SORT_ASCENDING; + + // Should sort on column + switch(sort_type) + { + case GTK_SORT_ASCENDING: + sort_type = GTK_SORT_DESCENDING; + break; + case GTK_SORT_DESCENDING: + sort_type = GTK_SORT_ASCENDING; + break; + } + gtk_clist_freeze( clist ); + gtk_clist_set_sort_type( clist, sort_type ); + gtk_clist_sort( clist ); + gtk_clist_thaw( clist ); +} + + +void +on_clistmedia_select_row (GtkCList *clist, + gint row, + gint column, + GdkEvent *event, + gpointer user_data) +{ +// intf_thread_t *p_intf = GtkGetIntf( clist ); + intf_thread_t *p_intf = p_main->p_intf; + gchar *text[2]; + gint ret; + struct stat st; + + ret = gtk_clist_get_text (p_intf->p_sys->p_clist, row, 0, text); + if (ret) + { + if (lstat((char*)text[0], &st)==0) + { + if (S_ISDIR(st.st_mode)) + ReadDirectory(p_intf->p_sys->p_clist, text[0]); +// OpenDirectory(p_intf->p_sys->p_clist, text[0]); + else if( (S_ISLNK(st.st_mode)) || (S_ISCHR(st.st_mode)) || + (S_ISBLK(st.st_mode)) || (S_ISFIFO(st.st_mode))|| + (S_ISSOCK(st.st_mode))|| (S_ISREG(st.st_mode)) ) + { + MediaURLOpenChanged(GTK_WIDGET(p_intf->p_sys->p_clist), text[0]); + } + } + } +} + +void +on_cbautoplay_toggled (GtkToggleButton *togglebutton, + gpointer user_data) +{ +}; + + +gboolean +on_familiar_delete_event (GtkWidget *widget, + GdkEvent *event, + gpointer user_data) +{ + GtkExit( GTK_WIDGET( widget ), user_data ); + return TRUE; +} + + +void +on_buttonSave_clicked (GtkButton *button, + gpointer user_data) +{ + intf_thread_t * p_intf = GtkGetIntf( button ); + on_buttonApply_clicked( button, user_data ); + config_PutIntVariable( "familiar-autoplayfile", p_intf->p_sys->b_autoplayfile ); +// config_SaveConfigFile( NULL ); +} + + +void +on_buttonApply_clicked (GtkButton *button, + gpointer user_data) +{ + intf_thread_t * p_intf = GtkGetIntf( button ); + GtkWidget *cbautoplay; + + cbautoplay = GTK_WIDGET( gtk_object_get_data( + GTK_OBJECT( p_intf->p_sys->p_window ), "cbautoplay" ) ); + p_intf->p_sys->b_autoplayfile = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON(cbautoplay)); +} + + +void +on_buttonCancel_clicked (GtkButton *button, + gpointer user_data) +{ + intf_thread_t * p_intf = GtkGetIntf( button ); + GtkWidget *cbautoplay; + + cbautoplay = GTK_WIDGET( gtk_object_get_data( + GTK_OBJECT( p_intf->p_sys->p_window ), "cbautoplay" ) ); + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON(cbautoplay),p_intf->p_sys->b_autoplayfile); +} + diff --git a/plugins/familiar/familiar_callbacks.h b/plugins/familiar/familiar_callbacks.h new file mode 100644 index 0000000000..c30e1669d7 --- /dev/null +++ b/plugins/familiar/familiar_callbacks.h @@ -0,0 +1,100 @@ +/***************************************************************************** + * familiar_callbacks.h : familiar plugin for vlc + ***************************************************************************** + * Copyright (C) 2002 VideoLAN + * $Id: familiar_callbacks.h,v 1.7.2.6 2002/10/29 20:53:30 jpsaman Exp $ + * + * Authors: Jean-Paul Saman + * + * 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. + *****************************************************************************/ + +#include + +gboolean GtkExit ( GtkWidget *, gpointer ); + +void ReadDirectory(GtkCList *clist, char *psz_dir); +void OpenDirectory(GtkCList *clist, char *psz_dir); + +void +on_toolbar_open_clicked (GtkButton *button, + gpointer user_data); + +void +on_toolbar_preferences_clicked (GtkButton *button, + gpointer user_data); + +void +on_toolbar_rewind_clicked (GtkButton *button, + gpointer user_data); + +void +on_toolbar_pause_clicked (GtkButton *button, + gpointer user_data); + +void +on_toolbar_play_clicked (GtkButton *button, + gpointer user_data); + +void +on_toolbar_stop_clicked (GtkButton *button, + gpointer user_data); + +void +on_toolbar_forward_clicked (GtkButton *button, + gpointer user_data); + +void +on_toolbar_about_clicked (GtkButton *button, + gpointer user_data); + +void +on_comboURL_entry_changed (GtkEditable *editable, + gpointer user_data); + + +void +on_clistmedia_click_column (GtkCList *clist, + gint column, + gpointer user_data); + +void +on_clistmedia_select_row (GtkCList *clist, + gint row, + gint column, + GdkEvent *event, + gpointer user_data); + +void +on_cbautoplay_toggled (GtkToggleButton *togglebutton, + gpointer user_data); + + +gboolean +on_familiar_delete_event (GtkWidget *widget, + GdkEvent *event, + gpointer user_data); + +void +on_buttonSave_clicked (GtkButton *button, + gpointer user_data); + +void +on_buttonApply_clicked (GtkButton *button, + gpointer user_data); + +void +on_buttonCancel_clicked (GtkButton *button, + gpointer user_data); diff --git a/plugins/familiar/familiar_interface.c b/plugins/familiar/familiar_interface.c new file mode 100644 index 0000000000..f7be8f1a3a --- /dev/null +++ b/plugins/familiar/familiar_interface.c @@ -0,0 +1,499 @@ +/* + * DO NOT EDIT THIS FILE - it is generated by Glade. + */ + +#ifdef HAVE_CONFIG_H +# include +#endif + +#include +#include +#include +#include + +#include +#include + +#include "familiar_callbacks.h" +#include "familiar_interface.h" +#include "familiar_support.h" + +GtkWidget* +create_familiar (void) +{ + GtkWidget *familiar; + GtkWidget *vbox; + GtkWidget *toolbar; + GtkWidget *tmp_toolbar_icon; + GtkWidget *toolbar_open; + GtkWidget *toolbar_preferences; + GtkWidget *toolbar_rewind; + GtkWidget *toolbar_pause; + GtkWidget *toolbar_play; + GtkWidget *toolbar_stop; + GtkWidget *toolbar_forward; + GtkWidget *toolbar_about; + GtkWidget *notebook; + GtkWidget *fixedMedia; + GtkWidget *labelUrl; + GtkWidget *scrolledwindow1; + GtkWidget *clistmedia; + GtkWidget *labelname; + GtkWidget *labeltype; + GtkWidget *labelsize; + GtkWidget *labeluid; + GtkWidget *labelgid; + GtkWidget *comboURL; + GList *comboURL_items = NULL; + GtkWidget *comboURL_entry; + GtkWidget *media; + GtkWidget *fixedPreferences; + GtkWidget *buttonSave; + GtkWidget *buttonApply; + GtkWidget *buttonCancel; + GtkWidget *cbautoplay; + GtkWidget *preferences; + GtkWidget *fixedAbout; + GtkWidget *logo; + GtkWidget *labelVlc; + GtkWidget *labelCopyright; + GtkWidget *labelAuthors; + GtkWidget *labelAbout; + GtkWidget *about; + + familiar = gtk_window_new (GTK_WINDOW_TOPLEVEL); + gtk_widget_set_name (familiar, "familiar"); + gtk_object_set_data (GTK_OBJECT (familiar), "familiar", familiar); + gtk_widget_set_usize (familiar, 240, 300); + gtk_window_set_title (GTK_WINDOW (familiar), _("vlc (familiar)")); + gtk_window_set_policy (GTK_WINDOW (familiar), TRUE, TRUE, TRUE); + + vbox = gtk_vbox_new (FALSE, 0); + gtk_widget_set_name (vbox, "vbox"); + gtk_widget_ref (vbox); + gtk_object_set_data_full (GTK_OBJECT (familiar), "vbox", vbox, + (GtkDestroyNotify) gtk_widget_unref); + gtk_widget_show (vbox); + gtk_container_add (GTK_CONTAINER (familiar), vbox); + + toolbar = gtk_toolbar_new (GTK_ORIENTATION_HORIZONTAL, GTK_TOOLBAR_ICONS); + gtk_widget_set_name (toolbar, "toolbar"); + gtk_widget_ref (toolbar); + gtk_object_set_data_full (GTK_OBJECT (familiar), "toolbar", toolbar, + (GtkDestroyNotify) gtk_widget_unref); + gtk_widget_show (toolbar); + gtk_box_pack_start (GTK_BOX (vbox), toolbar, TRUE, TRUE, 0); + gtk_widget_set_usize (toolbar, 112, 16); + gtk_container_set_border_width (GTK_CONTAINER (toolbar), 2); + + tmp_toolbar_icon = create_pixmap (familiar, "familiar-openb16x16.xpm"); + toolbar_open = gtk_toolbar_append_element (GTK_TOOLBAR (toolbar), + GTK_TOOLBAR_CHILD_BUTTON, + NULL, + _("Open"), + _("Open file"), NULL, + tmp_toolbar_icon, NULL, NULL); + gtk_widget_set_name (toolbar_open, "toolbar_open"); + gtk_widget_ref (toolbar_open); + gtk_object_set_data_full (GTK_OBJECT (familiar), "toolbar_open", toolbar_open, + (GtkDestroyNotify) gtk_widget_unref); + gtk_widget_show (toolbar_open); + + tmp_toolbar_icon = create_pixmap (familiar, "familiar-preferencesb16x16.xpm"); + toolbar_preferences = gtk_toolbar_append_element (GTK_TOOLBAR (toolbar), + GTK_TOOLBAR_CHILD_BUTTON, + NULL, + _("Preferences"), + _("Preferences"), NULL, + tmp_toolbar_icon, NULL, NULL); + gtk_widget_set_name (toolbar_preferences, "toolbar_preferences"); + gtk_widget_ref (toolbar_preferences); + gtk_object_set_data_full (GTK_OBJECT (familiar), "toolbar_preferences", toolbar_preferences, + (GtkDestroyNotify) gtk_widget_unref); + gtk_widget_show (toolbar_preferences); + + gtk_toolbar_append_space (GTK_TOOLBAR (toolbar)); + + tmp_toolbar_icon = create_pixmap (familiar, "familiar-rewindb16x16.xpm"); + toolbar_rewind = gtk_toolbar_append_element (GTK_TOOLBAR (toolbar), + GTK_TOOLBAR_CHILD_BUTTON, + NULL, + _("Rewind"), + _("Rewind stream"), NULL, + tmp_toolbar_icon, NULL, NULL); + gtk_widget_set_name (toolbar_rewind, "toolbar_rewind"); + gtk_widget_ref (toolbar_rewind); + gtk_object_set_data_full (GTK_OBJECT (familiar), "toolbar_rewind", toolbar_rewind, + (GtkDestroyNotify) gtk_widget_unref); + gtk_widget_show (toolbar_rewind); + + tmp_toolbar_icon = create_pixmap (familiar, "familiar-pauseb16x16.xpm"); + toolbar_pause = gtk_toolbar_append_element (GTK_TOOLBAR (toolbar), + GTK_TOOLBAR_CHILD_BUTTON, + NULL, + _("Pause"), + _("Pause stream"), NULL, + tmp_toolbar_icon, NULL, NULL); + gtk_widget_set_name (toolbar_pause, "toolbar_pause"); + gtk_widget_ref (toolbar_pause); + gtk_object_set_data_full (GTK_OBJECT (familiar), "toolbar_pause", toolbar_pause, + (GtkDestroyNotify) gtk_widget_unref); + gtk_widget_show (toolbar_pause); + + tmp_toolbar_icon = create_pixmap (familiar, "familiar-playb16x16.xpm"); + toolbar_play = gtk_toolbar_append_element (GTK_TOOLBAR (toolbar), + GTK_TOOLBAR_CHILD_BUTTON, + NULL, + _("Play"), + _("Play stream"), NULL, + tmp_toolbar_icon, NULL, NULL); + gtk_widget_set_name (toolbar_play, "toolbar_play"); + gtk_widget_ref (toolbar_play); + gtk_object_set_data_full (GTK_OBJECT (familiar), "toolbar_play", toolbar_play, + (GtkDestroyNotify) gtk_widget_unref); + gtk_widget_show (toolbar_play); + + tmp_toolbar_icon = create_pixmap (familiar, "familiar-stopb16x16.xpm"); + toolbar_stop = gtk_toolbar_append_element (GTK_TOOLBAR (toolbar), + GTK_TOOLBAR_CHILD_BUTTON, + NULL, + _("Stop"), + _("Stop stream"), NULL, + tmp_toolbar_icon, NULL, NULL); + gtk_widget_set_name (toolbar_stop, "toolbar_stop"); + gtk_widget_ref (toolbar_stop); + gtk_object_set_data_full (GTK_OBJECT (familiar), "toolbar_stop", toolbar_stop, + (GtkDestroyNotify) gtk_widget_unref); + gtk_widget_show (toolbar_stop); + + tmp_toolbar_icon = create_pixmap (familiar, "familiar-forwardb16x16.xpm"); + toolbar_forward = gtk_toolbar_append_element (GTK_TOOLBAR (toolbar), + GTK_TOOLBAR_CHILD_BUTTON, + NULL, + _("Forward"), + _("Forward stream"), NULL, + tmp_toolbar_icon, NULL, NULL); + gtk_widget_set_name (toolbar_forward, "toolbar_forward"); + gtk_widget_ref (toolbar_forward); + gtk_object_set_data_full (GTK_OBJECT (familiar), "toolbar_forward", toolbar_forward, + (GtkDestroyNotify) gtk_widget_unref); + gtk_widget_show (toolbar_forward); + + gtk_toolbar_append_space (GTK_TOOLBAR (toolbar)); + + tmp_toolbar_icon = create_pixmap (familiar, "vlc16x16.xpm"); + toolbar_about = gtk_toolbar_append_element (GTK_TOOLBAR (toolbar), + GTK_TOOLBAR_CHILD_BUTTON, + NULL, + _("About"), + _("About"), NULL, + tmp_toolbar_icon, NULL, NULL); + gtk_widget_set_name (toolbar_about, "toolbar_about"); + gtk_widget_ref (toolbar_about); + gtk_object_set_data_full (GTK_OBJECT (familiar), "toolbar_about", toolbar_about, + (GtkDestroyNotify) gtk_widget_unref); + gtk_widget_show (toolbar_about); + + notebook = gtk_notebook_new (); + gtk_widget_set_name (notebook, "notebook"); + gtk_widget_ref (notebook); + gtk_object_set_data_full (GTK_OBJECT (familiar), "notebook", notebook, + (GtkDestroyNotify) gtk_widget_unref); + gtk_widget_show (notebook); + gtk_box_pack_start (GTK_BOX (vbox), notebook, TRUE, TRUE, 0); + + fixedMedia = gtk_fixed_new (); + gtk_widget_set_name (fixedMedia, "fixedMedia"); + gtk_widget_ref (fixedMedia); + gtk_object_set_data_full (GTK_OBJECT (familiar), "fixedMedia", fixedMedia, + (GtkDestroyNotify) gtk_widget_unref); + gtk_widget_show (fixedMedia); + gtk_container_add (GTK_CONTAINER (notebook), fixedMedia); + + labelUrl = gtk_label_new (_("URL:")); + gtk_widget_set_name (labelUrl, "labelUrl"); + gtk_widget_ref (labelUrl); + gtk_object_set_data_full (GTK_OBJECT (familiar), "labelUrl", labelUrl, + (GtkDestroyNotify) gtk_widget_unref); + gtk_widget_show (labelUrl); + gtk_fixed_put (GTK_FIXED (fixedMedia), labelUrl, 4, 8); + gtk_widget_set_uposition (labelUrl, 4, 8); + gtk_widget_set_usize (labelUrl, 38, 18); + + scrolledwindow1 = gtk_scrolled_window_new (NULL, NULL); + gtk_widget_set_name (scrolledwindow1, "scrolledwindow1"); + gtk_widget_ref (scrolledwindow1); + gtk_object_set_data_full (GTK_OBJECT (familiar), "scrolledwindow1", scrolledwindow1, + (GtkDestroyNotify) gtk_widget_unref); + gtk_widget_show (scrolledwindow1); + gtk_fixed_put (GTK_FIXED (fixedMedia), scrolledwindow1, 0, 32); + gtk_widget_set_uposition (scrolledwindow1, 0, 32); + gtk_widget_set_usize (scrolledwindow1, 240, 208); + + clistmedia = gtk_clist_new (5); + gtk_widget_set_name (clistmedia, "clistmedia"); + gtk_widget_ref (clistmedia); + gtk_object_set_data_full (GTK_OBJECT (familiar), "clistmedia", clistmedia, + (GtkDestroyNotify) gtk_widget_unref); + gtk_widget_show (clistmedia); + gtk_container_add (GTK_CONTAINER (scrolledwindow1), clistmedia); + gtk_clist_set_column_width (GTK_CLIST (clistmedia), 0, 123); + gtk_clist_set_column_width (GTK_CLIST (clistmedia), 1, 80); + gtk_clist_set_column_width (GTK_CLIST (clistmedia), 2, 80); + gtk_clist_set_column_width (GTK_CLIST (clistmedia), 3, 80); + gtk_clist_set_column_width (GTK_CLIST (clistmedia), 4, 80); + gtk_clist_column_titles_show (GTK_CLIST (clistmedia)); + + labelname = gtk_label_new (_("Name")); + gtk_widget_set_name (labelname, "labelname"); + gtk_widget_ref (labelname); + gtk_object_set_data_full (GTK_OBJECT (familiar), "labelname", labelname, + (GtkDestroyNotify) gtk_widget_unref); + gtk_widget_show (labelname); + gtk_clist_set_column_widget (GTK_CLIST (clistmedia), 0, labelname); + + labeltype = gtk_label_new (_("Type")); + gtk_widget_set_name (labeltype, "labeltype"); + gtk_widget_ref (labeltype); + gtk_object_set_data_full (GTK_OBJECT (familiar), "labeltype", labeltype, + (GtkDestroyNotify) gtk_widget_unref); + gtk_widget_show (labeltype); + gtk_clist_set_column_widget (GTK_CLIST (clistmedia), 1, labeltype); + + labelsize = gtk_label_new (_("Size")); + gtk_widget_set_name (labelsize, "labelsize"); + gtk_widget_ref (labelsize); + gtk_object_set_data_full (GTK_OBJECT (familiar), "labelsize", labelsize, + (GtkDestroyNotify) gtk_widget_unref); + gtk_widget_show (labelsize); + gtk_clist_set_column_widget (GTK_CLIST (clistmedia), 2, labelsize); + + labeluid = gtk_label_new (_("User")); + gtk_widget_set_name (labeluid, "labeluid"); + gtk_widget_ref (labeluid); + gtk_object_set_data_full (GTK_OBJECT (familiar), "labeluid", labeluid, + (GtkDestroyNotify) gtk_widget_unref); + gtk_widget_show (labeluid); + gtk_clist_set_column_widget (GTK_CLIST (clistmedia), 3, labeluid); + + labelgid = gtk_label_new (_("Group")); + gtk_widget_set_name (labelgid, "labelgid"); + gtk_widget_ref (labelgid); + gtk_object_set_data_full (GTK_OBJECT (familiar), "labelgid", labelgid, + (GtkDestroyNotify) gtk_widget_unref); + gtk_widget_show (labelgid); + gtk_clist_set_column_widget (GTK_CLIST (clistmedia), 4, labelgid); + + comboURL = gtk_combo_new (); + gtk_widget_set_name (comboURL, "comboURL"); + gtk_widget_ref (comboURL); + gtk_object_set_data_full (GTK_OBJECT (familiar), "comboURL", comboURL, + (GtkDestroyNotify) gtk_widget_unref); + gtk_widget_show (comboURL); + gtk_fixed_put (GTK_FIXED (fixedMedia), comboURL, 40, 4); + gtk_widget_set_uposition (comboURL, 40, 4); + gtk_widget_set_usize (comboURL, 185, 24); + comboURL_items = g_list_append (comboURL_items, (gpointer) _("/mnt")); + comboURL_items = g_list_append (comboURL_items, (gpointer) _("file://")); + comboURL_items = g_list_append (comboURL_items, (gpointer) _("ftp://")); + comboURL_items = g_list_append (comboURL_items, (gpointer) _("http://")); + comboURL_items = g_list_append (comboURL_items, (gpointer) _("udp://@:1234")); + comboURL_items = g_list_append (comboURL_items, (gpointer) _("udpstream://@:1234")); + gtk_combo_set_popdown_strings (GTK_COMBO (comboURL), comboURL_items); + g_list_free (comboURL_items); + + comboURL_entry = GTK_COMBO (comboURL)->entry; + gtk_widget_set_name (comboURL_entry, "comboURL_entry"); + gtk_widget_ref (comboURL_entry); + gtk_object_set_data_full (GTK_OBJECT (familiar), "comboURL_entry", comboURL_entry, + (GtkDestroyNotify) gtk_widget_unref); + gtk_widget_show (comboURL_entry); + gtk_entry_set_text (GTK_ENTRY (comboURL_entry), _("/mnt")); + + media = gtk_label_new (_("Media")); + gtk_widget_set_name (media, "media"); + gtk_widget_ref (media); + gtk_object_set_data_full (GTK_OBJECT (familiar), "media", media, + (GtkDestroyNotify) gtk_widget_unref); + gtk_widget_show (media); + gtk_notebook_set_tab_label (GTK_NOTEBOOK (notebook), gtk_notebook_get_nth_page (GTK_NOTEBOOK (notebook), 0), media); + + fixedPreferences = gtk_fixed_new (); + gtk_widget_set_name (fixedPreferences, "fixedPreferences"); + gtk_widget_ref (fixedPreferences); + gtk_object_set_data_full (GTK_OBJECT (familiar), "fixedPreferences", fixedPreferences, + (GtkDestroyNotify) gtk_widget_unref); + gtk_widget_show (fixedPreferences); + gtk_container_add (GTK_CONTAINER (notebook), fixedPreferences); + + buttonSave = gtk_button_new_with_label (_("Save")); + gtk_widget_set_name (buttonSave, "buttonSave"); + gtk_widget_ref (buttonSave); + gtk_object_set_data_full (GTK_OBJECT (familiar), "buttonSave", buttonSave, + (GtkDestroyNotify) gtk_widget_unref); + gtk_widget_show (buttonSave); + gtk_fixed_put (GTK_FIXED (fixedPreferences), buttonSave, 8, 216); + gtk_widget_set_uposition (buttonSave, 8, 216); + gtk_widget_set_usize (buttonSave, 54, 24); + + buttonApply = gtk_button_new_with_label (_("Apply")); + gtk_widget_set_name (buttonApply, "buttonApply"); + gtk_widget_ref (buttonApply); + gtk_object_set_data_full (GTK_OBJECT (familiar), "buttonApply", buttonApply, + (GtkDestroyNotify) gtk_widget_unref); + gtk_widget_show (buttonApply); + gtk_fixed_put (GTK_FIXED (fixedPreferences), buttonApply, 64, 216); + gtk_widget_set_uposition (buttonApply, 64, 216); + gtk_widget_set_usize (buttonApply, 54, 24); + + buttonCancel = gtk_button_new_with_label (_("Cancel")); + gtk_widget_set_name (buttonCancel, "buttonCancel"); + gtk_widget_ref (buttonCancel); + gtk_object_set_data_full (GTK_OBJECT (familiar), "buttonCancel", buttonCancel, + (GtkDestroyNotify) gtk_widget_unref); + gtk_widget_show (buttonCancel); + gtk_fixed_put (GTK_FIXED (fixedPreferences), buttonCancel, 176, 216); + gtk_widget_set_uposition (buttonCancel, 176, 216); + gtk_widget_set_usize (buttonCancel, 54, 24); + + cbautoplay = gtk_check_button_new_with_label (_("Automatically play file.")); + gtk_widget_set_name (cbautoplay, "cbautoplay"); + gtk_widget_ref (cbautoplay); + gtk_object_set_data_full (GTK_OBJECT (familiar), "cbautoplay", cbautoplay, + (GtkDestroyNotify) gtk_widget_unref); + gtk_widget_show (cbautoplay); + gtk_fixed_put (GTK_FIXED (fixedPreferences), cbautoplay, 8, 8); + gtk_widget_set_uposition (cbautoplay, 8, 8); + gtk_widget_set_usize (cbautoplay, 216, 24); + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (cbautoplay), TRUE); + + preferences = gtk_label_new (_("Preference")); + gtk_widget_set_name (preferences, "preferences"); + gtk_widget_ref (preferences); + gtk_object_set_data_full (GTK_OBJECT (familiar), "preferences", preferences, + (GtkDestroyNotify) gtk_widget_unref); + gtk_widget_show (preferences); + gtk_notebook_set_tab_label (GTK_NOTEBOOK (notebook), gtk_notebook_get_nth_page (GTK_NOTEBOOK (notebook), 1), preferences); + + fixedAbout = gtk_fixed_new (); + gtk_widget_set_name (fixedAbout, "fixedAbout"); + gtk_widget_ref (fixedAbout); + gtk_object_set_data_full (GTK_OBJECT (familiar), "fixedAbout", fixedAbout, + (GtkDestroyNotify) gtk_widget_unref); + gtk_widget_show (fixedAbout); + gtk_container_add (GTK_CONTAINER (notebook), fixedAbout); + + logo = create_pixmap (familiar, "vlc32x32.xpm"); + gtk_widget_set_name (logo, "logo"); + gtk_widget_ref (logo); + gtk_object_set_data_full (GTK_OBJECT (familiar), "logo", logo, + (GtkDestroyNotify) gtk_widget_unref); + gtk_widget_show (logo); + gtk_fixed_put (GTK_FIXED (fixedAbout), logo, 8, 0); + gtk_widget_set_uposition (logo, 8, 0); + gtk_widget_set_usize (logo, 50, 50); + + labelVlc = gtk_label_new (_("VideoLAN Client\n for familiar Linux")); + gtk_widget_set_name (labelVlc, "labelVlc"); + gtk_widget_ref (labelVlc); + gtk_object_set_data_full (GTK_OBJECT (familiar), "labelVlc", labelVlc, + (GtkDestroyNotify) gtk_widget_unref); + gtk_widget_show (labelVlc); + gtk_fixed_put (GTK_FIXED (fixedAbout), labelVlc, 64, 8); + gtk_widget_set_uposition (labelVlc, 64, 8); + gtk_widget_set_usize (labelVlc, 120, 40); + gtk_label_set_line_wrap (GTK_LABEL (labelVlc), TRUE); + + labelCopyright = gtk_label_new (_("(c) 2002, the VideoLAN Team")); + gtk_widget_set_name (labelCopyright, "labelCopyright"); + gtk_widget_ref (labelCopyright); + gtk_object_set_data_full (GTK_OBJECT (familiar), "labelCopyright", labelCopyright, + (GtkDestroyNotify) gtk_widget_unref); + gtk_widget_show (labelCopyright); + gtk_fixed_put (GTK_FIXED (fixedAbout), labelCopyright, 16, 56); + gtk_widget_set_uposition (labelCopyright, 16, 56); + gtk_widget_set_usize (labelCopyright, 200, 18); + + labelAuthors = gtk_label_new (_("Authors: The VideoLAN Team, http://www.videolan.org")); + gtk_widget_set_name (labelAuthors, "labelAuthors"); + gtk_widget_ref (labelAuthors); + gtk_object_set_data_full (GTK_OBJECT (familiar), "labelAuthors", labelAuthors, + (GtkDestroyNotify) gtk_widget_unref); + gtk_widget_show (labelAuthors); + gtk_fixed_put (GTK_FIXED (fixedAbout), labelAuthors, 16, 80); + gtk_widget_set_uposition (labelAuthors, 16, 80); + gtk_widget_set_usize (labelAuthors, 200, 40); + gtk_label_set_line_wrap (GTK_LABEL (labelAuthors), TRUE); + + labelAbout = gtk_label_new (_("The VideoLAN Client is a MPEG, MPEG 2, MP3, DivX player, that accepts input from local or network sources.")); + gtk_widget_set_name (labelAbout, "labelAbout"); + gtk_widget_ref (labelAbout); + gtk_object_set_data_full (GTK_OBJECT (familiar), "labelAbout", labelAbout, + (GtkDestroyNotify) gtk_widget_unref); + gtk_widget_show (labelAbout); + gtk_fixed_put (GTK_FIXED (fixedAbout), labelAbout, 16, 128); + gtk_widget_set_uposition (labelAbout, 16, 128); + gtk_widget_set_usize (labelAbout, 200, 70); + gtk_label_set_justify (GTK_LABEL (labelAbout), GTK_JUSTIFY_LEFT); + gtk_label_set_line_wrap (GTK_LABEL (labelAbout), TRUE); + + about = gtk_label_new (_("About")); + gtk_widget_set_name (about, "about"); + gtk_widget_ref (about); + gtk_object_set_data_full (GTK_OBJECT (familiar), "about", about, + (GtkDestroyNotify) gtk_widget_unref); + gtk_widget_show (about); + gtk_notebook_set_tab_label (GTK_NOTEBOOK (notebook), gtk_notebook_get_nth_page (GTK_NOTEBOOK (notebook), 2), about); + + gtk_signal_connect (GTK_OBJECT (familiar), "delete_event", + GTK_SIGNAL_FUNC (on_familiar_delete_event), + NULL); + gtk_signal_connect (GTK_OBJECT (toolbar_open), "clicked", + GTK_SIGNAL_FUNC (on_toolbar_open_clicked), + NULL); + gtk_signal_connect (GTK_OBJECT (toolbar_preferences), "clicked", + GTK_SIGNAL_FUNC (on_toolbar_preferences_clicked), + NULL); + gtk_signal_connect (GTK_OBJECT (toolbar_rewind), "clicked", + GTK_SIGNAL_FUNC (on_toolbar_rewind_clicked), + NULL); + gtk_signal_connect (GTK_OBJECT (toolbar_pause), "clicked", + GTK_SIGNAL_FUNC (on_toolbar_pause_clicked), + NULL); + gtk_signal_connect (GTK_OBJECT (toolbar_play), "clicked", + GTK_SIGNAL_FUNC (on_toolbar_play_clicked), + NULL); + gtk_signal_connect (GTK_OBJECT (toolbar_stop), "clicked", + GTK_SIGNAL_FUNC (on_toolbar_stop_clicked), + NULL); + gtk_signal_connect (GTK_OBJECT (toolbar_forward), "clicked", + GTK_SIGNAL_FUNC (on_toolbar_forward_clicked), + NULL); + gtk_signal_connect (GTK_OBJECT (toolbar_about), "clicked", + GTK_SIGNAL_FUNC (on_toolbar_about_clicked), + NULL); + gtk_signal_connect (GTK_OBJECT (clistmedia), "select_row", + GTK_SIGNAL_FUNC (on_clistmedia_select_row), + NULL); + gtk_signal_connect (GTK_OBJECT (clistmedia), "click_column", + GTK_SIGNAL_FUNC (on_clistmedia_click_column), + NULL); + gtk_signal_connect (GTK_OBJECT (comboURL_entry), "changed", + GTK_SIGNAL_FUNC (on_comboURL_entry_changed), + NULL); + gtk_signal_connect (GTK_OBJECT (buttonSave), "clicked", + GTK_SIGNAL_FUNC (on_buttonSave_clicked), + NULL); + gtk_signal_connect (GTK_OBJECT (buttonApply), "clicked", + GTK_SIGNAL_FUNC (on_buttonApply_clicked), + NULL); + gtk_signal_connect (GTK_OBJECT (buttonCancel), "clicked", + GTK_SIGNAL_FUNC (on_buttonCancel_clicked), + NULL); + gtk_signal_connect (GTK_OBJECT (cbautoplay), "toggled", + GTK_SIGNAL_FUNC (on_cbautoplay_toggled), + NULL); + + return familiar; +} + diff --git a/plugins/familiar/familiar_interface.h b/plugins/familiar/familiar_interface.h new file mode 100644 index 0000000000..27a3bcf646 --- /dev/null +++ b/plugins/familiar/familiar_interface.h @@ -0,0 +1,5 @@ +/* + * DO NOT EDIT THIS FILE - it is generated by Glade. + */ + +GtkWidget* create_familiar (void); diff --git a/plugins/familiar/familiar_support.c b/plugins/familiar/familiar_support.c new file mode 100644 index 0000000000..22ca9310d0 --- /dev/null +++ b/plugins/familiar/familiar_support.c @@ -0,0 +1,162 @@ +/* + * DO NOT EDIT THIS FILE - it is generated by Glade. + */ + +#ifdef HAVE_CONFIG_H +# include +#endif + +#include +#include +#include +#include + +#include + +#include "familiar_support.h" + +/* This is an internally used function to check if a pixmap file exists. */ +static gchar* check_file_exists (const gchar *directory, + const gchar *filename); + +/* This is an internally used function to create pixmaps. */ +static GtkWidget* create_dummy_pixmap (GtkWidget *widget); + +GtkWidget* +lookup_widget (GtkWidget *widget, + const gchar *widget_name) +{ + GtkWidget *parent, *found_widget; + + for (;;) + { + if (GTK_IS_MENU (widget)) + parent = gtk_menu_get_attach_widget (GTK_MENU (widget)); + else + parent = widget->parent; + if (parent == NULL) + break; + widget = parent; + } + + found_widget = (GtkWidget*) gtk_object_get_data (GTK_OBJECT (widget), + widget_name); + if (!found_widget) + g_warning ("Widget not found: %s", widget_name); + return found_widget; +} + +/* This is a dummy pixmap we use when a pixmap can't be found. */ +static char *dummy_pixmap_xpm[] = { +/* columns rows colors chars-per-pixel */ +"1 1 1 1", +" c None", +/* pixels */ +" " +}; + +/* This is an internally used function to create pixmaps. */ +static GtkWidget* +create_dummy_pixmap (GtkWidget *widget) +{ + GdkColormap *colormap; + GdkPixmap *gdkpixmap; + GdkBitmap *mask; + GtkWidget *pixmap; + + colormap = gtk_widget_get_colormap (widget); + gdkpixmap = gdk_pixmap_colormap_create_from_xpm_d (NULL, colormap, &mask, + NULL, dummy_pixmap_xpm); + if (gdkpixmap == NULL) + g_error ("Couldn't create replacement pixmap."); + pixmap = gtk_pixmap_new (gdkpixmap, mask); + gdk_pixmap_unref (gdkpixmap); + gdk_bitmap_unref (mask); + return pixmap; +} + +static GList *pixmaps_directories = NULL; + +/* Use this function to set the directory containing installed pixmaps. */ +void +add_pixmap_directory (const gchar *directory) +{ + pixmaps_directories = g_list_prepend (pixmaps_directories, + g_strdup (directory)); +} + +/* This is an internally used function to create pixmaps. */ +GtkWidget* +create_pixmap (GtkWidget *widget, + const gchar *filename) +{ + gchar *found_filename = NULL; + GdkColormap *colormap; + GdkPixmap *gdkpixmap; + GdkBitmap *mask; + GtkWidget *pixmap; + GList *elem; + + if (!filename || !filename[0]) + return create_dummy_pixmap (widget); + + /* We first try any pixmaps directories set by the application. */ + elem = pixmaps_directories; + while (elem) + { + found_filename = check_file_exists ((gchar*)elem->data, filename); + if (found_filename) + break; + elem = elem->next; + } + + /* If we haven't found the pixmap, try the source directory. */ + if (!found_filename) + { + found_filename = check_file_exists ("../../share", filename); + } + + if (!found_filename) + { + g_warning (_("Couldn't find pixmap file: %s"), filename); + return create_dummy_pixmap (widget); + } + + colormap = gtk_widget_get_colormap (widget); + gdkpixmap = gdk_pixmap_colormap_create_from_xpm (NULL, colormap, &mask, + NULL, found_filename); + if (gdkpixmap == NULL) + { + g_warning (_("Error loading pixmap file: %s"), found_filename); + g_free (found_filename); + return create_dummy_pixmap (widget); + } + g_free (found_filename); + pixmap = gtk_pixmap_new (gdkpixmap, mask); + gdk_pixmap_unref (gdkpixmap); + gdk_bitmap_unref (mask); + return pixmap; +} + +/* This is an internally used function to check if a pixmap file exists. */ +static gchar* +check_file_exists (const gchar *directory, + const gchar *filename) +{ + gchar *full_filename; + struct stat s; + gint status; + + full_filename = (gchar*) g_malloc (strlen (directory) + 1 + + strlen (filename) + 1); + strcpy (full_filename, directory); + strcat (full_filename, G_DIR_SEPARATOR_S); + strcat (full_filename, filename); + + status = stat (full_filename, &s); + if (status == 0 && S_ISREG (s.st_mode)) + return full_filename; + g_free (full_filename); + return NULL; +} + diff --git a/plugins/familiar/familiar_support.h b/plugins/familiar/familiar_support.h new file mode 100644 index 0000000000..931bc5ad04 --- /dev/null +++ b/plugins/familiar/familiar_support.h @@ -0,0 +1,61 @@ +/* + * DO NOT EDIT THIS FILE - it is generated by Glade. + */ + +#ifdef HAVE_CONFIG_H +# include +#endif + +#include + +/* + * Standard gettext macros. + */ +#ifdef ENABLE_NLS +# include +# undef _ +# define _(String) dgettext (PACKAGE, String) +# ifdef gettext_noop +# define N_(String) gettext_noop (String) +# else +# define N_(String) (String) +# endif +#else +# define textdomain(String) (String) +# define gettext(String) (String) +# define dgettext(Domain,Message) (Message) +# define dcgettext(Domain,Message,Type) (Message) +# define bindtextdomain(Domain,Directory) (Domain) +# define _(String) (String) +# define N_(String) (String) +#endif + + +/* + * Public Functions. + */ + +/* + * This function returns a widget in a component created by Glade. + * Call it with the toplevel widget in the component (i.e. a window/dialog), + * or alternatively any widget in the component, and the name of the widget + * you want returned. + */ +GtkWidget* lookup_widget (GtkWidget *widget, + const gchar *widget_name); + +/* get_widget() is deprecated. Use lookup_widget instead. */ +#define get_widget lookup_widget + +/* Use this function to set the directory containing installed pixmaps. */ +void add_pixmap_directory (const gchar *directory); + + +/* + * Private Functions. + */ + +/* This is used to create the pixmaps in the interface. */ +GtkWidget* create_pixmap (GtkWidget *widget, + const gchar *filename); + 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/plugins/qte/Makefile b/plugins/qte/Makefile new file mode 100644 index 0000000000..291719cd8d --- /dev/null +++ b/plugins/qte/Makefile @@ -0,0 +1,3 @@ +qte_SOURCES = qte.c qte.cpp +#qte_CFLAGS = -I$(QTDIR)/include -DQT_QWS_IPAQ -DQWS -fno-exceptions -fno-rtti +#qte_LDFLAGS = -L$(QTDIR)/lib -lqpe -lqte diff --git a/plugins/qte/qte.c b/plugins/qte/qte.c new file mode 100644 index 0000000000..3f1a1294d8 --- /dev/null +++ b/plugins/qte/qte.c @@ -0,0 +1,54 @@ +/***************************************************************************** + * qte.c : Qt Embedded video output + ***************************************************************************** + * Copyright (C) 2002 VideoLAN + * $Id: qte.c,v 1.1.2.1 2002/09/30 20:32:46 jpsaman Exp $ + * + * Authors: Gerald Hansink + * Jean-Paul Saman + * + * 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 /* ENOMEM */ +#include /* free() */ +#include /* strerror() */ + +#include + +void _M( vout_getfunctions )( function_list_t * p_function_list ); + +MODULE_CONFIG_START +ADD_CATEGORY_HINT( N_("Miscellaneous"), NULL ) +ADD_STRING ( "qte-display", NULL, NULL, NULL, NULL ) +ADD_BOOL ( "qte-altfullscreen", NULL, NULL, NULL, NULL ) +MODULE_CONFIG_STOP + +MODULE_INIT_START + SET_DESCRIPTION( _("Qt Embedded video output module") ) + ADD_CAPABILITY( VOUT, 150 ) + ADD_SHORTCUT( "qtevlc" ) +MODULE_INIT_STOP + +MODULE_ACTIVATE_START + _M( vout_getfunctions )( &p_module->p_functions->vout ); +MODULE_ACTIVATE_STOP + +MODULE_DEACTIVATE_START +MODULE_DEACTIVATE_STOP + diff --git a/plugins/qte/qte.cpp b/plugins/qte/qte.cpp new file mode 100644 index 0000000000..8b788721b1 --- /dev/null +++ b/plugins/qte/qte.cpp @@ -0,0 +1,593 @@ +/***************************************************************************** + * qte.cpp : Qt Embedded video output plugin implementation + ***************************************************************************** + * Copyright (C) 2002 VideoLAN + * $Id: qte.cpp,v 1.1.2.1 2002/09/30 20:32:46 jpsaman Exp $ + * + * Authors: Gerald Hansink + * Jean-Paul Saman + * + * 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. + *****************************************************************************/ + +/***************************************************************************** + * notes: + * - written for ipaq, so hardcoded assumptions specific for ipaq... + * - runs full screen + * - no "mouse events" handling + * - etc. + *****************************************************************************/ + +/***************************************************************************** + * Preamble + *****************************************************************************/ + +#include +#include + +#ifdef Q_WS_QWS +# define USE_DIRECT_PAINTER +# include +# include +#endif + +#include /* ENOMEM */ +#include /* free() */ +#include /* strerror() */ + +#include + +#ifdef HAVE_MACHINE_PARAM_H + /* BSD */ +# include +# include /* typedef ushort */ +# include +#endif + +#ifndef WIN32 +# include /* BSD: struct in_addr */ +#endif + +#ifdef HAVE_SYS_SHM_H +# include /* shmget(), shmctl() */ +#endif + + +#include "video.h" +#include "video_output.h" + +#include "interface.h" +#include "netutils.h" /* network_ChannelJoin */ + +#include "stream_control.h" /* needed by input_ext-intf.h... */ +#include "input_ext-intf.h" + + +/***************************************************************************** + * Local prototypes + *****************************************************************************/ +static int vout_Create ( vout_thread_t * ); +static void vout_Destroy ( vout_thread_t * ); +static void vout_Render ( vout_thread_t *, picture_t * ); +static void vout_Display ( vout_thread_t *, picture_t * ); +static int vout_Manage ( vout_thread_t * ); +static int vout_Init ( vout_thread_t * ); +static void vout_End ( vout_thread_t * ); + + +static int CreateQtWindow ( vout_thread_t * ); +static void DestroyQtWindow( vout_thread_t * ); + +static int NewPicture ( vout_thread_t *, picture_t * ); +static void FreePicture ( vout_thread_t *, picture_t * ); + +static void ToggleFullScreen ( vout_thread_t * ); + +static void* vout_run_qtapp_exec (void* pVoid); + +/***************************************************************************** + * vout_sys_t: video output method descriptor + ***************************************************************************** + * This structure is part of the video output thread descriptor. + * It describes the specific properties of an video output plugin + *****************************************************************************/ +typedef struct vout_sys_s +{ + /* Internal settings and properties */ + int i_width; + int i_height; + + bool bRunning; + bool bOwnsQApp; + + QApplication* pcQApplication; + QWidget* pcVoutWidget; +} vout_sys_t; + + +/***************************************************************************** + * picture_sys_t: direct buffer method descriptor + *****************************************************************************/ +typedef struct picture_sys_s +{ + QImage* pQImage; +} picture_sys_t; + + +/***************************************************************************** + * Chroma defines + *****************************************************************************/ +#define QTE_MAX_DIRECTBUFFERS 2 + + +/***************************************************************************** + * Seeking function TODO: put this in a generic location ! + *****************************************************************************/ +static inline void vout_Seek( off_t i_seek ) +{ +} + +extern "C" +{ + +void _M( vout_getfunctions )( function_list_t * p_function_list ); + +/***************************************************************************** + * Functions exported as capabilities. They are declared as static so that + * we don't pollute the namespace too much. + *****************************************************************************/ +void _M( 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: allocate video thread output method + *****************************************************************************/ +static int vout_Create( vout_thread_t *p_vout ) +{ + //intf_ErrMsg( "+vout_Create::qte" ); + + /* Allocate structure */ + p_vout->p_sys = (vout_sys_s*) malloc( sizeof( vout_sys_t ) ); + + if( p_vout->p_sys == NULL ) + { + intf_ErrMsg( "vout error: %s", strerror(ENOMEM) ); + return( 1 ); + } + + memset(p_vout->p_sys, 0, sizeof( vout_sys_t )); + + CreateQtWindow(p_vout); + + //intf_ErrMsg( "-vout_Create::qte\n" ); + return( 0 ); +} + +/***************************************************************************** + * vout_Destroy: destroy video thread output method + ***************************************************************************** + * Terminate an output method created by vout_Create + *****************************************************************************/ +static void vout_Destroy( vout_thread_t *p_vout ) +{ + //intf_ErrMsg( "+vout_Destroy::qte\n" ); + DestroyQtWindow(p_vout); + free(p_vout->p_sys); +} + +/***************************************************************************** + * vout_Init: initialize video thread output method + ***************************************************************************** + * This function create the buffers needed by the output thread. It is called + * at the beginning of the thread, but also each time the window is resized. + *****************************************************************************/ +static int vout_Init( vout_thread_t *p_vout ) +{ + int i_index; + picture_t* p_pic; + + int dd = QPixmap::defaultDepth(); + + //intf_ErrMsg( "+vout_Init::qte\n" ); + + I_OUTPUTPICTURES = 0; + + p_vout->output.i_chroma = (dd == 16) ? FOURCC_RV16 : FOURCC_RV32; + p_vout->output.i_rmask = 0xf800; + p_vout->output.i_gmask = 0x07e0; + p_vout->output.i_bmask = 0x001f; + //p_vout->output.i_width = p_vout->render.i_width; + //p_vout->output.i_height = p_vout->render.i_height; + p_vout->output.i_width = p_vout->p_sys->i_width; + p_vout->output.i_height = p_vout->p_sys->i_height; + p_vout->output.i_aspect = p_vout->render.i_aspect; + + /* Try to initialize MAX_DIRECTBUFFERS direct buffers */ + while( I_OUTPUTPICTURES < QTE_MAX_DIRECTBUFFERS ) + { + p_pic = NULL; + + /* Find an empty picture slot */ + for( i_index = 0 ; i_index < VOUT_MAX_PICTURES ; i_index++ ) + { + if( p_vout->p_picture[ i_index ].i_status == FREE_PICTURE ) + { + p_pic = p_vout->p_picture + i_index; + break; + } + } + + /* Allocate the picture */ + if( p_pic == NULL || NewPicture( p_vout, p_pic ) ) + { + break; + } + + p_pic->i_status = DESTROYED_PICTURE; + p_pic->i_type = DIRECT_PICTURE; + + PP_OUTPUTPICTURE[ I_OUTPUTPICTURES ] = p_pic; + + I_OUTPUTPICTURES++; + } + + //intf_ErrMsg( "-vout_Init::qte %d output pictures\n", I_OUTPUTPICTURES); + + return( 0 ); +} + + +/***************************************************************************** + * vout_Render: render previously calculated output + *****************************************************************************/ +static void vout_Render( vout_thread_t *p_vout, picture_t *p_pic ) +{ + //intf_ErrMsg( "+vout_Render::qte\n" ); + ; +} + +/***************************************************************************** + * vout_Display: displays previously rendered output + ***************************************************************************** + * This function sends the currently rendered image to screen. + *****************************************************************************/ +static void vout_Display( vout_thread_t *p_vout, picture_t *p_pic ) +{ + int x, y, w, h; + + vout_PlacePicture( p_vout, p_vout->p_sys->i_width, p_vout->p_sys->i_height, + &x, &y, &w, &h ); + + if(p_vout->p_sys->pcVoutWidget) + { +// shameless borrowed from opie mediaplayer.... +#ifndef USE_DIRECT_PAINTER + QPainter p(p_vout->p_sys->pcVoutWidget); + + /* rotate frame */ + int dd = QPixmap::defaultDepth(); + int bytes = ( dd == 16 ) ? 2 : 4; + int rw = h, rh = w; + + QImage rotatedFrame( rw, rh, bytes << 3 ); + + ushort* in = (ushort*)p_pic->p_sys->pQImage->bits(); + ushort* out = (ushort*)rotatedFrame.bits(); + + int spl = rotatedFrame.bytesPerLine() / bytes; + for (int x=0; xp_sys->pcVoutWidget); + + // just copy the image to the frame buffer... + memcpy(p.frameBuffer(), (p_pic->p_sys->pQImage->jumpTable())[0], h * p.lineStep()); +#endif + } +} + +/***************************************************************************** + * vout_Manage: handle X11 events + ***************************************************************************** + * This function should be called regularly by video output thread. It manages + * X11 events and allows window resizing. It returns a non null value on + * error. + *****************************************************************************/ +static int vout_Manage( vout_thread_t *p_vout ) +{ + //intf_ErrMsg( "+vout_Manage::qte\n" ); + return 0; +} + +/***************************************************************************** + * vout_End: terminate video thread output method + ***************************************************************************** + * Destroy the buffers created by vout_Init. It is called at the end of + * the thread, but also each time the window is resized. + *****************************************************************************/ +static void vout_End( vout_thread_t *p_vout ) +{ + int i_index; + + //intf_ErrMsg( "+vout_End::qte\n" ); + + /* Free the direct buffers we allocated */ + for( i_index = I_OUTPUTPICTURES ; i_index ; ) + { + i_index--; + FreePicture( p_vout, PP_OUTPUTPICTURE[ i_index ] ); + } +} + + +/***************************************************************************** + * NewPicture: allocate a picture + ***************************************************************************** + * Returns 0 on success, -1 otherwise + *****************************************************************************/ +static int NewPicture( vout_thread_t *p_vout, picture_t *p_pic ) +{ + int dd = QPixmap::defaultDepth(); + + //intf_ErrMsg( "+NewPicture::dd = %d\n",dd ); + + p_pic->p_sys = (picture_sys_t*) malloc( sizeof( picture_sys_t ) ); + + if( p_pic->p_sys == NULL ) + { + return -1; + } + + switch(p_vout->output.i_chroma) + { + case FOURCC_RV16: + if(dd == 16) + { + p_pic->p_sys->pQImage = new QImage(p_vout->output.i_width, + p_vout->output.i_height, + dd ); + + if(p_pic->p_sys->pQImage == NULL) + { + return -1; + } + + p_pic->p->p_pixels = (p_pic->p_sys->pQImage->jumpTable())[0]; + + p_pic->p->i_pitch = p_pic->p_sys->pQImage->bytesPerLine(); + + p_pic->p->i_lines = p_vout->output.i_height; + p_pic->p->i_pixel_bytes = 2; + p_pic->p->b_margin = 0; + p_pic->i_planes = 1; + } + else + { + return -1; + } + break; + case FOURCC_RV32: + if(dd == 32) + { + p_pic->p_sys->pQImage = new QImage(p_vout->output.i_width, + p_vout->output.i_height, + dd ); + + if(p_pic->p_sys->pQImage == NULL) + { + return -1; + } + + p_pic->p->p_pixels = (p_pic->p_sys->pQImage->jumpTable())[0]; + + p_pic->p->i_pitch = p_pic->p_sys->pQImage->bytesPerLine(); + + p_pic->p->i_lines = p_vout->output.i_height; + p_pic->p->i_pixel_bytes = 4; + p_pic->p->b_margin = 0; + p_pic->i_planes = 1; + } + else + { + return -1; + } + break; + default: + return -1; + break; + } + +/* + intf_ErrMsg( "NewPicture: %d %d %d\n",p_vout->output.i_width, + p_vout->output.i_height, + p_vout->output.i_chroma ); +*/ + return 0; +} + +/***************************************************************************** + * FreePicture: destroy a picture allocated with NewPicture + *****************************************************************************/ +static void FreePicture( vout_thread_t *p_vout, picture_t *p_pic ) +{ + delete p_pic->p_sys->pQImage; +} + +/***************************************************************************** + * ToggleFullScreen: Enable or disable full screen mode + ***************************************************************************** + * This function will switch between fullscreen and window mode. + * + *****************************************************************************/ +static void ToggleFullScreen ( vout_thread_t *p_vout ) +{ +} + + +/***************************************************************************** + * CreateQtWindow: create qte applicaton / window + ***************************************************************************** + * Create a window according to video output given size, and set other + * properties according to the display properties. + *****************************************************************************/ +static int CreateQtWindow( vout_thread_t *p_vout ) +{ + //intf_ErrMsg( "vout_qt: +init qt window"); + + /* for displaying the vout in a qt window we need the QtApplication */ + vlc_thread_t thread_id; + //intf_ErrMsg( "vout_qt: +init qt window, creating qpe application"); + + p_vout->p_sys->pcVoutWidget = NULL; + + /* create thread to exec the qpe application */ + if ( vlc_thread_create( &thread_id, "vout qte", + (vlc_thread_func_t)vout_run_qtapp_exec, + (void *)p_vout) ) + { + intf_ErrMsg( "input error: can't spawn vout thread"); + return( -1 ); + } + + p_vout->p_sys->i_width = 320; + p_vout->p_sys->i_height = 240; + + // just wait until the crew is complete... + while(p_vout->p_sys->pcVoutWidget == NULL) + { + msleep(1); + } + + //intf_ErrMsg( "vout_qt: -init qt window"); + + return( 0 ); +} + + +/***************************************************************************** + * DestroyQtWindow: destroy the window + *****************************************************************************/ +static void DestroyQtWindow( vout_thread_t *p_vout ) +{ + // quit qt application loop + if(p_vout->p_sys->pcQApplication) + { + if(p_vout->p_sys->bOwnsQApp) + { + p_vout->p_sys->pcQApplication->quit(); + } + else + { + p_vout->p_sys->bRunning = FALSE; + } + + while(p_vout->p_sys->pcVoutWidget) + { + msleep(1); + } + } +} + +/***************************************************************************** + * main loop of qtapplication + *****************************************************************************/ +static void* +vout_run_qtapp_exec(void* pVoid) +{ + int argc = 0; + char arg0[] = "vout qte"; + + vout_thread_t* p_vout = (vout_thread_t*) pVoid; + + if(qApp == NULL) + { + QApplication* pApp = new QApplication(argc, NULL); + if(pApp) + { + p_vout->p_sys->pcQApplication = pApp; + p_vout->p_sys->bOwnsQApp = TRUE; + } + else + { + return NULL; + } + } + else + { + p_vout->p_sys->pcQApplication = qApp; + } + + { + QWidget vo(0, "vout"); + vo.showFullScreen(); + vo.show(); + p_vout->p_sys->pcVoutWidget = &vo; + + p_vout->p_sys->bRunning = TRUE; + + if(p_vout->p_sys->bOwnsQApp) + { + // run the main loop of qtapplication until someone says: 'quit' + p_vout->p_sys->pcQApplication->exec(); + } + else + { + while(p_vout->p_sys->bRunning) msleep(100); + } + } + + p_vout->p_sys->pcVoutWidget = NULL; + + if(p_vout->p_sys->bOwnsQApp) + { + delete p_vout->p_sys->pcQApplication; + p_vout->p_sys->pcQApplication = NULL; + } + + return 0; +} + diff --git a/share/familiar-forwardb16x16.xpm b/share/familiar-forwardb16x16.xpm new file mode 100644 index 0000000000..d4e25158c2 --- /dev/null +++ b/share/familiar-forwardb16x16.xpm @@ -0,0 +1,21 @@ +/* XPM */ +static char * familiar_forwardb16x16_xpm[] = { +"16 16 2 1", +" c None", +". c #000000", +" ", +" ", +" .. ... ", +" ... ... ", +" .... ... ", +" ..... ... ", +" ......... ", +" ......... ", +" ......... ", +" ..... ... ", +" .... ... ", +" ... ... ", +" .. ... ", +" ", +" ", +" "}; diff --git a/share/familiar-openb16x16.xpm b/share/familiar-openb16x16.xpm new file mode 100644 index 0000000000..343de044ad --- /dev/null +++ b/share/familiar-openb16x16.xpm @@ -0,0 +1,21 @@ +/* XPM */ +static char * familiar_openb16x16_xpm[] = { +"16 16 2 1", +" c None", +". c #000000", +" ", +" ", +" .. ", +" .... ", +" ...... ", +" ........ ", +" .......... ", +" ............ ", +" ............ ", +" ", +" ............ ", +" ............ ", +" ............ ", +" ............ ", +" ", +" "}; diff --git a/share/familiar-pauseb16x16.xpm b/share/familiar-pauseb16x16.xpm new file mode 100644 index 0000000000..bce7c6c655 --- /dev/null +++ b/share/familiar-pauseb16x16.xpm @@ -0,0 +1,21 @@ +/* XPM */ +static char * familiar_pauseb16x16_xpm[] = { +"16 16 2 1", +" c None", +". c #000000", +" ", +" ", +" .... .... ", +" .... .... ", +" .... .... ", +" .... .... ", +" .... .... ", +" .... .... ", +" .... .... ", +" .... .... ", +" .... .... ", +" .... .... ", +" .... .... ", +" .... .... ", +" ", +" "}; diff --git a/share/familiar-playb16x16.xpm b/share/familiar-playb16x16.xpm new file mode 100644 index 0000000000..3bf1e466ea --- /dev/null +++ b/share/familiar-playb16x16.xpm @@ -0,0 +1,21 @@ +/* XPM */ +static char * familiar_playb16x16_xpm[] = { +"16 16 2 1", +" c None", +". c #000000", +" ", +" ", +" .. ", +" .... ", +" ...... ", +" ........ ", +" .......... ", +" ........... ", +" ........... ", +" .......... ", +" ........ ", +" ...... ", +" .... ", +" .. ", +" ", +" "}; diff --git a/share/familiar-preferencesb16x16.xpm b/share/familiar-preferencesb16x16.xpm new file mode 100644 index 0000000000..3b5a318854 --- /dev/null +++ b/share/familiar-preferencesb16x16.xpm @@ -0,0 +1,21 @@ +/* XPM */ +static char * familiar_preferencesb16x16_xpm[] = { +"16 16 2 1", +" c None", +". c #000000", +" ", +" ", +" ....... ", +" ......... ", +" ........... ", +" ..... ..... ", +" ..... ..... ", +" ..... ..... ", +" ..... ..... ", +" ..... ..... ", +" ..... ..... ", +" ..... ..... ", +" ........... ", +" ......... ", +" ....... ", +" "}; diff --git a/share/familiar-rewindb16x16.xpm b/share/familiar-rewindb16x16.xpm new file mode 100644 index 0000000000..bb8027aa6c --- /dev/null +++ b/share/familiar-rewindb16x16.xpm @@ -0,0 +1,21 @@ +/* XPM */ +static char * familiar_rewindb16x16_xpm[] = { +"16 16 2 1", +" c None", +". c #000000", +" ", +" ", +" ... .. ", +" ... ... ", +" ... .... ", +" ... ..... ", +" ......... ", +" ......... ", +" ......... ", +" ... ..... ", +" ... .... ", +" ... ... ", +" ... .. ", +" ", +" ", +" "}; diff --git a/share/familiar-stopb16x16.xpm b/share/familiar-stopb16x16.xpm new file mode 100644 index 0000000000..4f0d07f004 --- /dev/null +++ b/share/familiar-stopb16x16.xpm @@ -0,0 +1,21 @@ +/* XPM */ +static char * familiar_stopb16x16_xpm[] = { +"16 16 2 1", +" c None", +". c #000000", +" ", +" ", +" ", +" ........ ", +" ........ ", +" ........ ", +" ........ ", +" ........ ", +" ........ ", +" ........ ", +" ........ ", +" ........ ", +" ........ ", +" ", +" ", +" "}; diff --git a/share/vlc16x16.xpm b/share/vlc16x16.xpm new file mode 100644 index 0000000000..d343f4dabf --- /dev/null +++ b/share/vlc16x16.xpm @@ -0,0 +1,90 @@ +/* XPM */ +static char * vlc16x16_xpm[] = { +"16 16 71 1", +" c None", +". c #3E2201", +"+ c #B07732", +"@ c #483622", +"# c #653D0D", +"$ c #FFC462", +"% c #B68653", +"& c #9D815F", +"* c #F8CB8B", +"= c #F1CEA8", +"- c #BDB8B3", +"; c #E4ECF7", +"> c #FFFFFF", +", c #75706B", +"' c #F19827", +") c #F1B670", +"! c #FED69D", +"~ c #B78F65", +"{ c #693D07", +"] c #FF9000", +"^ c #FD8E0B", +"/ c #FEAA46", +"( c #F1B36D", +"_ c #918576", +": c #EDC797", +"< c #F1AE5F", +"[ c #FCC382", +"} c #FFECCE", +"| c #908B88", +"1 c #B6A38C", +"2 c #DADCDF", +"3 c #DFE9F5", +"4 c #FDFFFF", +"5 c #FEFFFF", +"6 c #D6C4B3", +"7 c #F18A09", +"8 c #F79822", +"9 c #F2A84F", +"0 c #FDBC71", +"a c #FCC079", +"b c #FABF7B", +"c c #362819", +"d c #8F4E00", +"e c #FB8C00", +"f c #FF8900", +"g c #FF8800", +"h c #FF9410", +"i c #FFAC4D", +"j c #F8C382", +"k c #AA7233", +"l c #A25500", +"m c #7B4300", +"n c #BA6600", +"o c #D17300", +"p c #D97B02", +"q c #E48102", +"r c #DC830F", +"s c #D88C2D", +"t c #DF8E27", +"u c #E38003", +"v c #884A00", +"w c #000000", +"x c #231300", +"y c #492800", +"z c #7B4500", +"A c #B66500", +"B c #C16900", +"C c #693600", +"D c #1F1000", +"E c #090400", +"F c #070400", +" ", +" . ", +" +@ ", +" #$% ", +" &*= ", +" -;>, ", +" ')!~ ", +" {]^/( ", +" _:<[}| ", +" 123456 ", +" 7890abc ", +" defghijkl ", +" mnopqrstuv ", +" wxyzABCDw ", +" EF ", +" "}; diff --git a/vlc.spec b/vlc.spec index 3ddbe2af0a..5c71528115 100644 --- a/vlc.spec +++ b/vlc.spec @@ -1,18 +1,17 @@ - - %define name vlc -%define vlc_ver 0.4.0 +%define vlc_ver 0.4.6 %define version %vlc_ver %define cvs 0 %if %{cvs} %define cvsdate 20010619 -%define release 0.%{cvsdate}mdk +%define release 0.%{cvsdate} %define cvs_name %{name}-snapshot-%{cvsdate}-00 %else -%define release 1mdk +%define release 1 %endif +# The QT interface is not functional yet %define plugin_qt 0 %define plugin_lirc 1 @@ -31,12 +30,12 @@ License: GPL Group: Video URL: http://www.videolan.org/ Requires: vlc-gui -# yves 0.4.0-1mdk needed by ffmpeg builtin (i want MPEG4 support out of box) +# vlc-mad needed by ffmpeg builtin (i want MPEG4 support out of box) Requires: vlc-mad BuildRoot: %_tmppath/%name-%version-%release-root Buildrequires: libncurses5-devel -Buildrequires: libqt2-devel +#Buildrequires: libqt2-devel Buildrequires: libgtk+1.2-devel Buildrequires: gnome-libs-devel Buildrequires: db1-devel @@ -51,18 +50,16 @@ Buildrequires: liblirc-devel Buildrequires: libffmpeg-devel %description -VideoLAN is a free network-aware MPEG1, MPEG2, MPEG4 (aka DivX) -and DVD player. -The VideoLAN Client allows to play MPEG2 Transport Streams from the -network or from a file, as well as direct DVD playback. -VideoLAN is a project of students from the Ecole Centrale Paris. -This version add MPEG1 support, direct DVD support, DVD decryption, -arbitrary, seeking in the stream, pause, fast forward and slow motion, -hardware YUV acceleration and a few new interface features -including drag'n'drop. -You may install vlc-gnome, vlc-gtk and vlc-ncurses. -This package contains no CSS unscrambling functionality. -You need the libdvdcss library available from +VideoLAN is an OpenSource streaming solution for every OS developed by +students from the Ecole Centrale Paris and developers from all over the +World. +The VideoLAN Client (vlc) plays MPEG1, MPEG2 and MPEG4 (aka DivX) files, +DVDs, VCDs, SVCDs, from a satellite card, from an MPEG2 Transport +Streams sent by the VideoLAN Server (vls) or from a Web server (with the +HTTP input). +You may install vlc-gnome or vlc-gtk to have a nice graphical interface. +This package contains no CSS unscrambling functionality for DVDs ; +you need the libdvdcss library available from http://www.videolan.org/libdvdcss/ or http://plf.zarb.org/ # intf plugins @@ -277,7 +274,6 @@ rm -fr %buildroot %dir %{_libdir}/videolan/vlc %{_libdir}/videolan/vlc/ac3_spdif.so %{_libdir}/videolan/vlc/avi.so -%{_libdir}/videolan/vlc/dsp.so %{_libdir}/videolan/vlc/dummy.so %{_libdir}/videolan/vlc/dvd.so %{_libdir}/videolan/vlc/fb.so @@ -287,6 +283,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 @@ -299,6 +297,7 @@ rm -fr %buildroot %{_libdir}/videolan/vlc/mpeg_ps.so %{_libdir}/videolan/vlc/mpeg_ts.so %{_libdir}/videolan/vlc/null.so +%{_libdir}/videolan/vlc/dsp.so %{_libdir}/videolan/vlc/rc.so %{_libdir}/videolan/vlc/spudec.so %{_libdir}/videolan/vlc/udp.so @@ -409,6 +408,18 @@ rm -fr %buildroot %{_libdir}/videolan/vlc/alsa.so %changelog +* Wed Nov 13 2002 Alexis de Lattre 0.4.6 +- new upstream release + +* Mon Oct 14 2002 Alexis de Lattre 0.4.5 +- new upstream release + +* Mon Jun 20 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 -- 2.39.5