r984 - in /unstable/mpeg2dec/debian: changelog patches/62_drop-arch-opts.patch patches/70_autoconf.patch

lool at users.alioth.debian.org lool at users.alioth.debian.org
Sun Dec 16 15:50:01 UTC 2007


Author: lool
Date: Sun Dec 16 15:50:01 2007
New Revision: 984

URL: http://svn.debian.org/wsvn/pkg-multimedia/?sc=1&rev=984
Log:
* New patch, 62_drop-arch-opts, drop arch-specific CFLAGS detection in
  upstream configure as we want to use the gcc defaults to work on all
  machines which Debian will be installed on, and not use the buildds as
  references.

Added:
    unstable/mpeg2dec/debian/patches/62_drop-arch-opts.patch
Modified:
    unstable/mpeg2dec/debian/changelog
    unstable/mpeg2dec/debian/patches/70_autoconf.patch

Modified: unstable/mpeg2dec/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-multimedia/unstable/mpeg2dec/debian/changelog?rev=984&op=diff
==============================================================================
--- unstable/mpeg2dec/debian/changelog (original)
+++ unstable/mpeg2dec/debian/changelog Sun Dec 16 15:50:01 2007
@@ -4,6 +4,10 @@
   * Bump up Debhelper compatibility level to 5; bump up debhelper build-dep to
     >= 5.
   * Add -Wl,-z,defs -Wl,--as-needed to LDFLAGS; build-dep on cdbs >= 0.4.41.
+  * New patch, 62_drop-arch-opts, drop arch-specific CFLAGS detection in
+    upstream configure as we want to use the gcc defaults to work on all
+    machines which Debian will be installed on, and not use the buildds as
+    references.
 
  -- Loic Minier <lool at dooz.org>  Sun, 16 Dec 2007 16:21:57 +0100
 

Added: unstable/mpeg2dec/debian/patches/62_drop-arch-opts.patch
URL: http://svn.debian.org/wsvn/pkg-multimedia/unstable/mpeg2dec/debian/patches/62_drop-arch-opts.patch?rev=984&op=file
==============================================================================
--- unstable/mpeg2dec/debian/patches/62_drop-arch-opts.patch (added)
+++ unstable/mpeg2dec/debian/patches/62_drop-arch-opts.patch Sun Dec 16 15:50:01 2007
@@ -1,0 +1,21 @@
+diff -Nur mpeg2dec-0.4.1/configure.in mpeg2dec-0.4.1.new/configure.in
+--- mpeg2dec-0.4.1/configure.in	2006-02-15 15:43:34.000000000 +0100
++++ mpeg2dec-0.4.1.new/configure.in	2007-12-16 16:45:31.000000000 +0100
+@@ -56,6 +56,9 @@
+     AC_TRY_CFLAGS([$TRY_CFLAGS $CFLAGS],[OPT_CFLAGS="$TRY_CFLAGS"])
+ 
+     dnl arch-specific flags
++# Debian: disable arch-specific opts as we simply want to use the gcc defaults
++# to run on all supported machines instead of using the buildd as references
++if test "x" = "y"; then
+     case "$host" in
+     i?86-* | k?-* | x86_64-* | amd64-*)
+ 	AC_DEFINE([ARCH_X86],,[x86 architecture])
+@@ -98,6 +101,7 @@
+     alpha*)
+ 	AC_DEFINE([ARCH_ALPHA],,[alpha architecture]);;
+     esac
++fi # Debian disable arch-specific opts
+ elif test x"$CC" = x"tendracc"; then
+     dnl TenDRA portability checking compiler
+     TENDRA=yes

Modified: unstable/mpeg2dec/debian/patches/70_autoconf.patch
URL: http://svn.debian.org/wsvn/pkg-multimedia/unstable/mpeg2dec/debian/patches/70_autoconf.patch?rev=984&op=diff
==============================================================================
--- unstable/mpeg2dec/debian/patches/70_autoconf.patch (original)
+++ unstable/mpeg2dec/debian/patches/70_autoconf.patch Sun Dec 16 15:50:01 2007
@@ -1,6 +1,6 @@
 diff -Nur mpeg2dec-0.4.1/configure mpeg2dec-0.4.1.new/configure
 --- mpeg2dec-0.4.1/configure	2006-02-15 17:34:16.000000000 +0100
-+++ mpeg2dec-0.4.1.new/configure	2007-12-16 16:03:22.000000000 +0100
++++ mpeg2dec-0.4.1.new/configure	2007-12-16 16:46:35.000000000 +0100
 @@ -1,25 +1,54 @@
  #! /bin/sh
  # Guess values for system-dependent variables and create Makefiles.
@@ -1416,15 +1416,8 @@
 -  *) # Relative path.
 -    ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
 -    ac_top_srcdir=$ac_top_builddir$srcdir ;;
-+    ac_top_srcdir=$srcdir
-+    ac_abs_top_srcdir=$srcdir ;;
-+  *) # Relative name.
-+    ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
-+    ac_top_srcdir=$ac_top_build_prefix$srcdir
-+    ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
- esac
-+ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
- 
+-esac
+-
 -# Do not use `cd foo && pwd` to compute absolute paths, because
 -# the directories may not exist.
 -case `pwd` in
@@ -1462,8 +1455,15 @@
 -  [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
 -  *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
 -  esac;;
--esac
--
++    ac_top_srcdir=$srcdir
++    ac_abs_top_srcdir=$srcdir ;;
++  *) # Relative name.
++    ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
++    ac_top_srcdir=$ac_top_build_prefix$srcdir
++    ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
+ esac
++ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
+ 
 -    cd $ac_dir
 -    # Check for guested configure; otherwise get Cygnus style configure.
 -    if test -f $ac_srcdir/configure.gnu; then
@@ -2385,11 +2385,15 @@
  if test -n "$CC"; then
 -  echo "$as_me:$LINENO: result: $CC" >&5
 -echo "${ECHO_T}$CC" >&6
--else
++  { echo "$as_me:$LINENO: result: $CC" >&5
++echo "${ECHO_T}$CC" >&6; }
+ else
 -  echo "$as_me:$LINENO: result: no" >&5
 -echo "${ECHO_T}no" >&6
