Changeset 123b3214ec0802b2c8d1ce6c693dd3b79e1ada31

Timestamp:

07/08/02 23:36:56 (6 years ago)

Author:

Christophe Massiot <massiot@videolan.org>

git-committer:

Christophe Massiot <massiot@videolan.org> 1028756216 +0000

git-parent:

[cd7a6631a91eee7a22259923d88f94a043f82f7d]

git-author:

Christophe Massiot <massiot@videolan.org> 1028756216 +0000

Message:

Audio output 3. Expect major breakages.

Files:

• Makefile (modified) (1 diff)
• bootstrap.sh (modified) (3 diffs)
• configure (modified) (369 diffs)
• configure.in (modified) (11 diffs)
• include/aout_internal.h (added)
• include/audio_output.h (modified) (2 diffs)
• include/config.h (modified) (1 diff)
• include/defs.h.in (modified) (2 diffs)
• include/vlc_common.h (modified) (2 diffs)
• include/vlc_symbols.h (modified) (4 diffs)
• modules/audio_filter/.cvsignore (added)
• modules/audio_filter/Makefile (added)
• modules/audio_filter/float32tos16.c (added)
• modules/audio_mixer/.cvsignore (added)
• modules/audio_mixer/Makefile (added)
• modules/audio_mixer/trivial.c (added)
• modules/audio_output/.cvsignore (added)
• modules/audio_output/Makefile (added)
• modules/audio_output/alsa.c (added)
• modules/audio_output/alsa/.cvsignore (deleted)
• modules/audio_output/alsa/Makefile (deleted)
• modules/audio_output/alsa/alsa.c (deleted)
• modules/audio_output/arts.c (added)
• modules/audio_output/arts/.cvsignore (deleted)
• modules/audio_output/arts/Makefile (deleted)
• modules/audio_output/arts/arts.c (deleted)
• modules/audio_output/dsp/.cvsignore (deleted)
• modules/audio_output/dsp/Makefile (deleted)
• modules/audio_output/dsp/dsp.c (deleted)
• modules/audio_output/esd.c (added)
• modules/audio_output/esd/.cvsignore (deleted)
• modules/audio_output/esd/Makefile (deleted)
• modules/audio_output/esd/esd.c (deleted)
• modules/audio_output/file.c (added)
• modules/audio_output/oss.c (added)
• modules/audio_output/waveout.c (added)
• modules/audio_output/waveout/.cvsignore (deleted)
• modules/audio_output/waveout/Makefile (deleted)
• modules/audio_output/waveout/waveout.c (deleted)
• modules/codec/a52/a52.c (modified) (5 diffs)
• modules/codec/a52/a52.h (modified) (3 diffs)
• modules/gui/macosx/aout.m (modified) (7 diffs)
• modules/gui/macosx/vout.m (modified) (4 diffs)
• modules/misc/dummy/aout.c (modified) (3 diffs)
• modules/misc/dummy/dummy.c (modified) (2 diffs)
• modules/video_output/sdl/aout.c (modified) (8 diffs)
• src/audio_output/aout_ext-dec.c (deleted)
• src/audio_output/aout_pcm.c (deleted)
• src/audio_output/aout_pcm.h (deleted)
• src/audio_output/aout_spdif.c (deleted)
• src/audio_output/aout_spdif.h (deleted)
• src/audio_output/audio_output.c (modified) (4 diffs)
• src/audio_output/filters.c (added)
• src/audio_output/input.c (added)
• src/audio_output/mixer.c (added)
• src/audio_output/output.c (added)
• src/libvlc.c (modified) (3 diffs)
• src/libvlc.h (modified) (3 diffs)
• src/misc/modules_plugin.h (modified) (1 diff)
• src/misc/objects.c (modified) (3 diffs)

Makefile

@@ -23 +23 @@
-INPUT := input input_ext-plugins input_ext-dec input_ext-intf input_dec input_programs input_clock input_info
-VIDEO_OUTPUT := video_output video_text vout_pictures vout_subpictures
-aout_ext-dec aout_pcm aout_spdif
+filters input mixer output
-MISC := mtime modules threads cpu configuration netutils iso_lang messages objects extras
-

