From 440f9992ee947ea5fd0debbf35fdd1011c6404b3 Mon Sep 17 00:00:00 2001 From: Sam Hocevar Date: Wed, 30 May 2001 17:03:13 +0000 Subject: [PATCH] * Fixed the BeOS compile typo. * The ALSA plugin is back. * A gift for Gildas: plugins don't rely on backlinking any more. The drawback is the dirty magic in include/modules_export.h which has to be included whenever a module needs one of the functions in it. But a) we should less and less rely on those functions b) no plugin code modification was needed The BeOS and MacOS X modules may be broken when compiled as plugins, I'll check this later when I can reboot under BeOS. --- INSTALL | 4 +- Makefile | 5 +- Makefile.modules | 4 +- Makefile.opts.in | 14 - configure | 7778 ++++++++++------------------- configure.in | 11 +- debian/control | 43 +- debian/control-css | 4 +- debian/rules | 11 +- include/audio_output.h | 4 +- include/common.h | 3 +- include/defs.h.in | 2 +- include/input.h | 16 +- include/input_ext-intf.h | 10 +- include/intf_playlist.h | 3 +- include/intf_urldecode.h | 20 - include/main.h | 4 +- include/modules.h | 11 +- include/modules_inner.h | 100 +- include/netutils.h | 3 +- include/tests.h | 9 +- include/video_decoder.h | 4 +- include/video_output.h | 23 +- include/video_parser.h | 4 +- plugins/alsa/alsa.c | 71 +- plugins/alsa/aout_alsa.c | 3 +- plugins/beos/beos.cpp | 71 +- plugins/beos/vout_beos.cpp | 14 +- plugins/darwin/darwin.c | 70 +- plugins/downmix/downmix.c | 63 +- plugins/downmix/downmix3dn.c | 62 +- plugins/downmix/downmixsse.c | 62 +- plugins/dsp/aout_dsp.c | 3 +- plugins/dsp/dsp.c | 73 +- plugins/dummy/aout_dummy.c | 3 +- plugins/dummy/dummy.c | 71 +- plugins/dummy/intf_dummy.c | 3 +- plugins/dummy/vout_dummy.c | 5 +- plugins/dvd/dvd.c | 80 +- plugins/dvd/input_dvd.c | 10 +- plugins/esd/aout_esd.c | 3 +- plugins/esd/esd.c | 73 +- plugins/fb/fb.c | 71 +- plugins/fb/vout_fb.c | 10 +- plugins/ggi/ggi.c | 71 +- plugins/ggi/vout_ggi.c | 10 +- plugins/glide/Makefile | 2 +- plugins/glide/glide.c | 71 +- plugins/glide/vout_glide.c | 10 +- plugins/gtk/Makefile | 13 +- plugins/gtk/gnome.c | 71 +- plugins/gtk/gtk.c | 71 +- plugins/gtk/gtk_callbacks.c | 4 +- plugins/gtk/gtk_control.c | 4 +- plugins/gtk/gtk_display.c | 4 +- plugins/gtk/gtk_menu.c | 4 +- plugins/gtk/gtk_open.c | 4 +- plugins/gtk/gtk_playlist.c | 8 +- plugins/gtk/gtk_preferences.c | 4 +- plugins/gtk/intf_gnome.c | 6 +- plugins/gtk/intf_gtk.c | 6 +- plugins/idct/Makefile | 12 +- plugins/idct/idct.c | 65 +- plugins/idct/idctaltivec.c | 65 +- plugins/idct/idctclassic.c | 64 +- plugins/idct/idctmmx.c | 65 +- plugins/idct/idctmmxext.c | 65 +- plugins/idct/vdec_block.h | 4 +- plugins/idct/vdec_block_c.c | 6 +- plugins/idct/vdec_block_mmx.c | 6 +- plugins/imdct/imdct.c | 62 +- plugins/imdct/imdct3dn.c | 62 +- plugins/imdct/imdctsse.c | 62 +- plugins/kde/kde.cpp | 70 +- plugins/macosx/intf_macosx.c | 4 +- plugins/macosx/macosx.c | 70 +- plugins/macosx/vout_macosx.c | 2 +- plugins/mga/mga.c | 70 +- plugins/mga/vout_mga.c | 4 +- plugins/motion/motion.c | 62 +- plugins/motion/motionmmx.c | 62 +- plugins/motion/motionmmxext.c | 62 +- plugins/mpeg/es.c | 70 +- plugins/mpeg/input_es.c | 10 +- plugins/mpeg/input_ps.c | 10 +- plugins/mpeg/input_ts.c | 10 +- plugins/mpeg/ps.c | 71 +- plugins/mpeg/ts.c | 70 +- plugins/null/null.c | 55 +- plugins/qt/Makefile | 2 +- plugins/qt/intf_qt.cpp | 6 +- plugins/qt/qt.cpp | 72 +- plugins/sdl/aout_sdl.c | 3 +- plugins/sdl/sdl.c | 71 +- plugins/sdl/vout_sdl.c | 14 +- plugins/text/ncurses.c | 70 +- plugins/text/rc.c | 69 +- plugins/x11/vout_x11.c | 10 +- plugins/x11/vout_xvideo.c | 7 +- plugins/x11/x11.c | 71 +- plugins/x11/xvideo.c | 71 +- plugins/yuv/yuv.c | 62 +- plugins/yuv/yuvmmx.c | 62 +- src/input/input.c | 31 +- src/interface/intf_playlist.c | 36 +- src/interface/intf_urldecode.c | 58 - src/misc/modules.c | 42 +- src/misc/netutils.c | 4 +- src/misc/tests.c | 10 +- src/video_decoder/video_decoder.c | 6 +- src/video_output/video_output.c | 70 +- src/video_parser/video_parser.c | 4 +- 112 files changed, 3698 insertions(+), 7667 deletions(-) delete mode 100644 include/intf_urldecode.h delete mode 100644 src/interface/intf_urldecode.c diff --git a/INSTALL b/INSTALL index 416671e082..5dfc01ec1a 100644 --- a/INSTALL +++ b/INSTALL @@ -14,13 +14,13 @@ Here is a shortcut to copy-paste for a complete build: make distclean && ./configure --prefix=/usr --enable-gnome \ --enable-fb --with-glide --with-ggi --with-sdl --enable-esd \ - --enable-mga --enable-gtk --enable-qt --enable-xvideo + --enable-mga --enable-gtk --enable-qt --enable-xvideo --enable-alsa If you intend to debug stuff, you may want to disable optimizations: make distclean && ./configure --prefix=/usr --enable-gnome \ --enable-fb --with-glide --with-ggi --with-sdl --enable-esd \ - --enable-mga --enable-gtk --enable-qt --enable-xvideo \ + --enable-mga --enable-gtk --enable-qt --enable-xvideo --enable-alsa \ --enable-debug diff --git a/Makefile b/Makefile index 8183e1f85b..85a3ea3ce0 100644 --- a/Makefile +++ b/Makefile @@ -39,8 +39,7 @@ INTERFACE = src/interface/main.o \ src/interface/interface.o \ src/interface/intf_msg.o \ src/interface/intf_playlist.o \ - src/interface/intf_channels.o \ - src/interface/intf_urldecode.o \ + src/interface/intf_channels.o INPUT = src/input/input.o \ src/input/input_ext-dec.o \ @@ -328,7 +327,7 @@ $(CPP_OBJ): %.o: %.cpp # Main application target # vlc: Makefile.opts Makefile.dep Makefile $(H_OBJ) $(C_OBJ) $(CPP_OBJ) $(BUILTIN_OBJ) - $(CC) $(CFLAGS) -o $@ $(C_OBJ) $(CPP_OBJ) $(BUILTIN_OBJ) $(LCFLAGS) + $(CC) $(CFLAGS) -o $@ $(C_OBJ) $(CPP_OBJ) $(BUILTIN_OBJ) $(LCFLAGS) $(LIB) ifeq ($(SYS),beos) rm -f ./lib/_APP_ ln -s ../vlc ./lib/_APP_ diff --git a/Makefile.modules b/Makefile.modules index 31ac491e03..a13b1f4ab5 100644 --- a/Makefile.modules +++ b/Makefile.modules @@ -59,7 +59,7 @@ $(CPP_DEP): %.dpp: FORCE $(PLUGIN_C): %.o: .dep/%.d $(PLUGIN_C): %.o: %.c - $(CC) $(CFLAGS) $(PCFLAGS) -c -o $@ $< + $(CC) $(CFLAGS) -DPLUGIN $(PCFLAGS) -c -o $@ $< $(BUILTIN_C): BUILTIN_%.o: .dep/%.d $(BUILTIN_C): BUILTIN_%.o: %.c @@ -67,7 +67,7 @@ $(BUILTIN_C): BUILTIN_%.o: %.c $(PLUGIN_CPP): %.o: .dep/%.dpp $(PLUGIN_CPP): %.o: %.cpp - $(CC) $(CFLAGS) $(PCFLAGS) -c -o $@ $< + $(CC) $(CFLAGS) -DPLUGIN $(PCFLAGS) -c -o $@ $< $(BUILTIN_CPP): BUILTIN_%.o: .dep/%.dpp $(BUILTIN_CPP): BUILTIN_%.o: %.cpp diff --git a/Makefile.opts.in b/Makefile.opts.in index d67870ad7b..11771982d0 100644 --- a/Makefile.opts.in +++ b/Makefile.opts.in @@ -213,20 +213,6 @@ LCFLAGS += @LCFLAGS@ $(LIB) LCFLAGS += -Wall #LCFLAGS += -s -ifeq ($(SYS),beos) -LCFLAGS += -Xlinker -soname=_APP_ -else -ifneq (,$(findstring qnx,$(SYS))) -LCFLAGS += -Xlinker -export-dynamic -else -ifneq (,$(findstring darwin,$(SYS))) -LCFLAGS += -dyn -else -LCFLAGS += --export-dynamic -endif -endif -endif - # # Debugging and profiling support # diff --git a/configure b/configure index b2fe303b1b..a86f02ccfd 100755 --- a/configure +++ b/configure @@ -1,145 +1,80 @@ #! /bin/sh + # Guess values for system-dependent variables and create Makefiles. -# Generated by Autoconf 2.50. +# Generated automatically using autoconf version 2.13 +# Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc. # -# Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001 -# Free Software Foundation, Inc. # This configure script is free software; the Free Software Foundation # gives unlimited permission to copy, distribute and modify it. -# 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 - -# Name of the executable. -as_me=`echo "$0" |sed 's,.*[\\/],,'` - -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" - -# Support unset when possible. -if (FOO=FOO; unset FOO) >/dev/null 2>&1; then - as_unset=unset -else - as_unset=false -fi - -# NLS nuisances. -$as_unset LANG || test "${LANG+set}" != set || { LANG=C; export LANG; } -$as_unset LC_ALL || test "${LC_ALL+set}" != set || { LC_ALL=C; export LC_ALL; } -$as_unset LC_TIME || test "${LC_TIME+set}" != set || { LC_TIME=C; export LC_TIME; } -$as_unset LC_CTYPE || test "${LC_CTYPE+set}" != set || { LC_CTYPE=C; export LC_CTYPE; } -$as_unset LANGUAGE || test "${LANGUAGE+set}" != set || { LANGUAGE=C; export LANGUAGE; } -$as_unset LC_COLLATE || test "${LC_COLLATE+set}" != set || { LC_COLLATE=C; export LC_COLLATE; } -$as_unset LC_NUMERIC || test "${LC_NUMERIC+set}" != set || { LC_NUMERIC=C; export LC_NUMERIC; } -$as_unset LC_MESSAGES || test "${LC_MESSAGES+set}" != set || { LC_MESSAGES=C; export LC_MESSAGES; } - -# 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=:; 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. -# +# Defaults: +ac_help= ac_default_prefix=/usr/local -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} - -# Avoid depending upon Character Ranges. -ac_cr_az='abcdefghijklmnopqrstuvwxyz' -ac_cr_AZ='ABCDEFGHIJKLMNOPQRSTUVWXYZ' -ac_cr_09='0123456789' -ac_cr_alnum=$ac_cr_az$ac_cr_AZ$ac_cr_09 - -# Sed expression to map a string onto a valid sh and CPP variable names. -ac_tr_sh="sed y%*+%pp%;s%[^_$ac_cr_alnum]%_%g" -ac_tr_cpp="sed y%*$ac_cr_az%P$ac_cr_AZ%;s%[^_$ac_cr_alnum]%_%g" - -ac_unique_file="src/interface/main.c" -# Factoring default headers for most tests. -ac_includes_default="\ -#include -#include -#include -#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 -#else -# if HAVE_STRINGS_H -# include -# endif -#endif -#if HAVE_INTTYPES_H -# include -#endif -#if HAVE_UNISTD_H -# include -#endif" +# Any additions from configure.in: +ac_help="$ac_help + --disable-dummy dummy module (default enabled)" +ac_help="$ac_help + --disable-null Null module (default enabled)" +ac_help="$ac_help + --disable-rc rc module (default enabled)" +ac_help="$ac_help + --disable-ppro Disable PentiumPro optimizations (default enabled for x86)" +ac_help="$ac_help + --disable-mmx Disable MMX optimizations (default enabled for x86)" +ac_help="$ac_help + --enable-altivec Enable altivec optimizations (default disabled since it is broken)" +ac_help="$ac_help + --disable-css Disable DVD CSS decryption (default enabled)" +ac_help="$ac_help + --enable-debug Enable debug mode (default disabled)" +ac_help="$ac_help + --enable-stats Enable printing of statistics (default disabled)" +ac_help="$ac_help + --enable-trace Enable trace mode (default disabled)" +ac_help="$ac_help + --disable-optimizations Disable compiler optimizations (default enabled)" +ac_help="$ac_help + --disable-dsp Linux /dev/dsp support (default enabled)" +ac_help="$ac_help + --enable-esd Esound library support (default disabled)" +ac_help="$ac_help + --enable-darwin Darwin sound support (default disabled)" +ac_help="$ac_help + --enable-macosx Mac OS X interface support (default enabled in Mac OS X)" +ac_help="$ac_help + --enable-fb Linux framebuffer support (default disabled)" +ac_help="$ac_help + --with-ggi[=name] GGI support (default disabled)" +ac_help="$ac_help + --with-sdl[=name] SDL support (default enabled)" +ac_help="$ac_help + --with-glide[=name] Glide (3dfx) support (default disabled)" +ac_help="$ac_help + --enable-ncurses ncurses interface support (default disabled)" +ac_help="$ac_help + --enable-qt Qt interface support (default disabled)" +ac_help="$ac_help + --enable-kde KDE interface support (default disabled)" +ac_help="$ac_help + --enable-gnome Gnome interface support (default disabled)" +ac_help="$ac_help + --disable-gtk Gtk+ support (default enabled)" +ac_help="$ac_help + --disable-x11 X11 support (default enabled)" +ac_help="$ac_help + --disable-xvideo XVideo support (default enabled)" +ac_help="$ac_help + --enable-alsa Alsa sound drivers support (Only for linux) (default disabled)" # 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. -cache_file=/dev/null +build=NONE +cache_file=./config.cache exec_prefix=NONE +host=NONE no_create= +nonopt=NONE no_recursion= prefix=NONE program_prefix=NONE @@ -148,15 +83,10 @@ 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' @@ -170,16 +100,17 @@ oldincludedir='/usr/include' infodir='${prefix}/info' mandir='${prefix}/man' -# Identity of this package. -PACKAGE_NAME= -PACKAGE_TARNAME= -PACKAGE_VERSION= -PACKAGE_STRING= -PACKAGE_BUGREPORT= +# 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" @@ -187,59 +118,59 @@ do continue fi - ac_optarg=`expr "x$ac_option" : 'x[^=]*=\(.*\)'` + case "$ac_option" in + -*=*) ac_optarg=`echo "$ac_option" | sed 's/[-_a-zA-Z0-9]*=//'` ;; + *) ac_optarg= ;; + esac # 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_alias ;; + ac_prev=build ;; -build=* | --build=* | --buil=* | --bui=* | --bu=*) - build_alias=$ac_optarg ;; + build="$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 ;; - - --config-cache | -C) - cache_file=config.cache ;; + cache_file="$ac_optarg" ;; -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=`expr "x$ac_option" : 'x-*disable-\(.*\)'` + ac_feature=`echo $ac_option|sed -e 's/-*disable-//'` # Reject names that are not valid shell variable names. - expr "x$ac_feature" : ".*[^-_$ac_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" ;; + 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" ;; -enable-* | --enable-*) - ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` + ac_feature=`echo $ac_option|sed -e 's/-*enable-//' -e 's/=.*//'` # Reject names that are not valid shell variable names. - expr "x$ac_feature" : ".*[^-_$ac_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"`;; + 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 + *=*) ;; *) 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- \ @@ -248,47 +179,95 @@ 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 | -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 ;; + -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 ;; -host | --host | --hos | --ho) - ac_prev=host_alias ;; + ac_prev=host ;; -host=* | --host=* | --hos=* | --ho=*) - host_alias=$ac_optarg ;; + host="$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 \ @@ -297,12 +276,12 @@ do -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. @@ -323,26 +302,26 @@ do -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 \ @@ -359,7 +338,7 @@ do | --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) @@ -369,7 +348,7 @@ do ac_prev=sbindir ;; -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ | --sbi=* | --sb=*) - sbindir=$ac_optarg ;; + sbindir="$ac_optarg" ;; -sharedstatedir | --sharedstatedir | --sharedstatedi \ | --sharedstated | --sharedstate | --sharedstat | --sharedsta \ @@ -380,57 +359,58 @@ do | --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_alias ;; + ac_prev=target ;; -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*) - target_alias=$ac_optarg ;; + target="$ac_optarg" ;; -v | -verbose | --verbose | --verbos | --verbo | --verb) verbose=yes ;; - -version | --version | --versio | --versi | --vers | -V) - ac_init_version=: ;; + -version | --version | --versio | --versi | --vers) + echo "configure generated by autoconf version 2.13" + exit 0 ;; -with-* | --with-*) - ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` + ac_package=`echo $ac_option|sed -e 's/-*with-//' -e 's/=.*//'` # Reject names that are not valid shell variable names. - expr "x$ac_package" : ".*[^-_$ac_cr_alnum]" >/dev/null && - { echo "$as_me: error: invalid package name: $ac_package" >&2 - { (exit 1); exit 1; }; } + 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'` - case $ac_option in - *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;; + case "$ac_option" in + *=*) ;; *) ac_optarg=yes ;; esac - eval "with_$ac_package='$ac_optarg'" ;; + eval "with_${ac_package}='$ac_optarg'" ;; -without-* | --without-*) - ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'` + ac_package=`echo $ac_option|sed -e 's/-*without-//'` # Reject names that are not valid shell variable names. - expr "x$ac_package" : ".*[^-_$ac_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" ;; + 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" ;; --x) # Obsolete; use --with-x. @@ -441,89 +421,98 @@ do 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 "$as_me: error: unrecognized option: $ac_option -Try \`$0 --help' for more information." >&2 - { (exit 1); exit 1; }; } + -*) { echo "configure: error: $ac_option: invalid option; use --help to show usage" 1>&2; exit 1; } ;; - *=*) - ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='` - # Reject names that are not valid shell variable names. - expr "x$ac_envvar" : ".*[^_$ac_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 ;; - *) - # FIXME: should be removed in autoconf 3.0. - echo "$as_me: WARNING: you should use --build, --host, --target" >&2 - expr "x$ac_option" : ".*[^-._$ac_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} + 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" ;; esac done if test -n "$ac_prev"; then - ac_option=--`echo $ac_prev | sed 's/_/-/g'` - { echo "$as_me: error: missing argument to $ac_option" >&2 - { (exit 1); exit 1; }; } + { 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 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 bindir sbindir libexecdir datadir sysconfdir sharedstatedir \ - localstatedir libdir includedir oldincludedir infodir mandir \ - exec_prefix prefix +# 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 do - eval ac_val=$`echo $ac_var` - case $ac_val in - [\\/$]* | ?:[\\/]* ) ;; - NONE ) ;; - *) { echo "$as_me: error: expected an absolute path for --$ac_var: $ac_val" >&2 - { (exit 1); exit 1; }; };; + 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" ;; esac done -# There might be people who depend on the old broken behavior: `$host' -# used to hold the argument of --host etc. -build=$build_alias -host=$host_alias -target=$target_alias - -# FIXME: should be removed in autoconf 3.0. -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 +# 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 -ac_tool_prefix= -test -n "$host_alias" && ac_tool_prefix=$host_alias- +# 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 -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=src/interface/main.c # 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%[\\/][^\\/][^\\/]*$%%'` + ac_confdir=`echo $ac_prog|sed 's%/[^/][^/]*$%%'` test "x$ac_confdir" = "x$ac_prog" && ac_confdir=. srcdir=$ac_confdir if test ! -r $srcdir/$ac_unique_file; then @@ -534,334 +523,13 @@ else fi if test ! -r $srcdir/$ac_unique_file; then if test "$ac_srcdir_defaulted" = yes; then - { echo "$as_me: error: cannot find sources in $ac_confdir or .." >&2 - { (exit 1); exit 1; }; } + { echo "configure: error: can not find sources in $ac_confdir or .." 1>&2; exit 1; } else - { echo "$as_me: error: cannot find sources in $srcdir" >&2 - { (exit 1); exit 1; }; } + { echo "configure: error: can not find sources in $srcdir" 1>&2; exit 1; } fi fi -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 < 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. - -EOF -fi - -if test "$ac_init_help" = "recursive"; then - # If there are subdirs, report their specific --help. - ac_popdir=`pwd` - for ac_subdir in : $ac_subdirs_all; do test "x$ac_subdir" = x: && continue - cd $ac_subdir - # A "../" for each directory in /$ac_subdir. - ac_dots=`echo $ac_subdir | - sed 's,^\./,,;s,[^/]$,&/,;s,[^/]*/,../,g'` - - case $srcdir in - .) # No --srcdir option. We are building in place. - ac_sub_srcdir=$srcdir ;; - [\\/]* | ?:[\\/]* ) # Absolute path. - ac_sub_srcdir=$srcdir/$ac_subdir ;; - *) # Relative path. - ac_sub_srcdir=$ac_dots$srcdir/$ac_subdir ;; - esac - - # Check for guested configure; otherwise get Cygnus style configure. - if test -f $ac_sub_srcdir/configure.gnu; then - echo - $SHELL $ac_sub_srcdir/configure.gnu --help=recursive - elif test -f $ac_sub_srcdir/configure; then - echo - $SHELL $ac_sub_srcdir/configure --help=recursive - elif test -f $ac_sub_srcdir/configure.ac || - test -f $ac_sub_srcdir/configure.in; then - echo - $ac_configure --help - else - echo "$as_me: WARNING: no configuration information is in $ac_subdir" >&2 - fi - cd $ac_popdir - done -fi - -test -n "$ac_init_help" && exit 0 -if $ac_init_version; then - cat <<\EOF - -Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001 -Free Software Foundation, Inc. -This configure script is free software; the Free Software Foundation -gives unlimited permission to copy, distribute and modify it. -EOF - exit 0 -fi -exec 5>config.log -cat >&5 </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` - -PATH = $PATH - -_ASUNAME -} >&5 - -cat >&5 <\?\"\']*) - ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` - ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'" - ac_sep=" " ;; - *) 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. -trap 'exit_status=$? - # Save into config.log some information that might help in debugging. - echo >&5 - echo "## ----------------- ##" >&5 - echo "## Cache variables. ##" >&5 - echo "## ----------------- ##" >&5 - echo >&5 - # 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/^\\([_$ac_cr_alnum]*_cv_[_$ac_cr_alnum]*\\)=\\(.*\\)/\\1='"'"'\\2'"'"'/p" - ;; - *) - sed -n \ - "s/^\\([_$ac_cr_alnum]*_cv_[_$ac_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p" - ;; - esac; -} >&5 - sed "/^$/d" confdefs.h >conftest.log - if test -s conftest.log; then - echo >&5 - echo "## ------------ ##" >&5 - echo "## confdefs.h. ##" >&5 - echo "## ------------ ##" >&5 - echo >&5 - cat conftest.log >&5 - fi - (echo; echo) >&5 - test "$ac_signal" != 0 && - echo "$as_me: caught signal $ac_signal" >&5 - echo "$as_me: exit $exit_status" >&5 - rm -rf conftest* confdefs* core core.* *.core conf$$* $ac_clean_files && - exit $exit_status - ' 0 -for ac_signal in 1 2 13 15; do - trap 'ac_status=$?; ac_signal='$ac_signal'; { (exit $ac_status); exit $ac_status; }' $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 +srcdir=`echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'` -# 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 @@ -872,96 +540,42 @@ if test -z "$CONFIG_SITE"; then fi for ac_site_file in $CONFIG_SITE; do if test -r "$ac_site_file"; then - { echo "$as_me:875: loading site script $ac_site_file" >&5 -echo "$as_me: loading site script $ac_site_file" >&6;} - cat "$ac_site_file" >&5 + echo "loading site script $ac_site_file" . "$ac_site_file" fi done if test -r "$cache_file"; then - # 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:886: loading cache $cache_file" >&5 -echo "$as_me: loading cache $cache_file" >&6;} - case $cache_file in - [\\/]* | ?:[\\/]* ) . $cache_file;; - *) . ./$cache_file;; - esac - fi + echo "loading cache $cache_file" + . $cache_file else - { echo "$as_me:894: 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_suggest_removing_cache=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:910: WARNING: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 -echo "$as_me: WARNING: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} - ac_suggest_removing_cache=: ;; - ,set) - { echo "$as_me:914: WARNING: \`$ac_var' was not set in the previous run" >&5 -echo "$as_me: WARNING: \`$ac_var' was not set in the previous run" >&2;} - ac_suggest_removing_cache=: ;; - ,);; - *) - if test "x$ac_old_val" != "x$ac_new_val"; then - { echo "$as_me:920: WARNING: \`$ac_var' has changed since the previous run:" >&5 -echo "$as_me: WARNING: \`$ac_var' has changed since the previous run:" >&2;} - { echo "$as_me:922: WARNING: former value: $ac_old_val" >&5 -echo "$as_me: WARNING: former value: $ac_old_val" >&2;} - { echo "$as_me:924: WARNING: current value: $ac_new_val" >&5 -echo "$as_me: WARNING: current value: $ac_new_val" >&2;} - ac_suggest_removing_cache=: - fi;; - esac -done -if $ac_suggest_removing_cache; then - { echo "$as_me:931: WARNING: changes in the environment can compromise the build" >&5 -echo "$as_me: WARNING: changes in the environment can compromise the build" >&2;} - { echo "$as_me:933: WARNING: consider removing $cache_file and starting over" >&5 -echo "$as_me: WARNING: consider removing $cache_file and starting over" >&2;} + echo "creating cache $cache_file" + > $cache_file 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 -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 - -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 -echo "#! $SHELL" >conftest.sh -echo "exit 0" >>conftest.sh -chmod +x conftest.sh -if { (echo "$as_me:952: PATH=\".;.\"; conftest.sh") >&5 - (PATH=".;."; conftest.sh) 2>&5 - ac_status=$? - echo "$as_me:955: \$? = $ac_status" >&5 - (exit $ac_status); }; then - ac_path_separator=';' +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_path_separator=: + ac_n= ac_c='\c' ac_t= fi -PATH_SEPARATOR="$ac_path_separator" -rm -f conftest.sh -ac_config_headers="$ac_config_headers include/defs.h" + + ac_aux_dir= for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do @@ -973,654 +587,285 @@ 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 "$as_me:983: 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; }; } + { echo "configure: error: can not find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." 1>&2; exit 1; } fi -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. +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. + # Make sure we can run config.sub. -$ac_config_sub sun4 >/dev/null 2>&1 || - { { echo "$as_me:993: error: cannot run $ac_config_sub" >&5 -echo "$as_me: error: cannot run $ac_config_sub" >&2;} - { (exit 1); exit 1; }; } - -echo "$as_me:997: 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:1006: 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:1010: 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:1015: 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:1022: 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:1031: 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:1036: 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/'` +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:607: 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 + VLC_VERSION=0.2.73 VLC_CODENAME=Ourumov + save_CFLAGS="${CFLAGS}" -echo "$as_me:1049: 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 +echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6 +echo "configure:636: 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 else - cat >conftest.make <<\EOF + cat > conftestmake <<\EOF all: @echo 'ac_maketemp="${MAKE}"' EOF # GNU make sometimes prints "make[1]: Entering...", which would confuse us. -eval `${MAKE-make} -f conftest.make 2>/dev/null | grep temp=` +eval `${MAKE-make} -f conftestmake 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 conftest.make +rm -f conftestmake fi if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then - echo "$as_me:1069: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + echo "$ac_t""yes" 1>&6 SET_MAKE= else - echo "$as_me:1073: result: no" >&5 -echo "${ECHO_T}no" >&6 + echo "$ac_t""no" 1>&6 SET_MAKE="MAKE=${MAKE-make}" 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}gcc", so it can be a program name with args. -set dummy ${ac_tool_prefix}gcc; ac_word=$2 -echo "$as_me:1086: 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 - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue -ac_cv_prog_CC="${ac_tool_prefix}gcc" -echo "$as_me:1101: found $ac_dir/$ac_word" >&5 -break -done - -fi -fi -CC=$ac_cv_prog_CC -if test -n "$CC"; then - echo "$as_me:1109: result: $CC" >&5 -echo "${ECHO_T}$CC" >&6 -else - echo "$as_me:1112: 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. +# Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 -echo "$as_me:1121: 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 - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue -ac_cv_prog_ac_ct_CC="gcc" -echo "$as_me:1136: found $ac_dir/$ac_word" >&5 -break -done - -fi -fi -ac_ct_CC=$ac_cv_prog_ac_ct_CC -if test -n "$ac_ct_CC"; then - echo "$as_me:1144: result: $ac_ct_CC" >&5 -echo "${ECHO_T}$ac_ct_CC" >&6 -else - echo "$as_me:1147: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - - CC=$ac_ct_CC -else - 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:1160: 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 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +echo "configure:665: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 else if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue -ac_cv_prog_CC="${ac_tool_prefix}cc" -echo "$as_me:1175: found $ac_dir/$ac_word" >&5 -break -done - + 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" fi fi -CC=$ac_cv_prog_CC +CC="$ac_cv_prog_CC" if test -n "$CC"; then - echo "$as_me:1183: result: $CC" >&5 -echo "${ECHO_T}$CC" >&6 -else - echo "$as_me:1186: 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 "$as_me:1195: 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 - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue -ac_cv_prog_ac_ct_CC="cc" -echo "$as_me:1210: found $ac_dir/$ac_word" >&5 -break -done - -fi -fi -ac_ct_CC=$ac_cv_prog_ac_ct_CC -if test -n "$ac_ct_CC"; then - echo "$as_me:1218: result: $ac_ct_CC" >&5 -echo "${ECHO_T}$ac_ct_CC" >&6 -else - echo "$as_me:1221: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - - CC=$ac_ct_CC + echo "$ac_t""$CC" 1>&6 else - CC="$ac_cv_prog_CC" + echo "$ac_t""no" 1>&6 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:1234: 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 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +echo "configure:695: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 else 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_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue -if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then - ac_prog_rejected=yes - continue -fi -ac_cv_prog_CC="cc" -echo "$as_me:1254: found $ac_dir/$ac_word" >&5 -break -done - + 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" 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 $# != 0; then + if test $# -gt 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" ${1+"$@"} + set dummy "$ac_dir/$ac_word" "$@" 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 "$as_me:1276: result: $CC" >&5 -echo "${ECHO_T}$CC" >&6 + echo "$ac_t""$CC" 1>&6 else - echo "$as_me:1279: result: no" >&5 -echo "${ECHO_T}no" >&6 + echo "$ac_t""no" 1>&6 fi -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:1290: 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 + 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:746: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 else if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue -ac_cv_prog_CC="$ac_tool_prefix$ac_prog" -echo "$as_me:1305: found $ac_dir/$ac_word" >&5 -break -done - + 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" fi fi -CC=$ac_cv_prog_CC +CC="$ac_cv_prog_CC" if test -n "$CC"; then - echo "$as_me:1313: result: $CC" >&5 -echo "${ECHO_T}$CC" >&6 + echo "$ac_t""$CC" 1>&6 else - echo "$as_me:1316: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - - 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:1329: 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 - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue -ac_cv_prog_ac_ct_CC="$ac_prog" -echo "$as_me:1344: found $ac_dir/$ac_word" >&5 -break -done - + echo "$ac_t""no" 1>&6 fi + ;; + esac + fi + test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; } fi -ac_ct_CC=$ac_cv_prog_ac_ct_CC -if test -n "$ac_ct_CC"; then - echo "$as_me:1352: result: $ac_ct_CC" >&5 -echo "${ECHO_T}$ac_ct_CC" >&6 -else - echo "$as_me:1355: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - - test -n "$ac_ct_CC" && break -done - CC=$ac_ct_CC -fi +echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 +echo "configure:778: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 -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 -test -z "$CC" && { { echo "$as_me:1367: error: no acceptable cc found in \$PATH" >&5 -echo "$as_me: error: no acceptable cc found in \$PATH" >&2;} - { (exit 1); exit 1; }; } +cat > conftest.$ac_ext << EOF -cat >conftest.$ac_ext <<_ACEOF -#line 1372 "configure" +#line 789 "configure" #include "confdefs.h" -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 compiler, and finding out an intuition -# of exeext. -echo "$as_me:1388: 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:1391: \"$ac_link_default\"") >&5 - (eval $ac_link_default) 2>&5 - ac_status=$? - echo "$as_me:1394: \$? = $ac_status" >&5 - (exit $ac_status); }; then - for ac_file in `ls a.exe conftest.exe a.* conftest conftest.* 2>/dev/null`; do - case $ac_file in - *.$ac_ext | *.o | *.obj | *.xcoff | *.tds | *.d | *.pdb ) ;; - a.out ) # We found the default executable, but exeext='' is most - # certainly right. - break;; - *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` - export ac_cv_exeext - break;; - * ) break;; - esac -done -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -{ { echo "$as_me:1411: 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:1417: 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:1422: 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:1428: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:1431: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cross_compiling=no +main(){return(0);} +EOF +if { (eval echo configure:794: \"$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 else - if test "$cross_compiling" = maybe; then - cross_compiling=yes - else - { { echo "$as_me:1438: 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 + ac_cv_prog_cc_cross=yes fi +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + ac_cv_prog_cc_works=no fi -echo "$as_me:1446: 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:1453: checking whether we are cross compiling" >&5 -echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6 -echo "$as_me:1455: result: $cross_compiling" >&5 -echo "${ECHO_T}$cross_compiling" >&6 - -echo "$as_me:1458: checking for executable suffix" >&5 -echo $ECHO_N "checking for executable suffix... $ECHO_C" >&6 -if { (eval echo "$as_me:1460: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:1463: \$? = $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 +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:820: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 +cross_compiling=$ac_cv_prog_cc_cross + +echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 +echo "configure:825: checking whether we are using GNU C" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + cat > conftest.c <&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then + ac_cv_prog_gcc=yes else - { { echo "$as_me:1479: error: cannot compute EXEEXT: cannot compile and link" >&5 -echo "$as_me: error: cannot compute EXEEXT: cannot compile and link" >&2;} - { (exit 1); exit 1; }; } + ac_cv_prog_gcc=no +fi fi -rm -f conftest$ac_cv_exeext -echo "$as_me:1485: result: $ac_cv_exeext" >&5 -echo "${ECHO_T}$ac_cv_exeext" >&6 - -rm -f conftest.$ac_ext -EXEEXT=$ac_cv_exeext -ac_exeext=$EXEEXT -echo "$as_me:1491: checking for object suffix" >&5 -echo $ECHO_N "checking for object suffix... $ECHO_C" >&6 -if test "${ac_cv_objext+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -#line 1497 "configure" -#include "confdefs.h" - -int -main () -{ +echo "$ac_t""$ac_cv_prog_gcc" 1>&6 - ; - return 0; -} -_ACEOF -rm -f conftest.o conftest.obj -if { (eval echo "$as_me:1509: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:1512: \$? = $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 +if test $ac_cv_prog_gcc = yes; then + GCC=yes else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -{ { echo "$as_me:1524: error: cannot compute OBJEXT: cannot compile" >&5 -echo "$as_me: error: cannot compute OBJEXT: cannot compile" >&2;} - { (exit 1); exit 1; }; } + GCC= fi -rm -f conftest.$ac_cv_objext conftest.$ac_ext -fi -echo "$as_me:1531: result: $ac_cv_objext" >&5 -echo "${ECHO_T}$ac_cv_objext" >&6 -OBJEXT=$ac_cv_objext -ac_objext=$OBJEXT -echo "$as_me:1535: 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 +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:853: 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 - cat >conftest.$ac_ext <<_ACEOF -#line 1541 "configure" -#include "confdefs.h" - -int -main () -{ -#ifndef __GNUC__ - choke me -#endif - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:1556: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:1559: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:1562: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:1565: \$? = $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:1577: 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:1583: 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 1589 "configure" -#include "confdefs.h" - -int -main () -{ - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:1601: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:1604: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:1607: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:1610: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo 'void f(){}' > conftest.c +if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then ac_cv_prog_cc_g=yes else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_cv_prog_cc_g=no + ac_cv_prog_cc_g=no fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f conftest* + fi -echo "$as_me:1620: result: $ac_cv_prog_cc_g" >&5 -echo "${ECHO_T}$ac_cv_prog_cc_g" >&6 + +echo "$ac_t""$ac_cv_prog_cc_g" 1>&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" @@ -1634,388 +879,117 @@ 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:1647: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:1650: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:1653: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:1656: \$? = $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 1668 "configure" -#include "confdefs.h" -#include -$ac_declaration -int -main () -{ -exit (42); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:1681: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:1684: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:1687: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:1690: \$? = $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 1700 "configure" -#include "confdefs.h" -$ac_declaration -int -main () -{ -exit (42); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:1712: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:1715: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:1718: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:1721: \$? = $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 -echo '#ifdef __cplusplus' >>confdefs.h -echo $ac_declaration >>confdefs.h -echo '#endif' >>confdefs.h -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:1750: checking how to run the C preprocessor" >&5 -echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6 +echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 +echo "configure:885: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= fi if test -z "$CPP"; then - 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 - # break 2 since there is a loop in there. - 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. +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" # 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 1772 "configure" + # not just through cpp. + cat > conftest.$ac_ext < - Syntax error -_ACEOF -if { (eval echo "$as_me:1777: \"$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:1783: \$? = $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 +Syntax Error +EOF +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +{ (eval echo configure:906: \"$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 : else - echo "$as_me: failed program was:" >&5 + echo "$ac_err" >&5 + echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 - # Broken: fails on valid input. -continue -fi -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 1806 "configure" + rm -rf conftest* + CPP="${CC-cc} -E -traditional-cpp" + cat > conftest.$ac_ext < -_ACEOF -if { (eval echo "$as_me:1810: \"$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:1816: \$? = $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 - # Broken: success on invalid input. -continue +#include +Syntax Error +EOF +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +{ (eval echo configure:923: \"$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 + : else - echo "$as_me: failed program was:" >&5 + echo "$ac_err" >&5 + echo "configure: 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 - break 2 -fi - - done - ac_cv_prog_CPP=$CPP - -fi - CPP=$ac_cv_prog_CPP -else - ac_cv_prog_CPP=$CPP -fi -echo "$as_me:1853: result: $CPP" >&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 1863 "configure" + rm -rf conftest* + CPP="${CC-cc} -nologo -E" + cat > conftest.$ac_ext < - Syntax error -_ACEOF -if { (eval echo "$as_me:1868: \"$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:1874: \$? = $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 +Syntax Error +EOF +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +{ (eval echo configure:940: \"$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 : else - echo "$as_me: failed program was:" >&5 + echo "$ac_err" >&5 + echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 - # Broken: fails on valid input. -continue + rm -rf conftest* + CPP=/lib/cpp fi -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 1897 "configure" -#include "confdefs.h" -#include -_ACEOF -if { (eval echo "$as_me:1901: \"$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:1907: \$? = $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 +rm -f conftest* 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 - # Passes both tests. -ac_preproc_ok=: -break +rm -f conftest* 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 - : +rm -f conftest* + ac_cv_prog_CPP="$CPP" +fi + CPP="$ac_cv_prog_CPP" else - { { echo "$as_me:1935: error: C preprocessor \"$CPP\" fails sanity check" >&5 -echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check" >&2;} - { (exit 1); exit 1; }; } + ac_cv_prog_CPP="$CPP" fi +echo "$ac_t""$CPP" 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}ranlib", so it can be a program name with args. -set dummy ${ac_tool_prefix}ranlib; ac_word=$2 -echo "$as_me:1949: 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 +# 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:967: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 else if test -n "$RANLIB"; then ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. else - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue -ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" -echo "$as_me:1964: found $ac_dir/$ac_word" >&5 -break -done - + 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=":" fi fi -RANLIB=$ac_cv_prog_RANLIB +RANLIB="$ac_cv_prog_RANLIB" if test -n "$RANLIB"; then - echo "$as_me:1972: result: $RANLIB" >&5 -echo "${ECHO_T}$RANLIB" >&6 + echo "$ac_t""$RANLIB" 1>&6 else - echo "$as_me:1975: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - + echo "$ac_t""no" 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:1984: 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 - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue -ac_cv_prog_ac_ct_RANLIB="ranlib" -echo "$as_me:1999: found $ac_dir/$ac_word" >&5 -break -done - 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:2008: result: $ac_ct_RANLIB" >&5 -echo "${ECHO_T}$ac_ct_RANLIB" >&6 -else - echo "$as_me:2011: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - - RANLIB=$ac_ct_RANLIB -else - RANLIB="$ac_cv_prog_RANLIB" -fi # Find a good install program. We prefer a C program (faster), # so one script is as good as another. But avoid the broken or @@ -2024,39 +998,31 @@ fi # 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 "$as_me:2032: checking for a BSD compatible install" >&5 -echo $ECHO_N "checking for a BSD compatible install... $ECHO_C" >&6 +echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 +echo "configure:1007: checking for a BSD compatible install" >&5 if test -z "$INSTALL"; then -if test "${ac_cv_path_install+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 else - ac_save_IFS=$IFS; IFS=$ac_path_separator + IFS="${IFS= }"; ac_save_IFS="$IFS"; IFS=":" for ac_dir in $PATH; do - IFS=$ac_save_IFS # Account for people who put trailing slashes in PATH elements. - case $ac_dir/ in - / | ./ | .// | /cC/* \ - | /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* \ - | /usr/ucb/* ) ;; + 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 $as_executable_p "$ac_dir/$ac_prog"; then + if test -f $ac_dir/$ac_prog; then if test $ac_prog = install && - grep dspmsg "$ac_dir/$ac_prog" >/dev/null 2>&1; then + grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then # AIX install. It has an incompatible calling convention. : - elif test $ac_prog = install && - grep pwplus "$ac_dir/$ac_prog" >/dev/null 2>&1; then - # program-specific install script used by HP pwplus--don't use. - : else ac_cv_path_install="$ac_dir/$ac_prog -c" break 2 @@ -2066,304 +1032,164 @@ else ;; esac done + IFS="$ac_save_IFS" 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 "$as_me:2081: result: $INSTALL" >&5 -echo "${ECHO_T}$INSTALL" >&6 +echo "$ac_t""$INSTALL" 1>&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}' +test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}' test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' -echo "$as_me:2092: checking for $CC option to accept ANSI C" >&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 + +echo $ac_n "checking for working const""... $ac_c" 1>&6 +echo "configure:1061: 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 - ac_cv_prog_cc_stdc=no -ac_save_CC=$CC -cat >conftest.$ac_ext <<_ACEOF -#line 2100 "configure" + cat > conftest.$ac_ext < -#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]; + +int main() { + +/* 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; } -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; +{ /* Someone thinks the Sun supposedly-ANSI compiler will reject this. */ + int x[] = {25, 17}; + const int *foo = &x[0]; + ++foo; } -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; -int -main () -{ -return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]; - ; - return 0; +{ /* Sun SC1.0 ANSI compiler rejects this -- but not the above. */ + typedef const int *iptr; + iptr p = 0; + ++p; } -_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:2149: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:2152: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:2155: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:2158: \$? = $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 - -fi - -case "x$ac_cv_prog_cc_stdc" in - x|xno) - echo "$as_me:2175: result: none needed" >&5 -echo "${ECHO_T}none needed" >&6 ;; - *) - echo "$as_me:2178: 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:2183: 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 2189 "configure" -#include "confdefs.h" - -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; +{ /* 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; } -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:2247: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:2250: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:2253: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:2256: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then +{ /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */ + const int foo = 10; +} + +; return 0; } +EOF +if { (eval echo configure:1115: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* ac_cv_c_const=yes else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_cv_c_const=no + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + ac_cv_c_const=no fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f conftest* fi -echo "$as_me:2266: 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 +echo "$ac_t""$ac_cv_c_const" 1>&6 +if test $ac_cv_c_const = no; then + cat >> confdefs.h <<\EOF +#define const EOF fi + if test x${cross_compiling} != xyes; then - echo "$as_me:2277: checking whether byte ordering is bigendian" >&5 -echo $ECHO_N "checking whether byte ordering is bigendian... $ECHO_C" >&6 -if test "${ac_cv_c_bigendian+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6 +echo "configure:1138: checking whether byte ordering is bigendian" >&5 +if eval "test \"`echo '$''{'ac_cv_c_bigendian'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 else ac_cv_c_bigendian=unknown # See if sys/param.h defines the BYTE_ORDER macro. -cat >conftest.$ac_ext <<_ACEOF -#line 2285 "configure" +cat > conftest.$ac_ext < #include +int main() { -int -main () -{ #if !BYTE_ORDER || !BIG_ENDIAN || !LITTLE_ENDIAN bogus endian macros #endif - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:2302: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:2305: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:2308: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:2311: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then +; return 0; } +EOF +if { (eval echo configure:1156: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* # It does; now see whether it defined to BIG_ENDIAN or not. -cat >conftest.$ac_ext <<_ACEOF -#line 2315 "configure" +cat > conftest.$ac_ext < #include +int main() { -int -main () -{ #if BYTE_ORDER != BIG_ENDIAN not big endian #endif - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:2332: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:2335: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:2338: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:2341: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then +; return 0; } +EOF +if { (eval echo configure:1171: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* ac_cv_c_bigendian=yes else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_cv_c_bigendian=no + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + ac_cv_c_bigendian=no fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f conftest* else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f conftest* if test $ac_cv_c_bigendian = unknown; then if test "$cross_compiling" = yes; then - { { echo "$as_me:2357: error: cannot run test program while cross compiling" >&5 -echo "$as_me: error: cannot run test program while cross compiling" >&2;} - { (exit 1); exit 1; }; } + { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else - cat >conftest.$ac_ext <<_ACEOF -#line 2362 "configure" + cat > conftest.$ac_ext <&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:2381: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:2383: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:2386: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then +EOF +if { (eval echo configure:1204: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +then ac_cv_c_bigendian=no else - echo "$as_me: program exited with status $ac_status" >&5 -echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_cv_c_bigendian=yes + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -fr conftest* + ac_cv_c_bigendian=yes fi -rm -f core core.* *.core conftest$ac_exeext conftest.$ac_ext +rm -fr conftest* fi + fi fi -echo "$as_me:2399: result: $ac_cv_c_bigendian" >&5 -echo "${ECHO_T}$ac_cv_c_bigendian" >&6 -if test $ac_cv_c_bigendian = yes; then -cat >>confdefs.h <<\EOF +echo "$ac_t""$ac_cv_c_bigendian" 1>&6 +if test $ac_cv_c_bigendian = yes; then + cat >> confdefs.h <<\EOF #define WORDS_BIGENDIAN 1 EOF @@ -2410,1127 +1227,887 @@ fi for ac_func in gettimeofday select strerror strtod strtol do -ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh` -echo "$as_me:2414: checking for $ac_func" >&5 -echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 -if eval "test \"\${$ac_ac_var+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -#line 2420 "configure" +echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 +echo "configure:1232: checking for $ac_func" >&5 +if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + cat > conftest.$ac_ext < /* Override any gcc2 internal prototype to avoid an error. */ -#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 (); -char (*f) (); + builtin and then its argument prototype would still apply. */ +char $ac_func(); + +int main() { -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 -f = $ac_func; +$ac_func(); #endif - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:2451: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:2454: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:2457: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:2460: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - eval "$ac_ac_var=yes" -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -eval "$ac_ac_var=no" -fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -fi -echo "$as_me:2470: result: `eval echo '${'$ac_ac_var'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6 -if test `eval echo '${'$ac_ac_var'}'` = yes; then - cat >>confdefs.h <&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 fi done for ac_func in setenv putenv do -ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh` -echo "$as_me:2483: checking for $ac_func" >&5 -echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 -if eval "test \"\${$ac_ac_var+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 +echo "configure:1287: 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 <<_ACEOF -#line 2489 "configure" + cat > conftest.$ac_ext < /* 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 (); -char (*f) (); + builtin and then its argument prototype would still apply. */ +char $ac_func(); + +int main() { -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 -f = $ac_func; +$ac_func(); #endif - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:2520: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:2523: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:2526: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:2529: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - eval "$ac_ac_var=yes" -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -eval "$ac_ac_var=no" -fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -fi -echo "$as_me:2539: result: `eval echo '${'$ac_ac_var'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6 -if test `eval echo '${'$ac_ac_var'}'` = yes; then - cat >>confdefs.h <&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 fi done -echo "$as_me:2549: 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 +echo $ac_n "checking for connect""... $ac_c" 1>&6 +echo "configure:1340: checking for connect" >&5 +if eval "test \"`echo '$''{'ac_cv_func_connect'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 else - cat >conftest.$ac_ext <<_ACEOF -#line 2555 "configure" + cat > conftest.$ac_ext < /* 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 (); -char (*f) (); + builtin and then its argument prototype would still apply. */ +char connect(); + +int main() { -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 -f = connect; +connect(); #endif - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:2586: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:2589: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:2592: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:2595: \$? = $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:2605: result: $ac_cv_func_connect" >&5 -echo "${ECHO_T}$ac_cv_func_connect" >&6 -if test $ac_cv_func_connect = yes; then +; return 0; } +EOF +if { (eval echo configure:1368: \"$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 : else + echo "$ac_t""no" 1>&6 - echo "$as_me:2611: 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 + echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6 +echo "configure:1387: 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 else - ac_check_lib_save_LIBS=$LIBS + ac_save_LIBS="$LIBS" LIBS="-lsocket $LIBS" -cat >conftest.$ac_ext <<_ACEOF -#line 2619 "configure" +cat > conftest.$ac_ext <&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:2641: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:2644: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:2647: \$? = $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:2658: 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 + builtin and then its argument prototype would still apply. */ +char connect(); + +int main() { +connect() +; return 0; } +EOF +if { (eval echo configure:1406: \"$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 LIB="${LIB} -lsocket" +else + echo "$ac_t""no" 1>&6 fi + fi -echo "$as_me:2666: 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 +echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6 +echo "configure:1430: checking for gethostbyname" >&5 +if eval "test \"`echo '$''{'ac_cv_func_gethostbyname'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 else - cat >conftest.$ac_ext <<_ACEOF -#line 2672 "configure" + cat > conftest.$ac_ext < /* 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 (); -char (*f) (); + builtin and then its argument prototype would still apply. */ +char gethostbyname(); + +int main() { -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 -f = gethostbyname; +gethostbyname(); #endif - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:2703: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:2706: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:2709: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:2712: \$? = $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:2722: result: $ac_cv_func_gethostbyname" >&5 -echo "${ECHO_T}$ac_cv_func_gethostbyname" >&6 -if test $ac_cv_func_gethostbyname = yes; then +; return 0; } +EOF +if { (eval echo configure:1458: \"$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 : else + echo "$ac_t""no" 1>&6 - echo "$as_me:2728: 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 + echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6 +echo "configure:1477: 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 else - ac_check_lib_save_LIBS=$LIBS + ac_save_LIBS="$LIBS" LIBS="-lnsl $LIBS" -cat >conftest.$ac_ext <<_ACEOF -#line 2736 "configure" +cat > conftest.$ac_ext <&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:2758: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:2761: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:2764: \$? = $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:2775: 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 + builtin and then its argument prototype would still apply. */ +char gethostbyname(); + +int main() { +gethostbyname() +; return 0; } +EOF +if { (eval echo configure:1496: \"$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 LIB="${LIB} -lnsl" +else + echo "$ac_t""no" 1>&6 fi + fi -echo "$as_me:2783: 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 +echo $ac_n "checking for nanosleep""... $ac_c" 1>&6 +echo "configure:1520: checking for nanosleep" >&5 +if eval "test \"`echo '$''{'ac_cv_func_nanosleep'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 else - cat >conftest.$ac_ext <<_ACEOF -#line 2789 "configure" + cat > conftest.$ac_ext < /* 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 (); -char (*f) (); + builtin and then its argument prototype would still apply. */ +char nanosleep(); + +int main() { -int -main () -{ /* The GNU C library defines this for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ #if defined (__stub_nanosleep) || defined (__stub___nanosleep) choke me #else -f = nanosleep; +nanosleep(); #endif - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:2820: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:2823: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:2826: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:2829: \$? = $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:2839: result: $ac_cv_func_nanosleep" >&5 -echo "${ECHO_T}$ac_cv_func_nanosleep" >&6 -if test $ac_cv_func_nanosleep = yes; then +; return 0; } +EOF +if { (eval echo configure:1548: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_func_nanosleep=yes" +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_func_nanosleep=no" +fi +rm -f conftest* +fi + +if eval "test \"`echo '$ac_cv_func_'nanosleep`\" = yes"; then + echo "$ac_t""yes" 1>&6 : else + echo "$ac_t""no" 1>&6 - echo "$as_me:2845: 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 + echo $ac_n "checking for nanosleep in -lrt""... $ac_c" 1>&6 +echo "configure:1567: 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_check_lib_save_LIBS=$LIBS + ac_save_LIBS="$LIBS" LIBS="-lrt $LIBS" -cat >conftest.$ac_ext <<_ACEOF -#line 2853 "configure" +cat > conftest.$ac_ext <&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:2875: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:2878: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:2881: \$? = $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:2892: 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 + builtin and then its argument prototype would still apply. */ +char nanosleep(); + +int main() { +nanosleep() +; return 0; } +EOF +if { (eval echo configure:1586: \"$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 LIB="${LIB} -lrt" else + echo "$ac_t""no" 1>&6 - echo "$as_me:2898: 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 + echo $ac_n "checking for nanosleep in -lposix4""... $ac_c" 1>&6 +echo "configure:1606: 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_check_lib_save_LIBS=$LIBS + ac_save_LIBS="$LIBS" LIBS="-lposix4 $LIBS" -cat >conftest.$ac_ext <<_ACEOF -#line 2906 "configure" +cat > conftest.$ac_ext <&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:2928: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:2931: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:2934: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_lib_posix4_nanosleep=yes -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_cv_lib_posix4_nanosleep=no -fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -echo "$as_me:2945: 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 + builtin and then its argument prototype would still apply. */ +char nanosleep(); + +int main() { +nanosleep() +; return 0; } +EOF +if { (eval echo configure:1625: \"$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 LIB="${LIB} -lposix4" +else + echo "$ac_t""no" 1>&6 fi + fi + fi for ac_func in usleep do -ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh` -echo "$as_me:2958: checking for $ac_func" >&5 -echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 -if eval "test \"\${$ac_ac_var+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -#line 2964 "configure" +echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 +echo "configure:1654: checking for $ac_func" >&5 +if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + cat > conftest.$ac_ext < /* Override any gcc2 internal prototype to avoid an error. */ -#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 (); -char (*f) (); + builtin and then its argument prototype would still apply. */ +char $ac_func(); + +int main() { -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 -f = $ac_func; +$ac_func(); #endif - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:2995: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:2998: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:3001: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:3004: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - eval "$ac_ac_var=yes" -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -eval "$ac_ac_var=no" -fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -fi -echo "$as_me:3014: result: `eval echo '${'$ac_ac_var'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6 -if test `eval echo '${'$ac_ac_var'}'` = yes; then - cat >>confdefs.h <&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 fi done -echo "$as_me:3024: 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 +echo $ac_n "checking for inet_aton""... $ac_c" 1>&6 +echo "configure:1707: checking for inet_aton" >&5 +if eval "test \"`echo '$''{'ac_cv_func_inet_aton'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 else - cat >conftest.$ac_ext <<_ACEOF -#line 3030 "configure" + cat > conftest.$ac_ext < /* 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 (); -char (*f) (); + builtin and then its argument prototype would still apply. */ +char inet_aton(); + +int main() { -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 -f = inet_aton; +inet_aton(); #endif - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:3061: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:3064: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:3067: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:3070: \$? = $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:3080: 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 +; return 0; } +EOF +if { (eval echo configure:1735: \"$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 : else + echo "$ac_t""no" 1>&6 - echo "$as_me:3086: 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 + echo $ac_n "checking for inet_aton in -lresolv""... $ac_c" 1>&6 +echo "configure:1754: checking for inet_aton in -lresolv" >&5 +ac_lib_var=`echo resolv'_'inet_aton | sed 'y%./+-%__p_%'` +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 else - ac_check_lib_save_LIBS=$LIBS + ac_save_LIBS="$LIBS" LIBS="-lresolv $LIBS" -cat >conftest.$ac_ext <<_ACEOF -#line 3094 "configure" +cat > conftest.$ac_ext <&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:3116: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:3119: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:3122: \$? = $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:3133: 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 + builtin and then its argument prototype would still apply. */ +char inet_aton(); + +int main() { +inet_aton() +; return 0; } +EOF +if { (eval echo configure:1773: \"$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 LIB="${LIB} -lresolv" +else + echo "$ac_t""no" 1>&6 fi + fi for ac_func in vasprintf do -ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh` -echo "$as_me:3144: checking for $ac_func" >&5 -echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 -if eval "test \"\${$ac_ac_var+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -#line 3150 "configure" +echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 +echo "configure:1799: checking for $ac_func" >&5 +if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + cat > conftest.$ac_ext < /* Override any gcc2 internal prototype to avoid an error. */ -#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 (); -char (*f) (); + builtin and then its argument prototype would still apply. */ +char $ac_func(); + +int main() { -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 -f = $ac_func; +$ac_func(); #endif - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:3181: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:3184: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:3187: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:3190: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - eval "$ac_ac_var=yes" -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -eval "$ac_ac_var=no" -fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -fi -echo "$as_me:3200: result: `eval echo '${'$ac_ac_var'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6 -if test `eval echo '${'$ac_ac_var'}'` = yes; then - cat >>confdefs.h <&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 fi done for ac_func in swab do -ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh` -echo "$as_me:3213: checking for $ac_func" >&5 -echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 -if eval "test \"\${$ac_ac_var+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -#line 3219 "configure" +echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 +echo "configure:1854: checking for $ac_func" >&5 +if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + cat > conftest.$ac_ext < /* Override any gcc2 internal prototype to avoid an error. */ -#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 (); -char (*f) (); + builtin and then its argument prototype would still apply. */ +char $ac_func(); + +int main() { -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 -f = $ac_func; +$ac_func(); #endif - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:3250: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:3253: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:3256: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:3259: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - eval "$ac_ac_var=yes" -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -eval "$ac_ac_var=no" -fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -fi -echo "$as_me:3269: result: `eval echo '${'$ac_ac_var'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6 -if test `eval echo '${'$ac_ac_var'}'` = yes; then - cat >>confdefs.h <&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 fi done -echo "$as_me:3279: 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 + +echo $ac_n "checking for getopt_long""... $ac_c" 1>&6 +echo "configure:1908: checking for getopt_long" >&5 +if eval "test \"`echo '$''{'ac_cv_func_getopt_long'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 else - cat >conftest.$ac_ext <<_ACEOF -#line 3285 "configure" + cat > conftest.$ac_ext < /* 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 (); -char (*f) (); + builtin and then its argument prototype would still apply. */ +char getopt_long(); + +int main() { -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 -f = getopt_long; +getopt_long(); #endif - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:3316: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:3319: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:3322: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:3325: \$? = $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:3335: 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 <<\EOF +; return 0; } +EOF +if { (eval echo configure:1936: \"$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 #define HAVE_GETOPT_LONG 1 EOF else - # FreeBSD has a gnugetopt library for this: - echo "$as_me:3345: 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 + 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:1958: 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 else - ac_check_lib_save_LIBS=$LIBS + ac_save_LIBS="$LIBS" LIBS="-lgnugetopt $LIBS" -cat >conftest.$ac_ext <<_ACEOF -#line 3353 "configure" +cat > conftest.$ac_ext <&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:3375: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:3378: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:3381: \$? = $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:3392: 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 <<\EOF + builtin and then its argument prototype would still apply. */ +char getopt_long(); + +int main() { +getopt_long() +; return 0; } +EOF +if { (eval echo configure:1977: \"$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 #define HAVE_GETOPT_LONG 1 EOF LIB="${LIB} -lgnugetopt" else - GETOPT=1 + echo "$ac_t""no" 1>&6 +GETOPT=1 fi fi -for ac_header in stdlib.h unistd.h + + +for ac_hdr in unistd.h do -ac_ac_Header=`echo "ac_cv_header_$ac_header" | $ac_tr_sh` -echo "$as_me:3409: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$ac_ac_Header+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -#line 3415 "configure" +ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` +echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 +echo "configure:2009: 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 < -_ACEOF -if { (eval echo "$as_me:3419: \"$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:3425: \$? = $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 - eval "$ac_ac_Header=yes" -else - echo "$as_me: failed program was:" >&5 +#include <$ac_hdr> +EOF +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +{ (eval echo configure:2019: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` +if test -z "$ac_err"; then + rm -rf conftest* + eval "ac_cv_header_$ac_safe=yes" +else + echo "$ac_err" >&5 + echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 - eval "$ac_ac_Header=no" + rm -rf conftest* + eval "ac_cv_header_$ac_safe=no" fi -rm -f conftest.err conftest.$ac_ext +rm -f conftest* fi -echo "$as_me:3444: result: `eval echo '${'$ac_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$ac_ac_Header'}'`" >&6 -if test `eval echo '${'$ac_ac_Header'}'` = yes; then - cat >>confdefs.h <&6 + ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` + cat >> confdefs.h <&6 fi done for ac_func in getpagesize do -ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh` -echo "$as_me:3457: checking for $ac_func" >&5 -echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 -if eval "test \"\${$ac_ac_var+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -#line 3463 "configure" +echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 +echo "configure:2048: checking for $ac_func" >&5 +if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + cat > conftest.$ac_ext < /* Override any gcc2 internal prototype to avoid an error. */ -#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 (); -char (*f) (); + builtin and then its argument prototype would still apply. */ +char $ac_func(); + +int main() { -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 -f = $ac_func; +$ac_func(); #endif - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:3494: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:3497: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:3500: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:3503: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - eval "$ac_ac_var=yes" -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -eval "$ac_ac_var=no" -fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -fi -echo "$as_me:3513: result: `eval echo '${'$ac_ac_var'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6 -if test `eval echo '${'$ac_ac_var'}'` = yes; then - cat >>confdefs.h <&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 fi done -echo "$as_me:3523: 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 +echo $ac_n "checking for working mmap""... $ac_c" 1>&6 +echo "configure:2101: checking for working mmap" >&5 +if eval "test \"`echo '$''{'ac_cv_func_mmap_fixed_mapped'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 else if test "$cross_compiling" = yes; then ac_cv_func_mmap_fixed_mapped=no else - cat >conftest.$ac_ext <<_ACEOF -#line 3532 "configure" + cat > conftest.$ac_ext < #include -#if STDC_HEADERS || HAVE_STDLIB_H -# include -#else -char *malloc (); -#endif -#if HAVE_UNISTD_H -# include -#endif -#include - /* This mess was copied from the GNU getpagesize.h. */ -#if !HAVE_GETPAGESIZE +#ifndef HAVE_GETPAGESIZE +# ifdef HAVE_UNISTD_H +# include +# endif + /* Assume that all systems that can run configure have sys/param.h. */ -# if !HAVE_SYS_PARAM_H +# ifndef HAVE_SYS_PARAM_H # define HAVE_SYS_PARAM_H 1 # endif # ifdef _SC_PAGESIZE # define getpagesize() sysconf(_SC_PAGESIZE) # else /* no _SC_PAGESIZE */ -# if HAVE_SYS_PARAM_H +# ifdef HAVE_SYS_PARAM_H # include # ifdef EXEC_PAGESIZE # define getpagesize() EXEC_PAGESIZE @@ -3603,107 +2174,111 @@ char *malloc (); #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 = (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); + 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); } -_ACEOF -rm -f conftest$ac_exeext -if { (eval echo "$as_me:3664: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:3667: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:3669: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:3672: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + +EOF +if { (eval echo configure:2249: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +then ac_cv_func_mmap_fixed_mapped=yes else - echo "$as_me: program exited with status $ac_status" >&5 -echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_cv_func_mmap_fixed_mapped=no + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -fr conftest* + ac_cv_func_mmap_fixed_mapped=no fi -rm -f core core.* *.core conftest$ac_exeext conftest.$ac_ext +rm -fr conftest* fi + fi -echo "$as_me:3684: 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 +echo "$ac_t""$ac_cv_func_mmap_fixed_mapped" 1>&6 +if test $ac_cv_func_mmap_fixed_mapped = yes; then + cat >> confdefs.h <<\EOF #define HAVE_MMAP 1 EOF fi -rm -f conftest.mmap -echo "$as_me:3695: 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 +echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6 +echo "configure:2272: checking return type of signal handlers" >&5 +if eval "test \"`echo '$''{'ac_cv_type_signal'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 else - cat >conftest.$ac_ext <<_ACEOF -#line 3701 "configure" + cat > conftest.$ac_ext < #include #ifdef signal -# undef signal +#undef signal #endif #ifdef __cplusplus extern "C" void (*signal (int, void (*)(int)))(int); @@ -3711,1056 +2286,802 @@ extern "C" void (*signal (int, void (*)(int)))(int); void (*signal ()) (); #endif -int -main () -{ +int main() { int i; - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:3723: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:3726: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:3729: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:3732: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then +; return 0; } +EOF +if { (eval echo configure:2294: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* ac_cv_type_signal=void else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_cv_type_signal=int + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + ac_cv_type_signal=int fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f conftest* fi -echo "$as_me:3742: result: $ac_cv_type_signal" >&5 -echo "${ECHO_T}$ac_cv_type_signal" >&6 -cat >>confdefs.h <&6 +cat >> confdefs.h <&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 + +echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6 +echo "configure:2313: 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 else - ac_check_lib_save_LIBS=$LIBS + ac_save_LIBS="$LIBS" LIBS="-ldl $LIBS" -cat >conftest.$ac_ext <<_ACEOF -#line 3757 "configure" +cat > conftest.$ac_ext <&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:3779: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:3782: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:3785: \$? = $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:3796: 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 + builtin and then its argument prototype would still apply. */ +char dlopen(); + +int main() { +dlopen() +; return 0; } +EOF +if { (eval echo configure:2332: \"$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 LIB="${LIB} -ldl" +else + echo "$ac_t""no" 1>&6 fi -echo "$as_me:3802: 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 +echo $ac_n "checking for pow in -lm""... $ac_c" 1>&6 +echo "configure:2353: 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 else - ac_check_lib_save_LIBS=$LIBS + ac_save_LIBS="$LIBS" LIBS="-lm $LIBS" -cat >conftest.$ac_ext <<_ACEOF -#line 3810 "configure" +cat > conftest.$ac_ext <&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:3832: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:3835: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:3838: \$? = $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:3849: 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 + builtin and then its argument prototype would still apply. */ +char pow(); + +int main() { +pow() +; 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* + 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 LIB_YUV="${LIB_YUV} -lm" +else + echo "$ac_t""no" 1>&6 fi + CPPFLAGS="${CPPFLAGS} -I/usr/local/include" CFLAGS="${CFLAGS} -I/usr/local/include" PTHREAD_LIBS=error -echo "$as_me:3859: 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 +echo $ac_n "checking for pthread_attr_init in -lpthread""... $ac_c" 1>&6 +echo "configure:2398: 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 else - ac_check_lib_save_LIBS=$LIBS + ac_save_LIBS="$LIBS" LIBS="-lpthread $LIBS" -cat >conftest.$ac_ext <<_ACEOF -#line 3867 "configure" +cat > conftest.$ac_ext <&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:3889: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:3892: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:3895: \$? = $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:3906: 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 + 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:2417: \"$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 PTHREAD_LIBS="-lpthread" +else + echo "$ac_t""no" 1>&6 fi if test "x$PTHREAD_LIBS" = xerror; then - echo "$as_me:3913: 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 + echo $ac_n "checking for pthread_attr_init in -lpthreads""... $ac_c" 1>&6 +echo "configure:2439: 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 else - ac_check_lib_save_LIBS=$LIBS + ac_save_LIBS="$LIBS" LIBS="-lpthreads $LIBS" -cat >conftest.$ac_ext <<_ACEOF -#line 3921 "configure" +cat > conftest.$ac_ext <&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:3943: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:3946: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:3949: \$? = $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:3960: 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 + 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:2458: \"$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 PTHREAD_LIBS="-lpthreads" +else + echo "$ac_t""no" 1>&6 fi fi if test "x$PTHREAD_LIBS" = xerror; then - echo "$as_me:3968: 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 + echo $ac_n "checking for pthread_attr_init in -lc_r""... $ac_c" 1>&6 +echo "configure:2481: 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 else - ac_check_lib_save_LIBS=$LIBS + ac_save_LIBS="$LIBS" LIBS="-lc_r $LIBS" -cat >conftest.$ac_ext <<_ACEOF -#line 3976 "configure" +cat > conftest.$ac_ext <&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:3998: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:4001: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:4004: \$? = $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:4015: 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 + 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:2500: \"$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 PTHREAD_LIBS="-lc_r" +else + echo "$ac_t""no" 1>&6 fi fi if test "x$PTHREAD_LIBS" = xerror; then PTHREAD_LIBS="" - echo "$as_me:4024: 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 + echo $ac_n "checking for pthread_attr_init""... $ac_c" 1>&6 +echo "configure:2524: checking for pthread_attr_init" >&5 +if eval "test \"`echo '$''{'ac_cv_func_pthread_attr_init'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 else - cat >conftest.$ac_ext <<_ACEOF -#line 4030 "configure" + cat > conftest.$ac_ext < /* 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 (); -char (*f) (); + builtin and then its argument prototype would still apply. */ +char pthread_attr_init(); + +int main() { -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 -f = pthread_attr_init; +pthread_attr_init(); #endif - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:4061: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:4064: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:4067: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:4070: \$? = $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:4080: result: $ac_cv_func_pthread_attr_init" >&5 -echo "${ECHO_T}$ac_cv_func_pthread_attr_init" >&6 +; return 0; } +EOF +if { (eval echo configure:2552: \"$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 fi LIB="${LIB} ${PTHREAD_LIBS}" -cat >conftest.$ac_ext <<_ACEOF -#line 4087 "configure" +cat > conftest.$ac_ext < - -_ACEOF +EOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | egrep "pthread_cond_t" >/dev/null 2>&1; then - -cat >>confdefs.h <<\EOF + rm -rf conftest* + + cat >> confdefs.h <<\EOF #define PTHREAD_COND_T_IN_PTHREAD_H 1 EOF + fi rm -f conftest* -cat >conftest.$ac_ext <<_ACEOF -#line 4103 "configure" +cat > conftest.$ac_ext < - -_ACEOF +EOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | egrep "strncasecmp" >/dev/null 2>&1; then - -cat >>confdefs.h <<\EOF + rm -rf conftest* + + cat >> confdefs.h <<\EOF #define STRNCASECMP_IN_STRINGS_H 1 EOF + fi rm -f conftest* -for ac_header in stddef.h getopt.h strings.h + +for ac_hdr in stddef.h getopt.h strings.h do -ac_ac_Header=`echo "ac_cv_header_$ac_header" | $ac_tr_sh` -echo "$as_me:4121: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$ac_ac_Header+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -#line 4127 "configure" +ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` +echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 +echo "configure:2613: 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 < -_ACEOF -if { (eval echo "$as_me:4131: \"$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:4137: \$? = $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 - eval "$ac_ac_Header=yes" -else - echo "$as_me: failed program was:" >&5 +#include <$ac_hdr> +EOF +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +{ (eval echo configure:2623: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` +if test -z "$ac_err"; then + rm -rf conftest* + eval "ac_cv_header_$ac_safe=yes" +else + echo "$ac_err" >&5 + echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 - eval "$ac_ac_Header=no" + rm -rf conftest* + eval "ac_cv_header_$ac_safe=no" fi -rm -f conftest.err conftest.$ac_ext +rm -f conftest* fi -echo "$as_me:4156: result: `eval echo '${'$ac_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$ac_ac_Header'}'`" >&6 -if test `eval echo '${'$ac_ac_Header'}'` = yes; then - cat >>confdefs.h <&6 + ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` + cat >> confdefs.h <&6 fi done -for ac_header in sys/sockio.h fcntl.h sys/time.h unistd.h +for ac_hdr in sys/sockio.h fcntl.h sys/time.h unistd.h do -ac_ac_Header=`echo "ac_cv_header_$ac_header" | $ac_tr_sh` -echo "$as_me:4169: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$ac_ac_Header+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -#line 4175 "configure" +ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` +echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 +echo "configure:2653: 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 < -_ACEOF -if { (eval echo "$as_me:4179: \"$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:4185: \$? = $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 - eval "$ac_ac_Header=yes" -else - echo "$as_me: failed program was:" >&5 +#include <$ac_hdr> +EOF +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +{ (eval echo configure:2663: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` +if test -z "$ac_err"; then + rm -rf conftest* + eval "ac_cv_header_$ac_safe=yes" +else + echo "$ac_err" >&5 + echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 - eval "$ac_ac_Header=no" + rm -rf conftest* + eval "ac_cv_header_$ac_safe=no" fi -rm -f conftest.err conftest.$ac_ext +rm -f conftest* fi -echo "$as_me:4204: result: `eval echo '${'$ac_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$ac_ac_Header'}'`" >&6 -if test `eval echo '${'$ac_ac_Header'}'` = yes; then - cat >>confdefs.h <&6 + ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` + cat >> confdefs.h <&6 fi done -for ac_header in sys/soundcard.h machine/soundcard.h +for ac_hdr in sys/soundcard.h machine/soundcard.h do -ac_ac_Header=`echo "ac_cv_header_$ac_header" | $ac_tr_sh` -echo "$as_me:4217: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$ac_ac_Header+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -#line 4223 "configure" +ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` +echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 +echo "configure:2693: 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 < -_ACEOF -if { (eval echo "$as_me:4227: \"$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:4233: \$? = $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 - eval "$ac_ac_Header=yes" -else - echo "$as_me: failed program was:" >&5 +#include <$ac_hdr> +EOF +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +{ (eval echo configure:2703: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` +if test -z "$ac_err"; then + rm -rf conftest* + eval "ac_cv_header_$ac_safe=yes" +else + echo "$ac_err" >&5 + echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 - eval "$ac_ac_Header=no" + rm -rf conftest* + eval "ac_cv_header_$ac_safe=no" fi -rm -f conftest.err conftest.$ac_ext +rm -f conftest* fi -echo "$as_me:4252: result: `eval echo '${'$ac_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$ac_ac_Header'}'`" >&6 -if test `eval echo '${'$ac_ac_Header'}'` = yes; then - cat >>confdefs.h <&6 + ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` + cat >> confdefs.h <&6 fi done -for ac_header in dlfcn.h image.h +for ac_hdr in dlfcn.h image.h do -ac_ac_Header=`echo "ac_cv_header_$ac_header" | $ac_tr_sh` -echo "$as_me:4265: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$ac_ac_Header+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -#line 4271 "configure" +ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` +echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 +echo "configure:2733: 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 < -_ACEOF -if { (eval echo "$as_me:4275: \"$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:4281: \$? = $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 - eval "$ac_ac_Header=yes" -else - echo "$as_me: failed program was:" >&5 +#include <$ac_hdr> +EOF +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +{ (eval echo configure:2743: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` +if test -z "$ac_err"; then + rm -rf conftest* + eval "ac_cv_header_$ac_safe=yes" +else + echo "$ac_err" >&5 + echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 - eval "$ac_ac_Header=no" + rm -rf conftest* + eval "ac_cv_header_$ac_safe=no" fi -rm -f conftest.err conftest.$ac_ext +rm -f conftest* fi -echo "$as_me:4300: result: `eval echo '${'$ac_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$ac_ac_Header'}'`" >&6 -if test `eval echo '${'$ac_ac_Header'}'` = yes; then - cat >>confdefs.h <&6 + ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` + cat >> confdefs.h <&6 fi done -for ac_header in arpa/inet.h net/if.h netinet/in.h sys/socket.h +for ac_hdr in arpa/inet.h net/if.h netinet/in.h sys/socket.h do -ac_ac_Header=`echo "ac_cv_header_$ac_header" | $ac_tr_sh` -echo "$as_me:4313: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$ac_ac_Header+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -#line 4319 "configure" +ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` +echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 +echo "configure:2773: 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 < -_ACEOF -if { (eval echo "$as_me:4323: \"$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:4329: \$? = $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 - eval "$ac_ac_Header=yes" -else - echo "$as_me: failed program was:" >&5 +#include <$ac_hdr> +EOF +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +{ (eval echo configure:2783: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` +if test -z "$ac_err"; then + rm -rf conftest* + eval "ac_cv_header_$ac_safe=yes" +else + echo "$ac_err" >&5 + echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 - eval "$ac_ac_Header=no" + rm -rf conftest* + eval "ac_cv_header_$ac_safe=no" fi -rm -f conftest.err conftest.$ac_ext +rm -f conftest* fi -echo "$as_me:4348: result: `eval echo '${'$ac_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$ac_ac_Header'}'`" >&6 -if test `eval echo '${'$ac_ac_Header'}'` = yes; then - cat >>confdefs.h <&6 + ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` + cat >> confdefs.h <&6 fi done -for ac_header in machine/param.h +for ac_hdr in machine/param.h do -ac_ac_Header=`echo "ac_cv_header_$ac_header" | $ac_tr_sh` -echo "$as_me:4361: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$ac_ac_Header+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -#line 4367 "configure" +ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` +echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 +echo "configure:2813: 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 < -_ACEOF -if { (eval echo "$as_me:4371: \"$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:4377: \$? = $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 - eval "$ac_ac_Header=yes" -else - echo "$as_me: failed program was:" >&5 +#include <$ac_hdr> +EOF +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +{ (eval echo configure:2823: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` +if test -z "$ac_err"; then + rm -rf conftest* + eval "ac_cv_header_$ac_safe=yes" +else + echo "$ac_err" >&5 + echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 - eval "$ac_ac_Header=no" + rm -rf conftest* + eval "ac_cv_header_$ac_safe=no" fi -rm -f conftest.err conftest.$ac_ext +rm -f conftest* fi -echo "$as_me:4396: result: `eval echo '${'$ac_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$ac_ac_Header'}'`" >&6 -if test `eval echo '${'$ac_ac_Header'}'` = yes; then - cat >>confdefs.h <&6 + ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` + cat >> confdefs.h <&6 fi done -for ac_header in cthreads.h pthread.h kernel/scheduler.h kernel/OS.h + +for ac_hdr in cthreads.h pthread.h kernel/scheduler.h kernel/OS.h do -ac_ac_Header=`echo "ac_cv_header_$ac_header" | $ac_tr_sh` -echo "$as_me:4409: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$ac_ac_Header+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -#line 4415 "configure" +ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` +echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 +echo "configure:2854: 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 < -_ACEOF -if { (eval echo "$as_me:4419: \"$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:4425: \$? = $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 - eval "$ac_ac_Header=yes" -else - echo "$as_me: failed program was:" >&5 +#include <$ac_hdr> +EOF +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +{ (eval echo configure:2864: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` +if test -z "$ac_err"; then + rm -rf conftest* + eval "ac_cv_header_$ac_safe=yes" +else + echo "$ac_err" >&5 + echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 - eval "$ac_ac_Header=no" + rm -rf conftest* + eval "ac_cv_header_$ac_safe=no" fi -rm -f conftest.err conftest.$ac_ext +rm -f conftest* fi -echo "$as_me:4444: result: `eval echo '${'$ac_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$ac_ac_Header'}'`" >&6 -if test `eval echo '${'$ac_ac_Header'}'` = yes; then - cat >>confdefs.h <&6 + ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` + cat >> confdefs.h <&6 fi done + CFLAGS="${CFLAGS} -Wall -Werror" -echo "$as_me:4455: checking for ntohl in sys/param.h" >&5 -echo $ECHO_N "checking for ntohl in sys/param.h... $ECHO_C" >&6 -cat >conftest.$ac_ext <<_ACEOF -#line 4458 "configure" +echo $ac_n "checking for ntohl in sys/param.h""... $ac_c" 1>&6 +echo "configure:2893: checking for ntohl in sys/param.h" >&5 +cat > conftest.$ac_ext < void foo() { int meuh; ntohl(meuh); } -int -main () -{ +int main() { - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:4471: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:4474: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:4477: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:4480: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - -cat >>confdefs.h <<\EOF +; return 0; } +EOF +if { (eval echo configure:2903: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + cat >> confdefs.h <<\EOF #define NTOHL_IN_SYS_PARAM_H 1 EOF - echo "$as_me:4487: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + echo "$ac_t""yes" 1>&6 else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -echo "$as_me:4492: result: no" >&5 -echo "${ECHO_T}no" >&6 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + echo "$ac_t""no" 1>&6 fi -rm -f conftest.$ac_objext conftest.$ac_ext - -CFLAGS="${CFLAGS} -rdynamic -Wall -Werror" -echo "$as_me:4498: checking if \$CC miserably fails with the -rdynamic flag" >&5 -echo $ECHO_N "checking if \$CC miserably fails with the -rdynamic flag... $ECHO_C" >&6 -cat >conftest.$ac_ext <<_ACEOF -#line 4501 "configure" -#include "confdefs.h" - -int -main () -{ - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:4513: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:4516: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:4519: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:4522: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - LCFLAGS="${LCFLAGS} -rdynamic" - echo "$as_me:4525: result: no" >&5 -echo "${ECHO_T}no" >&6 -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -echo "$as_me:4530: result: yes" >&5 -echo "${ECHO_T}yes" >&6 -fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f conftest* CFLAGS="${save_CFLAGS}" -echo "$as_me:4537: checking for boolean_t in sys/types.h" >&5 -echo $ECHO_N "checking for boolean_t in sys/types.h... $ECHO_C" >&6 -cat >conftest.$ac_ext <<_ACEOF -#line 4540 "configure" +echo $ac_n "checking for boolean_t in sys/types.h""... $ac_c" 1>&6 +echo "configure:2921: checking for boolean_t in sys/types.h" >&5 +cat > conftest.$ac_ext < void quux() { boolean_t foo; } -int -main () -{ +int main() { - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:4553: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:4556: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:4559: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:4562: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - -cat >>confdefs.h <<\EOF +; return 0; } +EOF +if { (eval echo configure:2931: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + cat >> confdefs.h <<\EOF #define BOOLEAN_T_IN_SYS_TYPES_H 1 EOF - echo "$as_me:4569: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + echo "$ac_t""yes" 1>&6 else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -echo "$as_me:4574: result: no" >&5 -echo "${ECHO_T}no" >&6 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + echo "$ac_t""no" 1>&6 fi -rm -f conftest.$ac_objext conftest.$ac_ext -echo "$as_me:4578: checking for boolean_t in pthread.h" >&5 -echo $ECHO_N "checking for boolean_t in pthread.h... $ECHO_C" >&6 -cat >conftest.$ac_ext <<_ACEOF -#line 4581 "configure" +rm -f conftest* +echo $ac_n "checking for boolean_t in pthread.h""... $ac_c" 1>&6 +echo "configure:2946: checking for boolean_t in pthread.h" >&5 +cat > conftest.$ac_ext < void quux() { boolean_t foo; } -int -main () -{ +int main() { - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:4594: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:4597: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:4600: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:4603: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - -cat >>confdefs.h <<\EOF +; return 0; } +EOF +if { (eval echo configure:2956: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + cat >> confdefs.h <<\EOF #define BOOLEAN_T_IN_PTHREAD_H 1 EOF - echo "$as_me:4610: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + echo "$ac_t""yes" 1>&6 else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -echo "$as_me:4615: result: no" >&5 -echo "${ECHO_T}no" >&6 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + echo "$ac_t""no" 1>&6 fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f conftest* -echo "$as_me:4620: 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 +echo $ac_n "checking for working const""... $ac_c" 1>&6 +echo "configure:2972: 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 <<_ACEOF -#line 4626 "configure" + cat > conftest.$ac_ext <j = 5; - } - { /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */ - const int foo = 10; - } -#endif - - ; - return 0; +int main() { + +/* 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; } -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:4684: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:4687: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:4690: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:4693: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then +{ /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */ + const int foo = 10; +} + +; return 0; } +EOF +if { (eval echo configure:3026: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* ac_cv_c_const=yes else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_cv_c_const=no + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + ac_cv_c_const=no fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f conftest* fi -echo "$as_me:4703: 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 +echo "$ac_t""$ac_cv_c_const" 1>&6 +if test $ac_cv_c_const = no; then + cat >> confdefs.h <<\EOF +#define const EOF fi -echo "$as_me:4713: 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 +echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 +echo "configure:3047: checking for ANSI C header files" >&5 +if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 else - cat >conftest.$ac_ext <<_ACEOF -#line 4719 "configure" + cat > conftest.$ac_ext < #include #include #include - -_ACEOF -if { (eval echo "$as_me:4727: \"$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:4733: \$? = $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 +EOF +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +{ (eval echo configure:3060: \"$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* ac_cv_header_stdc=yes else - echo "$as_me: failed program was:" >&5 + echo "$ac_err" >&5 + echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 + rm -rf conftest* ac_cv_header_stdc=no fi -rm -f conftest.err conftest.$ac_ext +rm -f conftest* if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. - cat >conftest.$ac_ext <<_ACEOF -#line 4755 "configure" +cat > conftest.$ac_ext < - -_ACEOF +EOF 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* @@ -4769,16 +3090,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 <<_ACEOF -#line 4773 "configure" +cat > conftest.$ac_ext < - -_ACEOF +EOF 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* @@ -4787,217 +3108,113 @@ 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 <<_ACEOF -#line 4794 "configure" + cat > conftest.$ac_ext < -#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 - +#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); -} -_ACEOF -rm -f conftest$ac_exeext -if { (eval echo "$as_me:4820: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:4823: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:4825: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:4828: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then +int main () { int i; for (i = 0; i < 256; i++) +if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2); +exit (0); } + +EOF +if { (eval echo configure:3127: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +then : else - echo "$as_me: program exited with status $ac_status" >&5 -echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_cv_header_stdc=no + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -fr conftest* + ac_cv_header_stdc=no fi -rm -f core core.* *.core conftest$ac_exeext conftest.$ac_ext +rm -fr conftest* fi + fi fi -echo "$as_me:4841: 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 +echo "$ac_t""$ac_cv_header_stdc" 1>&6 +if test $ac_cv_header_stdc = yes; then + cat >> confdefs.h <<\EOF #define STDC_HEADERS 1 EOF fi -for ac_header in stdlib.h string.h memory.h strings.h inttypes.h unistd.h -do -ac_ac_Header=`echo "ac_cv_header_$ac_header" | $ac_tr_sh` -echo "$as_me:4854: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$ac_ac_Header+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -#line 4860 "configure" -#include "confdefs.h" -#include <$ac_header> -_ACEOF -if { (eval echo "$as_me:4864: \"$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:4870: \$? = $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 - eval "$ac_ac_Header=yes" -else - echo "$as_me: failed program was:" >&5 - cat conftest.$ac_ext >&5 - eval "$ac_ac_Header=no" -fi -rm -f conftest.err conftest.$ac_ext -fi -echo "$as_me:4889: result: `eval echo '${'$ac_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$ac_ac_Header'}'`" >&6 -if test `eval echo '${'$ac_ac_Header'}'` = yes; then - cat >>confdefs.h <&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 +echo $ac_n "checking for size_t""... $ac_c" 1>&6 +echo "configure:3151: checking for size_t" >&5 +if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 else - cat >conftest.$ac_ext <<_ACEOF -#line 4905 "configure" + cat > conftest.$ac_ext <&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:4923: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:4926: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:4929: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then +#include +#if STDC_HEADERS +#include +#include +#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* ac_cv_type_size_t=yes else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_cv_type_size_t=no -fi -rm -f conftest.$ac_objext conftest.$ac_ext + rm -rf conftest* + ac_cv_type_size_t=no fi -echo "$as_me:4939: 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 +rm -f conftest* -cat >>confdefs.h <&6 +if test $ac_cv_type_size_t = no; then + cat >> confdefs.h <<\EOF #define size_t unsigned EOF fi -echo "$as_me:4951: 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 +echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6 +echo "configure:3184: checking whether time.h and sys/time.h may both be included" >&5 +if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 else - cat >conftest.$ac_ext <<_ACEOF -#line 4957 "configure" + cat > conftest.$ac_ext < #include #include - -int -main () -{ +int main() { struct tm *tp; - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:4972: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:4975: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:4978: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:4981: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then +; return 0; } +EOF +if { (eval echo configure:3198: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* ac_cv_header_time=yes else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_cv_header_time=no + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + ac_cv_header_time=no fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f conftest* fi -echo "$as_me:4991: 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 +echo "$ac_t""$ac_cv_header_time" 1>&6 +if test $ac_cv_header_time = yes; then + cat >> confdefs.h <<\EOF #define TIME_WITH_SYS_TIME 1 EOF fi + ARCH=${host_cpu} BUILTINS="${BUILTINS} es ps ts yuv idct idctclassic motion imdct downmix" @@ -5013,279 +3230,239 @@ case x$host_os in ;; esac -echo "$as_me:5016: checking if \$CC groks MMX inline assembly" >&5 -echo $ECHO_N "checking if \$CC groks MMX inline assembly... $ECHO_C" >&6 -cat >conftest.$ac_ext <<_ACEOF -#line 5019 "configure" +echo $ac_n "checking if \$CC groks MMX inline assembly""... $ac_c" 1>&6 +echo "configure:3235: checking if \$CC groks MMX inline assembly" >&5 +cat > conftest.$ac_ext <&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:5034: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:5037: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:5040: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then +; return 0; } +EOF +if { (eval echo configure:3244: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* ACCEL_PLUGINS="${ACCEL_PLUGINS} ${MMX_PLUGINS}" - echo "$as_me:5043: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + echo "$ac_t""yes" 1>&6 else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -echo "$as_me:5048: result: no" >&5 -echo "${ECHO_T}no" >&6 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + echo "$ac_t""no" 1>&6 fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f conftest* -echo "$as_me:5053: checking if \$CC groks MMX EXT or SSE inline assembly" >&5 -echo $ECHO_N "checking if \$CC groks MMX EXT or SSE inline assembly... $ECHO_C" >&6 -cat >conftest.$ac_ext <<_ACEOF -#line 5056 "configure" +echo $ac_n "checking if \$CC groks MMX EXT or SSE inline assembly""... $ac_c" 1>&6 +echo "configure:3257: checking if \$CC groks MMX EXT or SSE inline assembly" >&5 +cat > conftest.$ac_ext <&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:5071: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:5074: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:5077: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then +; return 0; } +EOF +if { (eval echo configure:3266: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* ACCEL_PLUGINS="${ACCEL_PLUGINS} ${MMXEXT_PLUGINS}" - echo "$as_me:5080: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + echo "$ac_t""yes" 1>&6 else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -echo "$as_me:5085: result: no" >&5 -echo "${ECHO_T}no" >&6 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + echo "$ac_t""no" 1>&6 fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f conftest* -for ac_header in sys/ioctl.h +for ac_hdr in sys/ioctl.h do -ac_ac_Header=`echo "ac_cv_header_$ac_header" | $ac_tr_sh` -echo "$as_me:5093: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$ac_ac_Header+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -#line 5099 "configure" +ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` +echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 +echo "configure:3282: 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 < -_ACEOF -if { (eval echo "$as_me:5103: \"$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:5109: \$? = $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 - eval "$ac_ac_Header=yes" -else - echo "$as_me: failed program was:" >&5 +#include <$ac_hdr> +EOF +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +{ (eval echo configure:3292: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` +if test -z "$ac_err"; then + rm -rf conftest* + eval "ac_cv_header_$ac_safe=yes" +else + echo "$ac_err" >&5 + echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 - eval "$ac_ac_Header=no" + rm -rf conftest* + eval "ac_cv_header_$ac_safe=no" fi -rm -f conftest.err conftest.$ac_ext +rm -f conftest* fi -echo "$as_me:5128: result: `eval echo '${'$ac_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$ac_ac_Header'}'`" >&6 -if test `eval echo '${'$ac_ac_Header'}'` = yes; then - cat >>confdefs.h <&6 + ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` + cat >> confdefs.h <&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$ac_ac_Header+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -#line 5146 "configure" +ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` +echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 +echo "configure:3318: 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 < -_ACEOF -if { (eval echo "$as_me:5150: \"$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:5156: \$? = $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 - eval "$ac_ac_Header=yes" -else - echo "$as_me: failed program was:" >&5 +#include <$ac_hdr> +EOF +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +{ (eval echo configure:3328: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` +if test -z "$ac_err"; then + rm -rf conftest* + eval "ac_cv_header_$ac_safe=yes" +else + echo "$ac_err" >&5 + echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 - eval "$ac_ac_Header=no" + rm -rf conftest* + eval "ac_cv_header_$ac_safe=no" fi -rm -f conftest.err conftest.$ac_ext +rm -f conftest* fi -echo "$as_me:5175: result: `eval echo '${'$ac_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$ac_ac_Header'}'`" >&6 -if test `eval echo '${'$ac_ac_Header'}'` = yes; then - cat >>confdefs.h <&6 + ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` + cat >> confdefs.h <&6 fi done BSD_DVD_STRUCT=0 - cat >conftest.$ac_ext <<_ACEOF -#line 5187 "configure" + cat > conftest.$ac_ext < - -_ACEOF +EOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | egrep "dvd_struct" >/dev/null 2>&1; then - -cat >>confdefs.h <<\EOF + rm -rf conftest* + + cat >> confdefs.h <<\EOF #define DVD_STRUCT_IN_SYS_DVDIO_H 1 EOF BSD_DVD_STRUCT=1 - + fi rm -f conftest* - cat >conftest.$ac_ext <<_ACEOF -#line 5205 "configure" + cat > conftest.$ac_ext < - -_ACEOF +EOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | egrep "dvd_struct" >/dev/null 2>&1; then - -cat >>confdefs.h <<\EOF + rm -rf conftest* + + cat >> confdefs.h <<\EOF #define DVD_STRUCT_IN_SYS_CDIO_H 1 EOF BSD_DVD_STRUCT=1 - + fi rm -f conftest* if test x$BSD_DVD_STRUCT = x1; then - -cat >>confdefs.h <<\EOF + cat >> confdefs.h <<\EOF #define HAVE_BSD_DVD_STRUCT 1 EOF fi - cat >conftest.$ac_ext <<_ACEOF -#line 5230 "configure" + cat > conftest.$ac_ext < - -_ACEOF +EOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | egrep "dvd_struct" >/dev/null 2>&1; then - -cat >>confdefs.h <<\EOF + rm -rf conftest* + + cat >> confdefs.h <<\EOF #define DVD_STRUCT_IN_LINUX_CDROM_H 1 EOF + fi rm -f conftest* + +else + echo "$ac_t""no" 1>&6 fi done + # Check whether --enable-dummy or --disable-dummy was given. if test "${enable_dummy+set}" = set; then enableval="$enable_dummy" + : +fi -fi; if test x$enable_dummy != xno; then BUILTINS="${BUILTINS} dummy"; fi # Check whether --enable-null or --disable-null was given. if test "${enable_null+set}" = set; then enableval="$enable_null" + : +fi -fi; if test x$enable_null != xno; then BUILTINS="${BUILTINS} null"; fi # Check whether --enable-rc or --disable-rc was given. if test "${enable_rc+set}" = set; then enableval="$enable_rc" + : +fi -fi; if test x$enable_rc != xno; then BUILTINS="${BUILTINS} rc"; fi # Check whether --enable-ppro or --disable-ppro was given. if test "${enable_ppro+set}" = set; then enableval="$enable_ppro" - if test x$enableval = xyes; then ARCH="${ARCH} ppro"; fi + if test x$enableval = xyes; then ARCH="${ARCH} ppro"; fi else - if test x${host_cpu} = xi686; then ARCH="${ARCH} ppro"; fi -fi; + if test x${host_cpu} = xi686; then ARCH="${ARCH} ppro"; fi +fi + # Check whether --enable-mmx or --disable-mmx was given. if test "${enable_mmx+set}" = set; then enableval="$enable_mmx" if test x$enableval = xyes; then ARCH="${ARCH} mmx"; - BUILTINS="${BUILTINS} ${ACCEL_PLUGINS}"; fi + BUILTINS="${BUILTINS} ${ACCEL_PLUGINS}"; fi else if test x${host_cpu} = xi686 -o x${host_cpu} = xi586 -o x${host_cpu} = xx86 -o x${host_cpu} = xi386; then ARCH="${ARCH} mmx"; - BUILTINS="${BUILTINS} ${ACCEL_PLUGINS}"; fi -fi; + BUILTINS="${BUILTINS} ${ACCEL_PLUGINS}"; fi +fi + # Check whether --enable-altivec or --disable-altivec was given. if test "${enable_altivec+set}" = set; then @@ -5293,19 +3470,20 @@ if test "${enable_altivec+set}" = set; then if test x$enableval = xyes; then ARCH="${ARCH} altivec"; BUILTINS="${BUILTINS} idctaltivec" LIB_IDCTALTIVEC="-framework vecLib" - fi -fi; + fi +fi + #[ if test -d /System/Library/Frameworks/vecLib.framework; then ARCH="${ARCH} altivec"; PLUGINS="${PLUGINS} idctaltivec"; fi ]) # Check whether --enable-css or --disable-css was given. if test "${enable_css+set}" = set; then enableval="$enable_css" - if test x$enableval = xyes; then CSS=1; else CSS=0; fi + if test x$enableval = xyes; then CSS=1; else CSS=0; fi else - CSS=1; -fi; -if test x${CSS} = x1; then -cat >>confdefs.h <<\EOF + CSS=1; +fi + +if test x${CSS} = x1; then cat >> confdefs.h <<\EOF #define HAVE_CSS 1 EOF fi @@ -5313,28 +3491,32 @@ EOF # Check whether --enable-debug or --disable-debug was given. if test "${enable_debug+set}" = set; then enableval="$enable_debug" - if test x$enableval = xyes; then DEBUG=1; fi -fi; + if test x$enableval = xyes; then DEBUG=1; fi +fi + # Check whether --enable-stats or --disable-stats was given. if test "${enable_stats+set}" = set; then enableval="$enable_stats" - if test x$enableval = xyes; then STATS=1; fi -fi; + if test x$enableval = xyes; then STATS=1; fi +fi + # Check whether --enable-trace or --disable-trace was given. if test "${enable_trace+set}" = set; then enableval="$enable_trace" - if test x$enableval = xyes; then TRACE=1; fi -fi; + if test x$enableval = xyes; then TRACE=1; fi +fi + # Check whether --enable-optimizations or --disable-optimizations was given. if test "${enable_optimizations+set}" = set; then enableval="$enable_optimizations" - if test x$enableval = xno; then OPTIMS=0; fi + if test x$enableval = xno; then OPTIMS=0; fi else - OPTIMS=1 -fi; + OPTIMS=1 +fi + SYS=${host_os} @@ -5347,8 +3529,9 @@ else # 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; then if test -c /dev/dsp; then PLUGINS="${PLUGINS} dsp" @@ -5361,40 +3544,38 @@ if test "${enable_esd+set}" = set; then if test x$enable_esd = xyes; 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 "$as_me:5364: 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 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +echo "configure:3549: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_path_ESD_CONFIG'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 else - 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. + ;; *) - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - test -z "$ac_dir" && ac_dir=. - if $as_executable_p "$ac_dir/$ac_word"; then - ac_cv_path_ESD_CONFIG="$ac_dir/$ac_word" - echo "$as_me:5381: found $ac_dir/$ac_word" >&5 - break -fi -done - + 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" 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 "$as_me:5393: result: $ESD_CONFIG" >&5 -echo "${ECHO_T}$ESD_CONFIG" >&6 + echo "$ac_t""$ESD_CONFIG" 1>&6 else - echo "$as_me:5396: result: no" >&5 -echo "${ECHO_T}no" >&6 + echo "$ac_t""no" 1>&6 fi if test x${ESD_CONFIG} != xno; then @@ -5402,7 +3583,8 @@ fi LIB_ESD="`${ESD_CONFIG} --libs`" fi fi -fi; +fi + # Check whether --enable-darwin or --disable-darwin was given. if test "${enable_darwin+set}" = set; then @@ -5411,7 +3593,8 @@ if test "${enable_darwin+set}" = set; then PLUGINS="${PLUGINS} darwin" LIB_DARWIN="-framework CoreAudio" fi -fi; +fi + # Check whether --enable-macosx or --disable-macosx was given. if test "${enable_macosx+set}" = set; then @@ -5423,66 +3606,59 @@ if test "${enable_macosx+set}" = set; then LIB_SDL="${LIB_SDL} -framework AGL -framework Carbon" fi else - -for ac_header in Carbon/Carbon.h + for ac_hdr in Carbon/Carbon.h do -ac_ac_Header=`echo "ac_cv_header_$ac_header" | $ac_tr_sh` -echo "$as_me:5430: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$ac_ac_Header+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -#line 5436 "configure" +ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` +echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 +echo "configure:3614: 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 < -_ACEOF -if { (eval echo "$as_me:5440: \"$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:5446: \$? = $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 - eval "$ac_ac_Header=yes" -else - echo "$as_me: failed program was:" >&5 +#include <$ac_hdr> +EOF +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +{ (eval echo configure:3624: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` +if test -z "$ac_err"; then + rm -rf conftest* + eval "ac_cv_header_$ac_safe=yes" +else + echo "$ac_err" >&5 + echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 - eval "$ac_ac_Header=no" + rm -rf conftest* + eval "ac_cv_header_$ac_safe=no" fi -rm -f conftest.err conftest.$ac_ext +rm -f conftest* fi -echo "$as_me:5465: result: `eval echo '${'$ac_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$ac_ac_Header'}'`" >&6 -if test `eval echo '${'$ac_ac_Header'}'` = yes; then - cat >>confdefs.h <&6 + ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` + cat >> confdefs.h <&6 fi done -fi; +fi + # Check whether --enable-fb or --disable-fb was given. if test "${enable_fb+set}" = set; then enableval="$enable_fb" if test x$enable_fb = xyes; then PLUGINS="${PLUGINS} fb"; fi -fi; +fi + # Check whether --with-ggi or --without-ggi was given. if test "${with_ggi+set}" = set; then @@ -5496,8 +3672,9 @@ if test "${with_ggi+set}" = set; then else LIB_GGI="-lggi" fi - fi -fi; + fi +fi + # Check whether --with-sdl or --without-sdl was given. if test "${with_sdl+set}" = set; then @@ -5510,110 +3687,92 @@ if test "${with_sdl+set}" = set; then LIB_SDL="${LIB_SDL} -L/usr/X11R6/lib -L"$withval"/lib -lSDL" INCLUDE="${INCLUDE} -I"$withval"/include" else - -for ac_header in SDL/SDL.h + for ac_hdr in SDL/SDL.h do -ac_ac_Header=`echo "ac_cv_header_$ac_header" | $ac_tr_sh` -echo "$as_me:5517: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$ac_ac_Header+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -#line 5523 "configure" +ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` +echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 +echo "configure:3695: 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 < -_ACEOF -if { (eval echo "$as_me:5527: \"$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:5533: \$? = $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 - eval "$ac_ac_Header=yes" -else - echo "$as_me: failed program was:" >&5 +#include <$ac_hdr> +EOF +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +{ (eval echo configure:3705: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` +if test -z "$ac_err"; then + rm -rf conftest* + eval "ac_cv_header_$ac_safe=yes" +else + echo "$ac_err" >&5 + echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 - eval "$ac_ac_Header=no" + rm -rf conftest* + eval "ac_cv_header_$ac_safe=no" fi -rm -f conftest.err conftest.$ac_ext +rm -f conftest* fi -echo "$as_me:5552: result: `eval echo '${'$ac_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$ac_ac_Header'}'`" >&6 -if test `eval echo '${'$ac_ac_Header'}'` = yes; then - cat >>confdefs.h <&6 + ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` + cat >> confdefs.h <&6 +echo "Cannot find SDL headers !"; exit fi done LIB_SDL="${LIB_SDL} -L/usr/X11R6/lib -lSDL" fi - fi -fi; + fi +fi + if test "x$withval" = "x"; then - -for ac_header in SDL/SDL.h + for ac_hdr in SDL/SDL.h do -ac_ac_Header=`echo "ac_cv_header_$ac_header" | $ac_tr_sh` -echo "$as_me:5574: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$ac_ac_Header+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -#line 5580 "configure" +ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` +echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 +echo "configure:3743: 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 < -_ACEOF -if { (eval echo "$as_me:5584: \"$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:5590: \$? = $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 - eval "$ac_ac_Header=yes" -else - echo "$as_me: failed program was:" >&5 +#include <$ac_hdr> +EOF +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +{ (eval echo configure:3753: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` +if test -z "$ac_err"; then + rm -rf conftest* + eval "ac_cv_header_$ac_safe=yes" +else + echo "$ac_err" >&5 + echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 - eval "$ac_ac_Header=no" + rm -rf conftest* + eval "ac_cv_header_$ac_safe=no" fi -rm -f conftest.err conftest.$ac_ext +rm -f conftest* fi -echo "$as_me:5609: result: `eval echo '${'$ac_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$ac_ac_Header'}'`" >&6 -if test `eval echo '${'$ac_ac_Header'}'` = yes; then - cat >>confdefs.h <&6 + ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` + cat >> confdefs.h <&6 fi done @@ -5627,12 +3786,13 @@ if test "${with_glide+set}" = set; then PLUGINS="${PLUGINS} glide"; if test "x$withval" != "xyes"; then - LIB_GLIDE="-l"$withval + LIB_GLIDE="-l"$withval" -lm" else - LIB_GLIDE="-lglide2x" + LIB_GLIDE="-lglide2x -lm" fi - fi -fi; + fi +fi + # Check whether --enable-ncurses or --disable-ncurses was given. if test "${enable_ncurses+set}" = set; then @@ -5641,7 +3801,8 @@ if test "${enable_ncurses+set}" = set; then PLUGINS="${PLUGINS} ncurses" LIB_NCURSES="-lncurses" fi -fi; +fi + # Check whether --enable-qt or --disable-qt was given. if test "${enable_qt+set}" = set; then @@ -5657,13 +3818,15 @@ 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 enableval="$enable_kde" if test x$enable_kde = xyes; then PLUGINS="${PLUGINS} kde"; ALIASES="${ALIASES} kvlc"; fi -fi; +fi + # Check whether --enable-gnome or --disable-gnome was given. if test "${enable_gnome+set}" = set; then @@ -5673,50 +3836,50 @@ if test "${enable_gnome+set}" = set; then ALIASES="${ALIASES} gnome-vlc" LIB_GNOME="`gnome-config --libs gnomeui | sed 's,-rdynamic,,'`" fi -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 # 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:5686: 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 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +echo "configure:3853: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_path_GTK_CONFIG'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 else - case $GTK_CONFIG in - [\\/]* | ?:[\\/]*) + 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. + ;; *) - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - test -z "$ac_dir" && ac_dir=. - if $as_executable_p "$ac_dir/$ac_word"; then - ac_cv_path_GTK_CONFIG="$ac_dir/$ac_word" - echo "$as_me:5703: found $ac_dir/$ac_word" >&5 - break -fi -done - + 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_GTK_CONFIG="$ac_dir/$ac_word" + break + fi + done + IFS="$ac_save_ifs" test -z "$ac_cv_path_GTK_CONFIG" && ac_cv_path_GTK_CONFIG="no" ;; esac fi -GTK_CONFIG=$ac_cv_path_GTK_CONFIG - +GTK_CONFIG="$ac_cv_path_GTK_CONFIG" if test -n "$GTK_CONFIG"; then - echo "$as_me:5715: result: $GTK_CONFIG" >&5 -echo "${ECHO_T}$GTK_CONFIG" >&6 + echo "$ac_t""$GTK_CONFIG" 1>&6 else - echo "$as_me:5718: result: no" >&5 -echo "${ECHO_T}no" >&6 + echo "$ac_t""no" 1>&6 fi if test x${GTK_CONFIG} != xno; then @@ -5730,8 +3893,9 @@ 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; then if test x$x_includes = xNONE; then x_includes=/usr/X11R6/include @@ -5741,57 +3905,48 @@ if test x$enable_x11 != xno; then fi saved_CPPFLAGS=$CPPFLAGS CPPFLAGS="$CPPFLAGS -I$x_includes" - -for ac_header in X11/Xlib.h + for ac_hdr in X11/Xlib.h do -ac_ac_Header=`echo "ac_cv_header_$ac_header" | $ac_tr_sh` -echo "$as_me:5748: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$ac_ac_Header+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -#line 5754 "configure" +ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` +echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 +echo "configure:3913: 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 < -_ACEOF -if { (eval echo "$as_me:5758: \"$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:5764: \$? = $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 - eval "$ac_ac_Header=yes" -else - echo "$as_me: failed program was:" >&5 +#include <$ac_hdr> +EOF +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +{ (eval echo configure:3923: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` +if test -z "$ac_err"; then + rm -rf conftest* + eval "ac_cv_header_$ac_safe=yes" +else + echo "$ac_err" >&5 + echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 - eval "$ac_ac_Header=no" + rm -rf conftest* + eval "ac_cv_header_$ac_safe=no" fi -rm -f conftest.err conftest.$ac_ext +rm -f conftest* fi -echo "$as_me:5783: result: `eval echo '${'$ac_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$ac_ac_Header'}'`" >&6 -if test `eval echo '${'$ac_ac_Header'}'` = yes; then - cat >>confdefs.h <&6 + ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` + cat >> confdefs.h <&6 fi done @@ -5800,8 +3955,9 @@ 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; then if test x$x_includes = xNONE; then x_includes=/usr/X11R6/include @@ -5811,57 +3967,48 @@ if test x$enable_xvideo != xno; then fi saved_CPPFLAGS=$CPPFLAGS CPPFLAGS="$CPPFLAGS -I$x_includes" - -for ac_header in X11/extensions/Xv.h + for ac_hdr in X11/extensions/Xv.h do -ac_ac_Header=`echo "ac_cv_header_$ac_header" | $ac_tr_sh` -echo "$as_me:5818: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$ac_ac_Header+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -#line 5824 "configure" +ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` +echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 +echo "configure:3975: 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 < -_ACEOF -if { (eval echo "$as_me:5828: \"$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:5834: \$? = $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 - eval "$ac_ac_Header=yes" -else - echo "$as_me: failed program was:" >&5 +#include <$ac_hdr> +EOF +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +{ (eval echo configure:3985: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` +if test -z "$ac_err"; then + rm -rf conftest* + eval "ac_cv_header_$ac_safe=yes" +else + echo "$ac_err" >&5 + echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 - eval "$ac_ac_Header=no" + rm -rf conftest* + eval "ac_cv_header_$ac_safe=no" fi -rm -f conftest.err conftest.$ac_ext +rm -f conftest* fi -echo "$as_me:5853: result: `eval echo '${'$ac_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$ac_ac_Header'}'`" >&6 -if test `eval echo '${'$ac_ac_Header'}'` = yes; then - cat >>confdefs.h <&6 + ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` + cat >> confdefs.h <&6 fi done @@ -5870,954 +4017,527 @@ 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 echo "$as_me:5873: checking for sys/asoundlib.h" >&5 -echo $ECHO_N "checking for sys/asoundlib.h... $ECHO_C" >&6 -if test "${ac_cv_header_sys_asoundlib_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -#line 5879 "configure" + if test x$enable_alsa = xyes; then ac_safe=`echo "sys/asoundlib.h" | sed 'y%./+-%__p_%'` +echo $ac_n "checking for sys/asoundlib.h""... $ac_c" 1>&6 +echo "configure:4023: checking for sys/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 < -_ACEOF -if { (eval echo "$as_me:5883: \"$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:5889: \$? = $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_sys_asoundlib_h=yes -else - echo "$as_me: failed program was:" >&5 +EOF +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +{ (eval echo configure:4033: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` +if test -z "$ac_err"; then + rm -rf conftest* + eval "ac_cv_header_$ac_safe=yes" +else + echo "$ac_err" >&5 + echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 - ac_cv_header_sys_asoundlib_h=no + rm -rf conftest* + eval "ac_cv_header_$ac_safe=no" fi -rm -f conftest.err conftest.$ac_ext +rm -f conftest* fi -echo "$as_me:5908: result: $ac_cv_header_sys_asoundlib_h" >&5 -echo "${ECHO_T}$ac_cv_header_sys_asoundlib_h" >&6 -if test $ac_cv_header_sys_asoundlib_h = yes; then - echo "$as_me:5911: 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 +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:4050: checking for main in -lasound" >&5 +ac_lib_var=`echo asound'_'main | sed 'y%./+-%__p_%'` +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 else - ac_check_lib_save_LIBS=$LIBS + ac_save_LIBS="$LIBS" LIBS="-lasound $LIBS" -cat >conftest.$ac_ext <<_ACEOF -#line 5919 "configure" +cat > conftest.$ac_ext <&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:5934: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:5937: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:5940: \$? = $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:5951: 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 +int main() { +main() +; return 0; } +EOF +if { (eval echo configure:4065: \"$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 have_alsa="true" else - have_alsa="false" + echo "$ac_t""no" 1>&6 +have_alsa="false" fi else - have_alsa="false" + echo "$ac_t""no" 1>&6 +have_alsa="false" fi if test x$have_alsa = xtrue; then PLUGINS="${PLUGINS} alsa" LIB_ALSA="-lasound" fi; fi -fi; +fi + fi -ac_config_files="$ac_config_files Makefile.opts include/config.h" -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, 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. -# -# config.status only pays attention to the cache file if you give it -# the --recheck option to rerun configure. -# -# `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 \ - "s/'/'\\\\''/g; - s/^\\([_$ac_cr_alnum]*_cv_[_$ac_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p" - ;; - *) - # `set' quotes correctly as required by POSIX, so do not add quotes. - sed -n \ - "s/^\\([_$ac_cr_alnum]*_cv_[_$ac_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 - 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 -test "x$prefix" = xNONE && prefix=$ac_default_prefix -# Let make expand exec_prefix. -test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' -# 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[ ]*=/{ -s/:*\$(srcdir):*/:/; -s/:*\${srcdir}:*/:/; -s/:*@srcdir@:*/:/; -s/^\([^=]*=[ ]*\):*/\1/; -s/:*$//; -s/^[^=]*=[ ]*$//; -}' -fi -DEFS=-DHAVE_CONFIG_H -: ${CONFIG_STATUS=./config.status} -ac_clean_files_save=$ac_clean_files -ac_clean_files="$ac_clean_files $CONFIG_STATUS" -{ echo "$as_me:6050: creating $CONFIG_STATUS" >&5 -echo "$as_me: creating $CONFIG_STATUS" >&6;} -cat >$CONFIG_STATUS <<_ACEOF -#! $SHELL -# Generated automatically by configure. -# Run this file to recreate the current configuration. -# Compiler output produced by configure, useful for debugging -# configure, is in config.log if it exists. -debug=false -SHELL=\${CONFIG_SHELL-$SHELL} -ac_cs_invocation="\$0 \$@" -_ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF -# 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 -# Name of the executable. -as_me=`echo "$0" |sed 's,.*[\\/],,'` -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" -# Support unset when possible. -if (FOO=FOO; unset FOO) >/dev/null 2>&1; then - as_unset=unset -else - as_unset=false -fi -# NLS nuisances. -$as_unset LANG || test "${LANG+set}" != set || { LANG=C; export LANG; } -$as_unset LC_ALL || test "${LC_ALL+set}" != set || { LC_ALL=C; export LC_ALL; } -$as_unset LC_TIME || test "${LC_TIME+set}" != set || { LC_TIME=C; export LC_TIME; } -$as_unset LC_CTYPE || test "${LC_CTYPE+set}" != set || { LC_CTYPE=C; export LC_CTYPE; } -$as_unset LANGUAGE || test "${LANGUAGE+set}" != set || { LANGUAGE=C; export LANGUAGE; } -$as_unset LC_COLLATE || test "${LC_COLLATE+set}" != set || { LC_COLLATE=C; export LC_COLLATE; } -$as_unset LC_NUMERIC || test "${LC_NUMERIC+set}" != set || { LC_NUMERIC=C; export LC_NUMERIC; } -$as_unset LC_MESSAGES || test "${LC_MESSAGES+set}" != set || { LC_MESSAGES=C; export LC_MESSAGES; } -# 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=:; export CDPATH; } -exec 6>&1 -_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 <<\EOF -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 -Report bugs to ." -EOF -cat >>$CONFIG_STATUS <>$CONFIG_STATUS <<\EOF -# 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 - case $1 in - # Handling of the options. -EOF -cat >>$CONFIG_STATUS <>$CONFIG_STATUS <<\EOF - --version | --vers* | -V ) - echo "$ac_cs_version"; exit 0 ;; - --he | --h) - # Conflict between --help and --header - { { echo "$as_me:6223: 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;; - - # Handling of arguments. - 'Makefile.opts' ) CONFIG_FILES="$CONFIG_FILES Makefile.opts" ;; - 'include/config.h' ) CONFIG_FILES="$CONFIG_FILES include/config.h" ;; - 'include/defs.h' ) CONFIG_HEADERS="$CONFIG_HEADERS include/defs.h" ;; - - # This is an error. - -*) { { echo "$as_me:6247: 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; }; } ;; - *) { { echo "$as_me:6252: error: invalid argument: $1" >&5 -echo "$as_me: error: invalid argument: $1" >&2;} - { (exit 1); exit 1; }; };; - esac - shift -done -exec 5>>config.log -cat >&5 << _ACEOF -## ----------------------- ## -## Running config.status. ## -## ----------------------- ## -This file was extended by $as_me 2.50, executed with - > $ac_cs_invocation -on `(hostname || uname -n) 2>/dev/null | sed 1q` -_ACEOF -EOF -cat >>$CONFIG_STATUS <<\EOF -# 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 + +trap '' 1 2 15 +cat > confcache <<\EOF +# 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. +# +# 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. +# +EOF +# 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 + if test -w $cache_file; then + echo "updating cache $cache_file" + cat confcache > $cache_file + else + echo "not updating unwritable cache $cache_file" + fi fi +rm -f confcache -# Create a temporary directory, and hook for its removal unless debugging. -$debug || -{ - trap 'exit_status=$?; rm -rf $tmp && exit $exit_status' 0 - trap '{ (exit $?); exit $?; }' 1 2 13 15 -} +trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 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; } -} +test "x$prefix" = xNONE && prefix=$ac_default_prefix +# Let make expand exec_prefix. +test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' -EOF +# 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. +if test "x$srcdir" = x.; then + ac_vpsub='/^[ ]*VPATH[ ]*=[^:]*$/d' +fi + +trap 'rm -f $CONFIG_STATUS conftest*; exit 1' 1 2 15 + +DEFS=-DHAVE_CONFIG_H -cat >>$CONFIG_STATUS < $CONFIG_STATUS </dev/null | sed 1q`: # -# CONFIG_FILES section. +# $0 $ac_configure_args # +# Compiler output produced by configure, useful for debugging +# configure, is in ./config.log if it exists. -# 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,@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,@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,@ECHO_C@,$ECHO_C,;t t -s,@ECHO_N@,$ECHO_N,;t t -s,@ECHO_T@,$ECHO_T,;t t -s,@PATH_SEPARATOR@,$PATH_SEPARATOR,;t t -s,@DEFS@,$DEFS,;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,@VLC_VERSION@,$VLC_VERSION,;t t -s,@VLC_CODENAME@,$VLC_CODENAME,;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,@INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t -s,@INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t -s,@INSTALL_DATA@,$INSTALL_DATA,;t t -s,@GETOPT@,$GETOPT,;t t -s,@ESD_CONFIG@,$ESD_CONFIG,;t t -s,@GTK_CONFIG@,$GTK_CONFIG,;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,@DEFINE@,$DEFINE,;t t -s,@INCLUDE@,$INCLUDE,;t t -s,@DEBUG@,$DEBUG,;t t -s,@STATS@,$STATS,;t t -s,@TRACE@,$TRACE,;t t -s,@OPTIMS@,$OPTIMS,;t t -s,@CSS@,$CSS,;t t -s,@MOC@,$MOC,;t t -s,@LCFLAGS@,$LCFLAGS,;t t -s,@LIB@,$LIB,;t t -s,@LIB_ALSA@,$LIB_ALSA,;t t -s,@LIB_BEOS@,$LIB_BEOS,;t t -s,@LIB_DARWIN@,$LIB_DARWIN,;t t -s,@LIB_ESD@,$LIB_ESD,;t t -s,@LIB_GGI@,$LIB_GGI,;t t -s,@LIB_GLIDE@,$LIB_GLIDE,;t t -s,@LIB_GNOME@,$LIB_GNOME,;t t -s,@LIB_GTK@,$LIB_GTK,;t t -s,@LIB_IDCTALTIVEC@,$LIB_IDCTALTIVEC,;t t -s,@LIB_MACOSX@,$LIB_MACOSX,;t t -s,@LIB_NCURSES@,$LIB_NCURSES,;t t -s,@LIB_QT@,$LIB_QT,;t t -s,@LIB_TS@,$LIB_TS,;t t -s,@LIB_SDL@,$LIB_SDL,;t t -s,@LIB_X11@,$LIB_X11,;t t -s,@LIB_XVIDEO@,$LIB_XVIDEO,;t t -s,@LIB_YUV@,$LIB_YUV,;t t -s,@CFLAGS_VLC@,$CFLAGS_VLC,;t t -s,@CFLAGS_GTK@,$CFLAGS_GTK,;t t -s,@CFLAGS_X11@,$CFLAGS_X11,;t t -CEOF +ac_cs_usage="Usage: $CONFIG_STATUS [--recheck] [--version] [--help]" +for ac_option +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 ;; + esac +done + +ac_given_srcdir=$srcdir +ac_given_INSTALL="$INSTALL" +trap 'rm -fr `echo "Makefile.opts include/config.h include/defs.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15 EOF +cat >> $CONFIG_STATUS <>$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_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 +# Protect against being on the right side of a sed subst in config.status. +sed 's/%@/@@/; s/@%/@@/; s/%g\$/@g/; /@g\$/s/[\\\\&%]/\\\\&/g; + s/@@/%@/; s/@@/@%/; s/@g\$/%g/' > 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%@VLC_VERSION@%$VLC_VERSION%g +s%@VLC_CODENAME@%$VLC_CODENAME%g +s%@SET_MAKE@%$SET_MAKE%g +s%@CC@%$CC%g +s%@CPP@%$CPP%g +s%@RANLIB@%$RANLIB%g +s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g +s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g +s%@INSTALL_DATA@%$INSTALL_DATA%g +s%@GETOPT@%$GETOPT%g +s%@ESD_CONFIG@%$ESD_CONFIG%g +s%@GTK_CONFIG@%$GTK_CONFIG%g +s%@SYS@%$SYS%g +s%@ARCH@%$ARCH%g +s%@PLUGINS@%$PLUGINS%g +s%@BUILTINS@%$BUILTINS%g +s%@ALIASES@%$ALIASES%g +s%@DEFINE@%$DEFINE%g +s%@INCLUDE@%$INCLUDE%g +s%@DEBUG@%$DEBUG%g +s%@STATS@%$STATS%g +s%@TRACE@%$TRACE%g +s%@OPTIMS@%$OPTIMS%g +s%@CSS@%$CSS%g +s%@MOC@%$MOC%g +s%@LCFLAGS@%$LCFLAGS%g +s%@LIB@%$LIB%g +s%@LIB_ALSA@%$LIB_ALSA%g +s%@LIB_BEOS@%$LIB_BEOS%g +s%@LIB_DARWIN@%$LIB_DARWIN%g +s%@LIB_ESD@%$LIB_ESD%g +s%@LIB_GGI@%$LIB_GGI%g +s%@LIB_GLIDE@%$LIB_GLIDE%g +s%@LIB_GNOME@%$LIB_GNOME%g +s%@LIB_GTK@%$LIB_GTK%g +s%@LIB_IDCTALTIVEC@%$LIB_IDCTALTIVEC%g +s%@LIB_MACOSX@%$LIB_MACOSX%g +s%@LIB_NCURSES@%$LIB_NCURSES%g +s%@LIB_QT@%$LIB_QT%g +s%@LIB_TS@%$LIB_TS%g +s%@LIB_SDL@%$LIB_SDL%g +s%@LIB_X11@%$LIB_X11%g +s%@LIB_XVIDEO@%$LIB_XVIDEO%g +s%@LIB_YUV@%$LIB_YUV%g +s%@CFLAGS_VLC@%$CFLAGS_VLC%g +s%@CFLAGS_GTK@%$CFLAGS_GTK%g +s%@CFLAGS_X11@%$CFLAGS_X11%g + +CEOF +EOF + +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 + else + if test -z "$ac_sed_cmds"; then + ac_sed_cmds="sed -f conftest.s$ac_file" 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` + ac_sed_cmds="$ac_sed_cmds | sed -f conftest.s$ac_file" fi - done - if test -z "$ac_sed_cmds"; then - ac_sed_cmds=cat + ac_file=`expr $ac_file + 1` + ac_beg=$ac_end + ac_end=`expr $ac_end + $ac_max_sed_cmds` fi -fi # test -n "$CONFIG_FILES" +done +if test -z "$ac_sed_cmds"; then + ac_sed_cmds=cat +fi +EOF +cat >> $CONFIG_STATUS <>$CONFIG_STATUS <<\EOF -for ac_file in : $CONFIG_FILES; do test "x$ac_file" = x: && continue +cat >> $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 - - | *:- | *:-:* ) # 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 ;; + 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" ;; esac - # Compute @srcdir@, @top_srcdir@, and @INSTALL@ for subdirectories. - ac_dir=`$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'` - if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then - { 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" - ;; - esac -done; } + # Adjust a relative srcdir, top_srcdir, and INSTALL for subdirectories. - ac_dir_suffix="/`echo $ac_dir|sed 's,^\./,,'`" + # 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'` + ac_dots=`echo $ac_dir_suffix|sed 's%/[^/]*%../%g'` else ac_dir_suffix= ac_dots= fi - case $srcdir in - .) ac_srcdir=. - if test -z "$ac_dots"; then - ac_top_srcdir=. - else - ac_top_srcdir=`echo $ac_dots | sed 's,/$,,'` - fi ;; - [\\/]* | ?:[\\/]* ) - ac_srcdir=$srcdir$ac_dir_suffix; - ac_top_srcdir=$srcdir ;; + 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. - ac_srcdir=$ac_dots$srcdir$ac_dir_suffix - ac_top_srcdir=$ac_dots$srcdir ;; + srcdir="$ac_dots$ac_given_srcdir$ac_dir_suffix" + top_srcdir="$ac_dots$ac_given_srcdir" ;; esac - case $INSTALL in - [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;; - *) ac_INSTALL=$ac_dots$INSTALL ;; + case "$ac_given_INSTALL" in + [/$]*) INSTALL="$ac_given_INSTALL" ;; + *) INSTALL="$ac_dots$ac_given_INSTALL" ;; esac - if test x"$ac_file" != x-; then - { echo "$as_me:6522: 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 automatically by config.status. */ - configure_input="Generated automatically 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:6540: 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:6553: 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; } -EOF -cat >>$CONFIG_STATUS <>$CONFIG_STATUS <<\EOF -:t -/@[a-zA-Z_][a-zA-Z_0-9]*@/!b -s,@configure_input@,$configure_input,;t t -s,@srcdir@,$ac_srcdir,;t t -s,@top_srcdir@,$ac_top_srcdir,;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 -EOF -cat >>$CONFIG_STATUS <<\EOF + 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= ;; + esac -# -# CONFIG_HEADER section. -# + 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* # 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=' ' -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_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_uC=' ' -ac_uD=',;t' - -for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue +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 # 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 ;; + 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" ;; esac - test x"$ac_file" != x- && { echo "$as_me:6614: 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:6625: 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:6638: 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 + 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 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 <<\EOF -s/[\\&,]/\\&/g -s,[\\$`],\\&,g -t clear -: clear -s,^[ ]*#[ ]*define[ ][ ]*\(\([^ (][^ (]*\)([^)]*)\)[ ]*\(.*\)$,${ac_dA}\2${ac_dB}\1${ac_dC}\3${ac_dD},gp -t end -s,^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\)$,${ac_dA}\1${ac_dB}\1${ac_dC}\2${ac_dD},gp -: end +# 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 -# 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 +sed -n -f conftest.hdr confdefs.h > conftest.vals +rm -f conftest.hdr # 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.undefs <<\EOF -s,^[ ]*#[ ]*undef[ ][ ]*[a-zA-Z_][a-zA-Z_0-9]*,/* & */, +cat >> conftest.vals <<\EOF +s%^[ ]*#[ ]*undef[ ][ ]*[a-zA-Z_][a-zA-Z_0-9]*%/* & */% EOF -# 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.vals because some shells have a limit on +# the size of here documents, and old seds have small limits too. -# 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 grep . conftest.undefs >/dev/null +while : do - # 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 + 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 echo 'CEOF - 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 + 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.undefs - -cat >>$CONFIG_STATUS <<\EOF - # 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 automatically by config.status. */ - if test x"$ac_file" = x-; then - echo "/* Generated automatically by configure. */" >$tmp/config.h +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 else - echo "/* $ac_file. Generated automatically by configure. */" >$tmp/config.h - fi - cat $tmp/in >>$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:6755: $ac_file is unchanged" >&5 -echo "$as_me: $ac_file is unchanged" >&6;} - else - ac_dir=`$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'` + # 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 - { 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" - ;; - esac -done; } - - fi - rm -f $ac_file - mv $tmp/config.h $ac_file + # The file is in a subdirectory. + test ! -d "$ac_dir" && mkdir "$ac_dir" fi - else - cat $tmp/config.h - rm -f $tmp/config.h + rm -f $ac_file + mv conftest.h $ac_file fi -done +fi; done + EOF +cat >> $CONFIG_STATUS <>$CONFIG_STATUS <<\EOF +EOF +cat >> $CONFIG_STATUS <<\EOF -{ (exit 0); exit 0; } +exit 0 EOF chmod +x $CONFIG_STATUS -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 +rm -fr confdefs* $ac_clean_files +test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1 + echo " vlc configuration diff --git a/configure.in b/configure.in index 03954e97d5..5b3def3995 100644 --- a/configure.in +++ b/configure.in @@ -109,13 +109,6 @@ void foo() { int meuh; ntohl(meuh); }],, AC_DEFINE(NTOHL_IN_SYS_PARAM_H, 1, Define if defines ntohl.) AC_MSG_RESULT(yes), AC_MSG_RESULT(no)) -dnl Check for -rdynamic flag -CFLAGS="${CFLAGS} -rdynamic -Wall -Werror" -AC_MSG_CHECKING([if \$CC miserably fails with the -rdynamic flag]) -AC_TRY_COMPILE([],, - LCFLAGS="${LCFLAGS} -rdynamic" - AC_MSG_RESULT(no), AC_MSG_RESULT(yes)) - dnl End of the bizarre compilation tests CFLAGS="${save_CFLAGS}" @@ -412,9 +405,9 @@ AC_ARG_WITH(glide, PLUGINS="${PLUGINS} glide"; if test "x$withval" != "xyes"; then - LIB_GLIDE="-l"$withval + LIB_GLIDE="-l"$withval" -lm" else - LIB_GLIDE="-lglide2x" + LIB_GLIDE="-lglide2x -lm" fi fi ]) diff --git a/debian/control b/debian/control index 6145853ff4..9d77cfbc0f 100644 --- a/debian/control +++ b/debian/control @@ -2,27 +2,27 @@ Source: vlc Section: graphics Priority: optional Maintainer: Samuel Hocevar -Build-Depends: debhelper (>=2.2.0), xlib6g-dev, libgnome-dev, libggi2-dev, libglide-dev [i386], libesd0-dev, libsdl1.1-dev, libqt-dev +Build-Depends: debhelper (>=2.2.0), xlib6g-dev, libgnome-dev, libggi2-dev, libglide-dev [i386], libesd0-dev, libsdl1.2-dev, libqt-dev, libasound2-dev Standards-Version: 3.0.1 Package: vlc Architecture: any Depends: ${shlibs:Depends}, vlc-gui Suggests: vlc-sdl, vlc-esd, vlc-gnome -Description: the free MPEG and DVD player VideoLAN Client +Description: a free MPEG and DVD player VideoLAN is a free MPEG, MPEG2 and DVD software solution. . - This is the VideoLAN Client. It plays MPEG and MPEG2 files, unencrypted + This is vlc, the VideoLAN Client. It plays MPEG and MPEG2 files, unencrypted DVDs, or MPEG streams from a network source. Package: vlc-gnome Architecture: any Depends: vlc (= ${Source-Version}), ${shlibs:Depends} Provides: vlc-gui -Description: Gnome plugin for the VideoLAN Client +Description: Gnome plugin for vlc VideoLAN is a free MPEG, MPEG2 and DVD software solution. . - This plugin adds a Gnome interface to the VideoLAN Client. + This plugin adds a Gnome interface to vlc, the VideoLAN Client. Package: vlc-gtk Architecture: any @@ -30,50 +30,59 @@ Depends: vlc (= ${Source-Version}), ${shlibs:Depends} Replaces: vlc-gnome (<= 0.2.63-2) Conflicts: vlc-gnome (<= 0.2.63-2) Provides: vlc-gui -Description: Gtk+ plugin for the VideoLAN Client +Description: Gtk+ plugin for vlc VideoLAN is a free MPEG, MPEG2 and DVD software solution. . - This plugin adds a Gtk+ interface to the VideoLAN Client. + This plugin adds a Gtk+ interface to vlc, the VideoLAN Client. Package: vlc-esd Architecture: any Depends: vlc (= ${Source-Version}), ${shlibs:Depends} -Description: Esound plugin for the VideoLAN Client +Description: Esound plugin for vlc VideoLAN is a free MPEG, MPEG2 and DVD software solution. . This plugin adds support for the Enlightened Sound Daemon to - the VideoLAN Client. + vlc, the VideoLAN Client. + +Package: vlc-alsa +Architecture: any +Depends: vlc (= ${Source-Version}), ${shlibs:Depends} +Description: ALSA plugin for vlc + VideoLAN is a free MPEG, MPEG2 and DVD software solution. + . + This plugin adds support for the Advanced Linux Sound Architecture to + vlc, the VideoLAN Client. Package: vlc-sdl Architecture: any Depends: vlc (= ${Source-Version}), ${shlibs:Depends} -Description: SDL plugin for the VideoLAN Client +Description: SDL plugin for vlc VideoLAN is a free MPEG, MPEG2 and DVD software solution. . This plugin adds support for the Simple DirectMedia Layer library to - the VideoLAN Client. + vlc, the VideoLAN Client. Package: vlc-ggi Architecture: any Depends: vlc (= ${Source-Version}), ${shlibs:Depends} -Description: GGI plugin for the VideoLAN Client +Description: GGI plugin for vlc VideoLAN is a free MPEG, MPEG2 and DVD software solution. . - This is a GGI plugin for the VideoLAN Client. + This is a GGI plugin for vlc, the VideoLAN Client. Package: vlc-glide Architecture: i386 Depends: vlc (= ${Source-Version}), libglide2 -Description: Glide plugin for the VideoLAN Client +Description: Glide plugin for vlc VideoLAN is a free MPEG, MPEG2 and DVD software solution. . - This is a Glide (3dfx) plugin for the VideoLAN Client. + This is a Glide (3dfx) plugin for vlc, the VideoLAN Client. Package: vlc-qt Architecture: any Depends: vlc (= ${Source-Version}), ${shlibs:Depends} Provides: vlc-gui -Description: Qt plugin for the VideoLAN Client +Description: Qt plugin for vlc VideoLAN is a free MPEG, MPEG2 and DVD software solution. . - This plugin adds a Qt interface to the VideoLAN Client. + This plugin adds a Qt interface to vlc, the VideoLAN Client. diff --git a/debian/control-css b/debian/control-css index 61470450dc..423ce1c500 100644 --- a/debian/control-css +++ b/debian/control-css @@ -8,8 +8,8 @@ Standards-Version: 3.0.1 Package: vlc-css Architecture: any Depends: ${shlibs:Depends}, vlc (= ${Source-Version}) -Description: CSS plugin for the VideoLAN Client +Description: CSS plugin for vlc VideoLAN is a free MPEG, MPEG2 and DVD software solution. . - This plugin adds DVD support with CSS decryption to the VideoLAN Client. + This plugin adds DVD support with CSS decryption to vlc, the VideoLAN Client. diff --git a/debian/rules b/debian/rules index e6ca4058d8..51c3867640 100755 --- a/debian/rules +++ b/debian/rules @@ -17,14 +17,14 @@ build-stamp: --mandir=\$${prefix}/share/man \ --infodir=\$${prefix}/share/info \ --enable-gnome --enable-gtk --enable-fb --with-glide \ - --with-ggi --with-sdl --enable-esd \ + --with-ggi --with-sdl --enable-esd --enable-alsa \ --enable-qt --disable-ppro ; \ else \ ./configure --prefix=/usr \ --mandir=\$${prefix}/share/man \ --infodir=\$${prefix}/share/info \ --enable-gnome --enable-gtk --enable-fb \ - --with-ggi --with-sdl --enable-esd \ + --with-ggi --with-sdl --enable-esd --enable-alsa \ --enable-qt ; \ fi @@ -50,7 +50,7 @@ install: build DESTDIR=`pwd`/debian/vlc/ $(MAKE) install prefix=/usr # make symlinks for packages - aliases="ggi gtk gnome esd sdl qt" ; \ + aliases="ggi gtk gnome esd sdl qt alsa" ; \ if [ $(DEB_BUILD_ARCH) = i386 ]; then aliases=$$aliases" glide" ; fi ; \ for alias in `echo $$aliases` ; do \ mkdir -p debian/vlc-$$alias/usr/share/doc/ ; \ @@ -123,10 +123,10 @@ binary-arch: build install # dh_installpam # dh_installinit #dh_installcron -# dh_installmanpages -Nvlc-gnome -Nvlc-gtk -Nvlc-ggi -Nvlc-glide -Nvlc-esd -Nvlc-sdl -Nvlc-qt doc/vlc.1 +# dh_installmanpages -Nvlc-gnome -Nvlc-gtk -Nvlc-ggi -Nvlc-glide -Nvlc-esd -Nvlc-alsa -Nvlc-sdl -Nvlc-qt doc/vlc.1 #dh_installinfo # dh_undocumented - dh_installchangelogs -Nvlc-gnome -Nvlc-gtk -Nvlc-ggi -Nvlc-glide -Nvlc-esd -Nvlc-sdl -Nvlc-qt + dh_installchangelogs -Nvlc-gnome -Nvlc-gtk -Nvlc-ggi -Nvlc-glide -Nvlc-esd -Nvlc-alsa -Nvlc-sdl -Nvlc-qt dh_link dh_strip dh_compress @@ -147,3 +147,4 @@ binary-arch: build install binary: binary-indep binary-arch .PHONY: build clean binary-indep binary-arch binary install + diff --git a/include/audio_output.h b/include/audio_output.h index 449a9921ef..a8f1d15eca 100644 --- a/include/audio_output.h +++ b/include/audio_output.h @@ -2,7 +2,7 @@ * audio_output.h : audio output thread interface ***************************************************************************** * Copyright (C) 1999, 2000 VideoLAN - * $Id: audio_output.h,v 1.36 2001/05/30 05:19:03 stef Exp $ + * $Id: audio_output.h,v 1.37 2001/05/30 17:03:11 sam Exp $ * * Authors: Michel Kaempf * @@ -26,7 +26,7 @@ ***************************************************************************** * This global variable is accessed by any function using the audio output. *****************************************************************************/ -typedef struct +typedef struct aout_bank_s { /* Array to all the audio outputs */ struct aout_thread_s *pp_aout[ AOUT_MAX_THREADS ]; diff --git a/include/common.h b/include/common.h index fafb4a7249..423eeb9e6e 100644 --- a/include/common.h +++ b/include/common.h @@ -3,7 +3,7 @@ * Collection of useful common types and macros definitions ***************************************************************************** * Copyright (C) 1998, 1999, 2000 VideoLAN - * $Id: common.h,v 1.31 2001/04/28 03:36:25 sam Exp $ + * $Id: common.h,v 1.32 2001/05/30 17:03:11 sam Exp $ * * Authors: Samuel Hocevar * Vincent Seguin @@ -135,6 +135,7 @@ typedef struct video_parser_s * p_video_parser_t; /* Misc */ struct macroblock_s; struct data_packet_s; +struct es_descriptor_s; /***************************************************************************** * Macros and inline functions diff --git a/include/defs.h.in b/include/defs.h.in index 47faab5501..693b60fd50 100644 --- a/include/defs.h.in +++ b/include/defs.h.in @@ -1,4 +1,4 @@ -/* include/defs.h.in. Generated automatically from configure.in by autoheader. */ +/* include/defs.h.in. Generated automatically from configure.in by autoheader 2.13. */ /* Define to empty if the keyword does not work. */ #undef const diff --git a/include/input.h b/include/input.h index bc95666c13..4e4a97a2c7 100644 --- a/include/input.h +++ b/include/input.h @@ -2,7 +2,7 @@ * input.h: structures of the input not exported to other modules ***************************************************************************** * Copyright (C) 1999, 2000 VideoLAN - * $Id: input.h,v 1.36 2001/04/25 10:22:32 massiot Exp $ + * $Id: input.h,v 1.37 2001/05/30 17:03:11 sam Exp $ * * Authors: Christophe Massiot * @@ -45,20 +45,6 @@ void InitBitstream ( struct bit_stream_s *, struct decoder_fifo_s *, void * p_callback_arg ); void NextDataPacket ( struct bit_stream_s * ); -/***************************************************************************** - * Prototypes from input.c to open files - *****************************************************************************/ -void input_FileOpen ( struct input_thread_s * ); -void input_FileClose( struct input_thread_s * ); - -/***************************************************************************** - * Prototypes from input.c to open a network socket - *****************************************************************************/ -#if !defined( SYS_BEOS ) && !defined( SYS_NTO ) -void input_NetworkOpen ( struct input_thread_s * ); -void input_NetworkClose( struct input_thread_s * ); -#endif - /***************************************************************************** * Prototypes from input_programs.c *****************************************************************************/ diff --git a/include/input_ext-intf.h b/include/input_ext-intf.h index 9b51318ce2..4a94aa24f5 100644 --- a/include/input_ext-intf.h +++ b/include/input_ext-intf.h @@ -4,7 +4,7 @@ * control the pace of reading. ***************************************************************************** * Copyright (C) 1999, 2000 VideoLAN - * $Id: input_ext-intf.h,v 1.37 2001/05/19 00:39:29 stef Exp $ + * $Id: input_ext-intf.h,v 1.38 2001/05/30 17:03:11 sam Exp $ * * Authors: Christophe Massiot * @@ -294,6 +294,14 @@ typedef struct input_thread_s * backwards (it's gonna be fun) */ void (* pf_seek)( struct input_thread_s *, off_t ); + /* Special callback functions */ + void (* pf_file_open ) ( struct input_thread_s * ); + void (* pf_file_close ) ( struct input_thread_s * ); +#if !defined( SYS_BEOS ) && !defined( SYS_NTO ) + void (* pf_network_open ) ( struct input_thread_s * ); + void (* pf_network_close ) ( struct input_thread_s * ); +#endif + i_p_config_t i_p_config; /* plugin configuration */ char * p_source; diff --git a/include/intf_playlist.h b/include/intf_playlist.h index 56a6764681..00cb36ca5b 100644 --- a/include/intf_playlist.h +++ b/include/intf_playlist.h @@ -2,7 +2,7 @@ * intf_playlist.h : Playlist functions ***************************************************************************** * Copyright (C) 1999, 2000 VideoLAN - * $Id: intf_playlist.h,v 1.3 2001/05/15 01:01:44 stef Exp $ + * $Id: intf_playlist.h,v 1.4 2001/05/30 17:03:11 sam Exp $ * * Authors: Samuel Hocevar * @@ -78,4 +78,5 @@ void intf_PlaylistNext ( playlist_t * p_playlist ); void intf_PlaylistPrev ( playlist_t * p_playlist ); void intf_PlaylistDestroy ( playlist_t * p_playlist ); void intf_PlaylistJumpto ( playlist_t * p_playlist , int i_pos); +void intf_UrlDecode ( char * ); diff --git a/include/intf_urldecode.h b/include/intf_urldecode.h deleted file mode 100644 index 6c29c31e17..0000000000 --- a/include/intf_urldecode.h +++ /dev/null @@ -1,20 +0,0 @@ -/* - * Copyright (C) 1999, 2000 VideoLAN - * Copyright (C) 1998-2000 Peter Alm, Mikael Alm, Olle Hallnas, Thomas Nilsson and 4Front Technologies - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public Licensse 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-1307, USA. - */ - -void urldecode_path(char *); diff --git a/include/main.h b/include/main.h index f2416af2cd..dfc352b7a8 100644 --- a/include/main.h +++ b/include/main.h @@ -3,7 +3,7 @@ * Declaration and extern access to global program object. ***************************************************************************** * Copyright (C) 1999, 2000 VideoLAN - * $Id: main.h,v 1.18 2001/05/06 04:32:02 sam Exp $ + * $Id: main.h,v 1.19 2001/05/30 17:03:11 sam Exp $ * * Authors: Vincent Seguin * @@ -33,7 +33,7 @@ * should only be used by interface thread. *****************************************************************************/ -typedef struct +typedef struct main_s { /* Global properties */ int i_argc; /* command line arguments count */ diff --git a/include/modules.h b/include/modules.h index 33c0cbbdc7..4e60c05c42 100644 --- a/include/modules.h +++ b/include/modules.h @@ -2,7 +2,7 @@ * modules.h : Module management functions. ***************************************************************************** * Copyright (C) 2001 VideoLAN - * $Id: modules.h,v 1.24 2001/05/15 16:19:42 sam Exp $ + * $Id: modules.h,v 1.25 2001/05/30 17:03:11 sam Exp $ * * Authors: Samuel Hocevar * @@ -178,7 +178,7 @@ typedef struct function_list_s dctelem_t *, int ); void ( * pf_norm_scan ) ( u8 ppi_scan[2][64] ); - void ( * pf_vdec_init ) ( struct vdec_thread_s * ); + void ( * pf_decode_init ) ( struct vdec_thread_s * ); void ( * pf_decode_mb_c ) ( struct vdec_thread_s *, struct macroblock_s * ); void ( * pf_decode_mb_bw ) ( struct vdec_thread_s *, @@ -313,10 +313,11 @@ typedef struct module_s struct module_s * next; /* Next module */ struct module_s * prev; /* Previous module */ - module_config_t * p_config; /* Module configuration structure table */ + module_config_t *p_config; /* Module configuration structure */ + struct module_symbols_s *p_symbols; - u32 i_capabilities; /* Capability list */ - p_module_functions_t p_functions; /* Capability functions */ + u32 i_capabilities; /* Capability list */ + p_module_functions_t p_functions; /* Capability functions */ } module_t; diff --git a/include/modules_inner.h b/include/modules_inner.h index df635e3aa9..6e0fb72831 100644 --- a/include/modules_inner.h +++ b/include/modules_inner.h @@ -2,7 +2,7 @@ * modules_inner.h : Macros used from within a module. ***************************************************************************** * Copyright (C) 2001 VideoLAN - * $Id: modules_inner.h,v 1.6 2001/03/21 13:42:33 sam Exp $ + * $Id: modules_inner.h,v 1.7 2001/05/30 17:03:11 sam Exp $ * * Authors: Samuel Hocevar * @@ -56,18 +56,82 @@ /* If the module is built-in, then we need to define foo_InitModule instead * of InitModule. Same for Activate- and DeactivateModule. */ #ifdef BUILTIN + # define _M( function ) CONCATENATE( MODULE_NAME, function ) -# define MODULE_INIT \ - int CONCATENATE( MODULE_NAME, InitModule ) ( module_t *p_module ) -# define MODULE_ACTIVATE \ - int CONCATENATE( MODULE_NAME, ActivateModule ) ( module_t *p_module ) -# define MODULE_DEACTIVATE \ - int CONCATENATE( MODULE_NAME, DeactivateModule )( module_t *p_module ) + +# define MODULE_INIT_START \ + int CONCATENATE( MODULE_NAME, InitModule ) ( module_t *p_module ) \ + { \ + p_module->psz_name = MODULE_STRING; \ + p_module->psz_version = VERSION; + +# define MODULE_INIT_STOP \ + return( 0 ); \ + } + +# define MODULE_ACTIVATE_START \ + int CONCATENATE( MODULE_NAME, ActivateModule ) ( module_t *p_module ) \ + { \ + p_module->p_functions = \ + ( module_functions_t * )malloc( sizeof( module_functions_t ) ); \ + if( p_module->p_functions == NULL ) \ + { \ + return( -1 ); \ + } \ + p_module->p_config = p_config; + +# define MODULE_ACTIVATE_STOP \ + return( 0 ); \ + } + +# define MODULE_DEACTIVATE_START \ + int CONCATENATE( MODULE_NAME, DeactivateModule )( module_t *p_module ) \ + { \ + free( p_module->p_functions ); + +# define MODULE_DEACTIVATE_STOP \ + return( 0 ); \ + } + #else + # define _M( function ) function -# define MODULE_INIT int InitModule ( module_t *p_module ) -# define MODULE_ACTIVATE int ActivateModule ( module_t *p_module ) -# define MODULE_DEACTIVATE int DeactivateModule ( module_t *p_module ) + +# define MODULE_INIT_START \ + int InitModule ( module_t *p_module ) \ + { \ + p_module->psz_name = MODULE_STRING; \ + p_module->psz_version = VERSION; + +# define MODULE_INIT_STOP \ + return( 0 ); \ + } + +# define MODULE_ACTIVATE_START \ + int ActivateModule ( module_t *p_module ) \ + { \ + p_module->p_functions = \ + ( module_functions_t * )malloc( sizeof( module_functions_t ) ); \ + if( p_module->p_functions == NULL ) \ + { \ + return( -1 ); \ + } \ + p_module->p_config = p_config; \ + p_symbols = p_module->p_symbols; + +# define MODULE_ACTIVATE_STOP \ + return( 0 ); \ + } + +# define MODULE_DEACTIVATE_START \ + int DeactivateModule( module_t *p_module ) \ + { \ + free( p_module->p_functions ); + +# define MODULE_DEACTIVATE_STOP \ + return( 0 ); \ + } + #endif /* Now the real stuff */ @@ -76,11 +140,18 @@ /***************************************************************************** * Macros used to build the configuration structure. *****************************************************************************/ -#define MODULE_CONFIG_START \ -static module_config_t p_config[] = { \ - { MODULE_CONFIG_ITEM_START, NULL, NULL, NULL, NULL }, +#ifdef BUILTIN +# define MODULE_CONFIG_START \ + static module_config_t p_config[] = { \ + { MODULE_CONFIG_ITEM_START, NULL, NULL, NULL, NULL }, +#else +# define MODULE_CONFIG_START \ + module_symbols_t* p_symbols; \ + static module_config_t p_config[] = { \ + { MODULE_CONFIG_ITEM_START, NULL, NULL, NULL, NULL }, +#endif -#define MODULE_CONFIG_END \ +#define MODULE_CONFIG_STOP \ { MODULE_CONFIG_ITEM_END, NULL, NULL, NULL, NULL } \ }; @@ -107,3 +178,4 @@ static module_config_t p_config[] = { \ #define ADD_SPIN( text, name, p_getlist, p_update ) \ { MODULE_CONFIG_ITEM_SPIN, text, name, p_getlist, p_update }, + diff --git a/include/netutils.h b/include/netutils.h index fd0bf8c519..3e04dadfac 100644 --- a/include/netutils.h +++ b/include/netutils.h @@ -4,7 +4,7 @@ * modules. ***************************************************************************** * Copyright (C) 1999, 2000, 2001 VideoLAN - * $Id: netutils.h,v 1.13 2001/05/28 02:38:48 sam Exp $ + * $Id: netutils.h,v 1.14 2001/05/30 17:03:11 sam Exp $ * * Authors: Vincent Seguin * Henri Fallon @@ -34,3 +34,4 @@ int network_BuildLocalAddr ( struct sockaddr_in *, int, char * ); int network_BuildRemoteAddr( struct sockaddr_in *, char * ); int network_ChannelJoin ( int ); int network_ChannelCreate ( void ); + diff --git a/include/tests.h b/include/tests.h index ef66c974b9..8e545e18c9 100644 --- a/include/tests.h +++ b/include/tests.h @@ -2,7 +2,7 @@ * tests.h: several test functions needed by the plugins ***************************************************************************** * Copyright (C) 1996, 1997, 1998, 1999, 2000 VideoLAN - * $Id: tests.h,v 1.10 2001/05/14 15:58:03 reno Exp $ + * $Id: tests.h,v 1.11 2001/05/30 17:03:11 sam Exp $ * * Authors: Samuel Hocevar * @@ -34,8 +34,7 @@ /***************************************************************************** * TestVersion: tests if the given string equals the current version *****************************************************************************/ -int TestVersion ( char * psz_version ); -int TestProgram ( char * psz_program ); -int TestMethod ( char * psz_var, char * psz_method ); -int TestCPU ( int i_capabilities ); +int TestProgram ( char * ); +int TestMethod ( char *, char * ); +int TestCPU ( int ); diff --git a/include/video_decoder.h b/include/video_decoder.h index 6a0c056713..11c5be7747 100644 --- a/include/video_decoder.h +++ b/include/video_decoder.h @@ -2,7 +2,7 @@ * video_decoder.h : video decoder thread ***************************************************************************** * Copyright (C) 1999, 2000 VideoLAN - * $Id: video_decoder.h,v 1.23 2001/05/06 04:32:02 sam Exp $ + * $Id: video_decoder.h,v 1.24 2001/05/30 17:03:11 sam Exp $ * * Authors: Christophe Massiot * @@ -55,7 +55,7 @@ typedef struct vdec_thread_s dctelem_t p_pre_idct[64*64]; /* Macroblock copy functions */ - void ( * pf_vdec_init ) ( struct vdec_thread_s * ); + void ( * pf_decode_init ) ( struct vdec_thread_s * ); void ( * pf_decode_mb_c ) ( struct vdec_thread_s *, struct macroblock_s * ); void ( * pf_decode_mb_bw )( struct vdec_thread_s *, struct macroblock_s * ); diff --git a/include/video_output.h b/include/video_output.h index 0a36f65071..4c7bcfa970 100644 --- a/include/video_output.h +++ b/include/video_output.h @@ -5,7 +5,7 @@ * thread, and destroy a previously oppenned video output thread. ***************************************************************************** * Copyright (C) 1999, 2000 VideoLAN - * $Id: video_output.h,v 1.60 2001/05/06 18:32:30 stef Exp $ + * $Id: video_output.h,v 1.61 2001/05/30 17:03:11 sam Exp $ * * Authors: Vincent Seguin * @@ -29,7 +29,7 @@ ***************************************************************************** * This global variable is accessed by any function using the video output. *****************************************************************************/ -typedef struct +typedef struct vout_bank_s { /* Array to all the video outputs */ struct vout_thread_s *pp_vout[ VOUT_MAX_THREADS ]; @@ -195,14 +195,15 @@ typedef struct vout_thread_s /* Plugin used and shortcuts to access its capabilities */ struct module_s * p_module; - int ( *pf_create ) ( struct vout_thread_s * ); - int ( *pf_init ) ( struct vout_thread_s * ); - void ( *pf_end ) ( struct vout_thread_s * ); - void ( *pf_destroy ) ( struct vout_thread_s * ); - int ( *pf_manage ) ( struct vout_thread_s * ); - void ( *pf_display ) ( struct vout_thread_s * ); - void ( *pf_setpalette ) ( struct vout_thread_s *, u16 *red, - u16 *green, u16 *blue, u16 *transp ); + int ( *pf_create ) ( struct vout_thread_s * ); + int ( *pf_init ) ( struct vout_thread_s * ); + void ( *pf_end ) ( struct vout_thread_s * ); + void ( *pf_destroy ) ( struct vout_thread_s * ); + int ( *pf_manage ) ( struct vout_thread_s * ); + void ( *pf_display ) ( struct vout_thread_s * ); + void ( *pf_setpalette ) ( struct vout_thread_s *, u16 *red, + u16 *green, u16 *blue, u16 *transp ); + void ( *pf_setbuffers ) ( struct vout_thread_s *, void *, void * ); /* Pictures and rendering properties */ boolean_t b_grayscale; /* color or grayscale display */ @@ -296,5 +297,3 @@ subpicture_t * vout_CreateSubPicture ( vout_thread_t *p_vout, int i_type, int void vout_DestroySubPicture ( vout_thread_t *p_vout, subpicture_t *p_subpic ); void vout_DisplaySubPicture ( vout_thread_t *p_vout, subpicture_t *p_subpic ); -void vout_SetBuffers ( vout_thread_t *p_vout, void *p_buf1, void *p_buf2 ); - diff --git a/include/video_parser.h b/include/video_parser.h index 78ffff7843..55142a296e 100644 --- a/include/video_parser.h +++ b/include/video_parser.h @@ -2,7 +2,7 @@ * video_parser.h : video parser thread ***************************************************************************** * Copyright (C) 1999, 2000 VideoLAN - * $Id: video_parser.h,v 1.34 2001/05/06 04:32:02 sam Exp $ + * $Id: video_parser.h,v 1.35 2001/05/30 17:03:11 sam Exp $ * * Authors: Christophe Massiot * @@ -141,7 +141,7 @@ typedef struct vpar_thread_s void ( * pf_sparse_idct ) ( struct vdec_thread_s *, dctelem_t*, int ); void ( * pf_idct ) ( struct vdec_thread_s *, dctelem_t*, int ); void ( * pf_norm_scan ) ( u8 ppi_scan[2][64] ); - void ( * pf_vdec_init ) ( struct vdec_thread_s * ); + void ( * pf_decode_init ) ( struct vdec_thread_s * ); void ( * pf_decode_mb_c ) ( struct vdec_thread_s *, struct macroblock_s * ); void ( * pf_decode_mb_bw )( struct vdec_thread_s *, struct macroblock_s * ); diff --git a/plugins/alsa/alsa.c b/plugins/alsa/alsa.c index 16d4cf6061..edfe1fb711 100644 --- a/plugins/alsa/alsa.c +++ b/plugins/alsa/alsa.c @@ -2,7 +2,7 @@ * alsa.c : alsa plugin for vlc ***************************************************************************** * Copyright (C) 2000 VideoLAN - * $Id: alsa.c,v 1.9 2001/04/27 16:08:26 sam Exp $ + * $Id: alsa.c,v 1.10 2001/05/30 17:03:11 sam Exp $ * * Authors: Henri Fallon * @@ -38,13 +38,7 @@ #include "mtime.h" #include "modules.h" - -/***************************************************************************** - * Build configuration tree. - *****************************************************************************/ -MODULE_CONFIG_START - ADD_COMMENT( "Yeah, alsa rocks !" ) -MODULE_CONFIG_END +#include "modules_export.h" /***************************************************************************** * Capabilities defined in the other files. @@ -52,59 +46,22 @@ MODULE_CONFIG_END void _M( aout_getfunctions )( function_list_t * p_function_list ); /***************************************************************************** - * InitModule: get the module structure and configuration. - ***************************************************************************** - * We have to fill psz_name, psz_longname and psz_version. These variables - * will be strdup()ed later by the main application because the module can - * be unloaded later to save memory, and we want to be able to access this - * data even after the module has been unloaded. + * Build configuration tree. *****************************************************************************/ -MODULE_INIT -{ - p_module->psz_name = MODULE_STRING; - p_module->psz_longname = "Alsa audio module"; - p_module->psz_version = VERSION; +MODULE_CONFIG_START + ADD_COMMENT( "Yeah, alsa rocks !" ) +MODULE_CONFIG_STOP + +MODULE_INIT_START p_module->i_capabilities = MODULE_CAPABILITY_NULL | MODULE_CAPABILITY_AOUT; - return( 0 ); -} + p_module->psz_longname = "Alsa audio module"; +MODULE_INIT_STOP - -/***************************************************************************** - * ActivateModule: set the module to an usable state. - ***************************************************************************** - * This function fills the capability functions and the configuration - * structure. Once ActivateModule() has been called, the i_usage can - * be set to 0 and calls to NeedModule() be made to increment it. To unload - * the module, one has to wait until i_usage == 0 and call DeactivateModule(). - *****************************************************************************/ -MODULE_ACTIVATE -{ - p_module->p_functions = malloc( sizeof( module_functions_t ) ); - if( p_module->p_functions == NULL ) - { - return( -1 ); - } - +MODULE_ACTIVATE_START _M( aout_getfunctions )( &p_module->p_functions->aout ); - - p_module->p_config = p_config; - - return( 0 ); -} - - -/***************************************************************************** - * DeactivateModule: make sure the module can be unloaded. - ***************************************************************************** - * This function must only be called when i_usage == 0. If it successfully - * returns, i_usage can be set to -1 and the module unloaded. Be careful to - * lock usage_lock during the whole process. - *****************************************************************************/ -MODULE_DEACTIVATE -{ - free( p_module->p_functions ); +MODULE_ACTIVATE_STOP - return( 0 ); -} +MODULE_DEACTIVATE_START +MODULE_DEACTIVATE_STOP diff --git a/plugins/alsa/aout_alsa.c b/plugins/alsa/aout_alsa.c index 5bcd03e952..bb370cf1f9 100644 --- a/plugins/alsa/aout_alsa.c +++ b/plugins/alsa/aout_alsa.c @@ -2,7 +2,7 @@ * aout_alsa.c : Alsa functions library ***************************************************************************** * Copyright (C) 2000 VideoLAN - * $Id: aout_alsa.c,v 1.15 2001/05/11 01:03:14 henri Exp $ + * $Id: aout_alsa.c,v 1.16 2001/05/30 17:03:11 sam Exp $ * * Authors: Henri Fallon - Original Author * Jeffrey Baker - Port to ALSA 1.0 API @@ -50,6 +50,7 @@ #include "main.h" #include "modules.h" +#include "modules_export.h" typedef struct alsa_device_s { diff --git a/plugins/beos/beos.cpp b/plugins/beos/beos.cpp index 4bbf5e5874..27c5a507e7 100644 --- a/plugins/beos/beos.cpp +++ b/plugins/beos/beos.cpp @@ -2,7 +2,7 @@ * beos.cpp : BeOS plugin for vlc ***************************************************************************** * Copyright (C) 2000, 2001 VideoLAN - * $Id: beos.cpp,v 1.9 2001/03/21 13:42:33 sam Exp $ + * $Id: beos.cpp,v 1.10 2001/05/30 17:03:11 sam Exp $ * * Authors: Jean-Marc Dressler * Samuel Hocevar @@ -41,14 +41,6 @@ extern "C" #include "modules.h" -/***************************************************************************** - * Build configuration tree. - *****************************************************************************/ -MODULE_CONFIG_START -ADD_WINDOW( "Configuration for BeOS module" ) - ADD_COMMENT( "Ha, ha -- nothing to configure yet" ) -MODULE_CONFIG_END - /***************************************************************************** * Capabilities defined in the other files. *****************************************************************************/ @@ -57,65 +49,28 @@ void _M( vout_getfunctions )( function_list_t * p_function_list ); void _M( intf_getfunctions )( function_list_t * p_function_list ); /***************************************************************************** - * InitModule: get the module structure and configuration. - ***************************************************************************** - * We have to fill psz_name, psz_longname and psz_version. These variables - * will be strdup()ed later by the main application because the module can - * be unloaded later to save memory, and we want to be able to access this - * data even after the module has been unloaded. + * Build configuration tree. *****************************************************************************/ -MODULE_INIT -{ - p_module->psz_name = MODULE_STRING; - p_module->psz_longname = "BeOS standard API module"; - p_module->psz_version = VERSION; +MODULE_CONFIG_START +ADD_WINDOW( "Configuration for BeOS module" ) + ADD_COMMENT( "Ha, ha -- nothing to configure yet" ) +MODULE_CONFIG_STOP +MODULE_INIT_START p_module->i_capabilities = MODULE_CAPABILITY_NULL | MODULE_CAPABILITY_AOUT | MODULE_CAPABILITY_VOUT | MODULE_CAPABILITY_INTF; + p_module->psz_longname = "BeOS standard API module"; +MODULE_INIT_STOP - return( 0 ); -} - -/***************************************************************************** - * ActivateModule: set the module to an usable state. - ***************************************************************************** - * This function fills the capability functions and the configuration - * structure. Once ActivateModule() has been called, the i_usage can - * be set to 0 and calls to NeedModule() be made to increment it. To unload - * the module, one has to wait until i_usage == 0 and call DeactivateModule(). - *****************************************************************************/ -MODULE_ACTIVATE -{ - p_module->p_functions = - ( module_functions_t * )malloc( sizeof( module_functions_t ) ); - if( p_module->p_functions == NULL ) - { - return( -1 ); - } - +MODULE_ACTIVATE_START _M( aout_getfunctions )( &p_module->p_functions->aout ); _M( vout_getfunctions )( &p_module->p_functions->vout ); _M( intf_getfunctions )( &p_module->p_functions->intf ); +MODULE_ACTIVATE_STOP - p_module->p_config = p_config; - - return( 0 ); -} - -/***************************************************************************** - * DeactivateModule: make sure the module can be unloaded. - ***************************************************************************** - * This function must only be called when i_usage == 0. If it successfully - * returns, i_usage can be set to -1 and the module unloaded. Be careful to - * lock usage_lock during the whole process. - *****************************************************************************/ -MODULE_DEACTIVATE -{ - free( p_module->p_functions ); - - return( 0 ); -} +MODULE_DEACTIVATE_START +MODULE_DEACTIVATE_STOP } /* extern "C" */ diff --git a/plugins/beos/vout_beos.cpp b/plugins/beos/vout_beos.cpp index 468fc73f04..44fe4b304f 100644 --- a/plugins/beos/vout_beos.cpp +++ b/plugins/beos/vout_beos.cpp @@ -2,7 +2,7 @@ * vout_beos.cpp: beos video output display method ***************************************************************************** * Copyright (C) 2000, 2001 VideoLAN - * $Id: vout_beos.cpp,v 1.25 2001/04/29 17:03:20 sam Exp $ + * $Id: vout_beos.cpp,v 1.26 2001/05/30 17:03:11 sam Exp $ * * Authors: Jean-Marc Dressler * Samuel Hocevar @@ -459,7 +459,8 @@ int vout_Init( vout_thread_t *p_vout ) { if(p_win->bitmap[0] != NULL) { - vout_SetBuffers( p_vout, (byte_t *)p_win->bitmap[0]->Bits(), + p_vout->pf_setbuffers( p_vout, + (byte_t *)p_win->bitmap[0]->Bits(), (byte_t *)p_win->bitmap[0]->Bits()); delete p_win->bitmap[0]; p_win->bitmap[0] = NULL; @@ -469,13 +470,15 @@ int vout_Init( vout_thread_t *p_vout ) { if((p_win->bitmap[0] != NULL) && (p_win->bitmap[1] != NULL)) { - vout_SetBuffers( p_vout, (byte_t *)p_win->bitmap[0]->Bits(), + p_vout->pf_setbuffers( p_vout, + (byte_t *)p_win->bitmap[0]->Bits(), (byte_t *)p_win->bitmap[1]->Bits()); } }*/ if((p_win->bitmap[0] != NULL) && (p_win->bitmap[1] != NULL)) { - vout_SetBuffers( p_vout, (byte_t *)p_win->bitmap[0]->Bits(), + p_vout->pf_setbuffers( p_vout, + (byte_t *)p_win->bitmap[0]->Bits(), (byte_t *)p_win->bitmap[1]->Bits()); } @@ -540,7 +543,8 @@ if( (p_vout->i_width != p_vout->p_sys->i_width) || B_OVERLAY_FILTER_HORIZONTAL|B_OVERLAY_FILTER_VERTICAL|B_OVERLAY_TRANSFER_CHANNEL); p_win->view->SetViewColor(key); p_win->Unlock(); - vout_SetBuffers( p_vout, (byte_t *)p_win->bitmap[0]->Bits(), + p_vout->pf_setbuffers( p_vout, + (byte_t *)p_win->bitmap[0]->Bits(), (byte_t *)p_win->bitmap[0]->Bits()); delete p_win->bitmap[0]; } diff --git a/plugins/darwin/darwin.c b/plugins/darwin/darwin.c index f26d3bddea..2f0683cdb7 100644 --- a/plugins/darwin/darwin.c +++ b/plugins/darwin/darwin.c @@ -2,7 +2,7 @@ * darwin.c : Darwin plugin for vlc ***************************************************************************** * Copyright (C) 2001 VideoLAN - * $Id: darwin.c,v 1.4 2001/04/06 18:18:10 massiot Exp $ + * $Id: darwin.c,v 1.5 2001/05/30 17:03:12 sam Exp $ * * Authors: Colin Delacroix * Christophe Massiot @@ -45,72 +45,28 @@ #include "modules.h" -/***************************************************************************** - * Build configuration tree. - *****************************************************************************/ -MODULE_CONFIG_START -ADD_WINDOW( "Configuration for Darwin module" ) - ADD_COMMENT( "Ha, ha -- nothing to configure yet" ) -MODULE_CONFIG_END - /***************************************************************************** * Capabilities defined in the other files. *****************************************************************************/ // void _M( aout_getfunctions )( function_list_t * p_function_list ); /***************************************************************************** - * InitModule: get the module structure and configuration. - ***************************************************************************** - * We have to fill psz_name, psz_longname and psz_version. These variables - * will be strdup()ed later by the main application because the module can - * be unloaded later to save memory, and we want to be able to access this - * data even after the module has been unloaded. + * Build configuration tree. *****************************************************************************/ -MODULE_INIT -{ - p_module->psz_name = MODULE_STRING; - p_module->psz_longname = "Darwin support module"; - p_module->psz_version = VERSION; +MODULE_CONFIG_START +ADD_WINDOW( "Configuration for Darwin module" ) + ADD_COMMENT( "Ha, ha -- nothing to configure yet" ) +MODULE_CONFIG_STOP +MODULE_INIT_START p_module->i_capabilities = MODULE_CAPABILITY_NULL; + p_module->psz_longname = "Darwin support module"; +MODULE_INIT_STOP - return( 0 ); -} - -/***************************************************************************** - * ActivateModule: set the module to an usable state. - ***************************************************************************** - * This function fills the capability functions and the configuration - * structure. Once ActivateModule() has been called, the i_usage can - * be set to 0 and calls to NeedModule() be made to increment it. To unload - * the module, one has to wait until i_usage == 0 and call DeactivateModule(). - *****************************************************************************/ -MODULE_ACTIVATE -{ - p_module->p_functions = malloc( sizeof( module_functions_t ) ); - if( p_module->p_functions == NULL ) - { - return( -1 ); - } - +MODULE_ACTIVATE_START // _M( aout_getfunctions )( &p_module->p_functions->aout ); +MODULE_ACTIVATE_STOP - p_module->p_config = p_config; - - return( 0 ); -} - -/***************************************************************************** - * DeactivateModule: make sure the module can be unloaded. - ***************************************************************************** - * This function must only be called when i_usage == 0. If it successfully - * returns, i_usage can be set to -1 and the module unloaded. Be careful to - * lock usage_lock during the whole process. - *****************************************************************************/ -MODULE_DEACTIVATE -{ - free( p_module->p_functions ); - - return( 0 ); -} +MODULE_DEACTIVATE_START +MODULE_DEACTIVATE_STOP diff --git a/plugins/downmix/downmix.c b/plugins/downmix/downmix.c index 675424b887..a26b6c01ea 100644 --- a/plugins/downmix/downmix.c +++ b/plugins/downmix/downmix.c @@ -2,7 +2,7 @@ * downmix.c : AC3 downmix module ***************************************************************************** * Copyright (C) 1999, 2000 VideoLAN - * $Id: downmix.c,v 1.1 2001/05/15 16:19:42 sam Exp $ + * $Id: downmix.c,v 1.2 2001/05/30 17:03:12 sam Exp $ * * Authors: Gaël Hendryckx * @@ -41,6 +41,7 @@ #include "ac3_downmix_common.h" #include "modules.h" +#include "modules_export.h" /***************************************************************************** * Local and extern prototypes. @@ -54,64 +55,20 @@ static int downmix_Probe ( probedata_t *p_data ); MODULE_CONFIG_START ADD_WINDOW( "Configuration for AC3 downmix module" ) ADD_COMMENT( "Ha, ha -- nothing to configure yet" ) -MODULE_CONFIG_END - -/***************************************************************************** - * InitModule: get the module structure and configuration. - ***************************************************************************** - * We have to fill psz_name, psz_longname and psz_version. These variables - * will be strdup()ed later by the main application because the module can - * be unloaded later to save memory, and we want to be able to access this - * data even after the module has been unloaded. - *****************************************************************************/ -MODULE_INIT -{ - p_module->psz_name = MODULE_STRING; - p_module->psz_longname = "AC3 downmix module"; - p_module->psz_version = VERSION; +MODULE_CONFIG_STOP +MODULE_INIT_START p_module->i_capabilities = MODULE_CAPABILITY_NULL | MODULE_CAPABILITY_DOWNMIX; + p_module->psz_longname = "AC3 downmix module"; +MODULE_INIT_STOP - return( 0 ); -} - -/***************************************************************************** - * ActivateModule: set the module to an usable state. - ***************************************************************************** - * This function fills the capability functions and the configuration - * structure. Once ActivateModule() has been called, the i_usage can - * be set to 0 and calls to NeedModule() be made to increment it. To unload - * the module, one has to wait until i_usage == 0 and call DeactivateModule(). - *****************************************************************************/ -MODULE_ACTIVATE -{ - p_module->p_functions = malloc( sizeof( module_functions_t ) ); - if( p_module->p_functions == NULL ) - { - return( -1 ); - } - +MODULE_ACTIVATE_START downmix_getfunctions( &p_module->p_functions->downmix ); +MODULE_ACTIVATE_STOP - p_module->p_config = p_config; - - return( 0 ); -} - -/***************************************************************************** - * DeactivateModule: make sure the module can be unloaded. - ***************************************************************************** - * This function must only be called when i_usage == 0. If it successfully - * returns, i_usage can be set to -1 and the module unloaded. Be careful to - * lock usage_lock during the whole process. - *****************************************************************************/ -MODULE_DEACTIVATE -{ - free( p_module->p_functions ); - - return( 0 ); -} +MODULE_DEACTIVATE_START +MODULE_DEACTIVATE_STOP /* Following functions are local */ diff --git a/plugins/downmix/downmix3dn.c b/plugins/downmix/downmix3dn.c index f05a8a78dc..7b9a463f4b 100644 --- a/plugins/downmix/downmix3dn.c +++ b/plugins/downmix/downmix3dn.c @@ -2,7 +2,7 @@ * downmix3dn.c : accelerated 3D Now! AC3 downmix module ***************************************************************************** * Copyright (C) 1999, 2000 VideoLAN - * $Id: downmix3dn.c,v 1.1 2001/05/15 16:19:42 sam Exp $ + * $Id: downmix3dn.c,v 1.2 2001/05/30 17:03:12 sam Exp $ * * Authors: Gaël Hendryckx * @@ -54,64 +54,20 @@ static int downmix_Probe ( probedata_t *p_data ); MODULE_CONFIG_START ADD_WINDOW( "Configuration for AC3 downmix3dn module" ) ADD_COMMENT( "Ha, ha -- nothing to configure yet" ) -MODULE_CONFIG_END - -/***************************************************************************** - * InitModule: get the module structure and configuration. - ***************************************************************************** - * We have to fill psz_name, psz_longname and psz_version. These variables - * will be strdup()ed later by the main application because the module can - * be unloaded later to save memory, and we want to be able to access this - * data even after the module has been unloaded. - *****************************************************************************/ -MODULE_INIT -{ - p_module->psz_name = MODULE_STRING; - p_module->psz_longname = "3D Now! AC3 downmix module"; - p_module->psz_version = VERSION; +MODULE_CONFIG_STOP +MODULE_INIT_START p_module->i_capabilities = MODULE_CAPABILITY_NULL | MODULE_CAPABILITY_DOWNMIX; + p_module->psz_longname = "3D Now! AC3 downmix module"; +MODULE_INIT_STOP - return( 0 ); -} - -/***************************************************************************** - * ActivateModule: set the module to an usable state. - ***************************************************************************** - * This function fills the capability functions and the configuration - * structure. Once ActivateModule() has been called, the i_usage can - * be set to 0 and calls to NeedModule() be made to increment it. To unload - * the module, one has to wait until i_usage == 0 and call DeactivateModule(). - *****************************************************************************/ -MODULE_ACTIVATE -{ - p_module->p_functions = malloc( sizeof( module_functions_t ) ); - if( p_module->p_functions == NULL ) - { - return( -1 ); - } - +MODULE_ACTIVATE_START downmix_getfunctions( &p_module->p_functions->downmix ); +MODULE_ACTIVATE_STOP - p_module->p_config = p_config; - - return( 0 ); -} - -/***************************************************************************** - * DeactivateModule: make sure the module can be unloaded. - ***************************************************************************** - * This function must only be called when i_usage == 0. If it successfully - * returns, i_usage can be set to -1 and the module unloaded. Be careful to - * lock usage_lock during the whole process. - *****************************************************************************/ -MODULE_DEACTIVATE -{ - free( p_module->p_functions ); - - return( 0 ); -} +MODULE_DEACTIVATE_START +MODULE_DEACTIVATE_STOP /* Following functions are local */ diff --git a/plugins/downmix/downmixsse.c b/plugins/downmix/downmixsse.c index 34d2c172b6..91d6a1d38d 100644 --- a/plugins/downmix/downmixsse.c +++ b/plugins/downmix/downmixsse.c @@ -2,7 +2,7 @@ * downmixsse.c : accelerated SSE AC3 downmix module ***************************************************************************** * Copyright (C) 1999, 2000 VideoLAN - * $Id: downmixsse.c,v 1.1 2001/05/15 16:19:42 sam Exp $ + * $Id: downmixsse.c,v 1.2 2001/05/30 17:03:12 sam Exp $ * * Authors: Gaël Hendryckx * @@ -54,64 +54,20 @@ static int downmix_Probe ( probedata_t *p_data ); MODULE_CONFIG_START ADD_WINDOW( "Configuration for AC3 downmixsse module" ) ADD_COMMENT( "Ha, ha -- nothing to configure yet" ) -MODULE_CONFIG_END - -/***************************************************************************** - * InitModule: get the module structure and configuration. - ***************************************************************************** - * We have to fill psz_name, psz_longname and psz_version. These variables - * will be strdup()ed later by the main application because the module can - * be unloaded later to save memory, and we want to be able to access this - * data even after the module has been unloaded. - *****************************************************************************/ -MODULE_INIT -{ - p_module->psz_name = MODULE_STRING; - p_module->psz_longname = "SSE AC3 downmix module"; - p_module->psz_version = VERSION; +MODULE_CONFIG_STOP +MODULE_INIT_START p_module->i_capabilities = MODULE_CAPABILITY_NULL | MODULE_CAPABILITY_DOWNMIX; + p_module->psz_longname = "SSE AC3 downmix module"; +MODULE_INIT_STOP - return( 0 ); -} - -/***************************************************************************** - * ActivateModule: set the module to an usable state. - ***************************************************************************** - * This function fills the capability functions and the configuration - * structure. Once ActivateModule() has been called, the i_usage can - * be set to 0 and calls to NeedModule() be made to increment it. To unload - * the module, one has to wait until i_usage == 0 and call DeactivateModule(). - *****************************************************************************/ -MODULE_ACTIVATE -{ - p_module->p_functions = malloc( sizeof( module_functions_t ) ); - if( p_module->p_functions == NULL ) - { - return( -1 ); - } - +MODULE_ACTIVATE_START downmix_getfunctions( &p_module->p_functions->downmix ); +MODULE_ACTIVATE_STOP - p_module->p_config = p_config; - - return( 0 ); -} - -/***************************************************************************** - * DeactivateModule: make sure the module can be unloaded. - ***************************************************************************** - * This function must only be called when i_usage == 0. If it successfully - * returns, i_usage can be set to -1 and the module unloaded. Be careful to - * lock usage_lock during the whole process. - *****************************************************************************/ -MODULE_DEACTIVATE -{ - free( p_module->p_functions ); - - return( 0 ); -} +MODULE_DEACTIVATE_START +MODULE_DEACTIVATE_STOP /* Following functions are local */ diff --git a/plugins/dsp/aout_dsp.c b/plugins/dsp/aout_dsp.c index 94a5572b77..f055890f01 100644 --- a/plugins/dsp/aout_dsp.c +++ b/plugins/dsp/aout_dsp.c @@ -2,7 +2,7 @@ * aout_dsp.c : dsp functions library ***************************************************************************** * Copyright (C) 1999, 2000 VideoLAN - * $Id: aout_dsp.c,v 1.12 2001/03/21 13:42:33 sam Exp $ + * $Id: aout_dsp.c,v 1.13 2001/05/30 17:03:12 sam Exp $ * * Authors: Michel Kaempf * Samuel Hocevar @@ -66,6 +66,7 @@ #include "main.h" #include "modules.h" +#include "modules_export.h" /***************************************************************************** * aout_sys_t: dsp audio output method descriptor diff --git a/plugins/dsp/dsp.c b/plugins/dsp/dsp.c index 5115cd945b..bdadf7694e 100644 --- a/plugins/dsp/dsp.c +++ b/plugins/dsp/dsp.c @@ -2,7 +2,7 @@ * dsp.c : OSS /dev/dsp module for vlc ***************************************************************************** * Copyright (C) 2000 VideoLAN - * $Id: dsp.c,v 1.8 2001/03/21 13:42:33 sam Exp $ + * $Id: dsp.c,v 1.9 2001/05/30 17:03:12 sam Exp $ * * Authors: Michel Kaempf * Samuel Hocevar @@ -39,15 +39,7 @@ #include "mtime.h" #include "modules.h" - -/***************************************************************************** - * Build configuration tree. - *****************************************************************************/ -MODULE_CONFIG_START -ADD_WINDOW( "Configuration for dsp module" ) - ADD_FRAME( "OSS Device" ) - ADD_FILE( "Device name: ", MODULE_VAR(device), NULL ) -MODULE_CONFIG_END +#include "modules_export.h" /***************************************************************************** * Capabilities defined in the other files. @@ -55,59 +47,24 @@ MODULE_CONFIG_END void _M( aout_getfunctions )( function_list_t * p_function_list ); /***************************************************************************** - * InitModule: get the module structure and configuration. - ***************************************************************************** - * We have to fill psz_name, psz_longname and psz_version. These variables - * will be strdup()ed later by the main application because the module can - * be unloaded later to save memory, and we want to be able to access this - * data even after the module has been unloaded. + * Build configuration tree. *****************************************************************************/ -MODULE_INIT -{ - p_module->psz_name = MODULE_STRING; - p_module->psz_longname = "Linux OSS /dev/dsp module"; - p_module->psz_version = VERSION; +MODULE_CONFIG_START +ADD_WINDOW( "Configuration for dsp module" ) + ADD_FRAME( "OSS Device" ) + ADD_FILE( "Device name: ", MODULE_VAR(device), NULL ) +MODULE_CONFIG_STOP +MODULE_INIT_START p_module->i_capabilities = MODULE_CAPABILITY_NULL | MODULE_CAPABILITY_AOUT; + p_module->psz_longname = "Linux OSS /dev/dsp module"; +MODULE_INIT_STOP - return( 0 ); -} - -/***************************************************************************** - * ActivateModule: set the module to an usable state. - ***************************************************************************** - * This function fills the capability functions and the configuration - * structure. Once ActivateModule() has been called, the i_usage can - * be set to 0 and calls to NeedModule() be made to increment it. To unload - * the module, one has to wait until i_usage == 0 and call DeactivateModule(). - *****************************************************************************/ -MODULE_ACTIVATE -{ - p_module->p_functions = malloc( sizeof( module_functions_t ) ); - if( p_module->p_functions == NULL ) - { - return( -1 ); - } - +MODULE_ACTIVATE_START _M( aout_getfunctions )( &p_module->p_functions->aout ); +MODULE_ACTIVATE_STOP - p_module->p_config = p_config; - - return( 0 ); -} - -/***************************************************************************** - * DeactivateModule: make sure the module can be unloaded. - ***************************************************************************** - * This function must only be called when i_usage == 0. If it successfully - * returns, i_usage can be set to -1 and the module unloaded. Be careful to - * lock usage_lock during the whole process. - *****************************************************************************/ -MODULE_DEACTIVATE -{ - free( p_module->p_functions ); - - return( 0 ); -} +MODULE_DEACTIVATE_START +MODULE_DEACTIVATE_STOP diff --git a/plugins/dummy/aout_dummy.c b/plugins/dummy/aout_dummy.c index 1413d645e6..6e4a6f8e32 100644 --- a/plugins/dummy/aout_dummy.c +++ b/plugins/dummy/aout_dummy.c @@ -2,7 +2,7 @@ * aout_dummy.c : dummy audio output plugin ***************************************************************************** * Copyright (C) 2000, 2001 VideoLAN - * $Id: aout_dummy.c,v 1.10 2001/03/21 13:42:33 sam Exp $ + * $Id: aout_dummy.c,v 1.11 2001/05/30 17:03:12 sam Exp $ * * Authors: Samuel Hocevar * @@ -40,6 +40,7 @@ #include "main.h" #include "modules.h" +#include "modules_export.h" /***************************************************************************** * vout_dummy_t: dummy video output method descriptor diff --git a/plugins/dummy/dummy.c b/plugins/dummy/dummy.c index 5392cc532a..6f7afecded 100644 --- a/plugins/dummy/dummy.c +++ b/plugins/dummy/dummy.c @@ -2,7 +2,7 @@ * dummy.c : dummy plugin for vlc ***************************************************************************** * Copyright (C) 2000, 2001 VideoLAN - * $Id: dummy.c,v 1.8 2001/03/21 13:42:33 sam Exp $ + * $Id: dummy.c,v 1.9 2001/05/30 17:03:12 sam Exp $ * * Authors: Samuel Hocevar * @@ -37,14 +37,7 @@ #include "mtime.h" #include "modules.h" - -/***************************************************************************** - * Build configuration tree. - *****************************************************************************/ -MODULE_CONFIG_START -ADD_WINDOW( "Configuration for dummy module" ) - ADD_COMMENT( "Ha, ha -- nothing to configure yet" ) -MODULE_CONFIG_END +#include "modules_export.h" /***************************************************************************** * Capabilities defined in the other files. @@ -54,63 +47,27 @@ void _M( vout_getfunctions )( function_list_t * p_function_list ); void _M( intf_getfunctions )( function_list_t * p_function_list ); /***************************************************************************** - * InitModule: get the module structure and configuration. - ***************************************************************************** - * We have to fill psz_name, psz_longname and psz_version. These variables - * will be strdup()ed later by the main application because the module can - * be unloaded later to save memory, and we want to be able to access this - * data even after the module has been unloaded. + * Build configuration tree. *****************************************************************************/ -MODULE_INIT -{ - p_module->psz_name = MODULE_STRING; - p_module->psz_longname = "dummy functions module"; - p_module->psz_version = VERSION; +MODULE_CONFIG_START +ADD_WINDOW( "Configuration for dummy module" ) + ADD_COMMENT( "Ha, ha -- nothing to configure yet" ) +MODULE_CONFIG_STOP +MODULE_INIT_START p_module->i_capabilities = MODULE_CAPABILITY_NULL | MODULE_CAPABILITY_AOUT | MODULE_CAPABILITY_VOUT | MODULE_CAPABILITY_INTF; + p_module->psz_longname = "dummy functions module"; +MODULE_INIT_STOP - return( 0 ); -} - -/***************************************************************************** - * ActivateModule: set the module to an usable state. - ***************************************************************************** - * This function fills the capability functions and the configuration - * structure. Once ActivateModule() has been called, the i_usage can - * be set to 0 and calls to NeedModule() be made to increment it. To unload - * the module, one has to wait until i_usage == 0 and call DeactivateModule(). - *****************************************************************************/ -MODULE_ACTIVATE -{ - p_module->p_functions = malloc( sizeof( module_functions_t ) ); - if( p_module->p_functions == NULL ) - { - return( -1 ); - } - +MODULE_ACTIVATE_START _M( aout_getfunctions )( &p_module->p_functions->aout ); _M( vout_getfunctions )( &p_module->p_functions->vout ); _M( intf_getfunctions )( &p_module->p_functions->intf ); +MODULE_ACTIVATE_STOP - p_module->p_config = p_config; - - return( 0 ); -} - -/***************************************************************************** - * DeactivateModule: make sure the module can be unloaded. - ***************************************************************************** - * This function must only be called when i_usage == 0. If it successfully - * returns, i_usage can be set to -1 and the module unloaded. Be careful to - * lock usage_lock during the whole process. - *****************************************************************************/ -MODULE_DEACTIVATE -{ - free( p_module->p_functions ); - - return( 0 ); -} +MODULE_DEACTIVATE_START +MODULE_DEACTIVATE_STOP diff --git a/plugins/dummy/intf_dummy.c b/plugins/dummy/intf_dummy.c index 68b6a380ae..0ff9e0488e 100644 --- a/plugins/dummy/intf_dummy.c +++ b/plugins/dummy/intf_dummy.c @@ -2,7 +2,7 @@ * intf_dummy.c: dummy interface plugin ***************************************************************************** * Copyright (C) 2000, 2001 VideoLAN - * $Id: intf_dummy.c,v 1.7 2001/03/21 13:42:33 sam Exp $ + * $Id: intf_dummy.c,v 1.8 2001/05/30 17:03:12 sam Exp $ * * Authors: Samuel Hocevar * @@ -43,6 +43,7 @@ #include "modules.h" #include "main.h" +#include "modules_export.h" /***************************************************************************** * intf_sys_t: description and status of FB interface diff --git a/plugins/dummy/vout_dummy.c b/plugins/dummy/vout_dummy.c index 834980902f..8e4899fe52 100644 --- a/plugins/dummy/vout_dummy.c +++ b/plugins/dummy/vout_dummy.c @@ -2,7 +2,7 @@ * vout_dummy.c: Dummy video output display method for testing purposes ***************************************************************************** * Copyright (C) 2000, 2001 VideoLAN - * $Id: vout_dummy.c,v 1.7 2001/03/21 13:42:33 sam Exp $ + * $Id: vout_dummy.c,v 1.8 2001/05/30 17:03:12 sam Exp $ * * Authors: Samuel Hocevar * @@ -45,6 +45,7 @@ #include "intf_msg.h" #include "modules.h" +#include "modules_export.h" #define DUMMY_WIDTH 16 #define DUMMY_HEIGHT 16 @@ -140,7 +141,7 @@ static int vout_Create( vout_thread_t *p_vout ) } /* Set and initialize buffers */ - vout_SetBuffers( p_vout, p_vout->p_sys->p_video, + p_vout->pf_setbuffers( p_vout, p_vout->p_sys->p_video, p_vout->p_sys->p_video + p_vout->p_sys->i_page_size ); return( 0 ); diff --git a/plugins/dvd/dvd.c b/plugins/dvd/dvd.c index cae22c04d4..1e6a195455 100644 --- a/plugins/dvd/dvd.c +++ b/plugins/dvd/dvd.c @@ -2,7 +2,7 @@ * dvd.c : DVD input module for vlc ***************************************************************************** * Copyright (C) 2000 VideoLAN - * $Id: dvd.c,v 1.8 2001/04/16 13:00:54 sam Exp $ + * $Id: dvd.c,v 1.9 2001/05/30 17:03:12 sam Exp $ * * Authors: Samuel Hocevar * @@ -43,96 +43,52 @@ #include "modules.h" -/***************************************************************************** - * Build configuration tree. - *****************************************************************************/ -MODULE_CONFIG_START -ADD_WINDOW( "Configuration for DVD module" ) - ADD_COMMENT( "foobar !" ) -MODULE_CONFIG_END - /***************************************************************************** * Capabilities defined in the other files. *****************************************************************************/ void _M( input_getfunctions )( function_list_t * p_function_list ); /***************************************************************************** - * InitModule: get the module structure and configuration. - ***************************************************************************** - * We have to fill psz_name, psz_longname and psz_version. These variables - * will be strdup()ed later by the main application because the module can - * be unloaded later to save memory, and we want to be able to access this - * data even after the module has been unloaded. + * Build configuration tree. *****************************************************************************/ -MODULE_INIT -{ - p_module->psz_name = MODULE_STRING; +MODULE_CONFIG_START +ADD_WINDOW( "Configuration for DVD module" ) + ADD_COMMENT( "foobar !" ) +MODULE_CONFIG_STOP + +MODULE_INIT_START + p_module->i_capabilities = MODULE_CAPABILITY_NULL + | MODULE_CAPABILITY_INPUT; #ifdef HAVE_CSS p_module->psz_longname = "full DVD input module with CSS decryption"; #else /* HAVE_CSS */ p_module->psz_longname = "DVD input module, CSS decryption disabled"; #endif /* HAVE_CSS */ - p_module->psz_version = VERSION; - - p_module->i_capabilities = MODULE_CAPABILITY_NULL - | MODULE_CAPABILITY_INPUT; - - return( 0 ); -} - -/***************************************************************************** - * ActivateModule: set the module to an usable state. - ***************************************************************************** - * This function fills the capability functions and the configuration - * structure. Once ActivateModule() has been called, the i_usage can - * be set to 0 and calls to NeedModule() be made to increment it. To unload - * the module, one has to wait until i_usage == 0 and call DeactivateModule(). - *****************************************************************************/ -MODULE_ACTIVATE -{ - p_module->p_functions = malloc( sizeof( module_functions_t ) ); - if( p_module->p_functions == NULL ) - { - return( -1 ); - } +MODULE_INIT_STOP +MODULE_ACTIVATE_START _M( input_getfunctions )( &p_module->p_functions->input ); +MODULE_ACTIVATE_STOP - p_module->p_config = p_config; - - return( 0 ); -} - -/***************************************************************************** - * DeactivateModule: make sure the module can be unloaded. - ***************************************************************************** - * This function must only be called when i_usage == 0. If it successfully - * returns, i_usage can be set to -1 and the module unloaded. Be careful to - * lock usage_lock during the whole process. - *****************************************************************************/ -MODULE_DEACTIVATE -{ - free( p_module->p_functions ); - - return( 0 ); -} +MODULE_DEACTIVATE_START +MODULE_DEACTIVATE_STOP #ifdef HAVE_CSS #else /* HAVE_CSS */ #ifdef BUILTIN int module_dvd_InitModule( module_t *p_module ) { - module_dvdnocss_InitModule( p_module ); + return module_dvdnocss_InitModule( p_module ); } int module_dvd_ActivateModule( module_t *p_module ) { - module_dvdnocss_ActivateModule( p_module ); + return module_dvdnocss_ActivateModule( p_module ); } int module_dvd_DeactivateModule( module_t *p_module ) { - module_dvdnocss_DeactivateModule( p_module ); + return module_dvdnocss_DeactivateModule( p_module ); } #endif /* BUILTIN */ #endif /* HAVE_CSS */ diff --git a/plugins/dvd/input_dvd.c b/plugins/dvd/input_dvd.c index 41bad50a3c..af0467adfc 100644 --- a/plugins/dvd/input_dvd.c +++ b/plugins/dvd/input_dvd.c @@ -10,7 +10,7 @@ * -dvd_udf to find files ***************************************************************************** * Copyright (C) 1998-2001 VideoLAN - * $Id: input_dvd.c,v 1.60 2001/05/19 00:39:30 stef Exp $ + * $Id: input_dvd.c,v 1.61 2001/05/30 17:03:12 sam Exp $ * * Author: Stéphane Borel * @@ -110,8 +110,8 @@ void _M( input_getfunctions )( function_list_t * p_function_list ) #define input p_function_list->functions.input p_function_list->pf_probe = DVDProbe; input.pf_init = DVDInit; - input.pf_open = input_FileOpen; - input.pf_close = input_FileClose; + input.pf_open = NULL; /* Set in DVDInit */ + input.pf_close = NULL; input.pf_end = DVDEnd; input.pf_read = DVDRead; input.pf_set_area = DVDSetArea; @@ -192,6 +192,10 @@ static void DVDInit( input_thread_t * p_input ) p_input->p_plugin_data = (void *)p_dvd; p_input->p_method_data = NULL; + /* Set callback */ + p_input->pf_open = p_input->pf_file_open; + p_input->pf_close = p_input->pf_file_close; + p_dvd->i_fd = p_input->i_handle; /* reading several block once seems to cause lock-up diff --git a/plugins/esd/aout_esd.c b/plugins/esd/aout_esd.c index 425ce3bb7b..182fd18afa 100644 --- a/plugins/esd/aout_esd.c +++ b/plugins/esd/aout_esd.c @@ -2,7 +2,7 @@ * aout_esd.c : Esound functions library ***************************************************************************** * Copyright (C) 2000 VideoLAN - * $Id: aout_esd.c,v 1.12 2001/05/25 04:23:37 sam Exp $ + * $Id: aout_esd.c,v 1.13 2001/05/30 17:03:12 sam Exp $ * * Authors: Samuel Hocevar * @@ -56,6 +56,7 @@ #include "main.h" #include "modules.h" +#include "modules_export.h" /***************************************************************************** * aout_sys_t: esd audio output method descriptor diff --git a/plugins/esd/esd.c b/plugins/esd/esd.c index c5edb89c30..3002a690ed 100644 --- a/plugins/esd/esd.c +++ b/plugins/esd/esd.c @@ -2,7 +2,7 @@ * esd.c : EsounD module ***************************************************************************** * Copyright (C) 2000, 2001 VideoLAN - * $Id: esd.c,v 1.7 2001/03/21 13:42:33 sam Exp $ + * $Id: esd.c,v 1.8 2001/05/30 17:03:12 sam Exp $ * * Authors: Samuel Hocevar * @@ -38,15 +38,7 @@ #include "mtime.h" #include "modules.h" - -/***************************************************************************** - * Build configuration tree. - *****************************************************************************/ -MODULE_CONFIG_START -ADD_WINDOW( "Configuration for esd module" ) - ADD_FRAME( "EsounD" ) - ADD_COMMENT( "This module does not need configuration" ) -MODULE_CONFIG_END +#include "modules_export.h" /***************************************************************************** * Capabilities defined in the other files. @@ -54,59 +46,24 @@ MODULE_CONFIG_END void _M( aout_getfunctions )( function_list_t * p_function_list ); /***************************************************************************** - * InitModule: get the module structure and configuration. - ***************************************************************************** - * We have to fill psz_name, psz_longname and psz_version. These variables - * will be strdup()ed later by the main application because the module can - * be unloaded later to save memory, and we want to be able to access this - * data even after the module has been unloaded. + * Build configuration tree. *****************************************************************************/ -MODULE_INIT -{ - p_module->psz_name = MODULE_STRING; - p_module->psz_longname = "EsounD audio module"; - p_module->psz_version = VERSION; +MODULE_CONFIG_START +ADD_WINDOW( "Configuration for esd module" ) + ADD_FRAME( "EsounD" ) + ADD_COMMENT( "This module does not need configuration" ) +MODULE_CONFIG_STOP +MODULE_INIT_START p_module->i_capabilities = MODULE_CAPABILITY_NULL | MODULE_CAPABILITY_AOUT; + p_module->psz_longname = "EsounD audio module"; +MODULE_INIT_STOP - return( 0 ); -} - -/***************************************************************************** - * ActivateModule: set the module to an usable state. - ***************************************************************************** - * This function fills the capability functions and the configuration - * structure. Once ActivateModule() has been called, the i_usage can - * be set to 0 and calls to NeedModule() be made to increment it. To unload - * the module, one has to wait until i_usage == 0 and call DeactivateModule(). - *****************************************************************************/ -MODULE_ACTIVATE -{ - p_module->p_functions = malloc( sizeof( module_functions_t ) ); - if( p_module->p_functions == NULL ) - { - return( -1 ); - } - +MODULE_ACTIVATE_START _M( aout_getfunctions )( &p_module->p_functions->aout ); +MODULE_ACTIVATE_STOP - p_module->p_config = p_config; - - return( 0 ); -} - -/***************************************************************************** - * DeactivateModule: make sure the module can be unloaded. - ***************************************************************************** - * This function must only be called when i_usage == 0. If it successfully - * returns, i_usage can be set to -1 and the module unloaded. Be careful to - * lock usage_lock during the whole process. - *****************************************************************************/ -MODULE_DEACTIVATE -{ - free( p_module->p_functions ); - - return( 0 ); -} +MODULE_DEACTIVATE_START +MODULE_DEACTIVATE_STOP diff --git a/plugins/fb/fb.c b/plugins/fb/fb.c index a2f157d495..7a9979f97a 100644 --- a/plugins/fb/fb.c +++ b/plugins/fb/fb.c @@ -2,7 +2,7 @@ * fb.c : framebuffer plugin for vlc ***************************************************************************** * Copyright (C) 2000, 2001 VideoLAN - * $Id: fb.c,v 1.6 2001/04/28 03:36:25 sam Exp $ + * $Id: fb.c,v 1.7 2001/05/30 17:03:12 sam Exp $ * * Authors: Samuel Hocevar * @@ -40,14 +40,7 @@ #include "video_output.h" #include "modules.h" - -/***************************************************************************** - * Building configuration tree - *****************************************************************************/ -MODULE_CONFIG_START -ADD_WINDOW( "Configuration for framebuffer module" ) - ADD_COMMENT( "For now, the framebuffer module cannot be configured" ) -MODULE_CONFIG_END +#include "modules_export.h" /***************************************************************************** * Capabilities defined in the other files. @@ -55,59 +48,23 @@ MODULE_CONFIG_END void _M( vout_getfunctions )( function_list_t * p_function_list ); /***************************************************************************** - * InitModule: get the module structure and configuration. - ***************************************************************************** - * We have to fill psz_name, psz_longname and psz_version. These variables - * will be strdup()ed later by the main application because the module can - * be unloaded later to save memory, and we want to be able to access this - * data even after the module has been unloaded. + * Building configuration tree *****************************************************************************/ -MODULE_INIT -{ - p_module->psz_name = MODULE_STRING; - p_module->psz_longname = "Linux console framebuffer module"; - p_module->psz_version = VERSION; +MODULE_CONFIG_START +ADD_WINDOW( "Configuration for framebuffer module" ) + ADD_COMMENT( "For now, the framebuffer module cannot be configured" ) +MODULE_CONFIG_STOP +MODULE_INIT_START p_module->i_capabilities = MODULE_CAPABILITY_NULL | MODULE_CAPABILITY_VOUT; + p_module->psz_longname = "Linux console framebuffer module"; +MODULE_INIT_STOP - return( 0 ); -} - -/***************************************************************************** - * ActivateModule: set the module to an usable state. - ***************************************************************************** - * This function fills the capability functions and the configuration - * structure. Once ActivateModule() has been called, the i_usage can - * be set to 0 and calls to NeedModule() be made to increment it. To unload - * the module, one has to wait until i_usage == 0 and call DeactivateModule(). - *****************************************************************************/ -MODULE_ACTIVATE -{ - p_module->p_functions = malloc( sizeof( module_functions_t ) ); - if( p_module->p_functions == NULL ) - { - return( -1 ); - } - +MODULE_ACTIVATE_START _M( vout_getfunctions )( &p_module->p_functions->vout ); +MODULE_ACTIVATE_STOP - p_module->p_config = p_config; - - return( 0 ); -} - -/***************************************************************************** - * DeactivateModule: make sure the module can be unloaded. - ***************************************************************************** - * This function must only be called when i_usage == 0. If it successfully - * returns, i_usage can be set to -1 and the module unloaded. Be careful to - * lock usage_lock during the whole process. - *****************************************************************************/ -MODULE_DEACTIVATE -{ - free( p_module->p_functions ); - - return( 0 ); -} +MODULE_DEACTIVATE_START +MODULE_DEACTIVATE_STOP diff --git a/plugins/fb/vout_fb.c b/plugins/fb/vout_fb.c index bc85718d11..8111a033a4 100644 --- a/plugins/fb/vout_fb.c +++ b/plugins/fb/vout_fb.c @@ -2,7 +2,7 @@ * vout_fb.c: framebuffer video output display method ***************************************************************************** * Copyright (C) 1998, 1999, 2000, 2001 VideoLAN - * $Id: vout_fb.c,v 1.12 2001/05/07 03:14:09 stef Exp $ + * $Id: vout_fb.c,v 1.13 2001/05/30 17:03:12 sam Exp $ * * Authors: Samuel Hocevar * @@ -57,6 +57,8 @@ #include "intf_msg.h" #include "main.h" +#include "modules_export.h" + /***************************************************************************** * vout_sys_t: video output framebuffer method descriptor ***************************************************************************** @@ -563,13 +565,13 @@ static int FBOpenDisplay( vout_thread_t *p_vout ) /* Set and initialize buffers */ if( p_vout->p_sys->b_pan ) { - vout_SetBuffers( p_vout, p_vout->p_sys->p_video, + p_vout->pf_setbuffers( p_vout, p_vout->p_sys->p_video, p_vout->p_sys->p_video + p_vout->p_sys->i_page_size ); } else { - vout_SetBuffers( p_vout, p_vout->p_sys->p_video, + p_vout->pf_setbuffers( p_vout, p_vout->p_sys->p_video, p_vout->p_sys->p_video ); } @@ -608,6 +610,7 @@ static void FBCloseDisplay( vout_thread_t *p_vout ) *****************************************************************************/ static void FBSwitchDisplay(int i_signal) { +#if 0 vout_thread_t *p_vout; vlc_mutex_lock( &p_vout_bank->lock ); @@ -635,6 +638,7 @@ static void FBSwitchDisplay(int i_signal) } vlc_mutex_unlock( &p_vout_bank->lock ); +#endif } /***************************************************************************** diff --git a/plugins/ggi/ggi.c b/plugins/ggi/ggi.c index d6dad64b70..894bab5326 100644 --- a/plugins/ggi/ggi.c +++ b/plugins/ggi/ggi.c @@ -2,7 +2,7 @@ * ggi.c : GGI plugin for vlc ***************************************************************************** * Copyright (C) 2000, 2001 VideoLAN - * $Id: ggi.c,v 1.6 2001/04/28 03:36:25 sam Exp $ + * $Id: ggi.c,v 1.7 2001/05/30 17:03:12 sam Exp $ * * Authors: Samuel Hocevar * @@ -40,14 +40,7 @@ #include "video_output.h" #include "modules.h" - -/***************************************************************************** - * Building configuration tree - *****************************************************************************/ -MODULE_CONFIG_START -ADD_WINDOW( "Configuration for GGI module" ) - ADD_COMMENT( "For now, the GGI module cannot be configured" ) -MODULE_CONFIG_END +#include "modules_export.h" /***************************************************************************** * Capabilities defined in the other files. @@ -55,59 +48,23 @@ MODULE_CONFIG_END void _M( vout_getfunctions )( function_list_t * p_function_list ); /***************************************************************************** - * InitModule: get the module structure and configuration. - ***************************************************************************** - * We have to fill psz_name, psz_longname and psz_version. These variables - * will be strdup()ed later by the main application because the module can - * be unloaded later to save memory, and we want to be able to access this - * data even after the module has been unloaded. + * Building configuration tree *****************************************************************************/ -MODULE_INIT -{ - p_module->psz_name = MODULE_STRING; - p_module->psz_longname = "General Graphics Interface module"; - p_module->psz_version = VERSION; +MODULE_CONFIG_START +ADD_WINDOW( "Configuration for GGI module" ) + ADD_COMMENT( "For now, the GGI module cannot be configured" ) +MODULE_CONFIG_STOP +MODULE_INIT_START p_module->i_capabilities = MODULE_CAPABILITY_NULL | MODULE_CAPABILITY_VOUT; + p_module->psz_longname = "General Graphics Interface module"; +MODULE_INIT_STOP - return( 0 ); -} - -/***************************************************************************** - * ActivateModule: set the module to an usable state. - ***************************************************************************** - * This function fills the capability functions and the configuration - * structure. Once ActivateModule() has been called, the i_usage can - * be set to 0 and calls to NeedModule() be made to increment it. To unload - * the module, one has to wait until i_usage == 0 and call DeactivateModule(). - *****************************************************************************/ -MODULE_ACTIVATE -{ - p_module->p_functions = malloc( sizeof( module_functions_t ) ); - if( p_module->p_functions == NULL ) - { - return( -1 ); - } - +MODULE_ACTIVATE_START _M( vout_getfunctions )( &p_module->p_functions->vout ); +MODULE_ACTIVATE_STOP - p_module->p_config = p_config; - - return( 0 ); -} - -/***************************************************************************** - * DeactivateModule: make sure the module can be unloaded. - ***************************************************************************** - * This function must only be called when i_usage == 0. If it successfully - * returns, i_usage can be set to -1 and the module unloaded. Be careful to - * lock usage_lock during the whole process. - *****************************************************************************/ -MODULE_DEACTIVATE -{ - free( p_module->p_functions ); - - return( 0 ); -} +MODULE_DEACTIVATE_START +MODULE_DEACTIVATE_STOP diff --git a/plugins/ggi/vout_ggi.c b/plugins/ggi/vout_ggi.c index 76ea182f1c..e682259284 100644 --- a/plugins/ggi/vout_ggi.c +++ b/plugins/ggi/vout_ggi.c @@ -2,7 +2,7 @@ * vout_ggi.c: GGI video output display method ***************************************************************************** * Copyright (C) 1998, 1999, 2000, 2001 VideoLAN - * $Id: vout_ggi.c,v 1.9 2001/04/06 09:15:47 sam Exp $ + * $Id: vout_ggi.c,v 1.10 2001/05/30 17:03:12 sam Exp $ * * Authors: Vincent Seguin * Samuel Hocevar @@ -51,6 +51,8 @@ #include "main.h" +#include "modules_export.h" + /***************************************************************************** * vout_sys_t: video output GGI method descriptor ***************************************************************************** @@ -225,7 +227,7 @@ int vout_Manage( vout_thread_t *p_vout ) case 'Q': case GIIUC_Escape: /* FIXME pass message ! */ - p_main->p_intf->b_die = 1; + //p_main->p_intf->b_die = 1; break; default: @@ -239,7 +241,7 @@ int vout_Manage( vout_thread_t *p_vout ) { case GII_PBUTTON_RIGHT: /* FIXME: need locking ! */ - p_main->p_intf->b_menu_change = 1; + //p_main->p_intf->b_menu_change = 1; break; } break; @@ -423,7 +425,7 @@ static int GGIOpenDisplay( vout_thread_t *p_vout ) /* FIXME: set palette in 8bpp */ /* Set and initialize buffers */ - vout_SetBuffers( p_vout, p_b[ 0 ]->write, p_b[ 1 ]->write ); + p_vout->pf_setbuffers( p_vout, p_b[ 0 ]->write, p_b[ 1 ]->write ); return( 0 ); #undef p_b diff --git a/plugins/glide/Makefile b/plugins/glide/Makefile index 11033e1ded..c8ebf7e1cf 100644 --- a/plugins/glide/Makefile +++ b/plugins/glide/Makefile @@ -20,7 +20,7 @@ include ../../Makefile.modules $(PLUGIN_GLIDE): %.o: .dep/%.d $(PLUGIN_GLIDE): %.o: %.c - $(CC) $(CFLAGS) $(PCFLAGS) -I/usr/include/glide -c -o $@ $< + $(CC) $(CFLAGS) -DPLUGIN $(PCFLAGS) -I/usr/include/glide -c -o $@ $< $(BUILTIN_GLIDE): BUILTIN_%.o: .dep/%.d $(BUILTIN_GLIDE): BUILTIN_%.o: %.c diff --git a/plugins/glide/glide.c b/plugins/glide/glide.c index 86c255a0d7..f51d6255e1 100644 --- a/plugins/glide/glide.c +++ b/plugins/glide/glide.c @@ -2,7 +2,7 @@ * glide.c : 3dfx Glide plugin for vlc ***************************************************************************** * Copyright (C) 2000, 2001 VideoLAN - * $Id: glide.c,v 1.5 2001/04/28 03:36:25 sam Exp $ + * $Id: glide.c,v 1.6 2001/05/30 17:03:12 sam Exp $ * * Authors: Samuel Hocevar * @@ -40,14 +40,7 @@ #include "video_output.h" #include "modules.h" - -/***************************************************************************** - * Building configuration tree - *****************************************************************************/ -MODULE_CONFIG_START -ADD_WINDOW( "Configuration for Glide module" ) - ADD_COMMENT( "For now, the Glide module cannot be configured" ) -MODULE_CONFIG_END +#include "modules_export.h" /***************************************************************************** * Capabilities defined in the other files. @@ -55,59 +48,23 @@ MODULE_CONFIG_END void _M( vout_getfunctions )( function_list_t * p_function_list ); /***************************************************************************** - * InitModule: get the module structure and configuration. - ***************************************************************************** - * We have to fill psz_name, psz_longname and psz_version. These variables - * will be strdup()ed later by the main application because the module can - * be unloaded later to save memory, and we want to be able to access this - * data even after the module has been unloaded. + * Building configuration tree *****************************************************************************/ -MODULE_INIT -{ - p_module->psz_name = MODULE_STRING; - p_module->psz_longname = "3dfx Glide module"; - p_module->psz_version = VERSION; +MODULE_CONFIG_START +ADD_WINDOW( "Configuration for Glide module" ) + ADD_COMMENT( "For now, the Glide module cannot be configured" ) +MODULE_CONFIG_STOP +MODULE_INIT_START p_module->i_capabilities = MODULE_CAPABILITY_NULL | MODULE_CAPABILITY_VOUT; + p_module->psz_longname = "3dfx Glide module"; +MODULE_INIT_STOP - return( 0 ); -} - -/***************************************************************************** - * ActivateModule: set the module to an usable state. - ***************************************************************************** - * This function fills the capability functions and the configuration - * structure. Once ActivateModule() has been called, the i_usage can - * be set to 0 and calls to NeedModule() be made to increment it. To unload - * the module, one has to wait until i_usage == 0 and call DeactivateModule(). - *****************************************************************************/ -MODULE_ACTIVATE -{ - p_module->p_functions = malloc( sizeof( module_functions_t ) ); - if( p_module->p_functions == NULL ) - { - return( -1 ); - } - +MODULE_ACTIVATE_START _M( vout_getfunctions )( &p_module->p_functions->vout ); +MODULE_ACTIVATE_STOP - p_module->p_config = p_config; - - return( 0 ); -} - -/***************************************************************************** - * DeactivateModule: make sure the module can be unloaded. - ***************************************************************************** - * This function must only be called when i_usage == 0. If it successfully - * returns, i_usage can be set to -1 and the module unloaded. Be careful to - * lock usage_lock during the whole process. - *****************************************************************************/ -MODULE_DEACTIVATE -{ - free( p_module->p_functions ); - - return( 0 ); -} +MODULE_DEACTIVATE_START +MODULE_DEACTIVATE_STOP diff --git a/plugins/glide/vout_glide.c b/plugins/glide/vout_glide.c index afe5314d50..4f0bf1550c 100644 --- a/plugins/glide/vout_glide.c +++ b/plugins/glide/vout_glide.c @@ -2,7 +2,7 @@ * vout_glide.c: 3dfx video output display method for 3dfx cards ***************************************************************************** * Copyright (C) 2000, 2001 VideoLAN - * $Id: vout_glide.c,v 1.6 2001/03/21 13:42:34 sam Exp $ + * $Id: vout_glide.c,v 1.7 2001/05/30 17:03:12 sam Exp $ * * Authors: Samuel Hocevar * @@ -44,7 +44,6 @@ #include "threads.h" #include "mtime.h" #include "tests.h" -#include "modules.h" #include "video.h" #include "video_output.h" @@ -54,6 +53,9 @@ #include "main.h" +#include "modules.h" +#include "modules_export.h" + #define GLIDE_WIDTH 800 #define GLIDE_HEIGHT 600 #define GLIDE_BITS_PER_PLANE 16 @@ -320,8 +322,8 @@ static int GlideOpenDisplay( vout_thread_t *p_vout ) grBufferClear( 0, 0, 0 ); /* Set and initialize buffers */ - vout_SetBuffers( p_vout, p_vout->p_sys->p_buffer_info.lfbPtr, - p_front_buffer_info.lfbPtr ); + p_vout->pf_setbuffers( p_vout, p_vout->p_sys->p_buffer_info.lfbPtr, + p_front_buffer_info.lfbPtr ); return( 0 ); } diff --git a/plugins/gtk/Makefile b/plugins/gtk/Makefile index e34b8ad036..03b4a65172 100644 --- a/plugins/gtk/Makefile +++ b/plugins/gtk/Makefile @@ -27,20 +27,20 @@ include ../../Makefile.modules $(PLUGIN_GTKCOMMON): %.o: .dep/%.d $(PLUGIN_GTKCOMMON): %.o: %.c - $(CC) $(CFLAGS) $(PCFLAGS) $(CFLAGS_GTK) -c -o $@ $< + $(CC) $(CFLAGS) $(PCFLAGS) $(CFLAGS_GTK) -DPLUGIN -c -o $@ $< $(PLUGIN_GTK): %.o: .dep/%.d $(PLUGIN_GTK): %.o: %.c - $(CC) $(CFLAGS) $(PCFLAGS) $(CFLAGS_GTK) -DMODULE_NAME=gtk -c -o $@ $< - -$(PLUGIN_GNOME): %.o: .dep/%.d -$(PLUGIN_GNOME): %.o: %.c - $(CC) $(CFLAGS) $(PCFLAGS) -DMODULE_NAME=gnome `gnome-config --cflags gtk gnomeui` -c -o $@ $< + $(CC) $(CFLAGS) $(PCFLAGS) $(CFLAGS_GTK) -DPLUGIN -DMODULE_NAME=gtk -c -o $@ $< $(BUILTIN_GTK): BUILTIN_GTK_%.o: .dep/%.d $(BUILTIN_GTK): BUILTIN_GTK_%.o: %.c $(CC) $(CFLAGS) $(CFLAGS_GTK) -DBUILTIN -DMODULE_NAME=gtk -c -o $@ $< +$(PLUGIN_GNOME): %.o: .dep/%.d +$(PLUGIN_GNOME): %.o: %.c + $(CC) $(CFLAGS) $(PCFLAGS) -DPLUGIN -DMODULE_NAME=gnome `gnome-config --cflags gtk gnomeui` -c -o $@ $< + $(BUILTIN_GNOME): BUILTIN_GNOME_%.o: .dep/%.d $(BUILTIN_GNOME): BUILTIN_GNOME_%.o: %.c $(CC) $(CFLAGS) -DBUILTIN -DMODULE_NAME=gnome `gnome-config --cflags gtk gnomeui` -c -o $@ $< @@ -64,3 +64,4 @@ $(BUILTIN_GNOME): BUILTIN_GNOME_%.o: %.c ../../lib/gnome.a: $(BUILTIN_GNOME) ar r $@ $^ $(RANLIB) $@ + diff --git a/plugins/gtk/gnome.c b/plugins/gtk/gnome.c index fb41c11c32..d4fd605af7 100644 --- a/plugins/gtk/gnome.c +++ b/plugins/gtk/gnome.c @@ -2,7 +2,7 @@ * gnome.c : Gnome plugin for vlc ***************************************************************************** * Copyright (C) 2000 VideoLAN - * $Id: gnome.c,v 1.1 2001/05/23 23:08:20 stef Exp $ + * $Id: gnome.c,v 1.2 2001/05/30 17:03:12 sam Exp $ * * Authors: Samuel Hocevar * @@ -37,14 +37,7 @@ #include "mtime.h" #include "modules.h" - -/***************************************************************************** - * Building configuration tree - *****************************************************************************/ -MODULE_CONFIG_START -ADD_WINDOW( "Configuration for Gnome module" ) - ADD_COMMENT( "For now, the Gnome module cannot be configured" ) -MODULE_CONFIG_END +#include "modules_export.h" /***************************************************************************** * Capabilities defined in the other files. @@ -52,59 +45,23 @@ MODULE_CONFIG_END void _M( intf_getfunctions )( function_list_t * p_function_list ); /***************************************************************************** - * InitModule: get the module structure and configuration. - ***************************************************************************** - * We have to fill psz_name, psz_longname and psz_version. These variables - * will be strdup()ed later by the main application because the module can - * be unloaded later to save memory, and we want to be able to access this - * data even after the module has been unloaded. + * Building configuration tree *****************************************************************************/ -MODULE_INIT -{ - p_module->psz_name = MODULE_STRING; - p_module->psz_longname = "Gnome interface module"; - p_module->psz_version = VERSION; +MODULE_CONFIG_START +ADD_WINDOW( "Configuration for Gnome module" ) + ADD_COMMENT( "For now, the Gnome module cannot be configured" ) +MODULE_CONFIG_STOP +MODULE_INIT_START p_module->i_capabilities = MODULE_CAPABILITY_NULL | MODULE_CAPABILITY_INTF; + p_module->psz_longname = "Gnome interface module"; +MODULE_INIT_STOP - return( 0 ); -} - -/***************************************************************************** - * ActivateModule: set the module to an usable state. - ***************************************************************************** - * This function fills the capability functions and the configuration - * structure. Once ActivateModule() has been called, the i_usage can - * be set to 0 and calls to NeedModule() be made to increment it. To unload - * the module, one has to wait until i_usage == 0 and call DeactivateModule(). - *****************************************************************************/ -MODULE_ACTIVATE -{ - p_module->p_functions = malloc( sizeof( module_functions_t ) ); - if( p_module->p_functions == NULL ) - { - return( -1 ); - } - +MODULE_ACTIVATE_START _M( intf_getfunctions )( &p_module->p_functions->intf ); +MODULE_ACTIVATE_STOP - p_module->p_config = p_config; - - return( 0 ); -} - -/***************************************************************************** - * DeactivateModule: make sure the module can be unloaded. - ***************************************************************************** - * This function must only be called when i_usage == 0. If it successfully - * returns, i_usage can be set to -1 and the module unloaded. Be careful to - * lock usage_lock during the whole process. - *****************************************************************************/ -MODULE_DEACTIVATE -{ - free( p_module->p_functions ); - - return( 0 ); -} +MODULE_DEACTIVATE_START +MODULE_DEACTIVATE_STOP diff --git a/plugins/gtk/gtk.c b/plugins/gtk/gtk.c index f6ea542fc0..482df009b1 100644 --- a/plugins/gtk/gtk.c +++ b/plugins/gtk/gtk.c @@ -2,7 +2,7 @@ * gtk.c : Gtk+ plugin for vlc ***************************************************************************** * Copyright (C) 2000 VideoLAN - * $Id: gtk.c,v 1.3 2001/04/28 03:36:25 sam Exp $ + * $Id: gtk.c,v 1.4 2001/05/30 17:03:12 sam Exp $ * * Authors: Samuel Hocevar * @@ -37,14 +37,7 @@ #include "mtime.h" #include "modules.h" - -/***************************************************************************** - * Building configuration tree - *****************************************************************************/ -MODULE_CONFIG_START -ADD_WINDOW( "Configuration for Gtk+ module" ) - ADD_COMMENT( "For now, the Gtk+ module cannot be configured" ) -MODULE_CONFIG_END +#include "modules_export.h" /***************************************************************************** * Capabilities defined in the other files. @@ -52,59 +45,23 @@ MODULE_CONFIG_END void _M( intf_getfunctions )( function_list_t * p_function_list ); /***************************************************************************** - * InitModule: get the module structure and configuration. - ***************************************************************************** - * We have to fill psz_name, psz_longname and psz_version. These variables - * will be strdup()ed later by the main application because the module can - * be unloaded later to save memory, and we want to be able to access this - * data even after the module has been unloaded. + * Building configuration tree *****************************************************************************/ -MODULE_INIT -{ - p_module->psz_name = MODULE_STRING; - p_module->psz_longname = "Gtk+ interface module"; - p_module->psz_version = VERSION; +MODULE_CONFIG_START +ADD_WINDOW( "Configuration for Gtk+ module" ) + ADD_COMMENT( "For now, the Gtk+ module cannot be configured" ) +MODULE_CONFIG_STOP +MODULE_INIT_START p_module->i_capabilities = MODULE_CAPABILITY_NULL | MODULE_CAPABILITY_INTF; + p_module->psz_longname = "Gtk+ interface module"; +MODULE_INIT_STOP - return( 0 ); -} - -/***************************************************************************** - * ActivateModule: set the module to an usable state. - ***************************************************************************** - * This function fills the capability functions and the configuration - * structure. Once ActivateModule() has been called, the i_usage can - * be set to 0 and calls to NeedModule() be made to increment it. To unload - * the module, one has to wait until i_usage == 0 and call DeactivateModule(). - *****************************************************************************/ -MODULE_ACTIVATE -{ - p_module->p_functions = malloc( sizeof( module_functions_t ) ); - if( p_module->p_functions == NULL ) - { - return( -1 ); - } - +MODULE_ACTIVATE_START _M( intf_getfunctions )( &p_module->p_functions->intf ); +MODULE_ACTIVATE_STOP - p_module->p_config = p_config; - - return( 0 ); -} - -/***************************************************************************** - * DeactivateModule: make sure the module can be unloaded. - ***************************************************************************** - * This function must only be called when i_usage == 0. If it successfully - * returns, i_usage can be set to -1 and the module unloaded. Be careful to - * lock usage_lock during the whole process. - *****************************************************************************/ -MODULE_DEACTIVATE -{ - free( p_module->p_functions ); - - return( 0 ); -} +MODULE_DEACTIVATE_START +MODULE_DEACTIVATE_STOP diff --git a/plugins/gtk/gtk_callbacks.c b/plugins/gtk/gtk_callbacks.c index 96c9405ca5..021521ba53 100644 --- a/plugins/gtk/gtk_callbacks.c +++ b/plugins/gtk/gtk_callbacks.c @@ -2,7 +2,7 @@ * gtk_callbacks.c : Callbacks for the Gtk+ plugin. ***************************************************************************** * Copyright (C) 2000, 2001 VideoLAN - * $Id: gtk_callbacks.c,v 1.21 2001/05/30 05:19:03 stef Exp $ + * $Id: gtk_callbacks.c,v 1.22 2001/05/30 17:03:12 sam Exp $ * * Authors: Samuel Hocevar * Stéphane Borel @@ -56,6 +56,8 @@ #include "main.h" #include "netutils.h" +#include "modules_export.h" + /***************************************************************************** * Callbacks *****************************************************************************/ diff --git a/plugins/gtk/gtk_control.c b/plugins/gtk/gtk_control.c index 0141aec69c..7f6781f7b7 100644 --- a/plugins/gtk/gtk_control.c +++ b/plugins/gtk/gtk_control.c @@ -2,7 +2,7 @@ * gtk_control.c : functions to handle stream control buttons. ***************************************************************************** * Copyright (C) 2000, 2001 VideoLAN - * $Id: gtk_control.c,v 1.3 2001/05/23 23:08:20 stef Exp $ + * $Id: gtk_control.c,v 1.4 2001/05/30 17:03:12 sam Exp $ * * Authors: Samuel Hocevar * Stéphane Borel @@ -53,6 +53,8 @@ #include "main.h" +#include "modules_export.h" + /**************************************************************************** * Control functions: this is where the functions are defined **************************************************************************** diff --git a/plugins/gtk/gtk_display.c b/plugins/gtk/gtk_display.c index e1d6b854ef..87610d668c 100644 --- a/plugins/gtk/gtk_display.c +++ b/plugins/gtk/gtk_display.c @@ -2,7 +2,7 @@ * gtk_display.c: Gtk+ tools for main interface ***************************************************************************** * Copyright (C) 1999, 2000 VideoLAN - * $Id: gtk_display.c,v 1.2 2001/05/30 05:19:03 stef Exp $ + * $Id: gtk_display.c,v 1.3 2001/05/30 17:03:12 sam Exp $ * * Authors: Samuel Hocevar * Stéphane Borel @@ -60,6 +60,8 @@ #include "main.h" +#include "modules_export.h" + /***************************************************************************** * GtkDisplayDate: display stream date ***************************************************************************** diff --git a/plugins/gtk/gtk_menu.c b/plugins/gtk/gtk_menu.c index 40d7774813..406ba655ab 100644 --- a/plugins/gtk/gtk_menu.c +++ b/plugins/gtk/gtk_menu.c @@ -2,7 +2,7 @@ * gtk_menu.c : functions to handle menu items. ***************************************************************************** * Copyright (C) 2000, 2001 VideoLAN - * $Id: gtk_menu.c,v 1.5 2001/05/24 01:24:47 stef Exp $ + * $Id: gtk_menu.c,v 1.6 2001/05/30 17:03:12 sam Exp $ * * Authors: Samuel Hocevar * Stéphane Borel @@ -57,6 +57,8 @@ #include "main.h" +#include "modules_export.h" + /* * Local Prototypes */ diff --git a/plugins/gtk/gtk_open.c b/plugins/gtk/gtk_open.c index d7bc7980f3..b8ac154cc1 100644 --- a/plugins/gtk/gtk_open.c +++ b/plugins/gtk/gtk_open.c @@ -2,7 +2,7 @@ * gtk_open.c : functions to handle file/disc/network open widgets. ***************************************************************************** * Copyright (C) 2000, 2001 VideoLAN - * $Id: gtk_open.c,v 1.3 2001/05/23 23:08:20 stef Exp $ + * $Id: gtk_open.c,v 1.4 2001/05/30 17:03:12 sam Exp $ * * Authors: Samuel Hocevar * Stéphane Borel @@ -53,6 +53,8 @@ #include "main.h" +#include "modules_export.h" + /***************************************************************************** * Fileopen callbacks ***************************************************************************** diff --git a/plugins/gtk/gtk_playlist.c b/plugins/gtk/gtk_playlist.c index 72fabe8b96..d6201ddfa4 100644 --- a/plugins/gtk/gtk_playlist.c +++ b/plugins/gtk/gtk_playlist.c @@ -2,7 +2,7 @@ * gtk_playlist.c : Interface for the playlist dialog ***************************************************************************** * Copyright (C) 2001 VideoLAN - * $Id: gtk_playlist.c,v 1.14 2001/05/23 23:08:20 stef Exp $ + * $Id: gtk_playlist.c,v 1.15 2001/05/30 17:03:12 sam Exp $ * * Authors: Pierre Baillet * Stéphane Borel @@ -49,7 +49,6 @@ #include "interface.h" #include "intf_playlist.h" #include "intf_msg.h" -#include "intf_urldecode.h" #include "gtk_callbacks.h" #include "gtk_interface.h" @@ -57,9 +56,10 @@ #include "gtk_playlist.h" #include "intf_gtk.h" - #include "main.h" +#include "modules_export.h" + /**************************************************************************** * Playlist window management ****************************************************************************/ @@ -430,7 +430,7 @@ void GtkDropDataReceived( intf_thread_t * p_intf, */ if( i_info == DROP_ACCEPT_TEXT_URI_LIST ) { - urldecode_path( p_string ); + intf_UrlDecode( p_string ); } /* this cuts string into single file drops */ diff --git a/plugins/gtk/gtk_preferences.c b/plugins/gtk/gtk_preferences.c index f2db81df19..647c907b95 100644 --- a/plugins/gtk/gtk_preferences.c +++ b/plugins/gtk/gtk_preferences.c @@ -2,7 +2,7 @@ * gtk_control.c : functions to handle stream control buttons. ***************************************************************************** * Copyright (C) 2000, 2001 VideoLAN - * $Id: gtk_preferences.c,v 1.4 2001/05/30 05:19:03 stef Exp $ + * $Id: gtk_preferences.c,v 1.5 2001/05/30 17:03:12 sam Exp $ * * Authors: Samuel Hocevar * Stéphane Borel @@ -53,6 +53,8 @@ #include "main.h" +#include "modules_export.h" + /**************************************************************************** * GtkPreferencesShow: display interface window after initialization * if necessary diff --git a/plugins/gtk/intf_gnome.c b/plugins/gtk/intf_gnome.c index b18c1c6a99..1ddfcfb9be 100644 --- a/plugins/gtk/intf_gnome.c +++ b/plugins/gtk/intf_gnome.c @@ -2,7 +2,7 @@ * intf_gnome.c: Gnome interface ***************************************************************************** * Copyright (C) 1999, 2000 VideoLAN - * $Id: intf_gnome.c,v 1.1 2001/05/23 23:08:20 stef Exp $ + * $Id: intf_gnome.c,v 1.2 2001/05/30 17:03:12 sam Exp $ * * Authors: Samuel Hocevar * Stéphane Borel @@ -42,7 +42,6 @@ #include "threads.h" #include "mtime.h" #include "tests.h" -#include "modules.h" #include "stream_control.h" #include "input_ext-intf.h" @@ -62,6 +61,9 @@ #include "main.h" +#include "modules.h" +#include "modules_export.h" + /***************************************************************************** * Local prototypes. *****************************************************************************/ diff --git a/plugins/gtk/intf_gtk.c b/plugins/gtk/intf_gtk.c index b5504598b1..3398b810df 100644 --- a/plugins/gtk/intf_gtk.c +++ b/plugins/gtk/intf_gtk.c @@ -2,7 +2,7 @@ * intf_gtk.c: Gtk+ interface ***************************************************************************** * Copyright (C) 1999, 2000 VideoLAN - * $Id: intf_gtk.c,v 1.21 2001/05/23 23:08:20 stef Exp $ + * $Id: intf_gtk.c,v 1.22 2001/05/30 17:03:12 sam Exp $ * * Authors: Samuel Hocevar * Stéphane Borel @@ -42,7 +42,6 @@ #include "threads.h" #include "mtime.h" #include "tests.h" -#include "modules.h" #include "stream_control.h" #include "input_ext-intf.h" @@ -63,6 +62,9 @@ #include "main.h" +#include "modules.h" +#include "modules_export.h" + /***************************************************************************** * Local prototypes. *****************************************************************************/ diff --git a/plugins/idct/Makefile b/plugins/idct/Makefile index cf3a25d6b8..0d098d6b97 100644 --- a/plugins/idct/Makefile +++ b/plugins/idct/Makefile @@ -43,7 +43,7 @@ include ../../Makefile.modules $(PLUGIN_IDCTALTIVEC): %.o: .dep/%.d $(PLUGIN_IDCTALTIVEC): %.o: %.c - $(CC) $(CFLAGS) $(PCFLAGS) -faltivec -c -o $@ $< + $(CC) $(CFLAGS) -DPLUGIN $(PCFLAGS) -faltivec -c -o $@ $< $(BUILTIN_IDCT): BUILTIN_IDCT_%.o: .dep/%.d $(BUILTIN_IDCT): BUILTIN_IDCT_%.o: %.c @@ -69,35 +69,35 @@ $(BUILTIN_IDCTALTIVEC): BUILTIN_IDCTALTIVEC_%.o: %.c # Real targets # -../../lib/idct.so: $(PLUGIN_IDCT) $(PLUGIN_IDCTCOMMON) +../../lib/idct.so: $(PLUGIN_IDCT) $(PLUGIN_IDCTCOMMON) $(PLUGIN_VDECBLOCK_C) $(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS) ../../lib/idct.a: $(BUILTIN_IDCT) ar r $@ $^ $(RANLIB) $@ -../../lib/idctclassic.so: $(PLUGIN_IDCTCLASSIC) $(PLUGIN_IDCTCOMMON) +../../lib/idctclassic.so: $(PLUGIN_IDCTCLASSIC) $(PLUGIN_IDCTCOMMON) $(PLUGIN_VDECBLOCK_C) $(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS) ../../lib/idctclassic.a: $(BUILTIN_IDCTCLASSIC) ar r $@ $^ $(RANLIB) $@ -../../lib/idctmmx.so: $(PLUGIN_IDCTMMX) $(PLUGIN_IDCTCOMMON) +../../lib/idctmmx.so: $(PLUGIN_IDCTMMX) $(PLUGIN_IDCTCOMMON) $(PLUGIN_VDECBLOCK_MMX) $(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS) ../../lib/idctmmx.a: $(BUILTIN_IDCTMMX) ar r $@ $^ $(RANLIB) $@ -../../lib/idctmmxext.so: $(PLUGIN_IDCTMMXEXT) $(PLUGIN_IDCTCOMMON) +../../lib/idctmmxext.so: $(PLUGIN_IDCTMMXEXT) $(PLUGIN_IDCTCOMMON) $(PLUGIN_VDECBLOCK_MMX) $(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS) ../../lib/idctmmxext.a: $(BUILTIN_IDCTMMXEXT) ar r $@ $^ $(RANLIB) $@ -../../lib/idctaltivec.so: $(PLUGIN_IDCTALTIVEC) $(PLUGIN_IDCTCOMMON) +../../lib/idctaltivec.so: $(PLUGIN_IDCTALTIVEC) $(PLUGIN_IDCTCOMMON) $(PLUGIN_VDECBLOCK_C) $(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS) $(LIB_IDCTALTIVEC) ../../lib/idctaltivec.a: $(BUILTIN_IDCTALTIVEC) diff --git a/plugins/idct/idct.c b/plugins/idct/idct.c index eb51703da6..719d9c4ea0 100644 --- a/plugins/idct/idct.c +++ b/plugins/idct/idct.c @@ -2,7 +2,7 @@ * idct.c : IDCT module ***************************************************************************** * Copyright (C) 1999, 2000 VideoLAN - * $Id: idct.c,v 1.9 2001/05/06 04:32:02 sam Exp $ + * $Id: idct.c,v 1.10 2001/05/30 17:03:12 sam Exp $ * * Authors: Gaël Hendryckx * @@ -54,71 +54,26 @@ static void idct_getfunctions( function_list_t * p_function_list ); static int idct_Probe ( probedata_t *p_data ); static void vdec_NormScan ( u8 ppi_scan[2][64] ); - /***************************************************************************** * Build configuration tree. *****************************************************************************/ MODULE_CONFIG_START ADD_WINDOW( "Configuration for IDCT module" ) ADD_COMMENT( "Ha, ha -- nothing to configure yet" ) -MODULE_CONFIG_END - -/***************************************************************************** - * InitModule: get the module structure and configuration. - ***************************************************************************** - * We have to fill psz_name, psz_longname and psz_version. These variables - * will be strdup()ed later by the main application because the module can - * be unloaded later to save memory, and we want to be able to access this - * data even after the module has been unloaded. - *****************************************************************************/ -MODULE_INIT -{ - p_module->psz_name = MODULE_STRING; - p_module->psz_longname = "IDCT module"; - p_module->psz_version = VERSION; +MODULE_CONFIG_STOP +MODULE_INIT_START p_module->i_capabilities = MODULE_CAPABILITY_NULL | MODULE_CAPABILITY_IDCT; + p_module->psz_longname = "IDCT module"; +MODULE_INIT_STOP - return( 0 ); -} - -/***************************************************************************** - * ActivateModule: set the module to an usable state. - ***************************************************************************** - * This function fills the capability functions and the configuration - * structure. Once ActivateModule() has been called, the i_usage can - * be set to 0 and calls to NeedModule() be made to increment it. To unload - * the module, one has to wait until i_usage == 0 and call DeactivateModule(). - *****************************************************************************/ -MODULE_ACTIVATE -{ - p_module->p_functions = malloc( sizeof( module_functions_t ) ); - if( p_module->p_functions == NULL ) - { - return( -1 ); - } - +MODULE_ACTIVATE_START idct_getfunctions( &p_module->p_functions->idct ); +MODULE_ACTIVATE_STOP - p_module->p_config = p_config; - - return( 0 ); -} - -/***************************************************************************** - * DeactivateModule: make sure the module can be unloaded. - ***************************************************************************** - * This function must only be called when i_usage == 0. If it successfully - * returns, i_usage can be set to -1 and the module unloaded. Be careful to - * lock usage_lock during the whole process. - *****************************************************************************/ -MODULE_DEACTIVATE -{ - free( p_module->p_functions ); - - return( 0 ); -} +MODULE_DEACTIVATE_START +MODULE_DEACTIVATE_STOP /* Following functions are local */ @@ -134,7 +89,7 @@ static void idct_getfunctions( function_list_t * p_function_list ) F.pf_sparse_idct = _M( vdec_SparseIDCT ); F.pf_idct = _M( vdec_IDCT ); F.pf_norm_scan = vdec_NormScan; - F.pf_vdec_init = _M( vdec_Init ); + F.pf_decode_init = _M( vdec_InitDecode ); F.pf_decode_mb_c = _M( vdec_DecodeMacroblockC ); F.pf_decode_mb_bw = _M( vdec_DecodeMacroblockBW ); #undef F diff --git a/plugins/idct/idctaltivec.c b/plugins/idct/idctaltivec.c index 8a4e2ca8ef..e8ed10fc5f 100644 --- a/plugins/idct/idctaltivec.c +++ b/plugins/idct/idctaltivec.c @@ -2,7 +2,7 @@ * idctaltivec.c : Altivec IDCT module ***************************************************************************** * Copyright (C) 1999, 2000 VideoLAN - * $Id: idctaltivec.c,v 1.6 2001/05/15 16:19:42 sam Exp $ + * $Id: idctaltivec.c,v 1.7 2001/05/30 17:03:12 sam Exp $ * * Authors: Christophe Massiot * @@ -56,71 +56,26 @@ static void idct_getfunctions( function_list_t * p_function_list ); static int idct_Probe ( probedata_t *p_data ); static void vdec_NormScan ( u8 ppi_scan[2][64] ); - /***************************************************************************** * Build configuration tree. *****************************************************************************/ MODULE_CONFIG_START ADD_WINDOW( "Configuration for Altivec IDCT module" ) ADD_COMMENT( "Ha, ha -- nothing to configure yet" ) -MODULE_CONFIG_END - -/***************************************************************************** - * InitModule: get the module structure and configuration. - ***************************************************************************** - * We have to fill psz_name, psz_longname and psz_version. These variables - * will be strdup()ed later by the main application because the module can - * be unloaded later to save memory, and we want to be able to access this - * data even after the module has been unloaded. - *****************************************************************************/ -MODULE_INIT -{ - p_module->psz_name = MODULE_STRING; - p_module->psz_longname = "Altivec IDCT module"; - p_module->psz_version = VERSION; +MODULE_CONFIG_STOP +MODULE_INIT_START p_module->i_capabilities = MODULE_CAPABILITY_NULL | MODULE_CAPABILITY_IDCT; + p_module->psz_longname = "Altivec IDCT module"; +MODULE_INIT_STOP - return( 0 ); -} - -/***************************************************************************** - * ActivateModule: set the module to an usable state. - ***************************************************************************** - * This function fills the capability functions and the configuration - * structure. Once ActivateModule() has been called, the i_usage can - * be set to 0 and calls to NeedModule() be made to increment it. To unload - * the module, one has to wait until i_usage == 0 and call DeactivateModule(). - *****************************************************************************/ -MODULE_ACTIVATE -{ - p_module->p_functions = malloc( sizeof( module_functions_t ) ); - if( p_module->p_functions == NULL ) - { - return( -1 ); - } - +MODULE_ACTIVATE_START idct_getfunctions( &p_module->p_functions->idct ); +MODULE_ACTIVATE_STOP - p_module->p_config = p_config; - - return( 0 ); -} - -/***************************************************************************** - * DeactivateModule: make sure the module can be unloaded. - ***************************************************************************** - * This function must only be called when i_usage == 0. If it successfully - * returns, i_usage can be set to -1 and the module unloaded. Be careful to - * lock usage_lock during the whole process. - *****************************************************************************/ -MODULE_DEACTIVATE -{ - free( p_module->p_functions ); - - return( 0 ); -} +MODULE_DEACTIVATE_START +MODULE_DEACTIVATE_STOP /* Following functions are local */ @@ -135,7 +90,7 @@ static void idct_getfunctions( function_list_t * p_function_list ) F.pf_sparse_idct = _M( vdec_SparseIDCT ); F.pf_idct = _M( vdec_IDCT ); F.pf_norm_scan = vdec_NormScan; - F.pf_vdec_init = _M( vdec_Init ); + F.pf_decode_init = _M( vdec_InitDecode ); F.pf_decode_mb_c = _M( vdec_DecodeMacroblockC ); F.pf_decode_mb_bw = _M( vdec_DecodeMacroblockBW ); #undef F diff --git a/plugins/idct/idctclassic.c b/plugins/idct/idctclassic.c index a12ddbf43a..7e988b2de9 100644 --- a/plugins/idct/idctclassic.c +++ b/plugins/idct/idctclassic.c @@ -2,7 +2,7 @@ * idctclassic.c : Classic IDCT module ***************************************************************************** * Copyright (C) 1999, 2000 VideoLAN - * $Id: idctclassic.c,v 1.9 2001/05/06 04:32:02 sam Exp $ + * $Id: idctclassic.c,v 1.10 2001/05/30 17:03:12 sam Exp $ * * Authors: Gaël Hendryckx * @@ -61,64 +61,20 @@ static void vdec_NormScan ( u8 ppi_scan[2][64] ); MODULE_CONFIG_START ADD_WINDOW( "Configuration for classic IDCT module" ) ADD_COMMENT( "Ha, ha -- nothing to configure yet" ) -MODULE_CONFIG_END - -/***************************************************************************** - * InitModule: get the module structure and configuration. - ***************************************************************************** - * We have to fill psz_name, psz_longname and psz_version. These variables - * will be strdup()ed later by the main application because the module can - * be unloaded later to save memory, and we want to be able to access this - * data even after the module has been unloaded. - *****************************************************************************/ -MODULE_INIT -{ - p_module->psz_name = MODULE_STRING; - p_module->psz_longname = "classic IDCT module"; - p_module->psz_version = VERSION; +MODULE_CONFIG_STOP +MODULE_INIT_START p_module->i_capabilities = MODULE_CAPABILITY_NULL | MODULE_CAPABILITY_IDCT; + p_module->psz_longname = "classic IDCT module"; +MODULE_INIT_STOP - return( 0 ); -} - -/***************************************************************************** - * ActivateModule: set the module to an usable state. - ***************************************************************************** - * This function fills the capability functions and the configuration - * structure. Once ActivateModule() has been called, the i_usage can - * be set to 0 and calls to NeedModule() be made to increment it. To unload - * the module, one has to wait until i_usage == 0 and call DeactivateModule(). - *****************************************************************************/ -MODULE_ACTIVATE -{ - p_module->p_functions = malloc( sizeof( module_functions_t ) ); - if( p_module->p_functions == NULL ) - { - return( -1 ); - } - +MODULE_ACTIVATE_START idct_getfunctions( &p_module->p_functions->idct ); +MODULE_ACTIVATE_STOP - p_module->p_config = p_config; - - return( 0 ); -} - -/***************************************************************************** - * DeactivateModule: make sure the module can be unloaded. - ***************************************************************************** - * This function must only be called when i_usage == 0. If it successfully - * returns, i_usage can be set to -1 and the module unloaded. Be careful to - * lock usage_lock during the whole process. - *****************************************************************************/ -MODULE_DEACTIVATE -{ - free( p_module->p_functions ); - - return( 0 ); -} +MODULE_DEACTIVATE_START +MODULE_DEACTIVATE_STOP /* Following functions are local */ @@ -134,7 +90,7 @@ static void idct_getfunctions( function_list_t * p_function_list ) F.pf_sparse_idct = _M( vdec_SparseIDCT ); F.pf_idct = _M( vdec_IDCT ); F.pf_norm_scan = vdec_NormScan; - F.pf_vdec_init = _M( vdec_Init ); + F.pf_decode_init = _M( vdec_InitDecode ); F.pf_decode_mb_c = _M( vdec_DecodeMacroblockC ); F.pf_decode_mb_bw = _M( vdec_DecodeMacroblockBW ); #undef F diff --git a/plugins/idct/idctmmx.c b/plugins/idct/idctmmx.c index acc3702347..2dbd7729ed 100644 --- a/plugins/idct/idctmmx.c +++ b/plugins/idct/idctmmx.c @@ -2,7 +2,7 @@ * idctmmx.c : MMX IDCT module ***************************************************************************** * Copyright (C) 1999, 2000 VideoLAN - * $Id: idctmmx.c,v 1.11 2001/05/15 16:19:42 sam Exp $ + * $Id: idctmmx.c,v 1.12 2001/05/30 17:03:12 sam Exp $ * * Authors: Aaron Holtzman * Michel Lespinasse @@ -61,71 +61,26 @@ static void idct_getfunctions( function_list_t * p_function_list ); static int idct_Probe ( probedata_t *p_data ); static void vdec_NormScan ( u8 ppi_scan[2][64] ); - /***************************************************************************** * Build configuration tree. *****************************************************************************/ MODULE_CONFIG_START ADD_WINDOW( "Configuration for MMX IDCT module" ) ADD_COMMENT( "Ha, ha -- nothing to configure yet" ) -MODULE_CONFIG_END - -/***************************************************************************** - * InitModule: get the module structure and configuration. - ***************************************************************************** - * We have to fill psz_name, psz_longname and psz_version. These variables - * will be strdup()ed later by the main application because the module can - * be unloaded later to save memory, and we want to be able to access this - * data even after the module has been unloaded. - *****************************************************************************/ -MODULE_INIT -{ - p_module->psz_name = MODULE_STRING; - p_module->psz_longname = "MMX IDCT module"; - p_module->psz_version = VERSION; +MODULE_CONFIG_STOP +MODULE_INIT_START p_module->i_capabilities = MODULE_CAPABILITY_NULL | MODULE_CAPABILITY_IDCT; + p_module->psz_longname = "MMX IDCT module"; +MODULE_INIT_STOP - return( 0 ); -} - -/***************************************************************************** - * ActivateModule: set the module to an usable state. - ***************************************************************************** - * This function fills the capability functions and the configuration - * structure. Once ActivateModule() has been called, the i_usage can - * be set to 0 and calls to NeedModule() be made to increment it. To unload - * the module, one has to wait until i_usage == 0 and call DeactivateModule(). - *****************************************************************************/ -MODULE_ACTIVATE -{ - p_module->p_functions = malloc( sizeof( module_functions_t ) ); - if( p_module->p_functions == NULL ) - { - return( -1 ); - } - +MODULE_ACTIVATE_START idct_getfunctions( &p_module->p_functions->idct ); +MODULE_ACTIVATE_STOP - p_module->p_config = p_config; - - return( 0 ); -} - -/***************************************************************************** - * DeactivateModule: make sure the module can be unloaded. - ***************************************************************************** - * This function must only be called when i_usage == 0. If it successfully - * returns, i_usage can be set to -1 and the module unloaded. Be careful to - * lock usage_lock during the whole process. - *****************************************************************************/ -MODULE_DEACTIVATE -{ - free( p_module->p_functions ); - - return( 0 ); -} +MODULE_DEACTIVATE_START +MODULE_DEACTIVATE_STOP /* Following functions are local */ @@ -140,7 +95,7 @@ static void idct_getfunctions( function_list_t * p_function_list ) F.pf_sparse_idct = _M( vdec_SparseIDCT ); F.pf_idct = _M( vdec_IDCT ); F.pf_norm_scan = vdec_NormScan; - F.pf_vdec_init = _M( vdec_Init ); + F.pf_decode_init = _M( vdec_InitDecode ); F.pf_decode_mb_c = _M( vdec_DecodeMacroblockC ); F.pf_decode_mb_bw = _M( vdec_DecodeMacroblockBW ); #undef F diff --git a/plugins/idct/idctmmxext.c b/plugins/idct/idctmmxext.c index e2c2e6688e..e4ab124642 100644 --- a/plugins/idct/idctmmxext.c +++ b/plugins/idct/idctmmxext.c @@ -2,7 +2,7 @@ * idctmmxext.c : MMX EXT IDCT module ***************************************************************************** * Copyright (C) 1999, 2000 VideoLAN - * $Id: idctmmxext.c,v 1.8 2001/05/15 16:19:42 sam Exp $ + * $Id: idctmmxext.c,v 1.9 2001/05/30 17:03:12 sam Exp $ * * Authors: Aaron Holtzman * Michel Lespinasse @@ -61,71 +61,26 @@ static void idct_getfunctions( function_list_t * p_function_list ); static int idct_Probe ( probedata_t *p_data ); static void vdec_NormScan ( u8 ppi_scan[2][64] ); - /***************************************************************************** * Build configuration tree. *****************************************************************************/ MODULE_CONFIG_START ADD_WINDOW( "Configuration for MMX EXT IDCT module" ) ADD_COMMENT( "Ha, ha -- nothing to configure yet" ) -MODULE_CONFIG_END - -/***************************************************************************** - * InitModule: get the module structure and configuration. - ***************************************************************************** - * We have to fill psz_name, psz_longname and psz_version. These variables - * will be strdup()ed later by the main application because the module can - * be unloaded later to save memory, and we want to be able to access this - * data even after the module has been unloaded. - *****************************************************************************/ -MODULE_INIT -{ - p_module->psz_name = MODULE_STRING; - p_module->psz_longname = "MMX EXT IDCT module"; - p_module->psz_version = VERSION; +MODULE_CONFIG_STOP +MODULE_INIT_START p_module->i_capabilities = MODULE_CAPABILITY_NULL | MODULE_CAPABILITY_IDCT; + p_module->psz_longname = "MMX EXT IDCT module"; +MODULE_INIT_STOP - return( 0 ); -} - -/***************************************************************************** - * ActivateModule: set the module to an usable state. - ***************************************************************************** - * This function fills the capability functions and the configuration - * structure. Once ActivateModule() has been called, the i_usage can - * be set to 0 and calls to NeedModule() be made to increment it. To unload - * the module, one has to wait until i_usage == 0 and call DeactivateModule(). - *****************************************************************************/ -MODULE_ACTIVATE -{ - p_module->p_functions = malloc( sizeof( module_functions_t ) ); - if( p_module->p_functions == NULL ) - { - return( -1 ); - } - +MODULE_ACTIVATE_START idct_getfunctions( &p_module->p_functions->idct ); +MODULE_ACTIVATE_STOP - p_module->p_config = p_config; - - return( 0 ); -} - -/***************************************************************************** - * DeactivateModule: make sure the module can be unloaded. - ***************************************************************************** - * This function must only be called when i_usage == 0. If it successfully - * returns, i_usage can be set to -1 and the module unloaded. Be careful to - * lock usage_lock during the whole process. - *****************************************************************************/ -MODULE_DEACTIVATE -{ - free( p_module->p_functions ); - - return( 0 ); -} +MODULE_DEACTIVATE_START +MODULE_DEACTIVATE_STOP /* Following functions are local */ @@ -140,7 +95,7 @@ static void idct_getfunctions( function_list_t * p_function_list ) F.pf_sparse_idct = _M( vdec_SparseIDCT ); F.pf_idct = _M( vdec_IDCT ); F.pf_norm_scan = vdec_NormScan; - F.pf_vdec_init = _M( vdec_Init ); + F.pf_decode_init = _M( vdec_InitDecode ); F.pf_decode_mb_c = _M( vdec_DecodeMacroblockC ); F.pf_decode_mb_bw = _M( vdec_DecodeMacroblockBW ); #undef F diff --git a/plugins/idct/vdec_block.h b/plugins/idct/vdec_block.h index 9ae0be0826..1fbc05557b 100644 --- a/plugins/idct/vdec_block.h +++ b/plugins/idct/vdec_block.h @@ -2,7 +2,7 @@ * vdec_block_h: Macroblock copy functions ***************************************************************************** * Copyright (C) 1999, 2000, 2001 VideoLAN - * $Id: vdec_block.h,v 1.1 2001/05/06 04:32:02 sam Exp $ + * $Id: vdec_block.h,v 1.2 2001/05/30 17:03:12 sam Exp $ * * Authors: Christophe Massiot * @@ -24,7 +24,7 @@ /***************************************************************************** * Prototypes *****************************************************************************/ -void _M( vdec_Init ) ( struct vdec_thread_s *p_vdec ); +void _M( vdec_InitDecode ) ( struct vdec_thread_s *p_vdec ); void _M( vdec_DecodeMacroblockC ) ( struct vdec_thread_s *p_vdec, struct macroblock_s * p_mb ); void _M( vdec_DecodeMacroblockBW ) ( struct vdec_thread_s *p_vdec, diff --git a/plugins/idct/vdec_block_c.c b/plugins/idct/vdec_block_c.c index 9bba8cf1e7..8db93198e3 100644 --- a/plugins/idct/vdec_block_c.c +++ b/plugins/idct/vdec_block_c.c @@ -2,7 +2,7 @@ * vdec_block_c.c: Macroblock copy functions in C ***************************************************************************** * Copyright (C) 1999, 2000, 2001 VideoLAN - * $Id: vdec_block_c.c,v 1.1 2001/05/06 04:32:02 sam Exp $ + * $Id: vdec_block_c.c,v 1.2 2001/05/30 17:03:12 sam Exp $ * * Authors: Christophe Massiot * @@ -66,9 +66,9 @@ static u8 pi_crop_buf[VDEC_CROPRANGE]; static u8 *pi_crop; /***************************************************************************** - * vdec_Init: initialize video decoder thread + * vdec_InitDecode: initialize video decoder thread *****************************************************************************/ -void _M( vdec_Init ) ( vdec_thread_t *p_vdec ) +void _M( vdec_InitDecode ) ( vdec_thread_t *p_vdec ) { int i_dummy; diff --git a/plugins/idct/vdec_block_mmx.c b/plugins/idct/vdec_block_mmx.c index 786ed20e52..342c04340d 100644 --- a/plugins/idct/vdec_block_mmx.c +++ b/plugins/idct/vdec_block_mmx.c @@ -2,7 +2,7 @@ * vdec_block_mmx.c: Macroblock copy functions in MMX assembly ***************************************************************************** * Copyright (C) 1999, 2000, 2001 VideoLAN - * $Id: vdec_block_mmx.c,v 1.1 2001/05/06 04:32:02 sam Exp $ + * $Id: vdec_block_mmx.c,v 1.2 2001/05/30 17:03:12 sam Exp $ * * Authors: Gaël Hendryckx * @@ -58,9 +58,9 @@ #include "vdec_block.h" /***************************************************************************** - * vdec_Init: initialize video decoder thread + * vdec_InitDecode: initialize video decoder thread *****************************************************************************/ -void _M( vdec_Init ) ( vdec_thread_t *p_vdec ) +void _M( vdec_InitDecode ) ( vdec_thread_t *p_vdec ) { ; } diff --git a/plugins/imdct/imdct.c b/plugins/imdct/imdct.c index 57424a0915..d074631701 100644 --- a/plugins/imdct/imdct.c +++ b/plugins/imdct/imdct.c @@ -2,7 +2,7 @@ * imdct.c : IMDCT module ***************************************************************************** * Copyright (C) 1999, 2000 VideoLAN - * $Id: imdct.c,v 1.1 2001/05/15 16:19:42 sam Exp $ + * $Id: imdct.c,v 1.2 2001/05/30 17:03:12 sam Exp $ * * Authors: Gaël Hendryckx * @@ -54,64 +54,20 @@ static int imdct_Probe ( probedata_t *p_data ); MODULE_CONFIG_START ADD_WINDOW( "Configuration for IMDCT module" ) ADD_COMMENT( "Ha, ha -- nothing to configure yet" ) -MODULE_CONFIG_END - -/***************************************************************************** - * InitModule: get the module structure and configuration. - ***************************************************************************** - * We have to fill psz_name, psz_longname and psz_version. These variables - * will be strdup()ed later by the main application because the module can - * be unloaded later to save memory, and we want to be able to access this - * data even after the module has been unloaded. - *****************************************************************************/ -MODULE_INIT -{ - p_module->psz_name = MODULE_STRING; - p_module->psz_longname = "AC3 IMDCT module"; - p_module->psz_version = VERSION; +MODULE_CONFIG_STOP +MODULE_INIT_START p_module->i_capabilities = MODULE_CAPABILITY_NULL | MODULE_CAPABILITY_IMDCT; + p_module->psz_longname = "AC3 IMDCT module"; +MODULE_INIT_STOP - return( 0 ); -} - -/***************************************************************************** - * ActivateModule: set the module to an usable state. - ***************************************************************************** - * This function fills the capability functions and the configuration - * structure. Once ActivateModule() has been called, the i_usage can - * be set to 0 and calls to NeedModule() be made to increment it. To unload - * the module, one has to wait until i_usage == 0 and call DeactivateModule(). - *****************************************************************************/ -MODULE_ACTIVATE -{ - p_module->p_functions = malloc( sizeof( module_functions_t ) ); - if( p_module->p_functions == NULL ) - { - return( -1 ); - } - +MODULE_ACTIVATE_START imdct_getfunctions( &p_module->p_functions->imdct ); +MODULE_ACTIVATE_STOP - p_module->p_config = p_config; - - return( 0 ); -} - -/***************************************************************************** - * DeactivateModule: make sure the module can be unloaded. - ***************************************************************************** - * This function must only be called when i_usage == 0. If it successfully - * returns, i_usage can be set to -1 and the module unloaded. Be careful to - * lock usage_lock during the whole process. - *****************************************************************************/ -MODULE_DEACTIVATE -{ - free( p_module->p_functions ); - - return( 0 ); -} +MODULE_DEACTIVATE_START +MODULE_DEACTIVATE_STOP /* Following functions are local */ diff --git a/plugins/imdct/imdct3dn.c b/plugins/imdct/imdct3dn.c index 2a7b0587a4..d1c16dc065 100644 --- a/plugins/imdct/imdct3dn.c +++ b/plugins/imdct/imdct3dn.c @@ -2,7 +2,7 @@ * imdct3dn.c : accelerated 3D Now! IMDCT module ***************************************************************************** * Copyright (C) 1999, 2000 VideoLAN - * $Id: imdct3dn.c,v 1.2 2001/05/28 02:38:48 sam Exp $ + * $Id: imdct3dn.c,v 1.3 2001/05/30 17:03:12 sam Exp $ * * Authors: Gaël Hendryckx * @@ -54,64 +54,20 @@ static int imdct_Probe ( probedata_t *p_data ); MODULE_CONFIG_START ADD_WINDOW( "Configuration for IMDCT module" ) ADD_COMMENT( "Ha, ha -- nothing to configure yet" ) -MODULE_CONFIG_END - -/***************************************************************************** - * InitModule: get the module structure and configuration. - ***************************************************************************** - * We have to fill psz_name, psz_longname and psz_version. These variables - * will be strdup()ed later by the main application because the module can - * be unloaded later to save memory, and we want to be able to access this - * data even after the module has been unloaded. - *****************************************************************************/ -MODULE_INIT -{ - p_module->psz_name = MODULE_STRING; - p_module->psz_longname = "3D Now! AC3 IMDCT module"; - p_module->psz_version = VERSION; +MODULE_CONFIG_STOP +MODULE_INIT_START p_module->i_capabilities = MODULE_CAPABILITY_NULL | MODULE_CAPABILITY_IMDCT; + p_module->psz_longname = "3D Now! AC3 IMDCT module"; +MODULE_INIT_STOP - return( 0 ); -} - -/***************************************************************************** - * ActivateModule: set the module to an usable state. - ***************************************************************************** - * This function fills the capability functions and the configuration - * structure. Once ActivateModule() has been called, the i_usage can - * be set to 0 and calls to NeedModule() be made to increment it. To unload - * the module, one has to wait until i_usage == 0 and call DeactivateModule(). - *****************************************************************************/ -MODULE_ACTIVATE -{ - p_module->p_functions = malloc( sizeof( module_functions_t ) ); - if( p_module->p_functions == NULL ) - { - return( -1 ); - } - +MODULE_ACTIVATE_START imdct_getfunctions( &p_module->p_functions->imdct ); +MODULE_ACTIVATE_STOP - p_module->p_config = p_config; - - return( 0 ); -} - -/***************************************************************************** - * DeactivateModule: make sure the module can be unloaded. - ***************************************************************************** - * This function must only be called when i_usage == 0. If it successfully - * returns, i_usage can be set to -1 and the module unloaded. Be careful to - * lock usage_lock during the whole process. - *****************************************************************************/ -MODULE_DEACTIVATE -{ - free( p_module->p_functions ); - - return( 0 ); -} +MODULE_DEACTIVATE_START +MODULE_DEACTIVATE_STOP /* Following functions are local */ diff --git a/plugins/imdct/imdctsse.c b/plugins/imdct/imdctsse.c index 17ddf634e2..6d982d4300 100644 --- a/plugins/imdct/imdctsse.c +++ b/plugins/imdct/imdctsse.c @@ -2,7 +2,7 @@ * imdctsse.c : accelerated SSE IMDCT module ***************************************************************************** * Copyright (C) 1999, 2000 VideoLAN - * $Id: imdctsse.c,v 1.2 2001/05/28 02:38:48 sam Exp $ + * $Id: imdctsse.c,v 1.3 2001/05/30 17:03:12 sam Exp $ * * Authors: Gaël Hendryckx * @@ -54,64 +54,20 @@ static int imdct_Probe ( probedata_t *p_data ); MODULE_CONFIG_START ADD_WINDOW( "Configuration for IMDCT module" ) ADD_COMMENT( "Ha, ha -- nothing to configure yet" ) -MODULE_CONFIG_END - -/***************************************************************************** - * InitModule: get the module structure and configuration. - ***************************************************************************** - * We have to fill psz_name, psz_longname and psz_version. These variables - * will be strdup()ed later by the main application because the module can - * be unloaded later to save memory, and we want to be able to access this - * data even after the module has been unloaded. - *****************************************************************************/ -MODULE_INIT -{ - p_module->psz_name = MODULE_STRING; - p_module->psz_longname = "SSE AC3 IMDCT module"; - p_module->psz_version = VERSION; +MODULE_CONFIG_STOP +MODULE_INIT_START p_module->i_capabilities = MODULE_CAPABILITY_NULL | MODULE_CAPABILITY_IMDCT; + p_module->psz_longname = "SSE AC3 IMDCT module"; +MODULE_INIT_STOP - return( 0 ); -} - -/***************************************************************************** - * ActivateModule: set the module to an usable state. - ***************************************************************************** - * This function fills the capability functions and the configuration - * structure. Once ActivateModule() has been called, the i_usage can - * be set to 0 and calls to NeedModule() be made to increment it. To unload - * the module, one has to wait until i_usage == 0 and call DeactivateModule(). - *****************************************************************************/ -MODULE_ACTIVATE -{ - p_module->p_functions = malloc( sizeof( module_functions_t ) ); - if( p_module->p_functions == NULL ) - { - return( -1 ); - } - +MODULE_ACTIVATE_START imdct_getfunctions( &p_module->p_functions->imdct ); +MODULE_ACTIVATE_STOP - p_module->p_config = p_config; - - return( 0 ); -} - -/***************************************************************************** - * DeactivateModule: make sure the module can be unloaded. - ***************************************************************************** - * This function must only be called when i_usage == 0. If it successfully - * returns, i_usage can be set to -1 and the module unloaded. Be careful to - * lock usage_lock during the whole process. - *****************************************************************************/ -MODULE_DEACTIVATE -{ - free( p_module->p_functions ); - - return( 0 ); -} +MODULE_DEACTIVATE_START +MODULE_DEACTIVATE_STOP /* Following functions are local */ diff --git a/plugins/kde/kde.cpp b/plugins/kde/kde.cpp index 37a3281059..e1576f2d6e 100644 --- a/plugins/kde/kde.cpp +++ b/plugins/kde/kde.cpp @@ -11,76 +11,30 @@ extern "C" { -/***************************************************************************** - * Build configuration tree. - *****************************************************************************/ -MODULE_CONFIG_START -ADD_WINDOW( "Configuration for KDE module" ) - ADD_COMMENT( "Ha, ha -- nothing to configure yet" ) -MODULE_CONFIG_END - /***************************************************************************** * Capabilities defined in the other files. *****************************************************************************/ - void _M( intf_getfunctions )( function_list_t * p_function_list ); /***************************************************************************** - * InitModule: get the module structure and configuration. - ***************************************************************************** - * We have to fill psz_name, psz_longname and psz_version. These variables - * will be strdup()ed later by the main application because the module can - * be unloaded later to save memory, and we want to be able to access this - * data even after the module has been unloaded. + * Build configuration tree. *****************************************************************************/ -MODULE_INIT -{ - p_module->psz_name = MODULE_STRING; - p_module->psz_longname = "KDE interface module"; - p_module->psz_version = VERSION; +MODULE_CONFIG_START +ADD_WINDOW( "Configuration for KDE module" ) + ADD_COMMENT( "Ha, ha -- nothing to configure yet" ) +MODULE_CONFIG_STOP +MODULE_INIT_START p_module->i_capabilities = MODULE_CAPABILITY_NULL | MODULE_CAPABILITY_INTF; + p_module->psz_longname = "KDE interface module"; +MODULE_INIT_STOP - return( 0 ); -} - -/***************************************************************************** - * ActivateModule: set the module to an usable state. - ***************************************************************************** - * This function fills the capability functions and the configuration - * structure. Once ActivateModule() has been called, the i_usage can - * be set to 0 and calls to NeedModule() be made to increment it. To unload - * the module, one has to wait until i_usage == 0 and call DeactivateModule(). - *****************************************************************************/ -MODULE_ACTIVATE -{ - p_module->p_functions = - ( module_functions_t * )malloc( sizeof( module_functions_t ) ); - if( p_module->p_functions == NULL ) - { - return( -1 ); - } - +MODULE_ACTIVATE_START _M( intf_getfunctions )( &p_module->p_functions->intf ); +MODULE_ACTIVATE_STOP - p_module->p_config = p_config; - - return( 0 ); -} - -/***************************************************************************** - * DeactivateModule: make sure the module can be unloaded. - ***************************************************************************** - * This function must only be called when i_usage == 0. If it successfully - * returns, i_usage can be set to -1 and the module unloaded. Be careful to - * lock usage_lock during the whole process. - *****************************************************************************/ -MODULE_DEACTIVATE -{ - free( p_module->p_functions ); - - return( 0 ); -} +MODULE_DEACTIVATE_START +MODULE_DEACTIVATE_STOP } /* extern "C" */ diff --git a/plugins/macosx/intf_macosx.c b/plugins/macosx/intf_macosx.c index def873f7e7..6b28e413aa 100644 --- a/plugins/macosx/intf_macosx.c +++ b/plugins/macosx/intf_macosx.c @@ -49,9 +49,11 @@ #include "video.h" #include "video_output.h" -#include "modules.h" #include "main.h" +#include "modules.h" +#include "modules_export.h" + #include "macosx_common.h" extern main_t *p_main; diff --git a/plugins/macosx/macosx.c b/plugins/macosx/macosx.c index b1c815b3f0..76ee87ccea 100644 --- a/plugins/macosx/macosx.c +++ b/plugins/macosx/macosx.c @@ -2,7 +2,7 @@ * macosx.c : MacOS X plugin for vlc ***************************************************************************** * Copyright (C) 2001 VideoLAN - * $Id: macosx.c,v 1.4 2001/04/06 18:18:10 massiot Exp $ + * $Id: macosx.c,v 1.5 2001/05/30 17:03:12 sam Exp $ * * Authors: Colin Delacroix * Eugenio Jarosiewicz @@ -39,14 +39,6 @@ #include "modules.h" -/***************************************************************************** - * Build configuration tree. - *****************************************************************************/ -MODULE_CONFIG_START -ADD_WINDOW( "Configuration for MacOS X module" ) - ADD_COMMENT( "Ha, ha -- nothing to configure yet" ) -MODULE_CONFIG_END - /***************************************************************************** * Capabilities defined in the other files. *****************************************************************************/ @@ -55,63 +47,27 @@ void _M( vout_getfunctions )( function_list_t * p_function_list ); void _M( intf_getfunctions )( function_list_t * p_function_list ); /***************************************************************************** - * InitModule: get the module structure and configuration. - ***************************************************************************** - * We have to fill psz_name, psz_longname and psz_version. These variables - * will be strdup()ed later by the main application because the module can - * be unloaded later to save memory, and we want to be able to access this - * data even after the module has been unloaded. + * Build configuration tree. *****************************************************************************/ -MODULE_INIT -{ - p_module->psz_name = MODULE_STRING; - p_module->psz_longname = "MacOS X interface, sound and video module"; - p_module->psz_version = VERSION; +MODULE_CONFIG_START +ADD_WINDOW( "Configuration for MacOS X module" ) + ADD_COMMENT( "Ha, ha -- nothing to configure yet" ) +MODULE_CONFIG_STOP +MODULE_INIT_START p_module->i_capabilities = MODULE_CAPABILITY_NULL | MODULE_CAPABILITY_VOUT | MODULE_CAPABILITY_AOUT | MODULE_CAPABILITY_INTF; + p_module->psz_longname = "MacOS X interface, sound and video module"; +MODULE_INIT_STOP - return( 0 ); -} - -/***************************************************************************** - * ActivateModule: set the module to an usable state. - ***************************************************************************** - * This function fills the capability functions and the configuration - * structure. Once ActivateModule() has been called, the i_usage can - * be set to 0 and calls to NeedModule() be made to increment it. To unload - * the module, one has to wait until i_usage == 0 and call DeactivateModule(). - *****************************************************************************/ -MODULE_ACTIVATE -{ - p_module->p_functions = malloc( sizeof( module_functions_t ) ); - if( p_module->p_functions == NULL ) - { - return( -1 ); - } - +MODULE_ACTIVATE_START _M( vout_getfunctions )( &p_module->p_functions->vout ); _M( aout_getfunctions )( &p_module->p_functions->aout ); _M( intf_getfunctions )( &p_module->p_functions->intf ); +MODULE_ACTIVATE_STOP - p_module->p_config = p_config; - - return( 0 ); -} - -/***************************************************************************** - * DeactivateModule: make sure the module can be unloaded. - ***************************************************************************** - * This function must only be called when i_usage == 0. If it successfully - * returns, i_usage can be set to -1 and the module unloaded. Be careful to - * lock usage_lock during the whole process. - *****************************************************************************/ -MODULE_DEACTIVATE -{ - free( p_module->p_functions ); - - return( 0 ); -} +MODULE_DEACTIVATE_START +MODULE_DEACTIVATE_STOP diff --git a/plugins/macosx/vout_macosx.c b/plugins/macosx/vout_macosx.c index 7d4705e1b2..ac171ae7cb 100644 --- a/plugins/macosx/vout_macosx.c +++ b/plugins/macosx/vout_macosx.c @@ -256,7 +256,7 @@ static int CreateDisplay( vout_thread_t *p_vout ) //FIXME - if I ever dispose of the Gworlds and recreate them, i'll have a new address //and I'll need to tell vout about them... dunno what problems vout might have if we just updateGworld - vout_SetBuffers( p_vout, hPixmapBaseAddr0, hPixmapBaseAddr1 ); + p_vout->pf_setbuffers( p_vout, hPixmapBaseAddr0, hPixmapBaseAddr1 ); return 0; } diff --git a/plugins/mga/mga.c b/plugins/mga/mga.c index e5938c0a7d..80bcf0e9d9 100644 --- a/plugins/mga/mga.c +++ b/plugins/mga/mga.c @@ -2,7 +2,7 @@ * mga.c : Matrox Graphic Array plugin for vlc ***************************************************************************** * Copyright (C) 2000, 2001 VideoLAN - * $Id: mga.c,v 1.5 2001/04/28 03:36:25 sam Exp $ + * $Id: mga.c,v 1.6 2001/05/30 17:03:12 sam Exp $ * * Authors: Samuel Hocevar * @@ -41,73 +41,29 @@ #include "modules.h" -/***************************************************************************** - * Building configuration tree - *****************************************************************************/ -MODULE_CONFIG_START -ADD_WINDOW( "Configuration for MGA module" ) - ADD_COMMENT( "For now, the MGA module cannot be configured" ) -MODULE_CONFIG_END - /***************************************************************************** * Capabilities defined in the other files. *****************************************************************************/ void _M( vout_getfunctions )( function_list_t * p_function_list ); /***************************************************************************** - * InitModule: get the module structure and configuration. - ***************************************************************************** - * We have to fill psz_name, psz_longname and psz_version. These variables - * will be strdup()ed later by the main application because the module can - * be unloaded later to save memory, and we want to be able to access this - * data even after the module has been unloaded. + * Building configuration tree *****************************************************************************/ -MODULE_INIT -{ - p_module->psz_name = MODULE_STRING; - p_module->psz_longname = "Matrox Graphic Array module"; - p_module->psz_version = VERSION; +MODULE_CONFIG_START +ADD_WINDOW( "Configuration for MGA module" ) + ADD_COMMENT( "For now, the MGA module cannot be configured" ) +MODULE_CONFIG_STOP +MODULE_INIT_START p_module->i_capabilities = MODULE_CAPABILITY_NULL | MODULE_CAPABILITY_VOUT; + p_module->psz_longname = "Matrox Graphic Array module"; +MODULE_INIT_STOP - return( 0 ); -} - -/***************************************************************************** - * ActivateModule: set the module to an usable state. - ***************************************************************************** - * This function fills the capability functions and the configuration - * structure. Once ActivateModule() has been called, the i_usage can - * be set to 0 and calls to NeedModule() be made to increment it. To unload - * the module, one has to wait until i_usage == 0 and call DeactivateModule(). - *****************************************************************************/ -MODULE_ACTIVATE -{ - p_module->p_functions = malloc( sizeof( module_functions_t ) ); - if( p_module->p_functions == NULL ) - { - return( -1 ); - } - +MODULE_ACTIVATE_START _M( vout_getfunctions )( &p_module->p_functions->vout ); +MODULE_ACTIVATE_STOP - p_module->p_config = p_config; - - return( 0 ); -} - -/***************************************************************************** - * DeactivateModule: make sure the module can be unloaded. - ***************************************************************************** - * This function must only be called when i_usage == 0. If it successfully - * returns, i_usage can be set to -1 and the module unloaded. Be careful to - * lock usage_lock during the whole process. - *****************************************************************************/ -MODULE_DEACTIVATE -{ - free( p_module->p_functions ); - - return( 0 ); -} +MODULE_DEACTIVATE_START +MODULE_DEACTIVATE_STOP diff --git a/plugins/mga/vout_mga.c b/plugins/mga/vout_mga.c index c40a65ea18..6e873d3355 100644 --- a/plugins/mga/vout_mga.c +++ b/plugins/mga/vout_mga.c @@ -2,7 +2,7 @@ * vout_mga.c: MGA video output display method ***************************************************************************** * Copyright (C) 1998, 1999, 2000, 2001 VideoLAN - * $Id: vout_mga.c,v 1.7 2001/03/21 13:42:34 sam Exp $ + * $Id: vout_mga.c,v 1.8 2001/05/30 17:03:12 sam Exp $ * * Authors: Aaron Holtzman * Samuel Hocevar @@ -187,7 +187,7 @@ static int vout_Create( vout_thread_t *p_vout ) } /* Set and initialize buffers */ - vout_SetBuffers( p_vout, p_vout->p_sys->p_video, + p_vout->pf_setbuffers( p_vout, p_vout->p_sys->p_video, p_vout->p_sys->p_video + p_vout->p_sys->i_page_size ); return( 0 ); diff --git a/plugins/motion/motion.c b/plugins/motion/motion.c index 6fed1f146f..263e2223f8 100644 --- a/plugins/motion/motion.c +++ b/plugins/motion/motion.c @@ -2,7 +2,7 @@ * motion.c : C motion compensation module for vlc ***************************************************************************** * Copyright (C) 2000 VideoLAN - * $Id: motion.c,v 1.4 2001/04/15 04:19:57 sam Exp $ + * $Id: motion.c,v 1.5 2001/05/30 17:03:12 sam Exp $ * * Authors: Christophe Massiot * @@ -52,64 +52,20 @@ void motion_getfunctions( function_list_t * p_function_list ); MODULE_CONFIG_START ADD_WINDOW( "Configuration for motion compensation module" ) ADD_COMMENT( "Ha, ha -- nothing to configure yet" ) -MODULE_CONFIG_END - -/***************************************************************************** - * InitModule: get the module structure and configuration. - ***************************************************************************** - * We have to fill psz_name, psz_longname and psz_version. These variables - * will be strdup()ed later by the main application because the module can - * be unloaded later to save memory, and we want to be able to access this - * data even after the module has been unloaded. - *****************************************************************************/ -MODULE_INIT -{ - p_module->psz_name = MODULE_STRING; - p_module->psz_longname = "motion compensation module"; - p_module->psz_version = VERSION; +MODULE_CONFIG_STOP +MODULE_INIT_START p_module->i_capabilities = MODULE_CAPABILITY_NULL | MODULE_CAPABILITY_MOTION; + p_module->psz_longname = "motion compensation module"; +MODULE_INIT_STOP - return( 0 ); -} - -/***************************************************************************** - * ActivateModule: set the module to an usable state. - ***************************************************************************** - * This function fills the capability functions and the configuration - * structure. Once ActivateModule() has been called, the i_usage can - * be set to 0 and calls to NeedModule() be made to increment it. To unload - * the module, one has to wait until i_usage == 0 and call DeactivateModule(). - *****************************************************************************/ -MODULE_ACTIVATE -{ - p_module->p_functions = malloc( sizeof( module_functions_t ) ); - if( p_module->p_functions == NULL ) - { - return( -1 ); - } - +MODULE_ACTIVATE_START motion_getfunctions( &p_module->p_functions->motion ); +MODULE_ACTIVATE_STOP - p_module->p_config = p_config; - - return( 0 ); -} - -/***************************************************************************** - * DeactivateModule: make sure the module can be unloaded. - ***************************************************************************** - * This function must only be called when i_usage == 0. If it successfully - * returns, i_usage can be set to -1 and the module unloaded. Be careful to - * lock usage_lock during the whole process. - *****************************************************************************/ -MODULE_DEACTIVATE -{ - free( p_module->p_functions ); - - return( 0 ); -} +MODULE_DEACTIVATE_START +MODULE_DEACTIVATE_STOP /***************************************************************************** * motion_Probe: tests probe the CPU and return a score diff --git a/plugins/motion/motionmmx.c b/plugins/motion/motionmmx.c index 724c2898e6..d803b739d3 100644 --- a/plugins/motion/motionmmx.c +++ b/plugins/motion/motionmmx.c @@ -2,7 +2,7 @@ * motionmmx.c : MMX motion compensation module for vlc ***************************************************************************** * Copyright (C) 2000 VideoLAN - * $Id: motionmmx.c,v 1.5 2001/05/15 16:19:42 sam Exp $ + * $Id: motionmmx.c,v 1.6 2001/05/30 17:03:12 sam Exp $ * * Authors: Christophe Massiot * @@ -52,64 +52,20 @@ void motion_getfunctions( function_list_t * p_function_list ); MODULE_CONFIG_START ADD_WINDOW( "Configuration for MMX motion compensation module" ) ADD_COMMENT( "Ha, ha -- nothing to configure yet" ) -MODULE_CONFIG_END - -/***************************************************************************** - * InitModule: get the module structure and configuration. - ***************************************************************************** - * We have to fill psz_name, psz_longname and psz_version. These variables - * will be strdup()ed later by the main application because the module can - * be unloaded later to save memory, and we want to be able to access this - * data even after the module has been unloaded. - *****************************************************************************/ -MODULE_INIT -{ - p_module->psz_name = MODULE_STRING; - p_module->psz_longname = "MMX motion compensation module"; - p_module->psz_version = VERSION; +MODULE_CONFIG_STOP +MODULE_INIT_START p_module->i_capabilities = MODULE_CAPABILITY_NULL | MODULE_CAPABILITY_MOTION; + p_module->psz_longname = "MMX motion compensation module"; +MODULE_INIT_STOP - return( 0 ); -} - -/***************************************************************************** - * ActivateModule: set the module to an usable state. - ***************************************************************************** - * This function fills the capability functions and the configuration - * structure. Once ActivateModule() has been called, the i_usage can - * be set to 0 and calls to NeedModule() be made to increment it. To unload - * the module, one has to wait until i_usage == 0 and call DeactivateModule(). - *****************************************************************************/ -MODULE_ACTIVATE -{ - p_module->p_functions = malloc( sizeof( module_functions_t ) ); - if( p_module->p_functions == NULL ) - { - return( -1 ); - } - +MODULE_ACTIVATE_START motion_getfunctions( &p_module->p_functions->motion ); +MODULE_ACTIVATE_STOP - p_module->p_config = p_config; - - return( 0 ); -} - -/***************************************************************************** - * DeactivateModule: make sure the module can be unloaded. - ***************************************************************************** - * This function must only be called when i_usage == 0. If it successfully - * returns, i_usage can be set to -1 and the module unloaded. Be careful to - * lock usage_lock during the whole process. - *****************************************************************************/ -MODULE_DEACTIVATE -{ - free( p_module->p_functions ); - - return( 0 ); -} +MODULE_DEACTIVATE_START +MODULE_DEACTIVATE_STOP /***************************************************************************** * motion_Probe: tests probe the CPU and return a score diff --git a/plugins/motion/motionmmxext.c b/plugins/motion/motionmmxext.c index 702d5533dd..f7a0f6f1c7 100644 --- a/plugins/motion/motionmmxext.c +++ b/plugins/motion/motionmmxext.c @@ -2,7 +2,7 @@ * motionmmxext.c : MMX EXT motion compensation module for vlc ***************************************************************************** * Copyright (C) 2000 VideoLAN - * $Id: motionmmxext.c,v 1.5 2001/05/15 16:19:42 sam Exp $ + * $Id: motionmmxext.c,v 1.6 2001/05/30 17:03:12 sam Exp $ * * Authors: Christophe Massiot * @@ -52,64 +52,20 @@ void motion_getfunctions( function_list_t * p_function_list ); MODULE_CONFIG_START ADD_WINDOW( "Configuration for motion compensation module" ) ADD_COMMENT( "Ha, ha -- nothing to configure yet" ) -MODULE_CONFIG_END - -/***************************************************************************** - * InitModule: get the module structure and configuration. - ***************************************************************************** - * We have to fill psz_name, psz_longname and psz_version. These variables - * will be strdup()ed later by the main application because the module can - * be unloaded later to save memory, and we want to be able to access this - * data even after the module has been unloaded. - *****************************************************************************/ -MODULE_INIT -{ - p_module->psz_name = MODULE_STRING; - p_module->psz_longname = "MMX EXT motion compensation module"; - p_module->psz_version = VERSION; +MODULE_CONFIG_STOP +MODULE_INIT_START p_module->i_capabilities = MODULE_CAPABILITY_NULL | MODULE_CAPABILITY_MOTION; + p_module->psz_longname = "MMX EXT motion compensation module"; +MODULE_INIT_STOP - return( 0 ); -} - -/***************************************************************************** - * ActivateModule: set the module to an usable state. - ***************************************************************************** - * This function fills the capability functions and the configuration - * structure. Once ActivateModule() has been called, the i_usage can - * be set to 0 and calls to NeedModule() be made to increment it. To unload - * the module, one has to wait until i_usage == 0 and call DeactivateModule(). - *****************************************************************************/ -MODULE_ACTIVATE -{ - p_module->p_functions = malloc( sizeof( module_functions_t ) ); - if( p_module->p_functions == NULL ) - { - return( -1 ); - } - +MODULE_ACTIVATE_START motion_getfunctions( &p_module->p_functions->motion ); +MODULE_ACTIVATE_STOP - p_module->p_config = p_config; - - return( 0 ); -} - -/***************************************************************************** - * DeactivateModule: make sure the module can be unloaded. - ***************************************************************************** - * This function must only be called when i_usage == 0. If it successfully - * returns, i_usage can be set to -1 and the module unloaded. Be careful to - * lock usage_lock during the whole process. - *****************************************************************************/ -MODULE_DEACTIVATE -{ - free( p_module->p_functions ); - - return( 0 ); -} +MODULE_DEACTIVATE_START +MODULE_DEACTIVATE_STOP /***************************************************************************** * motion_Probe: tests probe the CPU and return a score diff --git a/plugins/mpeg/es.c b/plugins/mpeg/es.c index c26a08a475..de4bb528a0 100644 --- a/plugins/mpeg/es.c +++ b/plugins/mpeg/es.c @@ -2,7 +2,7 @@ * es.c : Elementary Stream input module for vlc ***************************************************************************** * Copyright (C) 2001 VideoLAN - * $Id: es.c,v 1.1 2001/04/20 15:02:48 sam Exp $ + * $Id: es.c,v 1.2 2001/05/30 17:03:12 sam Exp $ * * Authors: * @@ -39,73 +39,29 @@ #include "modules.h" -/***************************************************************************** - * Build configuration tree. - *****************************************************************************/ -MODULE_CONFIG_START -ADD_WINDOW( "Configuration for ES module" ) - ADD_COMMENT( "foobar !" ) -MODULE_CONFIG_END - /***************************************************************************** * Capabilities defined in the other files. *****************************************************************************/ void _M( input_getfunctions )( function_list_t * p_function_list ); /***************************************************************************** - * InitModule: get the module structure and configuration. - ***************************************************************************** - * We have to fill psz_name, psz_longname and psz_version. These variables - * will be strdup()ed later by the main application because the module can - * be unloaded later to save memory, and we want to be able to access this - * data even after the module has been unloaded. + * Build configuration tree. *****************************************************************************/ -MODULE_INIT -{ - p_module->psz_name = MODULE_STRING; - p_module->psz_longname = "ISO 13818-1 MPEG Elementary Stream input module"; - p_module->psz_version = VERSION; +MODULE_CONFIG_START +ADD_WINDOW( "Configuration for ES module" ) + ADD_COMMENT( "foobar !" ) +MODULE_CONFIG_STOP +MODULE_INIT_START p_module->i_capabilities = MODULE_CAPABILITY_NULL | MODULE_CAPABILITY_INPUT; + p_module->psz_longname = "ISO 13818-1 MPEG Elementary Stream input module"; +MODULE_INIT_STOP - return( 0 ); -} - -/***************************************************************************** - * ActivateModule: set the module to an usable state. - ***************************************************************************** - * This function fills the capability functions and the configuration - * structure. Once ActivateModule() has been called, the i_usage can - * be set to 0 and calls to NeedModule() be made to increment it. To unload - * the module, one has to wait until i_usage == 0 and call DeactivateModule(). - *****************************************************************************/ -MODULE_ACTIVATE -{ - p_module->p_functions = malloc( sizeof( module_functions_t ) ); - if( p_module->p_functions == NULL ) - { - return( -1 ); - } - +MODULE_ACTIVATE_START _M( input_getfunctions )( &p_module->p_functions->input ); +MODULE_ACTIVATE_STOP - p_module->p_config = p_config; - - return( 0 ); -} - -/***************************************************************************** - * DeactivateModule: make sure the module can be unloaded. - ***************************************************************************** - * This function must only be called when i_usage == 0. If it successfully - * returns, i_usage can be set to -1 and the module unloaded. Be careful to - * lock usage_lock during the whole process. - *****************************************************************************/ -MODULE_DEACTIVATE -{ - free( p_module->p_functions ); - - return( 0 ); -} +MODULE_DEACTIVATE_START +MODULE_DEACTIVATE_STOP diff --git a/plugins/mpeg/input_es.c b/plugins/mpeg/input_es.c index c3d3341d14..6acbebfa49 100644 --- a/plugins/mpeg/input_es.c +++ b/plugins/mpeg/input_es.c @@ -2,7 +2,7 @@ * input_es.c: Elementary Stream demux and packet management ***************************************************************************** * Copyright (C) 2001 VideoLAN - * $Id: input_es.c,v 1.2 2001/04/28 03:36:25 sam Exp $ + * $Id: input_es.c,v 1.3 2001/05/30 17:03:12 sam Exp $ * * Authors: * @@ -60,6 +60,7 @@ #include "debug.h" #include "modules.h" +#include "modules_export.h" /***************************************************************************** * Local prototypes @@ -85,8 +86,8 @@ void _M( input_getfunctions )( function_list_t * p_function_list ) #define input p_function_list->functions.input p_function_list->pf_probe = ESProbe; input.pf_init = ESInit; - input.pf_open = input_FileOpen; - input.pf_close = input_FileClose; + input.pf_open = NULL; /* Set in ESInit */ + input.pf_close = NULL; input.pf_end = ESEnd; input.pf_set_area = NULL; input.pf_read = ESRead; @@ -146,7 +147,8 @@ static void ESInit( input_thread_t * p_input ) } p_input->p_plugin_data = (void *)p_method; - /* XXX */ + p_input->pf_open = p_input->pf_file_open; + p_input->pf_close = p_input->pf_file_close; } /***************************************************************************** diff --git a/plugins/mpeg/input_ps.c b/plugins/mpeg/input_ps.c index bf3cc64ce4..856856c723 100644 --- a/plugins/mpeg/input_ps.c +++ b/plugins/mpeg/input_ps.c @@ -2,7 +2,7 @@ * input_ps.c: PS demux and packet management ***************************************************************************** * Copyright (C) 1998, 1999, 2000 VideoLAN - * $Id: input_ps.c,v 1.24 2001/05/23 17:47:34 stef Exp $ + * $Id: input_ps.c,v 1.25 2001/05/30 17:03:12 sam Exp $ * * Authors: Christophe Massiot * Cyril Deguet @@ -88,8 +88,8 @@ void _M( input_getfunctions )( function_list_t * p_function_list ) #define input p_function_list->functions.input p_function_list->pf_probe = PSProbe; input.pf_init = PSInit; - input.pf_open = input_FileOpen; - input.pf_close = input_FileClose; + input.pf_open = NULL; /* Set in PSInit */ + input.pf_close = NULL; input.pf_end = PSEnd; input.pf_set_area = NULL; input.pf_read = PSRead; @@ -167,6 +167,10 @@ static void PSInit( input_thread_t * p_input ) } p_input->p_method_data = (void *)p_packet_cache; + /* Set callback */ + p_input->pf_open = p_input->pf_file_open; + p_input->pf_close = p_input->pf_file_close; + /* Initialize packet cache mutex */ vlc_mutex_init( &p_packet_cache->lock ); diff --git a/plugins/mpeg/input_ts.c b/plugins/mpeg/input_ts.c index 35dba2fd5c..e69b46164a 100644 --- a/plugins/mpeg/input_ts.c +++ b/plugins/mpeg/input_ts.c @@ -2,7 +2,7 @@ * input_ts.c: TS demux and netlist management ***************************************************************************** * Copyright (C) 1998, 1999, 2000 VideoLAN - * $Id: input_ts.c,v 1.20 2001/05/28 04:23:52 sam Exp $ + * $Id: input_ts.c,v 1.21 2001/05/30 17:03:12 sam Exp $ * * Authors: Henri Fallon * @@ -223,14 +223,14 @@ void TSFakeOpen( input_thread_t * p_input ) if( ( strlen(psz_name) > 3 ) && !strncasecmp( psz_name, "ts:", 3 ) ) { /* If the user specified "ts:" he wants a network stream */ - p_input->pf_open = input_NetworkOpen; - p_input->pf_close = input_NetworkClose; + p_input->pf_open = p_input->pf_network_open; + p_input->pf_close = p_input->pf_network_close; } else #endif { - p_input->pf_open = input_FileOpen; - p_input->pf_close = input_FileClose; + p_input->pf_open = p_input->pf_file_open; + p_input->pf_close = p_input->pf_file_close; } p_input->pf_open( p_input ); diff --git a/plugins/mpeg/ps.c b/plugins/mpeg/ps.c index 040a60cfdd..92c52a41d6 100644 --- a/plugins/mpeg/ps.c +++ b/plugins/mpeg/ps.c @@ -2,7 +2,7 @@ * ps.c : Program Stream input module for vlc ***************************************************************************** * Copyright (C) 2000 VideoLAN - * $Id: ps.c,v 1.3 2001/03/21 13:42:34 sam Exp $ + * $Id: ps.c,v 1.4 2001/05/30 17:03:12 sam Exp $ * * Authors: Christophe Massiot * @@ -38,14 +38,7 @@ #include "mtime.h" #include "modules.h" - -/***************************************************************************** - * Build configuration tree. - *****************************************************************************/ -MODULE_CONFIG_START -ADD_WINDOW( "Configuration for PS module" ) - ADD_COMMENT( "foobar !" ) -MODULE_CONFIG_END +#include "modules_export.h" /***************************************************************************** * Capabilities defined in the other files. @@ -53,59 +46,23 @@ MODULE_CONFIG_END void _M( input_getfunctions )( function_list_t * p_function_list ); /***************************************************************************** - * InitModule: get the module structure and configuration. - ***************************************************************************** - * We have to fill psz_name, psz_longname and psz_version. These variables - * will be strdup()ed later by the main application because the module can - * be unloaded later to save memory, and we want to be able to access this - * data even after the module has been unloaded. + * Build configuration tree. *****************************************************************************/ -MODULE_INIT -{ - p_module->psz_name = MODULE_STRING; - p_module->psz_longname = "ISO 13818-1 MPEG Program Stream input module"; - p_module->psz_version = VERSION; +MODULE_CONFIG_START +ADD_WINDOW( "Configuration for PS module" ) + ADD_COMMENT( "foobar !" ) +MODULE_CONFIG_STOP +MODULE_INIT_START p_module->i_capabilities = MODULE_CAPABILITY_NULL | MODULE_CAPABILITY_INPUT; + p_module->psz_longname = "ISO 13818-1 MPEG Program Stream input module"; +MODULE_INIT_STOP - return( 0 ); -} - -/***************************************************************************** - * ActivateModule: set the module to an usable state. - ***************************************************************************** - * This function fills the capability functions and the configuration - * structure. Once ActivateModule() has been called, the i_usage can - * be set to 0 and calls to NeedModule() be made to increment it. To unload - * the module, one has to wait until i_usage == 0 and call DeactivateModule(). - *****************************************************************************/ -MODULE_ACTIVATE -{ - p_module->p_functions = malloc( sizeof( module_functions_t ) ); - if( p_module->p_functions == NULL ) - { - return( -1 ); - } - +MODULE_ACTIVATE_START _M( input_getfunctions )( &p_module->p_functions->input ); +MODULE_ACTIVATE_STOP - p_module->p_config = p_config; - - return( 0 ); -} - -/***************************************************************************** - * DeactivateModule: make sure the module can be unloaded. - ***************************************************************************** - * This function must only be called when i_usage == 0. If it successfully - * returns, i_usage can be set to -1 and the module unloaded. Be careful to - * lock usage_lock during the whole process. - *****************************************************************************/ -MODULE_DEACTIVATE -{ - free( p_module->p_functions ); - - return( 0 ); -} +MODULE_DEACTIVATE_START +MODULE_DEACTIVATE_STOP diff --git a/plugins/mpeg/ts.c b/plugins/mpeg/ts.c index 5180c4f297..d04979e32a 100644 --- a/plugins/mpeg/ts.c +++ b/plugins/mpeg/ts.c @@ -2,7 +2,7 @@ * ts.c : Transport Stream input module for vlc ***************************************************************************** * Copyright (C) 2000 VideoLAN - * $Id: ts.c,v 1.3 2001/03/21 13:42:34 sam Exp $ + * $Id: ts.c,v 1.4 2001/05/30 17:03:12 sam Exp $ * * Authors: Henri Fallon * @@ -39,73 +39,29 @@ #include "modules.h" -/***************************************************************************** - * Build configuration tree. - *****************************************************************************/ -MODULE_CONFIG_START -ADD_WINDOW( "Configuration for TS module" ) - ADD_COMMENT( "foobar !" ) -MODULE_CONFIG_END - /***************************************************************************** * Capabilities defined in the other files. *****************************************************************************/ void _M( input_getfunctions )( function_list_t * p_function_list ); /***************************************************************************** - * InitModule: get the module structure and configuration. - ***************************************************************************** - * We have to fill psz_name, psz_longname and psz_version. These variables - * will be strdup()ed later by the main application because the module can - * be unloaded later to save memory, and we want to be able to access this - * data even after the module has been unloaded. + * Build configuration tree. *****************************************************************************/ -MODULE_INIT -{ - p_module->psz_name = MODULE_STRING; - p_module->psz_longname = "ISO 13818-1 MPEG Transport Stream input module"; - p_module->psz_version = VERSION; +MODULE_CONFIG_START +ADD_WINDOW( "Configuration for TS module" ) + ADD_COMMENT( "foobar !" ) +MODULE_CONFIG_STOP +MODULE_INIT_START p_module->i_capabilities = MODULE_CAPABILITY_NULL | MODULE_CAPABILITY_INPUT; + p_module->psz_longname = "ISO 13818-1 MPEG Transport Stream input module"; +MODULE_INIT_STOP - return( 0 ); -} - -/***************************************************************************** - * ActivateModule: set the module to an usable state. - ***************************************************************************** - * This function fills the capability functions and the configuration - * structure. Once ActivateModule() has been called, the i_usage can - * be set to 0 and calls to NeedModule() be made to increment it. To unload - * the module, one has to wait until i_usage == 0 and call DeactivateModule(). - *****************************************************************************/ -MODULE_ACTIVATE -{ - p_module->p_functions = malloc( sizeof( module_functions_t ) ); - if( p_module->p_functions == NULL ) - { - return( -1 ); - } - +MODULE_ACTIVATE_START _M( input_getfunctions )( &p_module->p_functions->input ); +MODULE_ACTIVATE_STOP - p_module->p_config = p_config; - - return( 0 ); -} - -/***************************************************************************** - * DeactivateModule: make sure the module can be unloaded. - ***************************************************************************** - * This function must only be called when i_usage == 0. If it successfully - * returns, i_usage can be set to -1 and the module unloaded. Be careful to - * lock usage_lock during the whole process. - *****************************************************************************/ -MODULE_DEACTIVATE -{ - free( p_module->p_functions ); - - return( 0 ); -} +MODULE_DEACTIVATE_START +MODULE_DEACTIVATE_STOP diff --git a/plugins/null/null.c b/plugins/null/null.c index bfdc2929eb..fdcb714dea 100644 --- a/plugins/null/null.c +++ b/plugins/null/null.c @@ -2,7 +2,7 @@ * null.c : NULL module for vlc ***************************************************************************** * Copyright (C) 2000 VideoLAN - * $Id: null.c,v 1.6 2001/03/21 13:42:34 sam Exp $ + * $Id: null.c,v 1.7 2001/05/30 17:03:12 sam Exp $ * * Authors: Samuel Hocevar * @@ -56,55 +56,18 @@ ADD_WINDOW( "Configuration for null module" ) ADD_PANE( "Second pane" ) ADD_FRAME( "Frame" ) ADD_COMMENT( "There is nothing in this frame." ) -MODULE_CONFIG_END - -/***************************************************************************** - * InitModule: get the module structure and configuration. - ***************************************************************************** - * We have to fill psz_name, psz_longname and psz_version. These variables - * will be strdup()ed later by the main application because the module can - * be unloaded later to save memory, and we want to be able to access this - * data even after the module has been unloaded. - *****************************************************************************/ -MODULE_INIT -{ - p_module->psz_name = MODULE_STRING; - p_module->psz_longname = "the Null module that does nothing"; - p_module->psz_version = VERSION; +MODULE_CONFIG_STOP +MODULE_INIT_START p_module->i_capabilities = MODULE_CAPABILITY_NULL; + p_module->psz_longname = "the Null module that does nothing"; +MODULE_INIT_STOP - return( 0 ); -} - -/***************************************************************************** - * ActivateModule: set the module to an usable state. - ***************************************************************************** - * This function fills the capability functions and the configuration - * structure. Once ActivateModule() has been called, the i_usage can - * be set to 0 and calls to NeedModule() be made to increment it. To unload - * the module, one has to wait until i_usage == 0 and call DeactivateModule(). - *****************************************************************************/ -MODULE_ACTIVATE -{ +MODULE_ACTIVATE_START /* Since the Null module can't do anything, there is no need to * fill the p_functions structure. */ - p_module->p_functions = NULL; - p_module->p_config = p_config; - - return( 0 ); -} +MODULE_ACTIVATE_STOP -/***************************************************************************** - * DeactivateModule: make sure the module can be unloaded. - ***************************************************************************** - * This function must only be called when i_usage == 0. If it successfully - * returns, i_usage can be set to -1 and the module unloaded. Be careful to - * lock usage_lock during the whole process. - *****************************************************************************/ -MODULE_DEACTIVATE -{ - /* We didn't allocate p_functions - so we don't have to free it */ - return( 0 ); -} +MODULE_DEACTIVATE_START +MODULE_DEACTIVATE_STOP diff --git a/plugins/qt/Makefile b/plugins/qt/Makefile index 37cdd7b471..0dd8aef356 100644 --- a/plugins/qt/Makefile +++ b/plugins/qt/Makefile @@ -20,7 +20,7 @@ include ../../Makefile.modules $(PLUGIN_QT): %.o: .dep/%.dpp $(PLUGIN_QT): %.o: %.moc - $(CC) $(CFLAGS) $(PCFLAGS) -I/usr/include/qt -I${QTDIR}/include -c -o $@ $(<:%.moc=%.cpp) + $(CC) $(CFLAGS) -DPLUGIN $(PCFLAGS) -I/usr/include/qt -I${QTDIR}/include -c -o $@ $(<:%.moc=%.cpp) $(PLUGIN_QT:%.o=%.moc): %.moc: %.cpp grep -q Q_OBJECT $< && $(MOC) -i $< -o $@ || true diff --git a/plugins/qt/intf_qt.cpp b/plugins/qt/intf_qt.cpp index ffcf4f87e2..3168bc1dc1 100644 --- a/plugins/qt/intf_qt.cpp +++ b/plugins/qt/intf_qt.cpp @@ -2,7 +2,7 @@ * intf_qt.cpp: Qt interface ***************************************************************************** * Copyright (C) 1999, 2000 VideoLAN - * $Id: intf_qt.cpp,v 1.6 2001/05/07 03:14:09 stef Exp $ + * $Id: intf_qt.cpp,v 1.7 2001/05/30 17:03:12 sam Exp $ * * Authors: Samuel Hocevar * @@ -42,7 +42,6 @@ extern "C" #include "threads.h" #include "mtime.h" #include "tests.h" -#include "modules.h" #include "stream_control.h" #include "input_ext-intf.h" @@ -53,6 +52,9 @@ extern "C" #include "main.h" +#include "modules.h" +#include "modules_export.h" + } /* extern "C" */ #include diff --git a/plugins/qt/qt.cpp b/plugins/qt/qt.cpp index cf10997873..abec470253 100644 --- a/plugins/qt/qt.cpp +++ b/plugins/qt/qt.cpp @@ -2,7 +2,7 @@ * qt.cpp : Qt plugin for vlc ***************************************************************************** * Copyright (C) 2001 VideoLAN - * $Id: qt.cpp,v 1.2 2001/03/21 13:42:34 sam Exp $ + * $Id: qt.cpp,v 1.3 2001/05/30 17:03:12 sam Exp $ * * Authors: Samuel Hocevar * @@ -39,14 +39,7 @@ extern "C" #include "mtime.h" #include "modules.h" - -/***************************************************************************** - * Build configuration tree. - *****************************************************************************/ -MODULE_CONFIG_START -ADD_WINDOW( "Configuration for Qt module" ) - ADD_COMMENT( "Ha, ha -- nothing to configure yet" ) -MODULE_CONFIG_END +#include "modules_export.h" /***************************************************************************** * Capabilities defined in the other files. @@ -54,61 +47,24 @@ MODULE_CONFIG_END void _M( intf_getfunctions )( function_list_t * p_function_list ); /***************************************************************************** - * InitModule: get the module structure and configuration. - ***************************************************************************** - * We have to fill psz_name, psz_longname and psz_version. These variables - * will be strdup()ed later by the main application because the module can - * be unloaded later to save memory, and we want to be able to access this - * data even after the module has been unloaded. + * Build configuration tree. *****************************************************************************/ -MODULE_INIT -{ - p_module->psz_name = MODULE_STRING; - p_module->psz_longname = "Qt interface module"; - p_module->psz_version = VERSION; +MODULE_CONFIG_START +ADD_WINDOW( "Configuration for Qt module" ) + ADD_COMMENT( "Ha, ha -- nothing to configure yet" ) +MODULE_CONFIG_STOP +MODULE_INIT_START p_module->i_capabilities = MODULE_CAPABILITY_NULL | MODULE_CAPABILITY_INTF; + p_module->psz_longname = "Qt interface module"; +MODULE_INIT_STOP - return( 0 ); -} - -/***************************************************************************** - * ActivateModule: set the module to an usable state. - ***************************************************************************** - * This function fills the capability functions and the configuration - * structure. Once ActivateModule() has been called, the i_usage can - * be set to 0 and calls to NeedModule() be made to increment it. To unload - * the module, one has to wait until i_usage == 0 and call DeactivateModule(). - *****************************************************************************/ -MODULE_ACTIVATE -{ - p_module->p_functions = - ( module_functions_t * )malloc( sizeof( module_functions_t ) ); - if( p_module->p_functions == NULL ) - { - return( -1 ); - } - +MODULE_ACTIVATE_START _M( intf_getfunctions )( &p_module->p_functions->intf ); +MODULE_ACTIVATE_STOP - p_module->p_config = p_config; - - return( 0 ); -} - -/***************************************************************************** - * DeactivateModule: make sure the module can be unloaded. - ***************************************************************************** - * This function must only be called when i_usage == 0. If it successfully - * returns, i_usage can be set to -1 and the module unloaded. Be careful to - * lock usage_lock during the whole process. - *****************************************************************************/ -MODULE_DEACTIVATE -{ - free( p_module->p_functions ); - - return( 0 ); -} +MODULE_DEACTIVATE_START +MODULE_DEACTIVATE_STOP } /* extern "C" */ diff --git a/plugins/sdl/aout_sdl.c b/plugins/sdl/aout_sdl.c index 0431be21e6..6a3c2acbee 100644 --- a/plugins/sdl/aout_sdl.c +++ b/plugins/sdl/aout_sdl.c @@ -2,7 +2,7 @@ * aout_sdl.c : audio sdl functions library ***************************************************************************** * Copyright (C) 1999, 2000 VideoLAN - * $Id: aout_sdl.c,v 1.12 2001/04/28 03:36:25 sam Exp $ + * $Id: aout_sdl.c,v 1.13 2001/05/30 17:03:12 sam Exp $ * * Authors: Michel Kaempf * Samuel Hocevar @@ -52,6 +52,7 @@ #include "main.h" #include "modules.h" +#include "modules_export.h" /***************************************************************************** * aout_sys_t: dsp audio output method descriptor diff --git a/plugins/sdl/sdl.c b/plugins/sdl/sdl.c index 5ecb714569..6cc8534a2b 100644 --- a/plugins/sdl/sdl.c +++ b/plugins/sdl/sdl.c @@ -2,7 +2,7 @@ * sdl.c : SDL plugin for vlc ***************************************************************************** * Copyright (C) 2000, 2001 VideoLAN - * $Id: sdl.c,v 1.15 2001/04/28 03:36:25 sam Exp $ + * $Id: sdl.c,v 1.16 2001/05/30 17:03:12 sam Exp $ * * Authors: Samuel Hocevar * Pierre Baillet @@ -44,14 +44,7 @@ #include "video_output.h" #include "modules.h" - -/***************************************************************************** - * Building configuration tree - *****************************************************************************/ -MODULE_CONFIG_START -ADD_WINDOW( "Configuration for SDL module" ) - ADD_COMMENT( "For now, the SDL module cannot be configured" ) -MODULE_CONFIG_END +#include "modules_export.h" /***************************************************************************** * Capabilities defined in the other files. @@ -60,61 +53,25 @@ void _M( aout_getfunctions )( function_list_t * p_function_list ); void _M( vout_getfunctions )( function_list_t * p_function_list ); /***************************************************************************** - * InitModule: get the module structure and configuration. - ***************************************************************************** - * We have to fill psz_name, psz_longname and psz_version. These variables - * will be strdup()ed later by the main application because the module can - * be unloaded later to save memory, and we want to be able to access this - * data even after the module has been unloaded. + * Building configuration tree *****************************************************************************/ -MODULE_INIT -{ - p_module->psz_name = MODULE_STRING; - p_module->psz_longname = "Simple DirectMedia Layer module"; - p_module->psz_version = VERSION; +MODULE_CONFIG_START +ADD_WINDOW( "Configuration for SDL module" ) + ADD_COMMENT( "For now, the SDL module cannot be configured" ) +MODULE_CONFIG_STOP +MODULE_INIT_START p_module->i_capabilities = MODULE_CAPABILITY_NULL | MODULE_CAPABILITY_VOUT | MODULE_CAPABILITY_AOUT; + p_module->psz_longname = "Simple DirectMedia Layer module"; +MODULE_INIT_STOP - return( 0 ); -} - -/***************************************************************************** - * ActivateModule: set the module to an usable state. - ***************************************************************************** - * This function fills the capability functions and the configuration - * structure. Once ActivateModule() has been called, the i_usage can - * be set to 0 and calls to NeedModule() be made to increment it. To unload - * the module, one has to wait until i_usage == 0 and call DeactivateModule(). - *****************************************************************************/ -MODULE_ACTIVATE -{ - p_module->p_functions = malloc( sizeof( module_functions_t ) ); - if( p_module->p_functions == NULL ) - { - return( -1 ); - } - +MODULE_ACTIVATE_START _M( aout_getfunctions )( &p_module->p_functions->aout ); _M( vout_getfunctions )( &p_module->p_functions->vout ); +MODULE_ACTIVATE_STOP - p_module->p_config = p_config; - - return( 0 ); -} - -/***************************************************************************** - * DeactivateModule: make sure the module can be unloaded. - ***************************************************************************** - * This function must only be called when i_usage == 0. If it successfully - * returns, i_usage can be set to -1 and the module unloaded. Be careful to - * lock usage_lock during the whole process. - *****************************************************************************/ -MODULE_DEACTIVATE -{ - free( p_module->p_functions ); - - return( 0 ); -} +MODULE_DEACTIVATE_START +MODULE_DEACTIVATE_STOP diff --git a/plugins/sdl/vout_sdl.c b/plugins/sdl/vout_sdl.c index 900356a465..42c46c12d0 100644 --- a/plugins/sdl/vout_sdl.c +++ b/plugins/sdl/vout_sdl.c @@ -2,7 +2,7 @@ * vout_sdl.c: SDL video output display method ***************************************************************************** * Copyright (C) 1998, 1999, 2000 VideoLAN - * $Id: vout_sdl.c,v 1.52 2001/05/25 13:20:09 sam Exp $ + * $Id: vout_sdl.c,v 1.53 2001/05/30 17:03:12 sam Exp $ * * Authors: Samuel Hocevar * Pierre Baillet @@ -46,7 +46,6 @@ #include "threads.h" #include "mtime.h" #include "tests.h" -#include "modules.h" #include "video.h" #include "video_output.h" @@ -58,6 +57,9 @@ #include "main.h" #include "netutils.h" +#include "modules.h" +#include "modules_export.h" + /***************************************************************************** * FIXME: this file is ... * * * @@ -683,8 +685,8 @@ static int SDLOpenDisplay( vout_thread_t *p_vout ) /* FIXME: palette in 8bpp ?? */ /* Set and initialize buffers */ - vout_SetBuffers( p_vout, p_vout->p_sys->p_sdl_buf[ 0 ], - p_vout->p_sys->p_sdl_buf[ 1 ] ); + p_vout->pf_setbuffers( p_vout, p_vout->p_sys->p_sdl_buf[ 0 ], + p_vout->p_sys->p_sdl_buf[ 1 ] ); } else { @@ -696,8 +698,8 @@ static int SDLOpenDisplay( vout_thread_t *p_vout ) p_vout->i_height = p_vout->p_sys->p_display->h; p_vout->i_bytes_per_line = p_vout->p_sys->p_display->pitch; - vout_SetBuffers( p_vout, p_vout->p_sys->p_sdl_buf[ 0 ], - p_vout->p_sys->p_sdl_buf[ 1 ] ); + p_vout->pf_setbuffers( p_vout, p_vout->p_sys->p_sdl_buf[ 0 ], + p_vout->p_sys->p_sdl_buf[ 1 ] ); } p_vout->p_sys->b_reopen_display = 0; diff --git a/plugins/text/ncurses.c b/plugins/text/ncurses.c index a65531d5a7..4a71b262ed 100644 --- a/plugins/text/ncurses.c +++ b/plugins/text/ncurses.c @@ -2,7 +2,7 @@ * ncurses.c : NCurses plugin for vlc ***************************************************************************** * Copyright (C) 2001 VideoLAN - * $Id: ncurses.c,v 1.4 2001/04/28 03:36:25 sam Exp $ + * $Id: ncurses.c,v 1.5 2001/05/30 17:03:12 sam Exp $ * * Authors: Samuel Hocevar * @@ -38,73 +38,29 @@ #include "modules.h" -/***************************************************************************** - * Building configuration tree - *****************************************************************************/ -MODULE_CONFIG_START -ADD_WINDOW( "Configuration for NCurses module" ) - ADD_COMMENT( "For now, the NCurses module cannot be configured" ) -MODULE_CONFIG_END - /***************************************************************************** * Capabilities defined in the other files. *****************************************************************************/ void _M( intf_getfunctions )( function_list_t * p_function_list ); /***************************************************************************** - * InitModule: get the module structure and configuration. - ***************************************************************************** - * We have to fill psz_name, psz_longname and psz_version. These variables - * will be strdup()ed later by the main application because the module can - * be unloaded later to save memory, and we want to be able to access this - * data even after the module has been unloaded. + * Building configuration tree *****************************************************************************/ -MODULE_INIT -{ - p_module->psz_name = MODULE_STRING; - p_module->psz_longname = "ncurses interface module"; - p_module->psz_version = VERSION; +MODULE_CONFIG_START +ADD_WINDOW( "Configuration for NCurses module" ) + ADD_COMMENT( "For now, the NCurses module cannot be configured" ) +MODULE_CONFIG_STOP +MODULE_INIT_START p_module->i_capabilities = MODULE_CAPABILITY_NULL | MODULE_CAPABILITY_INTF; + p_module->psz_longname = "ncurses interface module"; +MODULE_INIT_STOP - return( 0 ); -} - -/***************************************************************************** - * ActivateModule: set the module to an usable state. - ***************************************************************************** - * This function fills the capability functions and the configuration - * structure. Once ActivateModule() has been called, the i_usage can - * be set to 0 and calls to NeedModule() be made to increment it. To unload - * the module, one has to wait until i_usage == 0 and call DeactivateModule(). - *****************************************************************************/ -MODULE_ACTIVATE -{ - p_module->p_functions = malloc( sizeof( module_functions_t ) ); - if( p_module->p_functions == NULL ) - { - return( -1 ); - } - +MODULE_ACTIVATE_START _M( intf_getfunctions )( &p_module->p_functions->intf ); +MODULE_ACTIVATE_STOP - p_module->p_config = p_config; - - return( 0 ); -} - -/***************************************************************************** - * DeactivateModule: make sure the module can be unloaded. - ***************************************************************************** - * This function must only be called when i_usage == 0. If it successfully - * returns, i_usage can be set to -1 and the module unloaded. Be careful to - * lock usage_lock during the whole process. - *****************************************************************************/ -MODULE_DEACTIVATE -{ - free( p_module->p_functions ); - - return( 0 ); -} +MODULE_DEACTIVATE_START +MODULE_DEACTIVATE_STOP diff --git a/plugins/text/rc.c b/plugins/text/rc.c index 8a2b4310c8..a3727f1188 100644 --- a/plugins/text/rc.c +++ b/plugins/text/rc.c @@ -38,74 +38,29 @@ #include "modules.h" -/***************************************************************************** - * Build configuration tree. - *****************************************************************************/ -MODULE_CONFIG_START -ADD_WINDOW( "Configuration for rc module" ) - ADD_COMMENT( "Ha, ha -- nothing to configure yet" ) -MODULE_CONFIG_END - /***************************************************************************** * Capabilities defined in the other files. *****************************************************************************/ void _M( intf_getfunctions )( function_list_t * p_function_list ); /***************************************************************************** - * InitModule: get the module structure and configuration. - ***************************************************************************** - * We have to fill psz_name, psz_longname and psz_version. These variables - * will be strdup()ed later by the main application because the module can - * be unloaded later to save memory, and we want to be able to access this - * data even after the module has been unloaded. + * Build configuration tree. *****************************************************************************/ -MODULE_INIT -{ - p_module->psz_name = MODULE_STRING; - p_module->psz_longname = "remote control interface module"; - p_module->psz_version = VERSION; +MODULE_CONFIG_START +ADD_WINDOW( "Configuration for rc module" ) + ADD_COMMENT( "Ha, ha -- nothing to configure yet" ) +MODULE_CONFIG_STOP +MODULE_INIT_START p_module->i_capabilities = MODULE_CAPABILITY_NULL | MODULE_CAPABILITY_INTF; + p_module->psz_longname = "remote control interface module"; +MODULE_INIT_STOP - return( 0 ); -} - -/***************************************************************************** - * ActivateModule: set the module to an usable state. - ***************************************************************************** - * This function fills the capability functions and the configuration - * structure. Once ActivateModule() has been called, the i_usage can - * be set to 0 and calls to NeedModule() be made to increment it. To unload - * the module, one has to wait until i_usage == 0 and call DeactivateModule(). - *****************************************************************************/ -MODULE_ACTIVATE -{ - p_module->p_functions = - ( module_functions_t * )malloc( sizeof( module_functions_t ) ); - if( p_module->p_functions == NULL ) - { - return( -1 ); - } - +MODULE_ACTIVATE_START _M( intf_getfunctions )( &p_module->p_functions->intf ); +MODULE_ACTIVATE_STOP - p_module->p_config = p_config; - - return( 0 ); -} - -/***************************************************************************** - * DeactivateModule: make sure the module can be unloaded. - ***************************************************************************** - * This function must only be called when i_usage == 0. If it successfully - * returns, i_usage can be set to -1 and the module unloaded. Be careful to - * lock usage_lock during the whole process. - *****************************************************************************/ -MODULE_DEACTIVATE -{ - free( p_module->p_functions ); - - return( 0 ); -} +MODULE_DEACTIVATE_START +MODULE_DEACTIVATE_STOP diff --git a/plugins/x11/vout_x11.c b/plugins/x11/vout_x11.c index a2e830bd65..eb7c2a3c37 100644 --- a/plugins/x11/vout_x11.c +++ b/plugins/x11/vout_x11.c @@ -2,7 +2,7 @@ * vout_x11.c: X11 video output display method ***************************************************************************** * Copyright (C) 1998, 1999, 2000 VideoLAN - * $Id: vout_x11.c,v 1.25 2001/05/25 13:20:09 sam Exp $ + * $Id: vout_x11.c,v 1.26 2001/05/30 17:03:12 sam Exp $ * * Authors: Vincent Seguin * Samuel Hocevar @@ -57,7 +57,6 @@ #include "threads.h" #include "mtime.h" #include "tests.h" -#include "modules.h" #include "video.h" #include "video_output.h" @@ -69,6 +68,9 @@ #include "main.h" +#include "modules.h" +#include "modules_export.h" + /***************************************************************************** * vout_sys_t: video output X11 method descriptor ***************************************************************************** @@ -312,8 +314,8 @@ static int vout_Init( vout_thread_t *p_vout ) /* Set bytes per line and initialize buffers */ p_vout->i_bytes_per_line = p_vout->p_sys->p_ximage[0]->bytes_per_line; - vout_SetBuffers( p_vout, p_vout->p_sys->p_ximage[ 0 ]->data, - p_vout->p_sys->p_ximage[ 1 ]->data ); + p_vout->pf_setbuffers( p_vout, p_vout->p_sys->p_ximage[ 0 ]->data, + p_vout->p_sys->p_ximage[ 1 ]->data ); /* Set date for autohiding cursor */ p_vout->p_sys->i_lastmoved = mdate(); diff --git a/plugins/x11/vout_xvideo.c b/plugins/x11/vout_xvideo.c index ac1de28bbe..bacb06ade4 100644 --- a/plugins/x11/vout_xvideo.c +++ b/plugins/x11/vout_xvideo.c @@ -2,7 +2,7 @@ * vout_xvideo.c: Xvideo video output display method ***************************************************************************** * Copyright (C) 1998, 1999, 2000, 2001 VideoLAN - * $Id: vout_xvideo.c,v 1.17 2001/05/25 13:20:09 sam Exp $ + * $Id: vout_xvideo.c,v 1.18 2001/05/30 17:03:12 sam Exp $ * * Authors: Shane Harper * Vincent Seguin @@ -60,7 +60,6 @@ #include "threads.h" #include "mtime.h" #include "tests.h" -#include "modules.h" #include "video.h" #include "video_output.h" @@ -75,6 +74,8 @@ #include "stream_control.h" /* needed by input_ext-intf.h... */ #include "input_ext-intf.h" +#include "modules.h" +#include "modules_export.h" #define GUID_YUV12_PLANAR 0x32315659 @@ -664,7 +665,7 @@ static int XVideoUpdateImgSizeIfRequired( vout_thread_t *p_vout ) (p_vout->p_sys->p_xvimage->data_size) / (p_vout->p_sys->p_xvimage->height); - /* vout_SetBuffers( p_vout, p_vout->p_sys->p_xvimage->data ); */ + /* p_vout->pf_setbuffers( p_vout, p_vout->p_sys->p_xvimage->data ); */ } return( 0 ); diff --git a/plugins/x11/x11.c b/plugins/x11/x11.c index d56e7e9e6a..8d44d7854c 100644 --- a/plugins/x11/x11.c +++ b/plugins/x11/x11.c @@ -2,7 +2,7 @@ * x11.c : X11 plugin for vlc ***************************************************************************** * Copyright (C) 2000, 2001 VideoLAN - * $Id: x11.c,v 1.6 2001/04/28 03:36:25 sam Exp $ + * $Id: x11.c,v 1.7 2001/05/30 17:03:12 sam Exp $ * * Authors: Samuel Hocevar * @@ -40,14 +40,7 @@ #include "video_output.h" #include "modules.h" - -/***************************************************************************** - * Building configuration tree - *****************************************************************************/ -MODULE_CONFIG_START -ADD_WINDOW( "Configuration for X11 module" ) - ADD_COMMENT( "For now, the X11 module cannot be configured" ) -MODULE_CONFIG_END +#include "modules_export.h" /***************************************************************************** * Capabilities defined in the other files. @@ -55,59 +48,23 @@ MODULE_CONFIG_END void _M( vout_getfunctions )( function_list_t * p_function_list ); /***************************************************************************** - * InitModule: get the module structure and configuration. - ***************************************************************************** - * We have to fill psz_name, psz_longname and psz_version. These variables - * will be strdup()ed later by the main application because the module can - * be unloaded later to save memory, and we want to be able to access this - * data even after the module has been unloaded. + * Building configuration tree *****************************************************************************/ -MODULE_INIT -{ - p_module->psz_name = MODULE_STRING; - p_module->psz_longname = "X11 module"; - p_module->psz_version = VERSION; +MODULE_CONFIG_START +ADD_WINDOW( "Configuration for X11 module" ) + ADD_COMMENT( "For now, the X11 module cannot be configured" ) +MODULE_CONFIG_STOP +MODULE_INIT_START p_module->i_capabilities = MODULE_CAPABILITY_NULL | MODULE_CAPABILITY_VOUT; + p_module->psz_longname = "X11 module"; +MODULE_INIT_STOP - return( 0 ); -} - -/***************************************************************************** - * ActivateModule: set the module to an usable state. - ***************************************************************************** - * This function fills the capability functions and the configuration - * structure. Once ActivateModule() has been called, the i_usage can - * be set to 0 and calls to NeedModule() be made to increment it. To unload - * the module, one has to wait until i_usage == 0 and call DeactivateModule(). - *****************************************************************************/ -MODULE_ACTIVATE -{ - p_module->p_functions = malloc( sizeof( module_functions_t ) ); - if( p_module->p_functions == NULL ) - { - return( -1 ); - } - +MODULE_ACTIVATE_START _M( vout_getfunctions )( &p_module->p_functions->vout ); +MODULE_ACTIVATE_STOP - p_module->p_config = p_config; - - return( 0 ); -} - -/***************************************************************************** - * DeactivateModule: make sure the module can be unloaded. - ***************************************************************************** - * This function must only be called when i_usage == 0. If it successfully - * returns, i_usage can be set to -1 and the module unloaded. Be careful to - * lock usage_lock during the whole process. - *****************************************************************************/ -MODULE_DEACTIVATE -{ - free( p_module->p_functions ); - - return( 0 ); -} +MODULE_DEACTIVATE_START +MODULE_DEACTIVATE_STOP diff --git a/plugins/x11/xvideo.c b/plugins/x11/xvideo.c index d0f9f94113..f534c2a364 100644 --- a/plugins/x11/xvideo.c +++ b/plugins/x11/xvideo.c @@ -2,7 +2,7 @@ * xvideo.c : Xvideo plugin for vlc ***************************************************************************** * Copyright (C) 2000, 2001 VideoLAN - * $Id: xvideo.c,v 1.2 2001/04/28 03:36:25 sam Exp $ + * $Id: xvideo.c,v 1.3 2001/05/30 17:03:12 sam Exp $ * * Authors: Shane Harper * @@ -40,14 +40,7 @@ #include "video_output.h" #include "modules.h" - -/***************************************************************************** - * Building configuration tree - *****************************************************************************/ -MODULE_CONFIG_START -ADD_WINDOW( "Configuration for xvideo module" ) - ADD_COMMENT( "For now, the xvideo module cannot be configured" ) -MODULE_CONFIG_END +#include "modules_export.h" /***************************************************************************** * Capabilities defined in the other files. @@ -55,59 +48,23 @@ MODULE_CONFIG_END void _M( vout_getfunctions )( function_list_t * p_function_list ); /***************************************************************************** - * InitModule: get the module structure and configuration. - ***************************************************************************** - * We have to fill psz_name, psz_longname and psz_version. These variables - * will be strdup()ed later by the main application because the module can - * be unloaded later to save memory, and we want to be able to access this - * data even after the module has been unloaded. + * Building configuration tree *****************************************************************************/ -MODULE_INIT -{ - p_module->psz_name = MODULE_STRING; - p_module->psz_longname = "XVideo extension module"; - p_module->psz_version = VERSION; +MODULE_CONFIG_START +ADD_WINDOW( "Configuration for xvideo module" ) + ADD_COMMENT( "For now, the xvideo module cannot be configured" ) +MODULE_CONFIG_STOP +MODULE_INIT_START p_module->i_capabilities = MODULE_CAPABILITY_NULL | MODULE_CAPABILITY_VOUT; + p_module->psz_longname = "XVideo extension module"; +MODULE_INIT_STOP - return( 0 ); -} - -/***************************************************************************** - * ActivateModule: set the module to an usable state. - ***************************************************************************** - * This function fills the capability functions and the configuration - * structure. Once ActivateModule() has been called, the i_usage can - * be set to 0 and calls to NeedModule() be made to increment it. To unload - * the module, one has to wait until i_usage == 0 and call DeactivateModule(). - *****************************************************************************/ -MODULE_ACTIVATE -{ - p_module->p_functions = malloc( sizeof( module_functions_t ) ); - if( p_module->p_functions == NULL ) - { - return( -1 ); - } - +MODULE_ACTIVATE_START _M( vout_getfunctions )( &p_module->p_functions->vout ); +MODULE_ACTIVATE_STOP - p_module->p_config = p_config; - - return( 0 ); -} - -/***************************************************************************** - * DeactivateModule: make sure the module can be unloaded. - ***************************************************************************** - * This function must only be called when i_usage == 0. If it successfully - * returns, i_usage can be set to -1 and the module unloaded. Be careful to - * lock usage_lock during the whole process. - *****************************************************************************/ -MODULE_DEACTIVATE -{ - free( p_module->p_functions ); - - return( 0 ); -} +MODULE_DEACTIVATE_START +MODULE_DEACTIVATE_STOP diff --git a/plugins/yuv/yuv.c b/plugins/yuv/yuv.c index 4c85a22473..2284824c70 100644 --- a/plugins/yuv/yuv.c +++ b/plugins/yuv/yuv.c @@ -2,7 +2,7 @@ * yuv.c : C YUV module for vlc ***************************************************************************** * Copyright (C) 2000 VideoLAN - * $Id: yuv.c,v 1.6 2001/03/21 13:42:34 sam Exp $ + * $Id: yuv.c,v 1.7 2001/05/30 17:03:12 sam Exp $ * * Authors: Vincent Seguin * @@ -52,62 +52,18 @@ void _M( yuv_getfunctions )( function_list_t * p_function_list ); MODULE_CONFIG_START ADD_WINDOW( "Configuration for YUV module" ) ADD_COMMENT( "Ha, ha -- nothing to configure yet" ) -MODULE_CONFIG_END - -/***************************************************************************** - * InitModule: get the module structure and configuration. - ***************************************************************************** - * We have to fill psz_name, psz_longname and psz_version. These variables - * will be strdup()ed later by the main application because the module can - * be unloaded later to save memory, and we want to be able to access this - * data even after the module has been unloaded. - *****************************************************************************/ -MODULE_INIT -{ - p_module->psz_name = MODULE_STRING; - p_module->psz_longname = "YUV transformations module"; - p_module->psz_version = VERSION; +MODULE_CONFIG_STOP +MODULE_INIT_START p_module->i_capabilities = MODULE_CAPABILITY_NULL | MODULE_CAPABILITY_YUV; + p_module->psz_longname = "YUV transformations module"; +MODULE_INIT_STOP - return( 0 ); -} - -/***************************************************************************** - * ActivateModule: set the module to an usable state. - ***************************************************************************** - * This function fills the capability functions and the configuration - * structure. Once ActivateModule() has been called, the i_usage can - * be set to 0 and calls to NeedModule() be made to increment it. To unload - * the module, one has to wait until i_usage == 0 and call DeactivateModule(). - *****************************************************************************/ -MODULE_ACTIVATE -{ - p_module->p_functions = malloc( sizeof( module_functions_t ) ); - if( p_module->p_functions == NULL ) - { - return( -1 ); - } - +MODULE_ACTIVATE_START _M( yuv_getfunctions )( &p_module->p_functions->yuv ); +MODULE_ACTIVATE_STOP - p_module->p_config = p_config; - - return( 0 ); -} - -/***************************************************************************** - * DeactivateModule: make sure the module can be unloaded. - ***************************************************************************** - * This function must only be called when i_usage == 0. If it successfully - * returns, i_usage can be set to -1 and the module unloaded. Be careful to - * lock usage_lock during the whole process. - *****************************************************************************/ -MODULE_DEACTIVATE -{ - free( p_module->p_functions ); - - return( 0 ); -} +MODULE_DEACTIVATE_START +MODULE_DEACTIVATE_STOP diff --git a/plugins/yuv/yuvmmx.c b/plugins/yuv/yuvmmx.c index 8d21fe7006..27cdcfe0ff 100644 --- a/plugins/yuv/yuvmmx.c +++ b/plugins/yuv/yuvmmx.c @@ -2,7 +2,7 @@ * yuvmmx.c : Accelerated MMX YUV module for vlc ***************************************************************************** * Copyright (C) 2000 VideoLAN - * $Id: yuvmmx.c,v 1.4 2001/03/21 13:42:34 sam Exp $ + * $Id: yuvmmx.c,v 1.5 2001/05/30 17:03:12 sam Exp $ * * Authors: Samuel Hocevar * @@ -52,62 +52,18 @@ void _M( yuv_getfunctions )( function_list_t * p_function_list ); MODULE_CONFIG_START ADD_WINDOW( "Configuration for MMX YUV module" ) ADD_COMMENT( "Ha, ha -- nothing to configure yet" ) -MODULE_CONFIG_END - -/***************************************************************************** - * InitModule: get the module structure and configuration. - ***************************************************************************** - * We have to fill psz_name, psz_longname and psz_version. These variables - * will be strdup()ed later by the main application because the module can - * be unloaded later to save memory, and we want to be able to access this - * data even after the module has been unloaded. - *****************************************************************************/ -MODULE_INIT -{ - p_module->psz_name = MODULE_STRING; - p_module->psz_longname = "MMX YUV transformations module"; - p_module->psz_version = VERSION; +MODULE_CONFIG_STOP +MODULE_INIT_START p_module->i_capabilities = MODULE_CAPABILITY_NULL | MODULE_CAPABILITY_YUV; + p_module->psz_longname = "MMX YUV transformations module"; +MODULE_INIT_STOP - return( 0 ); -} - -/***************************************************************************** - * ActivateModule: set the module to an usable state. - ***************************************************************************** - * This function fills the capability functions and the configuration - * structure. Once ActivateModule() has been called, the i_usage can - * be set to 0 and calls to NeedModule() be made to increment it. To unload - * the module, one has to wait until i_usage == 0 and call DeactivateModule(). - *****************************************************************************/ -MODULE_ACTIVATE -{ - p_module->p_functions = malloc( sizeof( module_functions_t ) ); - if( p_module->p_functions == NULL ) - { - return( -1 ); - } - +MODULE_ACTIVATE_START _M( yuv_getfunctions )( &p_module->p_functions->yuv ); +MODULE_ACTIVATE_STOP - p_module->p_config = p_config; - - return( 0 ); -} - -/***************************************************************************** - * DeactivateModule: make sure the module can be unloaded. - ***************************************************************************** - * This function must only be called when i_usage == 0. If it successfully - * returns, i_usage can be set to -1 and the module unloaded. Be careful to - * lock usage_lock during the whole process. - *****************************************************************************/ -MODULE_DEACTIVATE -{ - free( p_module->p_functions ); - - return( 0 ); -} +MODULE_DEACTIVATE_START +MODULE_DEACTIVATE_STOP diff --git a/src/input/input.c b/src/input/input.c index 517bab4a4c..e444286d9a 100644 --- a/src/input/input.c +++ b/src/input/input.c @@ -4,7 +4,7 @@ * decoders. ***************************************************************************** * Copyright (C) 1998, 1999, 2000 VideoLAN - * $Id: input.c,v 1.112 2001/05/30 05:19:03 stef Exp $ + * $Id: input.c,v 1.113 2001/05/30 17:03:12 sam Exp $ * * Authors: Christophe Massiot * @@ -90,6 +90,11 @@ static void ErrorThread ( input_thread_t *p_input ); static void DestroyThread ( input_thread_t *p_input ); static void EndThread ( input_thread_t *p_input ); +static void FileOpen ( input_thread_t *p_input ); +static void FileClose ( input_thread_t *p_input ); +static void NetworkOpen ( input_thread_t *p_input ); +static void NetworkClose ( input_thread_t *p_input ); + /***************************************************************************** * input_CreateThread: creates a new input thread ***************************************************************************** @@ -149,6 +154,14 @@ input_thread_t *input_CreateThread ( playlist_item_t *p_item, int *pi_status ) p_input->stream.control.b_mute = 0; p_input->stream.control.b_bw = 0; + /* Setup callbacks */ + p_input->pf_file_open = FileOpen; + p_input->pf_file_close = FileClose; +#if !defined( SYS_BEOS ) && !defined( SYS_NTO ) + p_input->pf_network_open = NetworkOpen; + p_input->pf_network_close = NetworkClose; +#endif + /* Create thread and set locks. */ vlc_mutex_init( &p_input->stream.stream_lock ); vlc_cond_init( &p_input->stream.stream_wait ); @@ -459,9 +472,9 @@ static void DestroyThread( input_thread_t * p_input ) } /***************************************************************************** - * input_FileOpen : open a file descriptor + * FileOpen : open a file descriptor *****************************************************************************/ -void input_FileOpen( input_thread_t * p_input ) +static void FileOpen( input_thread_t * p_input ) { struct stat stat_info; int i_stat; @@ -547,9 +560,9 @@ void input_FileOpen( input_thread_t * p_input ) } /***************************************************************************** - * input_FileClose : close a file descriptor + * FileClose : close a file descriptor *****************************************************************************/ -void input_FileClose( input_thread_t * p_input ) +static void FileClose( input_thread_t * p_input ) { intf_WarnMsg( 1, "input: closing file `%s'", p_input->p_source ); close( p_input->i_handle ); @@ -560,9 +573,9 @@ void input_FileClose( input_thread_t * p_input ) #if !defined( SYS_BEOS ) && !defined( SYS_NTO ) /***************************************************************************** - * input_NetworkOpen : open a network socket + * NetworkOpen : open a network socket *****************************************************************************/ -void input_NetworkOpen( input_thread_t * p_input ) +static void NetworkOpen( input_thread_t * p_input ) { char *psz_server = NULL; char *psz_broadcast = NULL; @@ -766,9 +779,9 @@ void input_NetworkOpen( input_thread_t * p_input ) } /***************************************************************************** - * input_NetworkClose : close a network socket + * NetworkClose : close a network socket *****************************************************************************/ -void input_NetworkClose( input_thread_t * p_input ) +static void NetworkClose( input_thread_t * p_input ) { close( p_input->i_handle ); diff --git a/src/interface/intf_playlist.c b/src/interface/intf_playlist.c index 37cf3e38c2..52ecdbf3cb 100644 --- a/src/interface/intf_playlist.c +++ b/src/interface/intf_playlist.c @@ -2,7 +2,7 @@ * intf_playlist.c : Playlist management functions ***************************************************************************** * Copyright (C) 1999, 2000 VideoLAN - * $Id: intf_playlist.c,v 1.6 2001/05/15 14:49:48 stef Exp $ + * $Id: intf_playlist.c,v 1.7 2001/05/30 17:03:12 sam Exp $ * * Authors: Samuel Hocevar * @@ -272,6 +272,40 @@ void intf_PlaylistJumpto( playlist_t * p_playlist , int i_pos) vlc_mutex_unlock( &p_playlist->change_lock ); } +/* URL-decode a file: URL path, return NULL if it's not what we expect */ +void intf_UrlDecode( char *encoded_path ) +{ + char *tmp = NULL, *cur = NULL, *ext = NULL; + int realchar; + + if( !encoded_path || *encoded_path == '\0' ) + { + return; + } + + cur = encoded_path ; + + tmp = calloc(strlen(encoded_path) + 1, sizeof(char) ); + + while ( ( ext = strchr(cur, '%') ) != NULL) + { + strncat(tmp, cur, (ext - cur) / sizeof(char)); + ext++; + + if (!sscanf(ext, "%2x", &realchar)) + { + free(tmp); + return; + } + + tmp[strlen(tmp)] = (char)realchar; + + cur = ext + 2; + } + + strcat(tmp, cur); + strcpy(encoded_path,tmp); +} /***************************************************************************** * Following functions are local diff --git a/src/interface/intf_urldecode.c b/src/interface/intf_urldecode.c deleted file mode 100644 index ec693ed010..0000000000 --- a/src/interface/intf_urldecode.c +++ /dev/null @@ -1,58 +0,0 @@ -/* Copyright (C) 1999, 2000 VideoLAN - * Copyright (C) 1998-2000 Peter Alm, Mikael Alm, Olle Hallnas, Thomas Nilsson and 4Front Technologies - * - * Code borrowed from xmms 1.2.4 - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public Licensse 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-1307, USA. - */ - -#include "intf_urldecode.h" -#include -#include -#include - -/* URL-decode a file: URL path, return NULL if it's not what we expect */ -void urldecode_path(char *encoded_path) -{ - char *tmp = NULL, *cur = NULL, *ext = NULL; - int realchar; - - - if (!encoded_path || *encoded_path == '\0' ) - return; - - cur = encoded_path ; - - tmp = calloc(strlen(encoded_path) + 1, sizeof(char) ); - - - while ( ( ext = strchr(cur, '%') ) != NULL) - { - strncat(tmp, cur, (ext - cur) / sizeof(char)); - ext++; - - if (!sscanf(ext, "%2x", &realchar)) - { - free(tmp); - return; - } - - tmp[strlen(tmp)] = (char)realchar; - - cur = ext + 2; - } - strcat(tmp, cur); - strcpy(encoded_path,tmp); -} diff --git a/src/misc/modules.c b/src/misc/modules.c index f990d68687..aad88dfc4a 100644 --- a/src/misc/modules.c +++ b/src/misc/modules.c @@ -2,7 +2,7 @@ * modules.c : Built-in and plugin modules management functions ***************************************************************************** * Copyright (C) 2001 VideoLAN - * $Id: modules.c,v 1.30 2001/05/07 03:14:09 stef Exp $ + * $Id: modules.c,v 1.31 2001/05/30 17:03:12 sam Exp $ * * Authors: Samuel Hocevar * Ethan C. Baldridge @@ -56,15 +56,34 @@ #include "common.h" #include "threads.h" +#include "mtime.h" +#include "tests.h" +#include "netutils.h" +#include "modules.h" + +#include "stream_control.h" +#include "input_ext-intf.h" + +#include "video.h" +#include "video_output.h" + +#include "audio_output.h" +#include "interface.h" #include "intf_msg.h" -#include "modules.h" +#include "intf_playlist.h" + #ifdef HAVE_DYNAMIC_PLUGINS # include "modules_core.h" #endif #include "modules_builtin.h" +#include "modules_export.h" + +#include "main.h" -/* Local prototypes */ +/***************************************************************************** + * Local prototypes + *****************************************************************************/ #ifdef HAVE_DYNAMIC_PLUGINS static int AllocatePluginModule ( char * ); #endif @@ -79,6 +98,8 @@ static int HideModule ( module_t * ); static int CallSymbol ( module_t *, char * ); #endif +static module_symbols_t symbols; + /***************************************************************************** * module_InitBank: create the module bank. ***************************************************************************** @@ -105,6 +126,11 @@ void module_InitBank( void ) p_module_bank->first = NULL; vlc_mutex_init( &p_module_bank->lock ); + /* + * Store the symbols to be exported + */ + STORE_SYMBOLS( &symbols ); + /* * Check all the built-in modules */ @@ -422,6 +448,7 @@ static int AllocatePluginModule( char * psz_filename ) /* We need to fill these since they may be needed by CallSymbol() */ p_module->is.plugin.psz_filename = psz_filename; p_module->is.plugin.handle = handle; + p_module->p_symbols = &symbols; /* Initialize the module : fill p_module->psz_name, etc. */ if( CallSymbol( p_module, "InitModule" ) != 0 ) @@ -834,13 +861,12 @@ static int HideModule( module_t * p_module ) *****************************************************************************/ static int CallSymbol( module_t * p_module, char * psz_name ) { - typedef int ( symbol_t ) ( module_t * p_module ); - symbol_t * p_symbol; + int (* pf_symbol) ( module_t * p_module ); /* Try to resolve the symbol */ - p_symbol = module_getsymbol( p_module->is.plugin.handle, psz_name ); + pf_symbol = module_getsymbol( p_module->is.plugin.handle, psz_name ); - if( !p_symbol ) + if( pf_symbol == NULL ) { /* We couldn't load the symbol */ intf_WarnMsg( 1, "module warning: " @@ -851,7 +877,7 @@ static int CallSymbol( module_t * p_module, char * psz_name ) } /* We can now try to call the symbol */ - if( p_symbol( p_module ) != 0 ) + if( pf_symbol( p_module ) != 0 ) { /* With a well-written module we shouldn't have to print an * additional error message here, but just make sure. */ diff --git a/src/misc/netutils.c b/src/misc/netutils.c index 3d21cae746..67990c27a2 100644 --- a/src/misc/netutils.c +++ b/src/misc/netutils.c @@ -2,7 +2,7 @@ * netutils.c: various network functions ***************************************************************************** * Copyright (C) 1999, 2000, 2001 VideoLAN - * $Id: netutils.c,v 1.33 2001/05/28 02:54:09 sam Exp $ + * $Id: netutils.c,v 1.34 2001/05/30 17:03:12 sam Exp $ * * Authors: Vincent Seguin * Benoit Steiner @@ -458,7 +458,7 @@ static int GetMacAddress( int i_socket, char *psz_mac ) return( i_ret ); -#elif +#else return( -1); #endif diff --git a/src/misc/tests.c b/src/misc/tests.c index dc406cf7a3..4ffb2c4a8e 100644 --- a/src/misc/tests.c +++ b/src/misc/tests.c @@ -3,7 +3,7 @@ * Functions are prototyped in tests.h. ***************************************************************************** * Copyright (C) 2000 VideoLAN - * $Id: tests.c,v 1.6 2001/04/06 09:15:48 sam Exp $ + * $Id: tests.c,v 1.7 2001/05/30 17:03:12 sam Exp $ * * Authors: Samuel Hocevar * @@ -37,14 +37,6 @@ #include "main.h" -/***************************************************************************** - * TestVersion: tests if the given string equals the current version - *****************************************************************************/ -int TestVersion( char * psz_version ) -{ - return( !strcmp( psz_version, VERSION ) ); -} - /***************************************************************************** * TestProgram: tests if the given string equals the program name *****************************************************************************/ diff --git a/src/video_decoder/video_decoder.c b/src/video_decoder/video_decoder.c index 22e418cf4b..769aaa2116 100644 --- a/src/video_decoder/video_decoder.c +++ b/src/video_decoder/video_decoder.c @@ -2,7 +2,7 @@ * video_decoder.c : video decoder thread ***************************************************************************** * Copyright (C) 1999, 2000 VideoLAN - * $Id: video_decoder.c,v 1.49 2001/05/06 04:32:02 sam Exp $ + * $Id: video_decoder.c,v 1.50 2001/05/30 17:03:12 sam Exp $ * * Authors: Christophe Massiot * Gaël Hendryckx @@ -153,11 +153,11 @@ int vdec_InitThread( vdec_thread_t *p_vdec ) { intf_DbgMsg("vdec debug: initializing video decoder thread %p", p_vdec); - p_vdec->pf_vdec_init = p_vdec->p_vpar->pf_vdec_init; + p_vdec->pf_decode_init = p_vdec->p_vpar->pf_decode_init; p_vdec->pf_decode_mb_c = p_vdec->p_vpar->pf_decode_mb_c; p_vdec->pf_decode_mb_bw = p_vdec->p_vpar->pf_decode_mb_bw; - p_vdec->pf_vdec_init( p_vdec ); + p_vdec->pf_decode_init( p_vdec ); #ifdef VDEC_SMP /* Re-nice ourself */ diff --git a/src/video_output/video_output.c b/src/video_output/video_output.c index 7abe3ab4da..2e736d73b2 100644 --- a/src/video_output/video_output.c +++ b/src/video_output/video_output.c @@ -5,7 +5,7 @@ * thread, and destroy a previously oppened video output thread. ***************************************************************************** * Copyright (C) 2000 VideoLAN - * $Id: video_output.c,v 1.128 2001/05/08 20:38:25 sam Exp $ + * $Id: video_output.c,v 1.129 2001/05/30 17:03:13 sam Exp $ * * Authors: Vincent Seguin * @@ -67,6 +67,7 @@ static void DestroyThread ( vout_thread_t *p_vout, int i_status ); static void Print ( vout_thread_t *p_vout, int i_x, int i_y, int i_h_align, int i_v_align, unsigned char *psz_text ); +static void SetBuffers ( vout_thread_t *p_vout, void *, void * ); static void SetBufferArea ( vout_thread_t *p_vout, int i_x, int i_y, int i_w, int i_h ); static void SetBufferPicture ( vout_thread_t *p_vout, picture_t *p_pic ); @@ -154,9 +155,12 @@ vout_thread_t * vout_CreateThread ( int *pi_status ) p_vout->pf_setpalette = f.pf_setpalette; #undef f + /* Initialize callbacks */ + p_vout->pf_setbuffers = SetBuffers; + if( p_vout->pf_setpalette == NULL ) { - p_vout->pf_setpalette = SetPalette; + p_vout->pf_setpalette = SetPalette; } /* Initialize thread properties - thread id and locks will be initialized @@ -822,37 +826,6 @@ void vout_UnlinkPicture( vout_thread_t *p_vout, picture_t *p_pic ) vlc_mutex_unlock( &p_vout->picture_lock ); } -/***************************************************************************** - * vout_SetBuffers: set buffers adresses - ***************************************************************************** - * This function is called by system drivers to set buffers video memory - * adresses. - *****************************************************************************/ -void vout_SetBuffers( vout_thread_t *p_vout, void *p_buf1, void *p_buf2 ) -{ - /* No picture previously */ - p_vout->p_buffer[0].i_pic_x = 0; - p_vout->p_buffer[0].i_pic_y = 0; - p_vout->p_buffer[0].i_pic_width = 0; - p_vout->p_buffer[0].i_pic_height = 0; - p_vout->p_buffer[1].i_pic_x = 0; - p_vout->p_buffer[1].i_pic_y = 0; - p_vout->p_buffer[1].i_pic_width = 0; - p_vout->p_buffer[1].i_pic_height = 0; - - /* The first area covers all the screen */ - p_vout->p_buffer[0].i_areas = 1; - p_vout->p_buffer[0].pi_area_begin[0] = 0; - p_vout->p_buffer[0].pi_area_end[0] = p_vout->i_height - 1; - p_vout->p_buffer[1].i_areas = 1; - p_vout->p_buffer[1].pi_area_begin[0] = 0; - p_vout->p_buffer[1].pi_area_end[0] = p_vout->i_height - 1; - - /* Set adresses */ - p_vout->p_buffer[0].p_data = p_buf1; - p_vout->p_buffer[1].p_data = p_buf2; -} - /***************************************************************************** * vout_Pixel2RGB: return red, green and blue from pixel value ***************************************************************************** @@ -1445,6 +1418,37 @@ void Print( vout_thread_t *p_vout, int i_x, int i_y, int i_h_align, int i_v_alig } } +/***************************************************************************** + * SetBuffers: set buffers adresses + ***************************************************************************** + * This function is called by system drivers to set buffers video memory + * adresses. + *****************************************************************************/ +static void SetBuffers( vout_thread_t *p_vout, void *p_buf1, void *p_buf2 ) +{ + /* No picture previously */ + p_vout->p_buffer[0].i_pic_x = 0; + p_vout->p_buffer[0].i_pic_y = 0; + p_vout->p_buffer[0].i_pic_width = 0; + p_vout->p_buffer[0].i_pic_height = 0; + p_vout->p_buffer[1].i_pic_x = 0; + p_vout->p_buffer[1].i_pic_y = 0; + p_vout->p_buffer[1].i_pic_width = 0; + p_vout->p_buffer[1].i_pic_height = 0; + + /* The first area covers all the screen */ + p_vout->p_buffer[0].i_areas = 1; + p_vout->p_buffer[0].pi_area_begin[0] = 0; + p_vout->p_buffer[0].pi_area_end[0] = p_vout->i_height - 1; + p_vout->p_buffer[1].i_areas = 1; + p_vout->p_buffer[1].pi_area_begin[0] = 0; + p_vout->p_buffer[1].pi_area_end[0] = p_vout->i_height - 1; + + /* Set adresses */ + p_vout->p_buffer[0].p_data = p_buf1; + p_vout->p_buffer[1].p_data = p_buf2; +} + /***************************************************************************** * SetBufferArea: activate an area in current buffer ***************************************************************************** diff --git a/src/video_parser/video_parser.c b/src/video_parser/video_parser.c index ef358154a2..957c81a5c7 100644 --- a/src/video_parser/video_parser.c +++ b/src/video_parser/video_parser.c @@ -2,7 +2,7 @@ * video_parser.c : video parser thread ***************************************************************************** * Copyright (C) 1999, 2000 VideoLAN - * $Id: video_parser.c,v 1.85 2001/05/06 04:32:03 sam Exp $ + * $Id: video_parser.c,v 1.86 2001/05/30 17:03:13 sam Exp $ * * Authors: Christophe Massiot * Samuel Hocevar @@ -178,7 +178,7 @@ vlc_thread_t vpar_CreateThread( vdec_config_t * p_config ) p_vpar->pf_sparse_idct = f.pf_sparse_idct; p_vpar->pf_idct = f.pf_idct; p_vpar->pf_norm_scan = f.pf_norm_scan; - p_vpar->pf_vdec_init = f.pf_vdec_init; + p_vpar->pf_decode_init = f.pf_decode_init; p_vpar->pf_decode_mb_c = f.pf_decode_mb_c; p_vpar->pf_decode_mb_bw = f.pf_decode_mb_bw; #undef f -- 2.39.2