--fi
--
++  { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ fi
+ 
 -fi
 -if test -z "$ac_cv_prog_CC"; then
 -  ac_ct_CC=$CC
@@ -2423,15 +2427,11 @@
 -if test -n "$ac_ct_CC"; then
 -  echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
 -echo "${ECHO_T}$ac_ct_CC" >&6
-+  { echo "$as_me:$LINENO: result: $CC" >&5
-+echo "${ECHO_T}$CC" >&6; }
- else
+-else
 -  echo "$as_me:$LINENO: result: no" >&5
 -echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
- 
+-fi
+-
 -  CC=$ac_ct_CC
 -else
 -  CC="$ac_cv_prog_CC"
@@ -3069,11 +3069,11 @@
  
 -ac_cv_prog_cc_g=no
 +
++fi
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+fi
 +
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
@@ -3582,7 +3582,7 @@
    # can be detected and how.
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
-@@ -3313,74 +3802,220 @@
+@@ -3313,24 +3802,22 @@
  /* end confdefs.h.  */
  #include <ac_nonexistent.h>
  _ACEOF
@@ -3618,17 +3618,22 @@
    # Broken: success on invalid input.
  continue
  else
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--  # Passes both tests.
--ac_preproc_ok=:
--break
-+  # Passes both tests.
-+ac_preproc_ok=:
-+break
-+fi
-+
+@@ -3341,46 +3828,194 @@
+ ac_preproc_ok=:
+ break
+ fi
+-rm -f conftest.err conftest.$ac_ext
+ 
+-done
+-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+-rm -f conftest.err conftest.$ac_ext
+-if $ac_preproc_ok; then
+-  :
+-else
+-  { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
+-See \`config.log' for more details." >&5
+-echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
+-See \`config.log' for more details." >&2;}
 +rm -f conftest.err conftest.$ac_ext
 +
 +done
@@ -3716,22 +3721,7 @@
 +if test -z "$GREP"; then
 +  { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
 +echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
-+   { (exit 1); exit 1; }; }
- fi
--rm -f conftest.err conftest.$ac_ext
- 
--done
--# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
--rm -f conftest.err conftest.$ac_ext
--if $ac_preproc_ok; then
--  :
- else
--  { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
--See \`config.log' for more details." >&5
--echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
--See \`config.log' for more details." >&2;}
--   { (exit 1); exit 1; }; }
-+  ac_cv_path_GREP=$GREP
+    { (exit 1); exit 1; }; }
  fi
  
 -ac_ext=c
@@ -3739,6 +3729,10 @@
 -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 -ac_compiler_gnu=$ac_cv_c_compiler_gnu
++else
++  ac_cv_path_GREP=$GREP
++fi
++
 +
 +fi
 +{ echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5
@@ -3825,14 +3819,14 @@
 +
 +else
 +  ac_cv_path_EGREP=$EGREP
++fi
++
++
++   fi
  fi
 -echo "$as_me:$LINENO: result: $ac_cv_prog_egrep" >&5
 -echo "${ECHO_T}$ac_cv_prog_egrep" >&6
 - EGREP=$ac_cv_prog_egrep
-+
-+
-+   fi
-+fi
 +{ echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5
 +echo "${ECHO_T}$ac_cv_path_EGREP" >&6; }
 + EGREP="$ac_cv_path_EGREP"
@@ -4434,7 +4428,7 @@
      SAVE_CFLAGS="$CFLAGS"
      CFLAGS="$TRY_CFLAGS $CFLAGS"
      cat >conftest.$ac_ext <<_ACEOF
-@@ -4036,37 +4660,34 @@
+@@ -4036,44 +4660,44 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -4488,7 +4482,18 @@
      if test x"$ac_cv_try_cflags_ok" = x"yes"; then
  	OPT_CFLAGS="$TRY_CFLAGS"
      else
-@@ -4087,8 +4708,8 @@
+ 	:
+     fi
+ 
+-        case "$host" in
++    # Debian: disable arch-specific opts as we simply want to use the gcc defaults
++# to run on all supported machines instead of using the buildd as references
++if test "x" = "y"; then
++    case "$host" in
+     i?86-* | k?-* | x86_64-* | amd64-*)
+ 
+ cat >>confdefs.h <<\_ACEOF
+@@ -4087,8 +4711,8 @@
  	i686-*) TRY_CFLAGS="$OPT_CFLAGS -mcpu=pentiumpro";;
  	k6-*)   TRY_CFLAGS="$OPT_CFLAGS -mcpu=k6";;
  	esac
@@ -4499,7 +4504,7 @@
      SAVE_CFLAGS="$CFLAGS"
      CFLAGS="$TRY_CFLAGS $CFLAGS"
      cat >conftest.$ac_ext <<_ACEOF
-@@ -4107,37 +4728,34 @@
+@@ -4107,37 +4731,34 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -4553,7 +4558,7 @@
      if test x"$ac_cv_try_cflags_ok" = x"yes"; then
  	OPT_CFLAGS="$TRY_CFLAGS"
      else
-@@ -4146,8 +4764,8 @@
+@@ -4146,8 +4767,8 @@
      ppc-* | powerpc-*)
  	have_altivec=no
  	for TRY_CFLAGS in "-mpim-altivec -force_cpusubtype_ALL" -faltivec -maltivec -fvec; do
@@ -4564,7 +4569,7 @@
      SAVE_CFLAGS="$CFLAGS"
      CFLAGS="$OPT_CFLAGS $TRY_CFLAGS $CFLAGS"
      cat >conftest.$ac_ext <<_ACEOF
-@@ -4166,42 +4784,39 @@
+@@ -4166,42 +4787,39 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -4625,7 +4630,7 @@
  		 cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -4219,33 +4834,29 @@
+@@ -4219,33 +4837,29 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -4673,7 +4678,7 @@
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
-@@ -4261,43 +4872,41 @@
+@@ -4261,43 +4875,41 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -4736,7 +4741,7 @@
  		 CFLAGS="$save_CFLAGS"
      else
  	:
-@@ -4319,8 +4928,8 @@
+@@ -4319,8 +4931,8 @@
  _ACEOF
  
  	TRY_CFLAGS="$OPT_CFLAGS -mcpu=ultrasparc -mvis"
@@ -4747,7 +4752,7 @@
      SAVE_CFLAGS="$CFLAGS"
      CFLAGS="$TRY_CFLAGS $CFLAGS"
      cat >conftest.$ac_ext <<_ACEOF
-@@ -4339,37 +4948,34 @@
+@@ -4339,37 +4951,34 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -4801,7 +4806,14 @@
      if test x"$ac_cv_try_cflags_ok" = x"yes"; then
  	OPT_CFLAGS="$TRY_CFLAGS"
      else
-@@ -4388,13 +4994,13 @@
+@@ -4382,19 +4991,20 @@
+ _ACEOF
+ ;;
+     esac
++fi # Debian disable arch-specific opts
+ elif test x"$CC" = x"tendracc"; then
+         TENDRA=yes
+     OPT_CFLAGS="-Xp -Yansi -f`pwd`/include/tendra.h -DELIDE_CODE"
      no_x=yes
      enable_sdl=no
  elif test x"$CC" = x"icc" -a x"`$CC -V 2>&1 | grep Intel`" != x""; then
@@ -4818,7 +4830,7 @@
      SAVE_CFLAGS="$CFLAGS"
      CFLAGS="$TRY_CFLAGS $CFLAGS"
      cat >conftest.$ac_ext <<_ACEOF
-@@ -4413,37 +5019,34 @@
+@@ -4413,37 +5023,34 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -4872,7 +4884,7 @@
      if test x"$ac_cv_try_cflags_ok" = x"yes"; then
  	OPT_CFLAGS="$TRY_CFLAGS"
      else
-@@ -4452,10 +5055,9 @@
+@@ -4452,10 +5059,9 @@
      esac
  fi
  
@@ -4885,7 +4897,7 @@
      case $enableval in
      yes) enable_shared=yes ;;
      no) enable_shared=no ;;
-@@ -4474,15 +5076,15 @@
+@@ -4474,15 +5080,15 @@
      esac
  else
    enable_shared=no
@@ -4905,7 +4917,7 @@
      case $enableval in
      yes) enable_static=yes ;;
      no) enable_static=no ;;
-@@ -4501,12 +5103,12 @@
+@@ -4501,12 +5107,12 @@
      esac
  else
    enable_static=yes
@@ -4922,7 +4934,7 @@
      case $enableval in
      yes) enable_fast_install=yes ;;
      no) enable_fast_install=no ;;
-@@ -4525,10 +5127,11 @@
+@@ -4525,10 +5131,11 @@
      esac
  else
    enable_fast_install=yes
@@ -4937,7 +4949,7 @@
  if test "${lt_cv_path_SED+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -4581,22 +5184,22 @@
+@@ -4581,22 +5188,22 @@
  fi
  
  SED=$lt_cv_path_SED
@@ -4968,7 +4980,7 @@
    case $host in
    *-*-mingw*)
      # gcc leaves a trailing carriage return which upsets mingw
-@@ -4625,11 +5228,11 @@
+@@ -4625,11 +5232,11 @@
      ;;
    esac
  elif test "$with_gnu_ld" = yes; then
@@ -4984,7 +4996,7 @@
  fi
  if test "${lt_cv_path_LD+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -4662,17 +5265,17 @@
+@@ -4662,17 +5269,17 @@
  
  LD="$lt_cv_path_LD"
  if test -n "$LD"; then
@@ -5008,7 +5020,7 @@
  if test "${lt_cv_prog_gnu_ld+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -4686,20 +5289,20 @@
+@@ -4686,20 +5293,20 @@
    ;;
  esac
  fi
@@ -5035,7 +5047,7 @@
  reload_flag=$lt_cv_ld_reload_flag
  case $reload_flag in
  "" | " "*) ;;
-@@ -4716,8 +5319,8 @@
+@@ -4716,8 +5323,8 @@
      ;;
  esac
  
@@ -5046,7 +5058,7 @@
  if test "${lt_cv_path_NM+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -4765,23 +5368,23 @@
+@@ -4765,23 +5372,23 @@
    test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm
  fi
  fi
@@ -5080,7 +5092,7 @@
  if test "${lt_cv_deplibs_check_method+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -4956,8 +5559,8 @@
+@@ -4956,8 +5563,8 @@
  esac
  
  fi
@@ -5091,7 +5103,7 @@
  file_magic_cmd=$lt_cv_file_magic_cmd
  deplibs_check_method=$lt_cv_deplibs_check_method
  test -z "$deplibs_check_method" && deplibs_check_method=unknown
-@@ -4974,11 +5577,11 @@
+@@ -4974,11 +5581,11 @@
  # Allow CC to be a program name with arguments.
  compiler=$CC
  
@@ -5106,16 +5118,16 @@
  test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
  
  # Some flags need to be propagated to the compiler or linker for good
-@@ -5005,7 +5608,7 @@
+@@ -5005,7 +5612,7 @@
    ;;
  *-*-irix6*)
    # Find out which ABI we are using.
 -  echo '#line 5008 "configure"' > conftest.$ac_ext
-+  echo '#line 5611 "configure"' > conftest.$ac_ext
++  echo '#line 5615 "configure"' > conftest.$ac_ext
    if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
-@@ -5090,8 +5693,8 @@
+@@ -5090,8 +5697,8 @@
    # On SCO OpenServer 5, we need -belf to get full-featured binaries.
    SAVE_CFLAGS="$CFLAGS"
    CFLAGS="$CFLAGS -belf"
@@ -5126,7 +5138,7 @@
  if test "${lt_cv_cc_needs_belf+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -5117,34 +5720,32 @@
+@@ -5117,34 +5724,32 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -5176,7 +5188,7 @@
        conftest$ac_exeext conftest.$ac_ext
       ac_ext=c
  ac_cpp='$CPP $CPPFLAGS'
-@@ -5153,8 +5754,8 @@
+@@ -5153,8 +5758,8 @@
  ac_compiler_gnu=$ac_cv_c_compiler_gnu
  
  fi
@@ -5187,7 +5199,7 @@
    if test x"$lt_cv_cc_needs_belf" != x"yes"; then
      # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
      CFLAGS="$SAVE_CFLAGS"
-@@ -5184,8 +5785,8 @@
+@@ -5184,8 +5789,8 @@
    if test -n "$ac_tool_prefix"; then
    # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
  set dummy ${ac_tool_prefix}dlltool; ac_word=$2
@@ -5198,7 +5210,7 @@
  if test "${ac_cv_prog_DLLTOOL+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -5198,32 +5799,34 @@
+@@ -5198,32 +5803,34 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -5240,7 +5252,7 @@
  if test "${ac_cv_prog_ac_ct_DLLTOOL+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -5236,27 +5839,41 @@
+@@ -5236,27 +5843,41 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -5289,7 +5301,7 @@
  else
    DLLTOOL="$ac_cv_prog_DLLTOOL"
  fi
-@@ -5264,8 +5881,8 @@
+@@ -5264,8 +5885,8 @@
    if test -n "$ac_tool_prefix"; then
    # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args.
  set dummy ${ac_tool_prefix}as; ac_word=$2
@@ -5300,7 +5312,7 @@
  if test "${ac_cv_prog_AS+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -5278,32 +5895,34 @@
+@@ -5278,32 +5899,34 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -5342,7 +5354,7 @@
  if test "${ac_cv_prog_ac_ct_AS+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -5316,27 +5935,41 @@
+@@ -5316,27 +5939,41 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -5391,7 +5403,7 @@
  else
    AS="$ac_cv_prog_AS"
  fi
-@@ -5344,8 +5977,8 @@
+@@ -5344,8 +5981,8 @@
    if test -n "$ac_tool_prefix"; then
    # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args.
  set dummy ${ac_tool_prefix}objdump; ac_word=$2
@@ -5402,7 +5414,7 @@
  if test "${ac_cv_prog_OBJDUMP+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -5358,32 +5991,34 @@
+@@ -5358,32 +5995,34 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -5444,7 +5456,7 @@
  if test "${ac_cv_prog_ac_ct_OBJDUMP+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -5396,27 +6031,41 @@
+@@ -5396,27 +6035,41 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -5493,7 +5505,7 @@
  else
    OBJDUMP="$ac_cv_prog_OBJDUMP"
  fi
-@@ -5432,18 +6081,19 @@
+@@ -5432,18 +6085,19 @@
  for ac_header in dlfcn.h
  do
  as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -5521,7 +5533,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -5454,40 +6104,37 @@
+@@ -5454,40 +6108,37 @@
  #include <$ac_header>
  _ACEOF
  rm -f conftest.$ac_objext
@@ -5580,7 +5592,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -5496,24 +6143,22 @@
+@@ -5496,24 +6147,22 @@
  /* end confdefs.h.  */
  #include <$ac_header>
  _ACEOF
@@ -5616,7 +5628,7 @@
    ac_header_preproc=yes
  else
    echo "$as_me: failed program was:" >&5
-@@ -5521,9 +6166,10 @@
+@@ -5521,9 +6170,10 @@
  
    ac_header_preproc=no
  fi
@@ -5629,7 +5641,7 @@
  
  # So?  What about this header?
  case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -5547,25 +6193,19 @@
+@@ -5547,25 +6197,19 @@
  echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
      { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
  echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
@@ -5662,7 +5674,7 @@
  
  fi
  if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -5577,18 +6217,22 @@
+@@ -5577,18 +6221,22 @@
  
  done
  
@@ -5690,7 +5702,7 @@
  if test "${ac_cv_prog_CXX+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -5601,36 +6245,38 @@
+@@ -5601,36 +6249,38 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -5737,7 +5749,7 @@
  if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -5643,55 +6289,85 @@
+@@ -5643,55 +6293,85 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -5841,7 +5853,7 @@
  if test "${ac_cv_cxx_compiler_gnu+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -5714,49 +6390,49 @@
+@@ -5714,49 +6394,49 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -5914,7 +5926,7 @@
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
-@@ -5772,157 +6448,134 @@
+@@ -5772,157 +6452,134 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -6142,7 +6154,7 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -5930,8 +6583,8 @@
+@@ -5930,8 +6587,8 @@
  
  depcc="$CXX"  am_compiler_list=
  
@@ -6153,7 +6165,7 @@
  if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -6020,8 +6673,8 @@
+@@ -6020,8 +6677,8 @@
  fi
  
  fi
@@ -6164,7 +6176,7 @@
  CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type
  
  
-@@ -6042,13 +6695,13 @@
+@@ -6042,13 +6699,13 @@
  if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
      ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
      (test "X$CXX" != "Xg++"))) ; then
@@ -6181,7 +6193,7 @@
  if test -z "$CXXCPP"; then
    if test "${ac_cv_prog_CXXCPP+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -6078,24 +6731,22 @@
+@@ -6078,24 +6735,22 @@
  #endif
  		     Syntax error
  _ACEOF
@@ -6217,7 +6229,7 @@
    :
  else
    echo "$as_me: failed program was:" >&5
-@@ -6104,9 +6755,10 @@
+@@ -6104,9 +6759,10 @@
    # Broken: fails on valid input.
  continue
  fi
@@ -6229,7 +6241,7 @@
    # can be detected and how.
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
-@@ -6116,24 +6768,22 @@
+@@ -6116,24 +6772,22 @@
  /* end confdefs.h.  */
  #include <ac_nonexistent.h>
  _ACEOF
@@ -6265,7 +6277,7 @@
    # Broken: success on invalid input.
  continue
  else
-@@ -6144,6 +6794,7 @@
+@@ -6144,6 +6798,7 @@
  ac_preproc_ok=:
  break
  fi
@@ -6273,7 +6285,7 @@
  rm -f conftest.err conftest.$ac_ext
  
  done
-@@ -6161,8 +6812,8 @@
+@@ -6161,8 +6816,8 @@
  else
    ac_cv_prog_CXXCPP=$CXXCPP
  fi
@@ -6284,7 +6296,7 @@
  ac_preproc_ok=false
  for ac_cxx_preproc_warn_flag in '' yes
  do
-@@ -6185,24 +6836,22 @@
+@@ -6185,24 +6840,22 @@
  #endif
  		     Syntax error
  _ACEOF
@@ -6320,7 +6332,7 @@
    :
  else
    echo "$as_me: failed program was:" >&5
-@@ -6211,9 +6860,10 @@
+@@ -6211,9 +6864,10 @@
    # Broken: fails on valid input.
  continue
  fi
@@ -6332,7 +6344,7 @@
    # can be detected and how.
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
-@@ -6223,24 +6873,22 @@
+@@ -6223,24 +6877,22 @@
  /* end confdefs.h.  */
  #include <ac_nonexistent.h>
  _ACEOF
@@ -6368,7 +6380,7 @@
    # Broken: success on invalid input.
  continue
  else
-@@ -6251,6 +6899,7 @@
+@@ -6251,6 +6903,7 @@
  ac_preproc_ok=:
  break
  fi
@@ -6376,7 +6388,7 @@
  rm -f conftest.err conftest.$ac_ext
  
  done
-@@ -6266,7 +6915,7 @@
+@@ -6266,7 +6919,7 @@
     { (exit 1); exit 1; }; }
  fi
  
@@ -6385,7 +6397,7 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -6280,12 +6929,12 @@
+@@ -6280,12 +6933,12 @@
  ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
  ac_compiler_gnu=$ac_cv_f77_compiler_gnu
  if test -n "$ac_tool_prefix"; then
@@ -6401,7 +6413,7 @@
  if test "${ac_cv_prog_F77+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -6298,36 +6947,38 @@
+@@ -6298,36 +6951,38 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -6448,7 +6460,7 @@
  if test "${ac_cv_prog_ac_ct_F77+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -6340,48 +6991,78 @@
+@@ -6340,48 +6995,78 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -6541,7 +6553,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }
-@@ -6391,8 +7072,8 @@
+@@ -6391,8 +7076,8 @@
  # input file.  (Note that this only needs to work for GNU compilers.)
  ac_save_ext=$ac_ext
  ac_ext=F
@@ -6552,7 +6564,7 @@
  if test "${ac_cv_f77_compiler_gnu+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -6405,45 +7086,42 @@
+@@ -6405,45 +7090,42 @@
        end
  _ACEOF
  rm -f conftest.$ac_objext
@@ -6616,7 +6628,7 @@
  if test "${ac_cv_prog_f77_g+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -6454,38 +7132,35 @@
+@@ -6454,38 +7136,35 @@
        end
  _ACEOF
  rm -f conftest.$ac_objext
@@ -6671,7 +6683,7 @@
  if test "$ac_test_FFLAGS" = set; then
    FFLAGS=$ac_save_FFLAGS
  elif test $ac_cv_prog_f77_g = yes; then
-@@ -6514,8 +7189,8 @@
+@@ -6514,8 +7193,8 @@
  # Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers!
  
  # find the maximum length of command line arguments
@@ -6682,7 +6694,7 @@
  if test "${lt_cv_sys_max_cmd_len+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -6623,19 +7298,19 @@
+@@ -6623,19 +7302,19 @@
  fi
  
  if test -n $lt_cv_sys_max_cmd_len ; then
@@ -6708,7 +6720,7 @@
  if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -6839,15 +7514,15 @@
+@@ -6839,15 +7518,15 @@
    lt_cv_sys_global_symbol_to_cdecl=
  fi
  if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then
@@ -6730,7 +6742,7 @@
  if test "${lt_cv_objdir+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -6861,8 +7536,8 @@
+@@ -6861,8 +7540,8 @@
  fi
  rmdir .libs 2>/dev/null
  fi
@@ -6741,7 +6753,7 @@
  objdir=$lt_cv_objdir
  
  
-@@ -6913,8 +7588,8 @@
+@@ -6913,8 +7592,8 @@
  if test -n "$ac_tool_prefix"; then
    # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
  set dummy ${ac_tool_prefix}ar; ac_word=$2
@@ -6752,7 +6764,7 @@
  if test "${ac_cv_prog_AR+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -6927,32 +7602,34 @@
+@@ -6927,32 +7606,34 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -6794,7 +6806,7 @@
  if test "${ac_cv_prog_ac_ct_AR+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -6965,27 +7642,41 @@
+@@ -6965,27 +7646,41 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -6843,7 +6855,7 @@
  else
    AR="$ac_cv_prog_AR"
  fi
-@@ -6993,8 +7684,8 @@
+@@ -6993,8 +7688,8 @@
  if test -n "$ac_tool_prefix"; then
    # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
  set dummy ${ac_tool_prefix}ranlib; ac_word=$2
@@ -6854,7 +6866,7 @@
  if test "${ac_cv_prog_RANLIB+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -7007,32 +7698,34 @@
+@@ -7007,32 +7702,34 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -6896,7 +6908,7 @@
  if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -7045,27 +7738,41 @@
+@@ -7045,27 +7742,41 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -6945,7 +6957,7 @@
  else
    RANLIB="$ac_cv_prog_RANLIB"
  fi
-@@ -7073,8 +7780,8 @@
+@@ -7073,8 +7784,8 @@
  if test -n "$ac_tool_prefix"; then
    # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
  set dummy ${ac_tool_prefix}strip; ac_word=$2
@@ -6956,7 +6968,7 @@
  if test "${ac_cv_prog_STRIP+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -7087,32 +7794,34 @@
+@@ -7087,32 +7798,34 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -6998,7 +7010,7 @@
  if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -7125,27 +7834,41 @@
+@@ -7125,27 +7838,41 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -7047,7 +7059,7 @@
  else
    STRIP="$ac_cv_prog_STRIP"
  fi
-@@ -7204,8 +7927,8 @@
+@@ -7204,8 +7931,8 @@
  case $deplibs_check_method in
  file_magic*)
    if test "$file_magic_cmd" = '$MAGIC_CMD'; then
@@ -7058,7 +7070,7 @@
  if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -7257,17 +7980,17 @@
+@@ -7257,17 +7984,17 @@
  
  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
  if test -n "$MAGIC_CMD"; then
@@ -7082,7 +7094,7 @@
  if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -7319,11 +8042,11 @@
+@@ -7319,11 +8046,11 @@
  
  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
  if test -n "$MAGIC_CMD"; then
@@ -7098,7 +7110,7 @@
  fi
  
    else
-@@ -7338,21 +8061,21 @@
+@@ -7338,21 +8065,21 @@
  enable_dlopen=no
  enable_win32_dll=yes
  
@@ -7127,7 +7139,7 @@
  test -z "$pic_mode" && pic_mode=default
  
  # Use C for the default configuration in the libtool script
-@@ -7410,8 +8133,8 @@
+@@ -7410,8 +8137,8 @@
    lt_prog_compiler_no_builtin_flag=' -fno-builtin'
  
  
@@ -7138,21 +7150,21 @@
  if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -7428,11 +8151,11 @@
+@@ -7428,11 +8155,11 @@
     -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
 -   (eval echo "\"\$as_me:7431: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:8154: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:8158: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
 -   echo "$as_me:7435: \$? = $ac_status" >&5
-+   echo "$as_me:8158: \$? = $ac_status" >&5
++   echo "$as_me:8162: \$? = $ac_status" >&5
     if (exit $ac_status) && test -s "$ac_outfile"; then
       # The compiler can only warn and ignore the option if not recognized
       # So say no if there are warnings other than the usual output.
-@@ -7445,8 +8168,8 @@
+@@ -7445,8 +8172,8 @@
     $rm conftest*
  
  fi
@@ -7163,7 +7175,7 @@
  
  if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then
      lt_prog_compiler_no_builtin_flag="$lt_prog_compiler_no_builtin_flag -fno-rtti -fno-exceptions"
-@@ -7460,8 +8183,8 @@
+@@ -7460,8 +8187,8 @@
  lt_prog_compiler_pic=
  lt_prog_compiler_static=
  
@@ -7174,7 +7186,7 @@
  
    if test "$GCC" = yes; then
      lt_prog_compiler_wl='-Wl,'
-@@ -7670,16 +8393,16 @@
+@@ -7670,16 +8397,16 @@
      esac
    fi
  
@@ -7195,21 +7207,21 @@
  if test "${lt_prog_compiler_pic_works+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -7696,11 +8419,11 @@
+@@ -7696,11 +8423,11 @@
     -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
 -   (eval echo "\"\$as_me:7699: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:8422: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:8426: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
 -   echo "$as_me:7703: \$? = $ac_status" >&5
-+   echo "$as_me:8426: \$? = $ac_status" >&5
++   echo "$as_me:8430: \$? = $ac_status" >&5
     if (exit $ac_status) && test -s "$ac_outfile"; then
       # The compiler can only warn and ignore the option if not recognized
       # So say no if there are warnings other than the usual output.
-@@ -7713,8 +8436,8 @@
+@@ -7713,8 +8440,8 @@
     $rm conftest*
  
  fi
@@ -7220,7 +7232,7 @@
  
  if test x"$lt_prog_compiler_pic_works" = xyes; then
      case $lt_prog_compiler_pic in
-@@ -7741,8 +8464,8 @@
+@@ -7741,8 +8468,8 @@
  # Check to make sure the static flag actually works.
  #
  wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\"
@@ -7231,7 +7243,7 @@
  if test "${lt_prog_compiler_static_works+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -7769,8 +8492,8 @@
+@@ -7769,8 +8496,8 @@
     LDFLAGS="$save_LDFLAGS"
  
  fi
@@ -7242,7 +7254,7 @@
  
  if test x"$lt_prog_compiler_static_works" = xyes; then
      :
-@@ -7779,8 +8502,8 @@
+@@ -7779,8 +8506,8 @@
  fi
  
  
@@ -7253,21 +7265,21 @@
  if test "${lt_cv_prog_compiler_c_o+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -7800,11 +8523,11 @@
+@@ -7800,11 +8527,11 @@
     -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
 -   (eval echo "\"\$as_me:7803: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:8526: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:8530: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>out/conftest.err)
     ac_status=$?
     cat out/conftest.err >&5
 -   echo "$as_me:7807: \$? = $ac_status" >&5
-+   echo "$as_me:8530: \$? = $ac_status" >&5
++   echo "$as_me:8534: \$? = $ac_status" >&5
     if (exit $ac_status) && test -s out/conftest2.$ac_objext
     then
       # The compiler can only warn and ignore the option if not recognized
-@@ -7826,23 +8549,23 @@
+@@ -7826,23 +8553,23 @@
     $rm conftest*
  
  fi
@@ -7297,7 +7309,7 @@
    if test "$hard_links" = no; then
      { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
  echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
-@@ -7852,8 +8575,8 @@
+@@ -7852,8 +8579,8 @@
    need_locks=no
  fi
  
@@ -7308,7 +7320,7 @@
  
    runpath_var=
    allow_undefined_flag=
-@@ -8269,26 +8992,23 @@
+@@ -8269,26 +8996,23 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -7347,7 +7359,7 @@
  
  aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
  }'`
-@@ -8299,8 +9019,10 @@
+@@ -8299,8 +9023,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -7359,7 +7371,7 @@
        conftest$ac_exeext conftest.$ac_ext
  if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  
-@@ -8329,26 +9051,23 @@
+@@ -8329,26 +9055,23 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -7398,7 +7410,7 @@
  
  aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
  }'`
-@@ -8359,8 +9078,10 @@
+@@ -8359,8 +9082,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -7410,7 +7422,7 @@
        conftest$ac_exeext conftest.$ac_ext
  if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  
-@@ -8818,8 +9539,8 @@
+@@ -8818,8 +9543,8 @@
      esac
    fi
  
@@ -7421,7 +7433,7 @@
  test "$ld_shlibs" = no && can_build_shared=no
  
  #
-@@ -8839,8 +9560,8 @@
+@@ -8839,8 +9564,8 @@
        # Test whether the compiler implicitly links with -lc since on some
        # systems, -lgcc has to come before -lc. If gcc already passes -lc
        # to ld, don't add -lc before -lgcc.
@@ -7432,7 +7444,7 @@
        $rm conftest*
        printf "$lt_simple_compile_test_code" > conftest.$ac_ext
  
-@@ -8877,16 +9598,16 @@
+@@ -8877,16 +9602,16 @@
          cat conftest.err 1>&5
        fi
        $rm conftest*
@@ -7453,7 +7465,7 @@
  library_names_spec=
  libname_spec='lib$name'
  soname_spec=
-@@ -9485,8 +10206,8 @@
+@@ -9485,8 +10210,8 @@
    dynamic_linker=no
    ;;
  esac
@@ -7464,7 +7476,7 @@
  test "$dynamic_linker" = no && can_build_shared=no
  
  variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
-@@ -9494,8 +10215,8 @@
+@@ -9494,8 +10219,8 @@
    variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
  fi
  
@@ -7475,7 +7487,7 @@
  hardcode_action=
  if test -n "$hardcode_libdir_flag_spec" || \
     test -n "$runpath_var" || \
-@@ -9519,8 +10240,8 @@
+@@ -9519,8 +10244,8 @@
    # directories.
    hardcode_action=unsupported
  fi
@@ -7486,7 +7498,7 @@
  
  if test "$hardcode_action" = relink; then
    # Fast installation is not supported
-@@ -9533,29 +10254,29 @@
+@@ -9533,29 +10258,29 @@
  
  striplib=
  old_striplib=
@@ -7526,7 +7538,7 @@
      ;;
    esac
  fi
-@@ -9587,8 +10308,8 @@
+@@ -9587,8 +10312,8 @@
  
    darwin*)
    # if libdl is installed we need to link against it
