michael@2: Index: configure
michael@2: diff -Nau configure.orig configure
michael@2: --- configure.orig	2009-01-31 05:48:59.000000000 +0100
michael@2: +++ configure	2009-02-23 14:32:54.000000000 +0100
michael@2: @@ -1,6 +1,6 @@
michael@2:  #! /bin/sh
michael@2:  # Guess values for system-dependent variables and create Makefiles.
michael@2: -# Generated by GNU Autoconf 2.60.
michael@2: +# Generated by GNU Autoconf 2.61.
michael@2:  #
michael@2:  # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
michael@2:  # 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
michael@2: @@ -10,7 +10,8 @@
michael@2:  ## M4sh Initialization.  ##
michael@2:  ## --------------------- ##
michael@2:  
michael@2: -# Be Bourne compatible
michael@2: +# Be more Bourne compatible
michael@2: +DUALCASE=1; export DUALCASE # for MKS sh
michael@2:  if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
michael@2:    emulate sh
michael@2:    NULLCMD=:
michael@2: @@ -19,10 +20,13 @@
michael@2:    alias -g '${1+"$@"}'='"$@"'
michael@2:    setopt NO_GLOB_SUBST
michael@2:  else
michael@2: -  case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
michael@2: +  case `(set -o) 2>/dev/null` in
michael@2: +  *posix*) set -o posix ;;
michael@2: +esac
michael@2: +
michael@2:  fi
michael@2: -BIN_SH=xpg4; export BIN_SH # for Tru64
michael@2: -DUALCASE=1; export DUALCASE # for MKS sh
michael@2: +
michael@2: +
michael@2:  
michael@2:  
michael@2:  # PATH needs CR
michael@2: @@ -215,7 +219,7 @@
michael@2:  else
michael@2:    as_candidate_shells=
michael@2:      as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
michael@2: -for as_dir in /usr/bin/posix$PATH_SEPARATOR/bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
michael@2: +for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
michael@2:  do
michael@2:    IFS=$as_save_IFS
michael@2:    test -z "$as_dir" && as_dir=.
michael@2: @@ -233,7 +237,6 @@
michael@2:  	 # Try only shells that exist, to save several forks.
michael@2:  	 if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
michael@2:  		{ ("$as_shell") 2> /dev/null <<\_ASEOF
michael@2: -# Be Bourne compatible
michael@2:  if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
michael@2:    emulate sh
michael@2:    NULLCMD=:
michael@2: @@ -242,10 +245,12 @@
michael@2:    alias -g '${1+"$@"}'='"$@"'
michael@2:    setopt NO_GLOB_SUBST
michael@2:  else
michael@2: -  case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
michael@2: +  case `(set -o) 2>/dev/null` in
michael@2: +  *posix*) set -o posix ;;
michael@2: +esac
michael@2: +
michael@2:  fi
michael@2: -BIN_SH=xpg4; export BIN_SH # for Tru64
michael@2: -DUALCASE=1; export DUALCASE # for MKS sh
michael@2: +
michael@2:  
michael@2:  :
michael@2:  _ASEOF
michael@2: @@ -253,7 +258,6 @@
michael@2:    CONFIG_SHELL=$as_shell
michael@2:  	       as_have_required=yes
michael@2:  	       if { "$as_shell" 2> /dev/null <<\_ASEOF
michael@2: -# Be Bourne compatible
michael@2:  if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
michael@2:    emulate sh
michael@2:    NULLCMD=:
michael@2: @@ -262,10 +266,12 @@
michael@2:    alias -g '${1+"$@"}'='"$@"'
michael@2:    setopt NO_GLOB_SUBST
michael@2:  else
michael@2: -  case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
michael@2: +  case `(set -o) 2>/dev/null` in
michael@2: +  *posix*) set -o posix ;;
michael@2: +esac
michael@2: +
michael@2:  fi
michael@2: -BIN_SH=xpg4; export BIN_SH # for Tru64
michael@2: -DUALCASE=1; export DUALCASE # for MKS sh
michael@2: +
michael@2:  
michael@2:  :
michael@2:  (as_func_return () {
michael@2: @@ -512,19 +518,28 @@
michael@2:    as_mkdir_p=false
michael@2:  fi
michael@2:  
michael@2: -# Find out whether ``test -x'' works.  Don't use a zero-byte file, as
michael@2: -# systems may use methods other than mode bits to determine executability.
michael@2: -cat >conf$$.file <<_ASEOF
michael@2: -#! /bin/sh
michael@2: -exit 0
michael@2: -_ASEOF
michael@2: -chmod +x conf$$.file
michael@2: -if test -x conf$$.file >/dev/null 2>&1; then
michael@2: -  as_executable_p="test -x"
michael@2: +if test -x / >/dev/null 2>&1; then
michael@2: +  as_test_x='test -x'
michael@2:  else
michael@2: -  as_executable_p=:
michael@2: +  if ls -dL / >/dev/null 2>&1; then
michael@2: +    as_ls_L_option=L
michael@2: +  else
michael@2: +    as_ls_L_option=
michael@2: +  fi
michael@2: +  as_test_x='
michael@2: +    eval sh -c '\''
michael@2: +      if test -d "$1"; then
michael@2: +        test -d "$1/.";
michael@2: +      else
michael@2: +	case $1 in
michael@2: +        -*)set "./$1";;
michael@2: +	esac;
michael@2: +	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
michael@2: +	???[sx]*):;;*)false;;esac;fi
michael@2: +    '\'' sh
michael@2: +  '
michael@2:  fi
michael@2: -rm -f conf$$.file
michael@2: +as_executable_p=$as_test_x
michael@2:  
michael@2:  # Sed expression to map a string onto a valid CPP name.
michael@2:  as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
michael@2: @@ -565,36 +580,36 @@
michael@2:  # Factoring default headers for most tests.
michael@2:  ac_includes_default="\
michael@2:  #include <stdio.h>
michael@2: -#if HAVE_SYS_TYPES_H
michael@2: +#ifdef HAVE_SYS_TYPES_H
michael@2:  # include <sys/types.h>
michael@2:  #endif
michael@2: -#if HAVE_SYS_STAT_H
michael@2: +#ifdef HAVE_SYS_STAT_H
michael@2:  # include <sys/stat.h>
michael@2:  #endif
michael@2: -#if STDC_HEADERS
michael@2: +#ifdef STDC_HEADERS
michael@2:  # include <stdlib.h>
michael@2:  # include <stddef.h>
michael@2:  #else
michael@2: -# if HAVE_STDLIB_H
michael@2: +# ifdef HAVE_STDLIB_H
michael@2:  #  include <stdlib.h>
michael@2:  # endif
michael@2:  #endif
michael@2: -#if HAVE_STRING_H
michael@2: -# if !STDC_HEADERS && HAVE_MEMORY_H
michael@2: +#ifdef HAVE_STRING_H
michael@2: +# if !defined STDC_HEADERS && defined HAVE_MEMORY_H
michael@2:  #  include <memory.h>
michael@2:  # endif
michael@2:  # include <string.h>
michael@2:  #endif
michael@2: -#if HAVE_STRINGS_H
michael@2: +#ifdef HAVE_STRINGS_H
michael@2:  # include <strings.h>
michael@2:  #endif
michael@2: -#if HAVE_INTTYPES_H
michael@2: +#ifdef HAVE_INTTYPES_H
michael@2:  # include <inttypes.h>
michael@2:  #endif
michael@2: -#if HAVE_STDINT_H
michael@2: +#ifdef HAVE_STDINT_H
michael@2:  # include <stdint.h>
michael@2:  #endif
michael@2: -#if HAVE_UNISTD_H
michael@2: +#ifdef HAVE_UNISTD_H
michael@2:  # include <unistd.h>
michael@2:  #endif"
michael@2:  
michael@2: @@ -696,8 +711,8 @@
michael@2:  CXXCPP
michael@2:  RANLIB
michael@2:  LEX
michael@2: -LEXLIB
michael@2:  LEX_OUTPUT_ROOT
michael@2: +LEXLIB
michael@2:  YACC
michael@2:  YFLAGS
michael@2:  GREP
michael@2: @@ -840,6 +855,7 @@
michael@2:  CC
michael@2:  CFLAGS
michael@2:  LDFLAGS
michael@2: +LIBS
michael@2:  CPPFLAGS
michael@2:  CXX
michael@2:  CXXFLAGS
michael@2: @@ -954,10 +970,10 @@
michael@2:    -disable-* | --disable-*)
michael@2:      ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
michael@2:      # Reject names that are not valid shell variable names.
michael@2: -    expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
michael@2: +    expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&
michael@2:        { echo "$as_me: error: invalid feature name: $ac_feature" >&2
michael@2:     { (exit 1); exit 1; }; }
michael@2: -    ac_feature=`echo $ac_feature | sed 's/-/_/g'`
michael@2: +    ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
michael@2:      eval enable_$ac_feature=no ;;
michael@2:  
michael@2:    -docdir | --docdir | --docdi | --doc | --do)
michael@2: @@ -973,10 +989,10 @@
michael@2:    -enable-* | --enable-*)
michael@2:      ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
michael@2:      # Reject names that are not valid shell variable names.
michael@2: -    expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
michael@2: +    expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&
michael@2:        { echo "$as_me: error: invalid feature name: $ac_feature" >&2
michael@2:     { (exit 1); exit 1; }; }
michael@2: -    ac_feature=`echo $ac_feature | sed 's/-/_/g'`
michael@2: +    ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
michael@2:      eval enable_$ac_feature=\$ac_optarg ;;
michael@2:  
michael@2:    -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
michael@2: @@ -1170,19 +1186,19 @@
michael@2:    -with-* | --with-*)
michael@2:      ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
michael@2:      # Reject names that are not valid shell variable names.
michael@2: -    expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
michael@2: +    expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&
michael@2:        { echo "$as_me: error: invalid package name: $ac_package" >&2
michael@2:     { (exit 1); exit 1; }; }
michael@2: -    ac_package=`echo $ac_package| sed 's/-/_/g'`
michael@2: +    ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
michael@2:      eval with_$ac_package=\$ac_optarg ;;
michael@2:  
michael@2:    -without-* | --without-*)
michael@2:      ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'`
michael@2:      # Reject names that are not valid shell variable names.
michael@2: -    expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
michael@2: +    expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&
michael@2:        { echo "$as_me: error: invalid package name: $ac_package" >&2
michael@2:     { (exit 1); exit 1; }; }
michael@2: -    ac_package=`echo $ac_package | sed 's/-/_/g'`
michael@2: +    ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
michael@2:      eval with_$ac_package=no ;;
michael@2:  
michael@2:    --x)
michael@2: @@ -1461,6 +1477,7 @@
michael@2:    CFLAGS      C compiler flags
michael@2:    LDFLAGS     linker flags, e.g. -L<lib dir> if you have libraries in a
michael@2:                nonstandard directory <lib dir>
michael@2: +  LIBS        libraries to pass to the linker, e.g. -l<library>
michael@2:    CPPFLAGS    C/C++/Objective C preprocessor flags, e.g. -I<include dir> if
michael@2:                you have headers in a nonstandard directory <include dir>
michael@2:    CXX         C++ compiler command
michael@2: @@ -1538,7 +1555,7 @@
michael@2:  if $ac_init_version; then
michael@2:    cat <<\_ACEOF
michael@2:  configure
michael@2: -generated by GNU Autoconf 2.60
michael@2: +generated by GNU Autoconf 2.61
michael@2:  
michael@2:  Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
michael@2:  2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
michael@2: @@ -1552,7 +1569,7 @@
michael@2:  running configure, to aid debugging if configure makes a mistake.
michael@2:  
michael@2:  It was created by $as_me, which was
michael@2: -generated by GNU Autoconf 2.60.  Invocation command line was
michael@2: +generated by GNU Autoconf 2.61.  Invocation command line was
michael@2:  
michael@2:    $ $0 $@
michael@2:  
michael@2: @@ -2150,7 +2167,7 @@
michael@2:      # by default.
michael@2:      for ac_prog in ginstall scoinst install; do
michael@2:        for ac_exec_ext in '' $ac_executable_extensions; do
michael@2: -	if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; }; then
michael@2: +	if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then
michael@2:  	  if test $ac_prog = install &&
michael@2:  	    grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
michael@2:  	    # AIX install.  It has an incompatible calling convention.
michael@2: @@ -2344,7 +2361,7 @@
michael@2:    IFS=$as_save_IFS
michael@2:    test -z "$as_dir" && as_dir=.
michael@2:    for ac_exec_ext in '' $ac_executable_extensions; do
michael@2: -  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
michael@2: +  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
michael@2:      ac_cv_prog_AWK="$ac_prog"
michael@2:      echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
michael@2:      break 2
michael@2: @@ -2479,7 +2496,7 @@
michael@2:    IFS=$as_save_IFS
michael@2:    test -z "$as_dir" && as_dir=.
michael@2:    for ac_exec_ext in '' $ac_executable_extensions; do
michael@2: -  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
michael@2: +  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
michael@2:      ac_cv_prog_STRIP="${ac_tool_prefix}strip"
michael@2:      echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
michael@2:      break 2
michael@2: @@ -2519,7 +2536,7 @@
michael@2:    IFS=$as_save_IFS
michael@2:    test -z "$as_dir" && as_dir=.
michael@2:    for ac_exec_ext in '' $ac_executable_extensions; do
michael@2: -  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
michael@2: +  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
michael@2:      ac_cv_prog_ac_ct_STRIP="strip"
michael@2:      echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
michael@2:      break 2
michael@2: @@ -2600,7 +2617,7 @@
michael@2:    IFS=$as_save_IFS
michael@2:    test -z "$as_dir" && as_dir=.
michael@2:    for ac_exec_ext in '' $ac_executable_extensions; do
michael@2: -  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
michael@2: +  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
michael@2:      ac_cv_prog_CC="${ac_tool_prefix}gcc"
michael@2:      echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
michael@2:      break 2
michael@2: @@ -2640,7 +2657,7 @@
michael@2:    IFS=$as_save_IFS
michael@2:    test -z "$as_dir" && as_dir=.
michael@2:    for ac_exec_ext in '' $ac_executable_extensions; do
michael@2: -  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
michael@2: +  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
michael@2:      ac_cv_prog_ac_ct_CC="gcc"
michael@2:      echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
michael@2:      break 2
michael@2: @@ -2697,7 +2714,7 @@
michael@2:    IFS=$as_save_IFS
michael@2:    test -z "$as_dir" && as_dir=.
michael@2:    for ac_exec_ext in '' $ac_executable_extensions; do
michael@2: -  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
michael@2: +  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
michael@2:      ac_cv_prog_CC="${ac_tool_prefix}cc"
michael@2:      echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
michael@2:      break 2
michael@2: @@ -2738,7 +2755,7 @@
michael@2:    IFS=$as_save_IFS
michael@2:    test -z "$as_dir" && as_dir=.
michael@2:    for ac_exec_ext in '' $ac_executable_extensions; do
michael@2: -  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
michael@2: +  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
michael@2:      if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
michael@2:         ac_prog_rejected=yes
michael@2:         continue
michael@2: @@ -2796,7 +2813,7 @@
michael@2:    IFS=$as_save_IFS
michael@2:    test -z "$as_dir" && as_dir=.
michael@2:    for ac_exec_ext in '' $ac_executable_extensions; do
michael@2: -  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
michael@2: +  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
michael@2:      ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
michael@2:      echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
michael@2:      break 2
michael@2: @@ -2840,7 +2857,7 @@
michael@2:    IFS=$as_save_IFS
michael@2:    test -z "$as_dir" && as_dir=.
michael@2:    for ac_exec_ext in '' $ac_executable_extensions; do
michael@2: -  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
michael@2: +  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
michael@2:      ac_cv_prog_ac_ct_CC="$ac_prog"
michael@2:      echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
michael@2:      break 2
michael@2: @@ -2981,7 +2998,7 @@
michael@2:  # in a Makefile.  We should not override ac_cv_exeext if it was cached,
michael@2:  # so that the user can short-circuit this test for compilers unknown to
michael@2:  # Autoconf.
michael@2: -for ac_file in $ac_files
michael@2: +for ac_file in $ac_files ''
michael@2:  do
michael@2:    test -f "$ac_file" || continue
michael@2:    case $ac_file in
michael@2: @@ -3009,6 +3026,12 @@
michael@2:  test "$ac_cv_exeext" = no && ac_cv_exeext=
michael@2:  
michael@2:  else
michael@2: +  ac_file=''
michael@2: +fi
michael@2: +
michael@2: +{ echo "$as_me:$LINENO: result: $ac_file" >&5
michael@2: +echo "${ECHO_T}$ac_file" >&6; }
michael@2: +if test -z "$ac_file"; then
michael@2:    echo "$as_me: failed program was:" >&5
michael@2:  sed 's/^/| /' conftest.$ac_ext >&5
michael@2:  
michael@2: @@ -3020,8 +3043,6 @@
michael@2:  fi
michael@2:  
michael@2:  ac_exeext=$ac_cv_exeext
michael@2: -{ echo "$as_me:$LINENO: result: $ac_file" >&5
michael@2: -echo "${ECHO_T}$ac_file" >&6; }
michael@2:  
michael@2:  # Check that the compiler produces executables we can run.  If not, either
michael@2:  # the compiler is broken, or we cross compile.
michael@2: @@ -3199,27 +3220,10 @@
michael@2:    rm -f conftest.er1
michael@2:    cat conftest.err >&5
michael@2:    echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); } &&
michael@2: -	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
michael@2: -  { (case "(($ac_try" in
michael@2: -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
michael@2: -  *) ac_try_echo=$ac_try;;
michael@2: -esac
michael@2: -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
michael@2: -  (eval "$ac_try") 2>&5
michael@2: -  ac_status=$?
michael@2: -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); }; } &&
michael@2: -	 { ac_try='test -s conftest.$ac_objext'
michael@2: -  { (case "(($ac_try" in
michael@2: -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
michael@2: -  *) ac_try_echo=$ac_try;;
michael@2: -esac
michael@2: -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
michael@2: -  (eval "$ac_try") 2>&5
michael@2: -  ac_status=$?
michael@2: -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); }; }; then
michael@2: +  (exit $ac_status); } && {
michael@2: +	 test -z "$ac_c_werror_flag" ||
michael@2: +	 test ! -s conftest.err
michael@2: +       } && test -s conftest.$ac_objext; then
michael@2:    ac_compiler_gnu=yes
michael@2:  else
michael@2:    echo "$as_me: failed program was:" >&5
michael@2: @@ -3274,27 +3278,10 @@
michael@2:    rm -f conftest.er1
michael@2:    cat conftest.err >&5
michael@2:    echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); } &&
michael@2: -	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
michael@2: -  { (case "(($ac_try" in
michael@2: -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
michael@2: -  *) ac_try_echo=$ac_try;;
michael@2: -esac
michael@2: -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
michael@2: -  (eval "$ac_try") 2>&5
michael@2: -  ac_status=$?
michael@2: -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); }; } &&
michael@2: -	 { ac_try='test -s conftest.$ac_objext'
michael@2: -  { (case "(($ac_try" in
michael@2: -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
michael@2: -  *) ac_try_echo=$ac_try;;
michael@2: -esac
michael@2: -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
michael@2: -  (eval "$ac_try") 2>&5
michael@2: -  ac_status=$?
michael@2: -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); }; }; then
michael@2: +  (exit $ac_status); } && {
michael@2: +	 test -z "$ac_c_werror_flag" ||
michael@2: +	 test ! -s conftest.err
michael@2: +       } && test -s conftest.$ac_objext; then
michael@2:    ac_cv_prog_cc_g=yes
michael@2:  else
michael@2:    echo "$as_me: failed program was:" >&5
michael@2: @@ -3329,27 +3316,10 @@
michael@2:    rm -f conftest.er1
michael@2:    cat conftest.err >&5
michael@2:    echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); } &&
michael@2: -	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
michael@2: -  { (case "(($ac_try" in
michael@2: -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
michael@2: -  *) ac_try_echo=$ac_try;;
michael@2: -esac
michael@2: -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
michael@2: -  (eval "$ac_try") 2>&5
michael@2: -  ac_status=$?
michael@2: -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); }; } &&
michael@2: -	 { ac_try='test -s conftest.$ac_objext'
michael@2: -  { (case "(($ac_try" in
michael@2: -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
michael@2: -  *) ac_try_echo=$ac_try;;
michael@2: -esac
michael@2: -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
michael@2: -  (eval "$ac_try") 2>&5
michael@2: -  ac_status=$?
michael@2: -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); }; }; then
michael@2: +  (exit $ac_status); } && {
michael@2: +	 test -z "$ac_c_werror_flag" ||
michael@2: +	 test ! -s conftest.err
michael@2: +       } && test -s conftest.$ac_objext; then
michael@2:    :
michael@2:  else
michael@2:    echo "$as_me: failed program was:" >&5
michael@2: @@ -3385,27 +3355,10 @@
michael@2:    rm -f conftest.er1
michael@2:    cat conftest.err >&5
michael@2:    echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); } &&
michael@2: -	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
michael@2: -  { (case "(($ac_try" in
michael@2: -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
michael@2: -  *) ac_try_echo=$ac_try;;
michael@2: -esac
michael@2: -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
michael@2: -  (eval "$ac_try") 2>&5
michael@2: -  ac_status=$?
michael@2: -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); }; } &&
michael@2: -	 { ac_try='test -s conftest.$ac_objext'
michael@2: -  { (case "(($ac_try" in
michael@2: -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
michael@2: -  *) ac_try_echo=$ac_try;;
michael@2: -esac
michael@2: -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
michael@2: -  (eval "$ac_try") 2>&5
michael@2: -  ac_status=$?
michael@2: -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); }; }; then
michael@2: +  (exit $ac_status); } && {
michael@2: +	 test -z "$ac_c_werror_flag" ||
michael@2: +	 test ! -s conftest.err
michael@2: +       } && test -s conftest.$ac_objext; then
michael@2:    ac_cv_prog_cc_g=yes
michael@2:  else
michael@2:    echo "$as_me: failed program was:" >&5
michael@2: @@ -3521,27 +3474,10 @@
michael@2:    rm -f conftest.er1
michael@2:    cat conftest.err >&5
michael@2:    echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); } &&
michael@2: -	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
michael@2: -  { (case "(($ac_try" in
michael@2: -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
michael@2: -  *) ac_try_echo=$ac_try;;
michael@2: -esac
michael@2: -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
michael@2: -  (eval "$ac_try") 2>&5
michael@2: -  ac_status=$?
michael@2: -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); }; } &&
michael@2: -	 { ac_try='test -s conftest.$ac_objext'
michael@2: -  { (case "(($ac_try" in
michael@2: -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
michael@2: -  *) ac_try_echo=$ac_try;;
michael@2: -esac
michael@2: -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
michael@2: -  (eval "$ac_try") 2>&5
michael@2: -  ac_status=$?
michael@2: -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); }; }; then
michael@2: +  (exit $ac_status); } && {
michael@2: +	 test -z "$ac_c_werror_flag" ||
michael@2: +	 test ! -s conftest.err
michael@2: +       } && test -s conftest.$ac_objext; then
michael@2:    ac_cv_prog_cc_c89=$ac_arg
michael@2:  else
michael@2:    echo "$as_me: failed program was:" >&5
michael@2: @@ -3780,7 +3716,7 @@
michael@2:    IFS=$as_save_IFS
michael@2:    test -z "$as_dir" && as_dir=.
michael@2:    for ac_exec_ext in '' $ac_executable_extensions; do
michael@2: -  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
michael@2: +  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
michael@2:      ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
michael@2:      echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
michael@2:      break 2
michael@2: @@ -3824,7 +3760,7 @@
michael@2:    IFS=$as_save_IFS
michael@2:    test -z "$as_dir" && as_dir=.
michael@2:    for ac_exec_ext in '' $ac_executable_extensions; do
michael@2: -  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
michael@2: +  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
michael@2:      ac_cv_prog_ac_ct_CXX="$ac_prog"
michael@2:      echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
michael@2:      break 2
michael@2: @@ -3937,27 +3873,10 @@
michael@2:    rm -f conftest.er1
michael@2:    cat conftest.err >&5
michael@2:    echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); } &&
michael@2: -	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
michael@2: -  { (case "(($ac_try" in
michael@2: -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
michael@2: -  *) ac_try_echo=$ac_try;;
michael@2: -esac
michael@2: -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
michael@2: -  (eval "$ac_try") 2>&5
michael@2: -  ac_status=$?
michael@2: -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); }; } &&
michael@2: -	 { ac_try='test -s conftest.$ac_objext'
michael@2: -  { (case "(($ac_try" in
michael@2: -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
michael@2: -  *) ac_try_echo=$ac_try;;
michael@2: -esac
michael@2: -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
michael@2: -  (eval "$ac_try") 2>&5
michael@2: -  ac_status=$?
michael@2: -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); }; }; then
michael@2: +  (exit $ac_status); } && {
michael@2: +	 test -z "$ac_cxx_werror_flag" ||
michael@2: +	 test ! -s conftest.err
michael@2: +       } && test -s conftest.$ac_objext; then
michael@2:    ac_compiler_gnu=yes
michael@2:  else
michael@2:    echo "$as_me: failed program was:" >&5
michael@2: @@ -4012,27 +3931,10 @@
michael@2:    rm -f conftest.er1
michael@2:    cat conftest.err >&5
michael@2:    echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); } &&
michael@2: -	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
michael@2: -  { (case "(($ac_try" in
michael@2: -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
michael@2: -  *) ac_try_echo=$ac_try;;
michael@2: -esac
michael@2: -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
michael@2: -  (eval "$ac_try") 2>&5
michael@2: -  ac_status=$?
michael@2: -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); }; } &&
michael@2: -	 { ac_try='test -s conftest.$ac_objext'
michael@2: -  { (case "(($ac_try" in
michael@2: -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
michael@2: -  *) ac_try_echo=$ac_try;;
michael@2: -esac
michael@2: -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
michael@2: -  (eval "$ac_try") 2>&5
michael@2: -  ac_status=$?
michael@2: -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); }; }; then
michael@2: +  (exit $ac_status); } && {
michael@2: +	 test -z "$ac_cxx_werror_flag" ||
michael@2: +	 test ! -s conftest.err
michael@2: +       } && test -s conftest.$ac_objext; then
michael@2:    ac_cv_prog_cxx_g=yes
michael@2:  else
michael@2:    echo "$as_me: failed program was:" >&5
michael@2: @@ -4067,27 +3969,10 @@
michael@2:    rm -f conftest.er1
michael@2:    cat conftest.err >&5
michael@2:    echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); } &&
michael@2: -	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
michael@2: -  { (case "(($ac_try" in
michael@2: -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
michael@2: -  *) ac_try_echo=$ac_try;;
michael@2: -esac
michael@2: -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
michael@2: -  (eval "$ac_try") 2>&5
michael@2: -  ac_status=$?
michael@2: -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); }; } &&
michael@2: -	 { ac_try='test -s conftest.$ac_objext'
michael@2: -  { (case "(($ac_try" in
michael@2: -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
michael@2: -  *) ac_try_echo=$ac_try;;
michael@2: -esac
michael@2: -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
michael@2: -  (eval "$ac_try") 2>&5
michael@2: -  ac_status=$?
michael@2: -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); }; }; then
michael@2: +  (exit $ac_status); } && {
michael@2: +	 test -z "$ac_cxx_werror_flag" ||
michael@2: +	 test ! -s conftest.err
michael@2: +       } && test -s conftest.$ac_objext; then
michael@2:    :
michael@2:  else
michael@2:    echo "$as_me: failed program was:" >&5
michael@2: @@ -4123,27 +4008,10 @@
michael@2:    rm -f conftest.er1
michael@2:    cat conftest.err >&5
michael@2:    echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); } &&
michael@2: -	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
michael@2: -  { (case "(($ac_try" in
michael@2: -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
michael@2: -  *) ac_try_echo=$ac_try;;
michael@2: -esac
michael@2: -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
michael@2: -  (eval "$ac_try") 2>&5
michael@2: -  ac_status=$?
michael@2: -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); }; } &&
michael@2: -	 { ac_try='test -s conftest.$ac_objext'
michael@2: -  { (case "(($ac_try" in
michael@2: -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
michael@2: -  *) ac_try_echo=$ac_try;;
michael@2: -esac
michael@2: -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
michael@2: -  (eval "$ac_try") 2>&5
michael@2: -  ac_status=$?
michael@2: -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); }; }; then
michael@2: +  (exit $ac_status); } && {
michael@2: +	 test -z "$ac_cxx_werror_flag" ||
michael@2: +	 test ! -s conftest.err
michael@2: +       } && test -s conftest.$ac_objext; then
michael@2:    ac_cv_prog_cxx_g=yes
michael@2:  else
michael@2:    echo "$as_me: failed program was:" >&5
michael@2: @@ -4345,17 +4213,10 @@
michael@2:    rm -f conftest.er1
michael@2:    cat conftest.err >&5
michael@2:    echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); } >/dev/null; then
michael@2: -  if test -s conftest.err; then
michael@2: -    ac_cpp_err=$ac_c_preproc_warn_flag
michael@2: -    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
michael@2: -  else
michael@2: -    ac_cpp_err=
michael@2: -  fi
michael@2: -else
michael@2: -  ac_cpp_err=yes
michael@2: -fi
michael@2: -if test -z "$ac_cpp_err"; then
michael@2: +  (exit $ac_status); } >/dev/null && {
michael@2: +	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
michael@2: +	 test ! -s conftest.err
michael@2: +       }; then
michael@2:    :
michael@2:  else
michael@2:    echo "$as_me: failed program was:" >&5
michael@2: @@ -4389,17 +4250,10 @@
michael@2:    rm -f conftest.er1
michael@2:    cat conftest.err >&5
michael@2:    echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); } >/dev/null; then
michael@2: -  if test -s conftest.err; then
michael@2: -    ac_cpp_err=$ac_c_preproc_warn_flag
michael@2: -    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
michael@2: -  else
michael@2: -    ac_cpp_err=
michael@2: -  fi
michael@2: -else
michael@2: -  ac_cpp_err=yes
michael@2: -fi
michael@2: -if test -z "$ac_cpp_err"; then
michael@2: +  (exit $ac_status); } >/dev/null && {
michael@2: +	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
michael@2: +	 test ! -s conftest.err
michael@2: +       }; then
michael@2:    # Broken: success on invalid input.
michael@2:  continue
michael@2:  else
michael@2: @@ -4464,17 +4318,10 @@
michael@2:    rm -f conftest.er1
michael@2:    cat conftest.err >&5
michael@2:    echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); } >/dev/null; then
michael@2: -  if test -s conftest.err; then
michael@2: -    ac_cpp_err=$ac_c_preproc_warn_flag
michael@2: -    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
michael@2: -  else
michael@2: -    ac_cpp_err=
michael@2: -  fi
michael@2: -else
michael@2: -  ac_cpp_err=yes
michael@2: -fi
michael@2: -if test -z "$ac_cpp_err"; then
michael@2: +  (exit $ac_status); } >/dev/null && {
michael@2: +	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
michael@2: +	 test ! -s conftest.err
michael@2: +       }; then
michael@2:    :
michael@2:  else
michael@2:    echo "$as_me: failed program was:" >&5
michael@2: @@ -4508,17 +4355,10 @@
michael@2:    rm -f conftest.er1
michael@2:    cat conftest.err >&5
michael@2:    echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); } >/dev/null; then
michael@2: -  if test -s conftest.err; then
michael@2: -    ac_cpp_err=$ac_c_preproc_warn_flag
michael@2: -    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
michael@2: -  else
michael@2: -    ac_cpp_err=
michael@2: -  fi
michael@2: -else
michael@2: -  ac_cpp_err=yes
michael@2: -fi
michael@2: -if test -z "$ac_cpp_err"; then
michael@2: +  (exit $ac_status); } >/dev/null && {
michael@2: +	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
michael@2: +	 test ! -s conftest.err
michael@2: +       }; then
michael@2:    # Broken: success on invalid input.
michael@2:  continue
michael@2:  else
michael@2: @@ -4599,17 +4439,10 @@
michael@2:    rm -f conftest.er1
michael@2:    cat conftest.err >&5
michael@2:    echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); } >/dev/null; then
michael@2: -  if test -s conftest.err; then
michael@2: -    ac_cpp_err=$ac_cxx_preproc_warn_flag
michael@2: -    ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
michael@2: -  else
michael@2: -    ac_cpp_err=
michael@2: -  fi
michael@2: -else
michael@2: -  ac_cpp_err=yes
michael@2: -fi
michael@2: -if test -z "$ac_cpp_err"; then
michael@2: +  (exit $ac_status); } >/dev/null && {
michael@2: +	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
michael@2: +	 test ! -s conftest.err
michael@2: +       }; then
michael@2:    :
michael@2:  else
michael@2:    echo "$as_me: failed program was:" >&5
michael@2: @@ -4643,17 +4476,10 @@
michael@2:    rm -f conftest.er1
michael@2:    cat conftest.err >&5
michael@2:    echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); } >/dev/null; then
michael@2: -  if test -s conftest.err; then
michael@2: -    ac_cpp_err=$ac_cxx_preproc_warn_flag
michael@2: -    ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
michael@2: -  else
michael@2: -    ac_cpp_err=
michael@2: -  fi
michael@2: -else
michael@2: -  ac_cpp_err=yes
michael@2: -fi
michael@2: -if test -z "$ac_cpp_err"; then
michael@2: +  (exit $ac_status); } >/dev/null && {
michael@2: +	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
michael@2: +	 test ! -s conftest.err
michael@2: +       }; then
michael@2:    # Broken: success on invalid input.
michael@2:  continue
michael@2:  else
michael@2: @@ -4718,17 +4544,10 @@
michael@2:    rm -f conftest.er1
michael@2:    cat conftest.err >&5
michael@2:    echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); } >/dev/null; then
michael@2: -  if test -s conftest.err; then
michael@2: -    ac_cpp_err=$ac_cxx_preproc_warn_flag
michael@2: -    ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
michael@2: -  else
michael@2: -    ac_cpp_err=
michael@2: -  fi
michael@2: -else
michael@2: -  ac_cpp_err=yes
michael@2: -fi
michael@2: -if test -z "$ac_cpp_err"; then
michael@2: +  (exit $ac_status); } >/dev/null && {
michael@2: +	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
michael@2: +	 test ! -s conftest.err
michael@2: +       }; then
michael@2:    :
michael@2:  else
michael@2:    echo "$as_me: failed program was:" >&5
michael@2: @@ -4762,17 +4581,10 @@
michael@2:    rm -f conftest.er1
michael@2:    cat conftest.err >&5
michael@2:    echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); } >/dev/null; then
michael@2: -  if test -s conftest.err; then
michael@2: -    ac_cpp_err=$ac_cxx_preproc_warn_flag
michael@2: -    ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
michael@2: -  else
michael@2: -    ac_cpp_err=
michael@2: -  fi
michael@2: -else
michael@2: -  ac_cpp_err=yes
michael@2: -fi
michael@2: -if test -z "$ac_cpp_err"; then
michael@2: +  (exit $ac_status); } >/dev/null && {
michael@2: +	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
michael@2: +	 test ! -s conftest.err
michael@2: +       }; then
michael@2:    # Broken: success on invalid input.
michael@2:  continue
michael@2:  else
michael@2: @@ -4822,7 +4634,7 @@
michael@2:    IFS=$as_save_IFS
michael@2:    test -z "$as_dir" && as_dir=.
michael@2:    for ac_exec_ext in '' $ac_executable_extensions; do
michael@2: -  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
michael@2: +  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
michael@2:      ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
michael@2:      echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
michael@2:      break 2
michael@2: @@ -4862,7 +4674,7 @@
michael@2:    IFS=$as_save_IFS
michael@2:    test -z "$as_dir" && as_dir=.
michael@2:    for ac_exec_ext in '' $ac_executable_extensions; do
michael@2: -  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
michael@2: +  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
michael@2:      ac_cv_prog_ac_ct_RANLIB="ranlib"
michael@2:      echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
michael@2:      break 2
michael@2: @@ -4920,7 +4732,7 @@
michael@2:    IFS=$as_save_IFS
michael@2:    test -z "$as_dir" && as_dir=.
michael@2:    for ac_exec_ext in '' $ac_executable_extensions; do
michael@2: -  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
michael@2: +  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
michael@2:      ac_cv_prog_LEX="$ac_prog"
michael@2:      echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
michael@2:      break 2
michael@2: @@ -4945,116 +4757,69 @@
michael@2:  done
michael@2:  test -n "$LEX" || LEX=":"
michael@2:  
michael@2: -if test -z "$LEXLIB"
michael@2: -then
michael@2: -  { echo "$as_me:$LINENO: checking for yywrap in -lfl" >&5
michael@2: -echo $ECHO_N "checking for yywrap in -lfl... $ECHO_C" >&6; }
michael@2: -if test "${ac_cv_lib_fl_yywrap+set}" = set; then
michael@2: -  echo $ECHO_N "(cached) $ECHO_C" >&6
michael@2: -else
michael@2: -  ac_check_lib_save_LIBS=$LIBS
michael@2: -LIBS="-lfl  $LIBS"
michael@2: -cat >conftest.$ac_ext <<_ACEOF
michael@2: -/* confdefs.h.  */
michael@2: -_ACEOF
michael@2: -cat confdefs.h >>conftest.$ac_ext
michael@2: -cat >>conftest.$ac_ext <<_ACEOF
michael@2: -/* end confdefs.h.  */
michael@2: -
michael@2: -/* Override any GCC internal prototype to avoid an error.
michael@2: -   Use char because int might match the return type of a GCC
michael@2: -   builtin and then its argument prototype would still apply.  */
michael@2: -#ifdef __cplusplus
michael@2: -extern "C"
michael@2: +if test "x$LEX" != "x:"; then
michael@2: +  cat >conftest.l <<_ACEOF
michael@2: +%%
michael@2: +a { ECHO; }
michael@2: +b { REJECT; }
michael@2: +c { yymore (); }
michael@2: +d { yyless (1); }
michael@2: +e { yyless (input () != 0); }
michael@2: +f { unput (yytext[0]); }
michael@2: +. { BEGIN INITIAL; }
michael@2: +%%
michael@2: +#ifdef YYTEXT_POINTER
michael@2: +extern char *yytext;
michael@2:  #endif
michael@2: -char yywrap ();
michael@2:  int
michael@2: -main ()
michael@2: +main (void)
michael@2:  {
michael@2: -return yywrap ();
michael@2: -  ;
michael@2: -  return 0;
michael@2: +  return ! yylex () + ! yywrap ();
michael@2:  }
michael@2:  _ACEOF
michael@2: -rm -f conftest.$ac_objext conftest$ac_exeext
michael@2: -if { (ac_try="$ac_link"
michael@2: +{ (ac_try="$LEX conftest.l"
michael@2:  case "(($ac_try" in
michael@2:    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
michael@2:    *) ac_try_echo=$ac_try;;
michael@2:  esac
michael@2:  eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
michael@2: -  (eval "$ac_link") 2>conftest.er1
michael@2: -  ac_status=$?
michael@2: -  grep -v '^ *+' conftest.er1 >conftest.err
michael@2: -  rm -f conftest.er1
michael@2: -  cat conftest.err >&5
michael@2: -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); } &&
michael@2: -	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
michael@2: -  { (case "(($ac_try" in
michael@2: -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
michael@2: -  *) ac_try_echo=$ac_try;;
michael@2: -esac
michael@2: -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
michael@2: -  (eval "$ac_try") 2>&5
michael@2: -  ac_status=$?
michael@2: -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); }; } &&
michael@2: -	 { ac_try='test -s conftest$ac_exeext'
michael@2: -  { (case "(($ac_try" in
michael@2: -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
michael@2: -  *) ac_try_echo=$ac_try;;
michael@2: -esac
michael@2: -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
michael@2: -  (eval "$ac_try") 2>&5
michael@2: +  (eval "$LEX conftest.l") 2>&5
michael@2:    ac_status=$?
michael@2:    echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); }; }; then
michael@2: -  ac_cv_lib_fl_yywrap=yes
michael@2: +  (exit $ac_status); }
michael@2: +{ echo "$as_me:$LINENO: checking lex output file root" >&5
michael@2: +echo $ECHO_N "checking lex output file root... $ECHO_C" >&6; }
michael@2: +if test "${ac_cv_prog_lex_root+set}" = set; then
michael@2: +  echo $ECHO_N "(cached) $ECHO_C" >&6
michael@2:  else
michael@2: -  echo "$as_me: failed program was:" >&5
michael@2: -sed 's/^/| /' conftest.$ac_ext >&5
michael@2:  
michael@2: -	ac_cv_lib_fl_yywrap=no
michael@2: +if test -f lex.yy.c; then
michael@2: +  ac_cv_prog_lex_root=lex.yy
michael@2: +elif test -f lexyy.c; then
michael@2: +  ac_cv_prog_lex_root=lexyy
michael@2: +else
michael@2: +  { { echo "$as_me:$LINENO: error: cannot find output from $LEX; giving up" >&5
michael@2: +echo "$as_me: error: cannot find output from $LEX; giving up" >&2;}
michael@2: +   { (exit 1); exit 1; }; }
michael@2:  fi
michael@2: -
michael@2: -rm -f core conftest.err conftest.$ac_objext \
michael@2: -      conftest$ac_exeext conftest.$ac_ext
michael@2: -LIBS=$ac_check_lib_save_LIBS
michael@2:  fi
michael@2: -{ echo "$as_me:$LINENO: result: $ac_cv_lib_fl_yywrap" >&5
michael@2: -echo "${ECHO_T}$ac_cv_lib_fl_yywrap" >&6; }
michael@2: -if test $ac_cv_lib_fl_yywrap = yes; then
michael@2: -  LEXLIB="-lfl"
michael@2: -else
michael@2: -  { echo "$as_me:$LINENO: checking for yywrap in -ll" >&5
michael@2: -echo $ECHO_N "checking for yywrap in -ll... $ECHO_C" >&6; }
michael@2: -if test "${ac_cv_lib_l_yywrap+set}" = set; then
michael@2: +{ echo "$as_me:$LINENO: result: $ac_cv_prog_lex_root" >&5
michael@2: +echo "${ECHO_T}$ac_cv_prog_lex_root" >&6; }
michael@2: +LEX_OUTPUT_ROOT=$ac_cv_prog_lex_root
michael@2: +
michael@2: +if test -z "${LEXLIB+set}"; then
michael@2: +  { echo "$as_me:$LINENO: checking lex library" >&5
michael@2: +echo $ECHO_N "checking lex library... $ECHO_C" >&6; }
michael@2: +if test "${ac_cv_lib_lex+set}" = set; then
michael@2:    echo $ECHO_N "(cached) $ECHO_C" >&6
michael@2:  else
michael@2: -  ac_check_lib_save_LIBS=$LIBS
michael@2: -LIBS="-ll  $LIBS"
michael@2: -cat >conftest.$ac_ext <<_ACEOF
michael@2: -/* confdefs.h.  */
michael@2: -_ACEOF
michael@2: -cat confdefs.h >>conftest.$ac_ext
michael@2: -cat >>conftest.$ac_ext <<_ACEOF
michael@2: -/* end confdefs.h.  */
michael@2:  
michael@2: -/* Override any GCC internal prototype to avoid an error.
michael@2: -   Use char because int might match the return type of a GCC
michael@2: -   builtin and then its argument prototype would still apply.  */
michael@2: -#ifdef __cplusplus
michael@2: -extern "C"
michael@2: -#endif
michael@2: -char yywrap ();
michael@2: -int
michael@2: -main ()
michael@2: -{
michael@2: -return yywrap ();
michael@2: -  ;
michael@2: -  return 0;
michael@2: -}
michael@2: +    ac_save_LIBS=$LIBS
michael@2: +    ac_cv_lib_lex='none needed'
michael@2: +    for ac_lib in '' -lfl -ll; do
michael@2: +      LIBS="$ac_lib $ac_save_LIBS"
michael@2: +      cat >conftest.$ac_ext <<_ACEOF
michael@2: +`cat $LEX_OUTPUT_ROOT.c`
michael@2:  _ACEOF
michael@2:  rm -f conftest.$ac_objext conftest$ac_exeext
michael@2:  if { (ac_try="$ac_link"
michael@2: @@ -5069,85 +4834,31 @@
michael@2:    rm -f conftest.er1
michael@2:    cat conftest.err >&5
michael@2:    echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); } &&
michael@2: -	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
michael@2: -  { (case "(($ac_try" in
michael@2: -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
michael@2: -  *) ac_try_echo=$ac_try;;
michael@2: -esac
michael@2: -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
michael@2: -  (eval "$ac_try") 2>&5
michael@2: -  ac_status=$?
michael@2: -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); }; } &&
michael@2: -	 { ac_try='test -s conftest$ac_exeext'
michael@2: -  { (case "(($ac_try" in
michael@2: -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
michael@2: -  *) ac_try_echo=$ac_try;;
michael@2: -esac
michael@2: -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
michael@2: -  (eval "$ac_try") 2>&5
michael@2: -  ac_status=$?
michael@2: -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); }; }; then
michael@2: -  ac_cv_lib_l_yywrap=yes
michael@2: +  (exit $ac_status); } && {
michael@2: +	 test -z "$ac_c_werror_flag" ||
michael@2: +	 test ! -s conftest.err
michael@2: +       } && test -s conftest$ac_exeext &&
michael@2: +       $as_test_x conftest$ac_exeext; then
michael@2: +  ac_cv_lib_lex=$ac_lib
michael@2:  else
michael@2:    echo "$as_me: failed program was:" >&5
michael@2:  sed 's/^/| /' conftest.$ac_ext >&5
michael@2:  
michael@2: -	ac_cv_lib_l_yywrap=no
michael@2: +
michael@2:  fi
michael@2:  
michael@2: -rm -f core conftest.err conftest.$ac_objext \
michael@2: +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
michael@2:        conftest$ac_exeext conftest.$ac_ext
michael@2: -LIBS=$ac_check_lib_save_LIBS
michael@2: -fi
michael@2: -{ echo "$as_me:$LINENO: result: $ac_cv_lib_l_yywrap" >&5
michael@2: -echo "${ECHO_T}$ac_cv_lib_l_yywrap" >&6; }
michael@2: -if test $ac_cv_lib_l_yywrap = yes; then
michael@2: -  LEXLIB="-ll"
michael@2: -fi
michael@2: +      test "$ac_cv_lib_lex" != 'none needed' && break
michael@2: +    done
michael@2: +    LIBS=$ac_save_LIBS
michael@2:  
michael@2:  fi
michael@2: -
michael@2: +{ echo "$as_me:$LINENO: result: $ac_cv_lib_lex" >&5
michael@2: +echo "${ECHO_T}$ac_cv_lib_lex" >&6; }
michael@2: +  test "$ac_cv_lib_lex" != 'none needed' && LEXLIB=$ac_cv_lib_lex
michael@2:  fi
michael@2:  
michael@2: -if test "x$LEX" != "x:"; then
michael@2: -  { echo "$as_me:$LINENO: checking lex output file root" >&5
michael@2: -echo $ECHO_N "checking lex output file root... $ECHO_C" >&6; }
michael@2: -if test "${ac_cv_prog_lex_root+set}" = set; then
michael@2: -  echo $ECHO_N "(cached) $ECHO_C" >&6
michael@2: -else
michael@2: -  # The minimal lex program is just a single line: %%.  But some broken lexes
michael@2: -# (Solaris, I think it was) want two %% lines, so accommodate them.
michael@2: -cat >conftest.l <<_ACEOF
michael@2: -%%
michael@2: -%%
michael@2: -_ACEOF
michael@2: -{ (ac_try="$LEX conftest.l"
michael@2: -case "(($ac_try" in
michael@2: -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
michael@2: -  *) ac_try_echo=$ac_try;;
michael@2: -esac
michael@2: -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
michael@2: -  (eval "$LEX conftest.l") 2>&5
michael@2: -  ac_status=$?
michael@2: -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); }
michael@2: -if test -f lex.yy.c; then
michael@2: -  ac_cv_prog_lex_root=lex.yy
michael@2: -elif test -f lexyy.c; then
michael@2: -  ac_cv_prog_lex_root=lexyy
michael@2: -else
michael@2: -  { { echo "$as_me:$LINENO: error: cannot find output from $LEX; giving up" >&5
michael@2: -echo "$as_me: error: cannot find output from $LEX; giving up" >&2;}
michael@2: -   { (exit 1); exit 1; }; }
michael@2: -fi
michael@2: -fi
michael@2: -{ echo "$as_me:$LINENO: result: $ac_cv_prog_lex_root" >&5
michael@2: -echo "${ECHO_T}$ac_cv_prog_lex_root" >&6; }
michael@2: -rm -f conftest.l
michael@2: -LEX_OUTPUT_ROOT=$ac_cv_prog_lex_root
michael@2:  
michael@2:  { echo "$as_me:$LINENO: checking whether yytext is a pointer" >&5
michael@2:  echo $ECHO_N "checking whether yytext is a pointer... $ECHO_C" >&6; }
michael@2: @@ -5155,13 +4866,13 @@
michael@2:    echo $ECHO_N "(cached) $ECHO_C" >&6
michael@2:  else
michael@2:    # POSIX says lex can declare yytext either as a pointer or an array; the
michael@2: -# default is implementation-dependent. Figure out which it is, since
michael@2: +# default is implementation-dependent.  Figure out which it is, since
michael@2:  # not all implementations provide the %pointer and %array declarations.
michael@2:  ac_cv_prog_lex_yytext_pointer=no
michael@2: -echo 'extern char *yytext;' >>$LEX_OUTPUT_ROOT.c
michael@2:  ac_save_LIBS=$LIBS
michael@2: -LIBS="$LIBS $LEXLIB"
michael@2: +LIBS="$LEXLIB $ac_save_LIBS"
michael@2:  cat >conftest.$ac_ext <<_ACEOF
michael@2: +#define YYTEXT_POINTER 1
michael@2:  `cat $LEX_OUTPUT_ROOT.c`
michael@2:  _ACEOF
michael@2:  rm -f conftest.$ac_objext conftest$ac_exeext
michael@2: @@ -5177,27 +4888,11 @@
michael@2:    rm -f conftest.er1
michael@2:    cat conftest.err >&5
michael@2:    echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); } &&
michael@2: -	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
michael@2: -  { (case "(($ac_try" in
michael@2: -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
michael@2: -  *) ac_try_echo=$ac_try;;
michael@2: -esac
michael@2: -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
michael@2: -  (eval "$ac_try") 2>&5
michael@2: -  ac_status=$?
michael@2: -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); }; } &&
michael@2: -	 { ac_try='test -s conftest$ac_exeext'
michael@2: -  { (case "(($ac_try" in
michael@2: -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
michael@2: -  *) ac_try_echo=$ac_try;;
michael@2: -esac
michael@2: -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
michael@2: -  (eval "$ac_try") 2>&5
michael@2: -  ac_status=$?
michael@2: -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); }; }; then
michael@2: +  (exit $ac_status); } && {
michael@2: +	 test -z "$ac_c_werror_flag" ||
michael@2: +	 test ! -s conftest.err
michael@2: +       } && test -s conftest$ac_exeext &&
michael@2: +       $as_test_x conftest$ac_exeext; then
michael@2:    ac_cv_prog_lex_yytext_pointer=yes
michael@2:  else
michael@2:    echo "$as_me: failed program was:" >&5
michael@2: @@ -5206,10 +4901,9 @@
michael@2:  
michael@2:  fi
michael@2:  
michael@2: -rm -f core conftest.err conftest.$ac_objext \
michael@2: +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
michael@2:        conftest$ac_exeext conftest.$ac_ext
michael@2:  LIBS=$ac_save_LIBS
michael@2: -rm -f "${LEX_OUTPUT_ROOT}.c"
michael@2:  
michael@2:  fi
michael@2:  { echo "$as_me:$LINENO: result: $ac_cv_prog_lex_yytext_pointer" >&5
michael@2: @@ -5221,6 +4915,7 @@
michael@2:  _ACEOF
michael@2:  
michael@2:  fi
michael@2: +rm -f conftest.l $LEX_OUTPUT_ROOT.c
michael@2:  
michael@2:  fi
michael@2:  for ac_prog in 'bison -y' byacc
michael@2: @@ -5241,7 +4936,7 @@
michael@2:    IFS=$as_save_IFS
michael@2:    test -z "$as_dir" && as_dir=.
michael@2:    for ac_exec_ext in '' $ac_executable_extensions; do
michael@2: -  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
michael@2: +  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
michael@2:      ac_cv_prog_YACC="$ac_prog"
michael@2:      echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
michael@2:      break 2
michael@2: @@ -5288,7 +4983,7 @@
michael@2:    for ac_prog in grep ggrep; do
michael@2:    for ac_exec_ext in '' $ac_executable_extensions; do
michael@2:      ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
michael@2: -    { test -f "$ac_path_GREP" && $as_executable_p "$ac_path_GREP"; } || continue
michael@2: +    { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
michael@2:      # Check for GNU ac_path_GREP and select it if it is found.
michael@2:    # Check for GNU $ac_path_GREP
michael@2:  case `"$ac_path_GREP" --version 2>&1` in
michael@2: @@ -5370,7 +5065,7 @@
michael@2:    for ac_prog in egrep; do
michael@2:    for ac_exec_ext in '' $ac_executable_extensions; do
michael@2:      ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
michael@2: -    { test -f "$ac_path_EGREP" && $as_executable_p "$ac_path_EGREP"; } || continue
michael@2: +    { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
michael@2:      # Check for GNU ac_path_EGREP and select it if it is found.
michael@2:    # Check for GNU $ac_path_EGREP
michael@2:  case `"$ac_path_EGREP" --version 2>&1` in
michael@2: @@ -5466,27 +5161,10 @@
michael@2:    rm -f conftest.er1
michael@2:    cat conftest.err >&5
michael@2:    echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); } &&
michael@2: -	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
michael@2: -  { (case "(($ac_try" in
michael@2: -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
michael@2: -  *) ac_try_echo=$ac_try;;
michael@2: -esac
michael@2: -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
michael@2: -  (eval "$ac_try") 2>&5
michael@2: -  ac_status=$?
michael@2: -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); }; } &&
michael@2: -	 { ac_try='test -s conftest.$ac_objext'
michael@2: -  { (case "(($ac_try" in
michael@2: -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
michael@2: -  *) ac_try_echo=$ac_try;;
michael@2: -esac
michael@2: -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
michael@2: -  (eval "$ac_try") 2>&5
michael@2: -  ac_status=$?
michael@2: -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); }; }; then
michael@2: +  (exit $ac_status); } && {
michael@2: +	 test -z "$ac_c_werror_flag" ||
michael@2: +	 test ! -s conftest.err
michael@2: +       } && test -s conftest.$ac_objext; then
michael@2:    ac_cv_header_stdc=yes
michael@2:  else
michael@2:    echo "$as_me: failed program was:" >&5
michael@2: @@ -5662,27 +5340,10 @@
michael@2:    rm -f conftest.er1
michael@2:    cat conftest.err >&5
michael@2:    echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); } &&
michael@2: -	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
michael@2: -  { (case "(($ac_try" in
michael@2: -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
michael@2: -  *) ac_try_echo=$ac_try;;
michael@2: -esac
michael@2: -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
michael@2: -  (eval "$ac_try") 2>&5
michael@2: -  ac_status=$?
michael@2: -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); }; } &&
michael@2: -	 { ac_try='test -s conftest.$ac_objext'
michael@2: -  { (case "(($ac_try" in
michael@2: -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
michael@2: -  *) ac_try_echo=$ac_try;;
michael@2: -esac
michael@2: -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
michael@2: -  (eval "$ac_try") 2>&5
michael@2: -  ac_status=$?
michael@2: -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); }; }; then
michael@2: +  (exit $ac_status); } && {
michael@2: +	 test -z "$ac_c_werror_flag" ||
michael@2: +	 test ! -s conftest.err
michael@2: +       } && test -s conftest.$ac_objext; then
michael@2:    eval "$as_ac_Header=yes"
michael@2:  else
michael@2:    echo "$as_me: failed program was:" >&5
michael@2: @@ -5724,7 +5385,8 @@
michael@2:  int
michael@2:  main ()
michael@2:  {
michael@2: -#if !BYTE_ORDER || !BIG_ENDIAN || !LITTLE_ENDIAN
michael@2: +#if  ! (defined BYTE_ORDER && defined BIG_ENDIAN && defined LITTLE_ENDIAN \
michael@2: +	&& BYTE_ORDER && BIG_ENDIAN && LITTLE_ENDIAN)
michael@2:   bogus endian macros
michael@2:  #endif
michael@2:  
michael@2: @@ -5745,27 +5407,10 @@
michael@2:    rm -f conftest.er1
michael@2:    cat conftest.err >&5
michael@2:    echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); } &&
michael@2: -	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
michael@2: -  { (case "(($ac_try" in
michael@2: -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
michael@2: -  *) ac_try_echo=$ac_try;;
michael@2: -esac
michael@2: -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
michael@2: -  (eval "$ac_try") 2>&5
michael@2: -  ac_status=$?
michael@2: -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); }; } &&
michael@2: -	 { ac_try='test -s conftest.$ac_objext'
michael@2: -  { (case "(($ac_try" in
michael@2: -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
michael@2: -  *) ac_try_echo=$ac_try;;
michael@2: -esac
michael@2: -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
michael@2: -  (eval "$ac_try") 2>&5
michael@2: -  ac_status=$?
michael@2: -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); }; }; then
michael@2: +  (exit $ac_status); } && {
michael@2: +	 test -z "$ac_c_werror_flag" ||
michael@2: +	 test ! -s conftest.err
michael@2: +       } && test -s conftest.$ac_objext; then
michael@2:    # It does; now see whether it defined to BIG_ENDIAN or not.
michael@2:  cat >conftest.$ac_ext <<_ACEOF
michael@2:  /* confdefs.h.  */
michael@2: @@ -5800,27 +5445,10 @@
michael@2:    rm -f conftest.er1
michael@2:    cat conftest.err >&5
michael@2:    echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); } &&
michael@2: -	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
michael@2: -  { (case "(($ac_try" in
michael@2: -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
michael@2: -  *) ac_try_echo=$ac_try;;
michael@2: -esac
michael@2: -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
michael@2: -  (eval "$ac_try") 2>&5
michael@2: -  ac_status=$?
michael@2: -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); }; } &&
michael@2: -	 { ac_try='test -s conftest.$ac_objext'
michael@2: -  { (case "(($ac_try" in
michael@2: -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
michael@2: -  *) ac_try_echo=$ac_try;;
michael@2: -esac
michael@2: -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
michael@2: -  (eval "$ac_try") 2>&5
michael@2: -  ac_status=$?
michael@2: -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); }; }; then
michael@2: +  (exit $ac_status); } && {
michael@2: +	 test -z "$ac_c_werror_flag" ||
michael@2: +	 test ! -s conftest.err
michael@2: +       } && test -s conftest.$ac_objext; then
michael@2:    ac_cv_c_bigendian=yes
michael@2:  else
michael@2:    echo "$as_me: failed program was:" >&5
michael@2: @@ -5871,27 +5499,10 @@
michael@2:    rm -f conftest.er1
michael@2:    cat conftest.err >&5
michael@2:    echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); } &&
michael@2: -	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
michael@2: -  { (case "(($ac_try" in
michael@2: -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
michael@2: -  *) ac_try_echo=$ac_try;;
michael@2: -esac
michael@2: -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
michael@2: -  (eval "$ac_try") 2>&5
michael@2: -  ac_status=$?
michael@2: -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); }; } &&
michael@2: -	 { ac_try='test -s conftest.$ac_objext'
michael@2: -  { (case "(($ac_try" in
michael@2: -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
michael@2: -  *) ac_try_echo=$ac_try;;
michael@2: -esac
michael@2: -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
michael@2: -  (eval "$ac_try") 2>&5
michael@2: -  ac_status=$?
michael@2: -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); }; }; then
michael@2: +  (exit $ac_status); } && {
michael@2: +	 test -z "$ac_c_werror_flag" ||
michael@2: +	 test ! -s conftest.err
michael@2: +       } && test -s conftest.$ac_objext; then
michael@2:    if grep BIGenDianSyS conftest.$ac_objext >/dev/null ; then
michael@2:    ac_cv_c_bigendian=yes
michael@2:  fi
michael@2: @@ -6015,8 +5626,7 @@
michael@2:  main ()
michael@2:  {
michael@2:  #ifndef strerror_r
michael@2: -  char *p = (char *) strerror_r;
michael@2: -  return !p;
michael@2: +  (void) strerror_r;
michael@2:  #endif
michael@2:  
michael@2:    ;
michael@2: @@ -6036,27 +5646,10 @@
michael@2:    rm -f conftest.er1
michael@2:    cat conftest.err >&5
michael@2:    echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); } &&
michael@2: -	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
michael@2: -  { (case "(($ac_try" in
michael@2: -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
michael@2: -  *) ac_try_echo=$ac_try;;
michael@2: -esac
michael@2: -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
michael@2: -  (eval "$ac_try") 2>&5
michael@2: -  ac_status=$?
michael@2: -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); }; } &&
michael@2: -	 { ac_try='test -s conftest.$ac_objext'
michael@2: -  { (case "(($ac_try" in
michael@2: -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
michael@2: -  *) ac_try_echo=$ac_try;;
michael@2: -esac
michael@2: -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
michael@2: -  (eval "$ac_try") 2>&5
michael@2: -  ac_status=$?
michael@2: -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); }; }; then
michael@2: +  (exit $ac_status); } && {
michael@2: +	 test -z "$ac_cxx_werror_flag" ||
michael@2: +	 test ! -s conftest.err
michael@2: +       } && test -s conftest.$ac_objext; then
michael@2:    ac_cv_have_decl_strerror_r=yes
michael@2:  else
michael@2:    echo "$as_me: failed program was:" >&5
michael@2: @@ -6152,27 +5745,11 @@
michael@2:    rm -f conftest.er1
michael@2:    cat conftest.err >&5
michael@2:    echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); } &&
michael@2: -	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
michael@2: -  { (case "(($ac_try" in
michael@2: -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
michael@2: -  *) ac_try_echo=$ac_try;;
michael@2: -esac
michael@2: -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
michael@2: -  (eval "$ac_try") 2>&5
michael@2: -  ac_status=$?
michael@2: -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); }; } &&
michael@2: -	 { ac_try='test -s conftest$ac_exeext'
michael@2: -  { (case "(($ac_try" in
michael@2: -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
michael@2: -  *) ac_try_echo=$ac_try;;
michael@2: -esac
michael@2: -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
michael@2: -  (eval "$ac_try") 2>&5
michael@2: -  ac_status=$?
michael@2: -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); }; }; then
michael@2: +  (exit $ac_status); } && {
michael@2: +	 test -z "$ac_cxx_werror_flag" ||
michael@2: +	 test ! -s conftest.err
michael@2: +       } && test -s conftest$ac_exeext &&
michael@2: +       $as_test_x conftest$ac_exeext; then
michael@2:    eval "$as_ac_var=yes"
michael@2:  else
michael@2:    echo "$as_me: failed program was:" >&5
michael@2: @@ -6181,7 +5758,7 @@
michael@2:  	eval "$as_ac_var=no"
michael@2:  fi
michael@2:  
michael@2: -rm -f core conftest.err conftest.$ac_objext \
michael@2: +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
michael@2:        conftest$ac_exeext conftest.$ac_ext
michael@2:  fi
michael@2:  ac_res=`eval echo '${'$as_ac_var'}'`
michael@2: @@ -6236,27 +5813,10 @@
michael@2:    rm -f conftest.er1
michael@2:    cat conftest.err >&5
michael@2:    echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); } &&
michael@2: -	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
michael@2: -  { (case "(($ac_try" in
michael@2: -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
michael@2: -  *) ac_try_echo=$ac_try;;
michael@2: -esac
michael@2: -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
michael@2: -  (eval "$ac_try") 2>&5
michael@2: -  ac_status=$?
michael@2: -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); }; } &&
michael@2: -	 { ac_try='test -s conftest.$ac_objext'
michael@2: -  { (case "(($ac_try" in
michael@2: -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
michael@2: -  *) ac_try_echo=$ac_try;;
michael@2: -esac
michael@2: -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
michael@2: -  (eval "$ac_try") 2>&5
michael@2: -  ac_status=$?
michael@2: -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); }; }; then
michael@2: +  (exit $ac_status); } && {
michael@2: +	 test -z "$ac_cxx_werror_flag" ||
michael@2: +	 test ! -s conftest.err
michael@2: +       } && test -s conftest.$ac_objext; then
michael@2:    ac_cv_func_strerror_r_char_p=yes
michael@2:  else
michael@2:    echo "$as_me: failed program was:" >&5
michael@2: @@ -6379,27 +5939,10 @@
michael@2:    rm -f conftest.er1
michael@2:    cat conftest.err >&5
michael@2:    echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); } &&
michael@2: -	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
michael@2: -  { (case "(($ac_try" in
michael@2: -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
michael@2: -  *) ac_try_echo=$ac_try;;
michael@2: -esac
michael@2: -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
michael@2: -  (eval "$ac_try") 2>&5
michael@2: -  ac_status=$?
michael@2: -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); }; } &&
michael@2: -	 { ac_try='test -s conftest.$ac_objext'
michael@2: -  { (case "(($ac_try" in
michael@2: -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
michael@2: -  *) ac_try_echo=$ac_try;;
michael@2: -esac
michael@2: -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
michael@2: -  (eval "$ac_try") 2>&5
michael@2: -  ac_status=$?
michael@2: -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); }; }; then
michael@2: +  (exit $ac_status); } && {
michael@2: +	 test -z "$ac_cxx_werror_flag" ||
michael@2: +	 test ! -s conftest.err
michael@2: +       } && test -s conftest.$ac_objext; then
michael@2:    ac_header_compiler=yes
michael@2:  else
michael@2:    echo "$as_me: failed program was:" >&5
michael@2: @@ -6435,17 +5978,10 @@
michael@2:    rm -f conftest.er1
michael@2:    cat conftest.err >&5
michael@2:    echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); } >/dev/null; then
michael@2: -  if test -s conftest.err; then
michael@2: -    ac_cpp_err=$ac_cxx_preproc_warn_flag
michael@2: -    ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
michael@2: -  else
michael@2: -    ac_cpp_err=
michael@2: -  fi
michael@2: -else
michael@2: -  ac_cpp_err=yes
michael@2: -fi
michael@2: -if test -z "$ac_cpp_err"; then
michael@2: +  (exit $ac_status); } >/dev/null && {
michael@2: +	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
michael@2: +	 test ! -s conftest.err
michael@2: +       }; then
michael@2:    ac_header_preproc=yes
michael@2:  else
michael@2:    echo "$as_me: failed program was:" >&5
michael@2: @@ -6539,27 +6075,10 @@
michael@2:    rm -f conftest.er1
michael@2:    cat conftest.err >&5
michael@2:    echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); } &&
michael@2: -	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
michael@2: -  { (case "(($ac_try" in
michael@2: -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
michael@2: -  *) ac_try_echo=$ac_try;;
michael@2: -esac
michael@2: -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
michael@2: -  (eval "$ac_try") 2>&5
michael@2: -  ac_status=$?
michael@2: -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); }; } &&
michael@2: -	 { ac_try='test -s conftest.$ac_objext'
michael@2: -  { (case "(($ac_try" in
michael@2: -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
michael@2: -  *) ac_try_echo=$ac_try;;
michael@2: -esac
michael@2: -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
michael@2: -  (eval "$ac_try") 2>&5
michael@2: -  ac_status=$?
michael@2: -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); }; }; then
michael@2: +  (exit $ac_status); } && {
michael@2: +	 test -z "$ac_cxx_werror_flag" ||
michael@2: +	 test ! -s conftest.err
michael@2: +       } && test -s conftest.$ac_objext; then
michael@2:    eval "$as_ac_Header=yes"
michael@2:  else
michael@2:    echo "$as_me: failed program was:" >&5
michael@2: @@ -6609,7 +6128,7 @@
michael@2:    IFS=$as_save_IFS
michael@2:    test -z "$as_dir" && as_dir=.
michael@2:    for ac_exec_ext in '' $ac_executable_extensions; do
michael@2: -  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
michael@2: +  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
michael@2:      ac_cv_path_CCGNU2_CONFIG="$as_dir/$ac_word$ac_exec_ext"
michael@2:      echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
michael@2:      break 2
michael@2: @@ -6739,7 +6258,7 @@
michael@2:    IFS=$as_save_IFS
michael@2:    test -z "$as_dir" && as_dir=.
michael@2:    for ac_exec_ext in '' $ac_executable_extensions; do
michael@2: -  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
michael@2: +  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
michael@2:      ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
michael@2:      echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
michael@2:      break 2
michael@2: @@ -6839,7 +6358,7 @@
michael@2:    IFS=$as_save_IFS
michael@2:    test -z "$as_dir" && as_dir=.
michael@2:    for ac_exec_ext in '' $ac_executable_extensions; do
michael@2: -  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
michael@2: +  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
michael@2:      ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
michael@2:      echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
michael@2:      break 2
michael@2: @@ -6943,7 +6462,7 @@
michael@2:    IFS=$as_save_IFS
michael@2:    test -z "$as_dir" && as_dir=.
michael@2:    for ac_exec_ext in '' $ac_executable_extensions; do
michael@2: -  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
michael@2: +  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
michael@2:      ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
michael@2:      echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
michael@2:      break 2
michael@2: @@ -7117,27 +6636,10 @@
michael@2:    rm -f conftest.er1
michael@2:    cat conftest.err >&5
michael@2:    echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); } &&
michael@2: -	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
michael@2: -  { (case "(($ac_try" in
michael@2: -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
michael@2: -  *) ac_try_echo=$ac_try;;
michael@2: -esac
michael@2: -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
michael@2: -  (eval "$ac_try") 2>&5
michael@2: -  ac_status=$?
michael@2: -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); }; } &&
michael@2: -	 { ac_try='test -s conftest.$ac_objext'
michael@2: -  { (case "(($ac_try" in
michael@2: -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
michael@2: -  *) ac_try_echo=$ac_try;;
michael@2: -esac
michael@2: -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
michael@2: -  (eval "$ac_try") 2>&5
michael@2: -  ac_status=$?
michael@2: -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); }; }; then
michael@2: +  (exit $ac_status); } && {
michael@2: +	 test -z "$ac_cxx_werror_flag" ||
michael@2: +	 test ! -s conftest.err
michael@2: +       } && test -s conftest.$ac_objext; then
michael@2:    kde_cv_func_strlcat=yes
michael@2:  else
michael@2:    echo "$as_me: failed program was:" >&5
michael@2: @@ -7234,27 +6736,11 @@
michael@2:    rm -f conftest.er1
michael@2:    cat conftest.err >&5
michael@2:    echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); } &&
michael@2: -	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
michael@2: -  { (case "(($ac_try" in
michael@2: -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
michael@2: -  *) ac_try_echo=$ac_try;;
michael@2: -esac
michael@2: -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
michael@2: -  (eval "$ac_try") 2>&5
michael@2: -  ac_status=$?
michael@2: -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); }; } &&
michael@2: -	 { ac_try='test -s conftest$ac_exeext'
michael@2: -  { (case "(($ac_try" in
michael@2: -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
michael@2: -  *) ac_try_echo=$ac_try;;
michael@2: -esac
michael@2: -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
michael@2: -  (eval "$ac_try") 2>&5
michael@2: -  ac_status=$?
michael@2: -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); }; }; then
michael@2: +  (exit $ac_status); } && {
michael@2: +	 test -z "$ac_cxx_werror_flag" ||
michael@2: +	 test ! -s conftest.err
michael@2: +       } && test -s conftest$ac_exeext &&
michael@2: +       $as_test_x conftest$ac_exeext; then
michael@2:     kde_cv_func_strlcat=yes
michael@2:    kde_cv_proto_strlcat=yes
michael@2:  else
michael@2: @@ -7265,7 +6751,7 @@
michael@2:  
michael@2:  fi
michael@2:  
michael@2: -rm -f core conftest.err conftest.$ac_objext \
michael@2: +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
michael@2:        conftest$ac_exeext conftest.$ac_ext
michael@2:  LIBS=$kde_safe_libs
michael@2:  ac_ext=cpp
michael@2: @@ -7361,27 +6847,10 @@
michael@2:    rm -f conftest.er1
michael@2:    cat conftest.err >&5
michael@2:    echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); } &&
michael@2: -	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
michael@2: -  { (case "(($ac_try" in
michael@2: -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
michael@2: -  *) ac_try_echo=$ac_try;;
michael@2: -esac
michael@2: -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
michael@2: -  (eval "$ac_try") 2>&5
michael@2: -  ac_status=$?
michael@2: -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); }; } &&
michael@2: -	 { ac_try='test -s conftest.$ac_objext'
michael@2: -  { (case "(($ac_try" in
michael@2: -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
michael@2: -  *) ac_try_echo=$ac_try;;
michael@2: -esac
michael@2: -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
michael@2: -  (eval "$ac_try") 2>&5
michael@2: -  ac_status=$?
michael@2: -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); }; }; then
michael@2: +  (exit $ac_status); } && {
michael@2: +	 test -z "$ac_cxx_werror_flag" ||
michael@2: +	 test ! -s conftest.err
michael@2: +       } && test -s conftest.$ac_objext; then
michael@2:    kde_cv_func_strlcpy=yes
michael@2:  else
michael@2:    echo "$as_me: failed program was:" >&5
michael@2: @@ -7477,27 +6946,11 @@
michael@2:    rm -f conftest.er1
michael@2:    cat conftest.err >&5
michael@2:    echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); } &&
michael@2: -	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
michael@2: -  { (case "(($ac_try" in
michael@2: -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
michael@2: -  *) ac_try_echo=$ac_try;;
michael@2: -esac
michael@2: -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
michael@2: -  (eval "$ac_try") 2>&5
michael@2: -  ac_status=$?
michael@2: -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); }; } &&
michael@2: -	 { ac_try='test -s conftest$ac_exeext'
michael@2: -  { (case "(($ac_try" in
michael@2: -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
michael@2: -  *) ac_try_echo=$ac_try;;
michael@2: -esac
michael@2: -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
michael@2: -  (eval "$ac_try") 2>&5
michael@2: -  ac_status=$?
michael@2: -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); }; }; then
michael@2: +  (exit $ac_status); } && {
michael@2: +	 test -z "$ac_cxx_werror_flag" ||
michael@2: +	 test ! -s conftest.err
michael@2: +       } && test -s conftest$ac_exeext &&
michael@2: +       $as_test_x conftest$ac_exeext; then
michael@2:     kde_cv_func_strlcpy=yes
michael@2:    kde_cv_proto_strlcpy=yes
michael@2:  else
michael@2: @@ -7508,7 +6961,7 @@
michael@2:  
michael@2:  fi
michael@2:  
michael@2: -rm -f core conftest.err conftest.$ac_objext \
michael@2: +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
michael@2:        conftest$ac_exeext conftest.$ac_ext
michael@2:  LIBS=$kde_safe_libs
michael@2:  ac_ext=cpp
michael@2: @@ -7581,27 +7034,11 @@
michael@2:    rm -f conftest.er1
michael@2:    cat conftest.err >&5
michael@2:    echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); } &&
michael@2: -	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
michael@2: -  { (case "(($ac_try" in
michael@2: -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
michael@2: -  *) ac_try_echo=$ac_try;;
michael@2: -esac
michael@2: -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
michael@2: -  (eval "$ac_try") 2>&5
michael@2: -  ac_status=$?
michael@2: -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); }; } &&
michael@2: -	 { ac_try='test -s conftest$ac_exeext'
michael@2: -  { (case "(($ac_try" in
michael@2: -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
michael@2: -  *) ac_try_echo=$ac_try;;
michael@2: -esac
michael@2: -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
michael@2: -  (eval "$ac_try") 2>&5
michael@2: -  ac_status=$?
michael@2: -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); }; }; then
michael@2: +  (exit $ac_status); } && {
michael@2: +	 test -z "$ac_cxx_werror_flag" ||
michael@2: +	 test ! -s conftest.err
michael@2: +       } && test -s conftest$ac_exeext &&
michael@2: +       $as_test_x conftest$ac_exeext; then
michael@2:    ac_cv_lib_util_main=yes
michael@2:  else
michael@2:    echo "$as_me: failed program was:" >&5
michael@2: @@ -7610,7 +7047,7 @@
michael@2:  	ac_cv_lib_util_main=no
michael@2:  fi
michael@2:  
michael@2: -rm -f core conftest.err conftest.$ac_objext \
michael@2: +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
michael@2:        conftest$ac_exeext conftest.$ac_ext
michael@2:  LIBS=$ac_check_lib_save_LIBS
michael@2:  fi
michael@2: @@ -7656,27 +7093,11 @@
michael@2:    rm -f conftest.er1
michael@2:    cat conftest.err >&5
michael@2:    echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); } &&
michael@2: -	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
michael@2: -  { (case "(($ac_try" in
michael@2: -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
michael@2: -  *) ac_try_echo=$ac_try;;
michael@2: -esac
michael@2: -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
michael@2: -  (eval "$ac_try") 2>&5
michael@2: -  ac_status=$?
michael@2: -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); }; } &&
michael@2: -	 { ac_try='test -s conftest$ac_exeext'
michael@2: -  { (case "(($ac_try" in
michael@2: -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
michael@2: -  *) ac_try_echo=$ac_try;;
michael@2: -esac
michael@2: -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
michael@2: -  (eval "$ac_try") 2>&5
michael@2: -  ac_status=$?
michael@2: -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); }; }; then
michael@2: +  (exit $ac_status); } && {
michael@2: +	 test -z "$ac_cxx_werror_flag" ||
michael@2: +	 test ! -s conftest.err
michael@2: +       } && test -s conftest$ac_exeext &&
michael@2: +       $as_test_x conftest$ac_exeext; then
michael@2:    ac_cv_lib_compat_main=yes
michael@2:  else
michael@2:    echo "$as_me: failed program was:" >&5
michael@2: @@ -7685,7 +7106,7 @@
michael@2:  	ac_cv_lib_compat_main=no
michael@2:  fi
michael@2:  
michael@2: -rm -f core conftest.err conftest.$ac_objext \
michael@2: +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
michael@2:        conftest$ac_exeext conftest.$ac_ext
michael@2:  LIBS=$ac_check_lib_save_LIBS
michael@2:  fi
michael@2: @@ -7738,27 +7159,11 @@
michael@2:    rm -f conftest.er1
michael@2:    cat conftest.err >&5
michael@2:    echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); } &&
michael@2: -	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
michael@2: -  { (case "(($ac_try" in
michael@2: -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
michael@2: -  *) ac_try_echo=$ac_try;;
michael@2: -esac
michael@2: -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
michael@2: -  (eval "$ac_try") 2>&5
michael@2: -  ac_status=$?
michael@2: -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); }; } &&
michael@2: -	 { ac_try='test -s conftest$ac_exeext'
michael@2: -  { (case "(($ac_try" in
michael@2: -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
michael@2: -  *) ac_try_echo=$ac_try;;
michael@2: -esac
michael@2: -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
michael@2: -  (eval "$ac_try") 2>&5
michael@2: -  ac_status=$?
michael@2: -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); }; }; then
michael@2: +  (exit $ac_status); } && {
michael@2: +	 test -z "$ac_cxx_werror_flag" ||
michael@2: +	 test ! -s conftest.err
michael@2: +       } && test -s conftest$ac_exeext &&
michael@2: +       $as_test_x conftest$ac_exeext; then
michael@2:    ac_cv_lib_crypt_crypt=yes
michael@2:  else
michael@2:    echo "$as_me: failed program was:" >&5
michael@2: @@ -7767,7 +7172,7 @@
michael@2:  	ac_cv_lib_crypt_crypt=no
michael@2:  fi
michael@2:  
michael@2: -rm -f core conftest.err conftest.$ac_objext \
michael@2: +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
michael@2:        conftest$ac_exeext conftest.$ac_ext
michael@2:  LIBS=$ac_check_lib_save_LIBS
michael@2:  fi
michael@2: @@ -7818,27 +7223,11 @@
michael@2:    rm -f conftest.er1
michael@2:    cat conftest.err >&5
michael@2:    echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); } &&
michael@2: -	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
michael@2: -  { (case "(($ac_try" in
michael@2: -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
michael@2: -  *) ac_try_echo=$ac_try;;
michael@2: -esac
michael@2: -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
michael@2: -  (eval "$ac_try") 2>&5
michael@2: -  ac_status=$?
michael@2: -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); }; } &&
michael@2: -	 { ac_try='test -s conftest$ac_exeext'
michael@2: -  { (case "(($ac_try" in
michael@2: -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
michael@2: -  *) ac_try_echo=$ac_try;;
michael@2: -esac
michael@2: -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
michael@2: -  (eval "$ac_try") 2>&5
michael@2: -  ac_status=$?
michael@2: -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); }; }; then
michael@2: +  (exit $ac_status); } && {
michael@2: +	 test -z "$ac_cxx_werror_flag" ||
michael@2: +	 test ! -s conftest.err
michael@2: +       } && test -s conftest$ac_exeext &&
michael@2: +       $as_test_x conftest$ac_exeext; then
michael@2:    ac_cv_lib_c_crypt=yes
michael@2:  else
michael@2:    echo "$as_me: failed program was:" >&5
michael@2: @@ -7847,7 +7236,7 @@
michael@2:  	ac_cv_lib_c_crypt=no
michael@2:  fi
michael@2:  
michael@2: -rm -f core conftest.err conftest.$ac_objext \
michael@2: +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
michael@2:        conftest$ac_exeext conftest.$ac_ext
michael@2:  LIBS=$ac_check_lib_save_LIBS
michael@2:  fi
michael@2: @@ -7925,27 +7314,10 @@
michael@2:    rm -f conftest.er1
michael@2:    cat conftest.err >&5
michael@2:    echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); } &&
michael@2: -	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
michael@2: -  { (case "(($ac_try" in
michael@2: -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
michael@2: -  *) ac_try_echo=$ac_try;;
michael@2: -esac
michael@2: -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
michael@2: -  (eval "$ac_try") 2>&5
michael@2: -  ac_status=$?
michael@2: -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); }; } &&
michael@2: -	 { ac_try='test -s conftest.$ac_objext'
michael@2: -  { (case "(($ac_try" in
michael@2: -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
michael@2: -  *) ac_try_echo=$ac_try;;
michael@2: -esac
michael@2: -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
michael@2: -  (eval "$ac_try") 2>&5
michael@2: -  ac_status=$?
michael@2: -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); }; }; then
michael@2: +  (exit $ac_status); } && {
michael@2: +	 test -z "$ac_cxx_werror_flag" ||
michael@2: +	 test ! -s conftest.err
michael@2: +       } && test -s conftest.$ac_objext; then
michael@2:  
michael@2:           kde_cv_socklen_t=yes
michael@2:           kde_cv_socklen_t_equiv=socklen_t
michael@2: @@ -8018,27 +7390,10 @@
michael@2:    rm -f conftest.er1
michael@2:    cat conftest.err >&5
michael@2:    echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); } &&
michael@2: -	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
michael@2: -  { (case "(($ac_try" in
michael@2: -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
michael@2: -  *) ac_try_echo=$ac_try;;
michael@2: -esac
michael@2: -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
michael@2: -  (eval "$ac_try") 2>&5
michael@2: -  ac_status=$?
michael@2: -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); }; } &&
michael@2: -	 { ac_try='test -s conftest.$ac_objext'
michael@2: -  { (case "(($ac_try" in
michael@2: -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
michael@2: -  *) ac_try_echo=$ac_try;;
michael@2: -esac
michael@2: -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
michael@2: -  (eval "$ac_try") 2>&5
michael@2: -  ac_status=$?
michael@2: -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); }; }; then
michael@2: +  (exit $ac_status); } && {
michael@2: +	 test -z "$ac_cxx_werror_flag" ||
michael@2: +	 test ! -s conftest.err
michael@2: +       } && test -s conftest.$ac_objext; then
michael@2:  
michael@2:                 kde_cv_socklen_t_equiv="$t"
michael@2:                 break
michael@2: @@ -8117,27 +7472,11 @@
michael@2:    rm -f conftest.er1
michael@2:    cat conftest.err >&5
michael@2:    echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); } &&
michael@2: -	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
michael@2: -  { (case "(($ac_try" in
michael@2: -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
michael@2: -  *) ac_try_echo=$ac_try;;
michael@2: -esac
michael@2: -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
michael@2: -  (eval "$ac_try") 2>&5
michael@2: -  ac_status=$?
michael@2: -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); }; } &&
michael@2: -	 { ac_try='test -s conftest$ac_exeext'
michael@2: -  { (case "(($ac_try" in
michael@2: -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
michael@2: -  *) ac_try_echo=$ac_try;;
michael@2: -esac
michael@2: -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
michael@2: -  (eval "$ac_try") 2>&5
michael@2: -  ac_status=$?
michael@2: -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); }; }; then
michael@2: +  (exit $ac_status); } && {
michael@2: +	 test -z "$ac_cxx_werror_flag" ||
michael@2: +	 test ! -s conftest.err
michael@2: +       } && test -s conftest$ac_exeext &&
michael@2: +       $as_test_x conftest$ac_exeext; then
michael@2:    ac_cv_lib_dnet_dnet_ntoa=yes
michael@2:  else
michael@2:    echo "$as_me: failed program was:" >&5
michael@2: @@ -8146,7 +7485,7 @@
michael@2:  	ac_cv_lib_dnet_dnet_ntoa=no
michael@2:  fi
michael@2:  
michael@2: -rm -f core conftest.err conftest.$ac_objext \
michael@2: +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
michael@2:        conftest$ac_exeext conftest.$ac_ext
michael@2:  LIBS=$ac_check_lib_save_LIBS
michael@2:  fi
michael@2: @@ -8199,27 +7538,11 @@
michael@2:    rm -f conftest.er1
michael@2:    cat conftest.err >&5
michael@2:    echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); } &&
michael@2: -	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
michael@2: -  { (case "(($ac_try" in
michael@2: -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
michael@2: -  *) ac_try_echo=$ac_try;;
michael@2: -esac
michael@2: -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
michael@2: -  (eval "$ac_try") 2>&5
michael@2: -  ac_status=$?
michael@2: -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); }; } &&
michael@2: -	 { ac_try='test -s conftest$ac_exeext'
michael@2: -  { (case "(($ac_try" in
michael@2: -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
michael@2: -  *) ac_try_echo=$ac_try;;
michael@2: -esac
michael@2: -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
michael@2: -  (eval "$ac_try") 2>&5
michael@2: -  ac_status=$?
michael@2: -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); }; }; then
michael@2: +  (exit $ac_status); } && {
michael@2: +	 test -z "$ac_cxx_werror_flag" ||
michael@2: +	 test ! -s conftest.err
michael@2: +       } && test -s conftest$ac_exeext &&
michael@2: +       $as_test_x conftest$ac_exeext; then
michael@2:    ac_cv_lib_dnet_stub_dnet_ntoa=yes
michael@2:  else
michael@2:    echo "$as_me: failed program was:" >&5
michael@2: @@ -8228,7 +7551,7 @@
michael@2:  	ac_cv_lib_dnet_stub_dnet_ntoa=no
michael@2:  fi
michael@2:  
michael@2: -rm -f core conftest.err conftest.$ac_objext \
michael@2: +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
michael@2:        conftest$ac_exeext conftest.$ac_ext
michael@2:  LIBS=$ac_check_lib_save_LIBS
michael@2:  fi
michael@2: @@ -8302,27 +7625,11 @@
michael@2:    rm -f conftest.er1
michael@2:    cat conftest.err >&5
michael@2:    echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); } &&
michael@2: -	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
michael@2: -  { (case "(($ac_try" in
michael@2: -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
michael@2: -  *) ac_try_echo=$ac_try;;
michael@2: -esac
michael@2: -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
michael@2: -  (eval "$ac_try") 2>&5
michael@2: -  ac_status=$?
michael@2: -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); }; } &&
michael@2: -	 { ac_try='test -s conftest$ac_exeext'
michael@2: -  { (case "(($ac_try" in
michael@2: -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
michael@2: -  *) ac_try_echo=$ac_try;;
michael@2: -esac
michael@2: -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
michael@2: -  (eval "$ac_try") 2>&5
michael@2: -  ac_status=$?
michael@2: -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); }; }; then
michael@2: +  (exit $ac_status); } && {
michael@2: +	 test -z "$ac_cxx_werror_flag" ||
michael@2: +	 test ! -s conftest.err
michael@2: +       } && test -s conftest$ac_exeext &&
michael@2: +       $as_test_x conftest$ac_exeext; then
michael@2:    ac_cv_func_inet_ntoa=yes
michael@2:  else
michael@2:    echo "$as_me: failed program was:" >&5
michael@2: @@ -8331,7 +7638,7 @@
michael@2:  	ac_cv_func_inet_ntoa=no
michael@2:  fi
michael@2:  
michael@2: -rm -f core conftest.err conftest.$ac_objext \
michael@2: +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
michael@2:        conftest$ac_exeext conftest.$ac_ext
michael@2:  fi
michael@2:  { echo "$as_me:$LINENO: result: $ac_cv_func_inet_ntoa" >&5
michael@2: @@ -8380,27 +7687,11 @@
michael@2:    rm -f conftest.er1
michael@2:    cat conftest.err >&5
michael@2:    echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); } &&
michael@2: -	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
michael@2: -  { (case "(($ac_try" in
michael@2: -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
michael@2: -  *) ac_try_echo=$ac_try;;
michael@2: -esac
michael@2: -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
michael@2: -  (eval "$ac_try") 2>&5
michael@2: -  ac_status=$?
michael@2: -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); }; } &&
michael@2: -	 { ac_try='test -s conftest$ac_exeext'
michael@2: -  { (case "(($ac_try" in
michael@2: -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
michael@2: -  *) ac_try_echo=$ac_try;;
michael@2: -esac
michael@2: -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
michael@2: -  (eval "$ac_try") 2>&5
michael@2: -  ac_status=$?
michael@2: -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); }; }; then
michael@2: +  (exit $ac_status); } && {
michael@2: +	 test -z "$ac_cxx_werror_flag" ||
michael@2: +	 test ! -s conftest.err
michael@2: +       } && test -s conftest$ac_exeext &&
michael@2: +       $as_test_x conftest$ac_exeext; then
michael@2:    ac_cv_lib_nsl_inet_ntoa=yes
michael@2:  else
michael@2:    echo "$as_me: failed program was:" >&5
michael@2: @@ -8409,7 +7700,7 @@
michael@2:  	ac_cv_lib_nsl_inet_ntoa=no
michael@2:  fi
michael@2:  
michael@2: -rm -f core conftest.err conftest.$ac_objext \
michael@2: +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
michael@2:        conftest$ac_exeext conftest.$ac_ext
michael@2:  LIBS=$ac_check_lib_save_LIBS
michael@2:  fi
michael@2: @@ -8483,27 +7774,11 @@
michael@2:    rm -f conftest.er1
michael@2:    cat conftest.err >&5
michael@2:    echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); } &&
michael@2: -	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
michael@2: -  { (case "(($ac_try" in
michael@2: -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
michael@2: -  *) ac_try_echo=$ac_try;;
michael@2: -esac
michael@2: -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
michael@2: -  (eval "$ac_try") 2>&5
michael@2: -  ac_status=$?
michael@2: -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); }; } &&
michael@2: -	 { ac_try='test -s conftest$ac_exeext'
michael@2: -  { (case "(($ac_try" in
michael@2: -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
michael@2: -  *) ac_try_echo=$ac_try;;
michael@2: -esac
michael@2: -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
michael@2: -  (eval "$ac_try") 2>&5
michael@2: -  ac_status=$?
michael@2: -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); }; }; then
michael@2: +  (exit $ac_status); } && {
michael@2: +	 test -z "$ac_cxx_werror_flag" ||
michael@2: +	 test ! -s conftest.err
michael@2: +       } && test -s conftest$ac_exeext &&
michael@2: +       $as_test_x conftest$ac_exeext; then
michael@2:    ac_cv_func_connect=yes
michael@2:  else
michael@2:    echo "$as_me: failed program was:" >&5
michael@2: @@ -8512,7 +7787,7 @@
michael@2:  	ac_cv_func_connect=no
michael@2:  fi
michael@2:  
michael@2: -rm -f core conftest.err conftest.$ac_objext \
michael@2: +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
michael@2:        conftest$ac_exeext conftest.$ac_ext
michael@2:  fi
michael@2:  { echo "$as_me:$LINENO: result: $ac_cv_func_connect" >&5
michael@2: @@ -8561,27 +7836,11 @@
michael@2:    rm -f conftest.er1
michael@2:    cat conftest.err >&5
michael@2:    echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); } &&
michael@2: -	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
michael@2: -  { (case "(($ac_try" in
michael@2: -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
michael@2: -  *) ac_try_echo=$ac_try;;
michael@2: -esac
michael@2: -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
michael@2: -  (eval "$ac_try") 2>&5
michael@2: -  ac_status=$?
michael@2: -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); }; } &&
michael@2: -	 { ac_try='test -s conftest$ac_exeext'
michael@2: -  { (case "(($ac_try" in
michael@2: -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
michael@2: -  *) ac_try_echo=$ac_try;;
michael@2: -esac
michael@2: -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
michael@2: -  (eval "$ac_try") 2>&5
michael@2: -  ac_status=$?
michael@2: -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); }; }; then
michael@2: +  (exit $ac_status); } && {
michael@2: +	 test -z "$ac_cxx_werror_flag" ||
michael@2: +	 test ! -s conftest.err
michael@2: +       } && test -s conftest$ac_exeext &&
michael@2: +       $as_test_x conftest$ac_exeext; then
michael@2:    ac_cv_lib_socket_connect=yes
michael@2:  else
michael@2:    echo "$as_me: failed program was:" >&5
michael@2: @@ -8590,7 +7849,7 @@
michael@2:  	ac_cv_lib_socket_connect=no
michael@2:  fi
michael@2:  
michael@2: -rm -f core conftest.err conftest.$ac_objext \
michael@2: +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
michael@2:        conftest$ac_exeext conftest.$ac_ext
michael@2:  LIBS=$ac_check_lib_save_LIBS
michael@2:  fi
michael@2: @@ -8665,27 +7924,11 @@
michael@2:    rm -f conftest.er1
michael@2:    cat conftest.err >&5
michael@2:    echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); } &&
michael@2: -	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
michael@2: -  { (case "(($ac_try" in
michael@2: -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
michael@2: -  *) ac_try_echo=$ac_try;;
michael@2: -esac
michael@2: -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
michael@2: -  (eval "$ac_try") 2>&5
michael@2: -  ac_status=$?
michael@2: -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); }; } &&
michael@2: -	 { ac_try='test -s conftest$ac_exeext'
michael@2: -  { (case "(($ac_try" in
michael@2: -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
michael@2: -  *) ac_try_echo=$ac_try;;
michael@2: -esac
michael@2: -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
michael@2: -  (eval "$ac_try") 2>&5
michael@2: -  ac_status=$?
michael@2: -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); }; }; then
michael@2: +  (exit $ac_status); } && {
michael@2: +	 test -z "$ac_cxx_werror_flag" ||
michael@2: +	 test ! -s conftest.err
michael@2: +       } && test -s conftest$ac_exeext &&
michael@2: +       $as_test_x conftest$ac_exeext; then
michael@2:    ac_cv_func_remove=yes
michael@2:  else
michael@2:    echo "$as_me: failed program was:" >&5
michael@2: @@ -8694,7 +7937,7 @@
michael@2:  	ac_cv_func_remove=no
michael@2:  fi
michael@2:  
michael@2: -rm -f core conftest.err conftest.$ac_objext \
michael@2: +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
michael@2:        conftest$ac_exeext conftest.$ac_ext
michael@2:  fi
michael@2:  { echo "$as_me:$LINENO: result: $ac_cv_func_remove" >&5
michael@2: @@ -8743,27 +7986,11 @@
michael@2:    rm -f conftest.er1
michael@2:    cat conftest.err >&5
michael@2:    echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); } &&
michael@2: -	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
michael@2: -  { (case "(($ac_try" in
michael@2: -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
michael@2: -  *) ac_try_echo=$ac_try;;
michael@2: -esac
michael@2: -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
michael@2: -  (eval "$ac_try") 2>&5
michael@2: -  ac_status=$?
michael@2: -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); }; } &&
michael@2: -	 { ac_try='test -s conftest$ac_exeext'
michael@2: -  { (case "(($ac_try" in
michael@2: -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
michael@2: -  *) ac_try_echo=$ac_try;;
michael@2: -esac
michael@2: -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
michael@2: -  (eval "$ac_try") 2>&5
michael@2: -  ac_status=$?
michael@2: -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); }; }; then
michael@2: +  (exit $ac_status); } && {
michael@2: +	 test -z "$ac_cxx_werror_flag" ||
michael@2: +	 test ! -s conftest.err
michael@2: +       } && test -s conftest$ac_exeext &&
michael@2: +       $as_test_x conftest$ac_exeext; then
michael@2:    ac_cv_lib_posix_remove=yes
michael@2:  else
michael@2:    echo "$as_me: failed program was:" >&5
michael@2: @@ -8772,7 +7999,7 @@
michael@2:  	ac_cv_lib_posix_remove=no
michael@2:  fi
michael@2:  
michael@2: -rm -f core conftest.err conftest.$ac_objext \
michael@2: +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
michael@2:        conftest$ac_exeext conftest.$ac_ext
michael@2:  LIBS=$ac_check_lib_save_LIBS
michael@2:  fi
michael@2: @@ -8848,27 +8075,11 @@
michael@2:    rm -f conftest.er1
michael@2:    cat conftest.err >&5
michael@2:    echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); } &&
michael@2: -	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
michael@2: -  { (case "(($ac_try" in
michael@2: -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
michael@2: -  *) ac_try_echo=$ac_try;;
michael@2: -esac
michael@2: -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
michael@2: -  (eval "$ac_try") 2>&5
michael@2: -  ac_status=$?
michael@2: -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); }; } &&
michael@2: -	 { ac_try='test -s conftest$ac_exeext'
michael@2: -  { (case "(($ac_try" in
michael@2: -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
michael@2: -  *) ac_try_echo=$ac_try;;
michael@2: -esac
michael@2: -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
michael@2: -  (eval "$ac_try") 2>&5
michael@2: -  ac_status=$?
michael@2: -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); }; }; then
michael@2: +  (exit $ac_status); } && {
michael@2: +	 test -z "$ac_cxx_werror_flag" ||
michael@2: +	 test ! -s conftest.err
michael@2: +       } && test -s conftest$ac_exeext &&
michael@2: +       $as_test_x conftest$ac_exeext; then
michael@2:    ac_cv_func_shmat=yes
michael@2:  else
michael@2:    echo "$as_me: failed program was:" >&5
michael@2: @@ -8877,7 +8088,7 @@
michael@2:  	ac_cv_func_shmat=no
michael@2:  fi
michael@2:  
michael@2: -rm -f core conftest.err conftest.$ac_objext \
michael@2: +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
michael@2:        conftest$ac_exeext conftest.$ac_ext
michael@2:  fi
michael@2:  { echo "$as_me:$LINENO: result: $ac_cv_func_shmat" >&5
michael@2: @@ -8927,27 +8138,11 @@
michael@2:    rm -f conftest.er1
michael@2:    cat conftest.err >&5
michael@2:    echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); } &&
michael@2: -	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
michael@2: -  { (case "(($ac_try" in
michael@2: -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
michael@2: -  *) ac_try_echo=$ac_try;;
michael@2: -esac
michael@2: -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
michael@2: -  (eval "$ac_try") 2>&5
michael@2: -  ac_status=$?
michael@2: -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); }; } &&
michael@2: -	 { ac_try='test -s conftest$ac_exeext'
michael@2: -  { (case "(($ac_try" in
michael@2: -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
michael@2: -  *) ac_try_echo=$ac_try;;
michael@2: -esac
michael@2: -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
michael@2: -  (eval "$ac_try") 2>&5
michael@2: -  ac_status=$?
michael@2: -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); }; }; then
michael@2: +  (exit $ac_status); } && {
michael@2: +	 test -z "$ac_cxx_werror_flag" ||
michael@2: +	 test ! -s conftest.err
michael@2: +       } && test -s conftest$ac_exeext &&
michael@2: +       $as_test_x conftest$ac_exeext; then
michael@2:    ac_cv_lib_ipc_shmat=yes
michael@2:  else
michael@2:    echo "$as_me: failed program was:" >&5
michael@2: @@ -8956,7 +8151,7 @@
michael@2:  	ac_cv_lib_ipc_shmat=no
michael@2:  fi
michael@2:  
michael@2: -rm -f core conftest.err conftest.$ac_objext \
michael@2: +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
michael@2:        conftest$ac_exeext conftest.$ac_ext
michael@2:  LIBS=$ac_check_lib_save_LIBS
michael@2:  fi
michael@2: @@ -9010,27 +8205,10 @@
michael@2:    rm -f conftest.er1
michael@2:    cat conftest.err >&5
michael@2:    echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); } &&
michael@2: -	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
michael@2: -  { (case "(($ac_try" in
michael@2: -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
michael@2: -  *) ac_try_echo=$ac_try;;
michael@2: -esac
michael@2: -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
michael@2: -  (eval "$ac_try") 2>&5
michael@2: -  ac_status=$?
michael@2: -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); }; } &&
michael@2: -	 { ac_try='test -s conftest.$ac_objext'
michael@2: -  { (case "(($ac_try" in
michael@2: -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
michael@2: -  *) ac_try_echo=$ac_try;;
michael@2: -esac
michael@2: -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
michael@2: -  (eval "$ac_try") 2>&5
michael@2: -  ac_status=$?
michael@2: -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); }; }; then
michael@2: +  (exit $ac_status); } && {
michael@2: +	 test -z "$ac_cxx_werror_flag" ||
michael@2: +	 test ! -s conftest.err
michael@2: +       } && test -s conftest.$ac_objext; then
michael@2:    ac_header_compiler=yes
michael@2:  else
michael@2:    echo "$as_me: failed program was:" >&5
michael@2: @@ -9066,17 +8244,10 @@
michael@2:    rm -f conftest.er1
michael@2:    cat conftest.err >&5
michael@2:    echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); } >/dev/null; then
michael@2: -  if test -s conftest.err; then
michael@2: -    ac_cpp_err=$ac_cxx_preproc_warn_flag
michael@2: -    ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
michael@2: -  else
michael@2: -    ac_cpp_err=
michael@2: -  fi
michael@2: -else
michael@2: -  ac_cpp_err=yes
michael@2: -fi
michael@2: -if test -z "$ac_cpp_err"; then
michael@2: +  (exit $ac_status); } >/dev/null && {
michael@2: +	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
michael@2: +	 test ! -s conftest.err
michael@2: +       }; then
michael@2:    ac_header_preproc=yes
michael@2:  else
michael@2:    echo "$as_me: failed program was:" >&5
michael@2: @@ -9176,27 +8347,10 @@
michael@2:    rm -f conftest.er1
michael@2:    cat conftest.err >&5
michael@2:    echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); } &&
michael@2: -	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
michael@2: -  { (case "(($ac_try" in
michael@2: -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
michael@2: -  *) ac_try_echo=$ac_try;;
michael@2: -esac
michael@2: -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
michael@2: -  (eval "$ac_try") 2>&5
michael@2: -  ac_status=$?
michael@2: -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); }; } &&
michael@2: -	 { ac_try='test -s conftest.$ac_objext'
michael@2: -  { (case "(($ac_try" in
michael@2: -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
michael@2: -  *) ac_try_echo=$ac_try;;
michael@2: -esac
michael@2: -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
michael@2: -  (eval "$ac_try") 2>&5
michael@2: -  ac_status=$?
michael@2: -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); }; }; then
michael@2: +  (exit $ac_status); } && {
michael@2: +	 test -z "$ac_cxx_werror_flag" ||
michael@2: +	 test ! -s conftest.err
michael@2: +       } && test -s conftest.$ac_objext; then
michael@2:    ac_header_compiler=yes
michael@2:  else
michael@2:    echo "$as_me: failed program was:" >&5
michael@2: @@ -9232,17 +8386,10 @@
michael@2:    rm -f conftest.er1
michael@2:    cat conftest.err >&5
michael@2:    echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); } >/dev/null; then
michael@2: -  if test -s conftest.err; then
michael@2: -    ac_cpp_err=$ac_cxx_preproc_warn_flag
michael@2: -    ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
michael@2: -  else
michael@2: -    ac_cpp_err=
michael@2: -  fi
michael@2: -else
michael@2: -  ac_cpp_err=yes
michael@2: -fi
michael@2: -if test -z "$ac_cpp_err"; then
michael@2: +  (exit $ac_status); } >/dev/null && {
michael@2: +	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
michael@2: +	 test ! -s conftest.err
michael@2: +       }; then
michael@2:    ac_header_preproc=yes
michael@2:  else
michael@2:    echo "$as_me: failed program was:" >&5
michael@2: @@ -9345,27 +8492,11 @@
michael@2:    rm -f conftest.er1
michael@2:    cat conftest.err >&5
michael@2:    echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); } &&
michael@2: -	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
michael@2: -  { (case "(($ac_try" in
michael@2: -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
michael@2: -  *) ac_try_echo=$ac_try;;
michael@2: -esac
michael@2: -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
michael@2: -  (eval "$ac_try") 2>&5
michael@2: -  ac_status=$?
michael@2: -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); }; } &&
michael@2: -	 { ac_try='test -s conftest$ac_exeext'
michael@2: -  { (case "(($ac_try" in
michael@2: -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
michael@2: -  *) ac_try_echo=$ac_try;;
michael@2: -esac
michael@2: -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
michael@2: -  (eval "$ac_try") 2>&5
michael@2: -  ac_status=$?
michael@2: -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); }; }; then
michael@2: +  (exit $ac_status); } && {
michael@2: +	 test -z "$ac_cxx_werror_flag" ||
michael@2: +	 test ! -s conftest.err
michael@2: +       } && test -s conftest$ac_exeext &&
michael@2: +       $as_test_x conftest$ac_exeext; then
michael@2:    ac_cv_lib_poll_poll=yes
michael@2:  else
michael@2:    echo "$as_me: failed program was:" >&5
michael@2: @@ -9374,7 +8505,7 @@
michael@2:  	ac_cv_lib_poll_poll=no
michael@2:  fi
michael@2:  
michael@2: -rm -f core conftest.err conftest.$ac_objext \
michael@2: +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
michael@2:        conftest$ac_exeext conftest.$ac_ext
michael@2:  LIBS=$ac_check_lib_save_LIBS
michael@2:  fi
michael@2: @@ -9425,27 +8556,10 @@
michael@2:    rm -f conftest.er1
michael@2:    cat conftest.err >&5
michael@2:    echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); } &&
michael@2: -	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
michael@2: -  { (case "(($ac_try" in
michael@2: -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
michael@2: -  *) ac_try_echo=$ac_try;;
michael@2: -esac
michael@2: -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
michael@2: -  (eval "$ac_try") 2>&5
michael@2: -  ac_status=$?
michael@2: -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); }; } &&
michael@2: -	 { ac_try='test -s conftest.$ac_objext'
michael@2: -  { (case "(($ac_try" in
michael@2: -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
michael@2: -  *) ac_try_echo=$ac_try;;
michael@2: -esac
michael@2: -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
michael@2: -  (eval "$ac_try") 2>&5
michael@2: -  ac_status=$?
michael@2: -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); }; }; then
michael@2: +  (exit $ac_status); } && {
michael@2: +	 test -z "$ac_cxx_werror_flag" ||
michael@2: +	 test ! -s conftest.err
michael@2: +       } && test -s conftest.$ac_objext; then
michael@2:    ac_header_compiler=yes
michael@2:  else
michael@2:    echo "$as_me: failed program was:" >&5
michael@2: @@ -9481,17 +8595,10 @@
michael@2:    rm -f conftest.er1
michael@2:    cat conftest.err >&5
michael@2:    echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); } >/dev/null; then
michael@2: -  if test -s conftest.err; then
michael@2: -    ac_cpp_err=$ac_cxx_preproc_warn_flag
michael@2: -    ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
michael@2: -  else
michael@2: -    ac_cpp_err=
michael@2: -  fi
michael@2: -else
michael@2: -  ac_cpp_err=yes
michael@2: -fi
michael@2: -if test -z "$ac_cpp_err"; then
michael@2: +  (exit $ac_status); } >/dev/null && {
michael@2: +	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
michael@2: +	 test ! -s conftest.err
michael@2: +       }; then
michael@2:    ac_header_preproc=yes
michael@2:  else
michael@2:    echo "$as_me: failed program was:" >&5
michael@2: @@ -9586,27 +8693,10 @@
michael@2:    rm -f conftest.er1
michael@2:    cat conftest.err >&5
michael@2:    echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); } &&
michael@2: -	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
michael@2: -  { (case "(($ac_try" in
michael@2: -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
michael@2: -  *) ac_try_echo=$ac_try;;
michael@2: -esac
michael@2: -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
michael@2: -  (eval "$ac_try") 2>&5
michael@2: -  ac_status=$?
michael@2: -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); }; } &&
michael@2: -	 { ac_try='test -s conftest.$ac_objext'
michael@2: -  { (case "(($ac_try" in
michael@2: -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
michael@2: -  *) ac_try_echo=$ac_try;;
michael@2: -esac
michael@2: -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
michael@2: -  (eval "$ac_try") 2>&5
michael@2: -  ac_status=$?
michael@2: -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); }; }; then
michael@2: +  (exit $ac_status); } && {
michael@2: +	 test -z "$ac_cxx_werror_flag" ||
michael@2: +	 test ! -s conftest.err
michael@2: +       } && test -s conftest.$ac_objext; then
michael@2:    ac_header_compiler=yes
michael@2:  else
michael@2:    echo "$as_me: failed program was:" >&5
michael@2: @@ -9642,17 +8732,10 @@
michael@2:    rm -f conftest.er1
michael@2:    cat conftest.err >&5
michael@2:    echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); } >/dev/null; then
michael@2: -  if test -s conftest.err; then
michael@2: -    ac_cpp_err=$ac_cxx_preproc_warn_flag
michael@2: -    ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
michael@2: -  else
michael@2: -    ac_cpp_err=
michael@2: -  fi
michael@2: -else
michael@2: -  ac_cpp_err=yes
michael@2: -fi
michael@2: -if test -z "$ac_cpp_err"; then
michael@2: +  (exit $ac_status); } >/dev/null && {
michael@2: +	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
michael@2: +	 test ! -s conftest.err
michael@2: +       }; then
michael@2:    ac_header_preproc=yes
michael@2:  else
michael@2:    echo "$as_me: failed program was:" >&5
michael@2: @@ -9754,27 +8837,11 @@
michael@2:    rm -f conftest.er1
michael@2:    cat conftest.err >&5
michael@2:    echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); } &&
michael@2: -	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
michael@2: -  { (case "(($ac_try" in
michael@2: -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
michael@2: -  *) ac_try_echo=$ac_try;;
michael@2: -esac
michael@2: -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
michael@2: -  (eval "$ac_try") 2>&5
michael@2: -  ac_status=$?
michael@2: -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); }; } &&
michael@2: -	 { ac_try='test -s conftest$ac_exeext'
michael@2: -  { (case "(($ac_try" in
michael@2: -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
michael@2: -  *) ac_try_echo=$ac_try;;
michael@2: -esac
michael@2: -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
michael@2: -  (eval "$ac_try") 2>&5
michael@2: -  ac_status=$?
michael@2: -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); }; }; then
michael@2: +  (exit $ac_status); } && {
michael@2: +	 test -z "$ac_cxx_werror_flag" ||
michael@2: +	 test ! -s conftest.err
michael@2: +       } && test -s conftest$ac_exeext &&
michael@2: +       $as_test_x conftest$ac_exeext; then
michael@2:  
michael@2:        LIBRESOLV="-lresolv"
michael@2:        { echo "$as_me:$LINENO: result: yes" >&5
michael@2: @@ -9794,7 +8861,7 @@
michael@2:  
michael@2:  fi
michael@2:  
michael@2: -rm -f core conftest.err conftest.$ac_objext \
michael@2: +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
michael@2:        conftest$ac_exeext conftest.$ac_ext
michael@2:    LIBS=$kde_libs_safe
michael@2:  
michael@2: @@ -9861,27 +8928,10 @@
michael@2:    rm -f conftest.er1
michael@2:    cat conftest.err >&5
michael@2:    echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); } &&
michael@2: -	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
michael@2: -  { (case "(($ac_try" in
michael@2: -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
michael@2: -  *) ac_try_echo=$ac_try;;
michael@2: -esac
michael@2: -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
michael@2: -  (eval "$ac_try") 2>&5
michael@2: -  ac_status=$?
michael@2: -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); }; } &&
michael@2: -	 { ac_try='test -s conftest.$ac_objext'
michael@2: -  { (case "(($ac_try" in
michael@2: -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
michael@2: -  *) ac_try_echo=$ac_try;;
michael@2: -esac
michael@2: -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
michael@2: -  (eval "$ac_try") 2>&5
michael@2: -  ac_status=$?
michael@2: -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); }; }; then
michael@2: +  (exit $ac_status); } && {
michael@2: +	 test -z "$ac_cxx_werror_flag" ||
michael@2: +	 test ! -s conftest.err
michael@2: +       } && test -s conftest.$ac_objext; then
michael@2:    kde_cv_func_res_init=yes
michael@2:  else
michael@2:    echo "$as_me: failed program was:" >&5
michael@2: @@ -9978,27 +9028,11 @@
michael@2:    rm -f conftest.er1
michael@2:    cat conftest.err >&5
michael@2:    echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); } &&
michael@2: -	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
michael@2: -  { (case "(($ac_try" in
michael@2: -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
michael@2: -  *) ac_try_echo=$ac_try;;
michael@2: -esac
michael@2: -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
michael@2: -  (eval "$ac_try") 2>&5
michael@2: -  ac_status=$?
michael@2: -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); }; } &&
michael@2: -	 { ac_try='test -s conftest$ac_exeext'
michael@2: -  { (case "(($ac_try" in
michael@2: -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
michael@2: -  *) ac_try_echo=$ac_try;;
michael@2: -esac
michael@2: -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
michael@2: -  (eval "$ac_try") 2>&5
michael@2: -  ac_status=$?
michael@2: -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); }; }; then
michael@2: +  (exit $ac_status); } && {
michael@2: +	 test -z "$ac_cxx_werror_flag" ||
michael@2: +	 test ! -s conftest.err
michael@2: +       } && test -s conftest$ac_exeext &&
michael@2: +       $as_test_x conftest$ac_exeext; then
michael@2:     kde_cv_func_res_init=yes
michael@2:    kde_cv_proto_res_init=yes
michael@2:  else
michael@2: @@ -10009,7 +9043,7 @@
michael@2:  
michael@2:  fi
michael@2:  
michael@2: -rm -f core conftest.err conftest.$ac_objext \
michael@2: +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
michael@2:        conftest$ac_exeext conftest.$ac_ext
michael@2:  LIBS=$kde_safe_libs
michael@2:  ac_ext=cpp
michael@2: @@ -10092,27 +9126,11 @@
michael@2:    rm -f conftest.er1
michael@2:    cat conftest.err >&5
michael@2:    echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); } &&
michael@2: -	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
michael@2: -  { (case "(($ac_try" in
michael@2: -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
michael@2: -  *) ac_try_echo=$ac_try;;
michael@2: -esac
michael@2: -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
michael@2: -  (eval "$ac_try") 2>&5
michael@2: -  ac_status=$?
michael@2: -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); }; } &&
michael@2: -	 { ac_try='test -s conftest$ac_exeext'
michael@2: -  { (case "(($ac_try" in
michael@2: -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
michael@2: -  *) ac_try_echo=$ac_try;;
michael@2: -esac
michael@2: -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
michael@2: -  (eval "$ac_try") 2>&5
michael@2: -  ac_status=$?
michael@2: -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); }; }; then
michael@2: +  (exit $ac_status); } && {
michael@2: +	 test -z "$ac_cxx_werror_flag" ||
michael@2: +	 test ! -s conftest.err
michael@2: +       } && test -s conftest$ac_exeext &&
michael@2: +       $as_test_x conftest$ac_exeext; then
michael@2:    ac_cv_lib_ucb_killpg=yes
michael@2:  else
michael@2:    echo "$as_me: failed program was:" >&5
michael@2: @@ -10121,7 +9139,7 @@
michael@2:  	ac_cv_lib_ucb_killpg=no
michael@2:  fi
michael@2:  
michael@2: -rm -f core conftest.err conftest.$ac_objext \
michael@2: +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
michael@2:        conftest$ac_exeext conftest.$ac_ext
michael@2:  LIBS=$ac_check_lib_save_LIBS
michael@2:  fi
michael@2: @@ -10180,27 +9198,11 @@
michael@2:    rm -f conftest.er1
michael@2:    cat conftest.err >&5
michael@2:    echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); } &&
michael@2: -	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
michael@2: -  { (case "(($ac_try" in
michael@2: -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
michael@2: -  *) ac_try_echo=$ac_try;;
michael@2: -esac
michael@2: -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
michael@2: -  (eval "$ac_try") 2>&5
michael@2: -  ac_status=$?
michael@2: -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); }; } &&
michael@2: -	 { ac_try='test -s conftest$ac_exeext'
michael@2: -  { (case "(($ac_try" in
michael@2: -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
michael@2: -  *) ac_try_echo=$ac_try;;
michael@2: -esac
michael@2: -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
michael@2: -  (eval "$ac_try") 2>&5
michael@2: -  ac_status=$?
michael@2: -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); }; }; then
michael@2: +  (exit $ac_status); } && {
michael@2: +	 test -z "$ac_cxx_werror_flag" ||
michael@2: +	 test ! -s conftest.err
michael@2: +       } && test -s conftest$ac_exeext &&
michael@2: +       $as_test_x conftest$ac_exeext; then
michael@2:    ac_cv_lib_bsd_gethostbyname=yes
michael@2:  else
michael@2:    echo "$as_me: failed program was:" >&5
michael@2: @@ -10209,7 +9211,7 @@
michael@2:  	ac_cv_lib_bsd_gethostbyname=no
michael@2:  fi
michael@2:  
michael@2: -rm -f core conftest.err conftest.$ac_objext \
michael@2: +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
michael@2:        conftest$ac_exeext conftest.$ac_ext
michael@2:  LIBS=$ac_check_lib_save_LIBS
michael@2:  fi
michael@2: @@ -10258,27 +9260,10 @@
michael@2:    rm -f conftest.er1
michael@2:    cat conftest.err >&5
michael@2:    echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); } &&
michael@2: -	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
michael@2: -  { (case "(($ac_try" in
michael@2: -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
michael@2: -  *) ac_try_echo=$ac_try;;
michael@2: -esac
michael@2: -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
michael@2: -  (eval "$ac_try") 2>&5
michael@2: -  ac_status=$?
michael@2: -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); }; } &&
michael@2: -	 { ac_try='test -s conftest.$ac_objext'
michael@2: -  { (case "(($ac_try" in
michael@2: -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
michael@2: -  *) ac_try_echo=$ac_try;;
michael@2: -esac
michael@2: -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
michael@2: -  (eval "$ac_try") 2>&5
michael@2: -  ac_status=$?
michael@2: -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); }; }; then
michael@2: +  (exit $ac_status); } && {
michael@2: +	 test -z "$ac_cxx_werror_flag" ||
michael@2: +	 test ! -s conftest.err
michael@2: +       } && test -s conftest.$ac_objext; then
michael@2:    ac_cv_type_int=yes
michael@2:  else
michael@2:    echo "$as_me: failed program was:" >&5
michael@2: @@ -10292,16 +9277,15 @@
michael@2:  { echo "$as_me:$LINENO: result: $ac_cv_type_int" >&5
michael@2:  echo "${ECHO_T}$ac_cv_type_int" >&6; }
michael@2:  
michael@2: +# The cast to long int works around a bug in the HP C Compiler
michael@2: +# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
michael@2: +# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
michael@2: +# This bug is HP SR number 8606223364.
michael@2:  { echo "$as_me:$LINENO: checking size of int" >&5
michael@2:  echo $ECHO_N "checking size of int... $ECHO_C" >&6; }
michael@2:  if test "${ac_cv_sizeof_int+set}" = set; then
michael@2:    echo $ECHO_N "(cached) $ECHO_C" >&6
michael@2:  else
michael@2: -  if test "$ac_cv_type_int" = yes; then
michael@2: -  # The cast to long int works around a bug in the HP C Compiler
michael@2: -  # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
michael@2: -  # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
michael@2: -  # This bug is HP SR number 8606223364.
michael@2:    if test "$cross_compiling" = yes; then
michael@2:    # Depending upon the size, compute the lo and hi bounds.
michael@2:  cat >conftest.$ac_ext <<_ACEOF
michael@2: @@ -10311,7 +9295,7 @@
michael@2:  cat >>conftest.$ac_ext <<_ACEOF
michael@2:  /* end confdefs.h.  */
michael@2:  $ac_includes_default
michael@2: -		   typedef int ac__type_sizeof_;
michael@2: +   typedef int ac__type_sizeof_;
michael@2:  int
michael@2:  main ()
michael@2:  {
michael@2: @@ -10335,27 +9319,10 @@
michael@2:    rm -f conftest.er1
michael@2:    cat conftest.err >&5
michael@2:    echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); } &&
michael@2: -	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
michael@2: -  { (case "(($ac_try" in
michael@2: -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
michael@2: -  *) ac_try_echo=$ac_try;;
michael@2: -esac
michael@2: -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
michael@2: -  (eval "$ac_try") 2>&5
michael@2: -  ac_status=$?
michael@2: -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); }; } &&
michael@2: -	 { ac_try='test -s conftest.$ac_objext'
michael@2: -  { (case "(($ac_try" in
michael@2: -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
michael@2: -  *) ac_try_echo=$ac_try;;
michael@2: -esac
michael@2: -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
michael@2: -  (eval "$ac_try") 2>&5
michael@2: -  ac_status=$?
michael@2: -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); }; }; then
michael@2: +  (exit $ac_status); } && {
michael@2: +	 test -z "$ac_cxx_werror_flag" ||
michael@2: +	 test ! -s conftest.err
michael@2: +       } && test -s conftest.$ac_objext; then
michael@2:    ac_lo=0 ac_mid=0
michael@2:    while :; do
michael@2:      cat >conftest.$ac_ext <<_ACEOF
michael@2: @@ -10365,7 +9332,7 @@
michael@2:  cat >>conftest.$ac_ext <<_ACEOF
michael@2:  /* end confdefs.h.  */
michael@2:  $ac_includes_default
michael@2: -		   typedef int ac__type_sizeof_;
michael@2: +   typedef int ac__type_sizeof_;
michael@2:  int
michael@2:  main ()
michael@2:  {
michael@2: @@ -10389,27 +9356,10 @@
michael@2:    rm -f conftest.er1
michael@2:    cat conftest.err >&5
michael@2:    echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); } &&
michael@2: -	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
michael@2: -  { (case "(($ac_try" in
michael@2: -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
michael@2: -  *) ac_try_echo=$ac_try;;
michael@2: -esac
michael@2: -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
michael@2: -  (eval "$ac_try") 2>&5
michael@2: -  ac_status=$?
michael@2: -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); }; } &&
michael@2: -	 { ac_try='test -s conftest.$ac_objext'
michael@2: -  { (case "(($ac_try" in
michael@2: -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
michael@2: -  *) ac_try_echo=$ac_try;;
michael@2: -esac
michael@2: -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
michael@2: -  (eval "$ac_try") 2>&5
michael@2: -  ac_status=$?
michael@2: -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); }; }; then
michael@2: +  (exit $ac_status); } && {
michael@2: +	 test -z "$ac_cxx_werror_flag" ||
michael@2: +	 test ! -s conftest.err
michael@2: +       } && test -s conftest.$ac_objext; then
michael@2:    ac_hi=$ac_mid; break
michael@2:  else
michael@2:    echo "$as_me: failed program was:" >&5
michael@2: @@ -10436,7 +9386,7 @@
michael@2:  cat >>conftest.$ac_ext <<_ACEOF
michael@2:  /* end confdefs.h.  */
michael@2:  $ac_includes_default
michael@2: -		   typedef int ac__type_sizeof_;
michael@2: +   typedef int ac__type_sizeof_;
michael@2:  int
michael@2:  main ()
michael@2:  {
michael@2: @@ -10460,27 +9410,10 @@
michael@2:    rm -f conftest.er1
michael@2:    cat conftest.err >&5
michael@2:    echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); } &&
michael@2: -	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
michael@2: -  { (case "(($ac_try" in
michael@2: -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
michael@2: -  *) ac_try_echo=$ac_try;;
michael@2: -esac
michael@2: -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
michael@2: -  (eval "$ac_try") 2>&5
michael@2: -  ac_status=$?
michael@2: -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); }; } &&
michael@2: -	 { ac_try='test -s conftest.$ac_objext'
michael@2: -  { (case "(($ac_try" in
michael@2: -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
michael@2: -  *) ac_try_echo=$ac_try;;
michael@2: -esac
michael@2: -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
michael@2: -  (eval "$ac_try") 2>&5
michael@2: -  ac_status=$?
michael@2: -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); }; }; then
michael@2: +  (exit $ac_status); } && {
michael@2: +	 test -z "$ac_cxx_werror_flag" ||
michael@2: +	 test ! -s conftest.err
michael@2: +       } && test -s conftest.$ac_objext; then
michael@2:    ac_hi=-1 ac_mid=-1
michael@2:    while :; do
michael@2:      cat >conftest.$ac_ext <<_ACEOF
michael@2: @@ -10490,7 +9423,7 @@
michael@2:  cat >>conftest.$ac_ext <<_ACEOF
michael@2:  /* end confdefs.h.  */
michael@2:  $ac_includes_default
michael@2: -		   typedef int ac__type_sizeof_;
michael@2: +   typedef int ac__type_sizeof_;
michael@2:  int
michael@2:  main ()
michael@2:  {
michael@2: @@ -10514,27 +9447,10 @@
michael@2:    rm -f conftest.er1
michael@2:    cat conftest.err >&5
michael@2:    echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); } &&
michael@2: -	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
michael@2: -  { (case "(($ac_try" in
michael@2: -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
michael@2: -  *) ac_try_echo=$ac_try;;
michael@2: -esac
michael@2: -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
michael@2: -  (eval "$ac_try") 2>&5
michael@2: -  ac_status=$?
michael@2: -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); }; } &&
michael@2: -	 { ac_try='test -s conftest.$ac_objext'
michael@2: -  { (case "(($ac_try" in
michael@2: -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
michael@2: -  *) ac_try_echo=$ac_try;;
michael@2: -esac
michael@2: -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
michael@2: -  (eval "$ac_try") 2>&5
michael@2: -  ac_status=$?
michael@2: -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); }; }; then
michael@2: +  (exit $ac_status); } && {
michael@2: +	 test -z "$ac_cxx_werror_flag" ||
michael@2: +	 test ! -s conftest.err
michael@2: +       } && test -s conftest.$ac_objext; then
michael@2:    ac_lo=$ac_mid; break
michael@2:  else
michael@2:    echo "$as_me: failed program was:" >&5
michael@2: @@ -10571,7 +9487,7 @@
michael@2:  cat >>conftest.$ac_ext <<_ACEOF
michael@2:  /* end confdefs.h.  */
michael@2:  $ac_includes_default
michael@2: -		   typedef int ac__type_sizeof_;
michael@2: +   typedef int ac__type_sizeof_;
michael@2:  int
michael@2:  main ()
michael@2:  {
michael@2: @@ -10595,27 +9511,10 @@
michael@2:    rm -f conftest.er1
michael@2:    cat conftest.err >&5
michael@2:    echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); } &&
michael@2: -	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
michael@2: -  { (case "(($ac_try" in
michael@2: -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
michael@2: -  *) ac_try_echo=$ac_try;;
michael@2: -esac
michael@2: -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
michael@2: -  (eval "$ac_try") 2>&5
michael@2: -  ac_status=$?
michael@2: -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); }; } &&
michael@2: -	 { ac_try='test -s conftest.$ac_objext'
michael@2: -  { (case "(($ac_try" in
michael@2: -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
michael@2: -  *) ac_try_echo=$ac_try;;
michael@2: -esac
michael@2: -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
michael@2: -  (eval "$ac_try") 2>&5
michael@2: -  ac_status=$?
michael@2: -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); }; }; then
michael@2: +  (exit $ac_status); } && {
michael@2: +	 test -z "$ac_cxx_werror_flag" ||
michael@2: +	 test ! -s conftest.err
michael@2: +       } && test -s conftest.$ac_objext; then
michael@2:    ac_hi=$ac_mid
michael@2:  else
michael@2:    echo "$as_me: failed program was:" >&5
michael@2: @@ -10628,11 +9527,15 @@
michael@2:  done
michael@2:  case $ac_lo in
michael@2:  ?*) ac_cv_sizeof_int=$ac_lo;;
michael@2: -'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (int)
michael@2: +'') if test "$ac_cv_type_int" = yes; then
michael@2: +     { { echo "$as_me:$LINENO: error: cannot compute sizeof (int)
michael@2:  See \`config.log' for more details." >&5
michael@2:  echo "$as_me: error: cannot compute sizeof (int)
michael@2:  See \`config.log' for more details." >&2;}
michael@2: -   { (exit 77); exit 77; }; } ;;
michael@2: +   { (exit 77); exit 77; }; }
michael@2: +   else
michael@2: +     ac_cv_sizeof_int=0
michael@2: +   fi ;;
michael@2:  esac
michael@2:  else
michael@2:    cat >conftest.$ac_ext <<_ACEOF
michael@2: @@ -10642,7 +9545,7 @@
michael@2:  cat >>conftest.$ac_ext <<_ACEOF
michael@2:  /* end confdefs.h.  */
michael@2:  $ac_includes_default
michael@2: -		   typedef int ac__type_sizeof_;
michael@2: +   typedef int ac__type_sizeof_;
michael@2:  static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
michael@2:  static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
michael@2:  #include <stdio.h>
michael@2: @@ -10701,21 +9604,25 @@
michael@2:  sed 's/^/| /' conftest.$ac_ext >&5
michael@2:  
michael@2:  ( exit $ac_status )
michael@2: -{ { echo "$as_me:$LINENO: error: cannot compute sizeof (int)
michael@2: +if test "$ac_cv_type_int" = yes; then
michael@2: +     { { echo "$as_me:$LINENO: error: cannot compute sizeof (int)
michael@2:  See \`config.log' for more details." >&5
michael@2:  echo "$as_me: error: cannot compute sizeof (int)
michael@2:  See \`config.log' for more details." >&2;}
michael@2:     { (exit 77); exit 77; }; }
michael@2: +   else
michael@2: +     ac_cv_sizeof_int=0
michael@2: +   fi
michael@2:  fi
michael@2:  rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
michael@2:  fi
michael@2:  rm -f conftest.val
michael@2: -else
michael@2: -  ac_cv_sizeof_int=0
michael@2: -fi
michael@2:  fi
michael@2:  { echo "$as_me:$LINENO: result: $ac_cv_sizeof_int" >&5
michael@2:  echo "${ECHO_T}$ac_cv_sizeof_int" >&6; }
michael@2: +
michael@2: +
michael@2: +
michael@2:  cat >>confdefs.h <<_ACEOF
michael@2:  #define SIZEOF_INT $ac_cv_sizeof_int
michael@2:  _ACEOF
michael@2: @@ -10757,27 +9664,10 @@
michael@2:    rm -f conftest.er1
michael@2:    cat conftest.err >&5
michael@2:    echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); } &&
michael@2: -	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
michael@2: -  { (case "(($ac_try" in
michael@2: -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
michael@2: -  *) ac_try_echo=$ac_try;;
michael@2: -esac
michael@2: -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
michael@2: -  (eval "$ac_try") 2>&5
michael@2: -  ac_status=$?
michael@2: -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); }; } &&
michael@2: -	 { ac_try='test -s conftest.$ac_objext'
michael@2: -  { (case "(($ac_try" in
michael@2: -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
michael@2: -  *) ac_try_echo=$ac_try;;
michael@2: -esac
michael@2: -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
michael@2: -  (eval "$ac_try") 2>&5
michael@2: -  ac_status=$?
michael@2: -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); }; }; then
michael@2: +  (exit $ac_status); } && {
michael@2: +	 test -z "$ac_cxx_werror_flag" ||
michael@2: +	 test ! -s conftest.err
michael@2: +       } && test -s conftest.$ac_objext; then
michael@2:    ac_cv_type_short=yes
michael@2:  else
michael@2:    echo "$as_me: failed program was:" >&5
michael@2: @@ -10791,16 +9681,15 @@
michael@2:  { echo "$as_me:$LINENO: result: $ac_cv_type_short" >&5
michael@2:  echo "${ECHO_T}$ac_cv_type_short" >&6; }
michael@2:  
michael@2: +# The cast to long int works around a bug in the HP C Compiler
michael@2: +# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
michael@2: +# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
michael@2: +# This bug is HP SR number 8606223364.
michael@2:  { echo "$as_me:$LINENO: checking size of short" >&5
michael@2:  echo $ECHO_N "checking size of short... $ECHO_C" >&6; }
michael@2:  if test "${ac_cv_sizeof_short+set}" = set; then
michael@2:    echo $ECHO_N "(cached) $ECHO_C" >&6
michael@2:  else
michael@2: -  if test "$ac_cv_type_short" = yes; then
michael@2: -  # The cast to long int works around a bug in the HP C Compiler
michael@2: -  # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
michael@2: -  # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
michael@2: -  # This bug is HP SR number 8606223364.
michael@2:    if test "$cross_compiling" = yes; then
michael@2:    # Depending upon the size, compute the lo and hi bounds.
michael@2:  cat >conftest.$ac_ext <<_ACEOF
michael@2: @@ -10810,7 +9699,7 @@
michael@2:  cat >>conftest.$ac_ext <<_ACEOF
michael@2:  /* end confdefs.h.  */
michael@2:  $ac_includes_default
michael@2: -		   typedef short ac__type_sizeof_;
michael@2: +   typedef short ac__type_sizeof_;
michael@2:  int
michael@2:  main ()
michael@2:  {
michael@2: @@ -10834,27 +9723,10 @@
michael@2:    rm -f conftest.er1
michael@2:    cat conftest.err >&5
michael@2:    echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); } &&
michael@2: -	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
michael@2: -  { (case "(($ac_try" in
michael@2: -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
michael@2: -  *) ac_try_echo=$ac_try;;
michael@2: -esac
michael@2: -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
michael@2: -  (eval "$ac_try") 2>&5
michael@2: -  ac_status=$?
michael@2: -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); }; } &&
michael@2: -	 { ac_try='test -s conftest.$ac_objext'
michael@2: -  { (case "(($ac_try" in
michael@2: -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
michael@2: -  *) ac_try_echo=$ac_try;;
michael@2: -esac
michael@2: -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
michael@2: -  (eval "$ac_try") 2>&5
michael@2: -  ac_status=$?
michael@2: -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); }; }; then
michael@2: +  (exit $ac_status); } && {
michael@2: +	 test -z "$ac_cxx_werror_flag" ||
michael@2: +	 test ! -s conftest.err
michael@2: +       } && test -s conftest.$ac_objext; then
michael@2:    ac_lo=0 ac_mid=0
michael@2:    while :; do
michael@2:      cat >conftest.$ac_ext <<_ACEOF
michael@2: @@ -10864,7 +9736,7 @@
michael@2:  cat >>conftest.$ac_ext <<_ACEOF
michael@2:  /* end confdefs.h.  */
michael@2:  $ac_includes_default
michael@2: -		   typedef short ac__type_sizeof_;
michael@2: +   typedef short ac__type_sizeof_;
michael@2:  int
michael@2:  main ()
michael@2:  {
michael@2: @@ -10888,27 +9760,10 @@
michael@2:    rm -f conftest.er1
michael@2:    cat conftest.err >&5
michael@2:    echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); } &&
michael@2: -	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
michael@2: -  { (case "(($ac_try" in
michael@2: -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
michael@2: -  *) ac_try_echo=$ac_try;;
michael@2: -esac
michael@2: -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
michael@2: -  (eval "$ac_try") 2>&5
michael@2: -  ac_status=$?
michael@2: -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); }; } &&
michael@2: -	 { ac_try='test -s conftest.$ac_objext'
michael@2: -  { (case "(($ac_try" in
michael@2: -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
michael@2: -  *) ac_try_echo=$ac_try;;
michael@2: -esac
michael@2: -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
michael@2: -  (eval "$ac_try") 2>&5
michael@2: -  ac_status=$?
michael@2: -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); }; }; then
michael@2: +  (exit $ac_status); } && {
michael@2: +	 test -z "$ac_cxx_werror_flag" ||
michael@2: +	 test ! -s conftest.err
michael@2: +       } && test -s conftest.$ac_objext; then
michael@2:    ac_hi=$ac_mid; break
michael@2:  else
michael@2:    echo "$as_me: failed program was:" >&5
michael@2: @@ -10935,7 +9790,7 @@
michael@2:  cat >>conftest.$ac_ext <<_ACEOF
michael@2:  /* end confdefs.h.  */
michael@2:  $ac_includes_default
michael@2: -		   typedef short ac__type_sizeof_;
michael@2: +   typedef short ac__type_sizeof_;
michael@2:  int
michael@2:  main ()
michael@2:  {
michael@2: @@ -10959,27 +9814,10 @@
michael@2:    rm -f conftest.er1
michael@2:    cat conftest.err >&5
michael@2:    echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); } &&
michael@2: -	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
michael@2: -  { (case "(($ac_try" in
michael@2: -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
michael@2: -  *) ac_try_echo=$ac_try;;
michael@2: -esac
michael@2: -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
michael@2: -  (eval "$ac_try") 2>&5
michael@2: -  ac_status=$?
michael@2: -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); }; } &&
michael@2: -	 { ac_try='test -s conftest.$ac_objext'
michael@2: -  { (case "(($ac_try" in
michael@2: -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
michael@2: -  *) ac_try_echo=$ac_try;;
michael@2: -esac
michael@2: -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
michael@2: -  (eval "$ac_try") 2>&5
michael@2: -  ac_status=$?
michael@2: -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); }; }; then
michael@2: +  (exit $ac_status); } && {
michael@2: +	 test -z "$ac_cxx_werror_flag" ||
michael@2: +	 test ! -s conftest.err
michael@2: +       } && test -s conftest.$ac_objext; then
michael@2:    ac_hi=-1 ac_mid=-1
michael@2:    while :; do
michael@2:      cat >conftest.$ac_ext <<_ACEOF
michael@2: @@ -10989,7 +9827,7 @@
michael@2:  cat >>conftest.$ac_ext <<_ACEOF
michael@2:  /* end confdefs.h.  */
michael@2:  $ac_includes_default
michael@2: -		   typedef short ac__type_sizeof_;
michael@2: +   typedef short ac__type_sizeof_;
michael@2:  int
michael@2:  main ()
michael@2:  {
michael@2: @@ -11013,27 +9851,10 @@
michael@2:    rm -f conftest.er1
michael@2:    cat conftest.err >&5
michael@2:    echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); } &&
michael@2: -	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
michael@2: -  { (case "(($ac_try" in
michael@2: -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
michael@2: -  *) ac_try_echo=$ac_try;;
michael@2: -esac
michael@2: -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
michael@2: -  (eval "$ac_try") 2>&5
michael@2: -  ac_status=$?
michael@2: -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); }; } &&
michael@2: -	 { ac_try='test -s conftest.$ac_objext'
michael@2: -  { (case "(($ac_try" in
michael@2: -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
michael@2: -  *) ac_try_echo=$ac_try;;
michael@2: -esac
michael@2: -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
michael@2: -  (eval "$ac_try") 2>&5
michael@2: -  ac_status=$?
michael@2: -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); }; }; then
michael@2: +  (exit $ac_status); } && {
michael@2: +	 test -z "$ac_cxx_werror_flag" ||
michael@2: +	 test ! -s conftest.err
michael@2: +       } && test -s conftest.$ac_objext; then
michael@2:    ac_lo=$ac_mid; break
michael@2:  else
michael@2:    echo "$as_me: failed program was:" >&5
michael@2: @@ -11070,7 +9891,7 @@
michael@2:  cat >>conftest.$ac_ext <<_ACEOF
michael@2:  /* end confdefs.h.  */
michael@2:  $ac_includes_default
michael@2: -		   typedef short ac__type_sizeof_;
michael@2: +   typedef short ac__type_sizeof_;
michael@2:  int
michael@2:  main ()
michael@2:  {
michael@2: @@ -11094,27 +9915,10 @@
michael@2:    rm -f conftest.er1
michael@2:    cat conftest.err >&5
michael@2:    echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); } &&
michael@2: -	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
michael@2: -  { (case "(($ac_try" in
michael@2: -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
michael@2: -  *) ac_try_echo=$ac_try;;
michael@2: -esac
michael@2: -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
michael@2: -  (eval "$ac_try") 2>&5
michael@2: -  ac_status=$?
michael@2: -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); }; } &&
michael@2: -	 { ac_try='test -s conftest.$ac_objext'
michael@2: -  { (case "(($ac_try" in
michael@2: -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
michael@2: -  *) ac_try_echo=$ac_try;;
michael@2: -esac
michael@2: -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
michael@2: -  (eval "$ac_try") 2>&5
michael@2: -  ac_status=$?
michael@2: -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); }; }; then
michael@2: +  (exit $ac_status); } && {
michael@2: +	 test -z "$ac_cxx_werror_flag" ||
michael@2: +	 test ! -s conftest.err
michael@2: +       } && test -s conftest.$ac_objext; then
michael@2:    ac_hi=$ac_mid
michael@2:  else
michael@2:    echo "$as_me: failed program was:" >&5
michael@2: @@ -11127,11 +9931,15 @@
michael@2:  done
michael@2:  case $ac_lo in
michael@2:  ?*) ac_cv_sizeof_short=$ac_lo;;
michael@2: -'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (short)
michael@2: +'') if test "$ac_cv_type_short" = yes; then
michael@2: +     { { echo "$as_me:$LINENO: error: cannot compute sizeof (short)
michael@2:  See \`config.log' for more details." >&5
michael@2:  echo "$as_me: error: cannot compute sizeof (short)
michael@2:  See \`config.log' for more details." >&2;}
michael@2: -   { (exit 77); exit 77; }; } ;;
michael@2: +   { (exit 77); exit 77; }; }
michael@2: +   else
michael@2: +     ac_cv_sizeof_short=0
michael@2: +   fi ;;
michael@2:  esac
michael@2:  else
michael@2:    cat >conftest.$ac_ext <<_ACEOF
michael@2: @@ -11141,7 +9949,7 @@
michael@2:  cat >>conftest.$ac_ext <<_ACEOF
michael@2:  /* end confdefs.h.  */
michael@2:  $ac_includes_default
michael@2: -		   typedef short ac__type_sizeof_;
michael@2: +   typedef short ac__type_sizeof_;
michael@2:  static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
michael@2:  static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
michael@2:  #include <stdio.h>
michael@2: @@ -11200,21 +10008,25 @@
michael@2:  sed 's/^/| /' conftest.$ac_ext >&5
michael@2:  
michael@2:  ( exit $ac_status )
michael@2: -{ { echo "$as_me:$LINENO: error: cannot compute sizeof (short)
michael@2: +if test "$ac_cv_type_short" = yes; then
michael@2: +     { { echo "$as_me:$LINENO: error: cannot compute sizeof (short)
michael@2:  See \`config.log' for more details." >&5
michael@2:  echo "$as_me: error: cannot compute sizeof (short)
michael@2:  See \`config.log' for more details." >&2;}
michael@2:     { (exit 77); exit 77; }; }
michael@2: +   else
michael@2: +     ac_cv_sizeof_short=0
michael@2: +   fi
michael@2:  fi
michael@2:  rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
michael@2:  fi
michael@2:  rm -f conftest.val
michael@2: -else
michael@2: -  ac_cv_sizeof_short=0
michael@2: -fi
michael@2:  fi
michael@2:  { echo "$as_me:$LINENO: result: $ac_cv_sizeof_short" >&5
michael@2:  echo "${ECHO_T}$ac_cv_sizeof_short" >&6; }
michael@2: +
michael@2: +
michael@2: +
michael@2:  cat >>confdefs.h <<_ACEOF
michael@2:  #define SIZEOF_SHORT $ac_cv_sizeof_short
michael@2:  _ACEOF
michael@2: @@ -11256,27 +10068,10 @@
michael@2:    rm -f conftest.er1
michael@2:    cat conftest.err >&5
michael@2:    echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); } &&
michael@2: -	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
michael@2: -  { (case "(($ac_try" in
michael@2: -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
michael@2: -  *) ac_try_echo=$ac_try;;
michael@2: -esac
michael@2: -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
michael@2: -  (eval "$ac_try") 2>&5
michael@2: -  ac_status=$?
michael@2: -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); }; } &&
michael@2: -	 { ac_try='test -s conftest.$ac_objext'
michael@2: -  { (case "(($ac_try" in
michael@2: -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
michael@2: -  *) ac_try_echo=$ac_try;;
michael@2: -esac
michael@2: -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
michael@2: -  (eval "$ac_try") 2>&5
michael@2: -  ac_status=$?
michael@2: -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); }; }; then
michael@2: +  (exit $ac_status); } && {
michael@2: +	 test -z "$ac_cxx_werror_flag" ||
michael@2: +	 test ! -s conftest.err
michael@2: +       } && test -s conftest.$ac_objext; then
michael@2:    ac_cv_type_long=yes
michael@2:  else
michael@2:    echo "$as_me: failed program was:" >&5
michael@2: @@ -11290,16 +10085,15 @@
michael@2:  { echo "$as_me:$LINENO: result: $ac_cv_type_long" >&5
michael@2:  echo "${ECHO_T}$ac_cv_type_long" >&6; }
michael@2:  
michael@2: +# The cast to long int works around a bug in the HP C Compiler
michael@2: +# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
michael@2: +# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
michael@2: +# This bug is HP SR number 8606223364.
michael@2:  { echo "$as_me:$LINENO: checking size of long" >&5
michael@2:  echo $ECHO_N "checking size of long... $ECHO_C" >&6; }
michael@2:  if test "${ac_cv_sizeof_long+set}" = set; then
michael@2:    echo $ECHO_N "(cached) $ECHO_C" >&6
michael@2:  else
michael@2: -  if test "$ac_cv_type_long" = yes; then
michael@2: -  # The cast to long int works around a bug in the HP C Compiler
michael@2: -  # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
michael@2: -  # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
michael@2: -  # This bug is HP SR number 8606223364.
michael@2:    if test "$cross_compiling" = yes; then
michael@2:    # Depending upon the size, compute the lo and hi bounds.
michael@2:  cat >conftest.$ac_ext <<_ACEOF
michael@2: @@ -11309,7 +10103,7 @@
michael@2:  cat >>conftest.$ac_ext <<_ACEOF
michael@2:  /* end confdefs.h.  */
michael@2:  $ac_includes_default
michael@2: -		   typedef long ac__type_sizeof_;
michael@2: +   typedef long ac__type_sizeof_;
michael@2:  int
michael@2:  main ()
michael@2:  {
michael@2: @@ -11333,27 +10127,10 @@
michael@2:    rm -f conftest.er1
michael@2:    cat conftest.err >&5
michael@2:    echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); } &&
michael@2: -	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
michael@2: -  { (case "(($ac_try" in
michael@2: -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
michael@2: -  *) ac_try_echo=$ac_try;;
michael@2: -esac
michael@2: -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
michael@2: -  (eval "$ac_try") 2>&5
michael@2: -  ac_status=$?
michael@2: -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); }; } &&
michael@2: -	 { ac_try='test -s conftest.$ac_objext'
michael@2: -  { (case "(($ac_try" in
michael@2: -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
michael@2: -  *) ac_try_echo=$ac_try;;
michael@2: -esac
michael@2: -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
michael@2: -  (eval "$ac_try") 2>&5
michael@2: -  ac_status=$?
michael@2: -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); }; }; then
michael@2: +  (exit $ac_status); } && {
michael@2: +	 test -z "$ac_cxx_werror_flag" ||
michael@2: +	 test ! -s conftest.err
michael@2: +       } && test -s conftest.$ac_objext; then
michael@2:    ac_lo=0 ac_mid=0
michael@2:    while :; do
michael@2:      cat >conftest.$ac_ext <<_ACEOF
michael@2: @@ -11363,7 +10140,7 @@
michael@2:  cat >>conftest.$ac_ext <<_ACEOF
michael@2:  /* end confdefs.h.  */
michael@2:  $ac_includes_default
michael@2: -		   typedef long ac__type_sizeof_;
michael@2: +   typedef long ac__type_sizeof_;
michael@2:  int
michael@2:  main ()
michael@2:  {
michael@2: @@ -11387,27 +10164,10 @@
michael@2:    rm -f conftest.er1
michael@2:    cat conftest.err >&5
michael@2:    echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); } &&
michael@2: -	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
michael@2: -  { (case "(($ac_try" in
michael@2: -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
michael@2: -  *) ac_try_echo=$ac_try;;
michael@2: -esac
michael@2: -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
michael@2: -  (eval "$ac_try") 2>&5
michael@2: -  ac_status=$?
michael@2: -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); }; } &&
michael@2: -	 { ac_try='test -s conftest.$ac_objext'
michael@2: -  { (case "(($ac_try" in
michael@2: -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
michael@2: -  *) ac_try_echo=$ac_try;;
michael@2: -esac
michael@2: -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
michael@2: -  (eval "$ac_try") 2>&5
michael@2: -  ac_status=$?
michael@2: -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); }; }; then
michael@2: +  (exit $ac_status); } && {
michael@2: +	 test -z "$ac_cxx_werror_flag" ||
michael@2: +	 test ! -s conftest.err
michael@2: +       } && test -s conftest.$ac_objext; then
michael@2:    ac_hi=$ac_mid; break
michael@2:  else
michael@2:    echo "$as_me: failed program was:" >&5
michael@2: @@ -11434,7 +10194,7 @@
michael@2:  cat >>conftest.$ac_ext <<_ACEOF
michael@2:  /* end confdefs.h.  */
michael@2:  $ac_includes_default
michael@2: -		   typedef long ac__type_sizeof_;
michael@2: +   typedef long ac__type_sizeof_;
michael@2:  int
michael@2:  main ()
michael@2:  {
michael@2: @@ -11458,27 +10218,10 @@
michael@2:    rm -f conftest.er1
michael@2:    cat conftest.err >&5
michael@2:    echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); } &&
michael@2: -	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
michael@2: -  { (case "(($ac_try" in
michael@2: -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
michael@2: -  *) ac_try_echo=$ac_try;;
michael@2: -esac
michael@2: -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
michael@2: -  (eval "$ac_try") 2>&5
michael@2: -  ac_status=$?
michael@2: -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); }; } &&
michael@2: -	 { ac_try='test -s conftest.$ac_objext'
michael@2: -  { (case "(($ac_try" in
michael@2: -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
michael@2: -  *) ac_try_echo=$ac_try;;
michael@2: -esac
michael@2: -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
michael@2: -  (eval "$ac_try") 2>&5
michael@2: -  ac_status=$?
michael@2: -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); }; }; then
michael@2: +  (exit $ac_status); } && {
michael@2: +	 test -z "$ac_cxx_werror_flag" ||
michael@2: +	 test ! -s conftest.err
michael@2: +       } && test -s conftest.$ac_objext; then
michael@2:    ac_hi=-1 ac_mid=-1
michael@2:    while :; do
michael@2:      cat >conftest.$ac_ext <<_ACEOF
michael@2: @@ -11488,7 +10231,7 @@
michael@2:  cat >>conftest.$ac_ext <<_ACEOF
michael@2:  /* end confdefs.h.  */
michael@2:  $ac_includes_default
michael@2: -		   typedef long ac__type_sizeof_;
michael@2: +   typedef long ac__type_sizeof_;
michael@2:  int
michael@2:  main ()
michael@2:  {
michael@2: @@ -11512,27 +10255,10 @@
michael@2:    rm -f conftest.er1
michael@2:    cat conftest.err >&5
michael@2:    echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); } &&
michael@2: -	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
michael@2: -  { (case "(($ac_try" in
michael@2: -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
michael@2: -  *) ac_try_echo=$ac_try;;
michael@2: -esac
michael@2: -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
michael@2: -  (eval "$ac_try") 2>&5
michael@2: -  ac_status=$?
michael@2: -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); }; } &&
michael@2: -	 { ac_try='test -s conftest.$ac_objext'
michael@2: -  { (case "(($ac_try" in
michael@2: -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
michael@2: -  *) ac_try_echo=$ac_try;;
michael@2: -esac
michael@2: -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
michael@2: -  (eval "$ac_try") 2>&5
michael@2: -  ac_status=$?
michael@2: -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); }; }; then
michael@2: +  (exit $ac_status); } && {
michael@2: +	 test -z "$ac_cxx_werror_flag" ||
michael@2: +	 test ! -s conftest.err
michael@2: +       } && test -s conftest.$ac_objext; then
michael@2:    ac_lo=$ac_mid; break
michael@2:  else
michael@2:    echo "$as_me: failed program was:" >&5
michael@2: @@ -11569,7 +10295,7 @@
michael@2:  cat >>conftest.$ac_ext <<_ACEOF
michael@2:  /* end confdefs.h.  */
michael@2:  $ac_includes_default
michael@2: -		   typedef long ac__type_sizeof_;
michael@2: +   typedef long ac__type_sizeof_;
michael@2:  int
michael@2:  main ()
michael@2:  {
michael@2: @@ -11593,27 +10319,10 @@
michael@2:    rm -f conftest.er1
michael@2:    cat conftest.err >&5
michael@2:    echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); } &&
michael@2: -	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
michael@2: -  { (case "(($ac_try" in
michael@2: -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
michael@2: -  *) ac_try_echo=$ac_try;;
michael@2: -esac
michael@2: -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
michael@2: -  (eval "$ac_try") 2>&5
michael@2: -  ac_status=$?
michael@2: -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); }; } &&
michael@2: -	 { ac_try='test -s conftest.$ac_objext'
michael@2: -  { (case "(($ac_try" in
michael@2: -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
michael@2: -  *) ac_try_echo=$ac_try;;
michael@2: -esac
michael@2: -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
michael@2: -  (eval "$ac_try") 2>&5
michael@2: -  ac_status=$?
michael@2: -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); }; }; then
michael@2: +  (exit $ac_status); } && {
michael@2: +	 test -z "$ac_cxx_werror_flag" ||
michael@2: +	 test ! -s conftest.err
michael@2: +       } && test -s conftest.$ac_objext; then
michael@2:    ac_hi=$ac_mid
michael@2:  else
michael@2:    echo "$as_me: failed program was:" >&5
michael@2: @@ -11626,11 +10335,15 @@
michael@2:  done
michael@2:  case $ac_lo in
michael@2:  ?*) ac_cv_sizeof_long=$ac_lo;;
michael@2: -'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (long)
michael@2: +'') if test "$ac_cv_type_long" = yes; then
michael@2: +     { { echo "$as_me:$LINENO: error: cannot compute sizeof (long)
michael@2:  See \`config.log' for more details." >&5
michael@2:  echo "$as_me: error: cannot compute sizeof (long)
michael@2:  See \`config.log' for more details." >&2;}
michael@2: -   { (exit 77); exit 77; }; } ;;
michael@2: +   { (exit 77); exit 77; }; }
michael@2: +   else
michael@2: +     ac_cv_sizeof_long=0
michael@2: +   fi ;;
michael@2:  esac
michael@2:  else
michael@2:    cat >conftest.$ac_ext <<_ACEOF
michael@2: @@ -11640,7 +10353,7 @@
michael@2:  cat >>conftest.$ac_ext <<_ACEOF
michael@2:  /* end confdefs.h.  */
michael@2:  $ac_includes_default
michael@2: -		   typedef long ac__type_sizeof_;
michael@2: +   typedef long ac__type_sizeof_;
michael@2:  static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
michael@2:  static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
michael@2:  #include <stdio.h>
michael@2: @@ -11699,21 +10412,25 @@
michael@2:  sed 's/^/| /' conftest.$ac_ext >&5
michael@2:  
michael@2:  ( exit $ac_status )
michael@2: -{ { echo "$as_me:$LINENO: error: cannot compute sizeof (long)
michael@2: +if test "$ac_cv_type_long" = yes; then
michael@2: +     { { echo "$as_me:$LINENO: error: cannot compute sizeof (long)
michael@2:  See \`config.log' for more details." >&5
michael@2:  echo "$as_me: error: cannot compute sizeof (long)
michael@2:  See \`config.log' for more details." >&2;}
michael@2:     { (exit 77); exit 77; }; }
michael@2: +   else
michael@2: +     ac_cv_sizeof_long=0
michael@2: +   fi
michael@2:  fi
michael@2:  rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
michael@2:  fi
michael@2:  rm -f conftest.val
michael@2: -else
michael@2: -  ac_cv_sizeof_long=0
michael@2: -fi
michael@2:  fi
michael@2:  { echo "$as_me:$LINENO: result: $ac_cv_sizeof_long" >&5
michael@2:  echo "${ECHO_T}$ac_cv_sizeof_long" >&6; }
michael@2: +
michael@2: +
michael@2: +
michael@2:  cat >>confdefs.h <<_ACEOF
michael@2:  #define SIZEOF_LONG $ac_cv_sizeof_long
michael@2:  _ACEOF
michael@2: @@ -11755,27 +10472,10 @@
michael@2:    rm -f conftest.er1
michael@2:    cat conftest.err >&5
michael@2:    echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); } &&
michael@2: -	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
michael@2: -  { (case "(($ac_try" in
michael@2: -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
michael@2: -  *) ac_try_echo=$ac_try;;
michael@2: -esac
michael@2: -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
michael@2: -  (eval "$ac_try") 2>&5
michael@2: -  ac_status=$?
michael@2: -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); }; } &&
michael@2: -	 { ac_try='test -s conftest.$ac_objext'
michael@2: -  { (case "(($ac_try" in
michael@2: -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
michael@2: -  *) ac_try_echo=$ac_try;;
michael@2: -esac
michael@2: -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
michael@2: -  (eval "$ac_try") 2>&5
michael@2: -  ac_status=$?
michael@2: -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); }; }; then
michael@2: +  (exit $ac_status); } && {
michael@2: +	 test -z "$ac_cxx_werror_flag" ||
michael@2: +	 test ! -s conftest.err
michael@2: +       } && test -s conftest.$ac_objext; then
michael@2:    ac_cv_type_char_p=yes
michael@2:  else
michael@2:    echo "$as_me: failed program was:" >&5
michael@2: @@ -11789,16 +10489,15 @@
michael@2:  { echo "$as_me:$LINENO: result: $ac_cv_type_char_p" >&5
michael@2:  echo "${ECHO_T}$ac_cv_type_char_p" >&6; }
michael@2:  
michael@2: +# The cast to long int works around a bug in the HP C Compiler
michael@2: +# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
michael@2: +# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
michael@2: +# This bug is HP SR number 8606223364.
michael@2:  { echo "$as_me:$LINENO: checking size of char *" >&5
michael@2:  echo $ECHO_N "checking size of char *... $ECHO_C" >&6; }
michael@2:  if test "${ac_cv_sizeof_char_p+set}" = set; then
michael@2:    echo $ECHO_N "(cached) $ECHO_C" >&6
michael@2:  else
michael@2: -  if test "$ac_cv_type_char_p" = yes; then
michael@2: -  # The cast to long int works around a bug in the HP C Compiler
michael@2: -  # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
michael@2: -  # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
michael@2: -  # This bug is HP SR number 8606223364.
michael@2:    if test "$cross_compiling" = yes; then
michael@2:    # Depending upon the size, compute the lo and hi bounds.
michael@2:  cat >conftest.$ac_ext <<_ACEOF
michael@2: @@ -11808,7 +10507,7 @@
michael@2:  cat >>conftest.$ac_ext <<_ACEOF
michael@2:  /* end confdefs.h.  */
michael@2:  $ac_includes_default
michael@2: -		   typedef char * ac__type_sizeof_;
michael@2: +   typedef char * ac__type_sizeof_;
michael@2:  int
michael@2:  main ()
michael@2:  {
michael@2: @@ -11832,27 +10531,10 @@
michael@2:    rm -f conftest.er1
michael@2:    cat conftest.err >&5
michael@2:    echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); } &&
michael@2: -	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
michael@2: -  { (case "(($ac_try" in
michael@2: -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
michael@2: -  *) ac_try_echo=$ac_try;;
michael@2: -esac
michael@2: -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
michael@2: -  (eval "$ac_try") 2>&5
michael@2: -  ac_status=$?
michael@2: -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); }; } &&
michael@2: -	 { ac_try='test -s conftest.$ac_objext'
michael@2: -  { (case "(($ac_try" in
michael@2: -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
michael@2: -  *) ac_try_echo=$ac_try;;
michael@2: -esac
michael@2: -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
michael@2: -  (eval "$ac_try") 2>&5
michael@2: -  ac_status=$?
michael@2: -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); }; }; then
michael@2: +  (exit $ac_status); } && {
michael@2: +	 test -z "$ac_cxx_werror_flag" ||
michael@2: +	 test ! -s conftest.err
michael@2: +       } && test -s conftest.$ac_objext; then
michael@2:    ac_lo=0 ac_mid=0
michael@2:    while :; do
michael@2:      cat >conftest.$ac_ext <<_ACEOF
michael@2: @@ -11862,7 +10544,7 @@
michael@2:  cat >>conftest.$ac_ext <<_ACEOF
michael@2:  /* end confdefs.h.  */
michael@2:  $ac_includes_default
michael@2: -		   typedef char * ac__type_sizeof_;
michael@2: +   typedef char * ac__type_sizeof_;
michael@2:  int
michael@2:  main ()
michael@2:  {
michael@2: @@ -11886,27 +10568,10 @@
michael@2:    rm -f conftest.er1
michael@2:    cat conftest.err >&5
michael@2:    echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); } &&
michael@2: -	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
michael@2: -  { (case "(($ac_try" in
michael@2: -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
michael@2: -  *) ac_try_echo=$ac_try;;
michael@2: -esac
michael@2: -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
michael@2: -  (eval "$ac_try") 2>&5
michael@2: -  ac_status=$?
michael@2: -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); }; } &&
michael@2: -	 { ac_try='test -s conftest.$ac_objext'
michael@2: -  { (case "(($ac_try" in
michael@2: -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
michael@2: -  *) ac_try_echo=$ac_try;;
michael@2: -esac
michael@2: -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
michael@2: -  (eval "$ac_try") 2>&5
michael@2: -  ac_status=$?
michael@2: -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); }; }; then
michael@2: +  (exit $ac_status); } && {
michael@2: +	 test -z "$ac_cxx_werror_flag" ||
michael@2: +	 test ! -s conftest.err
michael@2: +       } && test -s conftest.$ac_objext; then
michael@2:    ac_hi=$ac_mid; break
michael@2:  else
michael@2:    echo "$as_me: failed program was:" >&5
michael@2: @@ -11933,7 +10598,7 @@
michael@2:  cat >>conftest.$ac_ext <<_ACEOF
michael@2:  /* end confdefs.h.  */
michael@2:  $ac_includes_default
michael@2: -		   typedef char * ac__type_sizeof_;
michael@2: +   typedef char * ac__type_sizeof_;
michael@2:  int
michael@2:  main ()
michael@2:  {
michael@2: @@ -11957,27 +10622,10 @@
michael@2:    rm -f conftest.er1
michael@2:    cat conftest.err >&5
michael@2:    echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); } &&
michael@2: -	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
michael@2: -  { (case "(($ac_try" in
michael@2: -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
michael@2: -  *) ac_try_echo=$ac_try;;
michael@2: -esac
michael@2: -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
michael@2: -  (eval "$ac_try") 2>&5
michael@2: -  ac_status=$?
michael@2: -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); }; } &&
michael@2: -	 { ac_try='test -s conftest.$ac_objext'
michael@2: -  { (case "(($ac_try" in
michael@2: -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
michael@2: -  *) ac_try_echo=$ac_try;;
michael@2: -esac
michael@2: -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
michael@2: -  (eval "$ac_try") 2>&5
michael@2: -  ac_status=$?
michael@2: -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); }; }; then
michael@2: +  (exit $ac_status); } && {
michael@2: +	 test -z "$ac_cxx_werror_flag" ||
michael@2: +	 test ! -s conftest.err
michael@2: +       } && test -s conftest.$ac_objext; then
michael@2:    ac_hi=-1 ac_mid=-1
michael@2:    while :; do
michael@2:      cat >conftest.$ac_ext <<_ACEOF
michael@2: @@ -11987,7 +10635,7 @@
michael@2:  cat >>conftest.$ac_ext <<_ACEOF
michael@2:  /* end confdefs.h.  */
michael@2:  $ac_includes_default
michael@2: -		   typedef char * ac__type_sizeof_;
michael@2: +   typedef char * ac__type_sizeof_;
michael@2:  int
michael@2:  main ()
michael@2:  {
michael@2: @@ -12011,27 +10659,10 @@
michael@2:    rm -f conftest.er1
michael@2:    cat conftest.err >&5
michael@2:    echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); } &&
michael@2: -	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
michael@2: -  { (case "(($ac_try" in
michael@2: -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
michael@2: -  *) ac_try_echo=$ac_try;;
michael@2: -esac
michael@2: -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
michael@2: -  (eval "$ac_try") 2>&5
michael@2: -  ac_status=$?
michael@2: -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); }; } &&
michael@2: -	 { ac_try='test -s conftest.$ac_objext'
michael@2: -  { (case "(($ac_try" in
michael@2: -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
michael@2: -  *) ac_try_echo=$ac_try;;
michael@2: -esac
michael@2: -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
michael@2: -  (eval "$ac_try") 2>&5
michael@2: -  ac_status=$?
michael@2: -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); }; }; then
michael@2: +  (exit $ac_status); } && {
michael@2: +	 test -z "$ac_cxx_werror_flag" ||
michael@2: +	 test ! -s conftest.err
michael@2: +       } && test -s conftest.$ac_objext; then
michael@2:    ac_lo=$ac_mid; break
michael@2:  else
michael@2:    echo "$as_me: failed program was:" >&5
michael@2: @@ -12068,7 +10699,7 @@
michael@2:  cat >>conftest.$ac_ext <<_ACEOF
michael@2:  /* end confdefs.h.  */
michael@2:  $ac_includes_default
michael@2: -		   typedef char * ac__type_sizeof_;
michael@2: +   typedef char * ac__type_sizeof_;
michael@2:  int
michael@2:  main ()
michael@2:  {
michael@2: @@ -12092,27 +10723,10 @@
michael@2:    rm -f conftest.er1
michael@2:    cat conftest.err >&5
michael@2:    echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); } &&
michael@2: -	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
michael@2: -  { (case "(($ac_try" in
michael@2: -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
michael@2: -  *) ac_try_echo=$ac_try;;
michael@2: -esac
michael@2: -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
michael@2: -  (eval "$ac_try") 2>&5
michael@2: -  ac_status=$?
michael@2: -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); }; } &&
michael@2: -	 { ac_try='test -s conftest.$ac_objext'
michael@2: -  { (case "(($ac_try" in
michael@2: -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
michael@2: -  *) ac_try_echo=$ac_try;;
michael@2: -esac
michael@2: -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
michael@2: -  (eval "$ac_try") 2>&5
michael@2: -  ac_status=$?
michael@2: -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); }; }; then
michael@2: +  (exit $ac_status); } && {
michael@2: +	 test -z "$ac_cxx_werror_flag" ||
michael@2: +	 test ! -s conftest.err
michael@2: +       } && test -s conftest.$ac_objext; then
michael@2:    ac_hi=$ac_mid
michael@2:  else
michael@2:    echo "$as_me: failed program was:" >&5
michael@2: @@ -12125,11 +10739,15 @@
michael@2:  done
michael@2:  case $ac_lo in
michael@2:  ?*) ac_cv_sizeof_char_p=$ac_lo;;
michael@2: -'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (char *)
michael@2: +'') if test "$ac_cv_type_char_p" = yes; then
michael@2: +     { { echo "$as_me:$LINENO: error: cannot compute sizeof (char *)
michael@2:  See \`config.log' for more details." >&5
michael@2:  echo "$as_me: error: cannot compute sizeof (char *)
michael@2:  See \`config.log' for more details." >&2;}
michael@2: -   { (exit 77); exit 77; }; } ;;
michael@2: +   { (exit 77); exit 77; }; }
michael@2: +   else
michael@2: +     ac_cv_sizeof_char_p=0
michael@2: +   fi ;;
michael@2:  esac
michael@2:  else
michael@2:    cat >conftest.$ac_ext <<_ACEOF
michael@2: @@ -12139,7 +10757,7 @@
michael@2:  cat >>conftest.$ac_ext <<_ACEOF
michael@2:  /* end confdefs.h.  */
michael@2:  $ac_includes_default
michael@2: -		   typedef char * ac__type_sizeof_;
michael@2: +   typedef char * ac__type_sizeof_;
michael@2:  static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
michael@2:  static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
michael@2:  #include <stdio.h>
michael@2: @@ -12198,21 +10816,25 @@
michael@2:  sed 's/^/| /' conftest.$ac_ext >&5
michael@2:  
michael@2:  ( exit $ac_status )
michael@2: -{ { echo "$as_me:$LINENO: error: cannot compute sizeof (char *)
michael@2: +if test "$ac_cv_type_char_p" = yes; then
michael@2: +     { { echo "$as_me:$LINENO: error: cannot compute sizeof (char *)
michael@2:  See \`config.log' for more details." >&5
michael@2:  echo "$as_me: error: cannot compute sizeof (char *)
michael@2:  See \`config.log' for more details." >&2;}
michael@2:     { (exit 77); exit 77; }; }
michael@2: +   else
michael@2: +     ac_cv_sizeof_char_p=0
michael@2: +   fi
michael@2:  fi
michael@2:  rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
michael@2:  fi
michael@2:  rm -f conftest.val
michael@2: -else
michael@2: -  ac_cv_sizeof_char_p=0
michael@2: -fi
michael@2:  fi
michael@2:  { echo "$as_me:$LINENO: result: $ac_cv_sizeof_char_p" >&5
michael@2:  echo "${ECHO_T}$ac_cv_sizeof_char_p" >&6; }
michael@2: +
michael@2: +
michael@2: +
michael@2:  cat >>confdefs.h <<_ACEOF
michael@2:  #define SIZEOF_CHAR_P $ac_cv_sizeof_char_p
michael@2:  _ACEOF
michael@2: @@ -12261,27 +10883,11 @@
michael@2:    rm -f conftest.er1
michael@2:    cat conftest.err >&5
michael@2:    echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); } &&
michael@2: -	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
michael@2: -  { (case "(($ac_try" in
michael@2: -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
michael@2: -  *) ac_try_echo=$ac_try;;
michael@2: -esac
michael@2: -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
michael@2: -  (eval "$ac_try") 2>&5
michael@2: -  ac_status=$?
michael@2: -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); }; } &&
michael@2: -	 { ac_try='test -s conftest$ac_exeext'
michael@2: -  { (case "(($ac_try" in
michael@2: -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
michael@2: -  *) ac_try_echo=$ac_try;;
michael@2: -esac
michael@2: -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
michael@2: -  (eval "$ac_try") 2>&5
michael@2: -  ac_status=$?
michael@2: -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); }; }; then
michael@2: +  (exit $ac_status); } && {
michael@2: +	 test -z "$ac_cxx_werror_flag" ||
michael@2: +	 test ! -s conftest.err
michael@2: +       } && test -s conftest$ac_exeext &&
michael@2: +       $as_test_x conftest$ac_exeext; then
michael@2:    ac_cv_lib_dl_dlopen=yes
michael@2:  else
michael@2:    echo "$as_me: failed program was:" >&5
michael@2: @@ -12290,7 +10896,7 @@
michael@2:  	ac_cv_lib_dl_dlopen=no
michael@2:  fi
michael@2:  
michael@2: -rm -f core conftest.err conftest.$ac_objext \
michael@2: +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
michael@2:        conftest$ac_exeext conftest.$ac_ext
michael@2:  LIBS=$ac_check_lib_save_LIBS
michael@2:  fi
michael@2: @@ -12346,27 +10952,11 @@
michael@2:    rm -f conftest.er1
michael@2:    cat conftest.err >&5
michael@2:    echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); } &&
michael@2: -	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
michael@2: -  { (case "(($ac_try" in
michael@2: -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
michael@2: -  *) ac_try_echo=$ac_try;;
michael@2: -esac
michael@2: -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
michael@2: -  (eval "$ac_try") 2>&5
michael@2: -  ac_status=$?
michael@2: -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); }; } &&
michael@2: -	 { ac_try='test -s conftest$ac_exeext'
michael@2: -  { (case "(($ac_try" in
michael@2: -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
michael@2: -  *) ac_try_echo=$ac_try;;
michael@2: -esac
michael@2: -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
michael@2: -  (eval "$ac_try") 2>&5
michael@2: -  ac_status=$?
michael@2: -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); }; }; then
michael@2: +  (exit $ac_status); } && {
michael@2: +	 test -z "$ac_cxx_werror_flag" ||
michael@2: +	 test ! -s conftest.err
michael@2: +       } && test -s conftest$ac_exeext &&
michael@2: +       $as_test_x conftest$ac_exeext; then
michael@2:    ac_cv_lib_dld_shl_unload=yes
michael@2:  else
michael@2:    echo "$as_me: failed program was:" >&5
michael@2: @@ -12375,7 +10965,7 @@
michael@2:  	ac_cv_lib_dld_shl_unload=no
michael@2:  fi
michael@2:  
michael@2: -rm -f core conftest.err conftest.$ac_objext \
michael@2: +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
michael@2:        conftest$ac_exeext conftest.$ac_ext
michael@2:  LIBS=$ac_check_lib_save_LIBS
michael@2:  fi
michael@2: @@ -12431,27 +11021,10 @@
michael@2:    rm -f conftest.er1
michael@2:    cat conftest.err >&5
michael@2:    echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); } &&
michael@2: -	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
michael@2: -  { (case "(($ac_try" in
michael@2: -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
michael@2: -  *) ac_try_echo=$ac_try;;
michael@2: -esac
michael@2: -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
michael@2: -  (eval "$ac_try") 2>&5
michael@2: -  ac_status=$?
michael@2: -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); }; } &&
michael@2: -	 { ac_try='test -s conftest.$ac_objext'
michael@2: -  { (case "(($ac_try" in
michael@2: -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
michael@2: -  *) ac_try_echo=$ac_try;;
michael@2: -esac
michael@2: -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
michael@2: -  (eval "$ac_try") 2>&5
michael@2: -  ac_status=$?
michael@2: -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); }; }; then
michael@2: +  (exit $ac_status); } && {
michael@2: +	 test -z "$ac_cxx_werror_flag" ||
michael@2: +	 test ! -s conftest.err
michael@2: +       } && test -s conftest.$ac_objext; then
michael@2:    ac_cv_type_size_t=yes
michael@2:  else
michael@2:    echo "$as_me: failed program was:" >&5
michael@2: @@ -12465,16 +11038,15 @@
michael@2:  { echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5
michael@2:  echo "${ECHO_T}$ac_cv_type_size_t" >&6; }
michael@2:  
michael@2: +# The cast to long int works around a bug in the HP C Compiler
michael@2: +# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
michael@2: +# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
michael@2: +# This bug is HP SR number 8606223364.
michael@2:  { echo "$as_me:$LINENO: checking size of size_t" >&5
michael@2:  echo $ECHO_N "checking size of size_t... $ECHO_C" >&6; }
michael@2:  if test "${ac_cv_sizeof_size_t+set}" = set; then
michael@2:    echo $ECHO_N "(cached) $ECHO_C" >&6
michael@2:  else
michael@2: -  if test "$ac_cv_type_size_t" = yes; then
michael@2: -  # The cast to long int works around a bug in the HP C Compiler
michael@2: -  # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
michael@2: -  # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
michael@2: -  # This bug is HP SR number 8606223364.
michael@2:    if test "$cross_compiling" = yes; then
michael@2:    # Depending upon the size, compute the lo and hi bounds.
michael@2:  cat >conftest.$ac_ext <<_ACEOF
michael@2: @@ -12484,7 +11056,7 @@
michael@2:  cat >>conftest.$ac_ext <<_ACEOF
michael@2:  /* end confdefs.h.  */
michael@2:  $ac_includes_default
michael@2: -		   typedef size_t ac__type_sizeof_;
michael@2: +   typedef size_t ac__type_sizeof_;
michael@2:  int
michael@2:  main ()
michael@2:  {
michael@2: @@ -12508,27 +11080,10 @@
michael@2:    rm -f conftest.er1
michael@2:    cat conftest.err >&5
michael@2:    echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); } &&
michael@2: -	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
michael@2: -  { (case "(($ac_try" in
michael@2: -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
michael@2: -  *) ac_try_echo=$ac_try;;
michael@2: -esac
michael@2: -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
michael@2: -  (eval "$ac_try") 2>&5
michael@2: -  ac_status=$?
michael@2: -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); }; } &&
michael@2: -	 { ac_try='test -s conftest.$ac_objext'
michael@2: -  { (case "(($ac_try" in
michael@2: -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
michael@2: -  *) ac_try_echo=$ac_try;;
michael@2: -esac
michael@2: -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
michael@2: -  (eval "$ac_try") 2>&5
michael@2: -  ac_status=$?
michael@2: -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); }; }; then
michael@2: +  (exit $ac_status); } && {
michael@2: +	 test -z "$ac_cxx_werror_flag" ||
michael@2: +	 test ! -s conftest.err
michael@2: +       } && test -s conftest.$ac_objext; then
michael@2:    ac_lo=0 ac_mid=0
michael@2:    while :; do
michael@2:      cat >conftest.$ac_ext <<_ACEOF
michael@2: @@ -12538,7 +11093,7 @@
michael@2:  cat >>conftest.$ac_ext <<_ACEOF
michael@2:  /* end confdefs.h.  */
michael@2:  $ac_includes_default
michael@2: -		   typedef size_t ac__type_sizeof_;
michael@2: +   typedef size_t ac__type_sizeof_;
michael@2:  int
michael@2:  main ()
michael@2:  {
michael@2: @@ -12562,27 +11117,10 @@
michael@2:    rm -f conftest.er1
michael@2:    cat conftest.err >&5
michael@2:    echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); } &&
michael@2: -	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
michael@2: -  { (case "(($ac_try" in
michael@2: -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
michael@2: -  *) ac_try_echo=$ac_try;;
michael@2: -esac
michael@2: -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
michael@2: -  (eval "$ac_try") 2>&5
michael@2: -  ac_status=$?
michael@2: -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); }; } &&
michael@2: -	 { ac_try='test -s conftest.$ac_objext'
michael@2: -  { (case "(($ac_try" in
michael@2: -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
michael@2: -  *) ac_try_echo=$ac_try;;
michael@2: -esac
michael@2: -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
michael@2: -  (eval "$ac_try") 2>&5
michael@2: -  ac_status=$?
michael@2: -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); }; }; then
michael@2: +  (exit $ac_status); } && {
michael@2: +	 test -z "$ac_cxx_werror_flag" ||
michael@2: +	 test ! -s conftest.err
michael@2: +       } && test -s conftest.$ac_objext; then
michael@2:    ac_hi=$ac_mid; break
michael@2:  else
michael@2:    echo "$as_me: failed program was:" >&5
michael@2: @@ -12609,7 +11147,7 @@
michael@2:  cat >>conftest.$ac_ext <<_ACEOF
michael@2:  /* end confdefs.h.  */
michael@2:  $ac_includes_default
michael@2: -		   typedef size_t ac__type_sizeof_;
michael@2: +   typedef size_t ac__type_sizeof_;
michael@2:  int
michael@2:  main ()
michael@2:  {
michael@2: @@ -12633,27 +11171,10 @@
michael@2:    rm -f conftest.er1
michael@2:    cat conftest.err >&5
michael@2:    echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); } &&
michael@2: -	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
michael@2: -  { (case "(($ac_try" in
michael@2: -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
michael@2: -  *) ac_try_echo=$ac_try;;
michael@2: -esac
michael@2: -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
michael@2: -  (eval "$ac_try") 2>&5
michael@2: -  ac_status=$?
michael@2: -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); }; } &&
michael@2: -	 { ac_try='test -s conftest.$ac_objext'
michael@2: -  { (case "(($ac_try" in
michael@2: -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
michael@2: -  *) ac_try_echo=$ac_try;;
michael@2: -esac
michael@2: -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
michael@2: -  (eval "$ac_try") 2>&5
michael@2: -  ac_status=$?
michael@2: -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); }; }; then
michael@2: +  (exit $ac_status); } && {
michael@2: +	 test -z "$ac_cxx_werror_flag" ||
michael@2: +	 test ! -s conftest.err
michael@2: +       } && test -s conftest.$ac_objext; then
michael@2:    ac_hi=-1 ac_mid=-1
michael@2:    while :; do
michael@2:      cat >conftest.$ac_ext <<_ACEOF
michael@2: @@ -12663,7 +11184,7 @@
michael@2:  cat >>conftest.$ac_ext <<_ACEOF
michael@2:  /* end confdefs.h.  */
michael@2:  $ac_includes_default
michael@2: -		   typedef size_t ac__type_sizeof_;
michael@2: +   typedef size_t ac__type_sizeof_;
michael@2:  int
michael@2:  main ()
michael@2:  {
michael@2: @@ -12687,27 +11208,10 @@
michael@2:    rm -f conftest.er1
michael@2:    cat conftest.err >&5
michael@2:    echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); } &&
michael@2: -	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
michael@2: -  { (case "(($ac_try" in
michael@2: -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
michael@2: -  *) ac_try_echo=$ac_try;;
michael@2: -esac
michael@2: -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
michael@2: -  (eval "$ac_try") 2>&5
michael@2: -  ac_status=$?
michael@2: -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); }; } &&
michael@2: -	 { ac_try='test -s conftest.$ac_objext'
michael@2: -  { (case "(($ac_try" in
michael@2: -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
michael@2: -  *) ac_try_echo=$ac_try;;
michael@2: -esac
michael@2: -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
michael@2: -  (eval "$ac_try") 2>&5
michael@2: -  ac_status=$?
michael@2: -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); }; }; then
michael@2: +  (exit $ac_status); } && {
michael@2: +	 test -z "$ac_cxx_werror_flag" ||
michael@2: +	 test ! -s conftest.err
michael@2: +       } && test -s conftest.$ac_objext; then
michael@2:    ac_lo=$ac_mid; break
michael@2:  else
michael@2:    echo "$as_me: failed program was:" >&5
michael@2: @@ -12744,7 +11248,7 @@
michael@2:  cat >>conftest.$ac_ext <<_ACEOF
michael@2:  /* end confdefs.h.  */
michael@2:  $ac_includes_default
michael@2: -		   typedef size_t ac__type_sizeof_;
michael@2: +   typedef size_t ac__type_sizeof_;
michael@2:  int
michael@2:  main ()
michael@2:  {
michael@2: @@ -12768,27 +11272,10 @@
michael@2:    rm -f conftest.er1
michael@2:    cat conftest.err >&5
michael@2:    echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); } &&
michael@2: -	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
michael@2: -  { (case "(($ac_try" in
michael@2: -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
michael@2: -  *) ac_try_echo=$ac_try;;
michael@2: -esac
michael@2: -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
michael@2: -  (eval "$ac_try") 2>&5
michael@2: -  ac_status=$?
michael@2: -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); }; } &&
michael@2: -	 { ac_try='test -s conftest.$ac_objext'
michael@2: -  { (case "(($ac_try" in
michael@2: -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
michael@2: -  *) ac_try_echo=$ac_try;;
michael@2: -esac
michael@2: -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
michael@2: -  (eval "$ac_try") 2>&5
michael@2: -  ac_status=$?
michael@2: -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); }; }; then
michael@2: +  (exit $ac_status); } && {
michael@2: +	 test -z "$ac_cxx_werror_flag" ||
michael@2: +	 test ! -s conftest.err
michael@2: +       } && test -s conftest.$ac_objext; then
michael@2:    ac_hi=$ac_mid
michael@2:  else
michael@2:    echo "$as_me: failed program was:" >&5
michael@2: @@ -12801,11 +11288,15 @@
michael@2:  done
michael@2:  case $ac_lo in
michael@2:  ?*) ac_cv_sizeof_size_t=$ac_lo;;
michael@2: -'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (size_t)
michael@2: +'') if test "$ac_cv_type_size_t" = yes; then
michael@2: +     { { echo "$as_me:$LINENO: error: cannot compute sizeof (size_t)
michael@2:  See \`config.log' for more details." >&5
michael@2:  echo "$as_me: error: cannot compute sizeof (size_t)
michael@2:  See \`config.log' for more details." >&2;}
michael@2: -   { (exit 77); exit 77; }; } ;;
michael@2: +   { (exit 77); exit 77; }; }
michael@2: +   else
michael@2: +     ac_cv_sizeof_size_t=0
michael@2: +   fi ;;
michael@2:  esac
michael@2:  else
michael@2:    cat >conftest.$ac_ext <<_ACEOF
michael@2: @@ -12815,7 +11306,7 @@
michael@2:  cat >>conftest.$ac_ext <<_ACEOF
michael@2:  /* end confdefs.h.  */
michael@2:  $ac_includes_default
michael@2: -		   typedef size_t ac__type_sizeof_;
michael@2: +   typedef size_t ac__type_sizeof_;
michael@2:  static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
michael@2:  static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
michael@2:  #include <stdio.h>
michael@2: @@ -12874,21 +11365,25 @@
michael@2:  sed 's/^/| /' conftest.$ac_ext >&5
michael@2:  
michael@2:  ( exit $ac_status )
michael@2: -{ { echo "$as_me:$LINENO: error: cannot compute sizeof (size_t)
michael@2: +if test "$ac_cv_type_size_t" = yes; then
michael@2: +     { { echo "$as_me:$LINENO: error: cannot compute sizeof (size_t)
michael@2:  See \`config.log' for more details." >&5
michael@2:  echo "$as_me: error: cannot compute sizeof (size_t)
michael@2:  See \`config.log' for more details." >&2;}
michael@2:     { (exit 77); exit 77; }; }
michael@2: +   else
michael@2: +     ac_cv_sizeof_size_t=0
michael@2: +   fi
michael@2:  fi
michael@2:  rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
michael@2:  fi
michael@2:  rm -f conftest.val
michael@2: -else
michael@2: -  ac_cv_sizeof_size_t=0
michael@2: -fi
michael@2:  fi
michael@2:  { echo "$as_me:$LINENO: result: $ac_cv_sizeof_size_t" >&5
michael@2:  echo "${ECHO_T}$ac_cv_sizeof_size_t" >&6; }
michael@2: +
michael@2: +
michael@2: +
michael@2:  cat >>confdefs.h <<_ACEOF
michael@2:  #define SIZEOF_SIZE_T $ac_cv_sizeof_size_t
michael@2:  _ACEOF
michael@2: @@ -12931,27 +11426,10 @@
michael@2:    rm -f conftest.er1
michael@2:    cat conftest.err >&5
michael@2:    echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); } &&
michael@2: -	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
michael@2: -  { (case "(($ac_try" in
michael@2: -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
michael@2: -  *) ac_try_echo=$ac_try;;
michael@2: -esac
michael@2: -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
michael@2: -  (eval "$ac_try") 2>&5
michael@2: -  ac_status=$?
michael@2: -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); }; } &&
michael@2: -	 { ac_try='test -s conftest.$ac_objext'
michael@2: -  { (case "(($ac_try" in
michael@2: -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
michael@2: -  *) ac_try_echo=$ac_try;;
michael@2: -esac
michael@2: -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
michael@2: -  (eval "$ac_try") 2>&5
michael@2: -  ac_status=$?
michael@2: -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); }; }; then
michael@2: +  (exit $ac_status); } && {
michael@2: +	 test -z "$ac_cxx_werror_flag" ||
michael@2: +	 test ! -s conftest.err
michael@2: +       } && test -s conftest.$ac_objext; then
michael@2:    ac_cv_type_unsigned_long=yes
michael@2:  else
michael@2:    echo "$as_me: failed program was:" >&5
michael@2: @@ -12965,16 +11443,15 @@
michael@2:  { echo "$as_me:$LINENO: result: $ac_cv_type_unsigned_long" >&5
michael@2:  echo "${ECHO_T}$ac_cv_type_unsigned_long" >&6; }
michael@2:  
michael@2: +# The cast to long int works around a bug in the HP C Compiler
michael@2: +# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
michael@2: +# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
michael@2: +# This bug is HP SR number 8606223364.
michael@2:  { echo "$as_me:$LINENO: checking size of unsigned long" >&5
michael@2:  echo $ECHO_N "checking size of unsigned long... $ECHO_C" >&6; }
michael@2:  if test "${ac_cv_sizeof_unsigned_long+set}" = set; then
michael@2:    echo $ECHO_N "(cached) $ECHO_C" >&6
michael@2:  else
michael@2: -  if test "$ac_cv_type_unsigned_long" = yes; then
michael@2: -  # The cast to long int works around a bug in the HP C Compiler
michael@2: -  # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
michael@2: -  # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
michael@2: -  # This bug is HP SR number 8606223364.
michael@2:    if test "$cross_compiling" = yes; then
michael@2:    # Depending upon the size, compute the lo and hi bounds.
michael@2:  cat >conftest.$ac_ext <<_ACEOF
michael@2: @@ -12984,7 +11461,7 @@
michael@2:  cat >>conftest.$ac_ext <<_ACEOF
michael@2:  /* end confdefs.h.  */
michael@2:  $ac_includes_default
michael@2: -		   typedef unsigned long ac__type_sizeof_;
michael@2: +   typedef unsigned long ac__type_sizeof_;
michael@2:  int
michael@2:  main ()
michael@2:  {
michael@2: @@ -13008,27 +11485,10 @@
michael@2:    rm -f conftest.er1
michael@2:    cat conftest.err >&5
michael@2:    echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); } &&
michael@2: -	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
michael@2: -  { (case "(($ac_try" in
michael@2: -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
michael@2: -  *) ac_try_echo=$ac_try;;
michael@2: -esac
michael@2: -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
michael@2: -  (eval "$ac_try") 2>&5
michael@2: -  ac_status=$?
michael@2: -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); }; } &&
michael@2: -	 { ac_try='test -s conftest.$ac_objext'
michael@2: -  { (case "(($ac_try" in
michael@2: -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
michael@2: -  *) ac_try_echo=$ac_try;;
michael@2: -esac
michael@2: -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
michael@2: -  (eval "$ac_try") 2>&5
michael@2: -  ac_status=$?
michael@2: -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); }; }; then
michael@2: +  (exit $ac_status); } && {
michael@2: +	 test -z "$ac_cxx_werror_flag" ||
michael@2: +	 test ! -s conftest.err
michael@2: +       } && test -s conftest.$ac_objext; then
michael@2:    ac_lo=0 ac_mid=0
michael@2:    while :; do
michael@2:      cat >conftest.$ac_ext <<_ACEOF
michael@2: @@ -13038,7 +11498,7 @@
michael@2:  cat >>conftest.$ac_ext <<_ACEOF
michael@2:  /* end confdefs.h.  */
michael@2:  $ac_includes_default
michael@2: -		   typedef unsigned long ac__type_sizeof_;
michael@2: +   typedef unsigned long ac__type_sizeof_;
michael@2:  int
michael@2:  main ()
michael@2:  {
michael@2: @@ -13062,27 +11522,10 @@
michael@2:    rm -f conftest.er1
michael@2:    cat conftest.err >&5
michael@2:    echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); } &&
michael@2: -	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
michael@2: -  { (case "(($ac_try" in
michael@2: -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
michael@2: -  *) ac_try_echo=$ac_try;;
michael@2: -esac
michael@2: -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
michael@2: -  (eval "$ac_try") 2>&5
michael@2: -  ac_status=$?
michael@2: -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); }; } &&
michael@2: -	 { ac_try='test -s conftest.$ac_objext'
michael@2: -  { (case "(($ac_try" in
michael@2: -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
michael@2: -  *) ac_try_echo=$ac_try;;
michael@2: -esac
michael@2: -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
michael@2: -  (eval "$ac_try") 2>&5
michael@2: -  ac_status=$?
michael@2: -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); }; }; then
michael@2: +  (exit $ac_status); } && {
michael@2: +	 test -z "$ac_cxx_werror_flag" ||
michael@2: +	 test ! -s conftest.err
michael@2: +       } && test -s conftest.$ac_objext; then
michael@2:    ac_hi=$ac_mid; break
michael@2:  else
michael@2:    echo "$as_me: failed program was:" >&5
michael@2: @@ -13109,7 +11552,7 @@
michael@2:  cat >>conftest.$ac_ext <<_ACEOF
michael@2:  /* end confdefs.h.  */
michael@2:  $ac_includes_default
michael@2: -		   typedef unsigned long ac__type_sizeof_;
michael@2: +   typedef unsigned long ac__type_sizeof_;
michael@2:  int
michael@2:  main ()
michael@2:  {
michael@2: @@ -13133,27 +11576,10 @@
michael@2:    rm -f conftest.er1
michael@2:    cat conftest.err >&5
michael@2:    echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); } &&
michael@2: -	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
michael@2: -  { (case "(($ac_try" in
michael@2: -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
michael@2: -  *) ac_try_echo=$ac_try;;
michael@2: -esac
michael@2: -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
michael@2: -  (eval "$ac_try") 2>&5
michael@2: -  ac_status=$?
michael@2: -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); }; } &&
michael@2: -	 { ac_try='test -s conftest.$ac_objext'
michael@2: -  { (case "(($ac_try" in
michael@2: -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
michael@2: -  *) ac_try_echo=$ac_try;;
michael@2: -esac
michael@2: -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
michael@2: -  (eval "$ac_try") 2>&5
michael@2: -  ac_status=$?
michael@2: -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); }; }; then
michael@2: +  (exit $ac_status); } && {
michael@2: +	 test -z "$ac_cxx_werror_flag" ||
michael@2: +	 test ! -s conftest.err
michael@2: +       } && test -s conftest.$ac_objext; then
michael@2:    ac_hi=-1 ac_mid=-1
michael@2:    while :; do
michael@2:      cat >conftest.$ac_ext <<_ACEOF
michael@2: @@ -13163,7 +11589,7 @@
michael@2:  cat >>conftest.$ac_ext <<_ACEOF
michael@2:  /* end confdefs.h.  */
michael@2:  $ac_includes_default
michael@2: -		   typedef unsigned long ac__type_sizeof_;
michael@2: +   typedef unsigned long ac__type_sizeof_;
michael@2:  int
michael@2:  main ()
michael@2:  {
michael@2: @@ -13187,27 +11613,10 @@
michael@2:    rm -f conftest.er1
michael@2:    cat conftest.err >&5
michael@2:    echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); } &&
michael@2: -	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
michael@2: -  { (case "(($ac_try" in
michael@2: -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
michael@2: -  *) ac_try_echo=$ac_try;;
michael@2: -esac
michael@2: -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
michael@2: -  (eval "$ac_try") 2>&5
michael@2: -  ac_status=$?
michael@2: -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); }; } &&
michael@2: -	 { ac_try='test -s conftest.$ac_objext'
michael@2: -  { (case "(($ac_try" in
michael@2: -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
michael@2: -  *) ac_try_echo=$ac_try;;
michael@2: -esac
michael@2: -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
michael@2: -  (eval "$ac_try") 2>&5
michael@2: -  ac_status=$?
michael@2: -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); }; }; then
michael@2: +  (exit $ac_status); } && {
michael@2: +	 test -z "$ac_cxx_werror_flag" ||
michael@2: +	 test ! -s conftest.err
michael@2: +       } && test -s conftest.$ac_objext; then
michael@2:    ac_lo=$ac_mid; break
michael@2:  else
michael@2:    echo "$as_me: failed program was:" >&5
michael@2: @@ -13244,7 +11653,7 @@
michael@2:  cat >>conftest.$ac_ext <<_ACEOF
michael@2:  /* end confdefs.h.  */
michael@2:  $ac_includes_default
michael@2: -		   typedef unsigned long ac__type_sizeof_;
michael@2: +   typedef unsigned long ac__type_sizeof_;
michael@2:  int
michael@2:  main ()
michael@2:  {
michael@2: @@ -13268,27 +11677,10 @@
michael@2:    rm -f conftest.er1
michael@2:    cat conftest.err >&5
michael@2:    echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); } &&
michael@2: -	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
michael@2: -  { (case "(($ac_try" in
michael@2: -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
michael@2: -  *) ac_try_echo=$ac_try;;
michael@2: -esac
michael@2: -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
michael@2: -  (eval "$ac_try") 2>&5
michael@2: -  ac_status=$?
michael@2: -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); }; } &&
michael@2: -	 { ac_try='test -s conftest.$ac_objext'
michael@2: -  { (case "(($ac_try" in
michael@2: -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
michael@2: -  *) ac_try_echo=$ac_try;;
michael@2: -esac
michael@2: -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
michael@2: -  (eval "$ac_try") 2>&5
michael@2: -  ac_status=$?
michael@2: -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); }; }; then
michael@2: +  (exit $ac_status); } && {
michael@2: +	 test -z "$ac_cxx_werror_flag" ||
michael@2: +	 test ! -s conftest.err
michael@2: +       } && test -s conftest.$ac_objext; then
michael@2:    ac_hi=$ac_mid
michael@2:  else
michael@2:    echo "$as_me: failed program was:" >&5
michael@2: @@ -13301,11 +11693,15 @@
michael@2:  done
michael@2:  case $ac_lo in
michael@2:  ?*) ac_cv_sizeof_unsigned_long=$ac_lo;;
michael@2: -'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (unsigned long)
michael@2: +'') if test "$ac_cv_type_unsigned_long" = yes; then
michael@2: +     { { echo "$as_me:$LINENO: error: cannot compute sizeof (unsigned long)
michael@2:  See \`config.log' for more details." >&5
michael@2:  echo "$as_me: error: cannot compute sizeof (unsigned long)
michael@2:  See \`config.log' for more details." >&2;}
michael@2: -   { (exit 77); exit 77; }; } ;;
michael@2: +   { (exit 77); exit 77; }; }
michael@2: +   else
michael@2: +     ac_cv_sizeof_unsigned_long=0
michael@2: +   fi ;;
michael@2:  esac
michael@2:  else
michael@2:    cat >conftest.$ac_ext <<_ACEOF
michael@2: @@ -13315,7 +11711,7 @@
michael@2:  cat >>conftest.$ac_ext <<_ACEOF
michael@2:  /* end confdefs.h.  */
michael@2:  $ac_includes_default
michael@2: -		   typedef unsigned long ac__type_sizeof_;
michael@2: +   typedef unsigned long ac__type_sizeof_;
michael@2:  static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
michael@2:  static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
michael@2:  #include <stdio.h>
michael@2: @@ -13374,21 +11770,25 @@
michael@2:  sed 's/^/| /' conftest.$ac_ext >&5
michael@2:  
michael@2:  ( exit $ac_status )
michael@2: -{ { echo "$as_me:$LINENO: error: cannot compute sizeof (unsigned long)
michael@2: +if test "$ac_cv_type_unsigned_long" = yes; then
michael@2: +     { { echo "$as_me:$LINENO: error: cannot compute sizeof (unsigned long)
michael@2:  See \`config.log' for more details." >&5
michael@2:  echo "$as_me: error: cannot compute sizeof (unsigned long)
michael@2:  See \`config.log' for more details." >&2;}
michael@2:     { (exit 77); exit 77; }; }
michael@2: +   else
michael@2: +     ac_cv_sizeof_unsigned_long=0
michael@2: +   fi
michael@2:  fi
michael@2:  rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
michael@2:  fi
michael@2:  rm -f conftest.val
michael@2: -else
michael@2: -  ac_cv_sizeof_unsigned_long=0
michael@2: -fi
michael@2:  fi
michael@2:  { echo "$as_me:$LINENO: result: $ac_cv_sizeof_unsigned_long" >&5
michael@2:  echo "${ECHO_T}$ac_cv_sizeof_unsigned_long" >&6; }
michael@2: +
michael@2: +
michael@2: +
michael@2:  cat >>confdefs.h <<_ACEOF
michael@2:  #define SIZEOF_UNSIGNED_LONG $ac_cv_sizeof_unsigned_long
michael@2:  _ACEOF
michael@2: @@ -13429,27 +11829,10 @@
michael@2:    rm -f conftest.er1
michael@2:    cat conftest.err >&5
michael@2:    echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); } &&
michael@2: -	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
michael@2: -  { (case "(($ac_try" in
michael@2: -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
michael@2: -  *) ac_try_echo=$ac_try;;
michael@2: -esac
michael@2: -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
michael@2: -  (eval "$ac_try") 2>&5
michael@2: -  ac_status=$?
michael@2: -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); }; } &&
michael@2: -	 { ac_try='test -s conftest.$ac_objext'
michael@2: -  { (case "(($ac_try" in
michael@2: -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
michael@2: -  *) ac_try_echo=$ac_try;;
michael@2: -esac
michael@2: -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
michael@2: -  (eval "$ac_try") 2>&5
michael@2: -  ac_status=$?
michael@2: -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); }; }; then
michael@2: +  (exit $ac_status); } && {
michael@2: +	 test -z "$ac_cxx_werror_flag" ||
michael@2: +	 test ! -s conftest.err
michael@2: +       } && test -s conftest.$ac_objext; then
michael@2:    { echo "$as_me:$LINENO: result: yes" >&5
michael@2:  echo "${ECHO_T}yes" >&6; }
michael@2:  else
michael@2: @@ -13514,27 +11897,10 @@
michael@2:    rm -f conftest.er1
michael@2:    cat conftest.err >&5
michael@2:    echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); } &&
michael@2: -	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
michael@2: -  { (case "(($ac_try" in
michael@2: -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
michael@2: -  *) ac_try_echo=$ac_try;;
michael@2: -esac
michael@2: -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
michael@2: -  (eval "$ac_try") 2>&5
michael@2: -  ac_status=$?
michael@2: -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); }; } &&
michael@2: -	 { ac_try='test -s conftest.$ac_objext'
michael@2: -  { (case "(($ac_try" in
michael@2: -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
michael@2: -  *) ac_try_echo=$ac_try;;
michael@2: -esac
michael@2: -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
michael@2: -  (eval "$ac_try") 2>&5
michael@2: -  ac_status=$?
michael@2: -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); }; }; then
michael@2: +  (exit $ac_status); } && {
michael@2: +	 test -z "$ac_cxx_werror_flag" ||
michael@2: +	 test ! -s conftest.err
michael@2: +       } && test -s conftest.$ac_objext; then
michael@2:    ac_header_compiler=yes
michael@2:  else
michael@2:    echo "$as_me: failed program was:" >&5
michael@2: @@ -13570,18 +11936,11 @@
michael@2:    rm -f conftest.er1
michael@2:    cat conftest.err >&5
michael@2:    echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); } >/dev/null; then
michael@2: -  if test -s conftest.err; then
michael@2: -    ac_cpp_err=$ac_cxx_preproc_warn_flag
michael@2: -    ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
michael@2: -  else
michael@2: -    ac_cpp_err=
michael@2: -  fi
michael@2: -else
michael@2: -  ac_cpp_err=yes
michael@2: -fi
michael@2: -if test -z "$ac_cpp_err"; then
michael@2: -  ac_header_preproc=yes
michael@2: +  (exit $ac_status); } >/dev/null && {
michael@2: +	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
michael@2: +	 test ! -s conftest.err
michael@2: +       }; then
michael@2: +  ac_header_preproc=yes
michael@2:  else
michael@2:    echo "$as_me: failed program was:" >&5
michael@2:  sed 's/^/| /' conftest.$ac_ext >&5
michael@2: @@ -13702,27 +12061,11 @@
michael@2:    rm -f conftest.er1
michael@2:    cat conftest.err >&5
michael@2:    echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); } &&
michael@2: -	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
michael@2: -  { (case "(($ac_try" in
michael@2: -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
michael@2: -  *) ac_try_echo=$ac_try;;
michael@2: -esac
michael@2: -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
michael@2: -  (eval "$ac_try") 2>&5
michael@2: -  ac_status=$?
michael@2: -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); }; } &&
michael@2: -	 { ac_try='test -s conftest$ac_exeext'
michael@2: -  { (case "(($ac_try" in
michael@2: -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
michael@2: -  *) ac_try_echo=$ac_try;;
michael@2: -esac
michael@2: -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
michael@2: -  (eval "$ac_try") 2>&5
michael@2: -  ac_status=$?
michael@2: -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); }; }; then
michael@2: +  (exit $ac_status); } && {
michael@2: +	 test -z "$ac_cxx_werror_flag" ||
michael@2: +	 test ! -s conftest.err
michael@2: +       } && test -s conftest$ac_exeext &&
michael@2: +       $as_test_x conftest$ac_exeext; then
michael@2:    ac_cv_func__NSGetEnviron=yes
michael@2:  else
michael@2:    echo "$as_me: failed program was:" >&5
michael@2: @@ -13731,7 +12074,7 @@
michael@2:  	ac_cv_func__NSGetEnviron=no
michael@2:  fi
michael@2:  
michael@2: -rm -f core conftest.err conftest.$ac_objext \
michael@2: +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
michael@2:        conftest$ac_exeext conftest.$ac_ext
michael@2:  fi
michael@2:  { echo "$as_me:$LINENO: result: $ac_cv_func__NSGetEnviron" >&5
michael@2: @@ -13819,27 +12162,11 @@
michael@2:    rm -f conftest.er1
michael@2:    cat conftest.err >&5
michael@2:    echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); } &&
michael@2: -	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
michael@2: -  { (case "(($ac_try" in
michael@2: -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
michael@2: -  *) ac_try_echo=$ac_try;;
michael@2: -esac
michael@2: -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
michael@2: -  (eval "$ac_try") 2>&5
michael@2: -  ac_status=$?
michael@2: -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); }; } &&
michael@2: -	 { ac_try='test -s conftest$ac_exeext'
michael@2: -  { (case "(($ac_try" in
michael@2: -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
michael@2: -  *) ac_try_echo=$ac_try;;
michael@2: -esac
michael@2: -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
michael@2: -  (eval "$ac_try") 2>&5
michael@2: -  ac_status=$?
michael@2: -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); }; }; then
michael@2: +  (exit $ac_status); } && {
michael@2: +	 test -z "$ac_cxx_werror_flag" ||
michael@2: +	 test ! -s conftest.err
michael@2: +       } && test -s conftest$ac_exeext &&
michael@2: +       $as_test_x conftest$ac_exeext; then
michael@2:    eval "$as_ac_var=yes"
michael@2:  else
michael@2:    echo "$as_me: failed program was:" >&5
michael@2: @@ -13848,7 +12175,7 @@
michael@2:  	eval "$as_ac_var=no"
michael@2:  fi
michael@2:  
michael@2: -rm -f core conftest.err conftest.$ac_objext \
michael@2: +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
michael@2:        conftest$ac_exeext conftest.$ac_ext
michael@2:  fi
michael@2:  ac_res=`eval echo '${'$as_ac_var'}'`
michael@2: @@ -13998,17 +12325,10 @@
michael@2:    rm -f conftest.er1
michael@2:    cat conftest.err >&5
michael@2:    echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); } >/dev/null; then
michael@2: -  if test -s conftest.err; then
michael@2: -    ac_cpp_err=$ac_cxx_preproc_warn_flag
michael@2: -    ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
michael@2: -  else
michael@2: -    ac_cpp_err=
michael@2: -  fi
michael@2: -else
michael@2: -  ac_cpp_err=yes
michael@2: -fi
michael@2: -if test -z "$ac_cpp_err"; then
michael@2: +  (exit $ac_status); } >/dev/null && {
michael@2: +	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
michael@2: +	 test ! -s conftest.err
michael@2: +       }; then
michael@2:    # We can compile using X headers with no special include directory.
michael@2:  ac_x_includes=
michael@2:  else
michael@2: @@ -14101,27 +12421,11 @@
michael@2:    rm -f conftest.er1
michael@2:    cat conftest.err >&5
michael@2:    echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); } &&
michael@2: -	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
michael@2: -  { (case "(($ac_try" in
michael@2: -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
michael@2: -  *) ac_try_echo=$ac_try;;
michael@2: -esac
michael@2: -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
michael@2: -  (eval "$ac_try") 2>&5
michael@2: -  ac_status=$?
michael@2: -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); }; } &&
michael@2: -	 { ac_try='test -s conftest$ac_exeext'
michael@2: -  { (case "(($ac_try" in
michael@2: -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
michael@2: -  *) ac_try_echo=$ac_try;;
michael@2: -esac
michael@2: -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
michael@2: -  (eval "$ac_try") 2>&5
michael@2: -  ac_status=$?
michael@2: -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); }; }; then
michael@2: +  (exit $ac_status); } && {
michael@2: +	 test -z "$ac_cxx_werror_flag" ||
michael@2: +	 test ! -s conftest.err
michael@2: +       } && test -s conftest$ac_exeext &&
michael@2: +       $as_test_x conftest$ac_exeext; then
michael@2:    LIBS="$ac_save_LIBS"
michael@2:  # We can link X programs with no special library path.
michael@2:  ac_x_libraries=
michael@2: @@ -14178,7 +12482,7 @@
michael@2:  done
michael@2:  fi
michael@2:  
michael@2: -rm -f core conftest.err conftest.$ac_objext \
michael@2: +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
michael@2:        conftest$ac_exeext conftest.$ac_ext
michael@2:  fi # $ac_x_libraries = NO
michael@2:  
michael@2: @@ -14343,27 +12647,11 @@
michael@2:    rm -f conftest.er1
michael@2:    cat conftest.err >&5
michael@2:    echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); } &&
michael@2: -	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
michael@2: -  { (case "(($ac_try" in
michael@2: -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
michael@2: -  *) ac_try_echo=$ac_try;;
michael@2: -esac
michael@2: -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
michael@2: -  (eval "$ac_try") 2>&5
michael@2: -  ac_status=$?
michael@2: -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); }; } &&
michael@2: -	 { ac_try='test -s conftest$ac_exeext'
michael@2: -  { (case "(($ac_try" in
michael@2: -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
michael@2: -  *) ac_try_echo=$ac_try;;
michael@2: -esac
michael@2: -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
michael@2: -  (eval "$ac_try") 2>&5
michael@2: -  ac_status=$?
michael@2: -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); }; }; then
michael@2: +  (exit $ac_status); } && {
michael@2: +	 test -z "$ac_cxx_werror_flag" ||
michael@2: +	 test ! -s conftest.err
michael@2: +       } && test -s conftest$ac_exeext &&
michael@2: +       $as_test_x conftest$ac_exeext; then
michael@2:    ac_cv_lib_ICE_IceConnectionNumber=yes
michael@2:  else
michael@2:    echo "$as_me: failed program was:" >&5
michael@2: @@ -14372,7 +12660,7 @@
michael@2:  	ac_cv_lib_ICE_IceConnectionNumber=no
michael@2:  fi
michael@2:  
michael@2: -rm -f core conftest.err conftest.$ac_objext \
michael@2: +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
michael@2:        conftest$ac_exeext conftest.$ac_ext
michael@2:  LIBS=$ac_check_lib_save_LIBS
michael@2:  fi
michael@2: @@ -14433,27 +12721,11 @@
michael@2:    rm -f conftest.er1
michael@2:    cat conftest.err >&5
michael@2:    echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); } &&
michael@2: -	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
michael@2: -  { (case "(($ac_try" in
michael@2: -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
michael@2: -  *) ac_try_echo=$ac_try;;
michael@2: -esac
michael@2: -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
michael@2: -  (eval "$ac_try") 2>&5
michael@2: -  ac_status=$?
michael@2: -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); }; } &&
michael@2: -	 { ac_try='test -s conftest$ac_exeext'
michael@2: -  { (case "(($ac_try" in
michael@2: -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
michael@2: -  *) ac_try_echo=$ac_try;;
michael@2: -esac
michael@2: -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
michael@2: -  (eval "$ac_try") 2>&5
michael@2: -  ac_status=$?
michael@2: -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); }; }; then
michael@2: +  (exit $ac_status); } && {
michael@2: +	 test -z "$ac_cxx_werror_flag" ||
michael@2: +	 test ! -s conftest.err
michael@2: +       } && test -s conftest$ac_exeext &&
michael@2: +       $as_test_x conftest$ac_exeext; then
michael@2:    kde_cv_have_libXext=yes
michael@2:  else
michael@2:    echo "$as_me: failed program was:" >&5
michael@2: @@ -14463,7 +12735,7 @@
michael@2:  
michael@2:  fi
michael@2:  
michael@2: -rm -f core conftest.err conftest.$ac_objext \
michael@2: +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
michael@2:        conftest$ac_exeext conftest.$ac_ext
michael@2:  
michael@2:  LDFLAGS=$kde_ldflags_safe
michael@2: @@ -14670,27 +12942,11 @@
michael@2:    rm -f conftest.er1
michael@2:    cat conftest.err >&5
michael@2:    echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); } &&
michael@2: -	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
michael@2: -  { (case "(($ac_try" in
michael@2: -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
michael@2: -  *) ac_try_echo=$ac_try;;
michael@2: -esac
michael@2: -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
michael@2: -  (eval "$ac_try") 2>&5
michael@2: -  ac_status=$?
michael@2: -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); }; } &&
michael@2: -	 { ac_try='test -s conftest$ac_exeext'
michael@2: -  { (case "(($ac_try" in
michael@2: -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
michael@2: -  *) ac_try_echo=$ac_try;;
michael@2: -esac
michael@2: -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
michael@2: -  (eval "$ac_try") 2>&5
michael@2: -  ac_status=$?
michael@2: -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); }; }; then
michael@2: +  (exit $ac_status); } && {
michael@2: +	 test -z "$ac_cxx_werror_flag" ||
michael@2: +	 test ! -s conftest.err
michael@2: +       } && test -s conftest$ac_exeext &&
michael@2: +       $as_test_x conftest$ac_exeext; then
michael@2:    eval "$as_ac_Lib=yes"
michael@2:  else
michael@2:    echo "$as_me: failed program was:" >&5
michael@2: @@ -14699,7 +12955,7 @@
michael@2:  	eval "$as_ac_Lib=no"
michael@2:  fi
michael@2:  
michael@2: -rm -f core conftest.err conftest.$ac_objext \
michael@2: +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
michael@2:        conftest$ac_exeext conftest.$ac_ext
michael@2:  LIBS=$ac_check_lib_save_LIBS
michael@2:  fi
michael@2: @@ -14760,27 +13016,11 @@
michael@2:    rm -f conftest.er1
michael@2:    cat conftest.err >&5
michael@2:    echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); } &&
michael@2: -	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
michael@2: -  { (case "(($ac_try" in
michael@2: -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
michael@2: -  *) ac_try_echo=$ac_try;;
michael@2: -esac
michael@2: -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
michael@2: -  (eval "$ac_try") 2>&5
michael@2: -  ac_status=$?
michael@2: -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); }; } &&
michael@2: -	 { ac_try='test -s conftest$ac_exeext'
michael@2: -  { (case "(($ac_try" in
michael@2: -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
michael@2: -  *) ac_try_echo=$ac_try;;
michael@2: -esac
michael@2: -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
michael@2: -  (eval "$ac_try") 2>&5
michael@2: -  ac_status=$?
michael@2: -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); }; }; then
michael@2: +  (exit $ac_status); } && {
michael@2: +	 test -z "$ac_cxx_werror_flag" ||
michael@2: +	 test ! -s conftest.err
michael@2: +       } && test -s conftest$ac_exeext &&
michael@2: +       $as_test_x conftest$ac_exeext; then
michael@2:    ac_cv_lib_pthread_pthread_create=yes
michael@2:  else
michael@2:    echo "$as_me: failed program was:" >&5
michael@2: @@ -14789,7 +13029,7 @@
michael@2:  	ac_cv_lib_pthread_pthread_create=no
michael@2:  fi
michael@2:  
michael@2: -rm -f core conftest.err conftest.$ac_objext \
michael@2: +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
michael@2:        conftest$ac_exeext conftest.$ac_ext
michael@2:  LIBS=$ac_check_lib_save_LIBS
michael@2:  fi
michael@2: @@ -14834,27 +13074,11 @@
michael@2:    rm -f conftest.er1
michael@2:    cat conftest.err >&5
michael@2:    echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); } &&
michael@2: -	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
michael@2: -  { (case "(($ac_try" in
michael@2: -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
michael@2: -  *) ac_try_echo=$ac_try;;
michael@2: -esac
michael@2: -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
michael@2: -  (eval "$ac_try") 2>&5
michael@2: -  ac_status=$?
michael@2: -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); }; } &&
michael@2: -	 { ac_try='test -s conftest$ac_exeext'
michael@2: -  { (case "(($ac_try" in
michael@2: -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
michael@2: -  *) ac_try_echo=$ac_try;;
michael@2: -esac
michael@2: -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
michael@2: -  (eval "$ac_try") 2>&5
michael@2: -  ac_status=$?
michael@2: -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); }; }; then
michael@2: +  (exit $ac_status); } && {
michael@2: +	 test -z "$ac_cxx_werror_flag" ||
michael@2: +	 test ! -s conftest.err
michael@2: +       } && test -s conftest$ac_exeext &&
michael@2: +       $as_test_x conftest$ac_exeext; then
michael@2:  
michael@2:          { echo "$as_me:$LINENO: result: yes" >&5
michael@2:  echo "${ECHO_T}yes" >&6; }
michael@2: @@ -14868,7 +13092,7 @@
michael@2:  echo "${ECHO_T}no" >&6; }
michael@2:  fi
michael@2:  
michael@2: -rm -f core conftest.err conftest.$ac_objext \
michael@2: +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
michael@2:        conftest$ac_exeext conftest.$ac_ext
michael@2:      LIBS=$kde_safe_libs
michael@2:    fi
michael@2: @@ -14930,27 +13154,11 @@
michael@2:    rm -f conftest.er1
michael@2:    cat conftest.err >&5
michael@2:    echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); } &&
michael@2: -	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
michael@2: -  { (case "(($ac_try" in
michael@2: -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
michael@2: -  *) ac_try_echo=$ac_try;;
michael@2: -esac
michael@2: -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
michael@2: -  (eval "$ac_try") 2>&5
michael@2: -  ac_status=$?
michael@2: -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); }; } &&
michael@2: -	 { ac_try='test -s conftest$ac_exeext'
michael@2: -  { (case "(($ac_try" in
michael@2: -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
michael@2: -  *) ac_try_echo=$ac_try;;
michael@2: -esac
michael@2: -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
michael@2: -  (eval "$ac_try") 2>&5
michael@2: -  ac_status=$?
michael@2: -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); }; }; then
michael@2: +  (exit $ac_status); } && {
michael@2: +	 test -z "$ac_cxx_werror_flag" ||
michael@2: +	 test ! -s conftest.err
michael@2: +       } && test -s conftest$ac_exeext &&
michael@2: +       $as_test_x conftest$ac_exeext; then
michael@2:    eval "kde_cv_prog_cxx_$kde_cache=yes"
michael@2:  else
michael@2:    echo "$as_me: failed program was:" >&5
michael@2: @@ -14959,7 +13167,7 @@
michael@2:  
michael@2:  fi
michael@2:  
michael@2: -rm -f core conftest.err conftest.$ac_objext \
michael@2: +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
michael@2:        conftest$ac_exeext conftest.$ac_ext
michael@2:    CXXFLAGS="$save_CXXFLAGS"
michael@2:    ac_ext=cpp
michael@2: @@ -15037,27 +13245,11 @@
michael@2:    rm -f conftest.er1
michael@2:    cat conftest.err >&5
michael@2:    echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); } &&
michael@2: -	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
michael@2: -  { (case "(($ac_try" in
michael@2: -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
michael@2: -  *) ac_try_echo=$ac_try;;
michael@2: -esac
michael@2: -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
michael@2: -  (eval "$ac_try") 2>&5
michael@2: -  ac_status=$?
michael@2: -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); }; } &&
michael@2: -	 { ac_try='test -s conftest$ac_exeext'
michael@2: -  { (case "(($ac_try" in
michael@2: -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
michael@2: -  *) ac_try_echo=$ac_try;;
michael@2: -esac
michael@2: -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
michael@2: -  (eval "$ac_try") 2>&5
michael@2: -  ac_status=$?
michael@2: -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); }; }; then
michael@2: +  (exit $ac_status); } && {
michael@2: +	 test -z "$ac_cxx_werror_flag" ||
michael@2: +	 test ! -s conftest.err
michael@2: +       } && test -s conftest$ac_exeext &&
michael@2: +       $as_test_x conftest$ac_exeext; then
michael@2:    eval "kde_cv_prog_cxx_$kde_cache=yes"
michael@2:  else
michael@2:    echo "$as_me: failed program was:" >&5
michael@2: @@ -15066,7 +13258,7 @@
michael@2:  
michael@2:  fi
michael@2:  
michael@2: -rm -f core conftest.err conftest.$ac_objext \
michael@2: +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
michael@2:        conftest$ac_exeext conftest.$ac_ext
michael@2:    CXXFLAGS="$save_CXXFLAGS"
michael@2:    ac_ext=cpp
michael@2: @@ -15226,27 +13418,11 @@
michael@2:    rm -f conftest.er1
michael@2:    cat conftest.err >&5
michael@2:    echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); } &&
michael@2: -	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
michael@2: -  { (case "(($ac_try" in
michael@2: -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
michael@2: -  *) ac_try_echo=$ac_try;;
michael@2: -esac
michael@2: -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
michael@2: -  (eval "$ac_try") 2>&5
michael@2: -  ac_status=$?
michael@2: -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); }; } &&
michael@2: -	 { ac_try='test -s conftest$ac_exeext'
michael@2: -  { (case "(($ac_try" in
michael@2: -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
michael@2: -  *) ac_try_echo=$ac_try;;
michael@2: -esac
michael@2: -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
michael@2: -  (eval "$ac_try") 2>&5
michael@2: -  ac_status=$?
michael@2: -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); }; }; then
michael@2: +  (exit $ac_status); } && {
michael@2: +	 test -z "$ac_cxx_werror_flag" ||
michael@2: +	 test ! -s conftest.err
michael@2: +       } && test -s conftest$ac_exeext &&
michael@2: +       $as_test_x conftest$ac_exeext; then
michael@2:    eval "ac_cv_lib_z='-lz'"
michael@2:  else
michael@2:    echo "$as_me: failed program was:" >&5
michael@2: @@ -15255,7 +13431,7 @@
michael@2:  	eval "ac_cv_lib_z=no"
michael@2:  fi
michael@2:  
michael@2: -rm -f core conftest.err conftest.$ac_objext \
michael@2: +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
michael@2:        conftest$ac_exeext conftest.$ac_ext
michael@2:  LIBS="$kde_save_LIBS"
michael@2:  CFLAGS="$kde_save_CFLAGS"
michael@2: @@ -15338,27 +13514,11 @@
michael@2:    rm -f conftest.er1
michael@2:    cat conftest.err >&5
michael@2:    echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); } &&
michael@2: -	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
michael@2: -  { (case "(($ac_try" in
michael@2: -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
michael@2: -  *) ac_try_echo=$ac_try;;
michael@2: -esac
michael@2: -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
michael@2: -  (eval "$ac_try") 2>&5
michael@2: -  ac_status=$?
michael@2: -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); }; } &&
michael@2: -	 { ac_try='test -s conftest$ac_exeext'
michael@2: -  { (case "(($ac_try" in
michael@2: -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
michael@2: -  *) ac_try_echo=$ac_try;;
michael@2: -esac
michael@2: -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
michael@2: -  (eval "$ac_try") 2>&5
michael@2: -  ac_status=$?
michael@2: -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); }; }; then
michael@2: +  (exit $ac_status); } && {
michael@2: +	 test -z "$ac_cxx_werror_flag" ||
michael@2: +	 test ! -s conftest.err
michael@2: +       } && test -s conftest$ac_exeext &&
michael@2: +       $as_test_x conftest$ac_exeext; then
michael@2:    eval "ac_cv_lib_png='-lpng $LIBZ -lm'"
michael@2:  else
michael@2:    echo "$as_me: failed program was:" >&5
michael@2: @@ -15368,7 +13528,7 @@
michael@2:  
michael@2:  fi
michael@2:  
michael@2: -rm -f core conftest.err conftest.$ac_objext \
michael@2: +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
michael@2:        conftest$ac_exeext conftest.$ac_ext
michael@2:  LIBS="$kde_save_LIBS"
michael@2:  CFLAGS="$kde_save_CFLAGS"
michael@2: @@ -15445,27 +13605,11 @@
michael@2:    rm -f conftest.er1
michael@2:    cat conftest.err >&5
michael@2:    echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); } &&
michael@2: -	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
michael@2: -  { (case "(($ac_try" in
michael@2: -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
michael@2: -  *) ac_try_echo=$ac_try;;
michael@2: -esac
michael@2: -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
michael@2: -  (eval "$ac_try") 2>&5
michael@2: -  ac_status=$?
michael@2: -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); }; } &&
michael@2: -	 { ac_try='test -s conftest$ac_exeext'
michael@2: -  { (case "(($ac_try" in
michael@2: -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
michael@2: -  *) ac_try_echo=$ac_try;;
michael@2: -esac
michael@2: -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
michael@2: -  (eval "$ac_try") 2>&5
michael@2: -  ac_status=$?
michael@2: -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); }; }; then
michael@2: +  (exit $ac_status); } && {
michael@2: +	 test -z "$ac_cxx_werror_flag" ||
michael@2: +	 test ! -s conftest.err
michael@2: +       } && test -s conftest$ac_exeext &&
michael@2: +       $as_test_x conftest$ac_exeext; then
michael@2:    eval "ac_cv_lib_jpeg_6b=-ljpeg6b"
michael@2:  else
michael@2:    echo "$as_me: failed program was:" >&5
michael@2: @@ -15474,7 +13618,7 @@
michael@2:  	eval "ac_cv_lib_jpeg_6b=no"
michael@2:  fi
michael@2:  
michael@2: -rm -f core conftest.err conftest.$ac_objext \
michael@2: +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
michael@2:        conftest$ac_exeext conftest.$ac_ext
michael@2:  LIBS="$ac_save_LIBS"
michael@2:  CFLAGS="$ac_save_CFLAGS"
michael@2: @@ -15542,27 +13686,11 @@
michael@2:    rm -f conftest.er1
michael@2:    cat conftest.err >&5
michael@2:    echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); } &&
michael@2: -	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
michael@2: -  { (case "(($ac_try" in
michael@2: -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
michael@2: -  *) ac_try_echo=$ac_try;;
michael@2: -esac
michael@2: -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
michael@2: -  (eval "$ac_try") 2>&5
michael@2: -  ac_status=$?
michael@2: -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); }; } &&
michael@2: -	 { ac_try='test -s conftest$ac_exeext'
michael@2: -  { (case "(($ac_try" in
michael@2: -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
michael@2: -  *) ac_try_echo=$ac_try;;
michael@2: -esac
michael@2: -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
michael@2: -  (eval "$ac_try") 2>&5
michael@2: -  ac_status=$?
michael@2: -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); }; }; then
michael@2: +  (exit $ac_status); } && {
michael@2: +	 test -z "$ac_cxx_werror_flag" ||
michael@2: +	 test ! -s conftest.err
michael@2: +       } && test -s conftest$ac_exeext &&
michael@2: +       $as_test_x conftest$ac_exeext; then
michael@2:    eval "ac_cv_lib_jpeg_normal=-ljpeg"
michael@2:  else
michael@2:    echo "$as_me: failed program was:" >&5
michael@2: @@ -15571,7 +13699,7 @@
michael@2:  	eval "ac_cv_lib_jpeg_normal=no"
michael@2:  fi
michael@2:  
michael@2: -rm -f core conftest.err conftest.$ac_objext \
michael@2: +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
michael@2:        conftest$ac_exeext conftest.$ac_ext
michael@2:  LIBS="$ac_save_LIBS"
michael@2:  CFLAGS="$ac_save_CFLAGS"
michael@2: @@ -15605,7 +13733,7 @@
michael@2:  do
michael@2:    for j in jpeglib.h;
michael@2:    do
michael@2: -    echo "configure: 15608: $i/$j" >&5
michael@2: +    echo "configure: 13736: $i/$j" >&5
michael@2:      if test -r "$i/$j"; then
michael@2:        echo "taking that" >&5
michael@2:        jpeg_incdir=$i
michael@2: @@ -15913,7 +14041,7 @@
michael@2:  do
michael@2:    for j in $kde_qt_header;
michael@2:    do
michael@2: -    echo "configure: 15916: $i/$j" >&5
michael@2: +    echo "configure: 14044: $i/$j" >&5
michael@2:      if test -r "$i/$j"; then
michael@2:        echo "taking that" >&5
michael@2:        qt_incdir=$i
michael@2: @@ -16591,27 +14719,11 @@
michael@2:    rm -f conftest.er1
michael@2:    cat conftest.err >&5
michael@2:    echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); } &&
michael@2: -	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
michael@2: -  { (case "(($ac_try" in
michael@2: -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
michael@2: -  *) ac_try_echo=$ac_try;;
michael@2: -esac
michael@2: -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
michael@2: -  (eval "$ac_try") 2>&5
michael@2: -  ac_status=$?
michael@2: -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); }; } &&
michael@2: -	 { ac_try='test -s conftest$ac_exeext'
michael@2: -  { (case "(($ac_try" in
michael@2: -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
michael@2: -  *) ac_try_echo=$ac_try;;
michael@2: -esac
michael@2: -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
michael@2: -  (eval "$ac_try") 2>&5
michael@2: -  ac_status=$?
michael@2: -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); }; }; then
michael@2: +  (exit $ac_status); } && {
michael@2: +	 test -z "$ac_cxx_werror_flag" ||
michael@2: +	 test ! -s conftest.err
michael@2: +       } && test -s conftest$ac_exeext &&
michael@2: +       $as_test_x conftest$ac_exeext; then
michael@2:    eval "kde_cv_qt_jpeg=no"
michael@2:  else
michael@2:    echo "$as_me: failed program was:" >&5
michael@2: @@ -16620,7 +14732,7 @@
michael@2:  	eval "kde_cv_qt_jpeg=yes"
michael@2:  fi
michael@2:  
michael@2: -rm -f core conftest.err conftest.$ac_objext \
michael@2: +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
michael@2:        conftest$ac_exeext conftest.$ac_ext
michael@2:  LIBS="$ac_save_LIBS"
michael@2:  CXXFLAGS="$ac_save_CXXFLAGS"
michael@2: @@ -16684,7 +14796,7 @@
michael@2:    IFS=$as_save_IFS
michael@2:    test -z "$as_dir" && as_dir=.
michael@2:    for ac_exec_ext in '' $ac_executable_extensions; do
michael@2: -  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
michael@2: +  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
michael@2:      ac_cv_prog_have_lrelease="yes"
michael@2:      echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
michael@2:      break 2
michael@2: @@ -16760,7 +14872,7 @@
michael@2:    IFS=$as_save_IFS
michael@2:    test -z "$as_dir" && as_dir=.
michael@2:    for ac_exec_ext in '' $ac_executable_extensions; do
michael@2: -  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
michael@2: +  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
michael@2:      ac_cv_prog_have_kde="yes"
michael@2:      echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
michael@2:      break 2
michael@2: @@ -17063,27 +15175,10 @@
michael@2:    rm -f conftest.er1
michael@2:    cat conftest.err >&5
michael@2:    echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); } &&
michael@2: -	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
michael@2: -  { (case "(($ac_try" in
michael@2: -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
michael@2: -  *) ac_try_echo=$ac_try;;
michael@2: -esac
michael@2: -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
michael@2: -  (eval "$ac_try") 2>&5
michael@2: -  ac_status=$?
michael@2: -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); }; } &&
michael@2: -	 { ac_try='test -s conftest.$ac_objext'
michael@2: -  { (case "(($ac_try" in
michael@2: -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
michael@2: -  *) ac_try_echo=$ac_try;;
michael@2: -esac
michael@2: -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
michael@2: -  (eval "$ac_try") 2>&5
michael@2: -  ac_status=$?
michael@2: -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); }; }; then
michael@2: +  (exit $ac_status); } && {
michael@2: +	 test -z "$ac_cxx_werror_flag" ||
michael@2: +	 test ! -s conftest.err
michael@2: +       } && test -s conftest.$ac_objext; then
michael@2:    kde_cv_stl_works=yes
michael@2:  else
michael@2:    echo "$as_me: failed program was:" >&5
michael@2: @@ -17219,7 +15314,7 @@
michael@2:  do
michael@2:    for j in $kde_check_header;
michael@2:    do
michael@2: -    echo "configure: 17222: $i/$j" >&5
michael@2: +    echo "configure: 15317: $i/$j" >&5
michael@2:      if test -r "$i/$j"; then
michael@2:        echo "taking that" >&5
michael@2:        kde_incdir=$i
michael@2: @@ -17249,7 +15344,7 @@
michael@2:  do
michael@2:    for j in $kde_check_lib;
michael@2:    do
michael@2: -    echo "configure: 17252: $i/$j" >&5
michael@2: +    echo "configure: 15347: $i/$j" >&5
michael@2:      if test -r "$i/$j"; then
michael@2:        echo "taking that" >&5
michael@2:        kde_libdir=$i
michael@2: @@ -17267,7 +15362,7 @@
michael@2:  do
michael@2:    for j in "kde3/plugins/designer/kdewidgets.la";
michael@2:    do
michael@2: -    echo "configure: 17270: $i/$j" >&5
michael@2: +    echo "configure: 15365: $i/$j" >&5
michael@2:      if test -r "$i/$j"; then
michael@2:        echo "taking that" >&5
michael@2:        kde_widgetdir=$i
michael@2: @@ -18767,7 +16862,7 @@
michael@2:  do
michael@2:    for j in apps/ksgmltools2/customization/kde-chunk.xsl;
michael@2:    do
michael@2: -    echo "configure: 18770: $i/$j" >&5
michael@2: +    echo "configure: 16865: $i/$j" >&5
michael@2:      if test -r "$i/$j"; then
michael@2:        echo "taking that" >&5
michael@2:        KDE_XSL_STYLESHEET=$i
michael@2: @@ -18999,27 +17094,11 @@
michael@2:    rm -f conftest.er1
michael@2:    cat conftest.err >&5
michael@2:    echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); } &&
michael@2: -	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
michael@2: -  { (case "(($ac_try" in
michael@2: -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
michael@2: -  *) ac_try_echo=$ac_try;;
michael@2: -esac
michael@2: -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
michael@2: -  (eval "$ac_try") 2>&5
michael@2: -  ac_status=$?
michael@2: -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); }; } &&
michael@2: -	 { ac_try='test -s conftest$ac_exeext'
michael@2: -  { (case "(($ac_try" in
michael@2: -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
michael@2: -  *) ac_try_echo=$ac_try;;
michael@2: -esac
michael@2: -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
michael@2: -  (eval "$ac_try") 2>&5
michael@2: -  ac_status=$?
michael@2: -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); }; }; then
michael@2: +  (exit $ac_status); } && {
michael@2: +	 test -z "$ac_cxx_werror_flag" ||
michael@2: +	 test ! -s conftest.err
michael@2: +       } && test -s conftest$ac_exeext &&
michael@2: +       $as_test_x conftest$ac_exeext; then
michael@2:    ac_cv_lib_bind_main=yes
michael@2:  else
michael@2:    echo "$as_me: failed program was:" >&5
michael@2: @@ -19028,7 +17107,7 @@
michael@2:  	ac_cv_lib_bind_main=no
michael@2:  fi
michael@2:  
michael@2: -rm -f core conftest.err conftest.$ac_objext \
michael@2: +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
michael@2:        conftest$ac_exeext conftest.$ac_ext
michael@2:  LIBS=$ac_check_lib_save_LIBS
michael@2:  fi
michael@2: @@ -19080,27 +17159,10 @@
michael@2:    rm -f conftest.er1
michael@2:    cat conftest.err >&5
michael@2:    echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); } &&
michael@2: -	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
michael@2: -  { (case "(($ac_try" in
michael@2: -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
michael@2: -  *) ac_try_echo=$ac_try;;
michael@2: -esac
michael@2: -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
michael@2: -  (eval "$ac_try") 2>&5
michael@2: -  ac_status=$?
michael@2: -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); }; } &&
michael@2: -	 { ac_try='test -s conftest.$ac_objext'
michael@2: -  { (case "(($ac_try" in
michael@2: -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
michael@2: -  *) ac_try_echo=$ac_try;;
michael@2: -esac
michael@2: -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
michael@2: -  (eval "$ac_try") 2>&5
michael@2: -  ac_status=$?
michael@2: -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); }; }; then
michael@2: +  (exit $ac_status); } && {
michael@2: +	 test -z "$ac_cxx_werror_flag" ||
michael@2: +	 test ! -s conftest.err
michael@2: +       } && test -s conftest.$ac_objext; then
michael@2:    ac_header_compiler=yes
michael@2:  else
michael@2:    echo "$as_me: failed program was:" >&5
michael@2: @@ -19136,17 +17198,10 @@
michael@2:    rm -f conftest.er1
michael@2:    cat conftest.err >&5
michael@2:    echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); } >/dev/null; then
michael@2: -  if test -s conftest.err; then
michael@2: -    ac_cpp_err=$ac_cxx_preproc_warn_flag
michael@2: -    ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
michael@2: -  else
michael@2: -    ac_cpp_err=
michael@2: -  fi
michael@2: -else
michael@2: -  ac_cpp_err=yes
michael@2: -fi
michael@2: -if test -z "$ac_cpp_err"; then
michael@2: +  (exit $ac_status); } >/dev/null && {
michael@2: +	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
michael@2: +	 test ! -s conftest.err
michael@2: +       }; then
michael@2:    ac_header_preproc=yes
michael@2:  else
michael@2:    echo "$as_me: failed program was:" >&5
michael@2: @@ -19247,27 +17302,11 @@
michael@2:    rm -f conftest.er1
michael@2:    cat conftest.err >&5
michael@2:    echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); } &&
michael@2: -	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
michael@2: -  { (case "(($ac_try" in
michael@2: -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
michael@2: -  *) ac_try_echo=$ac_try;;
michael@2: -esac
michael@2: -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
michael@2: -  (eval "$ac_try") 2>&5
michael@2: -  ac_status=$?
michael@2: -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); }; } &&
michael@2: -	 { ac_try='test -s conftest$ac_exeext'
michael@2: -  { (case "(($ac_try" in
michael@2: -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
michael@2: -  *) ac_try_echo=$ac_try;;
michael@2: -esac
michael@2: -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
michael@2: -  (eval "$ac_try") 2>&5
michael@2: -  ac_status=$?
michael@2: -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); }; }; then
michael@2: +  (exit $ac_status); } && {
michael@2: +	 test -z "$ac_cxx_werror_flag" ||
michael@2: +	 test ! -s conftest.err
michael@2: +       } && test -s conftest$ac_exeext &&
michael@2: +       $as_test_x conftest$ac_exeext; then
michael@2:    ac_cv_lib_sndfile_sf_open=yes
michael@2:  else
michael@2:    echo "$as_me: failed program was:" >&5
michael@2: @@ -19276,7 +17315,7 @@
michael@2:  	ac_cv_lib_sndfile_sf_open=no
michael@2:  fi
michael@2:  
michael@2: -rm -f core conftest.err conftest.$ac_objext \
michael@2: +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
michael@2:        conftest$ac_exeext conftest.$ac_ext
michael@2:  LIBS=$ac_check_lib_save_LIBS
michael@2:  fi
michael@2: @@ -19549,30 +17588,13 @@
michael@2:  
michael@2:  # This check does not work on all platforms
michael@2:  # Check if libgsm is available
michael@2: -# AC_CHECK_LIB(gsm, sf_open, [
michael@2: -#	AC_CHECK_HEADER(gsm.h, [],
michael@2: -#		[AC_MSG_ERROR([gsm header files missing (gsm.h)])])
michael@2: -#	AC_DEFINE(HAVE_GSM, 1, [Define to 1 if you have the <libgsm> library.])
michael@2: -#	GSM_LIBS="-lgsm"
michael@2: -#	echo "LIBS += -lgsm" >> $QT_INCL_PRO
michael@2: -#	have_gsm="yes" ], [
michael@2: -#	have_gsm="no"
michael@2: -#	GSM_LIBS="\$(top_builddir)/src/audio/gsm/libgsm.a"
michael@2: -#	echo "LIBS += ../audio/gsm/libgsm.a" >> $QT_INCL_PRO ])
michael@2: -have_gsm="no"
michael@2: -GSM_LIBS="\$(top_builddir)/src/audio/gsm/libgsm.a"
michael@2: -echo "LIBS += ../audio/gsm/libgsm.a" >> $QT_INCL_PRO
michael@2: -
michael@2: -
michael@2: -
michael@2: -# Check if ALSA is available
michael@2: -{ echo "$as_me:$LINENO: checking for main in -lasound" >&5
michael@2: -echo $ECHO_N "checking for main in -lasound... $ECHO_C" >&6; }
michael@2: -if test "${ac_cv_lib_asound_main+set}" = set; then
michael@2: +{ echo "$as_me:$LINENO: checking for sf_open in -lgsm" >&5
michael@2: +echo $ECHO_N "checking for sf_open in -lgsm... $ECHO_C" >&6; }
michael@2: +if test "${ac_cv_lib_gsm_sf_open+set}" = set; then
michael@2:    echo $ECHO_N "(cached) $ECHO_C" >&6
michael@2:  else
michael@2:    ac_check_lib_save_LIBS=$LIBS
michael@2: -LIBS="-lasound  $LIBS"
michael@2: +LIBS="-lgsm  $LIBS"
michael@2:  cat >conftest.$ac_ext <<_ACEOF
michael@2:  /* confdefs.h.  */
michael@2:  _ACEOF
michael@2: @@ -19580,11 +17602,17 @@
michael@2:  cat >>conftest.$ac_ext <<_ACEOF
michael@2:  /* end confdefs.h.  */
michael@2:  
michael@2: -
michael@2: +/* Override any GCC internal prototype to avoid an error.
michael@2: +   Use char because int might match the return type of a GCC
michael@2: +   builtin and then its argument prototype would still apply.  */
michael@2: +#ifdef __cplusplus
michael@2: +extern "C"
michael@2: +#endif
michael@2: +char sf_open ();
michael@2:  int
michael@2:  main ()
michael@2:  {
michael@2: -return main ();
michael@2: +return sf_open ();
michael@2:    ;
michael@2:    return 0;
michael@2:  }
michael@2: @@ -19602,55 +17630,39 @@
michael@2:    rm -f conftest.er1
michael@2:    cat conftest.err >&5
michael@2:    echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); } &&
michael@2: -	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
michael@2: -  { (case "(($ac_try" in
michael@2: -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
michael@2: -  *) ac_try_echo=$ac_try;;
michael@2: -esac
michael@2: -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
michael@2: -  (eval "$ac_try") 2>&5
michael@2: -  ac_status=$?
michael@2: -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); }; } &&
michael@2: -	 { ac_try='test -s conftest$ac_exeext'
michael@2: -  { (case "(($ac_try" in
michael@2: -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
michael@2: -  *) ac_try_echo=$ac_try;;
michael@2: -esac
michael@2: -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
michael@2: -  (eval "$ac_try") 2>&5
michael@2: -  ac_status=$?
michael@2: -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); }; }; then
michael@2: -  ac_cv_lib_asound_main=yes
michael@2: +  (exit $ac_status); } && {
michael@2: +	 test -z "$ac_cxx_werror_flag" ||
michael@2: +	 test ! -s conftest.err
michael@2: +       } && test -s conftest$ac_exeext &&
michael@2: +       $as_test_x conftest$ac_exeext; then
michael@2: +  ac_cv_lib_gsm_sf_open=yes
michael@2:  else
michael@2:    echo "$as_me: failed program was:" >&5
michael@2:  sed 's/^/| /' conftest.$ac_ext >&5
michael@2:  
michael@2: -	ac_cv_lib_asound_main=no
michael@2: +	ac_cv_lib_gsm_sf_open=no
michael@2:  fi
michael@2:  
michael@2: -rm -f core conftest.err conftest.$ac_objext \
michael@2: +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
michael@2:        conftest$ac_exeext conftest.$ac_ext
michael@2:  LIBS=$ac_check_lib_save_LIBS
michael@2:  fi
michael@2: -{ echo "$as_me:$LINENO: result: $ac_cv_lib_asound_main" >&5
michael@2: -echo "${ECHO_T}$ac_cv_lib_asound_main" >&6; }
michael@2: -if test $ac_cv_lib_asound_main = yes; then
michael@2: -
michael@2: -	if test "${ac_cv_header_alsa_asoundlib_h+set}" = set; then
michael@2: -  { echo "$as_me:$LINENO: checking for alsa/asoundlib.h" >&5
michael@2: -echo $ECHO_N "checking for alsa/asoundlib.h... $ECHO_C" >&6; }
michael@2: -if test "${ac_cv_header_alsa_asoundlib_h+set}" = set; then
michael@2: +{ echo "$as_me:$LINENO: result: $ac_cv_lib_gsm_sf_open" >&5
michael@2: +echo "${ECHO_T}$ac_cv_lib_gsm_sf_open" >&6; }
michael@2: +if test $ac_cv_lib_gsm_sf_open = yes; then
michael@2: +
michael@2: +	if test "${ac_cv_header_gsm_h+set}" = set; then
michael@2: +  { echo "$as_me:$LINENO: checking for gsm.h" >&5
michael@2: +echo $ECHO_N "checking for gsm.h... $ECHO_C" >&6; }
michael@2: +if test "${ac_cv_header_gsm_h+set}" = set; then
michael@2:    echo $ECHO_N "(cached) $ECHO_C" >&6
michael@2:  fi
michael@2: -{ echo "$as_me:$LINENO: result: $ac_cv_header_alsa_asoundlib_h" >&5
michael@2: -echo "${ECHO_T}$ac_cv_header_alsa_asoundlib_h" >&6; }
michael@2: +{ echo "$as_me:$LINENO: result: $ac_cv_header_gsm_h" >&5
michael@2: +echo "${ECHO_T}$ac_cv_header_gsm_h" >&6; }
michael@2:  else
michael@2:    # Is the header compilable?
michael@2: -{ echo "$as_me:$LINENO: checking alsa/asoundlib.h usability" >&5
michael@2: -echo $ECHO_N "checking alsa/asoundlib.h usability... $ECHO_C" >&6; }
michael@2: +{ echo "$as_me:$LINENO: checking gsm.h usability" >&5
michael@2: +echo $ECHO_N "checking gsm.h usability... $ECHO_C" >&6; }
michael@2:  cat >conftest.$ac_ext <<_ACEOF
michael@2:  /* confdefs.h.  */
michael@2:  _ACEOF
michael@2: @@ -19658,7 +17670,7 @@
michael@2:  cat >>conftest.$ac_ext <<_ACEOF
michael@2:  /* end confdefs.h.  */
michael@2:  $ac_includes_default
michael@2: -#include <alsa/asoundlib.h>
michael@2: +#include <gsm.h>
michael@2:  _ACEOF
michael@2:  rm -f conftest.$ac_objext
michael@2:  if { (ac_try="$ac_compile"
michael@2: @@ -19673,27 +17685,436 @@
michael@2:    rm -f conftest.er1
michael@2:    cat conftest.err >&5
michael@2:    echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); } &&
michael@2: -	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
michael@2: -  { (case "(($ac_try" in
michael@2: -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
michael@2: -  *) ac_try_echo=$ac_try;;
michael@2: -esac
michael@2: -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
michael@2: -  (eval "$ac_try") 2>&5
michael@2: -  ac_status=$?
michael@2: -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); }; } &&
michael@2: -	 { ac_try='test -s conftest.$ac_objext'
michael@2: -  { (case "(($ac_try" in
michael@2: -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
michael@2: +  (exit $ac_status); } && {
michael@2: +	 test -z "$ac_cxx_werror_flag" ||
michael@2: +	 test ! -s conftest.err
michael@2: +       } && test -s conftest.$ac_objext; then
michael@2: +  ac_header_compiler=yes
michael@2: +else
michael@2: +  echo "$as_me: failed program was:" >&5
michael@2: +sed 's/^/| /' conftest.$ac_ext >&5
michael@2: +
michael@2: +	ac_header_compiler=no
michael@2: +fi
michael@2: +
michael@2: +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
michael@2: +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
michael@2: +echo "${ECHO_T}$ac_header_compiler" >&6; }
michael@2: +
michael@2: +# Is the header present?
michael@2: +{ echo "$as_me:$LINENO: checking gsm.h presence" >&5
michael@2: +echo $ECHO_N "checking gsm.h presence... $ECHO_C" >&6; }
michael@2: +cat >conftest.$ac_ext <<_ACEOF
michael@2: +/* confdefs.h.  */
michael@2: +_ACEOF
michael@2: +cat confdefs.h >>conftest.$ac_ext
michael@2: +cat >>conftest.$ac_ext <<_ACEOF
michael@2: +/* end confdefs.h.  */
michael@2: +#include <gsm.h>
michael@2: +_ACEOF
michael@2: +if { (ac_try="$ac_cpp conftest.$ac_ext"
michael@2: +case "(($ac_try" in
michael@2: +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
michael@2:    *) ac_try_echo=$ac_try;;
michael@2:  esac
michael@2:  eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
michael@2: -  (eval "$ac_try") 2>&5
michael@2: +  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
michael@2:    ac_status=$?
michael@2: +  grep -v '^ *+' conftest.er1 >conftest.err
michael@2: +  rm -f conftest.er1
michael@2: +  cat conftest.err >&5
michael@2:    echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); }; }; then
michael@2: +  (exit $ac_status); } >/dev/null && {
michael@2: +	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
michael@2: +	 test ! -s conftest.err
michael@2: +       }; then
michael@2: +  ac_header_preproc=yes
michael@2: +else
michael@2: +  echo "$as_me: failed program was:" >&5
michael@2: +sed 's/^/| /' conftest.$ac_ext >&5
michael@2: +
michael@2: +  ac_header_preproc=no
michael@2: +fi
michael@2: +
michael@2: +rm -f conftest.err conftest.$ac_ext
michael@2: +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
michael@2: +echo "${ECHO_T}$ac_header_preproc" >&6; }
michael@2: +
michael@2: +# So?  What about this header?
michael@2: +case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
michael@2: +  yes:no: )
michael@2: +    { echo "$as_me:$LINENO: WARNING: gsm.h: accepted by the compiler, rejected by the preprocessor!" >&5
michael@2: +echo "$as_me: WARNING: gsm.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
michael@2: +    { echo "$as_me:$LINENO: WARNING: gsm.h: proceeding with the compiler's result" >&5
michael@2: +echo "$as_me: WARNING: gsm.h: proceeding with the compiler's result" >&2;}
michael@2: +    ac_header_preproc=yes
michael@2: +    ;;
michael@2: +  no:yes:* )
michael@2: +    { echo "$as_me:$LINENO: WARNING: gsm.h: present but cannot be compiled" >&5
michael@2: +echo "$as_me: WARNING: gsm.h: present but cannot be compiled" >&2;}
michael@2: +    { echo "$as_me:$LINENO: WARNING: gsm.h:     check for missing prerequisite headers?" >&5
michael@2: +echo "$as_me: WARNING: gsm.h:     check for missing prerequisite headers?" >&2;}
michael@2: +    { echo "$as_me:$LINENO: WARNING: gsm.h: see the Autoconf documentation" >&5
michael@2: +echo "$as_me: WARNING: gsm.h: see the Autoconf documentation" >&2;}
michael@2: +    { echo "$as_me:$LINENO: WARNING: gsm.h:     section \"Present But Cannot Be Compiled\"" >&5
michael@2: +echo "$as_me: WARNING: gsm.h:     section \"Present But Cannot Be Compiled\"" >&2;}
michael@2: +    { echo "$as_me:$LINENO: WARNING: gsm.h: proceeding with the preprocessor's result" >&5
michael@2: +echo "$as_me: WARNING: gsm.h: proceeding with the preprocessor's result" >&2;}
michael@2: +    { echo "$as_me:$LINENO: WARNING: gsm.h: in the future, the compiler will take precedence" >&5
michael@2: +echo "$as_me: WARNING: gsm.h: in the future, the compiler will take precedence" >&2;}
michael@2: +
michael@2: +    ;;
michael@2: +esac
michael@2: +{ echo "$as_me:$LINENO: checking for gsm.h" >&5
michael@2: +echo $ECHO_N "checking for gsm.h... $ECHO_C" >&6; }
michael@2: +if test "${ac_cv_header_gsm_h+set}" = set; then
michael@2: +  echo $ECHO_N "(cached) $ECHO_C" >&6
michael@2: +else
michael@2: +  ac_cv_header_gsm_h=$ac_header_preproc
michael@2: +fi
michael@2: +{ echo "$as_me:$LINENO: result: $ac_cv_header_gsm_h" >&5
michael@2: +echo "${ECHO_T}$ac_cv_header_gsm_h" >&6; }
michael@2: +
michael@2: +fi
michael@2: +if test $ac_cv_header_gsm_h = yes; then
michael@2: +  :
michael@2: +else
michael@2: +  { { echo "$as_me:$LINENO: error: gsm header files missing (gsm.h)" >&5
michael@2: +echo "$as_me: error: gsm header files missing (gsm.h)" >&2;}
michael@2: +   { (exit 1); exit 1; }; }
michael@2: +fi
michael@2: +
michael@2: +
michael@2: +
michael@2: +cat >>confdefs.h <<\_ACEOF
michael@2: +#define HAVE_GSM 1
michael@2: +_ACEOF
michael@2: +
michael@2: +	GSM_LIBS="-lgsm"
michael@2: +	echo "LIBS += -lgsm" >> $QT_INCL_PRO
michael@2: +	have_gsm="yes"
michael@2: +else
michael@2: +
michael@2: +	have_gsm="no"
michael@2: +	GSM_LIBS="\$(top_builddir)/src/audio/gsm/libgsm.a"
michael@2: +	echo "LIBS += ../audio/gsm/libgsm.a" >> $QT_INCL_PRO
michael@2: +fi
michael@2: +
michael@2: +#have_gsm="no"
michael@2: +#GSM_LIBS="\$(top_builddir)/src/audio/gsm/libgsm.a"
michael@2: +#echo "LIBS += ../audio/gsm/libgsm.a" >> $QT_INCL_PRO
michael@2: +
michael@2: +
michael@2: +
michael@2: +# Check if libgsm is available
michael@2: +{ echo "$as_me:$LINENO: checking for sf_open in -lgsm" >&5
michael@2: +echo $ECHO_N "checking for sf_open in -lgsm... $ECHO_C" >&6; }
michael@2: +if test "${ac_cv_lib_gsm_sf_open+set}" = set; then
michael@2: +  echo $ECHO_N "(cached) $ECHO_C" >&6
michael@2: +else
michael@2: +  ac_check_lib_save_LIBS=$LIBS
michael@2: +LIBS="-lgsm  $LIBS"
michael@2: +cat >conftest.$ac_ext <<_ACEOF
michael@2: +/* confdefs.h.  */
michael@2: +_ACEOF
michael@2: +cat confdefs.h >>conftest.$ac_ext
michael@2: +cat >>conftest.$ac_ext <<_ACEOF
michael@2: +/* end confdefs.h.  */
michael@2: +
michael@2: +/* Override any GCC internal prototype to avoid an error.
michael@2: +   Use char because int might match the return type of a GCC
michael@2: +   builtin and then its argument prototype would still apply.  */
michael@2: +#ifdef __cplusplus
michael@2: +extern "C"
michael@2: +#endif
michael@2: +char sf_open ();
michael@2: +int
michael@2: +main ()
michael@2: +{
michael@2: +return sf_open ();
michael@2: +  ;
michael@2: +  return 0;
michael@2: +}
michael@2: +_ACEOF
michael@2: +rm -f conftest.$ac_objext conftest$ac_exeext
michael@2: +if { (ac_try="$ac_link"
michael@2: +case "(($ac_try" in
michael@2: +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
michael@2: +  *) ac_try_echo=$ac_try;;
michael@2: +esac
michael@2: +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
michael@2: +  (eval "$ac_link") 2>conftest.er1
michael@2: +  ac_status=$?
michael@2: +  grep -v '^ *+' conftest.er1 >conftest.err
michael@2: +  rm -f conftest.er1
michael@2: +  cat conftest.err >&5
michael@2: +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: +  (exit $ac_status); } && {
michael@2: +	 test -z "$ac_cxx_werror_flag" ||
michael@2: +	 test ! -s conftest.err
michael@2: +       } && test -s conftest$ac_exeext &&
michael@2: +       $as_test_x conftest$ac_exeext; then
michael@2: +  ac_cv_lib_gsm_sf_open=yes
michael@2: +else
michael@2: +  echo "$as_me: failed program was:" >&5
michael@2: +sed 's/^/| /' conftest.$ac_ext >&5
michael@2: +
michael@2: +	ac_cv_lib_gsm_sf_open=no
michael@2: +fi
michael@2: +
michael@2: +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
michael@2: +      conftest$ac_exeext conftest.$ac_ext
michael@2: +LIBS=$ac_check_lib_save_LIBS
michael@2: +fi
michael@2: +{ echo "$as_me:$LINENO: result: $ac_cv_lib_gsm_sf_open" >&5
michael@2: +echo "${ECHO_T}$ac_cv_lib_gsm_sf_open" >&6; }
michael@2: +if test $ac_cv_lib_gsm_sf_open = yes; then
michael@2: +
michael@2: +	if test "${ac_cv_header_gsm_h+set}" = set; then
michael@2: +  { echo "$as_me:$LINENO: checking for gsm.h" >&5
michael@2: +echo $ECHO_N "checking for gsm.h... $ECHO_C" >&6; }
michael@2: +if test "${ac_cv_header_gsm_h+set}" = set; then
michael@2: +  echo $ECHO_N "(cached) $ECHO_C" >&6
michael@2: +fi
michael@2: +{ echo "$as_me:$LINENO: result: $ac_cv_header_gsm_h" >&5
michael@2: +echo "${ECHO_T}$ac_cv_header_gsm_h" >&6; }
michael@2: +else
michael@2: +  # Is the header compilable?
michael@2: +{ echo "$as_me:$LINENO: checking gsm.h usability" >&5
michael@2: +echo $ECHO_N "checking gsm.h usability... $ECHO_C" >&6; }
michael@2: +cat >conftest.$ac_ext <<_ACEOF
michael@2: +/* confdefs.h.  */
michael@2: +_ACEOF
michael@2: +cat confdefs.h >>conftest.$ac_ext
michael@2: +cat >>conftest.$ac_ext <<_ACEOF
michael@2: +/* end confdefs.h.  */
michael@2: +$ac_includes_default
michael@2: +#include <gsm.h>
michael@2: +_ACEOF
michael@2: +rm -f conftest.$ac_objext
michael@2: +if { (ac_try="$ac_compile"
michael@2: +case "(($ac_try" in
michael@2: +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
michael@2: +  *) ac_try_echo=$ac_try;;
michael@2: +esac
michael@2: +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
michael@2: +  (eval "$ac_compile") 2>conftest.er1
michael@2: +  ac_status=$?
michael@2: +  grep -v '^ *+' conftest.er1 >conftest.err
michael@2: +  rm -f conftest.er1
michael@2: +  cat conftest.err >&5
michael@2: +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: +  (exit $ac_status); } && {
michael@2: +	 test -z "$ac_cxx_werror_flag" ||
michael@2: +	 test ! -s conftest.err
michael@2: +       } && test -s conftest.$ac_objext; then
michael@2: +  ac_header_compiler=yes
michael@2: +else
michael@2: +  echo "$as_me: failed program was:" >&5
michael@2: +sed 's/^/| /' conftest.$ac_ext >&5
michael@2: +
michael@2: +	ac_header_compiler=no
michael@2: +fi
michael@2: +
michael@2: +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
michael@2: +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
michael@2: +echo "${ECHO_T}$ac_header_compiler" >&6; }
michael@2: +
michael@2: +# Is the header present?
michael@2: +{ echo "$as_me:$LINENO: checking gsm.h presence" >&5
michael@2: +echo $ECHO_N "checking gsm.h presence... $ECHO_C" >&6; }
michael@2: +cat >conftest.$ac_ext <<_ACEOF
michael@2: +/* confdefs.h.  */
michael@2: +_ACEOF
michael@2: +cat confdefs.h >>conftest.$ac_ext
michael@2: +cat >>conftest.$ac_ext <<_ACEOF
michael@2: +/* end confdefs.h.  */
michael@2: +#include <gsm.h>
michael@2: +_ACEOF
michael@2: +if { (ac_try="$ac_cpp conftest.$ac_ext"
michael@2: +case "(($ac_try" in
michael@2: +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
michael@2: +  *) ac_try_echo=$ac_try;;
michael@2: +esac
michael@2: +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
michael@2: +  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
michael@2: +  ac_status=$?
michael@2: +  grep -v '^ *+' conftest.er1 >conftest.err
michael@2: +  rm -f conftest.er1
michael@2: +  cat conftest.err >&5
michael@2: +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: +  (exit $ac_status); } >/dev/null && {
michael@2: +	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
michael@2: +	 test ! -s conftest.err
michael@2: +       }; then
michael@2: +  ac_header_preproc=yes
michael@2: +else
michael@2: +  echo "$as_me: failed program was:" >&5
michael@2: +sed 's/^/| /' conftest.$ac_ext >&5
michael@2: +
michael@2: +  ac_header_preproc=no
michael@2: +fi
michael@2: +
michael@2: +rm -f conftest.err conftest.$ac_ext
michael@2: +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
michael@2: +echo "${ECHO_T}$ac_header_preproc" >&6; }
michael@2: +
michael@2: +# So?  What about this header?
michael@2: +case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
michael@2: +  yes:no: )
michael@2: +    { echo "$as_me:$LINENO: WARNING: gsm.h: accepted by the compiler, rejected by the preprocessor!" >&5
michael@2: +echo "$as_me: WARNING: gsm.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
michael@2: +    { echo "$as_me:$LINENO: WARNING: gsm.h: proceeding with the compiler's result" >&5
michael@2: +echo "$as_me: WARNING: gsm.h: proceeding with the compiler's result" >&2;}
michael@2: +    ac_header_preproc=yes
michael@2: +    ;;
michael@2: +  no:yes:* )
michael@2: +    { echo "$as_me:$LINENO: WARNING: gsm.h: present but cannot be compiled" >&5
michael@2: +echo "$as_me: WARNING: gsm.h: present but cannot be compiled" >&2;}
michael@2: +    { echo "$as_me:$LINENO: WARNING: gsm.h:     check for missing prerequisite headers?" >&5
michael@2: +echo "$as_me: WARNING: gsm.h:     check for missing prerequisite headers?" >&2;}
michael@2: +    { echo "$as_me:$LINENO: WARNING: gsm.h: see the Autoconf documentation" >&5
michael@2: +echo "$as_me: WARNING: gsm.h: see the Autoconf documentation" >&2;}
michael@2: +    { echo "$as_me:$LINENO: WARNING: gsm.h:     section \"Present But Cannot Be Compiled\"" >&5
michael@2: +echo "$as_me: WARNING: gsm.h:     section \"Present But Cannot Be Compiled\"" >&2;}
michael@2: +    { echo "$as_me:$LINENO: WARNING: gsm.h: proceeding with the preprocessor's result" >&5
michael@2: +echo "$as_me: WARNING: gsm.h: proceeding with the preprocessor's result" >&2;}
michael@2: +    { echo "$as_me:$LINENO: WARNING: gsm.h: in the future, the compiler will take precedence" >&5
michael@2: +echo "$as_me: WARNING: gsm.h: in the future, the compiler will take precedence" >&2;}
michael@2: +
michael@2: +    ;;
michael@2: +esac
michael@2: +{ echo "$as_me:$LINENO: checking for gsm.h" >&5
michael@2: +echo $ECHO_N "checking for gsm.h... $ECHO_C" >&6; }
michael@2: +if test "${ac_cv_header_gsm_h+set}" = set; then
michael@2: +  echo $ECHO_N "(cached) $ECHO_C" >&6
michael@2: +else
michael@2: +  ac_cv_header_gsm_h=$ac_header_preproc
michael@2: +fi
michael@2: +{ echo "$as_me:$LINENO: result: $ac_cv_header_gsm_h" >&5
michael@2: +echo "${ECHO_T}$ac_cv_header_gsm_h" >&6; }
michael@2: +
michael@2: +fi
michael@2: +if test $ac_cv_header_gsm_h = yes; then
michael@2: +  :
michael@2: +else
michael@2: +  { { echo "$as_me:$LINENO: error: gsm header files missing (gsm.h)" >&5
michael@2: +echo "$as_me: error: gsm header files missing (gsm.h)" >&2;}
michael@2: +   { (exit 1); exit 1; }; }
michael@2: +fi
michael@2: +
michael@2: +
michael@2: +
michael@2: +cat >>confdefs.h <<\_ACEOF
michael@2: +#define HAVE_GSM 1
michael@2: +_ACEOF
michael@2: +
michael@2: +	LIBS="-lgsm $LIBS"
michael@2: +	echo "LIBS += -lgsm" >> $QT_INCL_PRO
michael@2: +	have_gsm="yes"
michael@2: +else
michael@2: +
michael@2: +	have_gsm="no"
michael@2: +	echo "$(top_builddir)/src/audio/gsm/libgsm.a" >> $QT_INCL_PRO
michael@2: +fi
michael@2: +
michael@2: +
michael@2: +# Check if ALSA is available
michael@2: +{ echo "$as_me:$LINENO: checking for main in -lasound" >&5
michael@2: +echo $ECHO_N "checking for main in -lasound... $ECHO_C" >&6; }
michael@2: +if test "${ac_cv_lib_asound_main+set}" = set; then
michael@2: +  echo $ECHO_N "(cached) $ECHO_C" >&6
michael@2: +else
michael@2: +  ac_check_lib_save_LIBS=$LIBS
michael@2: +LIBS="-lasound  $LIBS"
michael@2: +cat >conftest.$ac_ext <<_ACEOF
michael@2: +/* confdefs.h.  */
michael@2: +_ACEOF
michael@2: +cat confdefs.h >>conftest.$ac_ext
michael@2: +cat >>conftest.$ac_ext <<_ACEOF
michael@2: +/* end confdefs.h.  */
michael@2: +
michael@2: +
michael@2: +int
michael@2: +main ()
michael@2: +{
michael@2: +return main ();
michael@2: +  ;
michael@2: +  return 0;
michael@2: +}
michael@2: +_ACEOF
michael@2: +rm -f conftest.$ac_objext conftest$ac_exeext
michael@2: +if { (ac_try="$ac_link"
michael@2: +case "(($ac_try" in
michael@2: +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
michael@2: +  *) ac_try_echo=$ac_try;;
michael@2: +esac
michael@2: +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
michael@2: +  (eval "$ac_link") 2>conftest.er1
michael@2: +  ac_status=$?
michael@2: +  grep -v '^ *+' conftest.er1 >conftest.err
michael@2: +  rm -f conftest.er1
michael@2: +  cat conftest.err >&5
michael@2: +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: +  (exit $ac_status); } && {
michael@2: +	 test -z "$ac_cxx_werror_flag" ||
michael@2: +	 test ! -s conftest.err
michael@2: +       } && test -s conftest$ac_exeext &&
michael@2: +       $as_test_x conftest$ac_exeext; then
michael@2: +  ac_cv_lib_asound_main=yes
michael@2: +else
michael@2: +  echo "$as_me: failed program was:" >&5
michael@2: +sed 's/^/| /' conftest.$ac_ext >&5
michael@2: +
michael@2: +	ac_cv_lib_asound_main=no
michael@2: +fi
michael@2: +
michael@2: +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
michael@2: +      conftest$ac_exeext conftest.$ac_ext
michael@2: +LIBS=$ac_check_lib_save_LIBS
michael@2: +fi
michael@2: +{ echo "$as_me:$LINENO: result: $ac_cv_lib_asound_main" >&5
michael@2: +echo "${ECHO_T}$ac_cv_lib_asound_main" >&6; }
michael@2: +if test $ac_cv_lib_asound_main = yes; then
michael@2: +
michael@2: +	if test "${ac_cv_header_alsa_asoundlib_h+set}" = set; then
michael@2: +  { echo "$as_me:$LINENO: checking for alsa/asoundlib.h" >&5
michael@2: +echo $ECHO_N "checking for alsa/asoundlib.h... $ECHO_C" >&6; }
michael@2: +if test "${ac_cv_header_alsa_asoundlib_h+set}" = set; then
michael@2: +  echo $ECHO_N "(cached) $ECHO_C" >&6
michael@2: +fi
michael@2: +{ echo "$as_me:$LINENO: result: $ac_cv_header_alsa_asoundlib_h" >&5
michael@2: +echo "${ECHO_T}$ac_cv_header_alsa_asoundlib_h" >&6; }
michael@2: +else
michael@2: +  # Is the header compilable?
michael@2: +{ echo "$as_me:$LINENO: checking alsa/asoundlib.h usability" >&5
michael@2: +echo $ECHO_N "checking alsa/asoundlib.h usability... $ECHO_C" >&6; }
michael@2: +cat >conftest.$ac_ext <<_ACEOF
michael@2: +/* confdefs.h.  */
michael@2: +_ACEOF
michael@2: +cat confdefs.h >>conftest.$ac_ext
michael@2: +cat >>conftest.$ac_ext <<_ACEOF
michael@2: +/* end confdefs.h.  */
michael@2: +$ac_includes_default
michael@2: +#include <alsa/asoundlib.h>
michael@2: +_ACEOF
michael@2: +rm -f conftest.$ac_objext
michael@2: +if { (ac_try="$ac_compile"
michael@2: +case "(($ac_try" in
michael@2: +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
michael@2: +  *) ac_try_echo=$ac_try;;
michael@2: +esac
michael@2: +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
michael@2: +  (eval "$ac_compile") 2>conftest.er1
michael@2: +  ac_status=$?
michael@2: +  grep -v '^ *+' conftest.er1 >conftest.err
michael@2: +  rm -f conftest.er1
michael@2: +  cat conftest.err >&5
michael@2: +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: +  (exit $ac_status); } && {
michael@2: +	 test -z "$ac_cxx_werror_flag" ||
michael@2: +	 test ! -s conftest.err
michael@2: +       } && test -s conftest.$ac_objext; then
michael@2:    ac_header_compiler=yes
michael@2:  else
michael@2:    echo "$as_me: failed program was:" >&5
michael@2: @@ -19729,17 +18150,10 @@
michael@2:    rm -f conftest.er1
michael@2:    cat conftest.err >&5
michael@2:    echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); } >/dev/null; then
michael@2: -  if test -s conftest.err; then
michael@2: -    ac_cpp_err=$ac_cxx_preproc_warn_flag
michael@2: -    ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
michael@2: -  else
michael@2: -    ac_cpp_err=
michael@2: -  fi
michael@2: -else
michael@2: -  ac_cpp_err=yes
michael@2: -fi
michael@2: -if test -z "$ac_cpp_err"; then
michael@2: +  (exit $ac_status); } >/dev/null && {
michael@2: +	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
michael@2: +	 test ! -s conftest.err
michael@2: +       }; then
michael@2:    ac_header_preproc=yes
michael@2:  else
michael@2:    echo "$as_me: failed program was:" >&5
michael@2: @@ -19850,27 +18264,11 @@
michael@2:    rm -f conftest.er1
michael@2:    cat conftest.err >&5
michael@2:    echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); } &&
michael@2: -	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
michael@2: -  { (case "(($ac_try" in
michael@2: -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
michael@2: -  *) ac_try_echo=$ac_try;;
michael@2: -esac
michael@2: -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
michael@2: -  (eval "$ac_try") 2>&5
michael@2: -  ac_status=$?
michael@2: -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); }; } &&
michael@2: -	 { ac_try='test -s conftest$ac_exeext'
michael@2: -  { (case "(($ac_try" in
michael@2: -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
michael@2: -  *) ac_try_echo=$ac_try;;
michael@2: -esac
michael@2: -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
michael@2: -  (eval "$ac_try") 2>&5
michael@2: -  ac_status=$?
michael@2: -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); }; }; then
michael@2: +  (exit $ac_status); } && {
michael@2: +	 test -z "$ac_cxx_werror_flag" ||
michael@2: +	 test ! -s conftest.err
michael@2: +       } && test -s conftest$ac_exeext &&
michael@2: +       $as_test_x conftest$ac_exeext; then
michael@2:    ac_cv_lib_speex_main=yes
michael@2:  else
michael@2:    echo "$as_me: failed program was:" >&5
michael@2: @@ -19879,7 +18277,7 @@
michael@2:  	ac_cv_lib_speex_main=no
michael@2:  fi
michael@2:  
michael@2: -rm -f core conftest.err conftest.$ac_objext \
michael@2: +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
michael@2:        conftest$ac_exeext conftest.$ac_ext
michael@2:  LIBS=$ac_check_lib_save_LIBS
michael@2:  fi
michael@2: @@ -19921,27 +18319,10 @@
michael@2:    rm -f conftest.er1
michael@2:    cat conftest.err >&5
michael@2:    echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); } &&
michael@2: -	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
michael@2: -  { (case "(($ac_try" in
michael@2: -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
michael@2: -  *) ac_try_echo=$ac_try;;
michael@2: -esac
michael@2: -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
michael@2: -  (eval "$ac_try") 2>&5
michael@2: -  ac_status=$?
michael@2: -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); }; } &&
michael@2: -	 { ac_try='test -s conftest.$ac_objext'
michael@2: -  { (case "(($ac_try" in
michael@2: -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
michael@2: -  *) ac_try_echo=$ac_try;;
michael@2: -esac
michael@2: -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
michael@2: -  (eval "$ac_try") 2>&5
michael@2: -  ac_status=$?
michael@2: -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); }; }; then
michael@2: +  (exit $ac_status); } && {
michael@2: +	 test -z "$ac_cxx_werror_flag" ||
michael@2: +	 test ! -s conftest.err
michael@2: +       } && test -s conftest.$ac_objext; then
michael@2:    ac_header_compiler=yes
michael@2:  else
michael@2:    echo "$as_me: failed program was:" >&5
michael@2: @@ -19977,17 +18358,10 @@
michael@2:    rm -f conftest.er1
michael@2:    cat conftest.err >&5
michael@2:    echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); } >/dev/null; then
michael@2: -  if test -s conftest.err; then
michael@2: -    ac_cpp_err=$ac_cxx_preproc_warn_flag
michael@2: -    ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
michael@2: -  else
michael@2: -    ac_cpp_err=
michael@2: -  fi
michael@2: -else
michael@2: -  ac_cpp_err=yes
michael@2: -fi
michael@2: -if test -z "$ac_cpp_err"; then
michael@2: +  (exit $ac_status); } >/dev/null && {
michael@2: +	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
michael@2: +	 test ! -s conftest.err
michael@2: +       }; then
michael@2:    ac_header_preproc=yes
michael@2:  else
michael@2:    echo "$as_me: failed program was:" >&5
michael@2: @@ -20355,27 +18729,11 @@
michael@2:    rm -f conftest.er1
michael@2:    cat conftest.err >&5
michael@2:    echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); } &&
michael@2: -	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
michael@2: -  { (case "(($ac_try" in
michael@2: -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
michael@2: -  *) ac_try_echo=$ac_try;;
michael@2: -esac
michael@2: -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
michael@2: -  (eval "$ac_try") 2>&5
michael@2: -  ac_status=$?
michael@2: -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); }; } &&
michael@2: -	 { ac_try='test -s conftest$ac_exeext'
michael@2: -  { (case "(($ac_try" in
michael@2: -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
michael@2: -  *) ac_try_echo=$ac_try;;
michael@2: -esac
michael@2: -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
michael@2: -  (eval "$ac_try") 2>&5
michael@2: -  ac_status=$?
michael@2: -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); }; }; then
michael@2: +  (exit $ac_status); } && {
michael@2: +	 test -z "$ac_cxx_werror_flag" ||
michael@2: +	 test ! -s conftest.err
michael@2: +       } && test -s conftest$ac_exeext &&
michael@2: +       $as_test_x conftest$ac_exeext; then
michael@2:    ac_cv_lib_ilbc_iLBC_decode=yes
michael@2:  else
michael@2:    echo "$as_me: failed program was:" >&5
michael@2: @@ -20384,7 +18742,7 @@
michael@2:  	ac_cv_lib_ilbc_iLBC_decode=no
michael@2:  fi
michael@2:  
michael@2: -rm -f core conftest.err conftest.$ac_objext \
michael@2: +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
michael@2:        conftest$ac_exeext conftest.$ac_ext
michael@2:  LIBS=$ac_check_lib_save_LIBS
michael@2:  fi
michael@2: @@ -20426,27 +18784,10 @@
michael@2:    rm -f conftest.er1
michael@2:    cat conftest.err >&5
michael@2:    echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); } &&
michael@2: -	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
michael@2: -  { (case "(($ac_try" in
michael@2: -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
michael@2: -  *) ac_try_echo=$ac_try;;
michael@2: -esac
michael@2: -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
michael@2: -  (eval "$ac_try") 2>&5
michael@2: -  ac_status=$?
michael@2: -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); }; } &&
michael@2: -	 { ac_try='test -s conftest.$ac_objext'
michael@2: -  { (case "(($ac_try" in
michael@2: -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
michael@2: -  *) ac_try_echo=$ac_try;;
michael@2: -esac
michael@2: -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
michael@2: -  (eval "$ac_try") 2>&5
michael@2: -  ac_status=$?
michael@2: -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); }; }; then
michael@2: +  (exit $ac_status); } && {
michael@2: +	 test -z "$ac_cxx_werror_flag" ||
michael@2: +	 test ! -s conftest.err
michael@2: +       } && test -s conftest.$ac_objext; then
michael@2:    ac_header_compiler=yes
michael@2:  else
michael@2:    echo "$as_me: failed program was:" >&5
michael@2: @@ -20482,17 +18823,10 @@
michael@2:    rm -f conftest.er1
michael@2:    cat conftest.err >&5
michael@2:    echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); } >/dev/null; then
michael@2: -  if test -s conftest.err; then
michael@2: -    ac_cpp_err=$ac_cxx_preproc_warn_flag
michael@2: -    ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
michael@2: -  else
michael@2: -    ac_cpp_err=
michael@2: -  fi
michael@2: -else
michael@2: -  ac_cpp_err=yes
michael@2: -fi
michael@2: -if test -z "$ac_cpp_err"; then
michael@2: +  (exit $ac_status); } >/dev/null && {
michael@2: +	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
michael@2: +	 test ! -s conftest.err
michael@2: +       }; then
michael@2:    ac_header_preproc=yes
michael@2:  else
michael@2:    echo "$as_me: failed program was:" >&5
michael@2: @@ -20714,27 +19048,11 @@
michael@2:    rm -f conftest.er1
michael@2:    cat conftest.err >&5
michael@2:    echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); } &&
michael@2: -	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
michael@2: -  { (case "(($ac_try" in
michael@2: -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
michael@2: -  *) ac_try_echo=$ac_try;;
michael@2: -esac
michael@2: -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
michael@2: -  (eval "$ac_try") 2>&5
michael@2: -  ac_status=$?
michael@2: -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); }; } &&
michael@2: -	 { ac_try='test -s conftest$ac_exeext'
michael@2: -  { (case "(($ac_try" in
michael@2: -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
michael@2: -  *) ac_try_echo=$ac_try;;
michael@2: -esac
michael@2: -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
michael@2: -  (eval "$ac_try") 2>&5
michael@2: -  ac_status=$?
michael@2: -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); }; }; then
michael@2: +  (exit $ac_status); } && {
michael@2: +	 test -z "$ac_cxx_werror_flag" ||
michael@2: +	 test ! -s conftest.err
michael@2: +       } && test -s conftest$ac_exeext &&
michael@2: +       $as_test_x conftest$ac_exeext; then
michael@2:    ac_cv_lib_zrtpcpp_main=yes
michael@2:  else
michael@2:    echo "$as_me: failed program was:" >&5
michael@2: @@ -20743,7 +19061,7 @@
michael@2:  	ac_cv_lib_zrtpcpp_main=no
michael@2:  fi
michael@2:  
michael@2: -rm -f core conftest.err conftest.$ac_objext \
michael@2: +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
michael@2:        conftest$ac_exeext conftest.$ac_ext
michael@2:  LIBS=$ac_check_lib_save_LIBS
michael@2:  fi
michael@2: @@ -20785,27 +19103,10 @@
michael@2:    rm -f conftest.er1
michael@2:    cat conftest.err >&5
michael@2:    echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); } &&
michael@2: -	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
michael@2: -  { (case "(($ac_try" in
michael@2: -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
michael@2: -  *) ac_try_echo=$ac_try;;
michael@2: -esac
michael@2: -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
michael@2: -  (eval "$ac_try") 2>&5
michael@2: -  ac_status=$?
michael@2: -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); }; } &&
michael@2: -	 { ac_try='test -s conftest.$ac_objext'
michael@2: -  { (case "(($ac_try" in
michael@2: -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
michael@2: -  *) ac_try_echo=$ac_try;;
michael@2: -esac
michael@2: -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
michael@2: -  (eval "$ac_try") 2>&5
michael@2: -  ac_status=$?
michael@2: -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); }; }; then
michael@2: +  (exit $ac_status); } && {
michael@2: +	 test -z "$ac_cxx_werror_flag" ||
michael@2: +	 test ! -s conftest.err
michael@2: +       } && test -s conftest.$ac_objext; then
michael@2:    ac_header_compiler=yes
michael@2:  else
michael@2:    echo "$as_me: failed program was:" >&5
michael@2: @@ -20841,17 +19142,10 @@
michael@2:    rm -f conftest.er1
michael@2:    cat conftest.err >&5
michael@2:    echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); } >/dev/null; then
michael@2: -  if test -s conftest.err; then
michael@2: -    ac_cpp_err=$ac_cxx_preproc_warn_flag
michael@2: -    ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
michael@2: -  else
michael@2: -    ac_cpp_err=
michael@2: -  fi
michael@2: -else
michael@2: -  ac_cpp_err=yes
michael@2: -fi
michael@2: -if test -z "$ac_cpp_err"; then
michael@2: +  (exit $ac_status); } >/dev/null && {
michael@2: +	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
michael@2: +	 test ! -s conftest.err
michael@2: +       }; then
michael@2:    ac_header_preproc=yes
michael@2:  else
michael@2:    echo "$as_me: failed program was:" >&5
michael@2: @@ -21072,27 +19366,10 @@
michael@2:    rm -f conftest.er1
michael@2:    cat conftest.err >&5
michael@2:    echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); } &&
michael@2: -	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
michael@2: -  { (case "(($ac_try" in
michael@2: -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
michael@2: -  *) ac_try_echo=$ac_try;;
michael@2: -esac
michael@2: -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
michael@2: -  (eval "$ac_try") 2>&5
michael@2: -  ac_status=$?
michael@2: -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); }; } &&
michael@2: -	 { ac_try='test -s conftest.$ac_objext'
michael@2: -  { (case "(($ac_try" in
michael@2: -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
michael@2: -  *) ac_try_echo=$ac_try;;
michael@2: -esac
michael@2: -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
michael@2: -  (eval "$ac_try") 2>&5
michael@2: -  ac_status=$?
michael@2: -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); }; }; then
michael@2: +  (exit $ac_status); } && {
michael@2: +	 test -z "$ac_cxx_werror_flag" ||
michael@2: +	 test ! -s conftest.err
michael@2: +       } && test -s conftest.$ac_objext; then
michael@2:    ac_header_compiler=yes
michael@2:  else
michael@2:    echo "$as_me: failed program was:" >&5
michael@2: @@ -21128,17 +19405,10 @@
michael@2:    rm -f conftest.er1
michael@2:    cat conftest.err >&5
michael@2:    echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); } >/dev/null; then
michael@2: -  if test -s conftest.err; then
michael@2: -    ac_cpp_err=$ac_cxx_preproc_warn_flag
michael@2: -    ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
michael@2: -  else
michael@2: -    ac_cpp_err=
michael@2: -  fi
michael@2: -else
michael@2: -  ac_cpp_err=yes
michael@2: -fi
michael@2: -if test -z "$ac_cpp_err"; then
michael@2: +  (exit $ac_status); } >/dev/null && {
michael@2: +	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
michael@2: +	 test ! -s conftest.err
michael@2: +       }; then
michael@2:    ac_header_preproc=yes
michael@2:  else
michael@2:    echo "$as_me: failed program was:" >&5
michael@2: @@ -21650,27 +19920,11 @@
michael@2:    rm -f conftest.er1
michael@2:    cat conftest.err >&5
michael@2:    echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); } &&
michael@2: -	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
michael@2: -  { (case "(($ac_try" in
michael@2: -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
michael@2: -  *) ac_try_echo=$ac_try;;
michael@2: -esac
michael@2: -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
michael@2: -  (eval "$ac_try") 2>&5
michael@2: -  ac_status=$?
michael@2: -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); }; } &&
michael@2: -	 { ac_try='test -s conftest$ac_exeext'
michael@2: -  { (case "(($ac_try" in
michael@2: -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
michael@2: -  *) ac_try_echo=$ac_try;;
michael@2: -esac
michael@2: -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
michael@2: -  (eval "$ac_try") 2>&5
michael@2: -  ac_status=$?
michael@2: -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); }; }; then
michael@2: +  (exit $ac_status); } && {
michael@2: +	 test -z "$ac_cxx_werror_flag" ||
michael@2: +	 test ! -s conftest.err
michael@2: +       } && test -s conftest$ac_exeext &&
michael@2: +       $as_test_x conftest$ac_exeext; then
michael@2:    ac_cv_lib_boost_regex_main=yes
michael@2:  else
michael@2:    echo "$as_me: failed program was:" >&5
michael@2: @@ -21679,7 +19933,7 @@
michael@2:  	ac_cv_lib_boost_regex_main=no
michael@2:  fi
michael@2:  
michael@2: -rm -f core conftest.err conftest.$ac_objext \
michael@2: +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
michael@2:        conftest$ac_exeext conftest.$ac_ext
michael@2:  LIBS=$ac_check_lib_save_LIBS
michael@2:  fi
michael@2: @@ -21727,27 +19981,11 @@
michael@2:    rm -f conftest.er1
michael@2:    cat conftest.err >&5
michael@2:    echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); } &&
michael@2: -	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
michael@2: -  { (case "(($ac_try" in
michael@2: -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
michael@2: -  *) ac_try_echo=$ac_try;;
michael@2: -esac
michael@2: -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
michael@2: -  (eval "$ac_try") 2>&5
michael@2: -  ac_status=$?
michael@2: -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); }; } &&
michael@2: -	 { ac_try='test -s conftest$ac_exeext'
michael@2: -  { (case "(($ac_try" in
michael@2: -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
michael@2: -  *) ac_try_echo=$ac_try;;
michael@2: -esac
michael@2: -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
michael@2: -  (eval "$ac_try") 2>&5
michael@2: -  ac_status=$?
michael@2: -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: -  (exit $ac_status); }; }; then
michael@2: +  (exit $ac_status); } && {
michael@2: +	 test -z "$ac_cxx_werror_flag" ||
michael@2: +	 test ! -s conftest.err
michael@2: +       } && test -s conftest$ac_exeext &&
michael@2: +       $as_test_x conftest$ac_exeext; then
michael@2:    ac_cv_lib_boost_regex_gcc_main=yes
michael@2:  else
michael@2:    echo "$as_me: failed program was:" >&5
michael@2: @@ -21756,7 +19994,7 @@
michael@2:  	ac_cv_lib_boost_regex_gcc_main=no
michael@2:  fi
michael@2:  
michael@2: -rm -f core conftest.err conftest.$ac_objext \
michael@2: +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
michael@2:        conftest$ac_exeext conftest.$ac_ext
michael@2:  LIBS=$ac_check_lib_save_LIBS
michael@2:  fi
michael@2: @@ -21767,6 +20005,67 @@
michael@2:  		LIBS="-lboost_regex-gcc $LIBS"
michael@2:  		echo "LIBS += -lboost_regex-gcc" >> $QT_INCL_PRO
michael@2:  else
michael@2: +
michael@2: +		{ echo "$as_me:$LINENO: checking for main in -lboost_regex-mt" >&5
michael@2: +echo $ECHO_N "checking for main in -lboost_regex-mt... $ECHO_C" >&6; }
michael@2: +if test "${ac_cv_lib_boost_regex_mt_main+set}" = set; then
michael@2: +  echo $ECHO_N "(cached) $ECHO_C" >&6
michael@2: +else
michael@2: +  ac_check_lib_save_LIBS=$LIBS
michael@2: +LIBS="-lboost_regex-mt  $LIBS"
michael@2: +cat >conftest.$ac_ext <<_ACEOF
michael@2: +/* confdefs.h.  */
michael@2: +_ACEOF
michael@2: +cat confdefs.h >>conftest.$ac_ext
michael@2: +cat >>conftest.$ac_ext <<_ACEOF
michael@2: +/* end confdefs.h.  */
michael@2: +
michael@2: +
michael@2: +int
michael@2: +main ()
michael@2: +{
michael@2: +return main ();
michael@2: +  ;
michael@2: +  return 0;
michael@2: +}
michael@2: +_ACEOF
michael@2: +rm -f conftest.$ac_objext conftest$ac_exeext
michael@2: +if { (ac_try="$ac_link"
michael@2: +case "(($ac_try" in
michael@2: +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
michael@2: +  *) ac_try_echo=$ac_try;;
michael@2: +esac
michael@2: +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
michael@2: +  (eval "$ac_link") 2>conftest.er1
michael@2: +  ac_status=$?
michael@2: +  grep -v '^ *+' conftest.er1 >conftest.err
michael@2: +  rm -f conftest.er1
michael@2: +  cat conftest.err >&5
michael@2: +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@2: +  (exit $ac_status); } && {
michael@2: +	 test -z "$ac_cxx_werror_flag" ||
michael@2: +	 test ! -s conftest.err
michael@2: +       } && test -s conftest$ac_exeext &&
michael@2: +       $as_test_x conftest$ac_exeext; then
michael@2: +  ac_cv_lib_boost_regex_mt_main=yes
michael@2: +else
michael@2: +  echo "$as_me: failed program was:" >&5
michael@2: +sed 's/^/| /' conftest.$ac_ext >&5
michael@2: +
michael@2: +	ac_cv_lib_boost_regex_mt_main=no
michael@2: +fi
michael@2: +
michael@2: +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
michael@2: +      conftest$ac_exeext conftest.$ac_ext
michael@2: +LIBS=$ac_check_lib_save_LIBS
michael@2: +fi
michael@2: +{ echo "$as_me:$LINENO: result: $ac_cv_lib_boost_regex_mt_main" >&5
michael@2: +echo "${ECHO_T}$ac_cv_lib_boost_regex_mt_main" >&6; }
michael@2: +if test $ac_cv_lib_boost_regex_mt_main = yes; then
michael@2: +
michael@2: +			LIBS="-lboost_regex-mt $LIBS"
michael@2: +			echo "LIBS += -lboost_regex-mt" >> $QT_INCL_PRO
michael@2: +else
michael@2:    { { echo "$as_me:$LINENO: error: libboost_regex library is missing (boost package)." >&5
michael@2:  echo "$as_me: error: libboost_regex library is missing (boost package)." >&2;}
michael@2:     { (exit 1); exit 1; }; }
michael@2: @@ -21774,6 +20073,8 @@
michael@2:  
michael@2:  fi
michael@2:  
michael@2: +fi
michael@2: +
michael@2:  
michael@2:  
michael@2:  { echo "$as_me:$LINENO: checking LRELEASE OPTIONS" >&5
michael@2: @@ -21954,7 +20255,8 @@
michael@2:  ## M4sh Initialization.  ##
michael@2:  ## --------------------- ##
michael@2:  
michael@2: -# Be Bourne compatible
michael@2: +# Be more Bourne compatible
michael@2: +DUALCASE=1; export DUALCASE # for MKS sh
michael@2:  if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
michael@2:    emulate sh
michael@2:    NULLCMD=:
michael@2: @@ -21963,10 +20265,13 @@
michael@2:    alias -g '${1+"$@"}'='"$@"'
michael@2:    setopt NO_GLOB_SUBST
michael@2:  else
michael@2: -  case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
michael@2: +  case `(set -o) 2>/dev/null` in
michael@2: +  *posix*) set -o posix ;;
michael@2: +esac
michael@2: +
michael@2:  fi
michael@2: -BIN_SH=xpg4; export BIN_SH # for Tru64
michael@2: -DUALCASE=1; export DUALCASE # for MKS sh
michael@2: +
michael@2: +
michael@2:  
michael@2:  
michael@2:  # PATH needs CR
michael@2: @@ -22190,19 +20495,28 @@
michael@2:    as_mkdir_p=false
michael@2:  fi
michael@2:  
michael@2: -# Find out whether ``test -x'' works.  Don't use a zero-byte file, as
michael@2: -# systems may use methods other than mode bits to determine executability.
michael@2: -cat >conf$$.file <<_ASEOF
michael@2: -#! /bin/sh
michael@2: -exit 0
michael@2: -_ASEOF
michael@2: -chmod +x conf$$.file
michael@2: -if test -x conf$$.file >/dev/null 2>&1; then
michael@2: -  as_executable_p="test -x"
michael@2: +if test -x / >/dev/null 2>&1; then
michael@2: +  as_test_x='test -x'
michael@2:  else
michael@2: -  as_executable_p=:
michael@2: +  if ls -dL / >/dev/null 2>&1; then
michael@2: +    as_ls_L_option=L
michael@2: +  else
michael@2: +    as_ls_L_option=
michael@2: +  fi
michael@2: +  as_test_x='
michael@2: +    eval sh -c '\''
michael@2: +      if test -d "$1"; then
michael@2: +        test -d "$1/.";
michael@2: +      else
michael@2: +	case $1 in
michael@2: +        -*)set "./$1";;
michael@2: +	esac;
michael@2: +	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
michael@2: +	???[sx]*):;;*)false;;esac;fi
michael@2: +    '\'' sh
michael@2: +  '
michael@2:  fi
michael@2: -rm -f conf$$.file
michael@2: +as_executable_p=$as_test_x
michael@2:  
michael@2:  # Sed expression to map a string onto a valid CPP name.
michael@2:  as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
michael@2: @@ -22218,7 +20532,7 @@
michael@2:  # values after options handling.
michael@2:  ac_log="
michael@2:  This file was extended by $as_me, which was
michael@2: -generated by GNU Autoconf 2.60.  Invocation command line was
michael@2: +generated by GNU Autoconf 2.61.  Invocation command line was
michael@2:  
michael@2:    CONFIG_FILES    = $CONFIG_FILES
michael@2:    CONFIG_HEADERS  = $CONFIG_HEADERS
michael@2: @@ -22247,7 +20561,7 @@
michael@2:  Usage: $0 [OPTIONS] [FILE]...
michael@2:  
michael@2:    -h, --help       print this help, then exit
michael@2: -  -V, --version    print version number, then exit
michael@2: +  -V, --version    print version number and configuration settings, then exit
michael@2:    -q, --quiet      do not print progress messages
michael@2:    -d, --debug      don't remove temporary files
michael@2:        --recheck    update $as_me by reconfiguring in the same conditions
michael@2: @@ -22271,7 +20585,7 @@
michael@2:  cat >>$CONFIG_STATUS <<_ACEOF
michael@2:  ac_cs_version="\\
michael@2:  config.status
michael@2: -configured by $0, generated by GNU Autoconf 2.60,
michael@2: +configured by $0, generated by GNU Autoconf 2.61,
michael@2:    with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
michael@2:  
michael@2:  Copyright (C) 2006 Free Software Foundation, Inc.
michael@2: @@ -22563,7 +20877,7 @@
michael@2:  CXXCPP!$CXXCPP$ac_delim
michael@2:  RANLIB!$RANLIB$ac_delim
michael@2:  LEX!$LEX$ac_delim
michael@2: -LEXLIB!$LEXLIB$ac_delim
michael@2: +LEX_OUTPUT_ROOT!$LEX_OUTPUT_ROOT$ac_delim
michael@2:  _ACEOF
michael@2:  
michael@2:    if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
michael@2: @@ -22605,7 +20919,7 @@
michael@2:  ac_delim='%!_!# '
michael@2:  for ac_last_try in false false false false false :; do
michael@2:    cat >conf$$subs.sed <<_ACEOF
michael@2: -LEX_OUTPUT_ROOT!$LEX_OUTPUT_ROOT$ac_delim
michael@2: +LEXLIB!$LEXLIB$ac_delim
michael@2:  YACC!$YACC$ac_delim
michael@2:  YFLAGS!$YFLAGS$ac_delim
michael@2:  GREP!$GREP$ac_delim
michael@2: @@ -23400,3 +21714,5 @@
michael@2:  echo "${ECHO_T}iLBC:        $have_ilbc" >&6; }
michael@2:  { echo "$as_me:$LINENO: result: ZRTP:        $have_zrtp" >&5
michael@2:  echo "${ECHO_T}ZRTP:        $have_zrtp" >&6; }
michael@2: +{ echo "$as_me:$LINENO: result: Libgsm dynamic link:	$have_gsm" >&5
michael@2: +echo "${ECHO_T}Libgsm dynamic link:	$have_gsm" >&6; }
michael@2: Index: configure.in
michael@2: diff -Nau configure.in.orig configure.in
michael@2: --- configure.in.orig	2009-01-31 05:48:30.000000000 +0100
michael@2: +++ configure.in	2009-02-23 14:26:38.000000000 +0100
michael@2: @@ -195,22 +195,33 @@
michael@2:  
michael@2:  # This check does not work on all platforms
michael@2:  # Check if libgsm is available
michael@2: -# AC_CHECK_LIB(gsm, sf_open, [
michael@2: -#	AC_CHECK_HEADER(gsm.h, [],
michael@2: -#		[AC_MSG_ERROR([gsm header files missing (gsm.h)])])
michael@2: -#	AC_DEFINE(HAVE_GSM, 1, [Define to 1 if you have the <libgsm> library.])
michael@2: -#	GSM_LIBS="-lgsm"
michael@2: -#	echo "LIBS += -lgsm" >> $QT_INCL_PRO
michael@2: -#	have_gsm="yes" ], [
michael@2: -#	have_gsm="no"
michael@2: -#	GSM_LIBS="\$(top_builddir)/src/audio/gsm/libgsm.a"
michael@2: -#	echo "LIBS += ../audio/gsm/libgsm.a" >> $QT_INCL_PRO ])
michael@2: -have_gsm="no"
michael@2: -GSM_LIBS="\$(top_builddir)/src/audio/gsm/libgsm.a"
michael@2: -echo "LIBS += ../audio/gsm/libgsm.a" >> $QT_INCL_PRO
michael@2: +AC_CHECK_LIB(gsm, sf_open, [
michael@2: +	AC_CHECK_HEADER(gsm.h, [],
michael@2: +		[AC_MSG_ERROR([gsm header files missing (gsm.h)])])
michael@2: +	AC_DEFINE(HAVE_GSM, 1, [Define to 1 if you have the <libgsm> library.])
michael@2: +	GSM_LIBS="-lgsm"
michael@2: +	echo "LIBS += -lgsm" >> $QT_INCL_PRO
michael@2: +	have_gsm="yes" ], [
michael@2: +	have_gsm="no"
michael@2: +	GSM_LIBS="\$(top_builddir)/src/audio/gsm/libgsm.a"
michael@2: +	echo "LIBS += ../audio/gsm/libgsm.a" >> $QT_INCL_PRO ])
michael@2: +#have_gsm="no"
michael@2: +#GSM_LIBS="\$(top_builddir)/src/audio/gsm/libgsm.a"
michael@2: +#echo "LIBS += ../audio/gsm/libgsm.a" >> $QT_INCL_PRO
michael@2:  
michael@2:  AC_SUBST(GSM_LIBS)
michael@2:  
michael@2: +# Check if libgsm is available
michael@2: +AC_CHECK_LIB(gsm, sf_open, [
michael@2: +	AC_CHECK_HEADER(gsm.h, [],
michael@2: +		[AC_MSG_ERROR([gsm header files missing (gsm.h)])])
michael@2: +	AC_DEFINE(HAVE_GSM, 1, [Define to 1 if you have the <libgsm> library.])
michael@2: +	LIBS="-lgsm $LIBS"
michael@2: +	echo "LIBS += -lgsm" >> $QT_INCL_PRO
michael@2: +	have_gsm="yes" ], [
michael@2: +	have_gsm="no"
michael@2: +	echo "$(top_builddir)/src/audio/gsm/libgsm.a" >> $QT_INCL_PRO ])
michael@2: +
michael@2:  # Check if ALSA is available
michael@2:  AC_CHECK_LIB(asound, main, [
michael@2:  	AC_CHECK_HEADER(alsa/asoundlib.h, [],
michael@2: @@ -294,7 +305,11 @@
michael@2:  	AC_CHECK_LIB(boost_regex-gcc, main, [
michael@2:  		LIBS="-lboost_regex-gcc $LIBS"
michael@2:  		echo "LIBS += -lboost_regex-gcc" >> $QT_INCL_PRO],
michael@2: -		[AC_MSG_ERROR([libboost_regex library is missing (boost package).])])])
michael@2: +		[
michael@2: +		AC_CHECK_LIB(boost_regex-mt, main, [
michael@2: +			LIBS="-lboost_regex-mt $LIBS"
michael@2: +			echo "LIBS += -lboost_regex-mt" >> $QT_INCL_PRO],
michael@2: +			[AC_MSG_ERROR([libboost_regex library is missing (boost package).])])])])
michael@2:  
michael@2:  ms_CHECK_LRELEASE()
michael@2:  	
michael@2: @@ -344,3 +359,4 @@
michael@2:  AC_MSG_RESULT([Speex:       $have_speex])
michael@2:  AC_MSG_RESULT([iLBC:        $have_ilbc])
michael@2:  AC_MSG_RESULT([ZRTP:        $have_zrtp])
michael@2: +AC_MSG_RESULT([Libgsm dynamic link:	$have_gsm])
michael@2: Index: src/twinkle_config.h.in
michael@2: diff -Nau src/twinkle_config.h.in.orig src/twinkle_config.h.in
michael@2: --- src/twinkle_config.h.in.orig	2009-01-31 05:49:04.000000000 +0100
michael@2: +++ src/twinkle_config.h.in	2009-02-23 14:24:10.000000000 +0100
michael@2: @@ -19,6 +19,9 @@
michael@2:  /* Define to 1 if you have the <history.h> header file. */
michael@2:  #undef HAVE_HISTORY_H
michael@2:  
michael@2: +/* Define to 1 if you have the <libgsm> library. */
michael@2: +#undef HAVE_GSM
michael@2: +
michael@2:  /* Define to 1 if you have the <ilbc> library. */
michael@2:  #undef HAVE_ILBC
michael@2:  
michael@2: Index: src/audio/twinkle_zrtp_ui.cpp
michael@2: diff -Nau src/audio/twinkle_zrtp_ui.cpp.orig src/audio/twinkle_zrtp_ui.cpp
michael@2: --- src/audio/twinkle_zrtp_ui.cpp.orig	2009-01-03 17:54:05.000000000 +0100
michael@2: +++ src/audio/twinkle_zrtp_ui.cpp	2009-02-23 14:54:31.000000000 +0100
michael@2: @@ -208,7 +208,7 @@
michael@2:  	ui->cb_async_zrtp_confirm_go_clear(lineno);
michael@2:  }
michael@2:  
michael@2: -void TwinkleZrtpUI::showMessage(MessageSeverity sev, int subCode) {
michael@2: +void TwinkleZrtpUI::showMessage(GnuZrtpCodes::MessageSeverity sev, int subCode) {
michael@2:  	t_line *line = audioSession->get_line();
michael@2:  	int lineno = line->get_line_number();
michael@2:  	
michael@2: @@ -218,11 +218,11 @@
michael@2:  	msg += *mapCodesToString(sev, subCode);
michael@2:  	
michael@2:  	switch (sev) {
michael@2: -	case Info:
michael@2: +	case GnuZrtpCodes::Info:
michael@2:  		log_file->write_report(msg, "TwinkleZrtpUI::showMessage", LOG_NORMAL,
michael@2:  			LOG_INFO);
michael@2:  		break;
michael@2: -	case Warning:
michael@2: +	case GnuZrtpCodes::Warning:
michael@2:  		log_file->write_report(msg, "TwinkleZrtpUI::showMessage", LOG_NORMAL,
michael@2:  			LOG_WARNING);
michael@2:  		break;
michael@2: @@ -232,7 +232,7 @@
michael@2:  	}
michael@2:  }
michael@2:  
michael@2: -void TwinkleZrtpUI::zrtpNegotiationFailed(MessageSeverity severity, int subCode) {
michael@2: +void TwinkleZrtpUI::zrtpNegotiationFailed(GnuZrtpCodes::MessageSeverity severity, int subCode) {
michael@2:  	t_line *line = audioSession->get_line();
michael@2:  	int lineno = line->get_line_number();
michael@2:  	
michael@2: @@ -242,11 +242,11 @@
michael@2:  	m += *mapCodesToString(severity, subCode);
michael@2:  	
michael@2:  	switch (severity) {
michael@2: -	case Info:
michael@2: +	case GnuZrtpCodes::Info:
michael@2:  		log_file->write_report(m, "TwinkleZrtpUI::zrtpNegotiationFailed", LOG_NORMAL,
michael@2:  			LOG_INFO);
michael@2:  		break;
michael@2: -	case Warning:
michael@2: +	case GnuZrtpCodes::Warning:
michael@2:  		log_file->write_report(m, "TwinkleZrtpUI::zrtpNegotiationFailed", LOG_NORMAL,
michael@2:  			LOG_WARNING);
michael@2:  		break;
michael@2: @@ -266,20 +266,20 @@
michael@2:  	log_file->write_report(msg, "TwinkleZrtpUI::zrtpNotSuppOther");
michael@2:  }
michael@2:  
michael@2: -const string *const TwinkleZrtpUI::mapCodesToString(MessageSeverity severity, int subCode) {
michael@2: +const string *const TwinkleZrtpUI::mapCodesToString(GnuZrtpCodes::MessageSeverity severity, int subCode) {
michael@2:    	string *m = &unknownCode;
michael@2:  
michael@2:  	switch (severity) {
michael@2: -	case Info:
michael@2: +	case GnuZrtpCodes::Info:
michael@2:  		m = &infoMap[subCode];
michael@2:  		break;
michael@2: -	case Warning:
michael@2: +	case GnuZrtpCodes::Warning:
michael@2:  		m = &warningMap[subCode];
michael@2:  		break;
michael@2: -	case Severe:
michael@2: +	case GnuZrtpCodes::Severe:
michael@2:  		m = &severeMap[subCode];
michael@2:  		break;
michael@2: -	case ZrtpError:
michael@2: +	case GnuZrtpCodes::ZrtpError:
michael@2:  		if (subCode < 0) {
michael@2:  			subCode *= -1;
michael@2:  		}
michael@2: Index: src/audio/twinkle_zrtp_ui.h
michael@2: diff -Nau src/audio/twinkle_zrtp_ui.h.orig src/audio/twinkle_zrtp_ui.h
michael@2: --- src/audio/twinkle_zrtp_ui.h.orig	2009-01-03 17:53:58.000000000 +0100
michael@2: +++ src/audio/twinkle_zrtp_ui.h	2009-02-23 14:55:21.000000000 +0100
michael@2: @@ -56,8 +56,8 @@
michael@2:          virtual void secureOff();
michael@2:          virtual void showSAS(std::string sas, bool verified); 
michael@2:          virtual void confirmGoClear();
michael@2: -        virtual void showMessage(MessageSeverity sev, int subCode);
michael@2: -        virtual void zrtpNegotiationFailed(MessageSeverity severity, int subCode);
michael@2: +        virtual void showMessage(GnuZrtpCodes::MessageSeverity sev, int subCode);
michael@2: +        virtual void zrtpNegotiationFailed(GnuZrtpCodes::MessageSeverity severity, int subCode);
michael@2:          virtual void zrtpNotSuppOther();
michael@2:          //}
michael@2:  
michael@2: @@ -81,7 +81,7 @@
michael@2:  	 * @param subCode [in] The message code.
michael@2:  	 * @return The message text.
michael@2:  	 */
michael@2: -	const string *const mapCodesToString(MessageSeverity severity, int subCode);
michael@2: +	const string *const mapCodesToString(GnuZrtpCodes::MessageSeverity severity, int subCode);
michael@2:  
michael@2:  };
michael@2: