From 003c2ab30097c1406da51290eccab8863dfe5101 Mon Sep 17 00:00:00 2001 From: Sam Hocevar Date: Mon, 10 Dec 2001 04:53:11 +0000 Subject: [PATCH] * Removed unused code (intf_channels.c, keystrokes.h). * Put common_win32.h back into common.h -- it wasn't that big and we should not multiply header files. * Added gettext support by Thomas Graf , may be broken on other platforms but we'll only see it when I'm finished with vout 4 :-) * Fixed a segfault on exit when no fast_memcpy module was found. --- AUTHORS | 4 + Makefile | 42 +- Makefile.modules | 1 - Makefile.opts.in | 5 +- acconfig.h | 7 + aclocal.m4 | 593 ++++++ configure | 2590 +++++++++++++++++++++---- configure.in | 13 +- include/bytes_swap.h | 110 -- include/common.h | 196 +- include/common_win32.h | 90 - include/config.h.in | 2 +- include/defs.h.in | 148 ++ include/input_ext-dec.h | 6 +- include/input_ext-intf.h | 5 +- include/input_ext-plugins.h | 15 +- include/keystrokes.h | 18 - include/main.h | 6 +- include/modules_export.h | 15 +- include/modules_inner.h | 6 +- mkinstalldirs | 40 + plugins/ac3_adec/Makefile | 2 +- plugins/ac3_adec/ac3_adec.c | 8 +- plugins/ac3_adec/ac3_bit_allocate.c | 8 +- plugins/ac3_adec/ac3_decoder.c | 7 +- plugins/ac3_adec/ac3_exponent.c | 7 +- plugins/ac3_adec/ac3_imdct.c | 8 +- plugins/ac3_adec/ac3_mantissa.c | 7 +- plugins/ac3_adec/ac3_parse.c | 7 +- plugins/ac3_adec/ac3_rematrix.c | 8 +- plugins/ac3_spdif/Makefile | 2 +- plugins/ac3_spdif/ac3_iec958.c | 7 +- plugins/ac3_spdif/ac3_spdif.c | 8 +- plugins/alsa/Makefile | 2 +- plugins/arts/Makefile | 2 +- plugins/beos/Makefile | 2 +- plugins/chroma/Makefile | 2 +- plugins/directx/Makefile | 2 +- plugins/downmix/Makefile | 6 +- plugins/downmix/ac3_downmix_3dn.c | 4 +- plugins/downmix/ac3_downmix_sse.c | 4 +- plugins/dsp/Makefile | 2 +- plugins/dummy/Makefile | 4 +- plugins/dummy/input_dummy.c | 8 +- plugins/dvd/Makefile | 4 +- plugins/dvd/input_dvd.c | 8 +- plugins/dvdread/Makefile | 4 +- plugins/esd/Makefile | 2 +- plugins/fb/Makefile | 2 +- plugins/ggi/Makefile | 2 +- plugins/glide/Makefile | 2 +- plugins/gtk/Makefile | 4 +- plugins/gtk/gnome_interface.c | 2 +- plugins/gtk/intf_gnome.c | 4 +- plugins/idct/Makefile | 10 +- plugins/imdct/Makefile | 6 +- plugins/kde/Makefile | 2 +- plugins/kde/kdeinterface.cpp | 2 +- plugins/lpcm_adec/Makefile | 2 +- plugins/lpcm_adec/lpcm_adec.c | 8 +- plugins/macosx/Makefile | 2 +- plugins/mad/Makefile | 2 +- plugins/memcpy/Makefile | 8 +- plugins/mga/Makefile | 2 +- plugins/motion/Makefile | 12 +- plugins/mpeg_adec/Makefile | 2 +- plugins/mpeg_adec/adec_layer1.c | 5 +- plugins/mpeg_adec/adec_layer2.c | 5 +- plugins/mpeg_adec/mpeg_adec.c | 8 +- plugins/mpeg_adec/mpeg_adec_generic.c | 8 +- plugins/mpeg_system/Makefile | 6 +- plugins/mpeg_system/input_es.c | 8 +- plugins/mpeg_system/input_ps.c | 8 +- plugins/mpeg_system/input_ts.c | 8 +- plugins/mpeg_vdec/Makefile | 2 +- plugins/mpeg_vdec/video_decoder.c | 5 +- plugins/mpeg_vdec/video_parser.c | 6 +- plugins/mpeg_vdec/vpar_blocks.c | 6 +- plugins/mpeg_vdec/vpar_headers.c | 6 +- plugins/mpeg_vdec/vpar_pool.c | 6 +- plugins/mpeg_vdec/vpar_synchro.c | 4 +- plugins/qnx/Makefile | 2 +- plugins/qt/Makefile | 2 +- plugins/sdl/Makefile | 2 +- plugins/spudec/Makefile | 2 +- plugins/spudec/spu_decoder.c | 7 +- plugins/text/Makefile | 2 +- plugins/vcd/Makefile | 2 +- plugins/x11/Makefile | 32 +- po/.cvsignore | 4 + po/Makefile.in.in | 206 ++ po/POTFILES.in | 2 + po/de.po | 939 +++++++++ src/interface/interface.c | 13 +- src/interface/intf_channels.c | 330 ---- src/interface/intf_channels.h | 51 - src/interface/main.c | 40 +- src/misc/modules.c | 6 +- 98 files changed, 4584 insertions(+), 1270 deletions(-) create mode 100644 acconfig.h create mode 100644 aclocal.m4 delete mode 100644 include/bytes_swap.h delete mode 100644 include/common_win32.h delete mode 100644 include/keystrokes.h create mode 100755 mkinstalldirs create mode 100644 po/.cvsignore create mode 100644 po/Makefile.in.in create mode 100644 po/POTFILES.in create mode 100644 po/de.po delete mode 100644 src/interface/intf_channels.c delete mode 100644 src/interface/intf_channels.h diff --git a/AUTHORS b/AUTHORS index 14961428dd..fbf85f4a5a 100644 --- a/AUTHORS +++ b/AUTHORS @@ -99,6 +99,10 @@ N: Arnaud Gomes-do-Vale E: arnaud@carrosse.frmug.org D: autoconf patches +N: Thomas Graf +E: reeler@reeler.org +D: gettext support, german translation + N: Jean-Philippe Grimaldi E: jeanphi@via.ecp.fr C: jeanphi diff --git a/Makefile b/Makefile index 1b27d7b761..66e6785b62 100644 --- a/Makefile +++ b/Makefile @@ -111,7 +111,7 @@ PLUGINS_TARGETS := ac3_adec/ac3_adec \ # # C Objects # -INTERFACE := main interface intf_msg intf_playlist intf_channels +INTERFACE := main interface intf_msg intf_playlist INPUT := input input_ext-dec input_ext-intf input_dec input_programs input_netlist input_clock mpeg_system VIDEO_OUTPUT := video_output video_text vout_pictures vout_subpictures AUDIO_OUTPUT := audio_output aout_ext-dec aout_u8 aout_s8 aout_u16 aout_s16 aout_spdif @@ -183,7 +183,7 @@ export # # Virtual targets # -all: Makefile.opts vlc ${ALIASES} vlc.app +all: Makefile.opts vlc ${ALIASES} vlc.app plugins po Makefile.opts: @echo "**** No configuration found, running ./configure..." @@ -206,7 +206,7 @@ show: # # Cleaning rules # -clean: libdvdcss-clean libdvdread-clean plugins-clean vlc-clean +clean: libdvdcss-clean libdvdread-clean plugins-clean po-clean vlc-clean rm -f src/*/*.o extras/*/*.o rm -f lib/*.so* lib/*.a rm -f plugins/*.so plugins/*.a @@ -215,6 +215,9 @@ clean: libdvdcss-clean libdvdread-clean plugins-clean vlc-clean libdvdcss-clean: -cd extras/libdvdcss && $(MAKE) clean +po-clean: + -cd po && $(MAKE) clean + libdvdread-clean: -cd extras/libdvdread && $(MAKE) clean @@ -229,6 +232,7 @@ vlc-clean: rm -Rf vlc.app distclean: clean + -cd po && $(MAKE) distclean rm -f **/*.o **/*~ *.log rm -f Makefile.opts rm -f include/defs.h include/config.h include/modules_builtin.h @@ -241,9 +245,9 @@ distclean: clean # # Install/uninstall rules # -install: libdvdcss-install vlc-install plugins-install +install: libdvdcss-install vlc-install plugins-install po-install -uninstall: libdvdcss-uninstall vlc-uninstall plugins-uninstall +uninstall: libdvdcss-uninstall vlc-uninstall plugins-uninstall po-uninstall vlc-install: mkdir -p $(DESTDIR)$(bindir) @@ -280,6 +284,12 @@ libdvdcss-install: libdvdcss-uninstall: -cd extras/libdvdcss && $(MAKE) uninstall +po-install: + -cd po && $(MAKE) install + +po-uninstall: + -cd po && $(MAKE) uninstall + # # Package generation rules # @@ -309,11 +319,15 @@ snapshot-common: find tmp/vlc/extras tmp/vlc/doc \ -type d -name CVS -o -name '.*' -o -name '*.[o]' | \ while read i ; do rm -Rf $$i ; done + # Copy gettext stuff + mkdir tmp/vlc/po + cp po/*.po tmp/vlc/po + for i in Makefile.in.in POTFILES.in ; do cp po/$$i tmp/vlc/po ; done # Copy misc files cp FAQ AUTHORS COPYING TODO todo.pl ChangeLog* README* INSTALL* \ Makefile Makefile.opts.in Makefile.dep Makefile.modules \ configure configure.in install-sh install-win32 vlc.spec \ - config.sub config.guess \ + config.sub config.guess acconfig.h aclocal.m4 mkinstalldirs \ tmp/vlc/ # Copy Debian control files for file in debian/*dirs debian/*docs debian/*menu debian/*desktop \ @@ -518,7 +532,7 @@ endif # # Main application target # -vlc: Makefile.opts Makefile.dep Makefile $(H_OBJ) $(VLC_OBJ) $(BUILTIN_OBJ) plugins +vlc: Makefile.opts Makefile.dep Makefile $(H_OBJ) $(VLC_OBJ) $(BUILTIN_OBJ) $(CC) $(CFLAGS) -o $@ $(VLC_OBJ) $(BUILTIN_OBJ) $(LCFLAGS) ifeq ($(SYS),beos) xres -o $@ ./share/vlc_beos.rsrc @@ -530,24 +544,30 @@ endif # plugins: Makefile.modules Makefile.opts Makefile.dep Makefile $(PLUGIN_OBJ) $(PLUGIN_OBJ): FORCE - cd $(shell echo " "$(PLUGINS_TARGETS)" " | sed -e 's@.* \([^/]*/\)'$(@:plugins/%.so=%)' .*@plugins/\1@' -e 's@^ .*@@') && $(MAKE) $(@:plugins/%=../%) + @cd $(shell echo " "$(PLUGINS_TARGETS)" " | sed -e 's@.* \([^/]*/\)'$(@:plugins/%.so=%)' .*@plugins/\1@' -e 's@^ .*@@') && $(MAKE) $(@:plugins/%=../%) # # Built-in modules target # builtins: Makefile.modules Makefile.opts Makefile.dep Makefile $(BUILTIN_OBJ) $(BUILTIN_OBJ): FORCE - cd $(shell echo " "$(PLUGINS_TARGETS)" " | sed -e 's@.* \([^/]*/\)'$(@:plugins/%.a=%)' .*@plugins/\1@' -e 's@^ .*@@') && $(MAKE) $(@:plugins/%=../%) + @cd $(shell echo " "$(PLUGINS_TARGETS)" " | sed -e 's@.* \([^/]*/\)'$(@:plugins/%.a=%)' .*@plugins/\1@' -e 's@^ .*@@') && $(MAKE) $(@:plugins/%=../%) # # libdvdcss target # libdvdcss: Makefile.opts - cd extras/libdvdcss && $(MAKE) + @cd extras/libdvdcss && $(MAKE) # # libdvdread target # libdvdread: Makefile.opts - cd extras/libdvdread && $(MAKE) + @cd extras/libdvdread && $(MAKE) + +# +# gettext target +# +po: FORCE + @cd po && $(MAKE) diff --git a/Makefile.modules b/Makefile.modules index db54c5a2b4..94002eb0c9 100644 --- a/Makefile.modules +++ b/Makefile.modules @@ -55,4 +55,3 @@ $(BUILTIN_CPP): BUILTIN_%.o: .dep/%.dpp $(BUILTIN_CPP): BUILTIN_%.o: %.cpp $(CC) $(CFLAGS) -DBUILTIN -c -o $@ $< - diff --git a/Makefile.opts.in b/Makefile.opts.in index 6174d34060..e6ab0c6986 100644 --- a/Makefile.opts.in +++ b/Makefile.opts.in @@ -164,7 +164,10 @@ DEFINE_CONSTANTS := -DSYS_$(shell echo $(SYS) | sed -e 's/-.*//' | tr '[a-z].' ' DEFINE += $(DEFINE_CONSTANTS) # On Linux and Solaris, activate 64-bit off_t (by default under BSD) -DEFINE += -D_FILE_OFFSET_BITS=64 -D__USE_UNIX98 +DEFINE += -D_FILE_OFFSET_BITS=64 -D__USE_UNIX98 + +# Gettext support +DEFINE += -DLOCALEDIR=\"$(datadir)/locale\" ############################################################################### # Tuning and other variables - do not change anything except if you know diff --git a/acconfig.h b/acconfig.h new file mode 100644 index 0000000000..441dfd9e4b --- /dev/null +++ b/acconfig.h @@ -0,0 +1,7 @@ +#undef ENABLE_NLS +#undef HAVE_LC_MESSAGES +#undef HAVE_CATGETS +#undef HAVE_GETTEXT +#undef HAVE_STPCPY +#undef PACKAGE +#undef VERSION diff --git a/aclocal.m4 b/aclocal.m4 new file mode 100644 index 0000000000..f03dc8a6eb --- /dev/null +++ b/aclocal.m4 @@ -0,0 +1,593 @@ +dnl aclocal.m4 generated automatically by aclocal 1.4-p4 + +dnl Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. +dnl This file is free software; the Free Software Foundation +dnl gives unlimited permission to copy and/or distribute it, +dnl with or without modifications, as long as this notice is preserved. + +dnl This program is distributed in the hope that it will be useful, +dnl but WITHOUT ANY WARRANTY, to the extent permitted by law; without +dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A +dnl PARTICULAR PURPOSE. + +# Macro to add for using GNU gettext. +# Ulrich Drepper , 1995. +# +# This file can be copied and used freely without restrictions. It can +# be used in projects which are not available under the GNU General Public +# License or the GNU Library General Public License but which still want +# to provide support for the GNU gettext functionality. +# Please note that the actual code of the GNU gettext library is covered +# by the GNU Library General Public License, and the rest of the GNU +# gettext package package is covered by the GNU General Public License. +# They are *not* in the public domain. + +# serial 10 + +dnl Usage: AM_WITH_NLS([TOOLSYMBOL], [NEEDSYMBOL], [LIBDIR]). +dnl If TOOLSYMBOL is specified and is 'use-libtool', then a libtool library +dnl $(top_builddir)/intl/libintl.la will be created (shared and/or static, +dnl depending on --{enable,disable}-{shared,static} and on the presence of +dnl AM-DISABLE-SHARED). Otherwise, a static library +dnl $(top_builddir)/intl/libintl.a will be created. +dnl If NEEDSYMBOL is specified and is 'need-ngettext', then GNU gettext +dnl implementations (in libc or libintl) without the ngettext() function +dnl will be ignored. +dnl LIBDIR is used to find the intl libraries. If empty, +dnl the value `$(top_builddir)/intl/' is used. +dnl +dnl The result of the configuration is one of three cases: +dnl 1) GNU gettext, as included in the intl subdirectory, will be compiled +dnl and used. +dnl Catalog format: GNU --> install in $(datadir) +dnl Catalog extension: .mo after installation, .gmo in source tree +dnl 2) GNU gettext has been found in the system's C library. +dnl Catalog format: GNU --> install in $(datadir) +dnl Catalog extension: .mo after installation, .gmo in source tree +dnl 3) No internationalization, always use English msgid. +dnl Catalog format: none +dnl Catalog extension: none +dnl The use of .gmo is historical (it was needed to avoid overwriting the +dnl GNU format catalogs when building on a platform with an X/Open gettext), +dnl but we keep it in order not to force irrelevant filename changes on the +dnl maintainers. +dnl +AC_DEFUN([AM_WITH_NLS], + [AC_MSG_CHECKING([whether NLS is requested]) + dnl Default is enabled NLS + AC_ARG_ENABLE(nls, + [ --disable-nls do not use Native Language Support], + USE_NLS=$enableval, USE_NLS=yes) + AC_MSG_RESULT($USE_NLS) + AC_SUBST(USE_NLS) + + BUILD_INCLUDED_LIBINTL=no + USE_INCLUDED_LIBINTL=no + INTLLIBS= + + dnl If we use NLS figure out what method + if test "$USE_NLS" = "yes"; then + AC_DEFINE(ENABLE_NLS, 1, + [Define to 1 if translation of program messages to the user's native language + is requested.]) + AC_MSG_CHECKING([whether included gettext is requested]) + AC_ARG_WITH(included-gettext, + [ --with-included-gettext use the GNU gettext library included here], + nls_cv_force_use_gnu_gettext=$withval, + nls_cv_force_use_gnu_gettext=no) + AC_MSG_RESULT($nls_cv_force_use_gnu_gettext) + + nls_cv_use_gnu_gettext="$nls_cv_force_use_gnu_gettext" + if test "$nls_cv_force_use_gnu_gettext" != "yes"; then + dnl User does not insist on using GNU NLS library. Figure out what + dnl to use. If GNU gettext is available we use this. Else we have + dnl to fall back to GNU NLS library. + CATOBJEXT=NONE + + dnl Add a version number to the cache macros. + define(gt_cv_func_gnugettext_libc, [gt_cv_func_gnugettext]ifelse([$2], need-ngettext, 2, 1)[_libc]) + define(gt_cv_func_gnugettext_libintl, [gt_cv_func_gnugettext]ifelse([$2], need-ngettext, 2, 1)[_libintl]) + + AC_CHECK_HEADER(libintl.h, + [AC_CACHE_CHECK([for GNU gettext in libc], gt_cv_func_gnugettext_libc, + [AC_TRY_LINK([#include +extern int _nl_msg_cat_cntr;], + [bindtextdomain ("", ""); +return (int) gettext ("")]ifelse([$2], need-ngettext, [ + (int) ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr], + gt_cv_func_gnugettext_libc=yes, + gt_cv_func_gnugettext_libc=no)]) + + if test "$gt_cv_func_gnugettext_libc" != "yes"; then + AC_CACHE_CHECK([for GNU gettext in libintl], + gt_cv_func_gnugettext_libintl, + [gt_save_LIBS="$LIBS" + LIBS="$LIBS -lintl $LIBICONV" + AC_TRY_LINK([#include +extern int _nl_msg_cat_cntr;], + [bindtextdomain ("", ""); +return (int) gettext ("")]ifelse([$2], need-ngettext, [ + (int) ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr], + gt_cv_func_gnugettext_libintl=yes, + gt_cv_func_gnugettext_libintl=no) + LIBS="$gt_save_LIBS"]) + fi + + dnl If an already present or preinstalled GNU gettext() is found, + dnl use it. But if this macro is used in GNU gettext, and GNU + dnl gettext is already preinstalled in libintl, we update this + dnl libintl. (Cf. the install rule in intl/Makefile.in.) + if test "$gt_cv_func_gnugettext_libc" = "yes" \ + || { test "$gt_cv_func_gnugettext_libintl" = "yes" \ + && test "$PACKAGE" != gettext; }; then + AC_DEFINE(HAVE_GETTEXT, 1, + [Define if the GNU gettext() function is already present or preinstalled.]) + + if test "$gt_cv_func_gnugettext_libintl" = "yes"; then + dnl If iconv() is in a separate libiconv library, then anyone + dnl linking with libintl{.a,.so} also needs to link with + dnl libiconv. + INTLLIBS="-lintl $LIBICONV" + fi + + gt_save_LIBS="$LIBS" + LIBS="$LIBS $INTLLIBS" + AC_CHECK_FUNCS(dcgettext) + LIBS="$gt_save_LIBS" + + dnl Search for GNU msgfmt in the PATH. + AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt, + [$ac_dir/$ac_word --statistics /dev/null >/dev/null 2>&1], :) + AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT) + + dnl Search for GNU xgettext in the PATH. + AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext, + [$ac_dir/$ac_word --omit-header /dev/null >/dev/null 2>&1], :) + + CATOBJEXT=.gmo + fi + ]) + + if test "$CATOBJEXT" = "NONE"; then + dnl GNU gettext is not found in the C library. + dnl Fall back on GNU gettext library. + nls_cv_use_gnu_gettext=yes + fi + fi + + if test "$nls_cv_use_gnu_gettext" = "yes"; then + dnl Mark actions used to generate GNU NLS library. + INTLOBJS="\$(GETTOBJS)" + AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt, + [$ac_dir/$ac_word --statistics /dev/null >/dev/null 2>&1], :) + AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT) + AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext, + [$ac_dir/$ac_word --omit-header /dev/null >/dev/null 2>&1], :) + AC_SUBST(MSGFMT) + BUILD_INCLUDED_LIBINTL=yes + USE_INCLUDED_LIBINTL=yes + CATOBJEXT=.gmo + INTLLIBS="ifelse([$3],[],\$(top_builddir)/intl,[$3])/libintl.ifelse([$1], use-libtool, [l], [])a $LIBICONV" + LIBS=`echo " $LIBS " | sed -e 's/ -lintl / /' -e 's/^ //' -e 's/ $//'` + fi + + dnl This could go away some day; the PATH_PROG_WITH_TEST already does it. + dnl Test whether we really found GNU msgfmt. + if test "$GMSGFMT" != ":"; then + dnl If it is no GNU msgfmt we define it as : so that the + dnl Makefiles still can work. + if $GMSGFMT --statistics /dev/null >/dev/null 2>&1; then + : ; + else + AC_MSG_RESULT( + [found msgfmt program is not GNU msgfmt; ignore it]) + GMSGFMT=":" + fi + fi + + dnl This could go away some day; the PATH_PROG_WITH_TEST already does it. + dnl Test whether we really found GNU xgettext. + if test "$XGETTEXT" != ":"; then + dnl If it is no GNU xgettext we define it as : so that the + dnl Makefiles still can work. + if $XGETTEXT --omit-header /dev/null >/dev/null 2>&1; then + : ; + else + AC_MSG_RESULT( + [found xgettext program is not GNU xgettext; ignore it]) + XGETTEXT=":" + fi + fi + + dnl We need to process the po/ directory. + POSUB=po + fi + AC_OUTPUT_COMMANDS( + [for ac_file in $CONFIG_FILES; do + # Support "outfile[:infile[:infile...]]" + case "$ac_file" in + *:*) ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;; + esac + # PO directories have a Makefile.in generated from Makefile.in.in. + case "$ac_file" in */Makefile.in) + # Adjust a relative srcdir. + ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'` + ac_dir_suffix="/`echo "$ac_dir"|sed 's%^\./%%'`" + ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'` + # In autoconf-2.13 it is called $ac_given_srcdir. + # In autoconf-2.50 it is called $srcdir. + test -n "$ac_given_srcdir" || ac_given_srcdir="$srcdir" + case "$ac_given_srcdir" in + .) top_srcdir=`echo $ac_dots|sed 's%/$%%'` ;; + /*) top_srcdir="$ac_given_srcdir" ;; + *) top_srcdir="$ac_dots$ac_given_srcdir" ;; + esac + if test -f "$ac_given_srcdir/$ac_dir/POTFILES.in"; then + rm -f "$ac_dir/POTFILES" + test -n "$as_me" && echo "$as_me: creating $ac_dir/POTFILES" || echo "creating $ac_dir/POTFILES" + sed -e "/^#/d" -e "/^[ ]*\$/d" -e "s,.*, $top_srcdir/& \\\\," -e "\$s/\(.*\) \\\\/\1/" < "$ac_given_srcdir/$ac_dir/POTFILES.in" > "$ac_dir/POTFILES" + test -n "$as_me" && echo "$as_me: creating $ac_dir/Makefile" || echo "creating $ac_dir/Makefile" + sed -e "/POTFILES =/r $ac_dir/POTFILES" "$ac_dir/Makefile.in" > "$ac_dir/Makefile" + fi + ;; + esac + done]) + + + dnl If this is used in GNU gettext we have to set BUILD_INCLUDED_LIBINTL + dnl to 'yes' because some of the testsuite requires it. + if test "$PACKAGE" = gettext; then + BUILD_INCLUDED_LIBINTL=yes + fi + + dnl intl/plural.c is generated from intl/plural.y. It requires bison, + dnl because plural.y uses bison specific features. It requires at least + dnl bison-1.26 because earlier versions generate a plural.c that doesn't + dnl compile. + dnl bison is only needed for the maintainer (who touches plural.y). But in + dnl order to avoid separate Makefiles or --enable-maintainer-mode, we put + dnl the rule in general Makefile. Now, some people carelessly touch the + dnl files or have a broken "make" program, hence the plural.c rule will + dnl sometimes fire. To avoid an error, defines BISON to ":" if it is not + dnl present or too old. + AC_CHECK_PROGS([INTLBISON], [bison]) + if test -z "$INTLBISON"; then + ac_verc_fail=yes + else + dnl Found it, now check the version. + AC_MSG_CHECKING([version of bison]) +changequote(<<,>>)dnl + ac_prog_version=`$INTLBISON --version 2>&1 | sed -n 's/^.*GNU Bison.* \([0-9]*\.[0-9.]*\).*$/\1/p'` + case $ac_prog_version in + '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;; + 1.2[6-9]* | 1.[3-9][0-9]* | [2-9].*) +changequote([,])dnl + ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;; + *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;; + esac + AC_MSG_RESULT([$ac_prog_version]) + fi + if test $ac_verc_fail = yes; then + INTLBISON=: + fi + + dnl These rules are solely for the distribution goal. While doing this + dnl we only have to keep exactly one list of the available catalogs + dnl in configure.in. + for lang in $ALL_LINGUAS; do + GMOFILES="$GMOFILES $lang.gmo" + POFILES="$POFILES $lang.po" + done + + dnl Make all variables we use known to autoconf. + AC_SUBST(BUILD_INCLUDED_LIBINTL) + AC_SUBST(USE_INCLUDED_LIBINTL) + AC_SUBST(CATALOGS) + AC_SUBST(CATOBJEXT) + AC_SUBST(GMOFILES) + AC_SUBST(INTLLIBS) + AC_SUBST(INTLOBJS) + AC_SUBST(POFILES) + AC_SUBST(POSUB) + + dnl For backward compatibility. Some configure.ins may be using this. + nls_cv_header_intl= + nls_cv_header_libgt= + + dnl For backward compatibility. Some Makefiles may be using this. + DATADIRNAME=share + AC_SUBST(DATADIRNAME) + + dnl For backward compatibility. Some Makefiles may be using this. + INSTOBJEXT=.mo + AC_SUBST(INSTOBJEXT) + + dnl For backward compatibility. Some Makefiles may be using this. + GENCAT=gencat + AC_SUBST(GENCAT) + ]) + +dnl Usage: Just like AM_WITH_NLS, which see. +AC_DEFUN([AM_GNU_GETTEXT], + [AC_REQUIRE([AC_PROG_MAKE_SET])dnl + AC_REQUIRE([AC_PROG_CC])dnl + AC_REQUIRE([AC_CANONICAL_HOST])dnl + AC_REQUIRE([AC_PROG_RANLIB])dnl + AC_REQUIRE([AC_ISC_POSIX])dnl + AC_REQUIRE([AC_HEADER_STDC])dnl + AC_REQUIRE([AC_C_CONST])dnl + AC_REQUIRE([AC_C_INLINE])dnl + AC_REQUIRE([AC_TYPE_OFF_T])dnl + AC_REQUIRE([AC_TYPE_SIZE_T])dnl + AC_REQUIRE([AC_FUNC_ALLOCA])dnl + AC_REQUIRE([AC_FUNC_MMAP])dnl + AC_REQUIRE([jm_GLIBC21])dnl + + AC_CHECK_HEADERS([argz.h limits.h locale.h nl_types.h malloc.h stddef.h \ +stdlib.h string.h unistd.h sys/param.h]) + AC_CHECK_FUNCS([feof_unlocked fgets_unlocked getcwd getegid geteuid \ +getgid getuid mempcpy munmap putenv setenv setlocale stpcpy strchr strcasecmp \ +strdup strtoul tsearch __argz_count __argz_stringify __argz_next]) + + AM_ICONV + AM_LANGINFO_CODESET + AM_LC_MESSAGES + AM_WITH_NLS([$1],[$2],[$3]) + + if test "x$CATOBJEXT" != "x"; then + if test "x$ALL_LINGUAS" = "x"; then + LINGUAS= + else + AC_MSG_CHECKING(for catalogs to be installed) + NEW_LINGUAS= + for presentlang in $ALL_LINGUAS; do + useit=no + for desiredlang in ${LINGUAS-$ALL_LINGUAS}; do + # Use the presentlang catalog if desiredlang is + # a. equal to presentlang, or + # b. a variant of presentlang (because in this case, + # presentlang can be used as a fallback for messages + # which are not translated in the desiredlang catalog). + case "$desiredlang" in + "$presentlang"*) useit=yes;; + esac + done + if test $useit = yes; then + NEW_LINGUAS="$NEW_LINGUAS $presentlang" + fi + done + LINGUAS=$NEW_LINGUAS + AC_MSG_RESULT($LINGUAS) + fi + + dnl Construct list of names of catalog files to be constructed. + if test -n "$LINGUAS"; then + for lang in $LINGUAS; do CATALOGS="$CATALOGS $lang$CATOBJEXT"; done + fi + fi + + dnl If the AC_CONFIG_AUX_DIR macro for autoconf is used we possibly + dnl find the mkinstalldirs script in another subdir but $(top_srcdir). + dnl Try to locate is. + MKINSTALLDIRS= + if test -n "$ac_aux_dir"; then + MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs" + fi + if test -z "$MKINSTALLDIRS"; then + MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs" + fi + AC_SUBST(MKINSTALLDIRS) + + dnl Enable libtool support if the surrounding package wishes it. + INTL_LIBTOOL_SUFFIX_PREFIX=ifelse([$1], use-libtool, [l], []) + AC_SUBST(INTL_LIBTOOL_SUFFIX_PREFIX) + ]) + +# Search path for a program which passes the given test. +# Ulrich Drepper , 1996. +# +# This file can be copied and used freely without restrictions. It can +# be used in projects which are not available under the GNU General Public +# License or the GNU Library General Public License but which still want +# to provide support for the GNU gettext functionality. +# Please note that the actual code of the GNU gettext library is covered +# by the GNU Library General Public License, and the rest of the GNU +# gettext package package is covered by the GNU General Public License. +# They are *not* in the public domain. + +# serial 2 + +dnl AM_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR, +dnl TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]]) +AC_DEFUN([AM_PATH_PROG_WITH_TEST], +[# Extract the first word of "$2", so it can be a program name with args. +set dummy $2; ac_word=[$]2 +AC_MSG_CHECKING([for $ac_word]) +AC_CACHE_VAL(ac_cv_path_$1, +[case "[$]$1" in + /*) + ac_cv_path_$1="[$]$1" # Let the user override the test with a path. + ;; + *) + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" + for ac_dir in ifelse([$5], , $PATH, [$5]); do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + if [$3]; then + ac_cv_path_$1="$ac_dir/$ac_word" + break + fi + fi + done + IFS="$ac_save_ifs" +dnl If no 4th arg is given, leave the cache variable unset, +dnl so AC_PATH_PROGS will keep looking. +ifelse([$4], , , [ test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$4" +])dnl + ;; +esac])dnl +$1="$ac_cv_path_$1" +if test ifelse([$4], , [-n "[$]$1"], ["[$]$1" != "$4"]); then + AC_MSG_RESULT([$]$1) +else + AC_MSG_RESULT(no) +fi +AC_SUBST($1)dnl +]) + +#serial 1 +# This test replaces the one in autoconf. +# Currently this macro should have the same name as the autoconf macro +# because gettext's gettext.m4 (distributed in the automake package) +# still uses it. Otherwise, the use in gettext.m4 makes autoheader +# give these diagnostics: +# configure.in:556: AC_TRY_COMPILE was called before AC_ISC_POSIX +# configure.in:556: AC_TRY_RUN was called before AC_ISC_POSIX + +undefine([AC_ISC_POSIX]) + +AC_DEFUN([AC_ISC_POSIX], + [ + dnl This test replaces the obsolescent AC_ISC_POSIX kludge. + AC_CHECK_LIB(cposix, strerror, [LIBS="$LIBS -lcposix"]) + ] +) + +#serial 2 + +# Test for the GNU C Library, version 2.1 or newer. +# From Bruno Haible. + +AC_DEFUN([jm_GLIBC21], + [ + AC_CACHE_CHECK(whether we are using the GNU C Library 2.1 or newer, + ac_cv_gnu_library_2_1, + [AC_EGREP_CPP([Lucky GNU user], + [ +#include +#ifdef __GNU_LIBRARY__ + #if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1) || (__GLIBC__ > 2) + Lucky GNU user + #endif +#endif + ], + ac_cv_gnu_library_2_1=yes, + ac_cv_gnu_library_2_1=no) + ] + ) + AC_SUBST(GLIBC21) + GLIBC21="$ac_cv_gnu_library_2_1" + ] +) + +#serial AM2 + +dnl From Bruno Haible. + +AC_DEFUN([AM_ICONV], +[ + dnl Some systems have iconv in libc, some have it in libiconv (OSF/1 and + dnl those with the standalone portable GNU libiconv installed). + + AC_ARG_WITH([libiconv-prefix], +[ --with-libiconv-prefix=DIR search for libiconv in DIR/include and DIR/lib], [ + for dir in `echo "$withval" | tr : ' '`; do + if test -d $dir/include; then CPPFLAGS="$CPPFLAGS -I$dir/include"; fi + if test -d $dir/lib; then LDFLAGS="$LDFLAGS -L$dir/lib"; fi + done + ]) + + AC_CACHE_CHECK(for iconv, am_cv_func_iconv, [ + am_cv_func_iconv="no, consider installing GNU libiconv" + am_cv_lib_iconv=no + AC_TRY_LINK([#include +#include ], + [iconv_t cd = iconv_open("",""); + iconv(cd,NULL,NULL,NULL,NULL); + iconv_close(cd);], + am_cv_func_iconv=yes) + if test "$am_cv_func_iconv" != yes; then + am_save_LIBS="$LIBS" + LIBS="$LIBS -liconv" + AC_TRY_LINK([#include +#include ], + [iconv_t cd = iconv_open("",""); + iconv(cd,NULL,NULL,NULL,NULL); + iconv_close(cd);], + am_cv_lib_iconv=yes + am_cv_func_iconv=yes) + LIBS="$am_save_LIBS" + fi + ]) + if test "$am_cv_func_iconv" = yes; then + AC_DEFINE(HAVE_ICONV, 1, [Define if you have the iconv() function.]) + AC_MSG_CHECKING([for iconv declaration]) + AC_CACHE_VAL(am_cv_proto_iconv, [ + AC_TRY_COMPILE([ +#include +#include +extern +#ifdef __cplusplus +"C" +#endif +#if defined(__STDC__) || defined(__cplusplus) +size_t iconv (iconv_t cd, char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft); +#else +size_t iconv(); +#endif +], [], am_cv_proto_iconv_arg1="", am_cv_proto_iconv_arg1="const") + am_cv_proto_iconv="extern size_t iconv (iconv_t cd, $am_cv_proto_iconv_arg1 char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);"]) + am_cv_proto_iconv=`echo "[$]am_cv_proto_iconv" | tr -s ' ' | sed -e 's/( /(/'` + AC_MSG_RESULT([$]{ac_t:- + }[$]am_cv_proto_iconv) + AC_DEFINE_UNQUOTED(ICONV_CONST, $am_cv_proto_iconv_arg1, + [Define as const if the declaration of iconv() needs const.]) + fi + LIBICONV= + if test "$am_cv_lib_iconv" = yes; then + LIBICONV="-liconv" + fi + AC_SUBST(LIBICONV) +]) + +#serial AM1 + +dnl From Bruno Haible. + +AC_DEFUN([AM_LANGINFO_CODESET], +[ + AC_CACHE_CHECK([for nl_langinfo and CODESET], am_cv_langinfo_codeset, + [AC_TRY_LINK([#include ], + [char* cs = nl_langinfo(CODESET);], + am_cv_langinfo_codeset=yes, + am_cv_langinfo_codeset=no) + ]) + if test $am_cv_langinfo_codeset = yes; then + AC_DEFINE(HAVE_LANGINFO_CODESET, 1, + [Define if you have and nl_langinfo(CODESET).]) + fi +]) + +# Check whether LC_MESSAGES is available in . +# Ulrich Drepper , 1995. +# +# This file can be copied and used freely without restrictions. It can +# be used in projects which are not available under the GNU General Public +# License or the GNU Library General Public License but which still want +# to provide support for the GNU gettext functionality. +# Please note that the actual code of the GNU gettext library is covered +# by the GNU Library General Public License, and the rest of the GNU +# gettext package package is covered by the GNU General Public License. +# They are *not* in the public domain. + +# serial 2 + +AC_DEFUN([AM_LC_MESSAGES], + [if test $ac_cv_header_locale_h = yes; then + AC_CACHE_CHECK([for LC_MESSAGES], am_cv_val_LC_MESSAGES, + [AC_TRY_LINK([#include ], [return LC_MESSAGES], + am_cv_val_LC_MESSAGES=yes, am_cv_val_LC_MESSAGES=no)]) + if test $am_cv_val_LC_MESSAGES = yes; then + AC_DEFINE(HAVE_LC_MESSAGES, 1, + [Define if your file defines LC_MESSAGES.]) + fi + fi]) + diff --git a/configure b/configure index a4781ab7cd..5f52395953 100755 --- a/configure +++ b/configure @@ -11,6 +11,12 @@ ac_help= ac_default_prefix=/usr/local # Any additions from configure.in: +ac_help="$ac_help + --with-libiconv-prefix=DIR search for libiconv in DIR/include and DIR/lib" +ac_help="$ac_help + --disable-nls do not use Native Language Support" +ac_help="$ac_help + --with-included-gettext use the GNU gettext library included here" ac_help="$ac_help --with-words=endianness Set endianness (big or little)" ac_help="$ac_help @@ -655,7 +661,7 @@ else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; } fi echo $ac_n "checking host system type""... $ac_c" 1>&6 -echo "configure:659: checking host system type" >&5 +echo "configure:665: checking host system type" >&5 host_alias=$host case "$host_alias" in @@ -676,7 +682,7 @@ host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` echo "$ac_t""$host" 1>&6 echo $ac_n "checking target system type""... $ac_c" 1>&6 -echo "configure:680: checking target system type" >&5 +echo "configure:686: checking target system type" >&5 target_alias=$target case "$target_alias" in @@ -694,7 +700,7 @@ target_os=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` echo "$ac_t""$target" 1>&6 echo $ac_n "checking build system type""... $ac_c" 1>&6 -echo "configure:698: checking build system type" >&5 +echo "configure:704: checking build system type" >&5 build_alias=$build case "$build_alias" in @@ -743,7 +749,7 @@ save_CFLAGS="${CFLAGS}" save_LDFLAGS="${LDFLAGS}" echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6 -echo "configure:747: checking whether ${MAKE-make} sets \${MAKE}" >&5 +echo "configure:753: checking whether ${MAKE-make} sets \${MAKE}" >&5 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -772,7 +778,7 @@ fi # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:776: checking for $ac_word" >&5 +echo "configure:782: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -802,7 +808,7 @@ if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:806: checking for $ac_word" >&5 +echo "configure:812: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -853,7 +859,7 @@ fi # Extract the first word of "cl", so it can be a program name with args. set dummy cl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:857: checking for $ac_word" >&5 +echo "configure:863: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -885,7 +891,7 @@ fi fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:889: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:895: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -896,12 +902,12 @@ cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext << EOF -#line 900 "configure" +#line 906 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:905: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:911: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cc_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -927,12 +933,12 @@ if test $ac_cv_prog_cc_works = no; then { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:931: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:937: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:936: checking whether we are using GNU C" >&5 +echo "configure:942: checking whether we are using GNU C" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -941,7 +947,7 @@ else yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:945: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:951: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gcc=yes else ac_cv_prog_gcc=no @@ -960,7 +966,7 @@ ac_test_CFLAGS="${CFLAGS+set}" ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:964: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:970: checking whether ${CC-cc} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -992,7 +998,7 @@ else fi echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:996: checking how to run the C preprocessor" >&5 +echo "configure:1002: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -1007,13 +1013,13 @@ else # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1017: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1023: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -1024,13 +1030,13 @@ else rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1034: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1040: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -1041,13 +1047,13 @@ else rm -rf conftest* CPP="${CC-cc} -nologo -E" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1051: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1057: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -1065,85 +1071,1876 @@ fi rm -f conftest* ac_cv_prog_CPP="$CPP" fi - CPP="$ac_cv_prog_CPP" + CPP="$ac_cv_prog_CPP" +else + ac_cv_prog_CPP="$CPP" +fi +echo "$ac_t""$CPP" 1>&6 + +if test $host != $build; then + ac_tool_prefix=${host_alias}- +else + ac_tool_prefix= +fi + +# Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. +set dummy ${ac_tool_prefix}ranlib; ac_word=$2 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +echo "configure:1090: 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 + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" + break + fi + done + IFS="$ac_save_ifs" +fi +fi +RANLIB="$ac_cv_prog_RANLIB" +if test -n "$RANLIB"; then + echo "$ac_t""$RANLIB" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi + + +if test -z "$ac_cv_prog_RANLIB"; then +if test -n "$ac_tool_prefix"; then + # Extract the first word of "ranlib", so it can be a program name with args. +set dummy ranlib; ac_word=$2 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +echo "configure:1122: 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 + 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" +if test -n "$RANLIB"; then + echo "$ac_t""$RANLIB" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi + +else + RANLIB=":" +fi +fi + + +PACKAGE="vlc" +VERSION="$VLC_VERSION" +cat >> confdefs.h <> confdefs.h <&6 +echo "configure:1168: 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 + 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" +if test -n "$RANLIB"; then + echo "$ac_t""$RANLIB" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi + + + echo $ac_n "checking for strerror in -lcposix""... $ac_c" 1>&6 +echo "configure:1197: checking for strerror in -lcposix" >&5 +ac_lib_var=`echo cposix'_'strerror | sed 'y%./+-%__p_%'` +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + ac_save_LIBS="$LIBS" +LIBS="-lcposix $LIBS" +cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=no" +fi +rm -f conftest* +LIBS="$ac_save_LIBS" + +fi +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + echo "$ac_t""yes" 1>&6 + LIBS="$LIBS -lcposix" +else + echo "$ac_t""no" 1>&6 +fi + + + +echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 +echo "configure:1239: checking for ANSI C header files" >&5 +if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + cat > conftest.$ac_ext < +#include +#include +#include +EOF +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +{ (eval echo configure:1252: \"$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 "$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* + +if test $ac_cv_header_stdc = yes; then + # SunOS 4.x string.h does not declare mem*, contrary to ANSI. +cat > conftest.$ac_ext < +EOF +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* + +fi + +if test $ac_cv_header_stdc = yes; then + # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. +cat > conftest.$ac_ext < +EOF +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* + +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 + : +else + cat > conftest.$ac_ext < +#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); } + +EOF +if { (eval echo configure:1319: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +then + : +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -fr conftest* + ac_cv_header_stdc=no +fi +rm -fr conftest* +fi + +fi +fi + +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 + +echo $ac_n "checking for working const""... $ac_c" 1>&6 +echo "configure:1343: 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 <j = 5; +} +{ /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */ + const int foo = 10; +} + +; return 0; } +EOF +if { (eval echo configure:1397: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_c_const=yes +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + ac_cv_c_const=no +fi +rm -f conftest* +fi + +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 $ac_n "checking for inline""... $ac_c" 1>&6 +echo "configure:1418: checking for inline" >&5 +if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + ac_cv_c_inline=no +for ac_kw in inline __inline__ __inline; do + cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_c_inline=$ac_kw; break +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 +fi +rm -f conftest* +done + +fi + +echo "$ac_t""$ac_cv_c_inline" 1>&6 +case "$ac_cv_c_inline" in + inline | yes) ;; + no) cat >> confdefs.h <<\EOF +#define inline +EOF + ;; + *) cat >> confdefs.h <&6 +echo "configure:1458: checking for off_t" >&5 +if eval "test \"`echo '$''{'ac_cv_type_off_t'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + cat > conftest.$ac_ext < +#if STDC_HEADERS +#include +#include +#endif +EOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + egrep "(^|[^a-zA-Z_0-9])off_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then + rm -rf conftest* + ac_cv_type_off_t=yes +else + rm -rf conftest* + ac_cv_type_off_t=no +fi +rm -f conftest* + +fi +echo "$ac_t""$ac_cv_type_off_t" 1>&6 +if test $ac_cv_type_off_t = no; then + cat >> confdefs.h <<\EOF +#define off_t long +EOF + +fi + +echo $ac_n "checking for size_t""... $ac_c" 1>&6 +echo "configure:1491: checking for size_t" >&5 +if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + cat > conftest.$ac_ext < +#if STDC_HEADERS +#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 + rm -rf conftest* + ac_cv_type_size_t=no +fi +rm -f conftest* + +fi +echo "$ac_t""$ac_cv_type_size_t" 1>&6 +if test $ac_cv_type_size_t = no; then + cat >> confdefs.h <<\EOF +#define size_t unsigned +EOF + +fi + +# The Ultrix 4.2 mips builtin alloca declared by alloca.h only works +# for constant arguments. Useless! +echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6 +echo "configure:1526: checking for working alloca.h" >&5 +if eval "test \"`echo '$''{'ac_cv_header_alloca_h'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + cat > conftest.$ac_ext < +int main() { +char *p = alloca(2 * sizeof(int)); +; return 0; } +EOF +if { (eval echo configure:1538: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + ac_cv_header_alloca_h=yes +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + ac_cv_header_alloca_h=no +fi +rm -f conftest* +fi + +echo "$ac_t""$ac_cv_header_alloca_h" 1>&6 +if test $ac_cv_header_alloca_h = yes; then + cat >> confdefs.h <<\EOF +#define HAVE_ALLOCA_H 1 +EOF + +fi + +echo $ac_n "checking for alloca""... $ac_c" 1>&6 +echo "configure:1559: checking for alloca" >&5 +if eval "test \"`echo '$''{'ac_cv_func_alloca_works'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + cat > conftest.$ac_ext < +# define alloca _alloca +# else +# if HAVE_ALLOCA_H +# include +# else +# ifdef _AIX + #pragma alloca +# else +# ifndef alloca /* predefined by HP cc +Olibcalls */ +char *alloca (); +# endif +# endif +# endif +# endif +#endif + +int main() { +char *p = (char *) alloca(1); +; return 0; } +EOF +if { (eval echo configure:1592: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + ac_cv_func_alloca_works=yes +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + ac_cv_func_alloca_works=no +fi +rm -f conftest* +fi + +echo "$ac_t""$ac_cv_func_alloca_works" 1>&6 +if test $ac_cv_func_alloca_works = yes; then + cat >> confdefs.h <<\EOF +#define HAVE_ALLOCA 1 +EOF + +fi + +if test $ac_cv_func_alloca_works = no; then + # The SVR3 libPW and SVR4 libucb both contain incompatible functions + # that cause trouble. Some versions do not even contain alloca or + # contain a buggy version. If you still want to use their alloca, + # use ar to extract alloca.o from them instead of compiling alloca.c. + ALLOCA=alloca.${ac_objext} + cat >> confdefs.h <<\EOF +#define C_ALLOCA 1 +EOF + + +echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6 +echo "configure:1624: checking whether alloca needs Cray hooks" >&5 +if eval "test \"`echo '$''{'ac_cv_os_cray'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + cat > conftest.$ac_ext <&5 | + egrep "webecray" >/dev/null 2>&1; then + rm -rf conftest* + ac_cv_os_cray=yes +else + rm -rf conftest* + ac_cv_os_cray=no +fi +rm -f conftest* + +fi + +echo "$ac_t""$ac_cv_os_cray" 1>&6 +if test $ac_cv_os_cray = yes; then +for ac_func in _getb67 GETB67 getb67; do + echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 +echo "configure: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. */ +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char $ac_func(); + +int main() { + +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub_$ac_func) || defined (__stub___$ac_func) +choke me +#else +$ac_func(); +#endif + +; return 0; } +EOF +if { (eval echo configure:1682: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_func_$ac_func=yes" +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_func_$ac_func=no" +fi +rm -f conftest* +fi + +if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then + echo "$ac_t""yes" 1>&6 + cat >> confdefs.h <&6 +fi + +done +fi + +echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6 +echo "configure:1709: checking stack direction for C alloca" >&5 +if eval "test \"`echo '$''{'ac_cv_c_stack_direction'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + if test "$cross_compiling" = yes; then + ac_cv_c_stack_direction=0 +else + cat > conftest.$ac_ext < addr) ? 1 : -1; +} +main () +{ + exit (find_stack_direction() < 0); +} +EOF +if { (eval echo configure:1736: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +then + ac_cv_c_stack_direction=1 +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -fr conftest* + ac_cv_c_stack_direction=-1 +fi +rm -fr conftest* +fi + +fi + +echo "$ac_t""$ac_cv_c_stack_direction" 1>&6 +cat >> confdefs.h <&6 +echo "configure:1761: checking for $ac_hdr" >&5 +if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + cat > conftest.$ac_ext < +EOF +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +{ (eval echo configure:1771: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` +if test -z "$ac_err"; then + rm -rf conftest* + eval "ac_cv_header_$ac_safe=yes" +else + echo "$ac_err" >&5 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_header_$ac_safe=no" +fi +rm -f conftest* +fi +if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then + echo "$ac_t""yes" 1>&6 + ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` + cat >> confdefs.h <&6 +fi +done + +for ac_func in getpagesize +do +echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 +echo "configure:1800: checking for $ac_func" >&5 +if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + cat > conftest.$ac_ext < +/* Override any gcc2 internal prototype to avoid an error. */ +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char $ac_func(); + +int main() { + +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub_$ac_func) || defined (__stub___$ac_func) +choke me +#else +$ac_func(); +#endif + +; return 0; } +EOF +if { (eval echo configure:1828: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_func_$ac_func=yes" +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_func_$ac_func=no" +fi +rm -f conftest* +fi + +if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then + echo "$ac_t""yes" 1>&6 + ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` + cat >> confdefs.h <&6 +fi +done + +echo $ac_n "checking for working mmap""... $ac_c" 1>&6 +echo "configure:1853: 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 < +#include +#include + +/* This mess was copied from the GNU getpagesize.h. */ +#ifndef HAVE_GETPAGESIZE +# ifdef HAVE_UNISTD_H +# include +# endif + +/* Assume that all systems that can run configure 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 */ +# ifdef HAVE_SYS_PARAM_H +# include +# ifdef EXEC_PAGESIZE +# define getpagesize() EXEC_PAGESIZE +# else /* no EXEC_PAGESIZE */ +# ifdef NBPG +# define getpagesize() NBPG * CLSIZE +# ifndef CLSIZE +# define CLSIZE 1 +# endif /* no CLSIZE */ +# else /* no NBPG */ +# ifdef NBPC +# define getpagesize() NBPC +# else /* no NBPC */ +# ifdef PAGESIZE +# define getpagesize() PAGESIZE +# endif /* PAGESIZE */ +# endif /* no NBPC */ +# endif /* no NBPG */ +# endif /* no EXEC_PAGESIZE */ +# else /* no HAVE_SYS_PARAM_H */ +# define getpagesize() 8192 /* punt totally */ +# endif /* no HAVE_SYS_PARAM_H */ +# endif /* no _SC_PAGESIZE */ + +#endif /* no HAVE_GETPAGESIZE */ + +#ifdef __cplusplus +extern "C" { void *malloc(unsigned); } +#else +char *malloc(); +#endif + +int +main() +{ + char *data, *data2, *data3; + int i, pagesize; + int fd; + + pagesize = getpagesize(); + + /* + * First, make a file with some known garbage in it. + */ + data = malloc(pagesize); + if (!data) + exit(1); + for (i = 0; i < pagesize; ++i) + *(data + i) = rand(); + umask(0); + fd = creat("conftestmmap", 0600); + if (fd < 0) + exit(1); + if (write(fd, data, pagesize) != pagesize) + exit(1); + close(fd); + + /* + * Next, try to mmap the file at a fixed address which + * already has something else allocated at it. If we can, + * also make sure that we see the same garbage. + */ + fd = open("conftestmmap", O_RDWR); + if (fd < 0) + exit(1); + data2 = malloc(2 * pagesize); + if (!data2) + exit(1); + data2 += (pagesize - ((int) data2 & (pagesize - 1))) & (pagesize - 1); + if (data2 != mmap(data2, pagesize, PROT_READ | PROT_WRITE, + MAP_PRIVATE | MAP_FIXED, fd, 0L)) + exit(1); + for (i = 0; i < pagesize; ++i) + if (*(data + i) != *(data2 + i)) + exit(1); + + /* + * Finally, make sure that changes to the mapped area + * do not percolate back to the file as seen by read(). + * (This is a bug on some variants of i386 svr4.0.) + */ + for (i = 0; i < pagesize; ++i) + *(data2 + i) = *(data2 + i) + 1; + data3 = malloc(pagesize); + if (!data3) + exit(1); + if (read(fd, data3, pagesize) != pagesize) + exit(1); + for (i = 0; i < pagesize; ++i) + if (*(data + i) != *(data3 + i)) + exit(1); + close(fd); + unlink("conftestmmap"); + exit(0); +} + +EOF +if { (eval echo configure:2001: \"$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 "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -fr conftest* + ac_cv_func_mmap_fixed_mapped=no +fi +rm -fr conftest* +fi + +fi + +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 + + + echo $ac_n "checking whether we are using the GNU C Library 2.1 or newer""... $ac_c" 1>&6 +echo "configure:2025: checking whether we are using the GNU C Library 2.1 or newer" >&5 +if eval "test \"`echo '$''{'ac_cv_gnu_library_2_1'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + cat > conftest.$ac_ext < +#ifdef __GNU_LIBRARY__ + #if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1) || (__GLIBC__ > 2) + Lucky GNU user + #endif +#endif + +EOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + egrep "Lucky GNU user" >/dev/null 2>&1; then + rm -rf conftest* + ac_cv_gnu_library_2_1=yes +else + rm -rf conftest* + ac_cv_gnu_library_2_1=no +fi +rm -f conftest* + + + +fi + +echo "$ac_t""$ac_cv_gnu_library_2_1" 1>&6 + + GLIBC21="$ac_cv_gnu_library_2_1" + + + + for ac_hdr in argz.h limits.h locale.h nl_types.h malloc.h stddef.h \ +stdlib.h string.h unistd.h sys/param.h +do +ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` +echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 +echo "configure:2066: checking for $ac_hdr" >&5 +if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + cat > conftest.$ac_ext < +EOF +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +{ (eval echo configure:2076: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` +if test -z "$ac_err"; then + rm -rf conftest* + eval "ac_cv_header_$ac_safe=yes" +else + echo "$ac_err" >&5 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_header_$ac_safe=no" +fi +rm -f conftest* +fi +if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then + echo "$ac_t""yes" 1>&6 + ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` + cat >> confdefs.h <&6 +fi +done + + for ac_func in feof_unlocked fgets_unlocked getcwd getegid geteuid \ +getgid getuid mempcpy munmap putenv setenv setlocale stpcpy strchr strcasecmp \ +strdup strtoul tsearch __argz_count __argz_stringify __argz_next +do +echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 +echo "configure:2107: checking for $ac_func" >&5 +if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + cat > conftest.$ac_ext < +/* Override any gcc2 internal prototype to avoid an error. */ +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char $ac_func(); + +int main() { + +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub_$ac_func) || defined (__stub___$ac_func) +choke me +#else +$ac_func(); +#endif + +; return 0; } +EOF +if { (eval echo configure:2135: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_func_$ac_func=yes" +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_func_$ac_func=no" +fi +rm -f conftest* +fi + +if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then + echo "$ac_t""yes" 1>&6 + ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` + cat >> confdefs.h <&6 +fi +done + + + + + # Check whether --with-libiconv-prefix or --without-libiconv-prefix was given. +if test "${with_libiconv_prefix+set}" = set; then + withval="$with_libiconv_prefix" + + for dir in `echo "$withval" | tr : ' '`; do + if test -d $dir/include; then CPPFLAGS="$CPPFLAGS -I$dir/include"; fi + if test -d $dir/lib; then LDFLAGS="$LDFLAGS -L$dir/lib"; fi + done + +fi + + + echo $ac_n "checking for iconv""... $ac_c" 1>&6 +echo "configure:2175: checking for iconv" >&5 +if eval "test \"`echo '$''{'am_cv_func_iconv'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + + am_cv_func_iconv="no, consider installing GNU libiconv" + am_cv_lib_iconv=no + cat > conftest.$ac_ext < +#include +int main() { +iconv_t cd = iconv_open("",""); + iconv(cd,NULL,NULL,NULL,NULL); + iconv_close(cd); +; return 0; } +EOF +if { (eval echo configure:2193: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + am_cv_func_iconv=yes +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 +fi +rm -f conftest* + if test "$am_cv_func_iconv" != yes; then + am_save_LIBS="$LIBS" + LIBS="$LIBS -liconv" + cat > conftest.$ac_ext < +#include +int main() { +iconv_t cd = iconv_open("",""); + iconv(cd,NULL,NULL,NULL,NULL); + iconv_close(cd); +; return 0; } +EOF +if { (eval echo configure:2215: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + am_cv_lib_iconv=yes + am_cv_func_iconv=yes +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 +fi +rm -f conftest* + LIBS="$am_save_LIBS" + fi + +fi + +echo "$ac_t""$am_cv_func_iconv" 1>&6 + if test "$am_cv_func_iconv" = yes; then + cat >> confdefs.h <<\EOF +#define HAVE_ICONV 1 +EOF + + echo $ac_n "checking for iconv declaration""... $ac_c" 1>&6 +echo "configure:2236: checking for iconv declaration" >&5 + if eval "test \"`echo '$''{'am_cv_proto_iconv'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + + cat > conftest.$ac_ext < +#include +extern +#ifdef __cplusplus +"C" +#endif +#if defined(__STDC__) || defined(__cplusplus) +size_t iconv (iconv_t cd, char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft); +#else +size_t iconv(); +#endif + +int main() { + +; return 0; } +EOF +if { (eval echo configure:2261: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + am_cv_proto_iconv_arg1="" +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + am_cv_proto_iconv_arg1="const" +fi +rm -f conftest* + am_cv_proto_iconv="extern size_t iconv (iconv_t cd, $am_cv_proto_iconv_arg1 char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);" +fi + + am_cv_proto_iconv=`echo "$am_cv_proto_iconv" | tr -s ' ' | sed -e 's/( /(/'` + echo "$ac_t""${ac_t:- + }$am_cv_proto_iconv" 1>&6 + cat >> confdefs.h <&6 +echo "configure:2290: checking for nl_langinfo and CODESET" >&5 +if eval "test \"`echo '$''{'am_cv_langinfo_codeset'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + cat > conftest.$ac_ext < +int main() { +char* cs = nl_langinfo(CODESET); +; return 0; } +EOF +if { (eval echo configure:2302: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + am_cv_langinfo_codeset=yes +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + am_cv_langinfo_codeset=no +fi +rm -f conftest* + +fi + +echo "$ac_t""$am_cv_langinfo_codeset" 1>&6 + if test $am_cv_langinfo_codeset = yes; then + cat >> confdefs.h <<\EOF +#define HAVE_LANGINFO_CODESET 1 +EOF + + fi + + if test $ac_cv_header_locale_h = yes; then + echo $ac_n "checking for LC_MESSAGES""... $ac_c" 1>&6 +echo "configure:2325: checking for LC_MESSAGES" >&5 +if eval "test \"`echo '$''{'am_cv_val_LC_MESSAGES'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + cat > conftest.$ac_ext < +int main() { +return LC_MESSAGES +; return 0; } +EOF +if { (eval echo configure:2337: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + am_cv_val_LC_MESSAGES=yes +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + am_cv_val_LC_MESSAGES=no +fi +rm -f conftest* +fi + +echo "$ac_t""$am_cv_val_LC_MESSAGES" 1>&6 + if test $am_cv_val_LC_MESSAGES = yes; then + cat >> confdefs.h <<\EOF +#define HAVE_LC_MESSAGES 1 +EOF + + fi + fi + echo $ac_n "checking whether NLS is requested""... $ac_c" 1>&6 +echo "configure:2358: checking whether NLS is requested" >&5 + # Check whether --enable-nls or --disable-nls was given. +if test "${enable_nls+set}" = set; then + enableval="$enable_nls" + USE_NLS=$enableval +else + USE_NLS=yes +fi + + echo "$ac_t""$USE_NLS" 1>&6 + + + BUILD_INCLUDED_LIBINTL=no + USE_INCLUDED_LIBINTL=no + INTLLIBS= + + if test "$USE_NLS" = "yes"; then + cat >> confdefs.h <<\EOF +#define ENABLE_NLS 1 +EOF + + echo $ac_n "checking whether included gettext is requested""... $ac_c" 1>&6 +echo "configure:2380: checking whether included gettext is requested" >&5 + # Check whether --with-included-gettext or --without-included-gettext was given. +if test "${with_included_gettext+set}" = set; then + withval="$with_included_gettext" + nls_cv_force_use_gnu_gettext=$withval +else + nls_cv_force_use_gnu_gettext=no +fi + + echo "$ac_t""$nls_cv_force_use_gnu_gettext" 1>&6 + + nls_cv_use_gnu_gettext="$nls_cv_force_use_gnu_gettext" + if test "$nls_cv_force_use_gnu_gettext" != "yes"; then + CATOBJEXT=NONE + + + + + ac_safe=`echo "libintl.h" | sed 'y%./+-%__p_%'` +echo $ac_n "checking for libintl.h""... $ac_c" 1>&6 +echo "configure:2400: checking for libintl.h" >&5 +if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + cat > conftest.$ac_ext < +EOF +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +{ (eval echo configure:2410: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` +if test -z "$ac_err"; then + rm -rf conftest* + eval "ac_cv_header_$ac_safe=yes" +else + echo "$ac_err" >&5 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_header_$ac_safe=no" +fi +rm -f conftest* +fi +if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then + echo "$ac_t""yes" 1>&6 + echo $ac_n "checking for GNU gettext in libc""... $ac_c" 1>&6 +echo "configure:2427: checking for GNU gettext in libc" >&5 +if eval "test \"`echo '$''{'gt_cv_func_gnugettext1_libc'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + cat > conftest.$ac_ext < +extern int _nl_msg_cat_cntr; +int main() { +bindtextdomain ("", ""); +return (int) gettext ("") + _nl_msg_cat_cntr +; return 0; } +EOF +if { (eval echo configure:2441: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + gt_cv_func_gnugettext1_libc=yes +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + gt_cv_func_gnugettext1_libc=no +fi +rm -f conftest* +fi + +echo "$ac_t""$gt_cv_func_gnugettext1_libc" 1>&6 + + if test "$gt_cv_func_gnugettext1_libc" != "yes"; then + echo $ac_n "checking for GNU gettext in libintl""... $ac_c" 1>&6 +echo "configure:2457: checking for GNU gettext in libintl" >&5 +if eval "test \"`echo '$''{'gt_cv_func_gnugettext1_libintl'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + gt_save_LIBS="$LIBS" + LIBS="$LIBS -lintl $LIBICONV" + cat > conftest.$ac_ext < +extern int _nl_msg_cat_cntr; +int main() { +bindtextdomain ("", ""); +return (int) gettext ("") + _nl_msg_cat_cntr +; return 0; } +EOF +if { (eval echo configure:2473: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + gt_cv_func_gnugettext1_libintl=yes +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + gt_cv_func_gnugettext1_libintl=no +fi +rm -f conftest* + LIBS="$gt_save_LIBS" +fi + +echo "$ac_t""$gt_cv_func_gnugettext1_libintl" 1>&6 + fi + + if test "$gt_cv_func_gnugettext1_libc" = "yes" \ + || { test "$gt_cv_func_gnugettext1_libintl" = "yes" \ + && test "$PACKAGE" != gettext; }; then + cat >> confdefs.h <<\EOF +#define HAVE_GETTEXT 1 +EOF + + + if test "$gt_cv_func_gnugettext1_libintl" = "yes"; then + INTLLIBS="-lintl $LIBICONV" + fi + + gt_save_LIBS="$LIBS" + LIBS="$LIBS $INTLLIBS" + for ac_func in dcgettext +do +echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 +echo "configure:2506: checking for $ac_func" >&5 +if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + cat > conftest.$ac_ext < +/* Override any gcc2 internal prototype to avoid an error. */ +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char $ac_func(); + +int main() { + +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub_$ac_func) || defined (__stub___$ac_func) +choke me +#else +$ac_func(); +#endif + +; return 0; } +EOF +if { (eval echo configure:2534: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_func_$ac_func=yes" +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_func_$ac_func=no" +fi +rm -f conftest* +fi + +if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then + echo "$ac_t""yes" 1>&6 + ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` + cat >> confdefs.h <&6 +fi +done + + LIBS="$gt_save_LIBS" + + # Extract the first word of "msgfmt", so it can be a program name with args. +set dummy msgfmt; ac_word=$2 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +echo "configure:2563: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_path_MSGFMT'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + case "$MSGFMT" in + /*) + ac_cv_path_MSGFMT="$MSGFMT" # Let the user override the test with a path. + ;; + *) + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" + for ac_dir in $PATH; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + if $ac_dir/$ac_word --statistics /dev/null >/dev/null 2>&1; then + ac_cv_path_MSGFMT="$ac_dir/$ac_word" + break + fi + fi + done + IFS="$ac_save_ifs" + test -z "$ac_cv_path_MSGFMT" && ac_cv_path_MSGFMT=":" + ;; +esac +fi +MSGFMT="$ac_cv_path_MSGFMT" +if test "$MSGFMT" != ":"; then + echo "$ac_t""$MSGFMT" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi + + # Extract the first word of "gmsgfmt", so it can be a program name with args. +set dummy gmsgfmt; ac_word=$2 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +echo "configure:2597: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_path_GMSGFMT'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + case "$GMSGFMT" in + /*) + ac_cv_path_GMSGFMT="$GMSGFMT" # Let the user override the test with a path. + ;; + ?:/*) + ac_cv_path_GMSGFMT="$GMSGFMT" # Let the user override the test with a dos path. + ;; + *) + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_path_GMSGFMT="$ac_dir/$ac_word" + break + fi + done + IFS="$ac_save_ifs" + test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT" + ;; +esac +fi +GMSGFMT="$ac_cv_path_GMSGFMT" +if test -n "$GMSGFMT"; then + echo "$ac_t""$GMSGFMT" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi + + + # Extract the first word of "xgettext", so it can be a program name with args. +set dummy xgettext; ac_word=$2 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +echo "configure:2634: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_path_XGETTEXT'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + case "$XGETTEXT" in + /*) + ac_cv_path_XGETTEXT="$XGETTEXT" # Let the user override the test with a path. + ;; + *) + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" + for ac_dir in $PATH; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + if $ac_dir/$ac_word --omit-header /dev/null >/dev/null 2>&1; then + ac_cv_path_XGETTEXT="$ac_dir/$ac_word" + break + fi + fi + done + IFS="$ac_save_ifs" + test -z "$ac_cv_path_XGETTEXT" && ac_cv_path_XGETTEXT=":" + ;; +esac +fi +XGETTEXT="$ac_cv_path_XGETTEXT" +if test "$XGETTEXT" != ":"; then + echo "$ac_t""$XGETTEXT" 1>&6 else - ac_cv_prog_CPP="$CPP" + echo "$ac_t""no" 1>&6 fi -echo "$ac_t""$CPP" 1>&6 -if test $host != $build; then - ac_tool_prefix=${host_alias}- + + CATOBJEXT=.gmo + fi + else - ac_tool_prefix= + echo "$ac_t""no" 1>&6 fi -# Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. -set dummy ${ac_tool_prefix}ranlib; ac_word=$2 + + if test "$CATOBJEXT" = "NONE"; then + nls_cv_use_gnu_gettext=yes + fi + fi + + if test "$nls_cv_use_gnu_gettext" = "yes"; then + INTLOBJS="\$(GETTOBJS)" + # Extract the first word of "msgfmt", so it can be a program name with args. +set dummy msgfmt; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1084: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then +echo "configure:2684: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_path_MSGFMT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else - if test -n "$RANLIB"; then - ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. + case "$MSGFMT" in + /*) + ac_cv_path_MSGFMT="$MSGFMT" # Let the user override the test with a path. + ;; + *) + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" + for ac_dir in $PATH; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + if $ac_dir/$ac_word --statistics /dev/null >/dev/null 2>&1; then + ac_cv_path_MSGFMT="$ac_dir/$ac_word" + break + fi + fi + done + IFS="$ac_save_ifs" + test -z "$ac_cv_path_MSGFMT" && ac_cv_path_MSGFMT=":" + ;; +esac +fi +MSGFMT="$ac_cv_path_MSGFMT" +if test "$MSGFMT" != ":"; then + echo "$ac_t""$MSGFMT" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi + + # Extract the first word of "gmsgfmt", so it can be a program name with args. +set dummy gmsgfmt; ac_word=$2 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +echo "configure:2718: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_path_GMSGFMT'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 else + case "$GMSGFMT" in + /*) + ac_cv_path_GMSGFMT="$GMSGFMT" # Let the user override the test with a path. + ;; + ?:/*) + ac_cv_path_GMSGFMT="$GMSGFMT" # Let the user override the test with a dos path. + ;; + *) IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" ac_dummy="$PATH" - for ac_dir in $ac_dummy; do + for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if test -f $ac_dir/$ac_word; then - ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" + ac_cv_path_GMSGFMT="$ac_dir/$ac_word" break fi done IFS="$ac_save_ifs" + test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT" + ;; +esac fi +GMSGFMT="$ac_cv_path_GMSGFMT" +if test -n "$GMSGFMT"; then + echo "$ac_t""$GMSGFMT" 1>&6 +else + echo "$ac_t""no" 1>&6 fi -RANLIB="$ac_cv_prog_RANLIB" -if test -n "$RANLIB"; then - echo "$ac_t""$RANLIB" 1>&6 + + # Extract the first word of "xgettext", so it can be a program name with args. +set dummy xgettext; ac_word=$2 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +echo "configure:2754: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_path_XGETTEXT'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + case "$XGETTEXT" in + /*) + ac_cv_path_XGETTEXT="$XGETTEXT" # Let the user override the test with a path. + ;; + *) + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" + for ac_dir in $PATH; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + if $ac_dir/$ac_word --omit-header /dev/null >/dev/null 2>&1; then + ac_cv_path_XGETTEXT="$ac_dir/$ac_word" + break + fi + fi + done + IFS="$ac_save_ifs" + test -z "$ac_cv_path_XGETTEXT" && ac_cv_path_XGETTEXT=":" + ;; +esac +fi +XGETTEXT="$ac_cv_path_XGETTEXT" +if test "$XGETTEXT" != ":"; then + echo "$ac_t""$XGETTEXT" 1>&6 else echo "$ac_t""no" 1>&6 fi + + BUILD_INCLUDED_LIBINTL=yes + USE_INCLUDED_LIBINTL=yes + CATOBJEXT=.gmo + INTLLIBS="\$(top_builddir)/intl/libintl.a $LIBICONV" + LIBS=`echo " $LIBS " | sed -e 's/ -lintl / /' -e 's/^ //' -e 's/ $//'` + fi -if test -z "$ac_cv_prog_RANLIB"; then -if test -n "$ac_tool_prefix"; then - # Extract the first word of "ranlib", so it can be a program name with args. -set dummy ranlib; ac_word=$2 + if test "$GMSGFMT" != ":"; then + if $GMSGFMT --statistics /dev/null >/dev/null 2>&1; then + : ; + else + echo "$ac_t""found msgfmt program is not GNU msgfmt; ignore it" 1>&6 + GMSGFMT=":" + fi + fi + + if test "$XGETTEXT" != ":"; then + if $XGETTEXT --omit-header /dev/null >/dev/null 2>&1; then + : ; + else + echo "$ac_t""found xgettext program is not GNU xgettext; ignore it" 1>&6 + XGETTEXT=":" + fi + fi + + POSUB=po + fi + + + + if test "$PACKAGE" = gettext; then + BUILD_INCLUDED_LIBINTL=yes + fi + + for ac_prog in bison +do +# Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1116: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then +echo "configure:2825: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_INTLBISON'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else - if test -n "$RANLIB"; then - ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. + if test -n "$INTLBISON"; then + ac_cv_prog_INTLBISON="$INTLBISON" # Let the user override the test. else IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" ac_dummy="$PATH" for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if test -f $ac_dir/$ac_word; then - ac_cv_prog_RANLIB="ranlib" + ac_cv_prog_INTLBISON="$ac_prog" break fi done IFS="$ac_save_ifs" - test -z "$ac_cv_prog_RANLIB" && ac_cv_prog_RANLIB=":" fi fi -RANLIB="$ac_cv_prog_RANLIB" -if test -n "$RANLIB"; then - echo "$ac_t""$RANLIB" 1>&6 +INTLBISON="$ac_cv_prog_INTLBISON" +if test -n "$INTLBISON"; then + echo "$ac_t""$INTLBISON" 1>&6 else echo "$ac_t""no" 1>&6 fi -else - RANLIB=":" -fi -fi +test -n "$INTLBISON" && break +done + + if test -z "$INTLBISON"; then + ac_verc_fail=yes + else + echo $ac_n "checking version of bison""... $ac_c" 1>&6 +echo "configure:2858: checking version of bison" >&5 + ac_prog_version=`$INTLBISON --version 2>&1 | sed -n 's/^.*GNU Bison.* \([0-9]*\.[0-9.]*\).*$/\1/p'` + case $ac_prog_version in + '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;; + 1.2[6-9]* | 1.[3-9][0-9]* | [2-9].*) + ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;; + *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;; + esac + echo "$ac_t""$ac_prog_version" 1>&6 + fi + if test $ac_verc_fail = yes; then + INTLBISON=: + fi + + for lang in $ALL_LINGUAS; do + GMOFILES="$GMOFILES $lang.gmo" + POFILES="$POFILES $lang.po" + done + + + + + + + + + + + + nls_cv_header_intl= + nls_cv_header_libgt= + + DATADIRNAME=share + + + INSTOBJEXT=.mo + + + GENCAT=gencat + + + + if test "x$CATOBJEXT" != "x"; then + if test "x$ALL_LINGUAS" = "x"; then + LINGUAS= + else + echo $ac_n "checking for catalogs to be installed""... $ac_c" 1>&6 +echo "configure:2905: checking for catalogs to be installed" >&5 + NEW_LINGUAS= + for presentlang in $ALL_LINGUAS; do + useit=no + for desiredlang in ${LINGUAS-$ALL_LINGUAS}; do + # Use the presentlang catalog if desiredlang is + # a. equal to presentlang, or + # b. a variant of presentlang (because in this case, + # presentlang can be used as a fallback for messages + # which are not translated in the desiredlang catalog). + case "$desiredlang" in + "$presentlang"*) useit=yes;; + esac + done + if test $useit = yes; then + NEW_LINGUAS="$NEW_LINGUAS $presentlang" + fi + done + LINGUAS=$NEW_LINGUAS + echo "$ac_t""$LINGUAS" 1>&6 + fi + + if test -n "$LINGUAS"; then + for lang in $LINGUAS; do CATALOGS="$CATALOGS $lang$CATOBJEXT"; done + fi + fi + + MKINSTALLDIRS= + if test -n "$ac_aux_dir"; then + MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs" + fi + if test -z "$MKINSTALLDIRS"; then + MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs" + fi + + INTL_LIBTOOL_SUFFIX_PREFIX= + + +ALL_LINGUAS="de" # Find a good install program. We prefer a C program (faster), # so one script is as good as another. But avoid the broken or @@ -1157,7 +2954,7 @@ fi # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # ./install, which can be erroneously created by make from ./install.sh. echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 -echo "configure:1161: checking for a BSD compatible install" >&5 +echo "configure:2958: checking for a BSD compatible install" >&5 if test -z "$INSTALL"; then if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1212,14 +3009,14 @@ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' if test x${cross_compiling} != xyes; then echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6 -echo "configure:1216: checking whether byte ordering is bigendian" >&5 +echo "configure:3013: 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 < #include @@ -1230,11 +3027,11 @@ int main() { #endif ; return 0; } EOF -if { (eval echo configure:1234: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3031: \"$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 < #include @@ -1245,7 +3042,7 @@ int main() { #endif ; return 0; } EOF -if { (eval echo configure:1249: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3046: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_bigendian=yes else @@ -1265,7 +3062,7 @@ if test "$cross_compiling" = yes; then { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:3079: \"$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 @@ -1318,7 +3115,7 @@ fi *) ac_cv_c_bigendian=unknown echo $ac_n "checking what the byte order looks to be""... $ac_c" 1>&6 -echo "configure:1322: checking what the byte order looks to be" >&5 +echo "configure:3119: checking what the byte order looks to be" >&5 cat >conftest.c <&6 -echo "configure:1367: checking for $ac_func" >&5 +echo "configure:3164: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3192: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -1418,12 +3215,12 @@ done for ac_func in setenv putenv do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:1422: checking for $ac_func" >&5 +echo "configure:3219: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3247: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -1471,12 +3268,12 @@ fi done echo $ac_n "checking for connect""... $ac_c" 1>&6 -echo "configure:1475: checking for connect" >&5 +echo "configure:3272: checking for connect" >&5 if eval "test \"`echo '$''{'ac_cv_func_connect'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3300: \"$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 @@ -1518,7 +3315,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6 -echo "configure:1522: checking for connect in -lsocket" >&5 +echo "configure:3319: 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 @@ -1526,7 +3323,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lsocket $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3338: \"$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 @@ -1561,12 +3358,12 @@ fi fi echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6 -echo "configure:1565: checking for gethostbyname" >&5 +echo "configure:3362: checking for gethostbyname" >&5 if eval "test \"`echo '$''{'ac_cv_func_gethostbyname'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3390: \"$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 @@ -1608,7 +3405,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6 -echo "configure:1612: checking for gethostbyname in -lnsl" >&5 +echo "configure:3409: 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 @@ -1616,7 +3413,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lnsl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3428: \"$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 @@ -1651,12 +3448,12 @@ fi fi echo $ac_n "checking for nanosleep""... $ac_c" 1>&6 -echo "configure:1655: checking for nanosleep" >&5 +echo "configure:3452: 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 <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3480: \"$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 @@ -1698,7 +3495,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for nanosleep in -lrt""... $ac_c" 1>&6 -echo "configure:1702: checking for nanosleep in -lrt" >&5 +echo "configure:3499: 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 @@ -1706,7 +3503,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lrt $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3518: \"$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 @@ -1737,7 +3534,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for nanosleep in -lposix4""... $ac_c" 1>&6 -echo "configure:1741: checking for nanosleep in -lposix4" >&5 +echo "configure:3538: 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 @@ -1745,7 +3542,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lposix4 $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3557: \"$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 @@ -1785,12 +3582,12 @@ fi for ac_func in usleep do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:1789: checking for $ac_func" >&5 +echo "configure:3586: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3614: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -1838,12 +3635,12 @@ fi done echo $ac_n "checking for inet_aton""... $ac_c" 1>&6 -echo "configure:1842: checking for inet_aton" >&5 +echo "configure:3639: checking for inet_aton" >&5 if eval "test \"`echo '$''{'ac_cv_func_inet_aton'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3667: \"$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 @@ -1885,7 +3682,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for inet_aton in -lresolv""... $ac_c" 1>&6 -echo "configure:1889: checking for inet_aton in -lresolv" >&5 +echo "configure:3686: 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 @@ -1893,7 +3690,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lresolv $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3705: \"$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 @@ -1930,12 +3727,12 @@ fi for ac_func in vasprintf do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:1934: checking for $ac_func" >&5 +echo "configure:3731: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3759: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -1985,12 +3782,12 @@ done for ac_func in swab do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:1989: checking for $ac_func" >&5 +echo "configure:3786: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3814: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -2040,12 +3837,12 @@ done for ac_func in memalign valloc do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:2044: checking for $ac_func" >&5 +echo "configure:3841: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3869: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -2096,12 +3893,12 @@ done for ac_func in sigrelse do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:2100: checking for $ac_func" >&5 +echo "configure:3897: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3925: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -2151,12 +3948,12 @@ done NEED_GETOPT=0 echo $ac_n "checking for getopt_long""... $ac_c" 1>&6 -echo "configure:2155: checking for getopt_long" >&5 +echo "configure:3952: checking for getopt_long" >&5 if eval "test \"`echo '$''{'ac_cv_func_getopt_long'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3980: \"$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 @@ -2201,7 +3998,7 @@ else echo "$ac_t""no" 1>&6 # FreeBSD has a gnugetopt library for this: echo $ac_n "checking for getopt_long in -lgnugetopt""... $ac_c" 1>&6 -echo "configure:2205: checking for getopt_long in -lgnugetopt" >&5 +echo "configure:4002: 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 @@ -2209,7 +4006,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lgnugetopt $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4021: \"$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 @@ -2251,17 +4048,17 @@ for ac_hdr in unistd.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:2255: checking for $ac_hdr" >&5 +echo "configure:4052: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2265: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4062: \"$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* @@ -2290,12 +4087,12 @@ done for ac_func in getpagesize do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:2294: checking for $ac_func" >&5 +echo "configure:4091: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4119: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -2343,7 +4140,7 @@ fi done echo $ac_n "checking for working mmap""... $ac_c" 1>&6 -echo "configure:2347: checking for working mmap" >&5 +echo "configure:4144: 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 @@ -2351,7 +4148,7 @@ else ac_cv_func_mmap_fixed_mapped=no else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:4292: \"$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 @@ -2514,12 +4311,12 @@ EOF fi echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6 -echo "configure:2518: checking return type of signal handlers" >&5 +echo "configure:4315: checking return type of signal handlers" >&5 if eval "test \"`echo '$''{'ac_cv_type_signal'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -2536,7 +4333,7 @@ int main() { int i; ; return 0; } EOF -if { (eval echo configure:2540: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4337: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_type_signal=void else @@ -2555,7 +4352,7 @@ EOF echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6 -echo "configure:2559: checking for dlopen in -ldl" >&5 +echo "configure:4356: 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 @@ -2563,7 +4360,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ldl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4375: \"$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 @@ -2595,7 +4392,7 @@ else fi echo $ac_n "checking for cos in -lm""... $ac_c" 1>&6 -echo "configure:2599: checking for cos in -lm" >&5 +echo "configure:4396: checking for cos in -lm" >&5 ac_lib_var=`echo m'_'cos | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2603,7 +4400,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lm $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4415: \"$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 @@ -2635,7 +4432,7 @@ else fi echo $ac_n "checking for pow in -lm""... $ac_c" 1>&6 -echo "configure:2639: checking for pow in -lm" >&5 +echo "configure:4436: 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 @@ -2643,7 +4440,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lm $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4455: \"$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 @@ -2678,7 +4475,7 @@ fi THREAD_LIB=error if test "x${THREAD_LIB}" = xerror; then echo $ac_n "checking for pthread_attr_init in -lpthread""... $ac_c" 1>&6 -echo "configure:2682: checking for pthread_attr_init in -lpthread" >&5 +echo "configure:4479: 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 @@ -2686,7 +4483,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lpthread $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4498: \"$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 @@ -2720,7 +4517,7 @@ fi fi if test "x${THREAD_LIB}" = xerror; then echo $ac_n "checking for pthread_attr_init in -lpthreads""... $ac_c" 1>&6 -echo "configure:2724: checking for pthread_attr_init in -lpthreads" >&5 +echo "configure:4521: 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 @@ -2728,7 +4525,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lpthreads $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4540: \"$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 @@ -2762,7 +4559,7 @@ fi fi if test "x${THREAD_LIB}" = xerror; then echo $ac_n "checking for pthread_attr_init in -lc_r""... $ac_c" 1>&6 -echo "configure:2766: checking for pthread_attr_init in -lc_r" >&5 +echo "configure:4563: 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 @@ -2770,7 +4567,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lc_r $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4582: \"$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 @@ -2804,12 +4601,12 @@ fi fi if test "x${THREAD_LIB}" = xerror; then echo $ac_n "checking for pthread_attr_init""... $ac_c" 1>&6 -echo "configure:2808: checking for pthread_attr_init" >&5 +echo "configure:4605: checking for pthread_attr_init" >&5 if eval "test \"`echo '$''{'ac_cv_func_pthread_attr_init'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4633: \"$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 @@ -2855,7 +4652,7 @@ fi fi echo $ac_n "checking for cthread_fork in -lthreads""... $ac_c" 1>&6 -echo "configure:2859: checking for cthread_fork in -lthreads" >&5 +echo "configure:4656: checking for cthread_fork in -lthreads" >&5 ac_lib_var=`echo threads'_'cthread_fork | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2863,7 +4660,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lthreads $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4675: \"$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 @@ -2896,7 +4693,7 @@ fi cat > conftest.$ac_ext < EOF @@ -2912,7 +4709,7 @@ fi rm -f conftest* cat > conftest.$ac_ext < EOF @@ -2932,17 +4729,17 @@ for ac_hdr in stddef.h getopt.h strings.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:2936: checking for $ac_hdr" >&5 +echo "configure:4733: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2946: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4743: \"$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* @@ -2972,17 +4769,17 @@ for ac_hdr in sys/sockio.h fcntl.h sys/time.h sys/times.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:2976: checking for $ac_hdr" >&5 +echo "configure:4773: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2986: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4783: \"$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* @@ -3012,17 +4809,17 @@ for ac_hdr in sys/soundcard.h machine/soundcard.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:3016: checking for $ac_hdr" >&5 +echo "configure:4813: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3026: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4823: \"$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* @@ -3052,17 +4849,17 @@ for ac_hdr in dlfcn.h image.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:3056: checking for $ac_hdr" >&5 +echo "configure:4853: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3066: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4863: \"$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* @@ -3092,17 +4889,17 @@ for ac_hdr in arpa/inet.h net/if.h netinet/in.h sys/socket.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:3096: checking for $ac_hdr" >&5 +echo "configure:4893: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3106: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4903: \"$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* @@ -3132,17 +4929,17 @@ for ac_hdr in machine/param.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:3136: checking for $ac_hdr" >&5 +echo "configure:4933: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3146: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4943: \"$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* @@ -3173,17 +4970,17 @@ for ac_hdr in cthreads.h pthread.h kernel/scheduler.h kernel/OS.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:3177: checking for $ac_hdr" >&5 +echo "configure:4974: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3187: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4984: \"$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* @@ -3211,20 +5008,20 @@ done echo $ac_n "checking for ntohl in sys/param.h""... $ac_c" 1>&6 -echo "configure:3215: checking for ntohl in sys/param.h" >&5 +echo "configure:5012: checking for ntohl in sys/param.h" >&5 if eval "test \"`echo '$''{'ac_cv_c_ntohl_sys_param_h'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else CFLAGS="${save_CFLAGS} -Wall -Werror" cat > conftest.$ac_ext < int main() { void foo() { int meuh; ntohl(meuh); } ; return 0; } EOF -if { (eval echo configure:3228: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5025: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_ntohl_sys_param_h=yes else @@ -3245,20 +5042,20 @@ EOF fi echo $ac_n "checking if \$CC accepts -finline-limit""... $ac_c" 1>&6 -echo "configure:3249: checking if \$CC accepts -finline-limit" >&5 +echo "configure:5046: checking if \$CC accepts -finline-limit" >&5 if eval "test \"`echo '$''{'ac_cv_c_inline_limit'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else CFLAGS="${save_CFLAGS} -finline-limit-30000" cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5059: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_inline_limit=yes else @@ -3276,20 +5073,20 @@ if test x"$ac_cv_c_inline_limit" != x"no"; then fi echo $ac_n "checking if \$CC accepts -bundle -undefined error""... $ac_c" 1>&6 -echo "configure:3280: checking if \$CC accepts -bundle -undefined error" >&5 +echo "configure:5077: checking if \$CC accepts -bundle -undefined error" >&5 if eval "test \"`echo '$''{'ac_cv_ld_darwin'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else CFLAGS="${save_CFLAGS} -bundle -undefined error" cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5090: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_ld_darwin=yes else @@ -3307,20 +5104,20 @@ if test x"$ac_cv_ld_darwin" != x"no"; then fi echo $ac_n "checking if \$CC accepts -shared""... $ac_c" 1>&6 -echo "configure:3311: checking if \$CC accepts -shared" >&5 +echo "configure:5108: checking if \$CC accepts -shared" >&5 if eval "test \"`echo '$''{'ac_cv_ld_plugins'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else CFLAGS="${save_CFLAGS} -shared" cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5121: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_ld_plugins=yes else @@ -3339,7 +5136,7 @@ fi if test x"${SOFLAGS}" = x; then echo $ac_n "checking for soname setting""... $ac_c" 1>&6 -echo "configure:3343: checking for soname setting" >&5 +echo "configure:5140: checking for soname setting" >&5 if eval "test \"`echo '$''{'ac_cv_ld_soname'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3348,14 +5145,14 @@ else try_SOFLAGS="-Wl,-soname -Wl," LDFLAGS="${save_LDFLAGS} ${try_SOFLAGS}foo.so.0" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5156: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_ld_soname="${try_SOFLAGS}" else @@ -3367,14 +5164,14 @@ else try_SOFLAGS="-Wl,-h -Wl," LDFLAGS="${save_LDFLAGS} ${try_SOFLAGS}foo.so.0" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5175: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_ld_soname="${try_SOFLAGS}" else @@ -3403,7 +5200,7 @@ have problems using libdvdcss. fi echo $ac_n "checking __attribute__ ((aligned ())) support""... $ac_c" 1>&6 -echo "configure:3407: checking __attribute__ ((aligned ())) support" >&5 +echo "configure:5204: checking __attribute__ ((aligned ())) support" >&5 if eval "test \"`echo '$''{'ac_cv_c_attribute_aligned'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3411,14 +5208,14 @@ else CFLAGS="${save_CFLAGS} -Werror" for ac_cv_c_attr_align_try in 2 4 8 16 32 64; do cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5219: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_attribute_aligned=$ac_cv_c_attr_align_try else @@ -3441,19 +5238,19 @@ CFLAGS="${save_CFLAGS}" LDFLAGS="${save_LDFLAGS}" echo $ac_n "checking for boolean_t in sys/types.h""... $ac_c" 1>&6 -echo "configure:3445: checking for boolean_t in sys/types.h" >&5 +echo "configure:5242: checking for boolean_t in sys/types.h" >&5 if eval "test \"`echo '$''{'ac_cv_c_boolean_t_sys_types_h'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { boolean_t foo; ; return 0; } EOF -if { (eval echo configure:3457: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5254: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_boolean_t_sys_types_h=yes else @@ -3474,19 +5271,19 @@ EOF fi echo $ac_n "checking for boolean_t in pthread.h""... $ac_c" 1>&6 -echo "configure:3478: checking for boolean_t in pthread.h" >&5 +echo "configure:5275: checking for boolean_t in pthread.h" >&5 if eval "test \"`echo '$''{'ac_cv_c_boolean_t_pthread_h'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { boolean_t foo; ; return 0; } EOF -if { (eval echo configure:3490: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5287: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_boolean_t_pthread_h=yes else @@ -3507,19 +5304,19 @@ EOF fi echo $ac_n "checking for boolean_t in cthreads.h""... $ac_c" 1>&6 -echo "configure:3511: checking for boolean_t in cthreads.h" >&5 +echo "configure:5308: checking for boolean_t in cthreads.h" >&5 if eval "test \"`echo '$''{'ac_cv_c_boolean_t_cthreads_h'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { boolean_t foo; ; return 0; } EOF -if { (eval echo configure:3523: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5320: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_boolean_t_cthreads_h=yes else @@ -3540,12 +5337,12 @@ EOF fi echo $ac_n "checking for working const""... $ac_c" 1>&6 -echo "configure:3544: checking for working const" >&5 +echo "configure:5341: checking for working const" >&5 if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5395: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_const=yes else @@ -3614,117 +5411,13 @@ EOF fi -echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:3619: checking for ANSI C header files" >&5 -if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - cat > conftest.$ac_ext < -#include -#include -#include -EOF -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3632: \"$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 "$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* - -if test $ac_cv_header_stdc = yes; then - # SunOS 4.x string.h does not declare mem*, contrary to ANSI. -cat > conftest.$ac_ext < -EOF -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* - -fi - -if test $ac_cv_header_stdc = yes; then - # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. -cat > conftest.$ac_ext < -EOF -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* - -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 - : -else - cat > conftest.$ac_ext < -#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); } - -EOF -if { (eval echo configure:3699: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -then - : -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -fr conftest* - ac_cv_header_stdc=no -fi -rm -fr conftest* -fi - -fi -fi - -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 - echo $ac_n "checking for size_t""... $ac_c" 1>&6 -echo "configure:3723: checking for size_t" >&5 +echo "configure:5416: checking for size_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -3752,12 +5445,12 @@ EOF fi echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6 -echo "configure:3756: checking whether time.h and sys/time.h may both be included" >&5 +echo "configure:5449: checking whether time.h and sys/time.h may both be included" >&5 if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -3766,7 +5459,7 @@ int main() { struct tm *tp; ; return 0; } EOF -if { (eval echo configure:3770: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5463: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_header_time=yes else @@ -3801,19 +5494,19 @@ SSE_MODULES="imdctsse downmixsse" ALTIVEC_MODULES="idctaltivec motionaltivec" echo $ac_n "checking if \$CC groks MMX inline assembly""... $ac_c" 1>&6 -echo "configure:3805: checking if \$CC groks MMX inline assembly" >&5 +echo "configure:5498: checking if \$CC groks MMX inline assembly" >&5 if eval "test \"`echo '$''{'ac_cv_mmx_inline'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5510: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_mmx_inline=yes else @@ -3831,19 +5524,19 @@ if test x"$ac_cv_mmx_inline" != x"no"; then fi echo $ac_n "checking if \$CC groks MMX EXT inline assembly""... $ac_c" 1>&6 -echo "configure:3835: checking if \$CC groks MMX EXT inline assembly" >&5 +echo "configure:5528: checking if \$CC groks MMX EXT inline assembly" >&5 if eval "test \"`echo '$''{'ac_cv_mmxext_inline'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5540: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_mmxext_inline=yes else @@ -3861,19 +5554,19 @@ if test x"$ac_cv_mmxext_inline" != x"no"; then fi echo $ac_n "checking if \$CC groks 3D Now! inline assembly""... $ac_c" 1>&6 -echo "configure:3865: checking if \$CC groks 3D Now! inline assembly" >&5 +echo "configure:5558: checking if \$CC groks 3D Now! inline assembly" >&5 if eval "test \"`echo '$''{'ac_cv_3dnow_inline'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5570: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_3dnow_inline=yes else @@ -3895,19 +5588,19 @@ EOF fi echo $ac_n "checking if \$CC groks SSE inline assembly""... $ac_c" 1>&6 -echo "configure:3899: checking if \$CC groks SSE inline assembly" >&5 +echo "configure:5592: checking if \$CC groks SSE inline assembly" >&5 if eval "test \"`echo '$''{'ac_cv_sse_inline'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5604: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_sse_inline=yes else @@ -3929,19 +5622,19 @@ EOF fi echo $ac_n "checking if \$CC groks Altivec inline assembly""... $ac_c" 1>&6 -echo "configure:3933: checking if \$CC groks Altivec inline assembly" >&5 +echo "configure:5626: checking if \$CC groks Altivec inline assembly" >&5 if eval "test \"`echo '$''{'ac_cv_altivec_inline'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5638: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_altivec_inline=yes else @@ -3951,14 +5644,14 @@ else save_CFLAGS=$CFLAGS CFLAGS="$CFLAGS -Wa,-m7400" cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5655: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_altivec_inline="-Wa,-m7400" else @@ -3987,7 +5680,7 @@ EOF fi echo $ac_n "checking if \$CC groks Altivec C extensions""... $ac_c" 1>&6 -echo "configure:3991: checking if \$CC groks Altivec C extensions" >&5 +echo "configure:5684: checking if \$CC groks Altivec C extensions" >&5 if eval "test \"`echo '$''{'ac_cv_c_altivec'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3995,14 +5688,14 @@ else CFLAGS="$CFLAGS -faltivec" # Darwin test cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5699: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_altivec=-faltivec else @@ -4013,14 +5706,14 @@ else # Linux/PPC test CFLAGS="$save_CFLAGS $CFLAGS_ALTIVEC -fvec" cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5717: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_altivec="-fvec" else @@ -4048,21 +5741,21 @@ EOF fi echo $ac_n "checking if linker needs -framework vecLib""... $ac_c" 1>&6 -echo "configure:4052: checking if linker needs -framework vecLib" >&5 +echo "configure:5745: checking if linker needs -framework vecLib" >&5 if eval "test \"`echo '$''{'ac_cv_ld_altivec'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else save_LDFLAGS=$LDFLAGS LDFLAGS="$LDFLAGS -framework vecLib" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5759: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_ld_altivec=yes else @@ -4108,7 +5801,7 @@ if test $SYS = mingw32; then # Extract the first word of "${ac_tool_prefix}windres", so it can be a program name with args. set dummy ${ac_tool_prefix}windres; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4112: checking for $ac_word" >&5 +echo "configure:5805: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_WINDRES'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4140,7 +5833,7 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "windres", so it can be a program name with args. set dummy windres; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4144: checking for $ac_word" >&5 +echo "configure:5837: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_WINDRES'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4183,17 +5876,17 @@ for ac_hdr in winioctl.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:4187: checking for $ac_hdr" >&5 +echo "configure:5880: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4197: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5890: \"$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* @@ -4226,17 +5919,17 @@ for ac_hdr in sys/ioctl.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:4230: checking for $ac_hdr" >&5 +echo "configure:5923: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4240: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5933: \"$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* @@ -4262,17 +5955,17 @@ EOF do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:4266: checking for $ac_hdr" >&5 +echo "configure:5959: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4276: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5969: \"$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* @@ -4302,7 +5995,7 @@ done LINUX_DVD_STRUCT=0 OPENBSD_DVD_STRUCT=0 cat > conftest.$ac_ext < EOF @@ -4315,7 +6008,7 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | EOF cat > conftest.$ac_ext < EOF @@ -4335,7 +6028,7 @@ fi rm -f conftest* cat > conftest.$ac_ext < EOF @@ -4348,7 +6041,7 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | EOF cat > conftest.$ac_ext < EOF @@ -4368,7 +6061,7 @@ fi rm -f conftest* cat > conftest.$ac_ext < EOF @@ -4387,7 +6080,7 @@ rm -f conftest* NEED_BSDI_LIBDVD=0 cat > conftest.$ac_ext < EOF @@ -4409,17 +6102,17 @@ else do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:4413: checking for $ac_hdr" >&5 +echo "configure:6106: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4423: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:6116: \"$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* @@ -4459,17 +6152,17 @@ rm -f conftest* ac_safe=`echo "sys/scsi/scsi_types.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for sys/scsi/scsi_types.h""... $ac_c" 1>&6 -echo "configure:4463: checking for sys/scsi/scsi_types.h" >&5 +echo "configure:6156: checking for sys/scsi/scsi_types.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4473: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:6166: \"$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* @@ -4488,17 +6181,17 @@ if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then ac_safe=`echo "sys/scsi/impl/uscsi.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for sys/scsi/impl/uscsi.h""... $ac_c" 1>&6 -echo "configure:4492: checking for sys/scsi/impl/uscsi.h" >&5 +echo "configure:6185: checking for sys/scsi/impl/uscsi.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4502: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:6195: \"$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* @@ -4666,7 +6359,7 @@ if test "${enable_pth+set}" = set; then enableval="$enable_pth" if test x$enableval = xyes; then echo $ac_n "checking for pth_init in -lpth""... $ac_c" 1>&6 -echo "configure:4670: checking for pth_init in -lpth" >&5 +echo "configure:6363: checking for pth_init in -lpth" >&5 ac_lib_var=`echo pth'_'pth_init | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4674,7 +6367,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lpth $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6382: \"$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 @@ -4713,7 +6406,7 @@ else fi cat > conftest.$ac_ext < EOF @@ -4834,7 +6527,7 @@ fi if test x$enable_vcd != xno then cat > conftest.$ac_ext < EOF @@ -4908,17 +6601,17 @@ if test "${with_mad+set}" = set; then do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:4912: checking for $ac_hdr" >&5 +echo "configure:6605: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4922: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:6615: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -4948,7 +6641,7 @@ fi done echo $ac_n "checking for mad_bit_init in -lmad""... $ac_c" 1>&6 -echo "configure:4952: checking for mad_bit_init in -lmad" >&5 +echo "configure:6645: checking for mad_bit_init in -lmad" >&5 ac_lib_var=`echo mad'_'mad_bit_init | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4956,7 +6649,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lmad $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6664: \"$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 @@ -5036,7 +6729,7 @@ if test "${enable_esd+set}" = set; then # Extract the first word of "esd-config", so it can be a program name with args. set dummy esd-config; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:5040: checking for $ac_word" >&5 +echo "configure:6733: 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 @@ -5087,7 +6780,7 @@ if test "${enable_arts+set}" = set; then # Extract the first word of "artsc-config", so it can be a program name with args. set dummy artsc-config; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:5091: checking for $ac_word" >&5 +echo "configure:6784: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_ARTS_CONFIG'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -5144,17 +6837,17 @@ else do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:5148: checking for $ac_hdr" >&5 +echo "configure:6841: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5158: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:6851: \"$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* @@ -5198,17 +6891,17 @@ fi do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:5202: checking for $ac_hdr" >&5 +echo "configure:6895: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5212: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:6905: \"$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* @@ -5286,7 +6979,7 @@ fi # Extract the first word of "sdl12-config", so it can be a program name with args. set dummy sdl12-config; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:5290: checking for $ac_word" >&5 +echo "configure:6983: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_SDL12_CONFIG'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -5326,7 +7019,7 @@ fi # Extract the first word of "sdl11-config", so it can be a program name with args. set dummy sdl11-config; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:5330: checking for $ac_word" >&5 +echo "configure:7023: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_SDL11_CONFIG'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -5367,7 +7060,7 @@ fi # Extract the first word of "sdl-config", so it can be a program name with args. set dummy sdl-config; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:5371: checking for $ac_word" >&5 +echo "configure:7064: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_SDL_CONFIG'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -5413,17 +7106,17 @@ fi do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:5417: checking for $ac_hdr" >&5 +echo "configure:7110: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5427: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7120: \"$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* @@ -5493,17 +7186,17 @@ fi do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:5497: checking for $ac_hdr" >&5 +echo "configure:7190: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5507: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7200: \"$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* @@ -5532,7 +7225,7 @@ done else echo $ac_n "checking for directX headers in ${withval}""... $ac_c" 1>&6 -echo "configure:5536: checking for directX headers in ${withval}" >&5 +echo "configure:7229: checking for directX headers in ${withval}" >&5 if test -f ${withval}/include/directx.h then PLUGINS="${PLUGINS} directx" @@ -5615,7 +7308,7 @@ if test "${enable_gnome+set}" = set; then # Extract the first word of "gnome-config", so it can be a program name with args. set dummy gnome-config; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:5619: checking for $ac_word" >&5 +echo "configure:7312: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_GNOME_CONFIG'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -5660,17 +7353,17 @@ fi do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:5664: checking for $ac_hdr" >&5 +echo "configure:7357: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5674: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7367: \"$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* @@ -5730,7 +7423,7 @@ fi # Extract the first word of "gtk-config", so it can be a program name with args. set dummy gtk-config; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:5734: checking for $ac_word" >&5 +echo "configure:7427: 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 @@ -5776,17 +7469,17 @@ fi do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:5780: checking for $ac_hdr" >&5 +echo "configure:7473: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5790: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7483: \"$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* @@ -5842,17 +7535,17 @@ if test x$enable_x11 != xno && do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:5846: checking for $ac_hdr" >&5 +echo "configure:7539: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5856: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7549: \"$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* @@ -5905,17 +7598,17 @@ if test x$enable_xvideo != xno && do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:5909: checking for $ac_hdr" >&5 +echo "configure:7602: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5919: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7612: \"$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* @@ -5955,17 +7648,17 @@ if test "${enable_alsa+set}" = set; then then ac_safe=`echo "alsa/asoundlib.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for alsa/asoundlib.h""... $ac_c" 1>&6 -echo "configure:5959: checking for alsa/asoundlib.h" >&5 +echo "configure:7652: checking for alsa/asoundlib.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5969: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7662: \"$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* @@ -5982,7 +7675,7 @@ fi if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then echo "$ac_t""yes" 1>&6 echo $ac_n "checking for main in -lasound""... $ac_c" 1>&6 -echo "configure:5986: checking for main in -lasound" >&5 +echo "configure:7679: 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 @@ -5990,14 +7683,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lasound $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7694: \"$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 @@ -6113,6 +7806,8 @@ fi + + @@ -6217,7 +7912,7 @@ 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 +trap 'rm -fr `echo "Makefile.opts include/config.h po/Makefile.in include/defs.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15 EOF cat >> $CONFIG_STATUS <> $CONFIG_STATUS <> $CONFIG_STATUS <<\EOF for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then @@ -6555,8 +8274,38 @@ fi; done EOF cat >> $CONFIG_STATUS <> $CONFIG_STATUS <<\EOF +for ac_file in $CONFIG_FILES; do + # Support "outfile[:infile[:infile...]]" + case "$ac_file" in + *:*) ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;; + esac + # PO directories have a Makefile.in generated from Makefile.in.in. + case "$ac_file" in */Makefile.in) + # Adjust a relative srcdir. + ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'` + ac_dir_suffix="/`echo "$ac_dir"|sed 's%^\./%%'`" + ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'` + # In autoconf-2.13 it is called $ac_given_srcdir. + # In autoconf-2.50 it is called $srcdir. + test -n "$ac_given_srcdir" || ac_given_srcdir="$srcdir" + case "$ac_given_srcdir" in + .) top_srcdir=`echo $ac_dots|sed 's%/$%%'` ;; + /*) top_srcdir="$ac_given_srcdir" ;; + *) top_srcdir="$ac_dots$ac_given_srcdir" ;; + esac + if test -f "$ac_given_srcdir/$ac_dir/POTFILES.in"; then + rm -f "$ac_dir/POTFILES" + test -n "$as_me" && echo "$as_me: creating $ac_dir/POTFILES" || echo "creating $ac_dir/POTFILES" + sed -e "/^#/d" -e "/^[ ]*\$/d" -e "s,.*, $top_srcdir/& \\\\," -e "\$s/\(.*\) \\\\/\1/" < "$ac_given_srcdir/$ac_dir/POTFILES.in" > "$ac_dir/POTFILES" + test -n "$as_me" && echo "$as_me: creating $ac_dir/Makefile" || echo "creating $ac_dir/Makefile" + sed -e "/POTFILES =/r $ac_dir/POTFILES" "$ac_dir/Makefile.in" > "$ac_dir/Makefile" + fi + ;; + esac + done exit 0 EOF @@ -6564,6 +8313,7 @@ chmod +x $CONFIG_STATUS rm -fr confdefs* $ac_clean_files test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1 +#AC_OUTPUT([Makefile.opts include/config.h intl/Makefile po/Makefile.in]) echo " global configuration diff --git a/configure.in b/configure.in index 99d696dd8e..3d608a69ba 100644 --- a/configure.in +++ b/configure.in @@ -33,6 +33,14 @@ AC_PROG_CC AC_PROG_CPP AC_CHECK_TOOL(RANLIB, ranlib, :) +dnl Gettext stuff +PACKAGE="vlc" +VERSION="$VLC_VERSION" +AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE") +AC_DEFINE_UNQUOTED(VERSION, "$VERSION") +AM_GNU_GETTEXT +ALL_LINGUAS="de" + dnl AM_PROG_LIBTOOL AC_PROG_INSTALL @@ -1234,6 +1242,8 @@ AC_SUBST(RELEASE) AC_SUBST(NEED_GETOPT) AC_SUBST(MOC) AC_SUBST(WINDRES) +AC_SUBST(PACKAGE) +AC_SUBST(VERSION) AC_SUBST(LCFLAGS) AC_SUBST(PLCFLAGS) @@ -1286,7 +1296,8 @@ AC_SUBST(OBJ_LIBDVDCSS) AC_SUBST(NEED_LIBDVDCSS) -AC_OUTPUT([Makefile.opts include/config.h]) +AC_OUTPUT([Makefile.opts include/config.h po/Makefile.in]) +#AC_OUTPUT([Makefile.opts include/config.h intl/Makefile po/Makefile.in]) echo " global configuration diff --git a/include/bytes_swap.h b/include/bytes_swap.h deleted file mode 100644 index e650b5b672..0000000000 --- a/include/bytes_swap.h +++ /dev/null @@ -1,110 +0,0 @@ -/***************************************************************************** - * bytes_swap.h: fast routines to swap bytes order. - ***************************************************************************** - * Copyright (C) 1998, 1999, 2000 VideoLAN - * $Id: bytes_swap.h,v 1.1 2001/11/25 22:52:21 gbazin Exp $ - * - * Authors: This code was borrowed from the GNU C Library. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. - *****************************************************************************/ - -/* Swap bytes in 16 bit value. */ -#define __bswap_constant_16(x) \ - ((((x) >> 8) & 0xff) | (((x) & 0xff) << 8)) - -#if defined __GNUC__ && __GNUC__ >= 2 -# define __bswap_16(x) \ - (__extension__ \ - ({ register unsigned short int __v; \ - if (__builtin_constant_p (x)) \ - __v = __bswap_constant_16 (x); \ - else \ - __asm__ __volatile__ ("rorw $8, %w0" \ - : "=r" (__v) \ - : "0" ((unsigned short int) (x)) \ - : "cc"); \ - __v; })) -#else -/* This is better than nothing. */ -# define __bswap_16(x) __bswap_constant_16 (x) -#endif - - -/* Swap bytes in 32 bit value. */ -#define __bswap_constant_32(x) \ - ((((x) & 0xff000000) >> 24) | (((x) & 0x00ff0000) >> 8) | \ - (((x) & 0x0000ff00) << 8) | (((x) & 0x000000ff) << 24)) - -#if defined __GNUC__ && __GNUC__ >= 2 -/* To swap the bytes in a word the i486 processors and up provide the - `bswap' opcode. On i386 we have to use three instructions. */ -# if !defined __i486__ && !defined __pentium__ && !defined __pentiumpro__ -# define __bswap_32(x) \ - (__extension__ \ - ({ register unsigned int __v; \ - if (__builtin_constant_p (x)) \ - __v = __bswap_constant_32 (x); \ - else \ - __asm__ __volatile__ ("rorw $8, %w0;" \ - "rorl $16, %0;" \ - "rorw $8, %w0" \ - : "=r" (__v) \ - : "0" ((unsigned int) (x)) \ - : "cc"); \ - __v; })) -# else -# define __bswap_32(x) \ - (__extension__ \ - ({ register unsigned int __v; \ - if (__builtin_constant_p (x)) \ - __v = __bswap_constant_32 (x); \ - else \ - __asm__ __volatile__ ("bswap %0" \ - : "=r" (__v) \ - : "0" ((unsigned int) (x))); \ - __v; })) -# endif -#else -# define __bswap_32(x) __bswap_constant_32 (x) -#endif - - -#if defined __GNUC__ && __GNUC__ >= 2 -/* Swap bytes in 64 bit value. */ -#define __bswap_constant_64(x) \ - ((((x) & 0xff00000000000000ull) >> 56) \ - | (((x) & 0x00ff000000000000ull) >> 40) \ - | (((x) & 0x0000ff0000000000ull) >> 24) \ - | (((x) & 0x000000ff00000000ull) >> 8) \ - | (((x) & 0x00000000ff000000ull) << 8) \ - | (((x) & 0x0000000000ff0000ull) << 24) \ - | (((x) & 0x000000000000ff00ull) << 40) \ - | (((x) & 0x00000000000000ffull) << 56)) - -# define __bswap_64(x) \ - (__extension__ \ - ({ union { __extension__ unsigned long long int __ll; \ - unsigned long int __l[2]; } __w, __r; \ - if (__builtin_constant_p (x)) \ - __r.__ll = __bswap_constant_64 (x); \ - else \ - { \ - __w.__ll = (x); \ - __r.__l[0] = __bswap_32 (__w.__l[1]); \ - __r.__l[1] = __bswap_32 (__w.__l[0]); \ - } \ - __r.__ll; })) -#endif diff --git a/include/common.h b/include/common.h index 7c3aff21f5..0b2ce1c742 100644 --- a/include/common.h +++ b/include/common.h @@ -3,10 +3,11 @@ * Collection of useful common types and macros definitions ***************************************************************************** * Copyright (C) 1998, 1999, 2000 VideoLAN - * $Id: common.h,v 1.54 2001/12/09 17:01:35 sam Exp $ + * $Id: common.h,v 1.55 2001/12/10 04:53:10 sam Exp $ * * Authors: Samuel Hocevar * Vincent Seguin + * Gildas Bazin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -24,9 +25,13 @@ *****************************************************************************/ /***************************************************************************** - * Required headers + * Required system headers *****************************************************************************/ +#include /* strerror() */ +/***************************************************************************** + * Required vlc headers + *****************************************************************************/ #include "config.h" #include "int_types.h" @@ -76,10 +81,10 @@ typedef u8 yuv_data_t; ***************************************************************************** * Store an high precision date or time interval. The maximum precision is the * micro-second, and a 64 bits integer is used to avoid any overflow (maximum - * time interval is then 292271 years, which should be length enough for any + * time interval is then 292271 years, which should be long enough for any * video). Date are stored as a time interval since a common date. - * Note that date and time intervals can be manipulated using regular arithmetic - * operators, and that no special functions are required. + * Note that date and time intervals can be manipulated using regular + * arithmetic operators, and that no special functions are required. *****************************************************************************/ typedef s64 mtime_t; @@ -172,11 +177,98 @@ struct decoder_fifo_s; *****************************************************************************/ #ifdef NTOHL_IN_SYS_PARAM_H # include + #elif defined(WIN32) -# include "bytes_swap.h" -#else +/* Swap bytes in 16 bit value. */ +# define __bswap_constant_16(x) \ + ((((x) >> 8) & 0xff) | (((x) & 0xff) << 8)) + +# if defined __GNUC__ && __GNUC__ >= 2 +# define __bswap_16(x) \ + (__extension__ \ + ({ register unsigned short int __v; \ + if (__builtin_constant_p (x)) \ + __v = __bswap_constant_16 (x); \ + else \ + __asm__ __volatile__ ("rorw $8, %w0" \ + : "=r" (__v) \ + : "0" ((unsigned short int) (x)) \ + : "cc"); \ + __v; })) +# else +/* This is better than nothing. */ +# define __bswap_16(x) __bswap_constant_16 (x) +# endif + +/* Swap bytes in 32 bit value. */ +# define __bswap_constant_32(x) \ + ((((x) & 0xff000000) >> 24) | (((x) & 0x00ff0000) >> 8) | \ + (((x) & 0x0000ff00) << 8) | (((x) & 0x000000ff) << 24)) + +# if defined __GNUC__ && __GNUC__ >= 2 +/* To swap the bytes in a word the i486 processors and up provide the + `bswap' opcode. On i386 we have to use three instructions. */ +# if !defined __i486__ && !defined __pentium__ && !defined __pentiumpro__ +# define __bswap_32(x) \ + (__extension__ \ + ({ register unsigned int __v; \ + if (__builtin_constant_p (x)) \ + __v = __bswap_constant_32 (x); \ + else \ + __asm__ __volatile__ ("rorw $8, %w0;" \ + "rorl $16, %0;" \ + "rorw $8, %w0" \ + : "=r" (__v) \ + : "0" ((unsigned int) (x)) \ + : "cc"); \ + __v; })) +# else +# define __bswap_32(x) \ + (__extension__ \ + ({ register unsigned int __v; \ + if (__builtin_constant_p (x)) \ + __v = __bswap_constant_32 (x); \ + else \ + __asm__ __volatile__ ("bswap %0" \ + : "=r" (__v) \ + : "0" ((unsigned int) (x))); \ + __v; })) +# endif +# else +# define __bswap_32(x) __bswap_constant_32 (x) +# endif + +# if defined __GNUC__ && __GNUC__ >= 2 +/* Swap bytes in 64 bit value. */ +# define __bswap_constant_64(x) \ + ((((x) & 0xff00000000000000ull) >> 56) \ + | (((x) & 0x00ff000000000000ull) >> 40) \ + | (((x) & 0x0000ff0000000000ull) >> 24) \ + | (((x) & 0x000000ff00000000ull) >> 8) \ + | (((x) & 0x00000000ff000000ull) << 8) \ + | (((x) & 0x0000000000ff0000ull) << 24) \ + | (((x) & 0x000000000000ff00ull) << 40) \ + | (((x) & 0x00000000000000ffull) << 56)) + +# define __bswap_64(x) \ + (__extension__ \ + ({ union { __extension__ unsigned long long int __ll; \ + unsigned long int __l[2]; } __w, __r; \ + if (__builtin_constant_p (x)) \ + __r.__ll = __bswap_constant_64 (x); \ + else \ + { \ + __w.__ll = (x); \ + __r.__l[0] = __bswap_32 (__w.__l[1]); \ + __r.__l[1] = __bswap_32 (__w.__l[0]); \ + } \ + __r.__ll; })) +# endif + +#else /* NTOHL_IN_SYS_PARAM_H || WIN32 */ # include -#endif + +#endif /* NTOHL_IN_SYS_PARAM_H || WIN32 */ /* CEIL: division with round to nearest greater integer */ #define CEIL(n, d) ( ((n) / (d)) + ( ((n) % (d)) ? 1 : 0) ) @@ -242,12 +334,89 @@ struct decoder_fifo_s; # endif #endif - #define I64C(x) x##LL -/* The win32 specific stuff was getting really big so it has been moved */ + #if defined( WIN32 ) -# include "common_win32.h" +/* The ntoh* and hton* bytes swapping functions are provided by winsock + * but for conveniency and speed reasons it is better to implement them + * ourselves. ( several plugins use them and it is too much hassle to link + * winsock with each of them ;-) + */ +# undef ntoh32(x) +# undef ntoh16(x) +# undef ntoh64(x) +# undef hton32(x) +# undef hton16(x) +# undef hton64(x) + +# ifdef WORDS_BIGENDIAN +# define ntoh32(x) (x) +# define ntoh16(x) (x) +# define ntoh64(x) (x) +# define hton32(x) (x) +# define hton16(x) (x) +# define hton64(x) (x) +# else +# define ntoh32(x) __bswap_32 (x) +# define ntoh16(x) __bswap_16 (x) +# define ntoh64(x) __bswap_32 (x) +# define hton32(x) __bswap_32 (x) +# define hton16(x) __bswap_16 (x) +# define hton64(x) __bswap_32 (x) +# endif + +/* win32, cl and icl support */ +# if defined( _MSC_VER ) +# define __attribute__(x) +# define __inline__ __inline +# define strncasecmp strnicmp +# define strcasecmp stricmp +# define S_ISBLK(m) (0) +# define S_ISCHR(m) (0) +# define S_ISFIFO(m) (((m)&_S_IFMT) == _S_IFIFO) +# define S_ISREG(m) (((m)&_S_IFMT) == _S_IFREG) +# undef I64C(x) +# define I64C(x) x##i64 +# endif + +/* several type definitions */ +# if defined( __MINGW32__ ) +# if !defined( _OFF_T_ ) +typedef long long _off_t; +typedef _off_t off_t; +# define _OFF_T_ +# else +# define off_t long long +# endif +# endif + +# if defined( _MSC_VER ) +# if !defined( _OFF_T_DEFINED ) +typedef __int64 off_t; +# define _OFF_T_DEFINED +# else +# define off_t __int64 +# endif +# define stat _stati64 +# endif + +# ifndef snprintf +# define snprintf _snprintf /* snprintf not defined in mingw32 (bug?) */ +# endif + +#endif + +/***************************************************************************** + * I18n stuff + *****************************************************************************/ +#ifdef ENABLE_NLS +# include +#else +# define _(String) (String) +# define N_(String) (String) +# define textdomain(Domain) +# define bindtextdomain(Package, Directory) #endif /***************************************************************************** @@ -295,6 +464,8 @@ typedef struct module_symbols_s int ( * network_ChannelCreate )( void ); int ( * network_ChannelJoin ) ( int ); + int ( * input_SetProgram ) ( struct input_thread_s *, + struct pgrm_descriptor_s * ); void ( * input_SetStatus ) ( struct input_thread_s *, int ); void ( * input_Seek ) ( struct input_thread_s *, off_t ); void ( * input_DumpStream ) ( struct input_thread_s * ); @@ -406,8 +577,7 @@ extern module_symbols_t* p_symbols; #endif /***************************************************************************** - * Global headers + * Required vlc headers *****************************************************************************/ - #include "main.h" diff --git a/include/common_win32.h b/include/common_win32.h deleted file mode 100644 index 04d567da2e..0000000000 --- a/include/common_win32.h +++ /dev/null @@ -1,90 +0,0 @@ -/***************************************************************************** - * common_win32.h: common definitions specific to Win32 - * Collection of useful common types and macros definitions - ***************************************************************************** - * Copyright (C) 1998, 1999, 2000 VideoLAN - * $Id: common_win32.h,v 1.1 2001/11/25 22:52:21 gbazin Exp $ - * - * Authors: Gildas Bazin - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. - *****************************************************************************/ - -/* The ntoh* and hton* bytes swapping functions are provided by winsock - * but for conveniency and speed reasons it is better to implement them - * ourselves. ( several plugins use them and it is too much assle to link - * winsock with each of them ;-) - */ -#undef ntoh32(x) -#undef ntoh16(x) -#undef ntoh64(x) -#undef hton32(x) -#undef hton16(x) -#undef hton64(x) - -#ifdef WORDS_BIGENDIAN -# define ntoh32(x) (x) -# define ntoh16(x) (x) -# define ntoh64(x) (x) -# define hton32(x) (x) -# define hton16(x) (x) -# define hton64(x) (x) -#else -# define ntoh32(x) __bswap_32 (x) -# define ntoh16(x) __bswap_16 (x) -# define ntoh64(x) __bswap_32 (x) -# define hton32(x) __bswap_32 (x) -# define hton16(x) __bswap_16 (x) -# define hton64(x) __bswap_32 (x) -#endif - -/* win32, cl and icl support */ -#if defined( _MSC_VER ) -# define __attribute__(x) -# define __inline__ __inline -# define strncasecmp strnicmp -# define strcasecmp stricmp -# define S_ISBLK(m) (0) -# define S_ISCHR(m) (0) -# define S_ISFIFO(m) (((m)&_S_IFMT) == _S_IFIFO) -# define S_ISREG(m) (((m)&_S_IFMT) == _S_IFREG) -# undef I64C(x) -# define I64C(x) x##i64 -#endif - -/* several type definitions */ -#if defined( __MINGW32__ ) -# if !defined( _OFF_T_ ) -typedef long long _off_t; -typedef _off_t off_t; -# define _OFF_T_ -# else -# define off_t long long -# endif -#endif - -#if defined( _MSC_VER ) -# if !defined( _OFF_T_DEFINED ) -typedef __int64 off_t; -# define _OFF_T_DEFINED -# else -# define off_t __int64 -# endif -# define stat _stati64 -#endif - -#ifndef snprintf -# define snprintf _snprintf /* snprintf not defined in mingw32 (bug?) */ -#endif diff --git a/include/config.h.in b/include/config.h.in index 3e78b4aff6..38e0c5ce5d 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -51,7 +51,7 @@ #define COPYRIGHT_MESSAGE "VideoLAN Client - version @VLC_VERSION@" \ " @VLC_CODENAME@ - (C)1996-2001 VideoLAN" -#define VERSION "@VLC_VERSION@" +#define VLC_VERSION "@VLC_VERSION@" /***************************************************************************** * Debugging options - define or undefine symbols diff --git a/include/defs.h.in b/include/defs.h.in index c63b407999..21b173d3e3 100644 --- a/include/defs.h.in +++ b/include/defs.h.in @@ -1,17 +1,45 @@ /* include/defs.h.in. Generated automatically from configure.in by autoheader 2.13. */ +/* Define if using alloca.c. */ +#undef C_ALLOCA + /* Define to empty if the keyword does not work. */ #undef const +/* Define to one of _getb67, GETB67, getb67 for Cray-2 and Cray-YMP systems. + This function is required for alloca.c support on those systems. */ +#undef CRAY_STACKSEG_END + +/* Define if you have alloca, as a function or macro. */ +#undef HAVE_ALLOCA + +/* Define if you have and it should be used (not on Ultrix). */ +#undef HAVE_ALLOCA_H + /* Define if you have a working `mmap' system call. */ #undef HAVE_MMAP +/* Define as __inline if that's what the C compiler calls it. */ +#undef inline + +/* Define to `long' if doesn't define. */ +#undef off_t + /* Define as the return type of signal handlers (int or void). */ #undef RETSIGTYPE /* Define to `unsigned' if doesn't define. */ #undef size_t +/* If using the C implementation of alloca, define if you know the + direction of stack growth for your system; otherwise it will be + automatically deduced at run-time. + STACK_DIRECTION > 0 => grows toward higher addresses + STACK_DIRECTION < 0 => grows toward lower addresses + STACK_DIRECTION = 0 => direction of growth unknown + */ +#undef STACK_DIRECTION + /* Define if you have the ANSI C header files. */ #undef STDC_HEADERS @@ -22,15 +50,62 @@ byte first (like Motorola and SPARC, unlike Intel and VAX). */ #undef WORDS_BIGENDIAN +#undef ENABLE_NLS +#undef HAVE_LC_MESSAGES +#undef HAVE_CATGETS +#undef HAVE_GETTEXT +#undef HAVE_STPCPY +#undef PACKAGE +#undef VERSION + +/* Define if you have the __argz_count function. */ +#undef HAVE___ARGZ_COUNT + +/* Define if you have the __argz_next function. */ +#undef HAVE___ARGZ_NEXT + +/* Define if you have the __argz_stringify function. */ +#undef HAVE___ARGZ_STRINGIFY + +/* Define if you have the dcgettext function. */ +#undef HAVE_DCGETTEXT + +/* Define if you have the feof_unlocked function. */ +#undef HAVE_FEOF_UNLOCKED + +/* Define if you have the fgets_unlocked function. */ +#undef HAVE_FGETS_UNLOCKED + +/* Define if you have the getcwd function. */ +#undef HAVE_GETCWD + +/* Define if you have the getegid function. */ +#undef HAVE_GETEGID + +/* Define if you have the geteuid function. */ +#undef HAVE_GETEUID + +/* Define if you have the getgid function. */ +#undef HAVE_GETGID + /* Define if you have the getpagesize function. */ #undef HAVE_GETPAGESIZE /* Define if you have the gettimeofday function. */ #undef HAVE_GETTIMEOFDAY +/* Define if you have the getuid function. */ +#undef HAVE_GETUID + /* Define if you have the memalign function. */ #undef HAVE_MEMALIGN +/* Define if you have the mempcpy function. */ +#undef HAVE_MEMPCPY + +/* Define if you have the munmap function. */ +#undef HAVE_MUNMAP + /* Define if you have the putenv function. */ #undef HAVE_PUTENV @@ -40,9 +115,24 @@ /* Define if you have the setenv function. */ #undef HAVE_SETENV +/* Define if you have the setlocale function. */ +#undef HAVE_SETLOCALE + /* Define if you have the sigrelse function. */ #undef HAVE_SIGRELSE +/* Define if you have the stpcpy function. */ +#undef HAVE_STPCPY + +/* Define if you have the strcasecmp function. */ +#undef HAVE_STRCASECMP + +/* Define if you have the strchr function. */ +#undef HAVE_STRCHR + +/* Define if you have the strdup function. */ +#undef HAVE_STRDUP + /* Define if you have the strerror function. */ #undef HAVE_STRERROR @@ -52,9 +142,15 @@ /* Define if you have the strtol function. */ #undef HAVE_STRTOL +/* Define if you have the strtoul function. */ +#undef HAVE_STRTOUL + /* Define if you have the swab function. */ #undef HAVE_SWAB +/* Define if you have the tsearch function. */ +#undef HAVE_TSEARCH + /* Define if you have the usleep function. */ #undef HAVE_USLEEP @@ -73,9 +169,15 @@ /* Define if you have the header file. */ #undef HAVE_PH_H +/* Define if you have the header file. */ +#undef HAVE_X11_XLIB_H + /* Define if you have the header file. */ #undef HAVE_X11_EXTENSIONS_XV_H +/* Define if you have the header file. */ +#undef HAVE_ARGZ_H + /* Define if you have the header file. */ #undef HAVE_ARPA_INET_H @@ -118,27 +220,48 @@ /* Define if you have the header file. */ #undef HAVE_KERNEL_SCHEDULER_H +/* Define if you have the header file. */ +#undef HAVE_LIMITS_H + /* Define if you have the header file. */ #undef HAVE_LINUX_CDROM_H +/* Define if you have the header file. */ +#undef HAVE_LOCALE_H + /* Define if you have the header file. */ #undef HAVE_MACHINE_PARAM_H /* Define if you have the header file. */ #undef HAVE_MACHINE_SOUNDCARD_H +/* Define if you have the header file. */ +#undef HAVE_MAD_H + +/* Define if you have the header file. */ +#undef HAVE_MALLOC_H + /* Define if you have the header file. */ #undef HAVE_NET_IF_H /* Define if you have the header file. */ #undef HAVE_NETINET_IN_H +/* Define if you have the header file. */ +#undef HAVE_NL_TYPES_H + /* Define if you have the header file. */ #undef HAVE_PTHREAD_H /* Define if you have the header file. */ #undef HAVE_STDDEF_H +/* Define if you have the header file. */ +#undef HAVE_STDLIB_H + +/* Define if you have the header file. */ +#undef HAVE_STRING_H + /* Define if you have the header file. */ #undef HAVE_STRINGS_H @@ -151,6 +274,9 @@ /* Define if you have the header file. */ #undef HAVE_SYS_IOCTL_H +/* Define if you have the header file. */ +#undef HAVE_SYS_PARAM_H + /* Define if you have the header file. */ #undef HAVE_SYS_SOCKET_H @@ -172,12 +298,34 @@ /* Define if you have the header file. */ #undef HAVE_WINIOCTL_H +/* Define if you have the mad library (-lmad). */ +#undef HAVE_LIBMAD + /* Define if you have the pth library (-lpth). */ #undef HAVE_LIBPTH /* css decryption with player keys */ #undef HAVE_CSSKEYS +/* Define if you have the iconv() function. */ +#undef HAVE_ICONV + +/* Define as const if the declaration of iconv() needs const. */ +#undef ICONV_CONST + +/* Define if you have and nl_langinfo(CODESET). */ +#undef HAVE_LANGINFO_CODESET + +/* Define if your file defines LC_MESSAGES. */ +#undef HAVE_LC_MESSAGES + +/* Define to 1 if translation of program messages to the user's native language + is requested. */ +#undef ENABLE_NLS + +/* Define if the GNU gettext() function is already present or preinstalled. */ +#undef HAVE_GETTEXT + /* long getopt support */ #undef HAVE_GETOPT_LONG diff --git a/include/input_ext-dec.h b/include/input_ext-dec.h index d5283416ce..99b0d4be00 100644 --- a/include/input_ext-dec.h +++ b/include/input_ext-dec.h @@ -2,7 +2,7 @@ * input_ext-dec.h: structures exported to the VideoLAN decoders ***************************************************************************** * Copyright (C) 1999, 2000 VideoLAN - * $Id: input_ext-dec.h,v 1.41 2001/12/07 18:33:07 sam Exp $ + * $Id: input_ext-dec.h,v 1.42 2001/12/10 04:53:10 sam Exp $ * * Authors: Christophe Massiot * Michel Kaempf @@ -218,6 +218,10 @@ typedef struct bit_stream_s u32 UnalignedShowBits( struct bit_stream_s *, unsigned int ); void UnalignedRemoveBits( struct bit_stream_s * ); u32 UnalignedGetBits( struct bit_stream_s *, unsigned int ); +#else +# define UnalignedShowBits p_symbols->UnalignedShowBits +# define UnalignedRemoveBits p_symbols->UnalignedRemoveBits +# define UnalignedGetBits p_symbols->UnalignedGetBits #endif /***************************************************************************** diff --git a/include/input_ext-intf.h b/include/input_ext-intf.h index 24692eddbd..5b9cd0ef9d 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.51 2001/12/07 16:47:47 jobi Exp $ + * $Id: input_ext-intf.h,v 1.52 2001/12/10 04:53:10 sam Exp $ * * Authors: Christophe Massiot * @@ -325,7 +325,6 @@ typedef struct input_thread_s /***************************************************************************** * Prototypes *****************************************************************************/ -#ifndef PLUGIN struct input_thread_s * input_CreateThread ( struct playlist_item_s *, int *pi_status ); void input_DestroyThread( struct input_thread_s *, int *pi_status ); @@ -342,4 +341,4 @@ int input_ChangeArea( struct input_thread_s *, struct input_area_s * ); int input_ToggleGrayscale( struct input_thread_s * ); int input_ToggleMute( struct input_thread_s * ); int input_SetSMP( struct input_thread_s *, int ); -#endif + diff --git a/include/input_ext-plugins.h b/include/input_ext-plugins.h index d3abaf98ba..c1049647eb 100644 --- a/include/input_ext-plugins.h +++ b/include/input_ext-plugins.h @@ -3,7 +3,7 @@ * but exported to plug-ins ***************************************************************************** * Copyright (C) 1999, 2000, 2001 VideoLAN - * $Id: input_ext-plugins.h,v 1.7 2001/12/07 16:47:47 jobi Exp $ + * $Id: input_ext-plugins.h,v 1.8 2001/12/10 04:53:10 sam Exp $ * * Authors: Christophe Massiot * @@ -40,18 +40,15 @@ /***************************************************************************** * Prototypes from input_ext-dec.c *****************************************************************************/ -#ifndef PLUGIN void InitBitstream ( struct bit_stream_s *, struct decoder_fifo_s *, void (* pf_bitstream_callback)( struct bit_stream_s *, boolean_t ), void * p_callback_arg ); void NextDataPacket ( struct bit_stream_s * ); -#endif /***************************************************************************** * Prototypes from input_programs.c *****************************************************************************/ -#ifndef PLUGIN int input_InitStream( struct input_thread_s *, size_t ); void input_EndStream ( struct input_thread_s * ); struct pgrm_descriptor_s * input_FindProgram( struct input_thread_s *, u16 ); @@ -68,12 +65,10 @@ struct es_descriptor_s * input_AddES ( struct input_thread_s *, void input_DelES ( struct input_thread_s *, struct es_descriptor_s * ); int input_SelectES ( struct input_thread_s *, struct es_descriptor_s * ); int input_UnselectES( struct input_thread_s *, struct es_descriptor_s * ); -#endif /***************************************************************************** * Prototypes from input_dec.c *****************************************************************************/ -#ifndef PLUGIN //decoder_capabilities_s * input_ProbeDecoder( void ); vlc_thread_t input_RunDecoder( struct input_thread_s *, struct es_descriptor_s * ); @@ -82,12 +77,10 @@ void input_DecodePES ( struct decoder_fifo_s *, struct pes_packet_s * ); void input_EscapeDiscontinuity( struct input_thread_s *, struct pgrm_descriptor_s * ); void input_EscapeAudioDiscontinuity( struct input_thread_s * ); -#endif /***************************************************************************** * Prototypes from input_clock.c *****************************************************************************/ -#ifndef PLUGIN void input_ClockInit( struct pgrm_descriptor_s * ); int input_ClockManageControl( struct input_thread_s *, struct pgrm_descriptor_s *, mtime_t ); @@ -95,7 +88,6 @@ void input_ClockManageRef( struct input_thread_s *, struct pgrm_descriptor_s *, mtime_t ); mtime_t input_ClockGetTS( struct input_thread_s *, struct pgrm_descriptor_s *, mtime_t ); -#endif /***************************************************************************** * Create a NULL packet for padding in case of a data loss @@ -185,7 +177,6 @@ typedef struct netlist_s /***************************************************************************** * Prototypes *****************************************************************************/ -#ifndef PLUGIN int input_NetlistInit( struct input_thread_s *, int i_nb_iovec, int i_nb_data, @@ -204,7 +195,6 @@ void input_NetlistDeletePacket( void *, void input_NetlistDeletePES( void *, struct pes_packet_s * ); void input_NetlistEnd( struct input_thread_s * ); -#endif /* @@ -304,7 +294,6 @@ typedef struct stream_ps_data_s /***************************************************************************** * Prototypes *****************************************************************************/ -#ifndef PLUGIN void input_ParsePES ( struct input_thread_s *, struct es_descriptor_s * ); void input_GatherPES ( struct input_thread_s *, struct data_packet_s *, struct es_descriptor_s *, boolean_t, boolean_t ); @@ -314,4 +303,4 @@ void input_DemuxPS ( struct input_thread_s *, struct data_packet_s * ); void input_DemuxTS ( struct input_thread_s *, struct data_packet_s * ); void input_DemuxPSI ( struct input_thread_s *, struct data_packet_s *, struct es_descriptor_s *, boolean_t, boolean_t ); -#endif + diff --git a/include/keystrokes.h b/include/keystrokes.h deleted file mode 100644 index e2aa9cc7ba..0000000000 --- a/include/keystrokes.h +++ /dev/null @@ -1,18 +0,0 @@ -#ifndef VLC_KEYS -#define VLC_KEYS - -#define INTF_KEY_QUIT 0x01 -#define INTF_KEY_SET_CHANNEL 0x02 -#define INTF_KEY_DEC_VOLUME 0x03 -#define INTF_KEY_INC_VOLUME 0x04 -#define INTF_KEY_TOGGLE_VOLUME 0x05 -#define INTF_KEY_DEC_GAMMA 0x06 -#define INTF_KEY_INC_GAMMA 0x07 -#define INTF_KEY_TOGGLE_GRAYSCALE 0x08 -#define INTF_KEY_TOGGLE_INTERFACE 0x09 -#define INTF_KEY_TOGGLE_INFO 0x0A -#define INTF_KEY_TOGGLE_SCALING 0x0B -#define INTF_KEY_DUMP_STREAM 0x0C -#define INTF_KEY_UNKNOWN 0x0D - -#endif diff --git a/include/main.h b/include/main.h index 80793fc4df..6e3398661f 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.25 2001/12/07 18:33:07 sam Exp $ + * $Id: main.h,v 1.26 2001/12/10 04:53:10 sam Exp $ * * Authors: Vincent Seguin * @@ -65,7 +65,11 @@ typedef struct main_s p_input_channel_t p_channel; /* channel library data */ } main_t; +#ifndef PLUGIN extern main_t *p_main; +#else +# define p_main (p_symbols->p_main) +#endif /***************************************************************************** * Prototypes - these methods are used to get default values for some threads diff --git a/include/modules_export.h b/include/modules_export.h index a515c3d01c..5b0b2935b7 100644 --- a/include/modules_export.h +++ b/include/modules_export.h @@ -47,6 +47,7 @@ (p_symbols)->mdate = mdate; \ (p_symbols)->network_ChannelCreate = network_ChannelCreate; \ (p_symbols)->network_ChannelJoin = network_ChannelJoin; \ + (p_symbols)->input_SetProgram = input_SetProgram; \ (p_symbols)->input_SetStatus = input_SetStatus; \ (p_symbols)->input_Seek = input_Seek; \ (p_symbols)->input_DumpStream = input_DumpStream; \ @@ -107,7 +108,6 @@ (p_symbols)->intf_DbgMsgImm = _intf_DbgMsgImm; #ifdef PLUGIN -# define p_main (p_symbols->p_main) # define p_aout_bank (p_symbols->p_aout_bank) # define p_vout_bank (p_symbols->p_vout_bank) @@ -147,11 +147,12 @@ # define msleep(a) p_symbols->msleep(a) # define mdate() p_symbols->mdate() -# define network_ChannelCreate() p_symbols->network_ChannelCreate() -# define network_ChannelJoin(a) p_symbols->network_ChannelJoin(a) +# define network_ChannelCreate p_symbols->network_ChannelCreate +# define network_ChannelJoin p_symbols->network_ChannelJoin -# define input_SetStatus(a,b) p_symbols->input_SetStatus(a,b) -# define input_Seek(a,b) p_symbols->input_Seek(a,b) +# define input_SetProgram p_symbols->input_SetProgram +# define input_SetStatus p_symbols->input_SetStatus +# define input_Seek p_symbols->input_Seek # define input_DumpStream(a) p_symbols->input_DumpStream(a) # define input_OffsetToTime(a,b,c) p_symbols->input_OffsetToTime(a,b,c) # define input_ChangeES(a,b,c) p_symbols->input_ChangeES(a,b,c) @@ -205,10 +206,6 @@ # define vout_LinkPicture p_symbols->vout_LinkPicture # define vout_UnlinkPicture p_symbols->vout_UnlinkPicture -# define UnalignedShowBits p_symbols->UnalignedShowBits -# define UnalignedRemoveBits p_symbols->UnalignedRemoveBits -# define UnalignedGetBits p_symbols->UnalignedGetBits - # define DecodeLanguage p_symbols->DecodeLanguage # define module_Need p_symbols->module_Need diff --git a/include/modules_inner.h b/include/modules_inner.h index 6e0fb72831..c87f375417 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.7 2001/05/30 17:03:11 sam Exp $ + * $Id: modules_inner.h,v 1.8 2001/12/10 04:53:10 sam Exp $ * * Authors: Samuel Hocevar * @@ -63,7 +63,7 @@ int CONCATENATE( MODULE_NAME, InitModule ) ( module_t *p_module ) \ { \ p_module->psz_name = MODULE_STRING; \ - p_module->psz_version = VERSION; + p_module->psz_version = VLC_VERSION; # define MODULE_INIT_STOP \ return( 0 ); \ @@ -101,7 +101,7 @@ int InitModule ( module_t *p_module ) \ { \ p_module->psz_name = MODULE_STRING; \ - p_module->psz_version = VERSION; + p_module->psz_version = VLC_VERSION; # define MODULE_INIT_STOP \ return( 0 ); \ diff --git a/mkinstalldirs b/mkinstalldirs new file mode 100755 index 0000000000..116fee3fb8 --- /dev/null +++ b/mkinstalldirs @@ -0,0 +1,40 @@ +#! /bin/sh +# mkinstalldirs --- make directory hierarchy +# Author: Noah Friedman +# Created: 1993-05-16 +# Public domain + +# $Id: mkinstalldirs,v 1.1 2001/12/10 04:53:10 sam Exp $ + +errstatus=0 + +for file +do + set fnord `echo ":$file" | sed -ne 's/^:\//#/;s/^://;s/\// /g;s/^#/\//;p'` + shift + + pathcomp= + for d + do + pathcomp="$pathcomp$d" + case "$pathcomp" in + -* ) pathcomp=./$pathcomp ;; + esac + + if test ! -d "$pathcomp"; then + echo "mkdir $pathcomp" + + mkdir "$pathcomp" || lasterr=$? + + if test ! -d "$pathcomp"; then + errstatus=$lasterr + fi + fi + + pathcomp="$pathcomp/" + done +done + +exit $errstatus + +# mkinstalldirs ends here diff --git a/plugins/ac3_adec/Makefile b/plugins/ac3_adec/Makefile index e723ce3cc8..8af3132986 100644 --- a/plugins/ac3_adec/Makefile +++ b/plugins/ac3_adec/Makefile @@ -21,7 +21,7 @@ include ../../Makefile.modules # ../ac3_adec.so: $(PLUGIN_C) - $(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS) + $(CC) -o $@ $^ $(PLCFLAGS) ../ac3_adec.a: $(BUILTIN_C) ar r $@ $^ diff --git a/plugins/ac3_adec/ac3_adec.c b/plugins/ac3_adec/ac3_adec.c index 50211fde6a..0346b21098 100644 --- a/plugins/ac3_adec/ac3_adec.c +++ b/plugins/ac3_adec/ac3_adec.c @@ -2,7 +2,7 @@ * ac3_adec.c: ac3 decoder module main file ***************************************************************************** * Copyright (C) 1999-2001 VideoLAN - * $Id: ac3_adec.c,v 1.6 2001/12/09 17:01:36 sam Exp $ + * $Id: ac3_adec.c,v 1.7 2001/12/10 04:53:10 sam Exp $ * * Authors: Michel Lespinasse * @@ -43,13 +43,13 @@ #include "audio_output.h" -#include "modules.h" -#include "modules_export.h" - #include "stream_control.h" #include "input_ext-dec.h" #include "input_ext-intf.h" /* MPEG?_AUDIO_ES */ +#include "modules.h" +#include "modules_export.h" + #include "ac3_imdct.h" #include "ac3_downmix.h" #include "ac3_decoder.h" diff --git a/plugins/ac3_adec/ac3_bit_allocate.c b/plugins/ac3_adec/ac3_bit_allocate.c index 419a32c8d5..1a27190f6e 100644 --- a/plugins/ac3_adec/ac3_bit_allocate.c +++ b/plugins/ac3_adec/ac3_bit_allocate.c @@ -2,7 +2,7 @@ * ac3_bit_allocate.c: ac3 allocation tables ***************************************************************************** * Copyright (C) 2000-2001 VideoLAN - * $Id: ac3_bit_allocate.c,v 1.4 2001/12/09 17:01:36 sam Exp $ + * $Id: ac3_bit_allocate.c,v 1.5 2001/12/10 04:53:10 sam Exp $ * * Authors: Michel Kaempf * Aaron Holtzman @@ -35,12 +35,12 @@ #include "threads.h" #include "mtime.h" -#include "modules.h" -#include "modules_export.h" - #include "stream_control.h" #include "input_ext-dec.h" +#include "modules.h" +#include "modules_export.h" + #include "ac3_imdct.h" #include "ac3_downmix.h" #include "ac3_decoder.h" diff --git a/plugins/ac3_adec/ac3_decoder.c b/plugins/ac3_adec/ac3_decoder.c index ad0cbc5eb2..8c2dd36475 100644 --- a/plugins/ac3_adec/ac3_decoder.c +++ b/plugins/ac3_adec/ac3_decoder.c @@ -2,7 +2,7 @@ * ac3_decoder.c: core ac3 decoder ***************************************************************************** * Copyright (C) 1999-2001 VideoLAN - * $Id: ac3_decoder.c,v 1.4 2001/12/09 17:01:36 sam Exp $ + * $Id: ac3_decoder.c,v 1.5 2001/12/10 04:53:10 sam Exp $ * * Authors: Michel Kaempf * Michel Lespinasse @@ -37,12 +37,11 @@ #include "audio_output.h" -#include "modules.h" -#include "modules_export.h" - #include "stream_control.h" #include "input_ext-dec.h" +#include "modules.h" +#include "modules_export.h" #include "ac3_imdct.h" #include "ac3_downmix.h" diff --git a/plugins/ac3_adec/ac3_exponent.c b/plugins/ac3_adec/ac3_exponent.c index c9f6b452eb..69efe2aacc 100644 --- a/plugins/ac3_adec/ac3_exponent.c +++ b/plugins/ac3_adec/ac3_exponent.c @@ -2,7 +2,7 @@ * ac3_exponent.c: ac3 exponent calculations ***************************************************************************** * Copyright (C) 1999-2001 VideoLAN - * $Id: ac3_exponent.c,v 1.4 2001/12/09 17:01:36 sam Exp $ + * $Id: ac3_exponent.c,v 1.5 2001/12/10 04:53:10 sam Exp $ * * Authors: Michel Kaempf * Michel Lespinasse @@ -37,12 +37,11 @@ #include "audio_output.h" -#include "modules.h" -#include "modules_export.h" - #include "stream_control.h" #include "input_ext-dec.h" +#include "modules.h" +#include "modules_export.h" #include "ac3_imdct.h" #include "ac3_downmix.h" diff --git a/plugins/ac3_adec/ac3_imdct.c b/plugins/ac3_adec/ac3_imdct.c index 980f7bd193..143c9d2dcd 100644 --- a/plugins/ac3_adec/ac3_imdct.c +++ b/plugins/ac3_adec/ac3_imdct.c @@ -2,7 +2,7 @@ * ac3_imdct.c: ac3 DCT ***************************************************************************** * Copyright (C) 1999-2001 VideoLAN - * $Id: ac3_imdct.c,v 1.5 2001/12/09 17:01:36 sam Exp $ + * $Id: ac3_imdct.c,v 1.6 2001/12/10 04:53:10 sam Exp $ * * Authors: Michel Kaempf * Aaron Holtzman @@ -38,12 +38,12 @@ #include "threads.h" #include "mtime.h" -#include "modules.h" -#include "modules_export.h" - #include "stream_control.h" #include "input_ext-dec.h" +#include "modules.h" +#include "modules_export.h" + #include "ac3_imdct.h" #include "ac3_downmix.h" #include "ac3_decoder.h" diff --git a/plugins/ac3_adec/ac3_mantissa.c b/plugins/ac3_adec/ac3_mantissa.c index c4f95d78c5..8c7b7de321 100644 --- a/plugins/ac3_adec/ac3_mantissa.c +++ b/plugins/ac3_adec/ac3_mantissa.c @@ -2,7 +2,7 @@ * ac3_mantissa.c: ac3 mantissa computation ***************************************************************************** * Copyright (C) 1999-2001 VideoLAN - * $Id: ac3_mantissa.c,v 1.4 2001/12/09 17:01:36 sam Exp $ + * $Id: ac3_mantissa.c,v 1.5 2001/12/10 04:53:10 sam Exp $ * * Authors: Michel Kaempf * Aaron Holtzman @@ -37,12 +37,11 @@ #include "audio_output.h" -#include "modules.h" -#include "modules_export.h" - #include "stream_control.h" #include "input_ext-dec.h" +#include "modules.h" +#include "modules_export.h" #include "ac3_imdct.h" #include "ac3_downmix.h" diff --git a/plugins/ac3_adec/ac3_parse.c b/plugins/ac3_adec/ac3_parse.c index 3d1aba7e92..6e73f030bd 100644 --- a/plugins/ac3_adec/ac3_parse.c +++ b/plugins/ac3_adec/ac3_parse.c @@ -2,7 +2,7 @@ * ac3_parse.c: ac3 parsing procedures ***************************************************************************** * Copyright (C) 1999-2001 VideoLAN - * $Id: ac3_parse.c,v 1.4 2001/12/09 17:01:36 sam Exp $ + * $Id: ac3_parse.c,v 1.5 2001/12/10 04:53:10 sam Exp $ * * Authors: Michel Kaempf * Aaron Holtzman @@ -37,12 +37,11 @@ #include "audio_output.h" -#include "modules.h" -#include "modules_export.h" - #include "stream_control.h" #include "input_ext-dec.h" +#include "modules.h" +#include "modules_export.h" #include "ac3_imdct.h" #include "ac3_downmix.h" diff --git a/plugins/ac3_adec/ac3_rematrix.c b/plugins/ac3_adec/ac3_rematrix.c index b7a7a30f03..ef87a4816f 100644 --- a/plugins/ac3_adec/ac3_rematrix.c +++ b/plugins/ac3_adec/ac3_rematrix.c @@ -2,7 +2,7 @@ * ac3_rematrix.c: ac3 audio rematrixing ***************************************************************************** * Copyright (C) 1999-2001 VideoLAN - * $Id: ac3_rematrix.c,v 1.4 2001/12/09 17:01:36 sam Exp $ + * $Id: ac3_rematrix.c,v 1.5 2001/12/10 04:53:10 sam Exp $ * * Authors: Michel Kaempf * Aaron Holtzman @@ -34,12 +34,12 @@ #include "threads.h" #include "mtime.h" -#include "modules.h" -#include "modules_export.h" - #include "stream_control.h" #include "input_ext-dec.h" +#include "modules.h" +#include "modules_export.h" + #include "ac3_imdct.h" #include "ac3_downmix.h" #include "ac3_decoder.h" diff --git a/plugins/ac3_spdif/Makefile b/plugins/ac3_spdif/Makefile index 2d71b5a899..20504820a3 100644 --- a/plugins/ac3_spdif/Makefile +++ b/plugins/ac3_spdif/Makefile @@ -21,7 +21,7 @@ include ../../Makefile.modules # ../ac3_spdif.so: $(PLUGIN_C) - $(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS) + $(CC) -o $@ $^ $(PLCFLAGS) ../ac3_spdif.a: $(BUILTIN_C) ar r $@ $^ diff --git a/plugins/ac3_spdif/ac3_iec958.c b/plugins/ac3_spdif/ac3_iec958.c index bd4722ba78..faaee452cd 100644 --- a/plugins/ac3_spdif/ac3_iec958.c +++ b/plugins/ac3_spdif/ac3_iec958.c @@ -2,7 +2,7 @@ * ac3_iec958.c: ac3 to spdif converter ***************************************************************************** * Copyright (C) 2001 VideoLAN - * $Id: ac3_iec958.c,v 1.3 2001/12/09 17:01:36 sam Exp $ + * $Id: ac3_iec958.c,v 1.4 2001/12/10 04:53:10 sam Exp $ * * Authors: Stéphane Borel * Juha Yrjola @@ -44,15 +44,14 @@ #include "audio_output.h" -#include "modules_export.h" - #include "stream_control.h" #include "input_ext-dec.h" - #include "ac3_spdif.h" #include "ac3_iec958.h" +#include "modules_export.h" + /**************************************************************************** * Local structures and tables ****************************************************************************/ diff --git a/plugins/ac3_spdif/ac3_spdif.c b/plugins/ac3_spdif/ac3_spdif.c index 95c26b31ea..e3cc685b91 100644 --- a/plugins/ac3_spdif/ac3_spdif.c +++ b/plugins/ac3_spdif/ac3_spdif.c @@ -2,7 +2,7 @@ * ac3_spdif.c: ac3 pass-through to external decoder with enabled soundcard ***************************************************************************** * Copyright (C) 2001 VideoLAN - * $Id: ac3_spdif.c,v 1.6 2001/12/09 17:01:36 sam Exp $ + * $Id: ac3_spdif.c,v 1.7 2001/12/10 04:53:10 sam Exp $ * * Authors: Stéphane Borel * Juha Yrjola @@ -47,15 +47,15 @@ #include "audio_output.h" -#include "modules.h" -#include "modules_export.h" - #include "stream_control.h" #include "input_ext-dec.h" #include "ac3_spdif.h" #include "ac3_iec958.h" +#include "modules.h" +#include "modules_export.h" + #define FRAME_NB 8 /**************************************************************************** diff --git a/plugins/alsa/Makefile b/plugins/alsa/Makefile index db93956f23..d65fae412a 100644 --- a/plugins/alsa/Makefile +++ b/plugins/alsa/Makefile @@ -23,7 +23,7 @@ include ../../Makefile.modules # ../alsa.so: $(PLUGIN_C) - $(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS) $(LIB_ALSA) -lasound -lm -ldl + $(CC) -o $@ $^ $(PLCFLAGS) $(LIB_ALSA) -lasound -lm -ldl ../alsa.a: $(BUILTIN_C) ar r $@ $^ diff --git a/plugins/arts/Makefile b/plugins/arts/Makefile index 37923638c4..cd6b2a8786 100644 --- a/plugins/arts/Makefile +++ b/plugins/arts/Makefile @@ -29,7 +29,7 @@ include ../../Makefile.modules # ../arts.so: $(PLUGIN_C) - $(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS) $(LIB_ARTS) + $(CC) -o $@ $^ $(PLCFLAGS) $(LIB_ARTS) ../arts.a: $(BUILTIN_C) ar r $@ $^ diff --git a/plugins/beos/Makefile b/plugins/beos/Makefile index e49afed7b3..22b19bf5f4 100644 --- a/plugins/beos/Makefile +++ b/plugins/beos/Makefile @@ -23,7 +23,7 @@ include ../../Makefile.modules # ../beos.so: $(PLUGIN_CPP) - $(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS) $(LIB_BEOS) + $(CC) -o $@ $^ $(PLCFLAGS) $(LIB_BEOS) ../beos.a: $(BUILTIN_CPP) ar r $@ $^ diff --git a/plugins/chroma/Makefile b/plugins/chroma/Makefile index 315a145bef..2c3c511926 100644 --- a/plugins/chroma/Makefile +++ b/plugins/chroma/Makefile @@ -26,7 +26,7 @@ include ../../Makefile.modules # ../yuv2rgb8.so: $(PLUGIN_YUV2RGB8) - $(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS) + $(CC) -o $@ $^ $(PLCFLAGS) ../yuv2rgb8.a: $(BUILTIN_YUV2RGB8) ar r $@ $^ diff --git a/plugins/directx/Makefile b/plugins/directx/Makefile index dbee64be52..66ede93a7b 100644 --- a/plugins/directx/Makefile +++ b/plugins/directx/Makefile @@ -23,7 +23,7 @@ include ../../Makefile.modules # ../directx.so: $(PLUGIN_C) - $(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS) $(LIB_DIRECTX) + $(CC) -o $@ $^ $(PLCFLAGS) $(LIB_DIRECTX) ../directx.a: $(BUILTIN_C) ar r $@ $^ diff --git a/plugins/downmix/Makefile b/plugins/downmix/Makefile index 0fdca73597..51d150c541 100644 --- a/plugins/downmix/Makefile +++ b/plugins/downmix/Makefile @@ -41,21 +41,21 @@ $(BUILTIN_DOWNMIX3DN): BUILTIN_DOWNMIX3DN_%.o: %.c # ../downmix.so: $(PLUGIN_DOWNMIX) - $(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS) + $(CC) -o $@ $^ $(PLCFLAGS) ../downmix.a: $(BUILTIN_DOWNMIX) ar r $@ $^ $(RANLIB) $@ ../downmixsse.so: $(PLUGIN_DOWNMIXSSE) - $(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS) + $(CC) -o $@ $^ $(PLCFLAGS) ../downmixsse.a: $(BUILTIN_DOWNMIXSSE) ar r $@ $^ $(RANLIB) $@ ../downmix3dn.so: $(PLUGIN_DOWNMIX3DN) - $(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS) + $(CC) -o $@ $^ $(PLCFLAGS) ../downmix3dn.a: $(BUILTIN_DOWNMIX3DN) ar r $@ $^ diff --git a/plugins/downmix/ac3_downmix_3dn.c b/plugins/downmix/ac3_downmix_3dn.c index dc0ba6eb4e..fb6d297fd2 100644 --- a/plugins/downmix/ac3_downmix_3dn.c +++ b/plugins/downmix/ac3_downmix_3dn.c @@ -2,7 +2,7 @@ * ac3_downmix_3dn.c: accelerated 3D Now! ac3 downmix functions ***************************************************************************** * Copyright (C) 1999, 2000, 2001 VideoLAN - * $Id: ac3_downmix_3dn.c,v 1.7 2001/12/09 17:01:36 sam Exp $ + * $Id: ac3_downmix_3dn.c,v 1.8 2001/12/10 04:53:10 sam Exp $ * * Authors: Renaud Dartus * @@ -33,7 +33,7 @@ #include "ac3_downmix.h" -static const float sqrt2_3dn __asm__ ("sqrt2_3dn") = 0.7071068; +const float sqrt2_3dn __asm__ ("sqrt2_3dn") = 0.7071068; void _M( downmix_3f_2r_to_2ch ) (float * samples, dm_par_t * dm_par) { diff --git a/plugins/downmix/ac3_downmix_sse.c b/plugins/downmix/ac3_downmix_sse.c index 4d2e971454..3927e492a8 100644 --- a/plugins/downmix/ac3_downmix_sse.c +++ b/plugins/downmix/ac3_downmix_sse.c @@ -2,7 +2,7 @@ * ac3_downmix_sse.c: accelerated SSE ac3 downmix functions ***************************************************************************** * Copyright (C) 1999, 2000, 2001 VideoLAN - * $Id: ac3_downmix_sse.c,v 1.7 2001/12/09 17:01:36 sam Exp $ + * $Id: ac3_downmix_sse.c,v 1.8 2001/12/10 04:53:10 sam Exp $ * * Authors: Renaud Dartus * Aaron Holtzman @@ -34,7 +34,7 @@ #include "ac3_downmix.h" -static const float sqrt2_sse __asm__ ("sqrt2_sse") __attribute__ ((aligned (16))) = 0.7071068; +const float sqrt2_sse __asm__ ("sqrt2_sse") __attribute__ ((aligned (16))) = 0.7071068; void _M( downmix_3f_2r_to_2ch ) (float * samples, dm_par_t * dm_par) { diff --git a/plugins/dsp/Makefile b/plugins/dsp/Makefile index 95dcac8734..45e7c42f2f 100644 --- a/plugins/dsp/Makefile +++ b/plugins/dsp/Makefile @@ -23,7 +23,7 @@ include ../../Makefile.modules # ../dsp.so: $(PLUGIN_C) - $(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS) + $(CC) -o $@ $^ $(PLCFLAGS) ../dsp.a: $(BUILTIN_C) ar r $@ $^ diff --git a/plugins/dummy/Makefile b/plugins/dummy/Makefile index 6bead1fd77..4a04efb3c2 100644 --- a/plugins/dummy/Makefile +++ b/plugins/dummy/Makefile @@ -27,14 +27,14 @@ include ../../Makefile.modules # ../null.so: $(PLUGIN_NULL) - $(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS) + $(CC) -o $@ $^ $(PLCFLAGS) ../null.a: $(BUILTIN_NULL) ar r $@ $^ $(RANLIB) $@ ../dummy.so: $(PLUGIN_DUMMY) - $(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS) + $(CC) -o $@ $^ $(PLCFLAGS) ../dummy.a: $(BUILTIN_DUMMY) ar r $@ $^ diff --git a/plugins/dummy/input_dummy.c b/plugins/dummy/input_dummy.c index ac06fd5bac..3f0fbbc6db 100644 --- a/plugins/dummy/input_dummy.c +++ b/plugins/dummy/input_dummy.c @@ -2,7 +2,7 @@ * input_dummy.c: dummy input plugin, to manage "vlc:***" special options ***************************************************************************** * Copyright (C) 2001 VideoLAN - * $Id: input_dummy.c,v 1.9 2001/12/07 18:33:07 sam Exp $ + * $Id: input_dummy.c,v 1.10 2001/12/10 04:53:10 sam Exp $ * * Authors: Samuel Hocevar * @@ -47,14 +47,14 @@ #include "interface.h" #include "intf_playlist.h" -#include "modules.h" -#include "modules_export.h" - #include "stream_control.h" #include "input_ext-intf.h" #include "input_ext-dec.h" #include "input_ext-plugins.h" +#include "modules.h" +#include "modules_export.h" + /***************************************************************************** * Local prototypes *****************************************************************************/ diff --git a/plugins/dvd/Makefile b/plugins/dvd/Makefile index 7fc59f1aab..a850657cef 100644 --- a/plugins/dvd/Makefile +++ b/plugins/dvd/Makefile @@ -32,14 +32,14 @@ $(BUILTIN_DVD): BUILTIN_%.o: %.c ifeq (1,$(NEED_LIBDVDCSS)) ../dvd.so: libdvdcss $(PLUGIN_DVD) - $(CC) $(PCFLAGS) -o $@ $(PLUGIN_DVD) $(PLCFLAGS) $(LIB_DVD_PLUGIN) + $(CC) -o $@ $(PLUGIN_DVD) $(PLCFLAGS) $(LIB_DVD_PLUGIN) ../dvd.a: libdvdcss $(BUILTIN_DVD) ar r $@ $(BUILTIN_DVD) $(RANLIB) $@ else ../dvd.so: $(PLUGIN_DVD) - $(CC) $(PCFLAGS) -o $@ $(PLUGIN_DVD) $(PLCFLAGS) $(LIB_DVD_PLUGIN) + $(CC) -o $@ $(PLUGIN_DVD) $(PLCFLAGS) $(LIB_DVD_PLUGIN) ../dvd.a: $(BUILTIN_DVD) ar r $@ $(BUILTIN_DVD) diff --git a/plugins/dvd/input_dvd.c b/plugins/dvd/input_dvd.c index 0decae62fa..773852b60c 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.105 2001/12/07 18:33:07 sam Exp $ + * $Id: input_dvd.c,v 1.106 2001/12/10 04:53:10 sam Exp $ * * Author: Stéphane Borel * @@ -77,9 +77,6 @@ # include "input_iovec.h" #endif -#include "modules.h" -#include "modules_export.h" - #include "stream_control.h" #include "input_ext-intf.h" #include "input_ext-dec.h" @@ -91,6 +88,9 @@ #include "debug.h" +#include "modules.h" +#include "modules_export.h" + /* how many blocks DVDRead will read in each loop */ #define DVD_BLOCK_READ_ONCE 64 #define DVD_DATA_READ_ONCE (4 * DVD_BLOCK_READ_ONCE) diff --git a/plugins/dvdread/Makefile b/plugins/dvdread/Makefile index e284f0a765..bfccf57802 100644 --- a/plugins/dvdread/Makefile +++ b/plugins/dvdread/Makefile @@ -32,14 +32,14 @@ $(BUILTIN_DVDREAD): BUILTIN_%.o: %.c ifeq (1,$(NEED_LIBDVDCSS)) ../dvdread.so: libdvdcss libdvdread $(PLUGIN_DVDREAD) - $(CC) $(PCFLAGS) -o $@ $(PLUGIN_DVDREAD) $(PLCFLAGS) $(LIB_DVD_PLUGIN) $(LIB_DVDREAD_PLUGIN) + $(CC) -o $@ $(PLUGIN_DVDREAD) $(PLCFLAGS) $(LIB_DVD_PLUGIN) $(LIB_DVDREAD_PLUGIN) ../dvdread.a: libdvdcss libdvdread $(BUILTIN_DVDREAD) ar r $@ $(BUILTIN_DVDREAD) $(RANLIB) $@ else ../dvdread.so: libdvdread $(PLUGIN_DVDREAD) - $(CC) $(PCFLAGS) -o $@ $(PLUGIN_DVD) $(PLCFLAGS) $(LIB_DVD_PLUGIN) $(LIB_DVDREAD_PLUGIN) + $(CC) -o $@ $(PLUGIN_DVD) $(PLCFLAGS) $(LIB_DVD_PLUGIN) $(LIB_DVDREAD_PLUGIN) ../dvdread.a: libdvdread $(BUILTIN_DVDREAD) ar r $@ $(BUILTIN_DVDREAD) diff --git a/plugins/esd/Makefile b/plugins/esd/Makefile index 0064d531ba..1cc6137845 100644 --- a/plugins/esd/Makefile +++ b/plugins/esd/Makefile @@ -29,7 +29,7 @@ include ../../Makefile.modules # ../esd.so: $(PLUGIN_C) - $(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS) $(LIB_ESD) + $(CC) -o $@ $^ $(PLCFLAGS) $(LIB_ESD) ../esd.a: $(BUILTIN_C) ar r $@ $^ diff --git a/plugins/fb/Makefile b/plugins/fb/Makefile index 499d822922..8f50d23f30 100644 --- a/plugins/fb/Makefile +++ b/plugins/fb/Makefile @@ -23,7 +23,7 @@ include ../../Makefile.modules # ../fb.so: $(PLUGIN_C) - $(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS) + $(CC) -o $@ $^ $(PLCFLAGS) ../fb.a: $(BUILTIN_C) ar r $@ $^ diff --git a/plugins/ggi/Makefile b/plugins/ggi/Makefile index e535d9a3cf..721a916bbe 100644 --- a/plugins/ggi/Makefile +++ b/plugins/ggi/Makefile @@ -23,7 +23,7 @@ include ../../Makefile.modules # ../ggi.so: $(PLUGIN_C) - $(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS) $(LIB_GGI) + $(CC) -o $@ $^ $(PLCFLAGS) $(LIB_GGI) ../ggi.a: $(BUILTIN_C) ar r $@ $^ diff --git a/plugins/glide/Makefile b/plugins/glide/Makefile index 3ee8848767..653ced8179 100644 --- a/plugins/glide/Makefile +++ b/plugins/glide/Makefile @@ -31,7 +31,7 @@ $(BUILTIN_GLIDE): BUILTIN_%.o: %.c # ../glide.so: $(PLUGIN_GLIDE) - $(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS) $(LIB_GLIDE) + $(CC) -o $@ $^ $(PLCFLAGS) $(LIB_GLIDE) ../glide.a: $(BUILTIN_GLIDE) ar r $@ $^ diff --git a/plugins/gtk/Makefile b/plugins/gtk/Makefile index 07d231b936..cff4121cc5 100644 --- a/plugins/gtk/Makefile +++ b/plugins/gtk/Makefile @@ -55,7 +55,7 @@ $(BUILTIN_GNOME): BUILTIN_GNOME_%.o: %.c # ../gtk.so: $(PLUGIN_GTK) $(PLUGIN_GTK_SPECIFIC) - $(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS) $(LIB_GTK) + $(CC) -o $@ $^ $(PLCFLAGS) $(LIB_GTK) ../gtk.a: $(BUILTIN_GTK) ar r $@ $^ @@ -63,7 +63,7 @@ $(BUILTIN_GNOME): BUILTIN_GNOME_%.o: %.c ../gnome.so: $(PLUGIN_GNOME) $(PLUGIN_GNOME_SPECIFIC) - $(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS) $(LIB_GNOME) + $(CC) -o $@ $^ $(PLCFLAGS) $(LIB_GNOME) ../gnome.a: $(BUILTIN_GNOME) ar r $@ $^ diff --git a/plugins/gtk/gnome_interface.c b/plugins/gtk/gnome_interface.c index 4937830558..46601f3082 100644 --- a/plugins/gtk/gnome_interface.c +++ b/plugins/gtk/gnome_interface.c @@ -1077,7 +1077,7 @@ create_intf_about (void) }; GtkWidget *intf_about; - intf_about = gnome_about_new ("VideoLAN Client", VERSION, + intf_about = gnome_about_new ("VideoLAN Client", VLC_VERSION, _("(C) 1996, 1997, 1998, 1999, 2000, 2001 - the VideoLAN Team"), authors, _("This is the VideoLAN client, a DVD and MPEG player. It can play MPEG and MPEG 2 files from a file or from a network source."), diff --git a/plugins/gtk/intf_gnome.c b/plugins/gtk/intf_gnome.c index f1874d76f7..925ecdfc54 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-2001 VideoLAN - * $Id: intf_gnome.c,v 1.7 2001/12/07 18:33:07 sam Exp $ + * $Id: intf_gnome.c,v 1.8 2001/12/10 04:53:10 sam Exp $ * * Authors: Samuel Hocevar * Stéphane Borel @@ -192,7 +192,7 @@ static void intf_Run( intf_thread_t *p_intf ) int i_timeout; /* Initialize Gnome */ - gnome_init( p_main->psz_arg0, VERSION, i_args, p_args ); + gnome_init( p_main->psz_arg0, VLC_VERSION, i_args, p_args ); /* Create some useful widgets that will certainly be used */ p_intf->p_sys->p_window = create_intf_window( ); diff --git a/plugins/idct/Makefile b/plugins/idct/Makefile index 0561709a70..d440e24754 100644 --- a/plugins/idct/Makefile +++ b/plugins/idct/Makefile @@ -57,35 +57,35 @@ $(BUILTIN_IDCTALTIVEC): BUILTIN_IDCTALTIVEC_%.o: %.c # ../idct.so: $(PLUGIN_IDCT) - $(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS) + $(CC) -o $@ $^ $(PLCFLAGS) ../idct.a: $(BUILTIN_IDCT) ar r $@ $^ $(RANLIB) $@ ../idctclassic.so: $(PLUGIN_IDCTCLASSIC) - $(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS) + $(CC) -o $@ $^ $(PLCFLAGS) ../idctclassic.a: $(BUILTIN_IDCTCLASSIC) ar r $@ $^ $(RANLIB) $@ ../idctmmx.so: $(PLUGIN_IDCTMMX) - $(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS) + $(CC) -o $@ $^ $(PLCFLAGS) ../idctmmx.a: $(BUILTIN_IDCTMMX) ar r $@ $^ $(RANLIB) $@ ../idctmmxext.so: $(PLUGIN_IDCTMMXEXT) - $(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS) + $(CC) -o $@ $^ $(PLCFLAGS) ../idctmmxext.a: $(BUILTIN_IDCTMMXEXT) ar r $@ $^ $(RANLIB) $@ ../idctaltivec.so: $(PLUGIN_IDCTALTIVEC) - $(CC) $(PCFLAGS) -o $@ $^ $(LIB_ALTIVEC) $(PLCFLAGS) + $(CC) -o $@ $^ $(LIB_ALTIVEC) $(PLCFLAGS) ../idctaltivec.a: $(BUILTIN_IDCTALTIVEC) ar r $@ $^ diff --git a/plugins/imdct/Makefile b/plugins/imdct/Makefile index 92ee887fa6..76406ff42b 100644 --- a/plugins/imdct/Makefile +++ b/plugins/imdct/Makefile @@ -45,21 +45,21 @@ $(BUILTIN_IMDCT3DN): BUILTIN_IMDCT3DN_%.o: %.c # ../imdct.so: $(PLUGIN_IMDCT) $(PLUGIN_IMDCTCOMMON) - $(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS) + $(CC) -o $@ $^ $(PLCFLAGS) ../imdct.a: $(BUILTIN_IMDCT) ar r $@ $^ $(RANLIB) $@ ../imdctsse.so: $(PLUGIN_IMDCTSSE) $(PLUGIN_IMDCTCOMMON) - $(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS) + $(CC) -o $@ $^ $(PLCFLAGS) ../imdctsse.a: $(BUILTIN_IMDCTSSE) ar r $@ $^ $(RANLIB) $@ ../imdct3dn.so: $(PLUGIN_IMDCT3DN) $(PLUGIN_IMDCTCOMMON) - $(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS) + $(CC) -o $@ $^ $(PLCFLAGS) ../imdct3dn.a: $(BUILTIN_IMDCT3DN) ar r $@ $^ diff --git a/plugins/kde/Makefile b/plugins/kde/Makefile index b7b6f11598..47c0106fd6 100644 --- a/plugins/kde/Makefile +++ b/plugins/kde/Makefile @@ -63,7 +63,7 @@ $(BUILTIN_KDE_MOC): BUILTIN_%.o: %.cpp # ../kde.so: $(PLUGIN_KDE) $(PLUGIN_KDE_MOC) - $(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS) $(LIB_KDE) + $(CC) -o $@ $^ $(PLCFLAGS) $(LIB_KDE) ../kde.a: $(BUILTIN_KDE) $(BUILTIN_KDE_MOC) ar r $@ $^ diff --git a/plugins/kde/kdeinterface.cpp b/plugins/kde/kdeinterface.cpp index 7158004123..7fdba185a7 100644 --- a/plugins/kde/kdeinterface.cpp +++ b/plugins/kde/kdeinterface.cpp @@ -45,7 +45,7 @@ void _M( intf_getfunctions )( function_list_t * p_function_list ) KDEInterface::KDEInterface(intf_thread_t *p_intf) { fAboutData = new KAboutData("VideoLAN Client", I18N_NOOP("Kvlc"), - VERSION, + VLC_VERSION, "This is the VideoLAN client, a DVD and MPEG player. It can play MPEG and MPEG 2 files from a file or from a network source.", KAboutData::License_GPL, "(C) 1996, 1997, 1998, 1999, 2000, 2001 - the VideoLAN Team", 0, 0, "dae@chez.com"); diff --git a/plugins/lpcm_adec/Makefile b/plugins/lpcm_adec/Makefile index e35b52409c..7377344f78 100644 --- a/plugins/lpcm_adec/Makefile +++ b/plugins/lpcm_adec/Makefile @@ -21,7 +21,7 @@ include ../../Makefile.modules # ../lpcm_adec.so: $(PLUGIN_C) - $(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS) + $(CC) -o $@ $^ $(PLCFLAGS) ../lpcm_adec.a: $(BUILTIN_C) ar r $@ $^ diff --git a/plugins/lpcm_adec/lpcm_adec.c b/plugins/lpcm_adec/lpcm_adec.c index 164ab20ce7..e2a3eaaa74 100644 --- a/plugins/lpcm_adec/lpcm_adec.c +++ b/plugins/lpcm_adec/lpcm_adec.c @@ -2,7 +2,7 @@ * lpcm_decoder_thread.c: lpcm decoder thread ***************************************************************************** * Copyright (C) 1999-2001 VideoLAN - * $Id: lpcm_adec.c,v 1.4 2001/12/09 17:01:36 sam Exp $ + * $Id: lpcm_adec.c,v 1.5 2001/12/10 04:53:11 sam Exp $ * * Authors: Samuel Hocevar * Henri Fallon @@ -45,14 +45,14 @@ #include "audio_output.h" -#include "modules.h" -#include "modules_export.h" - #include "stream_control.h" #include "input_ext-dec.h" #include "lpcm_adec.h" +#include "modules.h" +#include "modules_export.h" + /***************************************************************************** * Local prototypes *****************************************************************************/ diff --git a/plugins/macosx/Makefile b/plugins/macosx/Makefile index dc9554540c..3882c3fe6d 100644 --- a/plugins/macosx/Makefile +++ b/plugins/macosx/Makefile @@ -31,7 +31,7 @@ $(BUILTIN_MACOSX): BUILTIN_%.o: %.c # ../macosx.so: $(PLUGIN_MACOSX) - $(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS) $(LIB_MACOSX) -lobjc + $(CC) -o $@ $^ $(PLCFLAGS) $(LIB_MACOSX) -lobjc ../macosx.a: $(BUILTIN_MACOSX) ar r $@ $^ diff --git a/plugins/mad/Makefile b/plugins/mad/Makefile index b63ed76a19..f7958155a9 100644 --- a/plugins/mad/Makefile +++ b/plugins/mad/Makefile @@ -29,7 +29,7 @@ $(BUILTIN_MAD): BUILTIN_%.o: %.c # ../mad.so: $(PLUGIN_MAD) - $(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS) $(LIB_MAD) + $(CC) -o $@ $^ $(PLCFLAGS) $(LIB_MAD) ../mad.a: $(BUILTIN_MAD) ar r $@ $^ diff --git a/plugins/memcpy/Makefile b/plugins/memcpy/Makefile index c100890268..8a61312042 100644 --- a/plugins/memcpy/Makefile +++ b/plugins/memcpy/Makefile @@ -32,28 +32,28 @@ include ../../Makefile.modules # ../memcpy.so: $(PLUGIN_MEMCPY) - $(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS) + $(CC) -o $@ $^ $(PLCFLAGS) ../memcpy.a: $(BUILTIN_MEMCPY) ar r $@ $^ $(RANLIB) $@ ../memcpymmx.so: $(PLUGIN_MEMCPYMMX) - $(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS) + $(CC) -o $@ $^ $(PLCFLAGS) ../memcpymmx.a: $(BUILTIN_MEMCPYMMX) ar r $@ $^ $(RANLIB) $@ ../memcpymmxext.so: $(PLUGIN_MEMCPYMMXEXT) - $(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS) + $(CC) -o $@ $^ $(PLCFLAGS) ../memcpymmxext.a: $(BUILTIN_MEMCPYMMXEXT) ar r $@ $^ $(RANLIB) $@ ../memcpy3dn.so: $(PLUGIN_MEMCPY3DN) - $(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS) + $(CC) -o $@ $^ $(PLCFLAGS) ../memcpy3dn.a: $(BUILTIN_MEMCPY3DN) ar r $@ $^ diff --git a/plugins/mga/Makefile b/plugins/mga/Makefile index d0c4febb4d..ca520bde1f 100644 --- a/plugins/mga/Makefile +++ b/plugins/mga/Makefile @@ -23,7 +23,7 @@ include ../../Makefile.modules # ../mga.so: $(PLUGIN_C) - $(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS) + $(CC) -o $@ $^ $(PLCFLAGS) ../mga.a: $(BUILTIN_C) ar r $@ $^ diff --git a/plugins/motion/Makefile b/plugins/motion/Makefile index 4e8ac581dc..9dc28b71f4 100644 --- a/plugins/motion/Makefile +++ b/plugins/motion/Makefile @@ -57,42 +57,42 @@ $(BUILTIN_MOTIONALTIVEC): BUILTIN_MOTIONALTIVEC_%.o: %.c # ../motion.so: $(PLUGIN_MOTION) - $(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS) + $(CC) -o $@ $^ $(PLCFLAGS) ../motion.a: $(BUILTIN_MOTION) ar r $@ $^ $(RANLIB) $@ ../motionclassic.so: $(PLUGIN_MOTIONCLASSIC) - $(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS) + $(CC) -o $@ $^ $(PLCFLAGS) ../motionclassic.a: $(BUILTIN_MOTIONCLASSIC) ar r $@ $^ $(RANLIB) $@ ../motionmmx.so: $(PLUGIN_MOTIONMMX) - $(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS) + $(CC) -o $@ $^ $(PLCFLAGS) ../motionmmx.a: $(BUILTIN_MOTIONMMX) ar r $@ $^ $(RANLIB) $@ ../motionmmxext.so: $(PLUGIN_MOTIONMMXEXT) - $(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS) + $(CC) -o $@ $^ $(PLCFLAGS) ../motionmmxext.a: $(BUILTIN_MOTIONMMXEXT) ar r $@ $^ $(RANLIB) $@ ../motion3dnow.so: $(PLUGIN_MOTION3DNOW) - $(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS) + $(CC) -o $@ $^ $(PLCFLAGS) ../motion3dnow.a: $(BUILTIN_MOTION3DNOW) ar r $@ $^ $(RANLIB) $@ ../motionaltivec.so: $(PLUGIN_MOTIONALTIVEC) - $(CC) $(PCFLAGS) -o $@ $^ $(LIB_ALTIVEC) $(PLCFLAGS) + $(CC) -o $@ $^ $(LIB_ALTIVEC) $(PLCFLAGS) ../motionaltivec.a: $(BUILTIN_MOTIONALTIVEC) ar r $@ $^ diff --git a/plugins/mpeg_adec/Makefile b/plugins/mpeg_adec/Makefile index 60636ad98d..c54586d652 100644 --- a/plugins/mpeg_adec/Makefile +++ b/plugins/mpeg_adec/Makefile @@ -21,7 +21,7 @@ include ../../Makefile.modules # ../mpeg_adec.so: $(PLUGIN_C) - $(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS) + $(CC) -o $@ $^ $(PLCFLAGS) ../mpeg_adec.a: $(BUILTIN_C) ar r $@ $^ diff --git a/plugins/mpeg_adec/adec_layer1.c b/plugins/mpeg_adec/adec_layer1.c index 7e25670fe7..b9909afa23 100644 --- a/plugins/mpeg_adec/adec_layer1.c +++ b/plugins/mpeg_adec/adec_layer1.c @@ -2,7 +2,7 @@ * adec_layer1.c: MPEG Layer I audio decoder ***************************************************************************** * Copyright (C) 1999-2001 VideoLAN - * $Id: adec_layer1.c,v 1.3 2001/12/09 17:01:36 sam Exp $ + * $Id: adec_layer1.c,v 1.4 2001/12/10 04:53:11 sam Exp $ * * Authors: Michel Kaempf * Michel Lespinasse @@ -32,7 +32,6 @@ #include "threads.h" #include "mtime.h" -#include "modules_export.h" #include "stream_control.h" #include "input_ext-dec.h" @@ -40,6 +39,8 @@ #include "mpeg_adec.h" #include "adec_math.h" /* DCT32(), PCM() */ +#include "modules_export.h" + /**** wkn ****/ static float adec_scalefactor_table[64] = diff --git a/plugins/mpeg_adec/adec_layer2.c b/plugins/mpeg_adec/adec_layer2.c index e05774e97a..af8fa7f789 100644 --- a/plugins/mpeg_adec/adec_layer2.c +++ b/plugins/mpeg_adec/adec_layer2.c @@ -2,7 +2,7 @@ * adec_layer2.c: MPEG Layer II audio decoder ***************************************************************************** * Copyright (C) 1999-2001 VideoLAN - * $Id: adec_layer2.c,v 1.3 2001/12/09 17:01:36 sam Exp $ + * $Id: adec_layer2.c,v 1.4 2001/12/10 04:53:11 sam Exp $ * * Authors: Michel Kaempf * Michel Lespinasse @@ -31,7 +31,6 @@ #include "intf_msg.h" #include "threads.h" #include "mtime.h" -#include "modules_export.h" #include "stream_control.h" #include "input_ext-dec.h" @@ -39,6 +38,8 @@ #include "mpeg_adec.h" #include "adec_math.h" /* DCT32(), PCM() */ +#include "modules_export.h" + /**** wkn ****/ static float adec_scalefactor_table[64] = diff --git a/plugins/mpeg_adec/mpeg_adec.c b/plugins/mpeg_adec/mpeg_adec.c index aabe23056b..7029f70958 100644 --- a/plugins/mpeg_adec/mpeg_adec.c +++ b/plugins/mpeg_adec/mpeg_adec.c @@ -2,7 +2,7 @@ * mpeg_adec.c: MPEG audio decoder thread ***************************************************************************** * Copyright (C) 1999-2001 VideoLAN - * $Id: mpeg_adec.c,v 1.6 2001/12/09 17:01:36 sam Exp $ + * $Id: mpeg_adec.c,v 1.7 2001/12/10 04:53:11 sam Exp $ * * Authors: Michel Kaempf * Michel Lespinasse @@ -42,15 +42,15 @@ #include "audio_output.h" /* aout_fifo_t (for audio_decoder.h) */ -#include "modules.h" -#include "modules_export.h" - #include "stream_control.h" #include "input_ext-dec.h" #include "mpeg_adec_generic.h" #include "mpeg_adec.h" +#include "modules.h" +#include "modules_export.h" + #define ADEC_FRAME_SIZE (2*1152) /***************************************************************************** diff --git a/plugins/mpeg_adec/mpeg_adec_generic.c b/plugins/mpeg_adec/mpeg_adec_generic.c index 4d1d7887d9..942d008a27 100644 --- a/plugins/mpeg_adec/mpeg_adec_generic.c +++ b/plugins/mpeg_adec/mpeg_adec_generic.c @@ -2,7 +2,7 @@ * adec_generic.c: MPEG audio decoder ***************************************************************************** * Copyright (C) 1999-2001 VideoLAN - * $Id: mpeg_adec_generic.c,v 1.3 2001/12/09 17:01:36 sam Exp $ + * $Id: mpeg_adec_generic.c,v 1.4 2001/12/10 04:53:11 sam Exp $ * * Authors: Michel Kaempf * Michel Lespinasse @@ -31,9 +31,6 @@ #include "threads.h" #include "mtime.h" -#include "modules.h" -#include "modules_export.h" /* Used for exporting vlc symbols to plugins */ - #include "input_ext-dec.h" #include "stream_control.h" @@ -43,6 +40,9 @@ #include "adec_layer1.h" #include "adec_layer2.h" +#include "modules.h" +#include "modules_export.h" /* Used for exporting vlc symbols to plugins */ + int adec_Init( adec_thread_t * p_adec ) { p_adec->bank_0.actual = p_adec->bank_0.v1; diff --git a/plugins/mpeg_system/Makefile b/plugins/mpeg_system/Makefile index c6305d446f..31b4cb0fdd 100644 --- a/plugins/mpeg_system/Makefile +++ b/plugins/mpeg_system/Makefile @@ -29,21 +29,21 @@ include ../../Makefile.modules # ../mpeg_es.so: $(PLUGIN_ES) - $(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS) + $(CC) -o $@ $^ $(PLCFLAGS) ../mpeg_es.a: $(BUILTIN_ES) ar r $@ $^ $(RANLIB) $@ ../mpeg_ps.so: $(PLUGIN_PS) - $(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS) + $(CC) -o $@ $^ $(PLCFLAGS) ../mpeg_ps.a: $(BUILTIN_PS) ar r $@ $^ $(RANLIB) $@ ../mpeg_ts.so: $(PLUGIN_TS) - $(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS) $(LIB_TS) + $(CC) -o $@ $^ $(PLCFLAGS) $(LIB_TS) ../mpeg_ts.a: $(BUILTIN_TS) ar r $@ $^ diff --git a/plugins/mpeg_system/input_es.c b/plugins/mpeg_system/input_es.c index 222862db65..99070ebad7 100644 --- a/plugins/mpeg_system/input_es.c +++ b/plugins/mpeg_system/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.1 2001/12/09 17:01:36 sam Exp $ + * $Id: input_es.c,v 1.2 2001/12/10 04:53:11 sam Exp $ * * Author: Christophe Massiot * @@ -58,9 +58,6 @@ # include "input_iovec.h" #endif -#include "modules.h" -#include "modules_export.h" - #include "stream_control.h" #include "input_ext-intf.h" #include "input_ext-dec.h" @@ -70,6 +67,9 @@ #include "debug.h" +#include "modules.h" +#include "modules_export.h" + /***************************************************************************** * Local prototypes *****************************************************************************/ diff --git a/plugins/mpeg_system/input_ps.c b/plugins/mpeg_system/input_ps.c index c5cd287a0a..5f795c1299 100644 --- a/plugins/mpeg_system/input_ps.c +++ b/plugins/mpeg_system/input_ps.c @@ -2,7 +2,7 @@ * input_ps.c: PS demux and packet management ***************************************************************************** * Copyright (C) 1998-2001 VideoLAN - * $Id: input_ps.c,v 1.1 2001/12/09 17:01:36 sam Exp $ + * $Id: input_ps.c,v 1.2 2001/12/10 04:53:11 sam Exp $ * * Authors: Christophe Massiot * Cyril Deguet @@ -56,9 +56,6 @@ #include "mtime.h" #include "tests.h" -#include "modules.h" -#include "modules_export.h" - #include "stream_control.h" #include "input_ext-intf.h" #include "input_ext-dec.h" @@ -68,6 +65,9 @@ #include "debug.h" +#include "modules.h" +#include "modules_export.h" + /***************************************************************************** * fseeko: fseeko replacement for BSDI. *****************************************************************************/ diff --git a/plugins/mpeg_system/input_ts.c b/plugins/mpeg_system/input_ts.c index 4cd52e5277..21f9b0d49c 100644 --- a/plugins/mpeg_system/input_ts.c +++ b/plugins/mpeg_system/input_ts.c @@ -2,7 +2,7 @@ * input_ts.c: TS demux and netlist management ***************************************************************************** * Copyright (C) 1998-2001 VideoLAN - * $Id: input_ts.c,v 1.1 2001/12/09 17:01:36 sam Exp $ + * $Id: input_ts.c,v 1.2 2001/12/10 04:53:11 sam Exp $ * * Authors: Henri Fallon * @@ -72,9 +72,6 @@ # include "input_iovec.h" #endif -#include "modules.h" -#include "modules_export.h" - #include "stream_control.h" #include "input_ext-intf.h" #include "input_ext-dec.h" @@ -82,6 +79,9 @@ #include "input_ts.h" +#include "modules.h" +#include "modules_export.h" + /***************************************************************************** * Local prototypes *****************************************************************************/ diff --git a/plugins/mpeg_vdec/Makefile b/plugins/mpeg_vdec/Makefile index 7857659b4b..06fb9acb1d 100644 --- a/plugins/mpeg_vdec/Makefile +++ b/plugins/mpeg_vdec/Makefile @@ -21,7 +21,7 @@ include ../../Makefile.modules # ../mpeg_vdec.so: $(PLUGIN_C) - $(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS) + $(CC) -o $@ $^ $(PLCFLAGS) ../mpeg_vdec.a: $(BUILTIN_C) ar r $@ $^ diff --git a/plugins/mpeg_vdec/video_decoder.c b/plugins/mpeg_vdec/video_decoder.c index 74c9bafb3f..b1002c5f1c 100644 --- a/plugins/mpeg_vdec/video_decoder.c +++ b/plugins/mpeg_vdec/video_decoder.c @@ -2,7 +2,7 @@ * video_decoder.c : video decoder thread ***************************************************************************** * Copyright (C) 1999-2001 VideoLAN - * $Id: video_decoder.c,v 1.3 2001/12/09 17:01:36 sam Exp $ + * $Id: video_decoder.c,v 1.4 2001/12/10 04:53:11 sam Exp $ * * Authors: Christophe Massiot * Michel Lespinasse @@ -43,7 +43,6 @@ #include "video.h" #include "video_output.h" -#include "modules_export.h" #include "stream_control.h" #include "input_ext-dec.h" @@ -52,6 +51,8 @@ #include "vpar_pool.h" #include "video_parser.h" +#include "modules_export.h" + /* * Local prototypes */ diff --git a/plugins/mpeg_vdec/video_parser.c b/plugins/mpeg_vdec/video_parser.c index 6a4a2116c8..248d3ef757 100644 --- a/plugins/mpeg_vdec/video_parser.c +++ b/plugins/mpeg_vdec/video_parser.c @@ -2,7 +2,7 @@ * video_parser.c : video parser thread ***************************************************************************** * Copyright (C) 1999-2001 VideoLAN - * $Id: video_parser.c,v 1.6 2001/12/07 18:33:08 sam Exp $ + * $Id: video_parser.c,v 1.7 2001/12/10 04:53:11 sam Exp $ * * Authors: Christophe Massiot * Samuel Hocevar @@ -47,12 +47,10 @@ #include "intf_msg.h" #include "threads.h" #include "mtime.h" -#include "modules.h" #include "video.h" #include "video_output.h" -#include "modules_export.h" #include "stream_control.h" #include "input_ext-dec.h" @@ -60,6 +58,8 @@ #include "vpar_pool.h" #include "video_parser.h" +#include "modules.h" +#include "modules_export.h" /* * Local prototypes diff --git a/plugins/mpeg_vdec/vpar_blocks.c b/plugins/mpeg_vdec/vpar_blocks.c index 871f892593..fa83662a2b 100644 --- a/plugins/mpeg_vdec/vpar_blocks.c +++ b/plugins/mpeg_vdec/vpar_blocks.c @@ -2,7 +2,7 @@ * vpar_blocks.c : blocks parsing ***************************************************************************** * Copyright (C) 1999-2001 VideoLAN - * $Id: vpar_blocks.c,v 1.3 2001/12/09 17:01:37 sam Exp $ + * $Id: vpar_blocks.c,v 1.4 2001/12/10 04:53:11 sam Exp $ * * Authors: Michel Lespinasse * Aaron Holtzman @@ -38,17 +38,17 @@ #include "video.h" #include "video_output.h" -#include "modules_export.h" #include "stream_control.h" #include "input_ext-dec.h" - #include "vdec_ext-plugins.h" #include "vpar_pool.h" #include "video_parser.h" #include "vpar_blocks.h" +#include "modules_export.h" + /* * Welcome to vpar_blocks.c ! Here's where the heavy processor-critical parsing * task is done. This file is divided in several parts : diff --git a/plugins/mpeg_vdec/vpar_headers.c b/plugins/mpeg_vdec/vpar_headers.c index b9f22eda83..f694f6763a 100644 --- a/plugins/mpeg_vdec/vpar_headers.c +++ b/plugins/mpeg_vdec/vpar_headers.c @@ -2,7 +2,7 @@ * vpar_headers.c : headers parsing ***************************************************************************** * Copyright (C) 1999-2001 VideoLAN - * $Id: vpar_headers.c,v 1.3 2001/12/09 17:01:37 sam Exp $ + * $Id: vpar_headers.c,v 1.4 2001/12/10 04:53:11 sam Exp $ * * Authors: Christophe Massiot * Stéphane Borel @@ -38,16 +38,16 @@ #include "video.h" #include "video_output.h" -#include "modules_export.h" #include "stream_control.h" #include "input_ext-dec.h" - #include "vdec_ext-plugins.h" #include "vpar_pool.h" #include "video_parser.h" #include "video_decoder.h" +#include "modules_export.h" + /* * Local prototypes */ diff --git a/plugins/mpeg_vdec/vpar_pool.c b/plugins/mpeg_vdec/vpar_pool.c index 2b30102ff9..60be7419d5 100644 --- a/plugins/mpeg_vdec/vpar_pool.c +++ b/plugins/mpeg_vdec/vpar_pool.c @@ -2,7 +2,7 @@ * vpar_pool.c : management of the pool of decoder threads ***************************************************************************** * Copyright (C) 2001 VideoLAN - * $Id: vpar_pool.c,v 1.3 2001/12/09 17:01:37 sam Exp $ + * $Id: vpar_pool.c,v 1.4 2001/12/10 04:53:11 sam Exp $ * * Authors: Christophe Massiot * @@ -37,16 +37,16 @@ #include "video.h" #include "video_output.h" -#include "modules_export.h" #include "stream_control.h" #include "input_ext-dec.h" - #include "vdec_ext-plugins.h" #include "vpar_pool.h" #include "video_parser.h" #include "video_decoder.h" +#include "modules_export.h" + /* * Local prototypes */ diff --git a/plugins/mpeg_vdec/vpar_synchro.c b/plugins/mpeg_vdec/vpar_synchro.c index 31066ad47c..3df308cf02 100644 --- a/plugins/mpeg_vdec/vpar_synchro.c +++ b/plugins/mpeg_vdec/vpar_synchro.c @@ -2,7 +2,7 @@ * vpar_synchro.c : frame dropping routines ***************************************************************************** * Copyright (C) 1999-2001 VideoLAN - * $Id: vpar_synchro.c,v 1.3 2001/12/07 18:33:08 sam Exp $ + * $Id: vpar_synchro.c,v 1.4 2001/12/10 04:53:11 sam Exp $ * * Authors: Christophe Massiot * Samuel Hocevar @@ -106,7 +106,6 @@ #include "video.h" #include "video_output.h" -#include "modules_export.h" #include "stream_control.h" #include "input_ext-dec.h" @@ -114,6 +113,7 @@ #include "vpar_pool.h" #include "video_parser.h" +#include "modules_export.h" /* * Local prototypes diff --git a/plugins/qnx/Makefile b/plugins/qnx/Makefile index 7de8cfa2c3..8b5889a10c 100644 --- a/plugins/qnx/Makefile +++ b/plugins/qnx/Makefile @@ -23,7 +23,7 @@ include ../../Makefile.modules # ../qnx.so: $(PLUGIN_C) - $(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS) $(LIB_QNX) + $(CC) -o $@ $^ $(PLCFLAGS) $(LIB_QNX) ../qnx.a: $(BUILTIN_C) ar r $@ $^ diff --git a/plugins/qt/Makefile b/plugins/qt/Makefile index e73176f83d..25c7a2acd0 100644 --- a/plugins/qt/Makefile +++ b/plugins/qt/Makefile @@ -35,7 +35,7 @@ $(BUILTIN_QT:%.o=%.moc): BUILTIN_%.moc: %.cpp # ../qt.so: $(PLUGIN_QT) - $(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS) $(LIB_QT) + $(CC) -o $@ $^ $(PLCFLAGS) $(LIB_QT) ../qt.a: $(BUILTIN_QT) ar r $@ $^ diff --git a/plugins/sdl/Makefile b/plugins/sdl/Makefile index b7a66f79ed..3ccd0eabac 100644 --- a/plugins/sdl/Makefile +++ b/plugins/sdl/Makefile @@ -31,7 +31,7 @@ $(BUILTIN_SDL): BUILTIN_%.o: %.c # ../sdl.so: $(PLUGIN_SDL) - $(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS) $(LIB_SDL) + $(CC) -o $@ $^ $(PLCFLAGS) $(LIB_SDL) ../sdl.a: $(BUILTIN_SDL) ar r $@ $^ diff --git a/plugins/spudec/Makefile b/plugins/spudec/Makefile index 01a91af64f..bce1907cb9 100644 --- a/plugins/spudec/Makefile +++ b/plugins/spudec/Makefile @@ -21,7 +21,7 @@ include ../../Makefile.modules # ../spudec.so: $(PLUGIN_C) - $(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS) + $(CC) -o $@ $^ $(PLCFLAGS) ../spudec.a: $(BUILTIN_C) ar r $@ $^ diff --git a/plugins/spudec/spu_decoder.c b/plugins/spudec/spu_decoder.c index 321c1a9d20..50e0b86c93 100644 --- a/plugins/spudec/spu_decoder.c +++ b/plugins/spudec/spu_decoder.c @@ -2,7 +2,7 @@ * spu_decoder.c : spu decoder thread ***************************************************************************** * Copyright (C) 2000-2001 VideoLAN - * $Id: spu_decoder.c,v 1.1 2001/12/09 17:01:37 sam Exp $ + * $Id: spu_decoder.c,v 1.2 2001/12/10 04:53:11 sam Exp $ * * Authors: Samuel Hocevar * @@ -48,13 +48,14 @@ #include "video.h" #include "video_output.h" -#include "modules.h" -#include "modules_export.h" #include "stream_control.h" #include "input_ext-dec.h" #include "spu_decoder.h" +#include "modules.h" +#include "modules_export.h" + /***************************************************************************** * Local prototypes *****************************************************************************/ diff --git a/plugins/text/Makefile b/plugins/text/Makefile index ebc27261ec..ea58661848 100644 --- a/plugins/text/Makefile +++ b/plugins/text/Makefile @@ -34,7 +34,7 @@ include ../../Makefile.modules $(RANLIB) $@ ../rc.so: $(PLUGIN_RC) - $(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS) $(LIB_RC) + $(CC) -o $@ $^ $(PLCFLAGS) $(LIB_RC) ../rc.a: $(BUILTIN_RC) ar r $@ $^ diff --git a/plugins/vcd/Makefile b/plugins/vcd/Makefile index 25c89ca20e..cba1426ca2 100644 --- a/plugins/vcd/Makefile +++ b/plugins/vcd/Makefile @@ -31,7 +31,7 @@ $(BUILTIN_VCD): BUILTIN_%.o: %.c # ../vcd.so: $(PLUGIN_VCD) - $(CC) $(PCFLAGS) -o $@ $(PLUGIN_VCD) $(PLCFLAGS) + $(CC) -o $@ $(PLUGIN_VCD) $(PLCFLAGS) ../vcd.a: $(BUILTIN_VCD) ar r $@ $(BUILTIN_VCD) diff --git a/plugins/x11/Makefile b/plugins/x11/Makefile index 4ef99b50d3..7d4289d888 100644 --- a/plugins/x11/Makefile +++ b/plugins/x11/Makefile @@ -9,15 +9,15 @@ PLUGIN_X11 = x11.o vout_x11.o PLUGIN_XVIDEO = xvideo.o vout_xvideo.o -PLUGIN_XCOMMON = vout_common.o +PLUGIN_COMMON = vout_common.o BUILTIN_X11 = $(PLUGIN_X11:%.o=BUILTIN_X11_%.o) \ - $(PLUGIN_XCOMMON:%.o=BUILTIN_X11_%.o) + $(PLUGIN_COMMON:%.o=BUILTIN_X11_%.o) BUILTIN_XVIDEO = $(PLUGIN_XVIDEO:%.o=BUILTIN_XVIDEO_%.o) \ - $(PLUGIN_XCOMMON:%.o=BUILTIN_XVIDEO_%.o) + $(PLUGIN_COMMON:%.o=BUILTIN_XVIDEO_%.o) -PLUGIN_C = $(PLUGIN_X11) $(PLUGIN_XVIDEO) $(PLUGIN_XCOMMON) -ALL_OBJ = $(PLUGIN_C) $(BUILTIN_X11) $(BUILTIN_XVIDEO) +ALL_OBJ = $(PLUGIN_X11) $(PLUGIN_XVIDEO) $(PLUGIN_COMMON) \ + $(PLUGIN_COMMON:%.o=%_xvideo.o) $(BUILTIN_X11) $(BUILTIN_XVIDEO) # # Virtual targets @@ -25,10 +25,24 @@ ALL_OBJ = $(PLUGIN_C) $(BUILTIN_X11) $(BUILTIN_XVIDEO) include ../../Makefile.modules +# X11 +$(PLUGIN_X11) $(PLUGIN_COMMON): %.o: .dep/%.d +$(PLUGIN_X11) $(PLUGIN_COMMON): %.o: %.c + $(CC) $(CFLAGS) $(PCFLAGS) $(CFLAGS_X11) -DPLUGIN -DMODULE_NAME=x11 -c -o $@ $< + $(BUILTIN_X11): BUILTIN_X11_%.o: .dep/%.d $(BUILTIN_X11): BUILTIN_X11_%.o: %.c $(CC) $(CFLAGS) $(CFLAGS_X11) -DBUILTIN -DMODULE_NAME=x11 -c -o $@ $< +# XVideo +$(PLUGIN_XVIDEO): %.o: .dep/%.d +$(PLUGIN_XVIDEO): %.o: %.c + $(CC) $(CFLAGS) $(PCFLAGS) $(CFLAGS_XVIDEO) -DPLUGIN -DMODULE_NAME=xvideo -c -o $@ $< + +$(PLUGIN_COMMON:%.o=%_xvideo.o): %_xvideo.o: .dep/%.d +$(PLUGIN_COMMON:%.o=%_xvideo.o): %_xvideo.o: %.c + $(CC) $(CFLAGS) $(PCFLAGS) $(CFLAGS_XVIDEO) -DPLUGIN -DMODULE_NAME=xvideo -c -o $@ $< + $(BUILTIN_XVIDEO): BUILTIN_XVIDEO_%.o: .dep/%.d $(BUILTIN_XVIDEO): BUILTIN_XVIDEO_%.o: %.c $(CC) $(CFLAGS) $(CFLAGS_XVIDEO) -DBUILTIN -DMODULE_NAME=xvideo -c -o $@ $< @@ -37,15 +51,15 @@ $(BUILTIN_XVIDEO): BUILTIN_XVIDEO_%.o: %.c # Real targets # -../x11.so: $(PLUGIN_X11) - $(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS) $(LIB_X11) +../x11.so: $(PLUGIN_X11) $(PLUGIN_COMMON) + $(CC) -o $@ $^ $(PLCFLAGS) $(LIB_X11) ../x11.a: $(BUILTIN_X11) ar r $@ $^ $(RANLIB) $@ -../xvideo.so: $(PLUGIN_XVIDEO) - $(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS) $(LIB_XVIDEO) +../xvideo.so: $(PLUGIN_XVIDEO) $(PLUGIN_COMMON:%.o=%_xvideo.o) + $(CC) -o $@ $^ $(PLCFLAGS) $(LIB_XVIDEO) ../xvideo.a: $(BUILTIN_XVIDEO) ar r $@ $^ diff --git a/po/.cvsignore b/po/.cvsignore new file mode 100644 index 0000000000..8f58e9b9db --- /dev/null +++ b/po/.cvsignore @@ -0,0 +1,4 @@ +Makefile +Makefile.in +POTFILES +*.mo diff --git a/po/Makefile.in.in b/po/Makefile.in.in new file mode 100644 index 0000000000..61e3f3ce44 --- /dev/null +++ b/po/Makefile.in.in @@ -0,0 +1,206 @@ +# Makefile for program source directory in GNU NLS utilities package. +# Copyright (C) 1995-1997, 2000, 2001 by Ulrich Drepper +# +# This file file be copied and used freely without restrictions. It can +# be used in projects which are not available under the GNU Public License +# but which still want to provide support for the GNU gettext functionality. +# Please note that the actual code is *not* freely available. + +PACKAGE = @PACKAGE@ +VERSION = @VERSION@ + +SHELL = /bin/sh +@SET_MAKE@ + +srcdir = @srcdir@ +top_srcdir = @top_srcdir@ +top_builddir = .. +VPATH = @srcdir@ + +prefix = @prefix@ +exec_prefix = @exec_prefix@ +datadir = @datadir@ +localedir = $(datadir)/locale +gettextsrcdir = $(datadir)/gettext/po +subdir = po + +INSTALL = @INSTALL@ +INSTALL_DATA = @INSTALL_DATA@ +MKINSTALLDIRS = @MKINSTALLDIRS@ +mkinstalldirs = $(SHELL) `case "$(MKINSTALLDIRS)" in /*) echo "$(MKINSTALLDIRS)" ;; *) echo "$(top_builddir)/$(MKINSTALLDIRS)" ;; esac` + +CC = @CC@ +GMSGFMT = @GMSGFMT@ +MSGFMT = @MSGFMT@ +XGETTEXT = @XGETTEXT@ +MSGMERGE = msgmerge + +DEFS = @DEFS@ +CFLAGS = @CFLAGS@ +CPPFLAGS = @CPPFLAGS@ + +INCLUDES = -I.. -I$(top_srcdir)/intl + +COMPILE = $(CC) -c $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $(XCFLAGS) + +POFILES = @POFILES@ +GMOFILES = @GMOFILES@ +DISTFILES = ChangeLog Makefile.in.in POTFILES.in $(PACKAGE).pot \ +$(POFILES) $(GMOFILES) + +POTFILES = \ + +CATALOGS = @CATALOGS@ + +.SUFFIXES: +.SUFFIXES: .c .o .po .pox .gmo .mo + +.c.o: + $(COMPILE) $< + +.po.pox: + $(MAKE) $(PACKAGE).pot + $(MSGMERGE) $< $(srcdir)/$(PACKAGE).pot -o $*.pox + +.po.mo: + $(MSGFMT) -o $@ $< + +.po.gmo: + file=$(srcdir)/`echo $* | sed 's,.*/,,'`.gmo \ + && rm -f $$file && $(GMSGFMT) --statistics -o $$file $< + + +all: all-@USE_NLS@ + +all-yes: $(CATALOGS) +all-no: + +# Note: Target 'all' must not depend on target '$(srcdir)/$(PACKAGE).pot', +# otherwise packages like GCC can not be built if only parts of the source +# have been downloaded. + +$(srcdir)/$(PACKAGE).pot: $(POTFILES) $(srcdir)/POTFILES.in + $(XGETTEXT) --default-domain=$(PACKAGE) --directory=$(top_srcdir) \ + --add-comments --keyword=_ --keyword=N_ \ + --files-from=$(srcdir)/POTFILES.in \ + && test ! -f $(PACKAGE).po \ + || ( rm -f $(srcdir)/$(PACKAGE).pot \ + && mv $(PACKAGE).po $(srcdir)/$(PACKAGE).pot ) + + +install: install-exec install-data +install-exec: +install-data: install-data-@USE_NLS@ + if test "$(PACKAGE)" = "gettext"; then \ + $(mkinstalldirs) $(DESTDIR)$(gettextsrcdir); \ + $(INSTALL_DATA) $(srcdir)/Makefile.in.in \ + $(DESTDIR)$(gettextsrcdir)/Makefile.in.in; \ + else \ + : ; \ + fi +install-data-no: all +install-data-yes: all + $(mkinstalldirs) $(DESTDIR)$(datadir) + @catalogs='$(CATALOGS)'; \ + for cat in $$catalogs; do \ + cat=`basename $$cat`; \ + lang=`echo $$cat | sed 's/\.gmo$$//'`; \ + dir=$(localedir)/$$lang/LC_MESSAGES; \ + $(mkinstalldirs) $(DESTDIR)$$dir; \ + if test -r $$cat; then \ + $(INSTALL_DATA) $$cat $(DESTDIR)$$dir/$(PACKAGE).mo; \ + echo "installing $$cat as $(DESTDIR)$$dir/$(PACKAGE).mo"; \ + else \ + $(INSTALL_DATA) $(srcdir)/$$cat $(DESTDIR)$$dir/$(PACKAGE).mo; \ + echo "installing $(srcdir)/$$cat as" \ + "$(DESTDIR)$$dir/$(PACKAGE).mo"; \ + fi; \ + done + +# Define this as empty until I found a useful application. +installcheck: + +uninstall: + catalogs='$(CATALOGS)'; \ + for cat in $$catalogs; do \ + cat=`basename $$cat`; \ + lang=`echo $$cat | sed 's/\.gmo$$//'`; \ + rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(PACKAGE).mo; \ + done + if test "$(PACKAGE)" = "gettext"; then \ + rm -f $(DESTDIR)$(gettextsrcdir)/Makefile.in.in; \ + else \ + : ; \ + fi + +check: all + +dvi info tags TAGS ID: + +mostlyclean: + rm -f core core.* *.pox $(PACKAGE).po *.new.po + rm -fr *.o + +clean: mostlyclean + +distclean: clean + rm -f Makefile Makefile.in POTFILES *.mo + +maintainer-clean: distclean + @echo "This command is intended for maintainers to use;" + @echo "it deletes files that may require special tools to rebuild." + rm -f $(GMOFILES) + +distdir = ../$(PACKAGE)-$(VERSION)/$(subdir) +dist distdir: + $(MAKE) update-po + @$(MAKE) dist2 +# This is a separate target because 'update-po' must be executed before. +dist2: $(DISTFILES) + dists="$(DISTFILES)"; \ + for file in $$dists; do \ + cp -p $(srcdir)/$$file $(distdir); \ + done + +update-po: Makefile + $(MAKE) $(PACKAGE).pot + if test "$(PACKAGE)" = "gettext"; then PATH=`pwd`/../src:$$PATH; fi; \ + cd $(srcdir); \ + catalogs='$(GMOFILES)'; \ + for cat in $$catalogs; do \ + cat=`basename $$cat`; \ + lang=`echo $$cat | sed 's/\.gmo$$//'`; \ + echo "$$lang:"; \ + if $(MSGMERGE) $$lang.po $(PACKAGE).pot -o $$lang.new.po; then \ + mv -f $$lang.new.po $$lang.po; \ + else \ + echo "msgmerge for $$cat failed!"; \ + rm -f $$lang.new.po; \ + fi; \ + done + $(MAKE) update-gmo + +update-gmo: Makefile $(GMOFILES) + @: + +POTFILES: POTFILES.in + ( if test 'x$(srcdir)' != 'x.'; then \ + posrcprefix='$(top_srcdir)/'; \ + else \ + posrcprefix="../"; \ + fi; \ + rm -f $@-t $@ \ + && (sed -e '/^#/d' -e '/^[ ]*$$/d' \ + -e "s@.*@ $$posrcprefix& \\\\@" < $(srcdir)/$@.in \ + | sed -e '$$s/\\$$//') > $@-t \ + && chmod a-w $@-t \ + && mv $@-t $@ ) + +Makefile: Makefile.in.in ../config.status POTFILES + cd .. \ + && CONFIG_FILES=$(subdir)/$@.in CONFIG_HEADERS= \ + $(SHELL) ./config.status + +# Tell versions [3.59,3.63) of GNU make not to export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff --git a/po/POTFILES.in b/po/POTFILES.in new file mode 100644 index 0000000000..b23eb85fbc --- /dev/null +++ b/po/POTFILES.in @@ -0,0 +1,2 @@ +plugins/gtk/gnome_interface.c +plugins/gtk/gtk_interface.c diff --git a/po/de.po b/po/de.po new file mode 100644 index 0000000000..b82bd60454 --- /dev/null +++ b/po/de.po @@ -0,0 +1,939 @@ +# German locale definition for vlc +# Copyright (C) 1999, 2000 VideoLAN +# +# Thomas Graf +# +msgid "" +msgstr "" +"Project-Id-Version: vlc 0.73.3\n" +"POT-Creation-Date: 2001-05-29 21:07+0200\n" +"PO-Revision-Date: 2001-05-19 01:42+0200\n" +"Last-Translator: Thomas Graf \n" +"Language-Team: LANGUAGE \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=iso-8859-1\n" +"Content-Transfer-Encoding: 8-bit\n" + +#: plugins/gtk/gnome_interface.c:23 plugins/gtk/gnome_interface.c:733 +#: plugins/gtk/gtk_interface.c:151 plugins/gtk/gtk_interface.c:1083 +msgid "_Open File..." +msgstr "Datei _öffnen..." + +#: plugins/gtk/gnome_interface.c:24 plugins/gtk/gnome_interface.c:338 +#: plugins/gtk/gnome_interface.c:734 plugins/gtk/gtk_interface.c:159 +#: plugins/gtk/gtk_interface.c:452 plugins/gtk/gtk_interface.c:1091 +msgid "Open a File" +msgstr "Datei öffnen" + +#: plugins/gtk/gnome_interface.c:30 plugins/gtk/gnome_interface.c:740 +#: plugins/gtk/gtk_interface.c:166 plugins/gtk/gtk_interface.c:1095 +msgid "Open _Disc..." +msgstr "_DVD/VCD laden..." + +#: plugins/gtk/gnome_interface.c:31 plugins/gtk/gnome_interface.c:350 +#: plugins/gtk/gnome_interface.c:741 plugins/gtk/gtk_interface.c:174 +#: plugins/gtk/gtk_interface.c:463 plugins/gtk/gtk_interface.c:1103 +msgid "Open a DVD or VCD" +msgstr "DVD/VCD laden" + +#: plugins/gtk/gnome_interface.c:37 plugins/gtk/gnome_interface.c:747 +#: plugins/gtk/gtk_interface.c:181 plugins/gtk/gtk_interface.c:1107 +msgid "_Network Stream..." +msgstr "_Netzwerk Stream..." + +#: plugins/gtk/gnome_interface.c:38 plugins/gtk/gnome_interface.c:362 +#: plugins/gtk/gnome_interface.c:748 plugins/gtk/gtk_interface.c:189 +#: plugins/gtk/gtk_interface.c:474 plugins/gtk/gtk_interface.c:1115 +msgid "Select a Network Stream" +msgstr "Netzwerk Stream laden" + +#: plugins/gtk/gnome_interface.c:51 plugins/gtk/gtk_interface.c:237 +msgid "_Hide interface" +msgstr "Oberfläche _verstecken" + +#: plugins/gtk/gnome_interface.c:58 plugins/gtk/gnome_interface.c:811 +#: plugins/gtk/gtk_interface.c:249 plugins/gtk/gtk_interface.c:973 +msgid "_Fullscreen" +msgstr "_Vollbild" + +#: plugins/gtk/gnome_interface.c:66 plugins/gtk/gtk_interface.c:268 +msgid "_Title" +msgstr "_Titel" + +#: plugins/gtk/gnome_interface.c:67 +msgid "Choose title" +msgstr "Titel festlegen" + +#: plugins/gtk/gnome_interface.c:73 plugins/gtk/gtk_interface.c:281 +msgid "_Chapter" +msgstr "_Kapitel" + +#: plugins/gtk/gnome_interface.c:74 +msgid "Choose chapter" +msgstr "Kapitel festlegen" + +#: plugins/gtk/gnome_interface.c:80 plugins/gtk/gnome_interface.c:847 +#: plugins/gtk/gtk_interface.c:293 plugins/gtk/gtk_interface.c:1029 +msgid "An_gle" +msgstr "Wi_nkel" + +#: plugins/gtk/gnome_interface.c:81 +msgid "Choose angle" +msgstr "Winkel festlegen" + +#: plugins/gtk/gnome_interface.c:88 plugins/gtk/gtk_interface.c:313 +msgid "_Playlist..." +msgstr "_Playlist..." + +#: plugins/gtk/gnome_interface.c:89 plugins/gtk/gtk_interface.c:321 +msgid "Open the playlist window" +msgstr "Playlist Fenster öffnen" + +#: plugins/gtk/gnome_interface.c:95 plugins/gtk/gtk_interface.c:325 +msgid "_Modules..." +msgstr "_Module" + +#: plugins/gtk/gnome_interface.c:96 plugins/gtk/gtk_interface.c:334 +msgid "Open the plugin manager" +msgstr "Plugin Manager öffnen" + +#: plugins/gtk/gnome_interface.c:107 plugins/gtk/gnome_interface.c:854 +#: plugins/gtk/gtk_interface.c:1041 +msgid "_Audio" +msgstr "_Audio" + +#: plugins/gtk/gnome_interface.c:108 plugins/gtk/gnome_interface.c:855 +msgid "Select audio channel" +msgstr "Audio Kanal festlegen" + +#: plugins/gtk/gnome_interface.c:114 plugins/gtk/gnome_interface.c:861 +#: plugins/gtk/gtk_interface.c:369 plugins/gtk/gtk_interface.c:1053 +msgid "_Subtitles" +msgstr "_Untertitel" + +#: plugins/gtk/gnome_interface.c:115 +msgid "Select subtitle unit" +msgstr "Untertitel festlegen" + +#: plugins/gtk/gnome_interface.c:188 plugins/gtk/gtk_interface.c:107 +#: plugins/gtk/gtk_interface.c:1265 +msgid "VideoLAN Client" +msgstr "VideoLAN Client" + +#: plugins/gtk/gnome_interface.c:337 plugins/gtk/gnome_interface.c:1580 +#: plugins/gtk/gnome_interface.c:2152 plugins/gtk/gtk_interface.c:451 +#: plugins/gtk/gtk_interface.c:1985 plugins/gtk/gtk_interface.c:2102 +#: plugins/gtk/gtk_interface.c:2362 +msgid "File" +msgstr "Datei" + +#: plugins/gtk/gnome_interface.c:349 plugins/gtk/gnome_interface.c:1573 +#: plugins/gtk/gnome_interface.c:2219 plugins/gtk/gtk_interface.c:462 +#: plugins/gtk/gtk_interface.c:1978 plugins/gtk/gtk_interface.c:2455 +msgid "Disc" +msgstr "DVD/VCD" + +#: plugins/gtk/gnome_interface.c:361 plugins/gtk/gtk_interface.c:473 +msgid "Net" +msgstr "Netzwerk" + +#: plugins/gtk/gnome_interface.c:375 plugins/gtk/gnome_interface.c:782 +#: plugins/gtk/gtk_interface.c:486 plugins/gtk/gtk_interface.c:928 +msgid "Back" +msgstr "Zurück" + +#: plugins/gtk/gnome_interface.c:376 plugins/gtk/gtk_interface.c:487 +msgid "Go Backwards" +msgstr "Zurück gehen" + +#: plugins/gtk/gnome_interface.c:388 plugins/gtk/gnome_interface.c:775 +#: plugins/gtk/gtk_interface.c:498 plugins/gtk/gtk_interface.c:920 +msgid "Stop" +msgstr "Stop" + +#: plugins/gtk/gnome_interface.c:389 plugins/gtk/gtk_interface.c:499 +msgid "Stop Stream" +msgstr "Stream stoppen" + +#: plugins/gtk/gnome_interface.c:401 plugins/gtk/gnome_interface.c:761 +#: plugins/gtk/gtk_interface.c:510 +msgid "Play" +msgstr "Abspielen" + +#: plugins/gtk/gnome_interface.c:402 plugins/gtk/gtk_interface.c:511 +msgid "Play Stream" +msgstr "Stream abspielen" + +#: plugins/gtk/gnome_interface.c:413 plugins/gtk/gnome_interface.c:768 +#: plugins/gtk/gtk_interface.c:521 plugins/gtk/gtk_interface.c:912 +msgid "Pause" +msgstr "Pause" + +#: plugins/gtk/gnome_interface.c:414 plugins/gtk/gtk_interface.c:522 +msgid "Pause Stream" +msgstr "Stream pausieren" + +#: plugins/gtk/gnome_interface.c:426 plugins/gtk/gnome_interface.c:789 +#: plugins/gtk/gtk_interface.c:533 plugins/gtk/gtk_interface.c:936 +msgid "Slow" +msgstr "Langsam" + +#: plugins/gtk/gnome_interface.c:427 plugins/gtk/gtk_interface.c:534 +msgid "Play Slower" +msgstr "Langsamer abspielen" + +#: plugins/gtk/gnome_interface.c:439 plugins/gtk/gnome_interface.c:796 +#: plugins/gtk/gtk_interface.c:545 plugins/gtk/gtk_interface.c:944 +msgid "Fast" +msgstr "Schnell" + +#: plugins/gtk/gnome_interface.c:440 plugins/gtk/gtk_interface.c:546 +msgid "Play Faster" +msgstr "Schneller abspielen" + +#: plugins/gtk/gnome_interface.c:454 plugins/gtk/gnome_interface.c:1690 +#: plugins/gtk/gnome_interface.c:1714 plugins/gtk/gnome_interface.c:2788 +#: plugins/gtk/gtk_interface.c:559 plugins/gtk/gtk_interface.c:1949 +#: plugins/gtk/gtk_interface.c:3039 +msgid "Playlist" +msgstr "Playlist" + +#: plugins/gtk/gnome_interface.c:455 plugins/gtk/gtk_interface.c:560 +msgid "Open Playlist" +msgstr "Playliste öffnen" + +#: plugins/gtk/gnome_interface.c:466 plugins/gtk/gnome_interface.c:826 +#: plugins/gtk/gtk_interface.c:570 plugins/gtk/gtk_interface.c:656 +#: plugins/gtk/gtk_interface.c:700 plugins/gtk/gtk_interface.c:997 +msgid "Prev" +msgstr "Vorheriges" + +#: plugins/gtk/gnome_interface.c:467 plugins/gtk/gtk_interface.c:571 +msgid "Previous File" +msgstr "Vorherige Datei" + +#: plugins/gtk/gnome_interface.c:478 plugins/gtk/gnome_interface.c:819 +#: plugins/gtk/gtk_interface.c:581 plugins/gtk/gtk_interface.c:664 +#: plugins/gtk/gtk_interface.c:708 plugins/gtk/gtk_interface.c:990 +msgid "Next" +msgstr "Nächstes" + +#: plugins/gtk/gnome_interface.c:479 plugins/gtk/gtk_interface.c:582 +msgid "Next File" +msgstr "Nächste Datei" + +#: plugins/gtk/gnome_interface.c:493 plugins/gtk/gtk_interface.c:589 +msgid "-:--:--" +msgstr "-:--:--" + +#: plugins/gtk/gnome_interface.c:529 +msgid "DVD " +msgstr "DVD" + +#: plugins/gtk/gnome_interface.c:543 +msgid "Title:" +msgstr "Titel:" + +#: plugins/gtk/gnome_interface.c:550 plugins/gtk/gtk_interface.c:649 +msgid "--" +msgstr "--" + +#: plugins/gtk/gnome_interface.c:563 +msgid "Select previous title" +msgstr "Vorheriger Titel festlegen" + +#: plugins/gtk/gnome_interface.c:588 +msgid "Chapter:" +msgstr "Kapitel:" + +#: plugins/gtk/gnome_interface.c:595 plugins/gtk/gtk_interface.c:693 +msgid "---" +msgstr "---" + +#: plugins/gtk/gnome_interface.c:608 +msgid "Select previous chapter" +msgstr "Vorheriges Kapitel festlegen" + +#: plugins/gtk/gnome_interface.c:617 +msgid "Select next chapter" +msgstr "Nächstes Kapitel festlegen" + +#: plugins/gtk/gnome_interface.c:626 +msgid "No server" +msgstr "Kein Server" + +#: plugins/gtk/gnome_interface.c:639 +msgid "Network Channel:" +msgstr "Netzwerk Kanal" + +#: plugins/gtk/gnome_interface.c:804 plugins/gtk/gtk_interface.c:962 +msgid "Toggle _Interface" +msgstr "" + +#: plugins/gtk/gnome_interface.c:812 +msgid "Toggle fullscreen mode" +msgstr "In Vollbildmodus wechseln" + +#: plugins/gtk/gnome_interface.c:833 plugins/gtk/gtk_interface.c:1006 +msgid "_Jump..." +msgstr "_Springen" + +#: plugins/gtk/gnome_interface.c:834 +msgid "Got directly so specified point" +msgstr "Geh direkt zum " + +#: plugins/gtk/gnome_interface.c:840 plugins/gtk/gtk_interface.c:1017 +msgid "_Navigation" +msgstr "_Navigation" + +#: plugins/gtk/gnome_interface.c:841 +msgid "Navigate through titles and chapters" +msgstr "Durch Titel und Kapitel navigieren" + +#: plugins/gtk/gnome_interface.c:862 +msgid "Select subtitle channel" +msgstr "Untertitel festlegen" + +#: plugins/gtk/gnome_interface.c:870 plugins/gtk/gtk_interface.c:1136 +msgid "Playlist..." +msgstr "Playlist..." + +#: plugins/gtk/gnome_interface.c:1067 plugins/gtk/gtk_interface.c:1273 +msgid "(C) 1996, 1997, 1998, 1999, 2000, 2001 - the VideoLAN Team" +msgstr "(C) 1996, 1997, 1998, 1999, 2000, 2001 - the VideoLAN Team" + +#: plugins/gtk/gnome_interface.c:1069 plugins/gtk/gtk_interface.c:1299 +msgid "" +"This is the VideoLAN client, a DVD and MPEG player. It can play MPEG and " +"MPEG 2 files from a file or from a network source." +msgstr "" +"VideoLAN ist ein DVD und MPEG player, der MPEG und MPEG 2 Dateien lokal oder " +"von einer Quelle im Netzwerk abspielen kann." + +#: plugins/gtk/gnome_interface.c:1083 +msgid "Open File" +msgstr "Datei öffnen" + +#: plugins/gtk/gnome_interface.c:1120 +msgid "Modules" +msgstr "Module" + +#: plugins/gtk/gnome_interface.c:1128 +msgid "" +"Sorry, the module manager isn't functional yet. Please retry in a later " +"version." +msgstr "" +"Der Module Manager ist noch nicht implementiert. Versuch es in einer " +"späteren Version nochmals." + +#: plugins/gtk/gnome_interface.c:1194 plugins/gtk/gtk_interface.c:1392 +msgid "Open Disc" +msgstr "DVD/VCD öffnen" + +#: plugins/gtk/gnome_interface.c:1210 plugins/gtk/gtk_interface.c:1416 +msgid "Disc type" +msgstr "DVD/VCD Typ" + +#: plugins/gtk/gnome_interface.c:1224 plugins/gtk/gtk_interface.c:628 +#: plugins/gtk/gtk_interface.c:1430 +msgid "DVD" +msgstr "DVD" + +#: plugins/gtk/gnome_interface.c:1232 plugins/gtk/gtk_interface.c:1438 +msgid "VCD" +msgstr "VCD" + +#: plugins/gtk/gnome_interface.c:1241 plugins/gtk/gtk_interface.c:1447 +msgid "Starting position" +msgstr "Startposition" + +#: plugins/gtk/gnome_interface.c:1258 plugins/gtk/gtk_interface.c:1494 +msgid "Title" +msgstr "Titel" + +#: plugins/gtk/gnome_interface.c:1268 plugins/gtk/gtk_interface.c:1484 +msgid "Chapter" +msgstr "Kapitel" + +#: plugins/gtk/gnome_interface.c:1305 +msgid "Device name:" +msgstr "Gerätename:" + +#: plugins/gtk/gnome_interface.c:1318 plugins/gtk/gtk_interface.c:1524 +#: plugins/gtk/gtk_interface.c:2407 plugins/gtk/gtk_interface.c:2416 +msgid "/dev/dvd" +msgstr "/dev/dvd" + +#: plugins/gtk/gnome_interface.c:1388 +msgid "Network Stream" +msgstr "Netzwerk Stream" + +#: plugins/gtk/gnome_interface.c:1404 plugins/gtk/gtk_interface.c:1624 +msgid "Protocol" +msgstr "Protokoll" + +#: plugins/gtk/gnome_interface.c:1418 plugins/gtk/gnome_interface.c:2316 +#: plugins/gtk/gtk_interface.c:1638 plugins/gtk/gtk_interface.c:2562 +msgid "TS" +msgstr "TS" + +#: plugins/gtk/gnome_interface.c:1426 plugins/gtk/gnome_interface.c:2326 +#: plugins/gtk/gtk_interface.c:1646 plugins/gtk/gtk_interface.c:2572 +msgid "RTP" +msgstr "RTP" + +#: plugins/gtk/gnome_interface.c:1435 plugins/gtk/gnome_interface.c:2336 +#: plugins/gtk/gtk_interface.c:1655 plugins/gtk/gtk_interface.c:2582 +msgid "HTTP" +msgstr "HTTP" + +#: plugins/gtk/gnome_interface.c:1444 plugins/gtk/gtk_interface.c:1664 +msgid "Server" +msgstr "Server" + +#: plugins/gtk/gnome_interface.c:1461 plugins/gtk/gtk_interface.c:1701 +msgid "Address" +msgstr "Adresse" + +#: plugins/gtk/gnome_interface.c:1471 plugins/gtk/gtk_interface.c:1691 +msgid "Port" +msgstr "Port" + +#: plugins/gtk/gnome_interface.c:1490 +msgid "Port of the stream server" +msgstr "Port vom Stream-Server" + +#: plugins/gtk/gnome_interface.c:1492 plugins/gtk/gtk_interface.c:1711 +msgid "Broadcast" +msgstr "Broadcast" + +#: plugins/gtk/gnome_interface.c:1531 plugins/gtk/gnome_interface.c:2290 +#: plugins/gtk/gtk_interface.c:1745 plugins/gtk/gtk_interface.c:1754 +msgid "vls" +msgstr "vls" + +#: plugins/gtk/gnome_interface.c:1587 plugins/gtk/gnome_interface.c:2356 +#: plugins/gtk/gtk_interface.c:1992 plugins/gtk/gtk_interface.c:2592 +msgid "Network" +msgstr "Netzwerk" + +#: plugins/gtk/gnome_interface.c:1594 plugins/gtk/gnome_interface.c:1733 +#: plugins/gtk/gtk_interface.c:1999 +msgid "Url" +msgstr "URL" + +#: plugins/gtk/gnome_interface.c:1606 plugins/gtk/gtk_interface.c:2020 +msgid "All" +msgstr "Alle" + +#: plugins/gtk/gnome_interface.c:1613 +msgid "Item" +msgstr "Element" + +#: plugins/gtk/gnome_interface.c:1625 +msgid "Crop" +msgstr "Kürzen" + +#: plugins/gtk/gnome_interface.c:1632 +msgid "Invert" +msgstr "Umkehren" + +#: plugins/gtk/gnome_interface.c:1639 +msgid "Select" +msgstr "Auswählen" + +#: plugins/gtk/gnome_interface.c:1651 plugins/gtk/gtk_interface.c:1964 +msgid "Add" +msgstr "Hinzufügen" + +#: plugins/gtk/gnome_interface.c:1658 plugins/gtk/gtk_interface.c:2006 +msgid "Delete" +msgstr "Löschen" + +#: plugins/gtk/gnome_interface.c:1665 plugins/gtk/gtk_interface.c:2034 +msgid "Selection" +msgstr "Selektion" + +#: plugins/gtk/gnome_interface.c:1740 plugins/gtk/gtk_interface.c:2109 +msgid "Duration" +msgstr "Dauer" + +#: plugins/gtk/gnome_interface.c:1892 +msgid "Jump to: " +msgstr "Spring zu:" + +#: plugins/gtk/gnome_interface.c:1909 plugins/gtk/gtk_interface.c:1840 +msgid "s." +msgstr "s." + +#: plugins/gtk/gnome_interface.c:1924 plugins/gtk/gtk_interface.c:1855 +msgid "m:" +msgstr "m:" + +#: plugins/gtk/gnome_interface.c:1939 plugins/gtk/gtk_interface.c:1870 +msgid "h:" +msgstr "h:" + +#: plugins/gtk/gnome_interface.c:2092 plugins/gtk/gnome_interface.c:2102 +#: plugins/gtk/gtk_interface.c:2303 +msgid "Preferences" +msgstr "Einstellungen" + +#: plugins/gtk/gnome_interface.c:2142 +msgid "Default path: " +msgstr "Standard Pfad:" + +#: plugins/gtk/gnome_interface.c:2199 +msgid "Default DVD path: " +msgstr "Standard DVD Pfad:" + +#: plugins/gtk/gnome_interface.c:2209 +msgid "Default VCD path: " +msgstr "Standard VCD Pfad:" + +#: plugins/gtk/gnome_interface.c:2236 +msgid "Default server: " +msgstr "Standard Server:" + +#: plugins/gtk/gnome_interface.c:2256 +msgid "Broadcast address: " +msgstr "Broadcast Adresse:" + +#: plugins/gtk/gnome_interface.c:2266 +msgid "Default port: " +msgstr "Standard Port: " + +#: plugins/gtk/gnome_interface.c:2307 plugins/gtk/gtk_interface.c:2543 +msgid "Broadcast mode" +msgstr "Broadcast Modus" + +#: plugins/gtk/gnome_interface.c:2346 +msgid "Default protocol: " +msgstr "Standard Protokoll: " + +#: plugins/gtk/gnome_interface.c:2373 +msgid "Default interface: " +msgstr "Standard Oberfläche: " + +#: plugins/gtk/gnome_interface.c:2398 plugins/gtk/gtk_interface.c:2639 +msgid "Interface" +msgstr "Oberfläche" + +#: plugins/gtk/gnome_interface.c:2415 plugins/gtk/gnome_interface.c:2606 +msgid "Default output: " +msgstr "Standard Ausgabe: " + +#: plugins/gtk/gnome_interface.c:2425 +msgid "Default height: " +msgstr "Standard Höhe: " + +#: plugins/gtk/gnome_interface.c:2455 +msgid "Default width: " +msgstr "Standard Breite: " + +#: plugins/gtk/gnome_interface.c:2480 plugins/gtk/gtk_interface.c:2748 +msgid "Default depth:" +msgstr "Standard Farbtiefe: " + +#: plugins/gtk/gnome_interface.c:2499 plugins/gtk/gnome_interface.c:2530 +#: plugins/gtk/gtk_interface.c:2736 plugins/gtk/gtk_interface.c:2777 +msgid "15 bits" +msgstr "15 bits" + +#: plugins/gtk/gnome_interface.c:2502 plugins/gtk/gnome_interface.c:2533 +#: plugins/gtk/gnome_interface.c:2683 plugins/gtk/gtk_interface.c:2739 +#: plugins/gtk/gtk_interface.c:2780 plugins/gtk/gtk_interface.c:2856 +msgid "16 bits" +msgstr "16 bits" + +#: plugins/gtk/gnome_interface.c:2505 plugins/gtk/gnome_interface.c:2536 +#: plugins/gtk/gtk_interface.c:2742 plugins/gtk/gtk_interface.c:2783 +msgid "32 bits" +msgstr "32 bits" + +#: plugins/gtk/gnome_interface.c:2511 plugins/gtk/gtk_interface.c:2758 +msgid "Fullscreen depth:" +msgstr "Vollbild Farbtiefe" + +#: plugins/gtk/gnome_interface.c:2542 plugins/gtk/gtk_interface.c:2809 +msgid "Fullscreen on play" +msgstr "Vollbild beim Abspielen" + +#: plugins/gtk/gnome_interface.c:2551 plugins/gtk/gtk_interface.c:2818 +msgid "Grayscale" +msgstr "Graustufen" + +#: plugins/gtk/gnome_interface.c:2560 plugins/gtk/gtk_interface.c:2799 +msgid "Gamma:" +msgstr "Gamma:" + +#: plugins/gtk/gnome_interface.c:2580 plugins/gtk/gtk_interface.c:2827 +msgid "Video" +msgstr "Video" + +#: plugins/gtk/gnome_interface.c:2597 plugins/gtk/gtk_interface.c:2947 +msgid "Spdif output" +msgstr "Spdif Ausgabe" + +#: plugins/gtk/gnome_interface.c:2631 +msgid "Frequency: " +msgstr "Frequenz: " + +#: plugins/gtk/gnome_interface.c:2650 plugins/gtk/gtk_interface.c:2871 +msgid "48000 Hz" +msgstr "48000 Hz" + +#: plugins/gtk/gnome_interface.c:2653 plugins/gtk/gtk_interface.c:2874 +msgid "44100 Hz" +msgstr "44100 Hz" + +#: plugins/gtk/gnome_interface.c:2656 +msgid "32000 Hz" +msgstr "32000 Hz" + +#: plugins/gtk/gnome_interface.c:2659 +msgid "22050 Hz" +msgstr "22050 Hz" + +#: plugins/gtk/gnome_interface.c:2664 +msgid "Quality: " +msgstr "Qualität: " + +#: plugins/gtk/gnome_interface.c:2686 plugins/gtk/gtk_interface.c:2853 +msgid "8 bits" +msgstr "8 bits" + +#: plugins/gtk/gnome_interface.c:2691 +msgid "Channels: " +msgstr "Kanäle: " + +#: plugins/gtk/gnome_interface.c:2710 plugins/gtk/gtk_interface.c:2888 +msgid "Mono" +msgstr "Mono" + +#: plugins/gtk/gnome_interface.c:2713 plugins/gtk/gtk_interface.c:2891 +msgid "Stereo" +msgstr "Stereo" + +#: plugins/gtk/gnome_interface.c:2719 plugins/gtk/gtk_interface.c:2907 +msgid "Default device:" +msgstr "Standard Adapter:" + +#: plugins/gtk/gnome_interface.c:2744 plugins/gtk/gtk_interface.c:2995 +msgid "Audio" +msgstr "Audio" + +#: plugins/gtk/gnome_interface.c:2761 plugins/gtk/gtk_interface.c:3012 +msgid "Launch on startup" +msgstr "Aufrufen beim Starten" + +#: plugins/gtk/gnome_interface.c:2770 plugins/gtk/gtk_interface.c:3030 +msgid "Loop on playlist end" +msgstr "Playlist endlos abspielen" + +#: plugins/gtk/gnome_interface.c:2779 plugins/gtk/gtk_interface.c:3021 +msgid "Enqueue as default" +msgstr "Als Standard einreihen" + +#: plugins/gtk/gnome_interface.c:2805 +msgid "Files associated with vlc" +msgstr "Zu vlc zugeordnete Dateien" + +#: plugins/gtk/gnome_interface.c:2823 plugins/gtk/gtk_interface.c:3099 +msgid "ts" +msgstr "ts" + +#: plugins/gtk/gnome_interface.c:2832 plugins/gtk/gtk_interface.c:3090 +msgid "vob" +msgstr "vob" + +#: plugins/gtk/gnome_interface.c:2841 plugins/gtk/gtk_interface.c:3081 +msgid "mp2" +msgstr "mp2" + +#: plugins/gtk/gnome_interface.c:2850 plugins/gtk/gtk_interface.c:3072 +msgid "mpeg" +msgstr "mpeg" + +#: plugins/gtk/gnome_interface.c:2859 plugins/gtk/gtk_interface.c:3108 +msgid "Messages" +msgstr "Meldungen" + +#: plugins/gtk/gnome_interface.c:2876 plugins/gtk/gtk_interface.c:3124 +msgid "Warning level: " +msgstr "Warnlevel: " + +#: plugins/gtk/gnome_interface.c:2895 plugins/gtk/gtk_interface.c:3144 +msgid "Misc" +msgstr "Anders" + +#: plugins/gtk/gtk_interface.c:133 plugins/gtk/gtk_interface.c:1065 +msgid "_File" +msgstr "_Datei" + +#: plugins/gtk/gtk_interface.c:204 plugins/gtk/gtk_interface.c:1164 +msgid "E_xit" +msgstr "B_eenden" + +#: plugins/gtk/gtk_interface.c:212 +msgid "Exit the program" +msgstr "Programm beenden" + +#: plugins/gtk/gtk_interface.c:219 +msgid "_View" +msgstr "_Ansicht" + +#: plugins/gtk/gtk_interface.c:245 +msgid "Hide the main interface window" +msgstr "Hauptfenster verstecken" + +#: plugins/gtk/gtk_interface.c:277 +msgid "Navigate through the stream" +msgstr "Durch Stream navigieren" + +#: plugins/gtk/gtk_interface.c:338 +msgid "_Settings" +msgstr "_Einstellungen" + +#: plugins/gtk/gtk_interface.c:356 +msgid "A_udio" +msgstr "A_udio" + +#: plugins/gtk/gtk_interface.c:365 +msgid "Select audio language" +msgstr "Sprache festlegen" + +#: plugins/gtk/gtk_interface.c:378 +msgid "Select sub-title" +msgstr "Untertitel festlegen" + +#: plugins/gtk/gtk_interface.c:390 plugins/gtk/gtk_interface.c:1145 +msgid "_Preferences..." +msgstr "_Einstellungen" + +#: plugins/gtk/gtk_interface.c:398 +msgid "Configure the application" +msgstr "Applikation konfigurieren" + +#: plugins/gtk/gtk_interface.c:402 +msgid "_Help" +msgstr "_Hilfe" + +#: plugins/gtk/gtk_interface.c:420 plugins/gtk/gtk_interface.c:1127 +msgid "_About..." +msgstr "_Über..." + +#: plugins/gtk/gtk_interface.c:428 +msgid "About this application" +msgstr "_Über diese Applikation" + +#: plugins/gtk/gtk_interface.c:642 +msgid "Title: " +msgstr "Titel: " + +#: plugins/gtk/gtk_interface.c:686 +msgid "Chapter: " +msgstr "Kapitel: " + +#: plugins/gtk/gtk_interface.c:723 +msgid "No server !" +msgstr "Kein Server !" + +#: plugins/gtk/gtk_interface.c:737 +msgid "Channel: " +msgstr "Kanal: " + +#: plugins/gtk/gtk_interface.c:903 +msgid "_Play" +msgstr "_Play" + +#: plugins/gtk/gtk_interface.c:1250 +msgid "About" +msgstr "Über uns" + +#: plugins/gtk/gtk_interface.c:1282 +msgid "Authors" +msgstr "Autoren" + +#: plugins/gtk/gtk_interface.c:1289 +msgid "" +"Régis Duchesne \n" +"Michel Lespinasse \n" +"Olivier Pomel \n" +"Pierre Baillet \n" +"Jean-Philippe Grimaldi \n" +"Andres Krapf \n" +"Christophe Massiot \n" +"Vincent Seguin \n" +"Benoit Steiner \n" +"Arnaud de Bossoreille de Ribou \n" +"Jean-Marc Dressler \n" +"Gaël Hendryckx \n" +"Samuel Hocevar \n" +"Brieuc Jeunhomme \n" +"Michel Kaempf \n" +"Stéphane Borel \n" +"Renaud Dartus \n" +"Henri Fallon " +msgstr "" + +#: plugins/gtk/gtk_interface.c:1314 plugins/gtk/gtk_interface.c:1538 +#: plugins/gtk/gtk_interface.c:1768 +msgid "OK" +msgstr "OK" + +#: plugins/gtk/gtk_interface.c:1337 +msgid "Select File" +msgstr "Datei festlegen" + +#: plugins/gtk/gtk_interface.c:1511 +msgid "Device name" +msgstr "Gerätename" + +#: plugins/gtk/gtk_interface.c:1545 plugins/gtk/gtk_interface.c:1775 +#: plugins/gtk/gtk_interface.c:1897 plugins/gtk/gtk_interface.c:2128 +#: plugins/gtk/gtk_interface.c:3170 +msgid "Cancel" +msgstr "Abbrechen" + +#: plugins/gtk/gtk_interface.c:1600 +msgid "Open Network" +msgstr "Netzwerk öffnen" + +#: plugins/gtk/gtk_interface.c:1817 +msgid "Jump" +msgstr "Springen" + +#: plugins/gtk/gtk_interface.c:1824 +msgid "Go to:" +msgstr "Gehe zu:" + +#: plugins/gtk/gtk_interface.c:1890 plugins/gtk/gtk_interface.c:2121 +#: plugins/gtk/gtk_interface.c:3156 +msgid "Ok" +msgstr "Ok" + +#: plugins/gtk/gtk_interface.c:2027 +msgid "Selected" +msgstr "Festgelegt" + +#: plugins/gtk/gtk_interface.c:2050 +msgid "_Crop" +msgstr "_Kürzen" + +#: plugins/gtk/gtk_interface.c:2061 +msgid "_Invert" +msgstr "_Umkehren" + +#: plugins/gtk/gtk_interface.c:2072 +msgid "_Select" +msgstr "_Festlegen" + +#: plugins/gtk/gtk_interface.c:2328 +msgid "Default path:" +msgstr "Standard Pfad:" + +#: plugins/gtk/gtk_interface.c:2353 plugins/gtk/gtk_interface.c:2437 +#: plugins/gtk/gtk_interface.c:2446 +msgid "Browse" +msgstr "Durchsuchen" + +#: plugins/gtk/gtk_interface.c:2379 +msgid "Default VCD path" +msgstr "Standard VCD Pfad" + +#: plugins/gtk/gtk_interface.c:2389 +msgid "Default DVD path:" +msgstr "Standard DVD Pfad" + +#: plugins/gtk/gtk_interface.c:2426 plugins/gtk/gtk_interface.c:2435 +msgid "/dev/cdrom" +msgstr "/dev/cdrom" + +#: plugins/gtk/gtk_interface.c:2486 +msgid "vls " +msgstr "vls" + +#: plugins/gtk/gtk_interface.c:2503 +msgid "Default server:" +msgstr "Standard server:" + +#: plugins/gtk/gtk_interface.c:2513 +msgid "Default port:" +msgstr "Standard Port:" + +#: plugins/gtk/gtk_interface.c:2533 +msgid "Broadcast address:" +msgstr "Broadcast Adresse:" + +#: plugins/gtk/gtk_interface.c:2552 +msgid "Default protocol:" +msgstr "Standard Protokoll:" + +#: plugins/gtk/gtk_interface.c:2617 plugins/gtk/gtk_interface.c:2627 +msgid "Gtk+" +msgstr "Gtk+" + +#: plugins/gtk/gtk_interface.c:2618 +msgid "Gnome" +msgstr "Gnome" + +#: plugins/gtk/gtk_interface.c:2629 +msgid "Default interface:" +msgstr "Standard Oberfläche:" + +#: plugins/gtk/gtk_interface.c:2664 plugins/gtk/gtk_interface.c:2675 +msgid "sdl" +msgstr "sdl" + +#: plugins/gtk/gtk_interface.c:2665 +msgid "xvideo" +msgstr "xvideo" + +#: plugins/gtk/gtk_interface.c:2666 +msgid "x11" +msgstr "x11" + +#: plugins/gtk/gtk_interface.c:2677 plugins/gtk/gtk_interface.c:2897 +msgid "Default output:" +msgstr "Standard Ausgabe:" + +#: plugins/gtk/gtk_interface.c:2687 +msgid "Default width:" +msgstr "Standard Breite:" + +#: plugins/gtk/gtk_interface.c:2717 +msgid "Default height:" +msgstr "Stanradrd Höhe:" + +#: plugins/gtk/gtk_interface.c:2917 +msgid "Quality:" +msgstr "Qualität:" + +#: plugins/gtk/gtk_interface.c:2927 +msgid "Frequency:" +msgstr "Frequenz:" + +#: plugins/gtk/gtk_interface.c:2937 +msgid "Channels:" +msgstr "Kanäle:" + +#: plugins/gtk/gtk_interface.c:2964 plugins/gtk/gtk_interface.c:2974 +msgid "dsp" +msgstr "dsp" + +#: plugins/gtk/gtk_interface.c:2965 +msgid "alsa" +msgstr "alsa" + +#: plugins/gtk/gtk_interface.c:2984 plugins/gtk/gtk_interface.c:2993 +msgid "/dev/dsp" +msgstr "/dev/dsp" + +#: plugins/gtk/gtk_interface.c:3056 +msgid "Types associated with vlc" +msgstr "Zu vlc zugeordnete Dateien" + +#: plugins/gtk/gtk_interface.c:3163 +msgid "Apply" +msgstr "Anwenden" diff --git a/src/interface/interface.c b/src/interface/interface.c index d263c8a05f..daaf16b69e 100644 --- a/src/interface/interface.c +++ b/src/interface/interface.c @@ -4,7 +4,7 @@ * interface, such as command line. ***************************************************************************** * Copyright (C) 1998-2001 VideoLAN - * $Id: interface.c,v 1.83 2001/12/09 17:01:37 sam Exp $ + * $Id: interface.c,v 1.84 2001/12/10 04:53:11 sam Exp $ * * Authors: Vincent Seguin * @@ -47,8 +47,6 @@ #include "interface.h" #include "intf_playlist.h" -#include "intf_channels.h" -#include "keystrokes.h" #include "video.h" #include "video_output.h" @@ -114,12 +112,6 @@ intf_thread_t* intf_Create( void ) /* Initialize mutexes */ vlc_mutex_init( &p_intf->change_lock ); - /* Load channels - the pointer will be set to NULL on failure. The - * return value is ignored since the program can work without - * channels */ - intf_LoadChannels( p_intf, main_GetPszVariable( INTF_CHANNELS_VAR, - INTF_CHANNELS_DEFAULT )); - intf_WarnMsg( 1, "intf: interface initialized"); return( p_intf ); } @@ -199,9 +191,6 @@ static void intf_Manage( intf_thread_t *p_intf ) *****************************************************************************/ void intf_Destroy( intf_thread_t *p_intf ) { - /* Unload channels */ - intf_UnloadChannels( p_intf ); - /* Destroy interfaces */ p_intf->pf_close( p_intf ); diff --git a/src/interface/intf_channels.c b/src/interface/intf_channels.c deleted file mode 100644 index 0eb6070a63..0000000000 --- a/src/interface/intf_channels.c +++ /dev/null @@ -1,330 +0,0 @@ -/***************************************************************************** - * intf_channels.c: channel handling functions - ***************************************************************************** - * Copyright (C) 1998-2001 VideoLAN - * $Id: intf_channels.c,v 1.5 2001/12/07 18:33:08 sam Exp $ - * - * Authors: Vincent Seguin - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. - *****************************************************************************/ - -/***************************************************************************** - * Preamble - *****************************************************************************/ -#include "defs.h" - -#include /* ENOMEM */ -#include /* free(), strtol() */ -#include /* FILE */ -#include /* strerror() */ - -#include "common.h" -#include "intf_msg.h" -#include "threads.h" -#include "mtime.h" - -#include "intf_channels.h" -#include "interface.h" - -/***************************************************************************** - * Local prototypes - *****************************************************************************/ -static int ParseChannel( intf_channel_t *p_channel, char *psz_str ); - -/***************************************************************************** - * intf_LoadChannels: load channels description from a file - ***************************************************************************** - * This structe describes all interface-specific data of the main (interface) - * thread. - * Each line of the file is a semicolon separated list of the following - * fields : - * integer channel number - * string channel description - * integer input method (see input.h) - * string input source - * integer input port - * integer input vlan id - * The last field must end with a semicolon. - * Comments and empty lines are not explicitely allowed, but lines with parsing - * errors are ignored without warning. - *****************************************************************************/ -int intf_LoadChannels( intf_thread_t *p_intf, char *psz_filename ) -{ - FILE * p_file; /* file */ - intf_channel_t * p_channel; /* current channel */ - char psz_line[INTF_MAX_CMD_SIZE]; /* line buffer */ - int i_index; /* channel or field index */ - - /* Set default value */ - p_intf->p_channel = NULL; - - /* Open file */ - p_file = fopen( psz_filename, "r" ); - if( p_file == NULL ) - { - intf_DbgMsg( "intf warning: cannot open %s (%s)", - psz_filename, strerror(errno) ); - return( 1 ); - } - - /* First pass: count number of lines */ - for( i_index = 0; fgets( psz_line, INTF_MAX_CMD_SIZE, p_file ) != NULL; - i_index++ ) - { - ; - } - - if( i_index != 0 ) - { - /* Allocate array and rewind - some of the lines may be invalid, - * and the array will probably be larger than the actual number of - * channels, but it has no consequences. */ - p_intf->p_channel = malloc( sizeof( intf_channel_t ) * i_index ); - if( p_intf->p_channel == NULL ) - { - intf_ErrMsg( "intf error: cannot create intf_channel_t (%s)", - strerror(ENOMEM) ); - fclose( p_file ); - return( 1 ); - } - p_channel = p_intf->p_channel; - rewind( p_file ); - - /* Second pass: read channels descriptions */ - while( fgets( psz_line, INTF_MAX_CMD_SIZE, p_file ) != NULL ) - { - if( !ParseChannel( p_channel, psz_line ) ) - { - intf_DbgMsg( "channel [%d] %s : method %d (%s:%d vlan id %d)", - p_channel->i_channel, p_channel->psz_description, - p_channel->i_input_method, - p_channel->psz_input_source, - p_channel->i_input_port, p_channel->i_input_vlan_id ); - p_channel++; - } - } - - /* Add marker at the end of the array */ - p_channel->i_channel = -1; - } - - /* Close file */ - fclose( p_file ); - return( 0 ); -} - -/***************************************************************************** - * intf_UnloadChannels: unload channels description - ***************************************************************************** - * This function free all resources allocated by LoadChannels, if any. - *****************************************************************************/ -void intf_UnloadChannels( intf_thread_t *p_intf ) -{ - int i_channel; /* channel index */ - - if( p_intf->p_channel != NULL ) - { - /* Free allocated strings */ - for( i_channel = 0; - p_intf->p_channel[ i_channel ].i_channel != -1; - i_channel++ ) - { - if( p_intf->p_channel[ i_channel ].psz_description != NULL ) - { - free( p_intf->p_channel[ i_channel ].psz_description ); - } - if( p_intf->p_channel[ i_channel ].psz_input_source != NULL ) - { - free( p_intf->p_channel[ i_channel ].psz_input_source ); - } - } - - /* Free array */ - free( p_intf->p_channel ); - p_intf->p_channel = NULL; - } -} - -/***************************************************************************** - * intf_SelectChannel: change channel - ***************************************************************************** - * Kill existing input, if any, and try to open a new one, using an input - * configuration table. - *****************************************************************************/ -int intf_SelectChannel( intf_thread_t * p_intf, int i_channel ) -{ - /* FIXME */ -#if 0 - intf_channel_t * p_channel; /* channel */ - - /* Look for channel in array */ - if( p_intf->p_channel != NULL ) - { - for( p_channel = p_intf->p_channel; p_channel->i_channel != -1; p_channel++ ) - { - if( p_channel->i_channel == i_channel ) - { - /* - * Change channel - */ - - /* Kill existing input, if any */ - if( p_intf->p_input != NULL ) - { - input_DestroyThread( p_intf->p_input, NULL ); - } - - intf_Msg("Channel %d: %s", i_channel, p_channel->psz_description ); - - /* Open a new input */ - p_intf->p_input = input_CreateThread( p_channel->i_input_method, p_channel->psz_input_source, - p_channel->i_input_port, p_channel->i_input_vlan_id, - p_intf->p_vout, p_main->p_aout, NULL ); - return( p_intf->p_input == NULL ); - } - } - } - - /* Channel does not exist */ - intf_Msg("Channel %d does not exist", i_channel ); -#endif - return( 1 ); -} - -/* Following functions are local */ - -/***************************************************************************** - * ParseChannel: parse a channel description line - ***************************************************************************** - * See intf_LoadChannels. This function return non 0 on parsing error. - *****************************************************************************/ -static int ParseChannel( intf_channel_t *p_channel, char *psz_str ) -{ - char * psz_index; /* current character */ - char * psz_end; /* end pointer for strtol */ - int i_field; /* field number, -1 on error */ - int i_field_length; /* field length, for text fields */ - - /* Set some default fields */ - p_channel->i_channel = 0; - p_channel->psz_description = NULL; - p_channel->i_input_method = 0; - p_channel->psz_input_source = NULL; - p_channel->i_input_port = 0; - p_channel->i_input_vlan_id = 0; - - /* Parse string */ - i_field = 0; - for( psz_index = psz_str; (i_field != -1) && (*psz_index != '\0'); psz_index++ ) - { - if( *psz_index == ';' ) - { - /* Mark end of field */ - *psz_index = '\0'; - - /* Parse field */ - switch( i_field++ ) - { - case 0: /* channel number */ - p_channel->i_channel = strtol( psz_str, &psz_end, 0); - if( (*psz_str == '\0') || (*psz_end != '\0') ) - { - i_field = -1; - } - break; - case 1: /* channel description */ - i_field_length = strlen( psz_str ); - if( i_field_length != 0 ) - { - p_channel->psz_description = malloc( i_field_length + 1 ); - if( p_channel->psz_description == NULL ) - { - intf_ErrMsg( "intf error: cannot create channel " - "description (%s)", strerror( ENOMEM ) ); - i_field = -1; - } - else - { - strcpy( p_channel->psz_description, psz_str ); - } - } - break; - case 2: /* input method */ - p_channel->i_input_method = strtol( psz_str, &psz_end, 0); - if( (*psz_str == '\0') || (*psz_end != '\0') ) - { - i_field = -1; - } - break; - case 3: /* input source */ - i_field_length = strlen( psz_str ); - if( i_field_length != 0 ) - { - p_channel->psz_input_source = malloc( i_field_length + 1 ); - if( p_channel->psz_input_source == NULL ) - { - intf_ErrMsg( "intf error: cannot create input " - "source (%s)", strerror( ENOMEM ) ); - i_field = -1; - } - else - { - strcpy( p_channel->psz_input_source, psz_str ); - } - } - break; - case 4: /* input port */ - p_channel->i_input_port = strtol( psz_str, &psz_end, 0); - if( (*psz_str == '\0') || (*psz_end != '\0') ) - { - i_field = -1; - } - break; - case 5: /* input vlan id */ - p_channel->i_input_vlan_id = strtol( psz_str, &psz_end, 0); - if( (*psz_str == '\0') || (*psz_end != '\0') ) - { - i_field = -1; - } - break; - /* ... following fields are ignored */ - } - - /* Set new beginning of field */ - psz_str = psz_index + 1; - } - } - - /* At least the first three fields must be parsed sucessfully for function - * success. Other parsing errors are returned using i_field = -1. */ - if( i_field < 3 ) - { - /* Function fails. Free allocated strings */ - if( p_channel->psz_description != NULL ) - { - free( p_channel->psz_description ); - } - if( p_channel->psz_input_source != NULL ) - { - free( p_channel->psz_input_source ); - } - return( 1 ); - } - - /* Return success */ - return( 0 ); -} - diff --git a/src/interface/intf_channels.h b/src/interface/intf_channels.h deleted file mode 100644 index a2b4a20c38..0000000000 --- a/src/interface/intf_channels.h +++ /dev/null @@ -1,51 +0,0 @@ -/***************************************************************************** - * intf_channels.h: Channel handling functions - ***************************************************************************** - * Copyright (C) 1998, 1999, 2000 VideoLAN - * $Id: intf_channels.h,v 1.2 2001/03/21 13:42:34 sam Exp $ - * - * Authors: Vincent Seguin - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. - *****************************************************************************/ - -/***************************************************************************** - * intf_channel_t: channel description - ***************************************************************************** - * A 'channel' is a descriptor of an input method. It is used to switch easily - * from source to source without having to specify the whole input thread - * configuration. The channels array, stored in the interface thread object, is - * loaded in intf_Create, and unloaded in intf_Destroy. - *****************************************************************************/ -typedef struct intf_channel_s -{ - /* Channel description */ - int i_channel; /* channel number, -1 for end of array */ - char * psz_description; /* channel description (owned) */ - - /* Input configuration */ - int i_input_method; /* input method descriptor */ - char * psz_input_source; /* source string (owned) */ - int i_input_port; /* port */ - int i_input_vlan_id; /* vlan id */ -} intf_channel_t; - -/***************************************************************************** - * Prototypes - *****************************************************************************/ -int intf_LoadChannels ( struct intf_thread_s *, char * ); -void intf_UnloadChannels ( struct intf_thread_s * ); -int intf_SelectChannel ( struct intf_thread_s *, int ); - diff --git a/src/interface/main.c b/src/interface/main.c index a8b6757508..6c47676e45 100644 --- a/src/interface/main.c +++ b/src/interface/main.c @@ -4,7 +4,7 @@ * and spawn threads. ***************************************************************************** * Copyright (C) 1998-2001 VideoLAN - * $Id: main.c,v 1.133 2001/12/09 17:01:37 sam Exp $ + * $Id: main.c,v 1.134 2001/12/10 04:53:11 sam Exp $ * * Authors: Vincent Seguin * Samuel Hocevar @@ -282,6 +282,25 @@ int main( int i_argc, char *ppsz_argv[], char *ppsz_env[] ) p_aout_bank = &aout_bank; p_vout_bank = &vout_bank; +#ifdef ENABLE_NLS + /* + * Support for getext + */ + if( ! setlocale(LC_MESSAGES, "") ) + { + fprintf( stderr, "warning: unsupported locale.\n" ); + } + + if( ! bindtextdomain(PACKAGE, LOCALEDIR) ) + { + fprintf( stderr, "warning: no domain %s in directory %s\n", + PACKAGE, LOCALEDIR ); + } + + textdomain( PACKAGE ); + printf("main: %s\n", gettext("Net")); +#endif + /* * Initialize threads system */ @@ -386,18 +405,18 @@ int main( int i_argc, char *ppsz_argv[], char *ppsz_env[] ) */ p_main->p_memcpy_module = module_Need( MODULE_CAPABILITY_MEMCPY, NULL ); - if( p_main->p_memcpy_module == NULL ) - { - intf_ErrMsg( "intf error: no suitable memcpy module, " - "using libc default" ); - p_main->fast_memcpy = memcpy; - } - else + if( p_main->p_memcpy_module != NULL ) { #define f p_main->p_memcpy_module->p_functions->memcpy.functions.memcpy p_main->fast_memcpy = f.fast_memcpy; #undef f } + else + { + intf_ErrMsg( "intf error: no suitable memcpy module, " + "using libc default" ); + p_main->fast_memcpy = memcpy; + } /* * Initialize shared resources and libraries @@ -450,7 +469,10 @@ int main( int i_argc, char *ppsz_argv[], char *ppsz_env[] ) /* * Free memcpy module */ - module_Unneed( p_main->p_memcpy_module ); + if( p_main->p_memcpy_module != NULL ) + { + module_Unneed( p_main->p_memcpy_module ); + } /* * Free module, aout and vout banks diff --git a/src/misc/modules.c b/src/misc/modules.c index 46c550910c..65b7c4bfdf 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.44 2001/12/07 18:33:08 sam Exp $ + * $Id: modules.c,v 1.45 2001/12/10 04:53:11 sam Exp $ * * Authors: Samuel Hocevar * Ethan C. Baldridge @@ -474,7 +474,7 @@ static int AllocatePluginModule( char * psz_filename ) } /* Check that version numbers match */ - if( strcmp( VERSION, p_module->psz_version ) ) + if( strcmp( VLC_VERSION, p_module->psz_version ) ) { free( p_module ); module_unload( handle ); @@ -599,7 +599,7 @@ static int AllocateBuiltinModule( int ( *pf_init ) ( module_t * ), } /* Check that version numbers match */ - if( strcmp( VERSION, p_module->psz_version ) ) + if( strcmp( VLC_VERSION, p_module->psz_version ) ) { free( p_module ); return( -1 ); -- 2.39.5