@@ -7537,7 +7549,7 @@
  if test "${ac_cv_lib_dl_dlopen+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -9601,55 +10322,53 @@
+@@ -9601,55 +10326,53 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -7614,7 +7626,7 @@
  if test $ac_cv_lib_dl_dlopen = yes; then
    lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
  else
-@@ -9663,8 +10382,8 @@
+@@ -9663,8 +10386,8 @@
     ;;
  
    *)
@@ -7625,7 +7637,7 @@
  if test "${ac_cv_func_shl_load+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -9691,72 +10410,64 @@
+@@ -9691,72 +10414,64 @@
  
  #undef shl_load
  
@@ -7725,7 +7737,7 @@
  if test "${ac_cv_lib_dld_shl_load+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -9769,60 +10480,58 @@
+@@ -9769,60 +10484,58 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -7809,7 +7821,7 @@
  if test "${ac_cv_func_dlopen+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -9849,72 +10558,64 @@
+@@ -9849,72 +10562,64 @@
  
  #undef dlopen
  
@@ -7906,7 +7918,7 @@
  if test "${ac_cv_lib_dl_dlopen+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -9927,60 +10628,58 @@
+@@ -9927,60 +10632,58 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -7990,7 +8002,7 @@
  if test "${ac_cv_lib_svld_dlopen+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -9993,60 +10692,58 @@
+@@ -9993,60 +10696,58 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -8074,7 +8086,7 @@
  if test "${ac_cv_lib_dld_dld_link+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -10059,55 +10756,53 @@
+@@ -10059,55 +10760,53 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -8151,7 +8163,7 @@
  if test $ac_cv_lib_dld_dld_link = yes; then
    lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"
  fi
-@@ -10147,8 +10842,8 @@
+@@ -10147,8 +10846,8 @@
      save_LIBS="$LIBS"
      LIBS="$lt_cv_dlopen_libs $LIBS"
  
@@ -8162,16 +8174,16 @@
  if test "${lt_cv_dlopen_self+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -10158,7 +10853,7 @@
+@@ -10158,7 +10857,7 @@
    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
    lt_status=$lt_dlunknown
    cat > conftest.$ac_ext <<EOF
 -#line 10161 "configure"
-+#line 10856 "configure"
++#line 10860 "configure"
  #include "confdefs.h"
  
  #if HAVE_DLFCN_H
-@@ -10242,13 +10937,13 @@
+@@ -10242,13 +10941,13 @@
  
  
  fi
@@ -8189,16 +8201,16 @@
  if test "${lt_cv_dlopen_self_static+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -10258,7 +10953,7 @@
+@@ -10258,7 +10957,7 @@
    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
    lt_status=$lt_dlunknown
    cat > conftest.$ac_ext <<EOF
 -#line 10261 "configure"
-+#line 10956 "configure"
++#line 10960 "configure"
  #include "confdefs.h"
  
  #if HAVE_DLFCN_H
-@@ -10342,8 +11037,8 @@
+@@ -10342,8 +11041,8 @@
  
  
  fi
@@ -8209,7 +8221,7 @@
      fi
  
      CPPFLAGS="$save_CPPFLAGS"
-@@ -10365,13 +11060,13 @@
+@@ -10365,13 +11064,13 @@
  
  
  # Report which library types will actually be built
@@ -8229,7 +8241,7 @@
  test "$can_build_shared" = "no" && enable_shared=no
  
  # On AIX, shared libraries and static libraries use the same namespace, and
-@@ -10391,15 +11086,15 @@
+@@ -10391,15 +11090,15 @@
    fi
      ;;
  esac
@@ -8251,7 +8263,7 @@
  
  # The else clause should only fire when bootstrapping the
  # libtool distribution, otherwise you forgot to ship ltmain.sh