bootstrap.sh

@@ -2 +2 @@
-
-##  bootstrap.sh file for vlc, the VideoLAN Client
-9 2002/08/07 00:29:36 sam
+10 2002/08/07 21:36:55 massiot
-##
-##  Authors: Samuel Hocevar <sam@zoy.org>
@@ -74 +74 @@
-for file in gnome_interface.c gtk_interface.c
-do
--q "DO NOT EDIT THIS FILE" modules/gui/gtk/$file
+"DO NOT EDIT THIS FILE" modules/gui/gtk/$file 2>&1 > /dev/null
-then
-    rm -f /tmp/$$.$file.bak
@@ -98 +98 @@
-
-file=gtk_support.h
--q "DO NOT EDIT THIS FILE" modules/gui/gtk/$file
+"DO NOT EDIT THIS FILE" modules/gui/gtk/$file 2>&1 > /dev/null
-then
-    rm -f /tmp/$$.$file.bak

configure

@@ -80 +80 @@
-  --enable-mp4            MP4 demux module (default disabled)"
-ac_help="$ac_help
-
+
+
+
-ac_help="$ac_help
-    --with-a52-tree=PATH  a52dec tree for static linking "
@@ -120 +122 @@
-Audio plugins:"
-ac_help="$ac_help
-dsp            Linux
+oss            Linux OSS
-ac_help="$ac_help
-  --enable-esd            Esound library support (default disabled)"
@@ -733 +735 @@
-
-echo $ac_n "checking host system type""... $ac_c" 1>&6
-6
+8
-
-host_alias=$host
@@ -754 +756 @@
-
-echo $ac_n "checking target system type""... $ac_c" 1>&6
-7
+9
-
-target_alias=$target
@@ -772 +774 @@
-
-echo $ac_n "checking build system type""... $ac_c" 1>&6
-5
+7
-
-build_alias=$build
@@ -806 +808 @@
-
-echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
-09
+11
-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
@@ -835 +837 @@
-set dummy gcc; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-38
+40
-if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
@@ -865 +867 @@
-set dummy cc; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-68
+70
-if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
@@ -916 +918 @@
-set dummy cl; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-19
+21
-if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
@@ -948 +950 @@
-
-echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-1
+3
-
-ac_ext=c
@@ -959 +961 @@
-cat > conftest.$ac_ext << EOF
-
-2
+4
-#include "confdefs.h"
-
-main(){return(0);}
-EOF
-7
+9
-  ac_cv_prog_cc_works=yes
-  # If we can't run a trivial program, we are probably using a cross compiler.
@@ -990 +992 @@
-fi
-echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-3
+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
-998
+1000
-if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
@@ -1004 +1006 @@
-#endif
-EOF
-7
+9
-  ac_cv_prog_gcc=yes
-else
@@ -1023 +1025 @@
-CFLAGS=
-echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-6
+8
-if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
@@ -1055 +1057 @@
-
-echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
-58
+60
-# On Suns, sometimes $CPP names a directory.
-if test -n "$CPP" && test -d "$CPP"; then
@@ -1070 +1072 @@
-  # not just through cpp.
-  cat > conftest.$ac_ext <<EOF
-3
+5
-#include "confdefs.h"
-#include <assert.h>
@@ -1076 +1078 @@
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-79
+81
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
@@ -1087 +1089 @@
-  CPP="${CC-cc} -E -traditional-cpp"
-  cat > conftest.$ac_ext <<EOF
-0
+2
-#include "confdefs.h"
-#include <assert.h>
@@ -1093 +1095 @@
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-6
+8
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
@@ -1104 +1106 @@
-  CPP="${CC-cc} -nologo -E"
-  cat > conftest.$ac_ext <<EOF
-7
+9
-#include "confdefs.h"
-#include <assert.h>
@@ -1110 +1112 @@
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-3
+5
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
@@ -1144 +1146 @@
-set dummy ${ac_tool_prefix}ranlib; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-7
+9
-if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
@@ -1176 +1178 @@
-set dummy ranlib; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-79
+81
-if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
@@ -1211 +1213 @@
-set dummy ${ac_tool_prefix}strip; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-4
+6
-if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
@@ -1243 +1245 @@
-set dummy strip; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-6
+8
-if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
@@ -1279 +1281 @@
-set dummy gmake; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-2
+4
-if eval "test \"`echo '$''{'ac_cv_path_GMAKE'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
@@ -1314 +1316 @@
-if test "x${GMAKE}" = "xno"; then
-  echo $ac_n "checking whether GNU make is installed""... $ac_c" 1>&6
-7
+9
-if eval "test \"`echo '$''{'ac_cv_gmake'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
@@ -1346 +1348 @@
-set dummy ranlib; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-49
+51
-if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
@@ -1375 +1377 @@
-
-        echo $ac_n "checking for strerror in -lcposix""... $ac_c" 1>&6
-78
+80
-ac_lib_var=`echo cposix'_'strerror | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
@@ -1383 +1385 @@
-LIBS="-lcposix  $LIBS"
-cat > conftest.$ac_ext <<EOF
-6
+8
-#include "confdefs.h"
-/* Override any gcc2 internal prototype to avoid an error.  */
@@ -1394 +1396 @@
-; return 0; }
-EOF
-7
+9
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=yes"
@@ -1417 +1419 @@
-
-echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
-0
+2
-if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-5
+7
-#include "confdefs.h"
-#include <stdlib.h>
@@ -1430 +1432 @@
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-3
+5
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
@@ -1447 +1449 @@
-  # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
-cat > conftest.$ac_ext <<EOF
-0
+2
-#include "confdefs.h"
-#include <string.h>
@@ -1465 +1467 @@
-  # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
-cat > conftest.$ac_ext <<EOF
-68
+70
-#include "confdefs.h"
-#include <stdlib.h>
@@ -1486 +1488 @@
-else
-  cat > conftest.$ac_ext <<EOF
-89
+91
-#include "confdefs.h"
-#include <ctype.h>
@@ -1497 +1499 @@
-
-EOF
-0
+2
-then
-  :
@@ -1521 +1523 @@
-
-echo $ac_n "checking for working const""... $ac_c" 1>&6
-4
+6
-if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-29
+31
-#include "confdefs.h"
-
@@ -1575 +1577 @@
-; return 0; }
-EOF
-78
+80
-  rm -rf conftest*
-  ac_cv_c_const=yes
@@ -1596 +1598 @@
-
-echo $ac_n "checking for inline""... $ac_c" 1>&6
-599
+601
-if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
@@ -1603 +1605 @@
-for ac_kw in inline __inline__ __inline; do
-  cat > conftest.$ac_ext <<EOF
-6
+8
-#include "confdefs.h"
-
@@ -1610 +1612 @@
-; return 0; }
-EOF
-3
+5
-  rm -rf conftest*
-  ac_cv_c_inline=$ac_kw; break
@@ -1636 +1638 @@
-
-echo $ac_n "checking for off_t""... $ac_c" 1>&6
-39
+41
-if eval "test \"`echo '$''{'ac_cv_type_off_t'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-4
+6
-#include "confdefs.h"
-#include <sys/types.h>
@@ -1669 +1671 @@
-
-echo $ac_n "checking for size_t""... $ac_c" 1>&6
-2
+4
-if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-7
+9
-#include "confdefs.h"
-#include <sys/types.h>
@@ -1704 +1706 @@
-# for constant arguments.  Useless!
-echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6
-7
+9
-if eval "test \"`echo '$''{'ac_cv_header_alloca_h'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-2
+4
-#include "confdefs.h"
-#include <alloca.h>
@@ -1716 +1718 @@
-; return 0; }
-EOF
-19
+21
-  rm -rf conftest*
-  ac_cv_header_alloca_h=yes
@@ -1737 +1739 @@
-
-echo $ac_n "checking for alloca""... $ac_c" 1>&6
-0
+2
-if eval "test \"`echo '$''{'ac_cv_func_alloca_works'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-5
+7
-#include "confdefs.h"
-
@@ -1770 +1772 @@
-; return 0; }
-EOF
-3
+5
-  rm -rf conftest*
-  ac_cv_func_alloca_works=yes
@@ -1802 +1804 @@
-
-echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6
-5
+7
-if eval "test \"`echo '$''{'ac_cv_os_cray'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-0
+2
-#include "confdefs.h"
-#if defined(CRAY) && ! defined(CRAY2)
@@ -1832 +1834 @@
-for ac_func in _getb67 GETB67 getb67; do
-  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-5
+7
-if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-0
+2
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
@@ -1860 +1862 @@
-; return 0; }
-EOF
-3
+5
-  rm -rf conftest*
-  eval "ac_cv_func_$ac_func=yes"
@@ -1887 +1889 @@
-
-echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6
-0
+2
-if eval "test \"`echo '$''{'ac_cv_c_stack_direction'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
@@ -1895 +1897 @@
-else
-  cat > conftest.$ac_ext <<EOF
-898
+900
-#include "confdefs.h"
-find_stack_direction ()
@@ -1914 +1916 @@
-}
-EOF
-7
+9
-then
-  ac_cv_c_stack_direction=1
@@ -1939 +1941 @@
-ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-2
+4
-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
-7
+9
-#include "confdefs.h"
-#include <$ac_hdr>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-2
+4
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
@@ -1978 +1980 @@
-do
-echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-1
+3
-if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-6
+8
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
@@ -2006 +2008 @@
-; return 0; }
-EOF
-09
+11
-  rm -rf conftest*
-  eval "ac_cv_func_$ac_func=yes"
@@ -2031 +2033 @@
-
-echo $ac_n "checking for working mmap""... $ac_c" 1>&6
-4
+6
-if eval "test \"`echo '$''{'ac_cv_func_mmap_fixed_mapped'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
@@ -2039 +2041 @@
-else
-  cat > conftest.$ac_ext <<EOF
-2
+4
-#include "confdefs.h"
-
@@ -2179 +2181 @@
-
-EOF
-2
+4
-then
-  ac_cv_func_mmap_fixed_mapped=yes
@@ -2203 +2205 @@
-
-    echo $ac_n "checking whether we are using the GNU C Library 2.1 or newer""... $ac_c" 1>&6
-6
+8
-if eval "test \"`echo '$''{'ac_cv_gnu_library_2_1'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-1
+3
-#include "confdefs.h"
-
@@ -2244 +2246 @@
-ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-7
+9
-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
-2
+4
-#include "confdefs.h"
-#include <$ac_hdr>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-7
+9
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
@@ -2285 +2287 @@
-do
-echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-88
+90
-if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-3
+5
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
@@ -2313 +2315 @@
-; return 0; }
-EOF
-6
+8
-  rm -rf conftest*
-  eval "ac_cv_func_$ac_func=yes"
@@ -2353 +2355 @@
-
-  echo $ac_n "checking for iconv""... $ac_c" 1>&6
-6
+8
-if eval "test \"`echo '$''{'am_cv_func_iconv'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
@@ -2361 +2363 @@
-    am_cv_lib_iconv=no
-    cat > conftest.$ac_ext <<EOF
-4
+6
-#include "confdefs.h"
-#include <stdlib.h>
@@ -2371 +2373 @@
-; return 0; }
-EOF
-4
+6
-  rm -rf conftest*
-  am_cv_func_iconv=yes
@@ -2383 +2385 @@
-      LIBS="$LIBS -liconv"
-      cat > conftest.$ac_ext <<EOF
-6
+8
-#include "confdefs.h"
-#include <stdlib.h>
@@ -2393 +2395 @@
-; return 0; }
-EOF
-6
+8
-  rm -rf conftest*
-  am_cv_lib_iconv=yes
@@ -2414 +2416 @@
-
-    echo $ac_n "checking for iconv declaration""... $ac_c" 1>&6
-7
+9
-    if eval "test \"`echo '$''{'am_cv_proto_iconv'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
@@ -2420 +2422 @@
-  
-      cat > conftest.$ac_ext <<EOF
-3
+5
-#include "confdefs.h"
-
@@ -2439 +2441 @@
-; return 0; }
-EOF
-2
+4
-  rm -rf conftest*
-  am_cv_proto_iconv_arg1=""
@@ -2468 +2470 @@
-   
-  echo $ac_n "checking for nl_langinfo and CODESET""... $ac_c" 1>&6
-1
+3
-if eval "test \"`echo '$''{'am_cv_langinfo_codeset'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-6
+8
-#include "confdefs.h"
-#include <langinfo.h>
@@ -2480 +2482 @@
-; return 0; }
-EOF
-3
+5
-  rm -rf conftest*
-  am_cv_langinfo_codeset=yes
@@ -2503 +2505 @@
-   if test $ac_cv_header_locale_h = yes; then
-    echo $ac_n "checking for LC_MESSAGES""... $ac_c" 1>&6
-6
+8
-if eval "test \"`echo '$''{'am_cv_val_LC_MESSAGES'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-1
+3
-#include "confdefs.h"
-#include <locale.h>
@@ -2515 +2517 @@
-; return 0; }
-EOF
-18
+20
-  rm -rf conftest*
-  am_cv_val_LC_MESSAGES=yes
@@ -2536 +2538 @@
-  fi
-   echo $ac_n "checking whether NLS is requested""... $ac_c" 1>&6
-39
+41
-        # Check whether --enable-nls or --disable-nls was given.
-if test "${enable_nls+set}" = set; then
@@ -2558 +2560 @@
-
-      echo $ac_n "checking whether included gettext is requested""... $ac_c" 1>&6
-1
+3
-      # Check whether --with-included-gettext or --without-included-gettext was given.
-if test "${with_included_gettext+set}" = set; then
@@ -2578 +2580 @@
-    ac_safe=`echo "libintl.h" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for libintl.h""... $ac_c" 1>&6
-1
+3
-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
-6
+8
-#include "confdefs.h"
-#include <libintl.h>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-1
+3
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
@@ -2605 +2607 @@
-  echo "$ac_t""yes" 1>&6
-  echo $ac_n "checking for GNU gettext in libc""... $ac_c" 1>&6
-08
+10
-if eval "test \"`echo '$''{'gt_cv_func_gnugettext1_libc'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-3
+5
-#include "confdefs.h"
-#include <libintl.h>
@@ -2619 +2621 @@
-; return 0; }
-EOF
-2
+4
-  rm -rf conftest*
-  gt_cv_func_gnugettext1_libc=yes
@@ -2635 +2637 @@
-       if test "$gt_cv_func_gnugettext1_libc" != "yes"; then
-         echo $ac_n "checking for GNU gettext in libintl""... $ac_c" 1>&6
-38
+40
-if eval "test \"`echo '$''{'gt_cv_func_gnugettext1_libintl'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
@@ -2642 +2644 @@
-        LIBS="$LIBS -lintl $LIBICONV"
-        cat > conftest.$ac_ext <<EOF
-5
+7
-#include "confdefs.h"
-#include <libintl.h>
@@ -2651 +2653 @@
-; return 0; }
-EOF
-4
+6
-  rm -rf conftest*
-  gt_cv_func_gnugettext1_libintl=yes
@@ -2684 +2686 @@
-do
-echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-7
+9
-if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-2
+4
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
@@ -2712 +2714 @@
-; return 0; }
-EOF
-5
+7
-  rm -rf conftest*
-  eval "ac_cv_func_$ac_func=yes"
@@ -2741 +2743 @@
-set dummy msgfmt; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-4
+6
-if eval "test \"`echo '$''{'ac_cv_path_MSGFMT'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
@@ -2775 +2777 @@
-set dummy gmsgfmt; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-78
+80
-if eval "test \"`echo '$''{'ac_cv_path_GMSGFMT'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
@@ -2812 +2814 @@
-set dummy xgettext; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-5
+7
-if eval "test \"`echo '$''{'ac_cv_path_XGETTEXT'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
@@ -2862 +2864 @@
-set dummy msgfmt; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-5
+7
-if eval "test \"`echo '$''{'ac_cv_path_MSGFMT'+set}'`\" = set"; then
-  echo $ac