Changeset 37e30b124b64abc0eb521a009392e059fa940177

Timestamp:

10/08/02 22:05:21 (6 years ago)

Author:

Laurent Aimar <fenrir@videolan.org>

git-committer:

Laurent Aimar <fenrir@videolan.org> 1029009921 +0000

git-parent:

[7acb51f93a1bd870a3cc12e4836ef485bb465105]

git-author:

Laurent Aimar <fenrir@videolan.org> 1029009921 +0000

Message:

• modules/codec/faad : an AAC decoder module using libfaad library
  

(faad2).

• modules/demux/mp4/libmp4.c : could compile without zlib.
  
• modules/codec/ffmpeg/* : set error resilience to -1 by default.(in
  

order to decode more files, but it could produce segfaults ... )

• Makefile.*, configure.in : enable mp4 by default, add faad
  

module (disabled by default ).

Files:

• Makefile.opts.in (modified) (2 diffs)
• configure (modified) (366 diffs)
• configure.in (modified) (3 diffs)
• include/defs.h.in (modified) (3 diffs)
• modules/codec/faad/.cvsignore (added)
• modules/codec/faad/Makefile (added)
• modules/codec/faad/decoder.c (added)
• modules/codec/faad/decoder.h (added)
• modules/codec/ffmpeg/ffmpeg.c (modified) (7 diffs)
• modules/codec/ffmpeg/ffmpeg.h (modified) (3 diffs)
• modules/demux/mp4/libmp4.c (modified) (5 diffs)

Makefile.opts.in

@@ -68 +68 @@
-esd_CFLAGS = @esd_CFLAGS@
-familiar_CFLAGS = @familiar_CFLAGS@
+faad_CFLAGS = @faad_CFLAGS@
-ffmpeg_CFLAGS = @ffmpeg_CFLAGS@
-glide_CFLAGS = @glide_CFLAGS@
@@ -106 +107 @@
-familiar_LDFLAGS = @familiar_LDFLAGS@
-distort_LDFLAGS = @distort_LDFLAGS@
+faad_LDFLAGS = @faad_LDFLAGS@
-ffmpeg_LDFLAGS = @ffmpeg_LDFLAGS@
-mp4_LDFLAGS = @mp4_LDFLAGS@

configure

@@ -78 +78 @@
-    --with-ffmpeg-tree=PATH ffmpeg tree for static linking"
-ac_help="$ac_help
-
+
+
+
+
+
+
+
-ac_help="$ac_help
-  --enable-a52            A/52 support with liba52 (default enabled)"
@@ -737 +743 @@
-
-echo $ac_n "checking host system type""... $ac_c" 1>&6
-0
+6
-
-host_alias=$host
@@ -758 +764 @@
-
-echo $ac_n "checking target system type""... $ac_c" 1>&6
-1
+7
-
-target_alias=$target
@@ -776 +782 @@
-
-echo $ac_n "checking build system type""... $ac_c" 1>&6
-79
+85
-
-build_alias=$build
@@ -810 +816 @@
-
-echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
-3
+9
-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
@@ -839 +845 @@
-set dummy gcc; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-2
+8
-if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
@@ -869 +875 @@
-set dummy cc; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-2
+8
-if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
@@ -920 +926 @@
-set dummy cl; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-3
+9
-if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
@@ -952 +958 @@
-
-echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-55
+61
-
-ac_ext=c
@@ -963 +969 @@
-cat > conftest.$ac_ext << EOF
-
-66
+72
-#include "confdefs.h"
-
-main(){return(0);}
-EOF
-1
+7
-  ac_cv_prog_cc_works=yes
-  # If we can't run a trivial program, we are probably using a cross compiler.
@@ -994 +1000 @@
-fi
-echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-997
+1003
-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
-2
+8
-if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
@@ -1008 +1014 @@
-#endif
-EOF
-1
+7
-  ac_cv_prog_gcc=yes
-else
@@ -1027 +1033 @@
-CFLAGS=
-echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-0
+6
-if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
@@ -1059 +1065 @@
-
-echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
-2
+8
-# On Suns, sometimes $CPP names a directory.
-if test -n "$CPP" && test -d "$CPP"; then
@@ -1074 +1080 @@
-  # not just through cpp.
-  cat > conftest.$ac_ext <<EOF
-77
+83
-#include "confdefs.h"
-#include <assert.h>
@@ -1080 +1086 @@
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-3
+9
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
@@ -1091 +1097 @@
-  CPP="${CC-cc} -E -traditional-cpp"
-  cat > conftest.$ac_ext <<EOF
-094
+100
-#include "confdefs.h"
-#include <assert.h>
@@ -1097 +1103 @@
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-0
+6
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
@@ -1108 +1114 @@
-  CPP="${CC-cc} -nologo -E"
-  cat > conftest.$ac_ext <<EOF
-1
+7
-#include "confdefs.h"
-#include <assert.h>
@@ -1114 +1120 @@
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-17
+23
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
@@ -1148 +1154 @@
-set dummy ${ac_tool_prefix}ranlib; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-1
+7
-if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
@@ -1180 +1186 @@
-set dummy ranlib; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-3
+9
-if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
@@ -1215 +1221 @@
-set dummy ${ac_tool_prefix}strip; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-18
+24
-if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
@@ -1247 +1253 @@
-set dummy strip; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-0
+6
-if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
@@ -1283 +1289 @@
-set dummy gmake; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-86
+92
-if eval "test \"`echo '$''{'ac_cv_path_GMAKE'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
@@ -1318 +1324 @@
-if test "x${GMAKE}" = "xno"; then
-  echo $ac_n "checking whether GNU make is installed""... $ac_c" 1>&6
-1
+7
-if eval "test \"`echo '$''{'ac_cv_gmake'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
@@ -1350 +1356 @@
-set dummy ranlib; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-3
+9
-if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
@@ -1379 +1385 @@
-
-        echo $ac_n "checking for strerror in -lcposix""... $ac_c" 1>&6
-2
+8
-ac_lib_var=`echo cposix'_'strerror | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
@@ -1387 +1393 @@
-LIBS="-lcposix  $LIBS"
-cat > conftest.$ac_ext <<EOF
-0
+6
-#include "confdefs.h"
-/* Override any gcc2 internal prototype to avoid an error.  */
@@ -1398 +1404 @@
-; return 0; }
-EOF
-1
+7
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=yes"
@@ -1421 +1427 @@
-
-echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
-24
+30
-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
-29
+35
-#include "confdefs.h"
-#include <stdlib.h>
@@ -1434 +1440 @@
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-37
+43
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
@@ -1451 +1457 @@
-  # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
-cat > conftest.$ac_ext <<EOF
-54
+60
-#include "confdefs.h"
-#include <string.h>
@@ -1469 +1475 @@
-  # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
-cat > conftest.$ac_ext <<EOF
-2
+8
-#include "confdefs.h"
-#include <stdlib.h>
@@ -1490 +1496 @@
-else
-  cat > conftest.$ac_ext <<EOF
-3
+9
-#include "confdefs.h"
-#include <ctype.h>
@@ -1501 +1507 @@
-
-EOF
-04
+10
-then
-  :
@@ -1525 +1531 @@
-
-echo $ac_n "checking for working const""... $ac_c" 1>&6
-28
+34
-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
-3
+9
-#include "confdefs.h"
-
@@ -1579 +1585 @@
-; return 0; }
-EOF
-2
+8
-  rm -rf conftest*
-  ac_cv_c_const=yes
@@ -1600 +1606 @@
-
-echo $ac_n "checking for inline""... $ac_c" 1>&6
-3
+9
-if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
@@ -1607 +1613 @@
-for ac_kw in inline __inline__ __inline; do
-  cat > conftest.$ac_ext <<EOF
-0
+6
-#include "confdefs.h"
-
@@ -1614 +1620 @@
-; return 0; }
-EOF
-17
+23
-  rm -rf conftest*
-  ac_cv_c_inline=$ac_kw; break
@@ -1640 +1646 @@
-
-echo $ac_n "checking for off_t""... $ac_c" 1>&6
-3
+9
-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
-48
+54
-#include "confdefs.h"
-#include <sys/types.h>
@@ -1673 +1679 @@
-
-echo $ac_n "checking for size_t""... $ac_c" 1>&6
-76
+82
-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
-1
+7
-#include "confdefs.h"
-#include <sys/types.h>
@@ -1708 +1714 @@
-# for constant arguments.  Useless!
-echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6
-1
+7
-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
-16
+22
-#include "confdefs.h"
-#include <alloca.h>
@@ -1720 +1726 @@
-; return 0; }
-EOF
-3
+9
-  rm -rf conftest*
-  ac_cv_header_alloca_h=yes
@@ -1741 +1747 @@
-
-echo $ac_n "checking for alloca""... $ac_c" 1>&6
-44
+50
-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
-49
+55
-#include "confdefs.h"
-
@@ -1774 +1780 @@
-; return 0; }
-EOF
-77
+83
-  rm -rf conftest*
-  ac_cv_func_alloca_works=yes
@@ -1806 +1812 @@
-
-echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6
-09
+15
-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
-14
+20
-#include "confdefs.h"
-#if defined(CRAY) && ! defined(CRAY2)
@@ -1836 +1842 @@
-for ac_func in _getb67 GETB67 getb67; do
-  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-39
+45
-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
-44
+50
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
@@ -1864 +1870 @@
-; return 0; }
-EOF
-67
+73
-  rm -rf conftest*
-  eval "ac_cv_func_$ac_func=yes"
@@ -1891 +1897 @@
-
-echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6
-894
+900
-if eval "test \"`echo '$''{'ac_cv_c_stack_direction'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
@@ -1899 +1905 @@
-else
-  cat > conftest.$ac_ext <<EOF
-2
+8
-#include "confdefs.h"
-find_stack_direction ()
@@ -1918 +1924 @@
-}
-EOF
-1
+7
-then
-  ac_cv_c_stack_direction=1
@@ -1939 +1945 @@
-fi
-
-stdlib.h unistd.h sys/stat.h sys/types
+unistd
-do
-ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-46
+52
-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
-1
+7
-#include "confdefs.h"
-#include <$ac_hdr>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-56
+62
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
@@ -1982 +1988 @@
-do
-echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-85
+91
-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
+6
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
@@ -2010 +2016 @@
-; return 0; }
-EOF
-3
+9
-  rm -rf conftest*
-  eval "ac_cv_func_$ac_func=yes"
@@ -2035 +2041 @@
-
-echo $ac_n "checking for working mmap""... $ac_c" 1>&6
-38
+44
-if eval "test \"`echo '$''{'ac_cv_func_mmap_fixed_mapped'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
@@ -2043 +2049 @@
-else
-  cat > conftest.$ac_ext <<EOF
-46
+52
-#include "confdefs.h"
-
@@ -2071 +2077 @@
-#include <sys/mman.h>
-
-#if HAVE_SYS_TYPES_H
-# include <sys/types.h>
-#endif
-
-#if HAVE_STDLIB_H
-# include <stdlib.h>
-#endif
-
-#if HAVE_SYS_STAT_H
-# include <sys/stat.h>
-#endif
-
-#if HAVE_UNISTD_H
-# include <unistd.h>
-#endif
-
-/* This mess was copied from the GNU getpagesize.h.  */
-#ifndef HAVE_GETPAGESIZE
+# ifdef HAVE_UNISTD_H
+#  include <unistd.h>
+# endif
-
-/* Assume that all systems that can run configure have sys/param.h.  */
@@ -2196 +2189 @@
-
-EOF
-9
+2
-then
-  ac_cv_func_mmap_fixed_mapped=yes
@@ -2220 +2213 @@
-
-    echo $ac_n "checking whether we are using the GNU C Library 2.1 or newer""... $ac_c" 1>&6
-23
+16
-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
-8
+1
-#include "confdefs.h"
-
@@ -2261 +2254 @@
-ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-64
+57
-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
-9
+2
-#include "confdefs.h"
-#include <$ac_hdr>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-74
+67
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
@@ -2302 +2295 @@
-do
-echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-305
+298
-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
-10
+03
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
@@ -2330 +2323 @@
-; return 0; }
-EOF
-33
+26
-  rm -rf conftest*
-  eval "ac_cv_func_$ac_func=yes"
@@ -2370 +2363 @@
-
-  echo $ac_n "checking for iconv""... $ac_c" 1>&6
-73
+66
-if eval "test \"`echo '$''{'am_cv_func_iconv'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
@@ -2378 +2371 @@
-    am_cv_lib_iconv=no
-    cat > conftest.$ac_ext <<EOF
-81
+74
-#include "confdefs.h"
-#include <stdlib.h>
@@ -2388 +2381 @@
-; return 0; }
-EOF
-91
+84
-  rm -rf conftest*
-  am_cv_func_iconv=yes
@@ -2400 +2393 @@
-      LIBS="$LIBS -liconv"
-      cat > conftest.$ac_ext <<EOF
-403
+396
-#include "confdefs.h"
-#include <stdlib.h>
@@ -2410 +2403 @@
-; return 0; }
-EOF
-13
+06
-  rm -rf conftest*
-  am_cv_lib_iconv=yes
@@ -2431 +2424 @@
-
-    echo $ac_n "checking for iconv declaration""... $ac_c" 1>&6
-34
+27
-    if eval "test \"`echo '$''{'am_cv_proto_iconv'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
@@ -2437 +2430 @@
-  
-      cat > conftest.$ac_ext <<EOF
-40
+33
-#include "confdefs.h"
-
@@ -2456 +2449 @@
-; return 0; }
-EOF
-9
+2
-  rm -rf conftest*
-  am_cv_proto_iconv_arg1=""
@@ -2485 +2478 @@
-   
-  echo $ac_n "checking for nl_langinfo and CODESET""... $ac_c" 1>&6
-8
+1
-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
-93
+86
-#include "confdefs.h"
-#include <langinfo.h>
@@ -2497 +2490 @@
-; return 0; }
-EOF
-500
+493
-  rm -rf conftest*
-  am_cv_langinfo_codeset=yes
@@ -2520 +2513 @@
-   if test $ac_cv_header_locale_h = yes; then
-    echo $ac_n "checking for LC_MESSAGES""... $ac_c" 1>&6
-23
+16
-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
-8
+1
-#include "confdefs.h"
-#include <locale.h>
@@ -2532 +2525 @@
-; return 0; }
-EOF
-35
+28
-  rm -rf conftest*
-  am_cv_val_LC_MESSAGES=yes
@@ -2553 +2546 @@
-  fi
-   echo $ac_n "checking whether NLS is requested""... $ac_c" 1>&6
-56
+49
-        # Check whether --enable-nls or --disable-nls was given.
-if test "${enable_nls+set}" = set; then
@@ -2575 +2568 @@
-
-      echo $ac_n "checking whether included gettext is requested""... $ac_c" 1>&6
-8
+1
-      # Check whether --with-included-gettext or --without-included-gettext was given.
-if test "${with_included_gettext+set}" = set; then
@@ -2595 +2588 @@
-    ac_safe=`echo "libintl.h" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for libintl.h""... $ac_c" 1>&6
-8
+1
-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
-603
+596
-#include "confdefs.h"
-#include <libintl.h>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-8
+1
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
@@ -2622 +2615 @@
-  echo "$ac_t""yes" 1>&6
-  echo $ac_n "checking for GNU gettext in libc""... $ac_c" 1>&6
-25
+18
-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
-30
+23
-#include "confdefs.h"
-#include <libintl.h>
@@ -2636 +2629 @@
-; return 0; }
-EOF
-9
+2
-  rm -rf conftest*
-  gt_cv_func_gnugettext1_libc=yes
@@ -2652 +2645 @@
-       if test "$gt_cv_func_gnugettext1_libc" != "yes"; then
-         echo $ac_n "checking for GNU gettext in libintl""... $ac_c" 1>&6
-55
+48
-if eval "test \"`echo '$''{'gt_cv_func_gnugettext1_libintl'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
@@ -2659 +2652 @@
-        LIBS="$LIBS -lintl $LIBICONV"
-        cat > conftest.$ac_ext <<EOF
-62
+55
-#include "confdefs.h"
-#include <libintl.h>
@@ -2668 +2661 @@
-; return 0; }
-EOF
-71
+64
-  rm -rf conftest*
-  gt_cv_func_gnugettext1_libintl=yes
@@ -2701 +2694 @@
-do
-echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-704
+697
-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
-9
+2
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
@@ -2729 +2722 @@
-; return 0; }
-EOF
-32
+25
-  rm -rf conftest*
-  eval "ac_cv_func_$ac_func=yes"
@@ -2758 +2751 @@
-set dummy msgfmt; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-61
+54
-if eval "test \"`echo '$''{'ac_cv_path_MSGFMT'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
@@ -2792 +2785 @@
-set dummy gmsgfmt; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-95
+88
-if eval "test \"`echo '$''{'ac_cv_path_GMSGFMT'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
@@ -2829 +2822 @@
-set dummy xgettext; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-32
+25
-if eval "test \"`echo '$''{'ac_cv_path_XGETTEXT'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
@@ -2879 +2872 @@
-set dummy msgfmt; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-82
+75
-if eval "test \"`echo '$''{'ac_cv_path_MSGFMT'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
@@ -2913 +2906 @@
-set dummy gmsgfmt; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-16
+09
-if eval "test \"`echo '$''{'ac_cv_path_GMSGFMT'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
@@ -2949 +2942 @@
-set dummy xgettext; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-52
+45
-if eval "test \"`echo '$''{'ac_cv_path_XGETTEXT'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
@@ -3020 +3013 @@
-set dummy $ac_prog; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-23
+16
-if eval "test \"`echo '$''{'ac_cv_prog_INTLBISON'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
@@ -3053 +3046 @@
-    else
-            echo $ac_n "checking version of bison""... $ac_c" 1>&6
-56
+49
-      ac_prog_version=`$INTLBISON --version 2>&1 | sed -n 's/^.*GNU Bison.* \([0-9]*\.[0-9.]*\).*$/\1/p'`
-      case $ac_prog_version in
@@ -3100 +3093 @@
-     else
-       echo $ac_n "checking for catalogs to be installed""... $ac_c" 1>&6
-103
+096
-       NEW_LINGUAS=
-       for presentlang in $ALL_LINGUAS; do
@@ -3152 +3145 @@
-# ./install, which can be erroneously created by make from ./install.sh.
-echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-55
+48
-if test -z "$INSTALL"; then
-if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
@@ -3206 +3199 @@
-
-echo $ac_n "checking for working const""... $ac_c" 1>&6
-9
+2
-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
-14
+07
-#include "confdefs.h"
-
@@ -3260 +3253 @@
-; return 0; }
-EOF
-63
+56
-  rm -rf conftest*
-  ac_cv_c_const=yes
@@ -3281 +3274 @@
-
-echo $ac_n "checking for inline""... $ac_c" 1>&6
-84
+77
-if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
@@ -3288 +3281 @@
-for ac_kw in inline __inline__ __inline; do
-  cat > conftest.$ac_ext <<EOF
-91
+84
-#include "confdefs.h"
-
@@ -3295 +3288 @@
-; return 0; }
-EOF
-8
+1
-  rm -rf conftest*
-  ac_cv_c_inline=$ac_kw; break
@@ -3350 +3343 @@
-set dummy ${ac_tool_prefix}windres; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-53
+46
-if eval "test \"`echo '$''{'ac_cv_prog_WINDRES'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
@@ -3382 +3375 @@
-set dummy windres; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-85
+78
-if eval "test \"`echo '$''{'ac_cv_prog_WINDRES'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
@@ -3456 +3449 @@
-do
-echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-9
+2
-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