-@@ -10891,11 +11586,11 @@
+@@ -10891,11 +11590,11 @@
  CC="$lt_save_CC"
  
  
@@ -8267,7 +8279,7 @@
  
  if test -f "$ltmain" && test -n "$tagnames"; then
    if test ! -f "${ofile}"; then
-@@ -10949,7 +11644,7 @@
+@@ -10949,7 +11648,7 @@
  	if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
  	    ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
  	    (test "X$CXX" != "Xg++"))) ; then
@@ -8276,7 +8288,7 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -11068,18 +11763,18 @@
+@@ -11068,18 +11767,18 @@
    # Set up default GNU C++ configuration
  
  
@@ -8301,7 +8313,7 @@
    case $host in
    *-*-mingw*)
      # gcc leaves a trailing carriage return which upsets mingw
-@@ -11108,11 +11803,11 @@
+@@ -11108,11 +11807,11 @@
      ;;
    esac
  elif test "$with_gnu_ld" = yes; then
@@ -8317,7 +8329,7 @@
  fi
  if test "${lt_cv_path_LD+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -11145,17 +11840,17 @@
+@@ -11145,17 +11844,17 @@
  
  LD="$lt_cv_path_LD"
  if test -n "$LD"; then
@@ -8341,7 +8353,7 @@
  if test "${lt_cv_prog_gnu_ld+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -11169,8 +11864,8 @@
+@@ -11169,8 +11868,8 @@
    ;;
  esac
  fi
@@ -8352,7 +8364,7 @@
  with_gnu_ld=$lt_cv_prog_gnu_ld
  
  
-@@ -11220,8 +11915,8 @@
+@@ -11220,8 +11919,8 @@
  fi
  
  # PORTME: fill in a description of your system's C++ link characteristics
@@ -8363,7 +8375,7 @@
  ld_shlibs_CXX=yes
  case $host_os in
    aix3*)
-@@ -11333,26 +12028,23 @@
+@@ -11333,26 +12032,23 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -8402,7 +8414,7 @@
  
  aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
  }'`
-@@ -11363,8 +12055,10 @@
+@@ -11363,8 +12059,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -8414,7 +8426,7 @@
        conftest$ac_exeext conftest.$ac_ext
  if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  
-@@ -11394,26 +12088,23 @@
+@@ -11394,26 +12092,23 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -8453,7 +8465,7 @@
  
  aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
  }'`
-@@ -11424,8 +12115,10 @@
+@@ -11424,8 +12119,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -8465,7 +8477,7 @@
        conftest$ac_exeext conftest.$ac_ext
  if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  
-@@ -12156,8 +12849,8 @@
+@@ -12156,8 +12853,8 @@
      ld_shlibs_CXX=no
      ;;
  esac
@@ -8476,7 +8488,7 @@
  test "$ld_shlibs_CXX" = no && can_build_shared=no
  
  GCC_CXX="$GXX"
-@@ -12296,8 +12989,8 @@
+@@ -12296,8 +12993,8 @@
  lt_prog_compiler_pic_CXX=
  lt_prog_compiler_static_CXX=
  
@@ -8487,7 +8499,7 @@
  
    # C++ specific cases for pic, static, wl, etc.
    if test "$GXX" = yes; then
-@@ -12570,16 +13263,16 @@
+@@ -12570,16 +13267,16 @@
      esac
    fi
  
@@ -8508,21 +8520,21 @@
  if test "${lt_prog_compiler_pic_works_CXX+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -12596,11 +13289,11 @@
+@@ -12596,11 +13293,11 @@
     -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
 -   (eval echo "\"\$as_me:12599: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:13292: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:13296: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
 -   echo "$as_me:12603: \$? = $ac_status" >&5
-+   echo "$as_me:13296: \$? = $ac_status" >&5
++   echo "$as_me:13300: \$? = $ac_status" >&5
     if (exit $ac_status) && test -s "$ac_outfile"; then
       # The compiler can only warn and ignore the option if not recognized
       # So say no if there are warnings other than the usual output.
-@@ -12613,8 +13306,8 @@
+@@ -12613,8 +13310,8 @@
     $rm conftest*
  
  fi
@@ -8533,7 +8545,7 @@
  
  if test x"$lt_prog_compiler_pic_works_CXX" = xyes; then
      case $lt_prog_compiler_pic_CXX in
-@@ -12641,8 +13334,8 @@
+@@ -12641,8 +13338,8 @@
  # Check to make sure the static flag actually works.
  #
  wl=$lt_prog_compiler_wl_CXX eval lt_tmp_static_flag=\"$lt_prog_compiler_static_CXX\"
@@ -8544,7 +8556,7 @@
  if test "${lt_prog_compiler_static_works_CXX+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -12669,8 +13362,8 @@
+@@ -12669,8 +13366,8 @@
     LDFLAGS="$save_LDFLAGS"
  
  fi
@@ -8555,7 +8567,7 @@
  
  if test x"$lt_prog_compiler_static_works_CXX" = xyes; then
      :
-@@ -12679,8 +13372,8 @@
+@@ -12679,8 +13376,8 @@
  fi
  
  
@@ -8566,21 +8578,21 @@
  if test "${lt_cv_prog_compiler_c_o_CXX+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -12700,11 +13393,11 @@
+@@ -12700,11 +13397,11 @@
     -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
 -   (eval echo "\"\$as_me:12703: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:13396: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:13400: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>out/conftest.err)
     ac_status=$?
     cat out/conftest.err >&5
 -   echo "$as_me:12707: \$? = $ac_status" >&5
-+   echo "$as_me:13400: \$? = $ac_status" >&5
++   echo "$as_me:13404: \$? = $ac_status" >&5
     if (exit $ac_status) && test -s out/conftest2.$ac_objext
     then
       # The compiler can only warn and ignore the option if not recognized
-@@ -12726,23 +13419,23 @@
+@@ -12726,23 +13423,23 @@
     $rm conftest*
  
  fi
@@ -8610,7 +8622,7 @@
    if test "$hard_links" = no; then
      { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
  echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
-@@ -12752,8 +13445,8 @@
+@@ -12752,8 +13449,8 @@
    need_locks=no
  fi
  
@@ -8621,7 +8633,7 @@
  
    export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
    case $host_os in
-@@ -12783,8 +13476,8 @@
+@@ -12783,8 +13480,8 @@
    ;;
    esac
  
@@ -8632,7 +8644,7 @@
  test "$ld_shlibs_CXX" = no && can_build_shared=no
  
  #
-@@ -12804,8 +13497,8 @@
+@@ -12804,8 +13501,8 @@
        # Test whether the compiler implicitly links with -lc since on some
        # systems, -lgcc has to come before -lc. If gcc already passes -lc
        # to ld, don't add -lc before -lgcc.
@@ -8643,7 +8655,7 @@
        $rm conftest*
        printf "$lt_simple_compile_test_code" > conftest.$ac_ext
  
-@@ -12842,16 +13535,16 @@
+@@ -12842,16 +13539,16 @@
          cat conftest.err 1>&5
        fi
        $rm conftest*
@@ -8664,7 +8676,7 @@
  library_names_spec=
  libname_spec='lib$name'
  soname_spec=
-@@ -13450,8 +14143,8 @@
+@@ -13450,8 +14147,8 @@
    dynamic_linker=no
    ;;
  esac
@@ -8675,7 +8687,7 @@
  test "$dynamic_linker" = no && can_build_shared=no
  
  variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
-@@ -13459,8 +14152,8 @@
+@@ -13459,8 +14156,8 @@
    variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
  fi
  
@@ -8686,7 +8698,7 @@
  hardcode_action_CXX=
  if test -n "$hardcode_libdir_flag_spec_CXX" || \
     test -n "$runpath_var_CXX" || \
-@@ -13484,8 +14177,8 @@
+@@ -13484,8 +14181,8 @@
    # directories.
    hardcode_action_CXX=unsupported
  fi
@@ -8697,7 +8709,7 @@
  
  if test "$hardcode_action_CXX" = relink; then
    # Fast installation is not supported
-@@ -14010,13 +14703,13 @@
+@@ -14010,13 +14707,13 @@
  cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
  
  
@@ -8717,7 +8729,7 @@
  test "$can_build_shared" = "no" && enable_shared=no
  
  # On AIX, shared libraries and static libraries use the same namespace, and
-@@ -14035,15 +14728,15 @@
+@@ -14035,15 +14732,15 @@
    fi
    ;;
  esac
@@ -8739,7 +8751,7 @@
  
  GCC_F77="$G77"
  LD_F77="$LD"
-@@ -14052,8 +14745,8 @@
+@@ -14052,8 +14749,8 @@
  lt_prog_compiler_pic_F77=
  lt_prog_compiler_static_F77=
  
@@ -8750,7 +8762,7 @@
  
    if test "$GCC" = yes; then
      lt_prog_compiler_wl_F77='-Wl,'
-@@ -14262,16 +14955,16 @@
+@@ -14262,16 +14959,16 @@
      esac
    fi
  
@@ -8771,21 +8783,21 @@
  if test "${lt_prog_compiler_pic_works_F77+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -14288,11 +14981,11 @@
+@@ -14288,11 +14985,11 @@
     -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
 -   (eval echo "\"\$as_me:14291: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:14984: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:14988: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
 -   echo "$as_me:14295: \$? = $ac_status" >&5
-+   echo "$as_me:14988: \$? = $ac_status" >&5
++   echo "$as_me:14992: \$? = $ac_status" >&5
     if (exit $ac_status) && test -s "$ac_outfile"; then
       # The compiler can only warn and ignore the option if not recognized
       # So say no if there are warnings other than the usual output.
-@@ -14305,8 +14998,8 @@
+@@ -14305,8 +15002,8 @@
     $rm conftest*
  
  fi
@@ -8796,7 +8808,7 @@
  
  if test x"$lt_prog_compiler_pic_works_F77" = xyes; then
      case $lt_prog_compiler_pic_F77 in
-@@ -14333,8 +15026,8 @@
+@@ -14333,8 +15030,8 @@
  # Check to make sure the static flag actually works.
  #
  wl=$lt_prog_compiler_wl_F77 eval lt_tmp_static_flag=\"$lt_prog_compiler_static_F77\"
@@ -8807,7 +8819,7 @@
  if test "${lt_prog_compiler_static_works_F77+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -14361,8 +15054,8 @@
+@@ -14361,8 +15058,8 @@
     LDFLAGS="$save_LDFLAGS"
  
  fi
@@ -8818,7 +8830,7 @@
  
  if test x"$lt_prog_compiler_static_works_F77" = xyes; then
      :
-@@ -14371,8 +15064,8 @@
+@@ -14371,8 +15068,8 @@
  fi
  
  
@@ -8829,21 +8841,21 @@
  if test "${lt_cv_prog_compiler_c_o_F77+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -14392,11 +15085,11 @@
+@@ -14392,11 +15089,11 @@
     -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
 -   (eval echo "\"\$as_me:14395: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:15088: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:15092: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>out/conftest.err)
     ac_status=$?
     cat out/conftest.err >&5
 -   echo "$as_me:14399: \$? = $ac_status" >&5
-+   echo "$as_me:15092: \$? = $ac_status" >&5
++   echo "$as_me:15096: \$? = $ac_status" >&5
     if (exit $ac_status) && test -s out/conftest2.$ac_objext
     then
       # The compiler can only warn and ignore the option if not recognized
-@@ -14418,23 +15111,23 @@
+@@ -14418,23 +15115,23 @@
     $rm conftest*
  
  fi
@@ -8873,7 +8885,7 @@
    if test "$hard_links" = no; then
      { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
  echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
-@@ -14444,8 +15137,8 @@
+@@ -14444,8 +15141,8 @@
    need_locks=no
  fi
  
@@ -8884,7 +8896,7 @@
  
    runpath_var=
    allow_undefined_flag_F77=
-@@ -14851,26 +15544,23 @@
+@@ -14851,26 +15548,23 @@
        end
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -8923,7 +8935,7 @@
  
  aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
  }'`
-@@ -14881,8 +15571,10 @@
+@@ -14881,8 +15575,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -8935,7 +8947,7 @@
        conftest$ac_exeext conftest.$ac_ext
  if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  
-@@ -14901,26 +15593,23 @@
+@@ -14901,26 +15597,23 @@
        end
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -8974,7 +8986,7 @@
  
  aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
  }'`
-@@ -14931,8 +15620,10 @@
+@@ -14931,8 +15624,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -8986,7 +8998,7 @@
        conftest$ac_exeext conftest.$ac_ext
  if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  
-@@ -15390,8 +16081,8 @@
+@@ -15390,8 +16085,8 @@
      esac
    fi
  
@@ -8997,7 +9009,7 @@
  test "$ld_shlibs_F77" = no && can_build_shared=no
  
  #
-@@ -15411,8 +16102,8 @@
+@@ -15411,8 +16106,8 @@
        # Test whether the compiler implicitly links with -lc since on some
        # systems, -lgcc has to come before -lc. If gcc already passes -lc
        # to ld, don't add -lc before -lgcc.
@@ -9008,7 +9020,7 @@
        $rm conftest*
        printf "$lt_simple_compile_test_code" > conftest.$ac_ext
  
-@@ -15449,16 +16140,16 @@
+@@ -15449,16 +16144,16 @@
          cat conftest.err 1>&5
        fi
        $rm conftest*
@@ -9029,7 +9041,7 @@
  library_names_spec=
  libname_spec='lib$name'
  soname_spec=
-@@ -16057,8 +16748,8 @@
+@@ -16057,8 +16752,8 @@
    dynamic_linker=no
    ;;
  esac
@@ -9040,7 +9052,7 @@
  test "$dynamic_linker" = no && can_build_shared=no
  
  variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
-@@ -16066,8 +16757,8 @@
+@@ -16066,8 +16761,8 @@
    variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
  fi
  
@@ -9051,7 +9063,7 @@
  hardcode_action_F77=
  if test -n "$hardcode_libdir_flag_spec_F77" || \
     test -n "$runpath_var_F77" || \
-@@ -16091,8 +16782,8 @@
+@@ -16091,8 +16786,8 @@
    # directories.
    hardcode_action_F77=unsupported
  fi
@@ -9062,7 +9074,7 @@
  
  if test "$hardcode_action_F77" = relink; then
    # Fast installation is not supported
-@@ -16529,7 +17220,6 @@
+@@ -16529,7 +17224,6 @@
  	if test -n "$GCJ" && test "X$GCJ" != "Xno"; then
  
  
@@ -9070,7 +9082,7 @@
  # Source file extension for Java test sources.
  ac_ext=java
  
-@@ -16597,8 +17287,8 @@
+@@ -16597,8 +17291,8 @@
    lt_prog_compiler_no_builtin_flag_GCJ=' -fno-builtin'
  
  
@@ -9081,21 +9093,21 @@
  if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -16615,11 +17305,11 @@
+@@ -16615,11 +17309,11 @@
     -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
 -   (eval echo "\"\$as_me:16618: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:17308: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:17312: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
 -   echo "$as_me:16622: \$? = $ac_status" >&5
-+   echo "$as_me:17312: \$? = $ac_status" >&5
++   echo "$as_me:17316: \$? = $ac_status" >&5
     if (exit $ac_status) && test -s "$ac_outfile"; then
       # The compiler can only warn and ignore the option if not recognized
       # So say no if there are warnings other than the usual output.
-@@ -16632,8 +17322,8 @@
+@@ -16632,8 +17326,8 @@
     $rm conftest*
  
  fi
@@ -9106,7 +9118,7 @@
  
  if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then
      lt_prog_compiler_no_builtin_flag_GCJ="$lt_prog_compiler_no_builtin_flag_GCJ -fno-rtti -fno-exceptions"
-@@ -16647,8 +17337,8 @@
+@@ -16647,8 +17341,8 @@
  lt_prog_compiler_pic_GCJ=
  lt_prog_compiler_static_GCJ=
  
@@ -9117,7 +9129,7 @@
  
    if test "$GCC" = yes; then
      lt_prog_compiler_wl_GCJ='-Wl,'
-@@ -16857,16 +17547,16 @@
+@@ -16857,16 +17551,16 @@
      esac
    fi
  
@@ -9138,21 +9150,21 @@
  if test "${lt_prog_compiler_pic_works_GCJ+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -16883,11 +17573,11 @@
+@@ -16883,11 +17577,11 @@
     -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
 -   (eval echo "\"\$as_me:16886: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:17576: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:17580: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
 -   echo "$as_me:16890: \$? = $ac_status" >&5
-+   echo "$as_me:17580: \$? = $ac_status" >&5
++   echo "$as_me:17584: \$? = $ac_status" >&5
     if (exit $ac_status) && test -s "$ac_outfile"; then
       # The compiler can only warn and ignore the option if not recognized
       # So say no if there are warnings other than the usual output.
-@@ -16900,8 +17590,8 @@
+@@ -16900,8 +17594,8 @@
     $rm conftest*
  
  fi
@@ -9163,7 +9175,7 @@
  
  if test x"$lt_prog_compiler_pic_works_GCJ" = xyes; then
      case $lt_prog_compiler_pic_GCJ in
-@@ -16928,8 +17618,8 @@
+@@ -16928,8 +17622,8 @@
  # Check to make sure the static flag actually works.
  #
  wl=$lt_prog_compiler_wl_GCJ eval lt_tmp_static_flag=\"$lt_prog_compiler_static_GCJ\"
@@ -9174,7 +9186,7 @@
  if test "${lt_prog_compiler_static_works_GCJ+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -16956,8 +17646,8 @@
+@@ -16956,8 +17650,8 @@
     LDFLAGS="$save_LDFLAGS"
  
  fi
@@ -9185,7 +9197,7 @@
  
  if test x"$lt_prog_compiler_static_works_GCJ" = xyes; then
      :
-@@ -16966,8 +17656,8 @@
+@@ -16966,8 +17660,8 @@
  fi
  
  
@@ -9196,21 +9208,21 @@
  if test "${lt_cv_prog_compiler_c_o_GCJ+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -16987,11 +17677,11 @@
+@@ -16987,11 +17681,11 @@
     -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
 -   (eval echo "\"\$as_me:16990: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:17680: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:17684: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>out/conftest.err)
     ac_status=$?
     cat out/conftest.err >&5
 -   echo "$as_me:16994: \$? = $ac_status" >&5
-+   echo "$as_me:17684: \$? = $ac_status" >&5
++   echo "$as_me:17688: \$? = $ac_status" >&5
     if (exit $ac_status) && test -s out/conftest2.$ac_objext
     then
       # The compiler can only warn and ignore the option if not recognized
-@@ -17013,23 +17703,23 @@
+@@ -17013,23 +17707,23 @@
     $rm conftest*
  
  fi
@@ -9240,7 +9252,7 @@
    if test "$hard_links" = no; then
      { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
  echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
-@@ -17039,8 +17729,8 @@
+@@ -17039,8 +17733,8 @@
    need_locks=no
  fi
  
@@ -9251,7 +9263,7 @@
  
    runpath_var=
    allow_undefined_flag_GCJ=
-@@ -17456,26 +18146,23 @@
+@@ -17456,26 +18150,23 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -9290,7 +9302,7 @@
  
  aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
  }'`
-@@ -17486,8 +18173,10 @@
+@@ -17486,8 +18177,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -9302,7 +9314,7 @@
        conftest$ac_exeext conftest.$ac_ext
  if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  
-@@ -17516,26 +18205,23 @@
+@@ -17516,26 +18209,23 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -9341,7 +9353,7 @@
  
  aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
  }'`
-@@ -17546,8 +18232,10 @@
+@@ -17546,8 +18236,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -9353,7 +9365,7 @@
        conftest$ac_exeext conftest.$ac_ext
  if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  
-@@ -18005,8 +18693,8 @@
+@@ -18005,8 +18697,8 @@
      esac
    fi
  
@@ -9364,7 +9376,7 @@
  test "$ld_shlibs_GCJ" = no && can_build_shared=no
  
  #
-@@ -18026,8 +18714,8 @@
+@@ -18026,8 +18718,8 @@
        # Test whether the compiler implicitly links with -lc since on some
        # systems, -lgcc has to come before -lc. If gcc already passes -lc
        # to ld, don't add -lc before -lgcc.
@@ -9375,7 +9387,7 @@
        $rm conftest*
        printf "$lt_simple_compile_test_code" > conftest.$ac_ext
  
-@@ -18064,16 +18752,16 @@
+@@ -18064,16 +18756,16 @@
          cat conftest.err 1>&5
        fi
        $rm conftest*
@@ -9396,7 +9408,7 @@
  library_names_spec=
  libname_spec='lib$name'
  soname_spec=
-@@ -18672,8 +19360,8 @@
+@@ -18672,8 +19364,8 @@
    dynamic_linker=no
    ;;
  esac
@@ -9407,7 +9419,7 @@
  test "$dynamic_linker" = no && can_build_shared=no
  
  variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
-@@ -18681,8 +19369,8 @@
+@@ -18681,8 +19373,8 @@
    variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
  fi
  
@@ -9418,7 +9430,7 @@
  hardcode_action_GCJ=
  if test -n "$hardcode_libdir_flag_spec_GCJ" || \
     test -n "$runpath_var_GCJ" || \
-@@ -18706,8 +19394,8 @@
+@@ -18706,8 +19398,8 @@
    # directories.
    hardcode_action_GCJ=unsupported
  fi
@@ -9429,7 +9441,7 @@
  
  if test "$hardcode_action_GCJ" = relink; then
    # Fast installation is not supported
-@@ -19143,7 +19831,6 @@
+@@ -19143,7 +19835,6 @@
        RC)
  
  
@@ -9437,7 +9449,7 @@
  # Source file extension for RC test sources.
  ac_ext=rc
  
-@@ -19678,8 +20365,8 @@
+@@ -19678,8 +20369,8 @@
  
  INCLUDES='-I$(top_srcdir)/include -I$(top_builddir)/include'
  
@@ -9448,7 +9460,7 @@
  if test "${ac_cv_header_time+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -19703,37 +20390,34 @@
+@@ -19703,37 +20394,34 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -9502,7 +9514,7 @@
  if test $ac_cv_header_time = yes; then
  
  cat >>confdefs.h <<\_ACEOF
-@@ -19742,8 +20426,8 @@
+@@ -19742,8 +20430,8 @@
  
  fi
  
@@ -9513,7 +9525,7 @@
  if test "${ac_cv_type_struct_timeval+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -19756,49 +20440,47 @@
+@@ -19756,49 +20444,47 @@
  #include <sys/time.h>
      #include <time.h>
  
@@ -9582,7 +9594,7 @@
  if test $ac_cv_type_struct_timeval = yes; then
  
  cat >>confdefs.h <<_ACEOF
-@@ -19810,17 +20492,17 @@
+@@ -19810,17 +20496,17 @@
  
  rm -f include/inttypes.h
      if test "${ac_cv_header_inttypes_h+set}" = set; then
@@ -9606,7 +9618,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -19831,40 +20513,37 @@
+@@ -19831,40 +20517,37 @@
  #include <inttypes.h>
  _ACEOF
  rm -f conftest.$ac_objext
@@ -9665,7 +9677,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -19873,24 +20552,22 @@
+@@ -19873,24 +20556,22 @@
  /* end confdefs.h.  */
  #include <inttypes.h>
  _ACEOF
@@ -9701,7 +9713,7 @@
    ac_header_preproc=yes
  else
    echo "$as_me: failed program was:" >&5
-@@ -19898,9 +20575,10 @@
+@@ -19898,9 +20579,10 @@
  
    ac_header_preproc=no
  fi
@@ -9714,7 +9726,7 @@
  
  # So?  What about this header?
  case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -19924,33 +20602,26 @@
+@@ -19924,33 +20606,26 @@
  echo "$as_me: WARNING: inttypes.h: proceeding with the preprocessor's result" >&2;}
      { echo "$as_me:$LINENO: WARNING: inttypes.h: in the future, the compiler will take precedence" >&5
  echo "$as_me: WARNING: inttypes.h: in the future, the compiler will take precedence" >&2;}
@@ -9755,7 +9767,7 @@
  ac_stdint_h=`echo include/inttypes.h`
  # try to shortcircuit - if the default include path of the compiler
  # can find a "stdint.h" header then we assume that all compilers can.
-@@ -19977,35 +20648,32 @@
+@@ -19977,35 +20652,32 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -9805,7 +9817,7 @@
  CXXFLAGS="$old_CXXFLAGS"
  CPPFLAGS="$old_CPPFLAGS"
  CFLAGS="$old_CFLAGS"
-@@ -20014,18 +20682,18 @@
+@@ -20014,18 +20686,18 @@
  
  v="... $ac_cv_header_stdint_h"
  if test "$ac_stdint_h" = "stdint.h" ; then
@@ -9832,7 +9844,7 @@
  fi
  
  if test "_$ac_cv_header_stdint_t" = "_" ; then # can not shortcircuit..
-@@ -20034,20 +20702,20 @@
+@@ -20034,20 +20706,20 @@
  inttype_headers=`echo  | sed -e 's/,/ /g'`
  
  ac_cv_stdint_result="(no helpful system typedefs seen)"
@@ -9859,7 +9871,7 @@
  if test "${ac_cv_type_uintptr_t+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -20059,57 +20727,55 @@
+@@ -20059,57 +20731,55 @@
  /* end confdefs.h.  */
  #include <$i>
  
@@ -9938,7 +9950,7 @@
  if test "${ac_cv_type_uint64_t+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -20121,49 +20787,47 @@
+@@ -20121,49 +20791,47 @@
  /* end confdefs.h.  */
  #include<$i>
  
@@ -10007,7 +10019,7 @@
  if test $ac_cv_type_uint64_t = yes; then
    and64="/uint64_t"
  else
-@@ -20173,28 +20837,28 @@
+@@ -20173,28 +20841,28 @@
     ac_cv_stdint_result="(seen uintptr_t$and64 in $i)"
     break;
    done
@@ -10046,7 +10058,7 @@
  if test "${ac_cv_type_uint32_t+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -20206,57 +20870,55 @@
+@@ -20206,57 +20874,55 @@
  /* end confdefs.h.  */
  #include <$i>
  
@@ -10129,7 +10141,7 @@
  if test "${ac_cv_type_uint64_t+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -20268,49 +20930,47 @@
+@@ -20268,49 +20934,47 @@
  /* end confdefs.h.  */
  #include<$i>
  
@@ -10198,7 +10210,7 @@
  if test $ac_cv_type_uint64_t = yes; then
    and64="/uint64_t"
  else
-@@ -20320,30 +20980,30 @@
+@@ -20320,30 +20984,30 @@
     ac_cv_stdint_result="(seen uint32_t$and64 in $i)"
     break;
    done
@@ -10239,7 +10251,7 @@
  if test "${ac_cv_type_u_int32_t+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -20355,57 +21015,55 @@
+@@ -20355,57 +21019,55 @@
  /* end confdefs.h.  */
  #include <$i>
  
@@ -10318,7 +10330,7 @@
  if test "${ac_cv_type_u_int64_t+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -20417,49 +21075,47 @@
+@@ -20417,49 +21079,47 @@
  /* end confdefs.h.  */
  #include<$i>
  
@@ -10387,7 +10399,7 @@
  if test $ac_cv_type_u_int64_t = yes; then
    and64="/u_int64_t"
  else
-@@ -20469,21 +21125,21 @@
+@@ -20469,21 +21129,21 @@
     ac_cv_stdint_result="(seen u_int32_t$and64 in $i)"
     break;
    done
@@ -10419,7 +10431,7 @@
  if test "${ac_cv_type_char+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -20494,60 +21150,57 @@
+@@ -20494,60 +21154,57 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -10505,7 +10517,7 @@
    if test "$cross_compiling" = yes; then
    # Depending upon the size, compute the lo and hi bounds.
  cat >conftest.$ac_ext <<_ACEOF
-@@ -20557,10 +21210,11 @@
+@@ -20557,10 +21214,11 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -10518,7 +10530,7 @@
  test_array [0] = 0
  
    ;
-@@ -20568,26 +21222,22 @@
+@@ -20568,26 +21226,22 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -10556,7 +10568,7 @@
    ac_lo=0 ac_mid=0
    while :; do
      cat >conftest.$ac_ext <<_ACEOF
-@@ -20597,10 +21247,11 @@
+@@ -20597,10 +21251,11 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -10569,7 +10581,7 @@
  test_array [0] = 0
  
    ;
-@@ -20608,55 +21259,53 @@
+@@ -20608,55 +21263,53 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -10647,7 +10659,7 @@
  test_array [0] = 0
  
    ;
-@@ -20664,26 +21313,22 @@
+@@ -20664,26 +21317,22 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -10685,7 +10697,7 @@
    ac_hi=-1 ac_mid=-1
    while :; do
      cat >conftest.$ac_ext <<_ACEOF
-@@ -20693,10 +21338,11 @@
+@@ -20693,10 +21342,11 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -10698,7 +10710,7 @@
  test_array [0] = 0
  
    ;
-@@ -20704,49 +21350,48 @@
+@@ -20704,49 +21354,48 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -10772,7 +10784,7 @@
  # Binary search between lo and hi bounds.
  while test "x$ac_lo" != "x$ac_hi"; do
    ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
-@@ -20757,10 +21402,11 @@
+@@ -20757,10 +21406,11 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -10785,7 +10797,7 @@
  test_array [0] = 0
  
    ;
-@@ -20768,49 +21414,45 @@
+@@ -20768,49 +21418,45 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -10856,7 +10868,7 @@
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -20818,8 +21460,9 @@
+@@ -20818,8 +21464,9 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -10868,7 +10880,7 @@
  #include <stdio.h>
  #include <stdlib.h>
  int
-@@ -20828,35 +21471,44 @@
+@@ -20828,35 +21475,44 @@
  
    FILE *f = fopen ("conftest.val", "w");
    if (! f)
@@ -10926,7 +10938,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -20867,29 +21519,32 @@
+@@ -20867,29 +21523,32 @@
  sed 's/^/| /' conftest.$ac_ext >&5
  
  ( exit $ac_status )
@@ -10971,7 +10983,7 @@
  if test "${ac_cv_type_short+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -20900,60 +21555,57 @@
+@@ -20900,60 +21559,57 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -11057,7 +11069,7 @@
    if test "$cross_compiling" = yes; then
    # Depending upon the size, compute the lo and hi bounds.
  cat >conftest.$ac_ext <<_ACEOF
-@@ -20963,10 +21615,11 @@
+@@ -20963,10 +21619,11 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -11070,7 +11082,7 @@
  test_array [0] = 0
  
    ;
-@@ -20974,26 +21627,22 @@
+@@ -20974,26 +21631,22 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -11108,7 +11120,7 @@
    ac_lo=0 ac_mid=0
    while :; do
      cat >conftest.$ac_ext <<_ACEOF
-@@ -21003,10 +21652,11 @@
+@@ -21003,10 +21656,11 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -11121,7 +11133,7 @@
  test_array [0] = 0
  
    ;
-@@ -21014,55 +21664,53 @@
+@@ -21014,55 +21668,53 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -11199,7 +11211,7 @@
  test_array [0] = 0
  
    ;
-@@ -21070,26 +21718,22 @@
+@@ -21070,26 +21722,22 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -11237,7 +11249,7 @@
    ac_hi=-1 ac_mid=-1
    while :; do
      cat >conftest.$ac_ext <<_ACEOF
-@@ -21099,10 +21743,11 @@
+@@ -21099,10 +21747,11 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -11250,7 +11262,7 @@
  test_array [0] = 0
  
    ;
-@@ -21110,49 +21755,48 @@
+@@ -21110,49 +21759,48 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -11324,7 +11336,7 @@
  # Binary search between lo and hi bounds.
  while test "x$ac_lo" != "x$ac_hi"; do
    ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
-@@ -21163,10 +21807,11 @@
+@@ -21163,10 +21811,11 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -11337,7 +11349,7 @@
  test_array [0] = 0
  
    ;
-@@ -21174,49 +21819,45 @@
+@@ -21174,49 +21823,45 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -11408,7 +11420,7 @@
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -21224,8 +21865,9 @@
+@@ -21224,8 +21869,9 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -11420,7 +11432,7 @@
  #include <stdio.h>
  #include <stdlib.h>
  int
-@@ -21234,35 +21876,44 @@
+@@ -21234,35 +21880,44 @@
  
    FILE *f = fopen ("conftest.val", "w");
    if (! f)
@@ -11478,7 +11490,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -21273,29 +21924,32 @@
+@@ -21273,29 +21928,32 @@
  sed 's/^/| /' conftest.$ac_ext >&5
  
  ( exit $ac_status )
@@ -11523,7 +11535,7 @@
  if test "${ac_cv_type_int+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -21306,60 +21960,57 @@
+@@ -21306,60 +21964,57 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -11609,7 +11621,7 @@
    if test "$cross_compiling" = yes; then
    # Depending upon the size, compute the lo and hi bounds.
  cat >conftest.$ac_ext <<_ACEOF
-@@ -21369,10 +22020,11 @@
+@@ -21369,10 +22024,11 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -11622,7 +11634,7 @@
  test_array [0] = 0
  
    ;
-@@ -21380,26 +22032,22 @@
+@@ -21380,26 +22036,22 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -11661,7 +11673,7 @@
    ac_lo=0 ac_mid=0
    while :; do
      cat >conftest.$ac_ext <<_ACEOF
-@@ -21409,10 +22057,11 @@
+@@ -21409,10 +22061,11 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -11674,7 +11686,7 @@
  test_array [0] = 0
  
    ;
-@@ -21420,55 +22069,53 @@
+@@ -21420,55 +22073,53 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -11752,7 +11764,7 @@
  test_array [0] = 0
  
    ;
-@@ -21476,26 +22123,22 @@
+@@ -21476,26 +22127,22 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -11790,7 +11802,7 @@
    ac_hi=-1 ac_mid=-1
    while :; do
      cat >conftest.$ac_ext <<_ACEOF
-@@ -21505,10 +22148,11 @@
+@@ -21505,10 +22152,11 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -11803,7 +11815,7 @@
  test_array [0] = 0
  
    ;
-@@ -21516,49 +22160,48 @@
+@@ -21516,49 +22164,48 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -11877,7 +11889,7 @@
  # Binary search between lo and hi bounds.
  while test "x$ac_lo" != "x$ac_hi"; do
    ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
-@@ -21569,10 +22212,11 @@
+@@ -21569,10 +22216,11 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -11890,7 +11902,7 @@
  test_array [0] = 0
  
    ;
-@@ -21580,49 +22224,45 @@
+@@ -21580,49 +22228,45 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -11961,7 +11973,7 @@
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -21630,8 +22270,9 @@
+@@ -21630,8 +22274,9 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -11973,7 +11985,7 @@
  #include <stdio.h>
  #include <stdlib.h>
  int
-@@ -21640,35 +22281,44 @@
+@@ -21640,35 +22285,44 @@
  
    FILE *f = fopen ("conftest.val", "w");
    if (! f)
@@ -12031,7 +12043,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -21679,29 +22329,32 @@
+@@ -21679,29 +22333,32 @@
  sed 's/^/| /' conftest.$ac_ext >&5
  
  ( exit $ac_status )
@@ -12076,7 +12088,7 @@
  if test "${ac_cv_type_long+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -21712,60 +22365,57 @@
+@@ -21712,60 +22369,57 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -12162,7 +12174,7 @@
    if test "$cross_compiling" = yes; then
    # Depending upon the size, compute the lo and hi bounds.
  cat >conftest.$ac_ext <<_ACEOF
-@@ -21775,10 +22425,11 @@
+@@ -21775,10 +22429,11 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -12175,7 +12187,7 @@
  test_array [0] = 0
  
    ;
-@@ -21786,26 +22437,22 @@
+@@ -21786,26 +22441,22 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -12213,7 +12225,7 @@
    ac_lo=0 ac_mid=0
    while :; do
      cat >conftest.$ac_ext <<_ACEOF
-@@ -21815,10 +22462,11 @@
+@@ -21815,10 +22466,11 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -12226,7 +12238,7 @@
  test_array [0] = 0
  
    ;
-@@ -21826,55 +22474,53 @@
+@@ -21826,55 +22478,53 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -12304,7 +12316,7 @@
  test_array [0] = 0
  
    ;
-@@ -21882,26 +22528,22 @@
+@@ -21882,26 +22532,22 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -12342,7 +12354,7 @@
    ac_hi=-1 ac_mid=-1
    while :; do
      cat >conftest.$ac_ext <<_ACEOF
-@@ -21911,10 +22553,11 @@
+@@ -21911,10 +22557,11 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -12355,7 +12367,7 @@
  test_array [0] = 0
  
    ;
-@@ -21922,49 +22565,48 @@
+@@ -21922,49 +22569,48 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -12429,7 +12441,7 @@
  # Binary search between lo and hi bounds.
  while test "x$ac_lo" != "x$ac_hi"; do
    ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
-@@ -21975,10 +22617,11 @@
+@@ -21975,10 +22621,11 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -12442,7 +12454,7 @@
  test_array [0] = 0
  
    ;
-@@ -21986,49 +22629,45 @@
+@@ -21986,49 +22633,45 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -12513,7 +12525,7 @@
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -22036,8 +22675,9 @@
+@@ -22036,8 +22679,9 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -12525,7 +12537,7 @@
  #include <stdio.h>
  #include <stdlib.h>
  int
-@@ -22046,35 +22686,44 @@
+@@ -22046,35 +22690,44 @@
  
    FILE *f = fopen ("conftest.val", "w");
    if (! f)
@@ -12583,7 +12595,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -22085,29 +22734,32 @@
+@@ -22085,29 +22738,32 @@
  sed 's/^/| /' conftest.$ac_ext >&5
  
  ( exit $ac_status )
@@ -12628,7 +12640,7 @@
  if test "${ac_cv_type_voidp+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -22118,60 +22770,57 @@
+@@ -22118,60 +22774,57 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -12714,7 +12726,7 @@
    if test "$cross_compiling" = yes; then
    # Depending upon the size, compute the lo and hi bounds.
  cat >conftest.$ac_ext <<_ACEOF
-@@ -22181,10 +22830,11 @@
+@@ -22181,10 +22834,11 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -12727,7 +12739,7 @@
  test_array [0] = 0
  
    ;
-@@ -22192,26 +22842,22 @@
+@@ -22192,26 +22846,22 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -12765,7 +12777,7 @@
    ac_lo=0 ac_mid=0
    while :; do
      cat >conftest.$ac_ext <<_ACEOF
-@@ -22221,10 +22867,11 @@
+@@ -22221,10 +22871,11 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -12778,7 +12790,7 @@
  test_array [0] = 0
  
    ;
-@@ -22232,55 +22879,53 @@
+@@ -22232,55 +22883,53 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -12856,7 +12868,7 @@
  test_array [0] = 0
  
    ;
-@@ -22288,26 +22933,22 @@
+@@ -22288,26 +22937,22 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -12894,7 +12906,7 @@
    ac_hi=-1 ac_mid=-1
    while :; do
      cat >conftest.$ac_ext <<_ACEOF
-@@ -22317,10 +22958,11 @@
+@@ -22317,10 +22962,11 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -12907,7 +12919,7 @@
  test_array [0] = 0
  
    ;
-@@ -22328,49 +22970,48 @@
+@@ -22328,49 +22974,48 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -12981,7 +12993,7 @@
  # Binary search between lo and hi bounds.
  while test "x$ac_lo" != "x$ac_hi"; do
    ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
-@@ -22381,10 +23022,11 @@
+@@ -22381,10 +23026,11 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -12994,7 +13006,7 @@
  test_array [0] = 0
  
    ;
-@@ -22392,49 +23034,45 @@
+@@ -22392,49 +23038,45 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -13065,7 +13077,7 @@
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -22442,8 +23080,9 @@
+@@ -22442,8 +23084,9 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -13077,7 +13089,7 @@
  #include <stdio.h>
  #include <stdlib.h>
  int
-@@ -22452,35 +23091,44 @@
+@@ -22452,35 +23095,44 @@
  
    FILE *f = fopen ("conftest.val", "w");
    if (! f)
@@ -13135,7 +13147,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -22491,22 +23139,25 @@
+@@ -22491,22 +23143,25 @@
  sed 's/^/| /' conftest.$ac_ext >&5
  
  ( exit $ac_status )
@@ -13171,7 +13183,7 @@
  cat >>confdefs.h <<_ACEOF
  #define SIZEOF_VOIDP $ac_cv_sizeof_voidp
  _ACEOF
-@@ -22534,8 +23185,8 @@
+@@ -22534,8 +23189,8 @@
      222/*|444/*) name="$name        (unusual dsptype)" ;;
       *)          name="$name        (very unusal model)" ;;
     esac
@@ -13182,7 +13194,7 @@
  fi
  
  if test "_$ac_cv_header_stdint_x" != "_" ; then
-@@ -22548,14 +23199,14 @@
+@@ -22548,14 +23203,14 @@
     ac_cv_header_stdint="stddef.h"
  fi
  
@@ -13203,7 +13215,7 @@
  if test "${ac_cv_type_int_least32_t+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -22567,52 +23218,50 @@
+@@ -22567,52 +23222,50 @@
  /* end confdefs.h.  */
  #include <$ac_cv_header_stdint>
  
@@ -13277,7 +13289,7 @@
  if test "${ac_cv_type_int_fast32_t+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -22624,52 +23273,50 @@
+@@ -22624,52 +23277,50 @@
  /* end confdefs.h.  */
  #include<$ac_cv_header_stdint>
  
@@ -13351,7 +13363,7 @@
  if test "${ac_cv_type_intmax_t+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -22681,49 +23328,47 @@
+@@ -22681,49 +23332,47 @@
  /* end confdefs.h.  */
  #include <$ac_cv_header_stdint>
  
@@ -13420,7 +13432,7 @@
  
  
  fi # shortcircut to system "stdint.h"
-@@ -22734,19 +23379,19 @@
+@@ -22734,19 +23383,19 @@
  ac_cv_stdint_message="using $CC"
  fi
  
@@ -13445,7 +13457,7 @@
  if test "${ac_cv_c_const+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -22764,10 +23409,10 @@
+@@ -22764,10 +23413,10 @@
  #ifndef __cplusplus
    /* Ultrix mips cc rejects this.  */
    typedef int charset[2];
@@ -13459,7 +13471,7 @@
    /* NEC SVR4.0.2 mips cc rejects this.  */
    struct point {int x, y;};
    static struct point const zero = {0,0};
-@@ -22776,16 +23421,17 @@
+@@ -22776,16 +23425,17 @@
       an arm of an if-expression whose if-part is not a constant
       expression */
    const char *g = "string";
@@ -13481,7 +13493,7 @@
    }
    { /* Someone thinks the Sun supposedly-ANSI compiler will reject this.  */
      int x[] = {25, 17};
-@@ -22804,7 +23450,9 @@
+@@ -22804,7 +23454,9 @@
    }
    { /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */
      const int foo = 10;
@@ -13491,7 +13503,7 @@
  #endif
  
    ;
-@@ -22812,37 +23460,34 @@
+@@ -22812,37 +23464,34 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -13545,7 +13557,7 @@
  if test $ac_cv_c_const = no; then
  
  cat >>confdefs.h <<\_ACEOF
-@@ -22851,8 +23496,8 @@
+@@ -22851,8 +23500,8 @@
  
  fi
  
@@ -13556,7 +13568,7 @@
  if test "${ac_cv_c_inline+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -22872,38 +23517,37 @@
+@@ -22872,38 +23521,37 @@
  
  _ACEOF
  rm -f conftest.$ac_objext
@@ -13613,7 +13625,7 @@
  
  
  case $ac_cv_c_inline in
-@@ -22922,8 +23566,8 @@
+@@ -22922,8 +23570,8 @@
  esac
  
      if test x"$GCC" = x"yes" -a x"$ac_cv_c_inline" = x"inline"; then
@@ -13624,7 +13636,7 @@
  	SAVE_CFLAGS="$CFLAGS"
  	CFLAGS="$CFLAGS -Wall -Werror"
  	cat >conftest.$ac_ext <<_ACEOF
-@@ -22945,37 +23589,34 @@
+@@ -22945,37 +23593,34 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -13678,7 +13690,7 @@
  	if test x"$ac_cv_always_inline" = x"yes"; then
  	    cat >>confdefs.h <<_ACEOF
  #define inline __attribute__ ((__always_inline__))
-@@ -22983,8 +23624,8 @@
+@@ -22983,8 +23628,8 @@
  
  	fi
      fi
@@ -13689,7 +13701,7 @@
      ac_cv_c_restrict=no
      for ac_kw in restrict __restrict__ __restrict; do
  	cat >conftest.$ac_ext <<_ACEOF
-@@ -23003,36 +23644,34 @@
+@@ -23003,36 +23648,34 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -13742,7 +13754,7 @@
      case $ac_cv_c_restrict in
  	restrict) ;;
  	no)
-@@ -23045,13 +23684,13 @@
+@@ -23045,13 +23688,13 @@
  _ACEOF
   ;;
      esac
@@ -13755,11 +13767,11 @@
  else
    cat > conftest.c <<EOF
 -#line 23054 "configure"
-+#line 23693 "configure"
++#line 23697 "configure"
  int foo (int a)
  {
      a = __builtin_expect (a, 10);
-@@ -23071,8 +23710,8 @@
+@@ -23071,8 +23714,8 @@
  	fi
  	rm -f conftest*
  fi
@@ -13770,7 +13782,7 @@
      if test x"$ac_cv_builtin_expect" = x"yes"; then
  
  cat >>confdefs.h <<\_ACEOF
-@@ -23080,8 +23719,8 @@
+@@ -23080,8 +23723,8 @@
  _ACEOF
  
      fi
@@ -13781,7 +13793,7 @@
  if test "${ac_cv_c_bigendian+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -23098,7 +23737,8 @@
+@@ -23098,7 +23741,8 @@
  int
  main ()
  {
@@ -13791,7 +13803,7 @@
   bogus endian macros
  #endif
  
-@@ -23107,26 +23747,22 @@
+@@ -23107,26 +23751,22 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -13829,7 +13841,7 @@
    # It does; now see whether it defined to BIG_ENDIAN or not.
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
-@@ -23149,39 +23785,36 @@
+@@ -23149,39 +23789,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -13884,7 +13896,7 @@
  if test "$cross_compiling" = yes; then
    # try to guess the endianness by grepping values into an object file
    ac_cv_c_bigendian=unknown
-@@ -23191,11 +23824,11 @@
+@@ -23191,11 +23828,11 @@
  cat confdefs.h >>conftest.$ac_ext
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
@@ -13900,7 +13912,7 @@
  void _ebcdic () { char *s = (char *) ebcdic_mm; s = (char *) ebcdic_ii; }
  int
  main ()
-@@ -23206,26 +23839,22 @@
+@@ -23206,26 +23843,22 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -13938,7 +13950,7 @@
    if grep BIGenDianSyS conftest.$ac_objext >/dev/null ; then
    ac_cv_c_bigendian=yes
  fi
-@@ -23241,8 +23870,10 @@
+@@ -23241,8 +23874,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -13950,7 +13962,7 @@
  else
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
-@@ -23250,27 +23881,41 @@
+@@ -23250,27 +23885,41 @@
  cat confdefs.h >>conftest.$ac_ext
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
@@ -13999,7 +14011,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -23283,13 +23928,16 @@
+@@ -23283,13 +23932,16 @@
  ( exit $ac_status )
  ac_cv_c_bigendian=yes
  fi
@@ -14020,7 +14032,7 @@
  case $ac_cv_c_bigendian in
    yes)
  
-@@ -23307,8 +23955,8 @@
+@@ -23307,8 +23959,8 @@
     { (exit 1); exit 1; }; } ;;
  esac
  
@@ -14031,7 +14043,7 @@
  if test "${ac_cv_c_volatile+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -23324,43 +23972,41 @@
+@@ -23324,43 +23976,41 @@
  {
  
  volatile int x;
@@ -14093,7 +14105,7 @@
  if test $ac_cv_c_volatile = no; then
  
  cat >>confdefs.h <<\_ACEOF
-@@ -23369,8 +24015,8 @@
+@@ -23369,8 +24019,8 @@
  
  fi
  
@@ -14104,7 +14116,7 @@
  if test "${ac_cv_type_size_t+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -23381,61 +24027,59 @@
+@@ -23381,61 +24031,59 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -14188,7 +14200,7 @@
  if test "${ac_cv_type_signal+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -23447,70 +24091,59 @@
+@@ -23447,70 +24095,59 @@
  /* end confdefs.h.  */
  #include <sys/types.h>
  #include <signal.h>
@@ -14282,7 +14294,7 @@
  if test "${ac_cv_sys_largefile_CC+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -23518,8 +24151,8 @@
+@@ -23518,8 +24155,8 @@
       if test "$GCC" != yes; then
         ac_save_CC=$CC
         while :; do
@@ -14293,7 +14305,7 @@
  	 cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -23543,82 +24176,77 @@
+@@ -23543,82 +24180,77 @@
    return 0;
  }
  _ACEOF
@@ -14411,7 +14423,7 @@
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -23643,33 +24271,31 @@
+@@ -23643,33 +24275,31 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -14460,7 +14472,7 @@
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -23695,53 +24321,53 @@
+@@ -23695,53 +24325,53 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -14539,7 +14551,7 @@
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -23766,33 +24392,31 @@
+@@ -23766,33 +24396,31 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -14588,7 +14600,7 @@
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -23818,46 +24442,47 @@
+@@ -23818,46 +24446,47 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -14658,7 +14670,7 @@
  fi
  
  
-@@ -23866,9 +24491,9 @@
+@@ -23866,9 +24495,9 @@
  for ac_func in gettimeofday ftime
  do
  as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -14671,7 +14683,7 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
-@@ -23894,67 +24519,60 @@
+@@ -23894,67 +24523,60 @@
  
  #undef $ac_func
  
@@ -14762,7 +14774,7 @@
  if test `eval echo '${'$as_ac_var'}'` = yes; then
    cat >>confdefs.h <<_ACEOF
  #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-@@ -23966,8 +24584,10 @@
+@@ -23966,8 +24588,10 @@
  
  
  
@@ -14775,7 +14787,7 @@
      mkdir ac_test_libtool; cd ac_test_libtool; ac_cv_libtool_non_pic=no
      echo "int g (int i); static int h (int i) {return g (i);} int f (int i) {return h (i);}" >f.c
      echo "int (* hook) (int) = 0; int g (int i) {if (hook) i = hook (i); return i + 1;}" >g.c
-@@ -23978,19 +24598,22 @@
+@@ -23978,19 +24602,22 @@
  	../libtool --mode=link $CC $CFLAGS -prefer-non-pic -o libfoo.la \
  		-rpath / f.lo g.lo >/dev/null 2>&1 &&
  	ac_cv_libtool_non_pic=yes
@@ -14803,7 +14815,7 @@
  if test x"$enable_accel_detect" != x"no"; then
  
  cat >>confdefs.h <<\_ACEOF
-@@ -24002,47 +24625,49 @@
+@@ -24002,47 +24629,49 @@
  
  
  
@@ -14874,7 +14886,7 @@
  	ac_im_usrlibdir=$ac_im_libdir; break
        fi
      done
-@@ -24050,7 +24675,7 @@
+@@ -24050,7 +24679,7 @@
      # bogus both because they are the default anyway, and because
      # using them would break gcc on systems where it needs fixed includes.
      case $ac_im_incroot in
@@ -14883,7 +14895,7 @@
  	*) test -f "$ac_im_incroot/X11/Xos.h" && ac_x_includes=$ac_im_incroot;;
      esac
      case $ac_im_usrlibdir in
-@@ -24059,7 +24684,7 @@
+@@ -24059,7 +24688,7 @@
      esac
    fi
    cd ..
@@ -14892,7 +14904,7 @@
  fi
  
  # Standard set of common directories for X headers.
-@@ -24100,7 +24725,7 @@
+@@ -24100,7 +24729,7 @@
  /usr/openwin/share/include'
  
  if test "$ac_x_includes" = no; then
@@ -14901,7 +14913,7 @@
    # First, try using that file with no special directory specified.
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
-@@ -24110,24 +24735,22 @@
+@@ -24110,24 +24739,22 @@
  /* end confdefs.h.  */
  #include <X11/Xlib.h>
  _ACEOF
@@ -14937,7 +14949,7 @@
    # We can compile using X headers with no special include directory.
  ac_x_includes=
  else
-@@ -24141,6 +24764,7 @@
+@@ -24141,6 +24768,7 @@
    fi
  done
  fi
@@ -14945,7 +14957,7 @@
  rm -f conftest.err conftest.$ac_ext
  fi # $ac_x_includes = no
  
-@@ -24166,26 +24790,23 @@
+@@ -24166,26 +24794,23 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -14984,7 +14996,7 @@
    LIBS=$ac_save_LIBS
  # We can link X programs with no special library path.
  ac_x_libraries=
-@@ -24193,56 +24814,56 @@
+@@ -24193,56 +24818,56 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -15065,7 +15077,7 @@
  if test "$no_x" = yes; then
    # Not all programs may use this symbol, but it does not hurt to define it.
  
-@@ -24261,12 +24882,12 @@
+@@ -24261,12 +24886,12 @@
      X_LIBS="$X_LIBS -L$x_libraries"
      # For Solaris; some versions of Sun CC require a space after -R and
      # others require no space.  Words are not sufficient . . . .
@@ -15084,7 +15096,7 @@
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
-@@ -24282,42 +24903,32 @@
+@@ -24282,42 +24907,32 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -15143,7 +15155,7 @@
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
-@@ -24333,46 +24944,42 @@
+@@ -24333,46 +24948,42 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -15215,7 +15227,7 @@
    fi
  
    # Check for system-dependent libraries X programs must link with.
-@@ -24393,49 +25000,46 @@
+@@ -24393,49 +25004,46 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -15283,7 +15295,7 @@
  if test "${ac_cv_lib_dnet_dnet_ntoa+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -24448,62 +25052,60 @@
+@@ -24448,62 +25056,60 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -15369,7 +15381,7 @@
  if test "${ac_cv_lib_dnet_stub_dnet_ntoa+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -24516,62 +25118,61 @@
+@@ -24516,62 +25122,61 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -15455,7 +15467,7 @@
        conftest$ac_exeext conftest.$ac_ext
      LIBS="$ac_xsave_LIBS"
  
-@@ -24583,8 +25184,8 @@
+@@ -24583,8 +25188,8 @@
      # on Irix 5.2, according to T.E. Dickey.
      # The functions gethostbyname, getservbyname, and inet_addr are
      # in -lbsd on LynxOS 3.0.1/i386, according to Lars Hecking.
@@ -15466,7 +15478,7 @@
  if test "${ac_cv_func_gethostbyname+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -24611,71 +25212,63 @@
+@@ -24611,71 +25216,63 @@
  
  #undef gethostbyname
  
@@ -15562,7 +15574,7 @@
  if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -24688,62 +25281,60 @@
+@@ -24688,62 +25285,60 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -15648,7 +15660,7 @@
  if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -24756,55 +25347,53 @@
+@@ -24756,55 +25351,53 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -15725,7 +15737,7 @@
  if test $ac_cv_lib_bsd_gethostbyname = yes; then
    X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd"
  fi
-@@ -24819,8 +25408,8 @@
+@@ -24819,8 +25412,8 @@
      # variants that don't use the name server (or something).  -lsocket
      # must be given before -lnsl if both are needed.  We assume that
      # if connect needs -lnsl, so does gethostbyname.
@@ -15736,7 +15748,7 @@
  if test "${ac_cv_func_connect+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -24847,71 +25436,63 @@
+@@ -24847,71 +25440,63 @@
  
  #undef connect
  
@@ -15832,7 +15844,7 @@
  if test "${ac_cv_lib_socket_connect+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -24924,55 +25505,53 @@
+@@ -24924,55 +25509,53 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -15909,7 +15921,7 @@
  if test $ac_cv_lib_socket_connect = yes; then
    X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS"
  fi
-@@ -24980,8 +25559,8 @@
+@@ -24980,8 +25563,8 @@
      fi
  
      # Guillermo Gomez says -lposix is necessary on A/UX.
@@ -15920,7 +15932,7 @@
  if test "${ac_cv_func_remove+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -25008,71 +25587,63 @@
+@@ -25008,71 +25591,63 @@
  
  #undef remove
  
@@ -16016,7 +16028,7 @@
  if test "${ac_cv_lib_posix_remove+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -25085,55 +25656,53 @@
+@@ -25085,55 +25660,53 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -16093,7 +16105,7 @@
  if test $ac_cv_lib_posix_remove = yes; then
    X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix"
  fi
-@@ -25141,8 +25710,8 @@
+@@ -25141,8 +25714,8 @@
      fi
  
      # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
@@ -16104,7 +16116,7 @@
  if test "${ac_cv_func_shmat+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -25169,71 +25738,63 @@
+@@ -25169,71 +25742,63 @@
  
  #undef shmat
  
@@ -16200,7 +16212,7 @@
  if test "${ac_cv_lib_ipc_shmat+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -25246,55 +25807,53 @@
+@@ -25246,55 +25811,53 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -16277,7 +16289,7 @@
  if test $ac_cv_lib_ipc_shmat = yes; then
    X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc"
  fi
-@@ -25311,8 +25870,8 @@
+@@ -25311,8 +25874,8 @@
    # These have to be linked with before -lX11, unlike the other
    # libraries we check for below, so use a different variable.
    # John Interrante, Karl Berry
@@ -16288,7 +16300,7 @@
  if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -25325,55 +25884,53 @@
+@@ -25325,55 +25888,53 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -16365,7 +16377,7 @@
  if test $ac_cv_lib_ICE_IceConnectionNumber = yes; then
    X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE"
  fi
-@@ -25383,8 +25940,8 @@
+@@ -25383,8 +25944,8 @@
  fi
  
  if test x"$no_x" != x"yes"; then
@@ -16376,7 +16388,7 @@
  if test "${ac_cv_lib_Xext_XShmCreateImage+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -25397,55 +25954,53 @@
+@@ -25397,55 +25958,53 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -16453,7 +16465,7 @@
  if test $ac_cv_lib_Xext_XShmCreateImage = yes; then
  
  cat >>confdefs.h <<\_ACEOF
-@@ -25454,8 +26009,8 @@
+@@ -25454,8 +26013,8 @@
  
  	LIBVO_CFLAGS="$LIBVO_CFLAGS $X_CFLAGS"
  	LIBVO_LIBS="$LIBVO_LIBS $X_PRE_LIBS $X_LIBS $X_EXTRA_LIBS -lXext -lX11"
@@ -16464,7 +16476,7 @@
  if test "${ac_cv_lib_Xv_XvShmCreateImage+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -25468,55 +26023,53 @@
+@@ -25468,55 +26027,53 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -16541,7 +16553,7 @@
  if test $ac_cv_lib_Xv_XvShmCreateImage = yes; then
  
  cat >>confdefs.h <<\_ACEOF
-@@ -25530,24 +26083,24 @@
+@@ -25530,24 +26087,24 @@
  
  fi
  
@@ -16575,7 +16587,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -25558,40 +26111,37 @@
+@@ -25558,40 +26115,37 @@
  #include <ddraw.h>
  _ACEOF
  rm -f conftest.$ac_objext
@@ -16634,7 +16646,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -25600,24 +26150,22 @@
+@@ -25600,24 +26154,22 @@
  /* end confdefs.h.  */
  #include <ddraw.h>
  _ACEOF
@@ -16670,7 +16682,7 @@
    ac_header_preproc=yes
  else
    echo "$as_me: failed program was:" >&5
-@@ -25625,9 +26173,10 @@
+@@ -25625,9 +26177,10 @@
  
    ac_header_preproc=no
  fi
@@ -16683,7 +16695,7 @@
  
  # So?  What about this header?
  case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -25651,25 +26200,18 @@
+@@ -25651,25 +26204,18 @@
  echo "$as_me: WARNING: ddraw.h: proceeding with the preprocessor's result" >&2;}
      { echo "$as_me:$LINENO: WARNING: ddraw.h: in the future, the compiler will take precedence" >&5
  echo "$as_me: WARNING: ddraw.h: in the future, the compiler will take precedence" >&2;}
@@ -16714,7 +16726,7 @@
  
  fi
  if test $ac_cv_header_ddraw_h = yes; then
-@@ -25698,16 +26240,16 @@
+@@ -25698,16 +26244,16 @@
  		fi;;
  esac
  
@@ -16736,7 +16748,7 @@
  if test "${ac_cv_prog_SDLCONFIG+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -25720,25 +26262,27 @@
+@@ -25720,25 +26266,27 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -16769,7 +16781,7 @@
      if test x"$SDLCONFIG" = x"yes"; then
  
  cat >>confdefs.h <<\_ACEOF
-@@ -25751,15 +26295,15 @@
+@@ -25751,15 +26299,15 @@
  fi
  
  
@@ -16790,7 +16802,7 @@
      SAVE_CFLAGS="$CFLAGS"
      CFLAGS="$TRY_CFLAGS $CFLAGS"
      cat >conftest.$ac_ext <<_ACEOF
-@@ -25778,37 +26322,34 @@
+@@ -25778,37 +26326,34 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -16844,7 +16856,7 @@
      if test x"$ac_cv_try_cflags_ok" = x"yes"; then
  	OPT_CFLAGS="$TRY_CFLAGS"
      else
-@@ -25822,11 +26363,11 @@
+@@ -25822,11 +26367,11 @@
  
  MPEG2DEC_CFLAGS="$OPT_CFLAGS"
  
@@ -16859,7 +16871,7 @@
  if test x"$enable_gprof" = x"yes"; then
  
  cat >>confdefs.h <<\_ACEOF
-@@ -25840,8 +26381,8 @@
+@@ -25840,8 +26385,8 @@
  
  SAV_CFLAGS=$CFLAGS;
      if test x"$GCC" = xyes; then CFLAGS="$CFLAGS -Werror"; fi
@@ -16870,7 +16882,7 @@
  if test "${ac_cv_c_attribute_aligned+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -25872,37 +26413,35 @@
+@@ -25872,37 +26417,35 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -16924,7 +16936,7 @@
      if test x"$ac_cv_c_attribute_aligned" != x"0"; then
  
  cat >>confdefs.h <<_ACEOF
-@@ -25930,39 +26469,58 @@
+@@ -25930,39 +26473,58 @@
  
  # The following way of writing the cache mishandles newlines in values,
  # but we know of no workaround that is simple, portable, and efficient.
@@ -16999,7 +17011,7 @@
    fi
  fi
  rm -f confcache
-@@ -25971,32 +26529,18 @@
+@@ -25971,32 +26533,18 @@
  # Let make expand exec_prefix.
  test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
  
@@ -17038,7 +17050,7 @@
  done
  LIBOBJS=$ac_libobjs
  
-@@ -26055,17 +26599,45 @@
+@@ -26055,17 +26603,45 @@
  ## M4sh Initialization.  ##
  ## --------------------- ##
  
@@ -17088,7 +17100,7 @@
  
  # Support unset when possible.
  if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
-@@ -26075,8 +26647,43 @@
+@@ -26075,8 +26651,43 @@
  fi
  
  
@@ -17133,7 +17145,7 @@
  PS1='$ '
  PS2='> '
  PS4='+ '
-@@ -26090,18 +26697,19 @@
+@@ -26090,18 +26701,19 @@
    if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
      eval $as_var=C; export $as_var
    else
@@ -17156,7 +17168,7 @@
    as_basename=basename
  else
    as_basename=false
-@@ -26109,159 +26717,120 @@
+@@ -26109,159 +26721,120 @@
  
  
  # Name of the executable.
@@ -17387,7 +17399,7 @@
  
  if mkdir -p . 2>/dev/null; then
    as_mkdir_p=:
-@@ -26270,7 +26839,28 @@
+@@ -26270,7 +26843,28 @@
    as_mkdir_p=false
  fi
  
@@ -17417,7 +17429,7 @@
  
  # Sed expression to map a string onto a valid CPP name.
  as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
-@@ -26279,31 +26869,14 @@
+@@ -26279,31 +26873,14 @@
  as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
  
  
@@ -17455,7 +17467,7 @@
  
    CONFIG_FILES    = $CONFIG_FILES
    CONFIG_HEADERS  = $CONFIG_HEADERS
-@@ -26311,30 +26884,20 @@
+@@ -26311,30 +26888,20 @@
    CONFIG_COMMANDS = $CONFIG_COMMANDS
    $ $0 $@
  
@@ -17494,7 +17506,7 @@
  ac_cs_usage="\
  \`$as_me' instantiates files from templates according to the
  current configuration.
-@@ -26342,7 +26905,7 @@
+@@ -26342,7 +26909,7 @@
  Usage: $0 [OPTIONS] [FILE]...
  
    -h, --help       print this help, then exit
@@ -17503,7 +17515,7 @@
    -q, --quiet      do not print progress messages
    -d, --debug      don't remove temporary files
        --recheck    update $as_me by reconfiguring in the same conditions
-@@ -26361,19 +26924,21 @@
+@@ -26361,19 +26928,21 @@
  $config_commands
  
  Report bugs to <bug-autoconf at gnu.org>."
@@ -17531,7 +17543,7 @@
  _ACEOF
  
  cat >>$CONFIG_STATUS <<\_ACEOF
-@@ -26384,39 +26949,24 @@
+@@ -26384,39 +26953,24 @@
  do
    case $1 in
    --*=*)
@@ -17577,7 +17589,7 @@
      debug=: ;;
    --file | --fil | --fi | --f )
      $ac_shift
-@@ -26426,18 +26976,24 @@
+@@ -26426,18 +26980,24 @@
      $ac_shift
      CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg"
      ac_need_defaults=false;;
@@ -17607,7 +17619,7 @@
  
    esac
    shift
-@@ -26453,17 +27009,28 @@
+@@ -26453,17 +27013,28 @@
  _ACEOF
  cat >>$CONFIG_STATUS <<_ACEOF
  if \$ac_cs_recheck; then
@@ -17640,7 +17652,7 @@
  AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
  # variables for create stdint.h replacement
  PACKAGE="$PACKAGE"
-@@ -26486,34 +27053,35 @@
+@@ -26486,34 +27057,35 @@
  
  _ACEOF
  
@@ -17695,7 +17707,7 @@
  # If the user did not use the arguments to specify the items to instantiate,
  # then the envvar interface is used.  Set only those that are not.
  # We use the long form for the default assignment because of an extremely
-@@ -26525,622 +27093,607 @@
+@@ -26525,622 +27097,607 @@
  fi
  
  # Have a temporary directory for convenience.  Make it in the build tree
@@ -18833,7 +18845,7 @@
  # Compute $ac_file's index in $config_headers.
  _am_stamp_count=1
  for _am_header in $config_headers :; do
-@@ -27151,135 +27704,39 @@
+@@ -27151,135 +27708,39 @@
        _am_stamp_count=`expr $_am_stamp_count + 1` ;;
    esac
  done
@@ -18995,7 +19007,7 @@
    # Strip MF so we end up with the name of the file.
    mf=`echo "$mf" | sed -e 's/:.*$//'`
    # Check whether this is an Automake generated Makefile or not.
-@@ -27289,18 +27746,29 @@
+@@ -27289,18 +27750,29 @@
    # each Makefile.in and add a new line on top of each file to say so.
    # So let's grep whole file.
    if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then
@@ -19033,7 +19045,7 @@
    else
      continue
    fi
-@@ -27322,49 +27790,76 @@
+@@ -27322,49 +27794,76 @@
         sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
      # Make sure the directory exists.
      test -f "$dirpart/$file" && continue
@@ -19137,7 +19149,7 @@
  { echo "$as_me:$LINENO: creating $ac_stdint_h : $_ac_stdint_h" >&5
  echo "$as_me: creating $ac_stdint_h : $_ac_stdint_h" >&6;}
  ac_stdint=$tmp/_stdint.h
-@@ -27719,52 +28214,78 @@
+@@ -27719,52 +28218,78 @@
        { echo "$as_me:$LINENO: $ac_stdint_h is unchanged" >&5
  echo "$as_me: $ac_stdint_h is unchanged" >&6;}
      else




More information about the pkg-multimedia-commits mailing list