[gpxview] Diff of /trunk/configure

Diff of /trunk/configure

Parent Directory | Revision Log | View Patch Patch

-revision 279 by harbaum,
Wed Feb 10 19:19:55 2010 UTC
+revision 280 by harbaum,
Fri May 21 19:28:16 2010 UTC
 Line 1
  #! /bin/sh
  # Guess values for system-dependent variables and create Makefiles.
- # Generated by GNU Autoconf 2.63 for GPXView 0.9.3.
+ # Generated by GNU Autoconf 2.65 for GPXView 0.9.4.
  #
  # Report bugs to <till@harbaum.org>.
  #
+ #
  # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
- # 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+ # 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+ # Inc.
+ #
+ #
  # This configure script is free software; the Free Software Foundation
  # gives unlimited permission to copy, distribute and modify it.
- ## --------------------- ##
+ ## -------------------- ##
- ## M4sh Initialization.  ##
+ ## M4sh Initialization. ##
- ## --------------------- ##
+ ## -------------------- ##
  # Be more Bourne compatible
  DUALCASE=1; export DUALCASE # for MKS sh
- if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+ if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
    emulate sh
    NULLCMD=:
    # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
-Line 22 
 if test -n "${ZSH_VERSION+set}" && (emul
+Line 26 
 if test -n "${ZSH_VERSION+set}" && (emul
    alias -g '${1+"$@"}'='"$@"'
    setopt NO_GLOB_SUBST
  else
-   case `(set -o) 2>/dev/null` in
+   case `(set -o) 2>/dev/null` in #(
-   *posix*) set -o posix ;;
+   *posix*) :
+     set -o posix ;; #(
+   *) :
+      ;;
  esac
  fi
- # PATH needs CR
- # Avoid depending upon Character Ranges.
- as_cr_letters='abcdefghijklmnopqrstuvwxyz'
- as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
- as_cr_Letters=$as_cr_letters$as_cr_LETTERS
- as_cr_digits='0123456789'
- as_cr_alnum=$as_cr_Letters$as_cr_digits
  as_nl='
  '
  export as_nl
-Line 46 
 export as_nl
+Line 42 
 export as_nl
  as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
  as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
  as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
- if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
+ # Prefer a ksh shell builtin over an external printf program on Solaris,
+ # but without wasting forks for bash or zsh.
+ if test -z "$BASH_VERSION$ZSH_VERSION" \
+     && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
+   as_echo='print -r --'
+   as_echo_n='print -rn --'
+ elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
    as_echo='printf %s\n'
    as_echo_n='printf %s'
  else
-Line 57 
 else
+Line 59 
 else
      as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
      as_echo_n_body='eval
        arg=$1;
-       case $arg in
+       case $arg in #(
        *"$as_nl"*)
          expr "X$arg" : "X\\(.*\\)$as_nl";
          arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
-Line 80 
 if test "${PATH_SEPARATOR+set}" != set;
+Line 82 
 if test "${PATH_SEPARATOR+set}" != set;
    }
  fi
- # Support unset when possible.
- if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
-   as_unset=unset
- else
-   as_unset=false
- fi
  # IFS
  # We need space, tab and new line, in precisely that order.  Quoting is
-Line 96 
 fi
+Line 91 
 fi
  IFS=" ""        $as_nl"
  # Find who we are.  Look in the path if we contain no directory separator.
- case $0 in
+ case $0 in #((
    *[\\/]* ) as_myself=$0 ;;
    *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  for as_dir in $PATH
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
-   test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
+     test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
- done
+   done
  IFS=$as_save_IFS
       ;;
-Line 116 
 if test "x$as_myself" = x; then
+Line 111 
 if test "x$as_myself" = x; then
  fi
  if test ! -f "$as_myself"; then
    $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
-   { (exit 1); exit 1; }
+   exit 1
  fi
- # Work around bugs in pre-3.0 UWIN ksh.
+ # Unset variables that we do not need and which cause bugs (e.g. in
- for as_var in ENV MAIL MAILPATH
+ # pre-3.0 UWIN ksh).  But do not cause bugs in bash 2.01; the "|| exit 1"
- do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
+ # suppresses any "Segmentation fault" message there.  '((' could
+ # trigger a bug in pdksh 5.2.14.
+ for as_var in BASH_ENV ENV MAIL MAILPATH
+ do eval test x\${$as_var+set} = xset \
+   && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
  done
  PS1='$ '
  PS2='> '
-Line 133 
 export LC_ALL
+Line 132 
 export LC_ALL
  LANGUAGE=C
  export LANGUAGE
- # Required to use basename.
- if expr a : '\(a\)' >/dev/null 2>&1 &&
-    test "X`expr 00001 : '.*\(...\)'`" = X001; then
-   as_expr=expr
- else
-   as_expr=false
- fi
- if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
-   as_basename=basename
- else
-   as_basename=false
- fi
- # Name of the executable.
- as_me=`$as_basename -- "$0" ||
- $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
-          X"$0" : 'X\(//\)$' \| \
-          X"$0" : 'X\(/\)' \| . 2>/dev/null ||
- $as_echo X/"$0" |
-     sed '/^.*\/\([^/][^/]*\)\/*$/{
-             s//\1/
-             q
-           }
-           /^X\/\(\/\/\)$/{
-             s//\1/
-             q
-           }
-           /^X\/\(\/\).*/{
-             s//\1/
-             q
-           }
-           s/.*/./; q'`
  # CDPATH.
- $as_unset CDPATH
+ (unset CDPATH) >/dev/null 2>&1 && unset CDPATH
  if test "x$CONFIG_SHELL" = x; then
-   if (eval ":") 2>/dev/null; then
+   as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
-   as_have_required=yes
+   emulate sh
+   NULLCMD=:
+   # Pre-4.2 versions of Zsh do word splitting on \${1+\"\$@\"}, which
+   # is contrary to our usage.  Disable this feature.
+   alias -g '\${1+\"\$@\"}'='\"\$@\"'
+   setopt NO_GLOB_SUBST
  else
-   as_have_required=no
+   case \`(set -o) 2>/dev/null\` in #(
+   *posix*) :
+     set -o posix ;; #(
+   *) :
+      ;;
+ esac
  fi
+ "
-   if test $as_have_required = yes &&     (eval ":
+   as_required="as_fn_return () { (exit \$1); }
- (as_func_return () {
+ as_fn_success () { as_fn_return 0; }
-   (exit \$1)
+ as_fn_failure () { as_fn_return 1; }
- }
+ as_fn_ret_success () { return 0; }
- as_func_success () {
+ as_fn_ret_failure () { return 1; }
-   as_func_return 0
- }
- as_func_failure () {
-   as_func_return 1
- }
- as_func_ret_success () {
-   return 0
- }
- as_func_ret_failure () {
-   return 1
- }
  exitcode=0
- if as_func_success; then
+ as_fn_success || { exitcode=1; echo as_fn_success failed.; }
-   :
+ as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; }
- else
+ as_fn_ret_success || { exitcode=1; echo as_fn_ret_success failed.; }
-   exitcode=1
+ as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; }
-   echo as_func_success failed.
+ if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then :
- fi
+ else
- if as_func_failure; then
+   exitcode=1; echo positional parameters were not saved.
-   exitcode=1
+ fi
-   echo as_func_failure succeeded.
+ test x\$exitcode = x0 || exit 1"
- fi
+   as_suggested="  as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
+   as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
- if as_func_ret_success; then
+   eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
-   :
+   test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1
+ test \$(( 1 + 1 )) = 2 || exit 1"
+   if (eval "$as_required") 2>/dev/null; then :
+   as_have_required=yes
  else
-   exitcode=1
+   as_have_required=no
-   echo as_func_ret_success failed.
- fi
- if as_func_ret_failure; then
-   exitcode=1
-   echo as_func_ret_failure succeeded.
  fi
+   if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then :
- if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
-   :
  else
-   exitcode=1
+   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-   echo positional parameters were not saved.
+ as_found=false
- fi
- test \$exitcode = 0) || { (exit 1); exit 1; }
- (
-   as_lineno_1=\$LINENO
-   as_lineno_2=\$LINENO
-   test \"x\$as_lineno_1\" != \"x\$as_lineno_2\" &&
-   test \"x\`expr \$as_lineno_1 + 1\`\" = \"x\$as_lineno_2\") || { (exit 1); exit 1; }
- ") 2> /dev/null; then
-   :
- else
-   as_candidate_shells=
-     as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
-   case $as_dir in
+   as_found=:
+   case $as_dir in #(
           /*)
             for as_base in sh bash ksh sh5; do
-              as_candidate_shells="$as_candidate_shells $as_dir/$as_base"
+              # Try only shells that exist, to save several forks.
+              as_shell=$as_dir/$as_base
+              if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
+                     { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$as_shell"; } 2>/dev/null; then :
+   CONFIG_SHELL=$as_shell as_have_required=yes
+                    if { $as_echo "$as_bourne_compatible""$as_suggested" | as_run=a "$as_shell"; } 2>/dev/null; then :
+   break 2
+ fi
+ fi
             done;;
         esac
+   as_found=false
  done
+ $as_found || { if { test -f "$SHELL" || test -f "$SHELL.exe"; } &&
+               { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$SHELL"; } 2>/dev/null; then :
+   CONFIG_SHELL=$SHELL as_have_required=yes
+ fi; }
  IFS=$as_save_IFS
-       for as_shell in $as_candidate_shells $SHELL; do
+       if test "x$CONFIG_SHELL" != x; then :
-          # Try only shells that exist, to save several forks.
+   # We cannot yet assume a decent shell, so we have to provide a
-          if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
+         # neutralization value for shells without unset; and this also
-                 { ("$as_shell") 2> /dev/null <<\_ASEOF
+         # works around shells that cannot unset nonexistent variables.
- if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+         BASH_ENV=/dev/null
-   emulate sh
+         ENV=/dev/null
-   NULLCMD=:
+         (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
-   # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
+         export CONFIG_SHELL
-   # is contrary to our usage.  Disable this feature.
+         exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
-   alias -g '${1+"$@"}'='"$@"'
-   setopt NO_GLOB_SUBST
- else
-   case `(set -o) 2>/dev/null` in
-   *posix*) set -o posix ;;
- esac
- fi
- :
- _ASEOF
- }; then
-   CONFIG_SHELL=$as_shell
-                as_have_required=yes
-                if { "$as_shell" 2> /dev/null <<\_ASEOF
- if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-   emulate sh
-   NULLCMD=:
-   # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
-   # is contrary to our usage.  Disable this feature.
-   alias -g '${1+"$@"}'='"$@"'
-   setopt NO_GLOB_SUBST
- else
-   case `(set -o) 2>/dev/null` in
-   *posix*) set -o posix ;;
- esac
- fi
- :
- (as_func_return () {
-   (exit $1)
- }
- as_func_success () {
-   as_func_return 0
- }
- as_func_failure () {
-   as_func_return 1
- }
- as_func_ret_success () {
-   return 0
- }
- as_func_ret_failure () {
-   return 1
- }
- exitcode=0
- if as_func_success; then
-   :
- else
-   exitcode=1
-   echo as_func_success failed.
- fi
- if as_func_failure; then
-   exitcode=1
-   echo as_func_failure succeeded.
- fi
- if as_func_ret_success; then
-   :
- else
-   exitcode=1
-   echo as_func_ret_success failed.
- fi
- if as_func_ret_failure; then
-   exitcode=1
-   echo as_func_ret_failure succeeded.
  fi
- if ( set x; as_func_ret_success y && test x = "$1" ); then
+     if test x$as_have_required = xno; then :
-   :
+   $as_echo "$0: This script requires a shell more modern than all"
- else
+   $as_echo "$0: the shells that I found on your system."
-   exitcode=1
+   if test x${ZSH_VERSION+set} = xset ; then
-   echo positional parameters were not saved.
+     $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should"
+     $as_echo "$0: be upgraded to zsh 4.3.4 or later."
+   else
+     $as_echo "$0: Please tell bug-autoconf@gnu.org and till@harbaum.org
+ $0: about your system, including any error possibly output
+ $0: before this message. Then install a modern shell, or
+ $0: manually run the script under such a shell if you do
+ $0: have one."
+   fi
+   exit 1
  fi
- test $exitcode = 0) || { (exit 1); exit 1; }
- (
-   as_lineno_1=$LINENO
-   as_lineno_2=$LINENO
-   test "x$as_lineno_1" != "x$as_lineno_2" &&
-   test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2") || { (exit 1); exit 1; }
- _ASEOF
- }; then
-   break
  fi
  fi
+ SHELL=${CONFIG_SHELL-/bin/sh}
+ export SHELL
+ # Unset more variables known to interfere with behavior of common tools.
+ CLICOLOR_FORCE= GREP_OPTIONS=
+ unset CLICOLOR_FORCE GREP_OPTIONS
-       done
+ ## --------------------- ##
+ ## M4sh Shell Functions. ##
-       if test "x$CONFIG_SHELL" != x; then
+ ## --------------------- ##
-   for as_var in BASH_ENV ENV
+ # as_fn_unset VAR
-         do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
+ # ---------------
-         done
+ # Portably unset VAR.
-         export CONFIG_SHELL
+ as_fn_unset ()
-         exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
+ {
- fi
+   { eval $1=; unset $1;}
+ }
+ as_unset=as_fn_unset
+ # as_fn_set_status STATUS
+ # -----------------------
+ # Set $? to STATUS, without forking.
+ as_fn_set_status ()
+ {
+   return $1
+ } # as_fn_set_status
-     if test $as_have_required = no; then
+ # as_fn_exit STATUS
-   echo This script requires a shell more modern than all the
+ # -----------------
-       echo shells that I found on your system.  Please install a
+ # Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
-       echo modern shell, or manually run the script under such a
+ as_fn_exit ()
-       echo shell if you do have one.
+ {
-       { (exit 1); exit 1; }
+   set +e
- fi
+   as_fn_set_status $1
+   exit $1
+ } # as_fn_exit
+ # as_fn_mkdir_p
+ # -------------
+ # Create "$as_dir" as a directory, including parents if necessary.
+ as_fn_mkdir_p ()
+ {
+   case $as_dir in #(
+   -*) as_dir=./$as_dir;;
+   esac
+   test -d "$as_dir" || eval $as_mkdir_p || {
+     as_dirs=
+     while :; do
+       case $as_dir in #(
+       *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
+       *) as_qdir=$as_dir;;
+       esac
+       as_dirs="'$as_qdir' $as_dirs"
+       as_dir=`$as_dirname -- "$as_dir" ||
+ $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+          X"$as_dir" : 'X\(//\)[^/]' \| \
+          X"$as_dir" : 'X\(//\)$' \| \
+          X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
+ $as_echo X"$as_dir" |
+     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+             s//\1/
+             q
+           }
+           /^X\(\/\/\)[^/].*/{
+             s//\1/
+             q
+           }
+           /^X\(\/\/\)$/{
+             s//\1/
+             q
+           }
+           /^X\(\/\).*/{
+             s//\1/
+             q
+           }
+           s/.*/./; q'`
+       test -d "$as_dir" && break
+     done
+     test -z "$as_dirs" || eval "mkdir $as_dirs"
+   } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
- fi
- fi
+ } # as_fn_mkdir_p
+ # as_fn_append VAR VALUE
+ # ----------------------
+ # Append the text in VALUE to the end of the definition contained in VAR. Take
+ # advantage of any shell optimizations that allow amortized linear growth over
+ # repeated appends, instead of the typical quadratic growth present in naive
+ # implementations.
+ if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
+   eval 'as_fn_append ()
+   {
+     eval $1+=\$2
+   }'
+ else
+   as_fn_append ()
+   {
+     eval $1=\$$1\$2
+   }
+ fi # as_fn_append
+ # as_fn_arith ARG...
+ # ------------------
+ # Perform arithmetic evaluation on the ARGs, and store the result in the
+ # global $as_val. Take advantage of shells that can avoid forks. The arguments
+ # must be portable across $(()) and expr.
+ if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
+   eval 'as_fn_arith ()
+   {
+     as_val=$(( $* ))
+   }'
+ else
+   as_fn_arith ()
+   {
+     as_val=`expr "$@" || test $? -eq 1`
+   }
+ fi # as_fn_arith
- (eval "as_func_return () {
+ # as_fn_error ERROR [LINENO LOG_FD]
-   (exit \$1)
+ # ---------------------------------
- }
+ # Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
- as_func_success () {
+ # provided, also output the error to LOG_FD, referencing LINENO. Then exit the
-   as_func_return 0
+ # script with status $?, using 1 if that was 0.
- }
+ as_fn_error ()
- as_func_failure () {
+ {
-   as_func_return 1
+   as_status=$?; test $as_status -eq 0 && as_status=1
- }
+   if test "$3"; then
- as_func_ret_success () {
+     as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-   return 0
+     $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
- }
+   fi
- as_func_ret_failure () {
+   $as_echo "$as_me: error: $1" >&2
-   return 1
+   as_fn_exit $as_status
- }
+ } # as_fn_error
- exitcode=0
+ if expr a : '\(a\)' >/dev/null 2>&1 &&
- if as_func_success; then
+    test "X`expr 00001 : '.*\(...\)'`" = X001; then
-   :
+   as_expr=expr
  else
-   exitcode=1
+   as_expr=false
-   echo as_func_success failed.
- fi
- if as_func_failure; then
-   exitcode=1
-   echo as_func_failure succeeded.
  fi
- if as_func_ret_success; then
+ if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
-   :
+   as_basename=basename
  else
-   exitcode=1
+   as_basename=false
-   echo as_func_ret_success failed.
- fi
- if as_func_ret_failure; then
-   exitcode=1
-   echo as_func_ret_failure succeeded.
  fi
- if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
+ if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
-   :
+   as_dirname=dirname
  else
-   exitcode=1
+   as_dirname=false
-   echo positional parameters were not saved.
  fi
- test \$exitcode = 0") || {
+ as_me=`$as_basename -- "$0" ||
-   echo No shell found that supports shell functions.
+ $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
-   echo Please tell bug-autoconf@gnu.org about your system,
+          X"$0" : 'X\(//\)$' \| \
-   echo including any error possibly output before this message.
+          X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-   echo This can help us improve future autoconf versions.
+ $as_echo X/"$0" |
-   echo Configuration will now proceed without shell functions.
+     sed '/^.*\/\([^/][^/]*\)\/*$/{
- }
+             s//\1/
+             q
+           }
+           /^X\/\(\/\/\)$/{
+             s//\1/
+             q
+           }
+           /^X\/\(\/\).*/{
+             s//\1/
+             q
+           }
+           s/.*/./; q'`
+ # Avoid depending upon Character Ranges.
+ as_cr_letters='abcdefghijklmnopqrstuvwxyz'
+ as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
+ as_cr_Letters=$as_cr_letters$as_cr_LETTERS
+ as_cr_digits='0123456789'
+ as_cr_alnum=$as_cr_Letters$as_cr_digits
-   as_lineno_1=$LINENO
+   as_lineno_1=$LINENO as_lineno_1a=$LINENO
-   as_lineno_2=$LINENO
+   as_lineno_2=$LINENO as_lineno_2a=$LINENO
-   test "x$as_lineno_1" != "x$as_lineno_2" &&
+   eval 'test "x$as_lineno_1'$as_run'" != "x$as_lineno_2'$as_run'" &&
-   test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {
+   test "x`expr $as_lineno_1'$as_run' + 1`" = "x$as_lineno_2'$as_run'"' || {
+   # Blame Lee E. McMahon (1931-1989) for sed's syntax.  :-)
-   # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
-   # uniformly replaced by the line number.  The first 'sed' inserts a
-   # line-number line after each line using $LINENO; the second 'sed'
-   # does the real work.  The second script uses 'N' to pair each
-   # line-number line with the line containing $LINENO, and appends
-   # trailing '-' during substitution so that $LINENO is not a special
-   # case at line end.
-   # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
-   # scripts with optimization help from Paolo Bonzini.  Blame Lee
-   # E. McMahon (1931-1989) for sed's syntax.  :-)
    sed -n '
      p
      /[$]LINENO/=
-Line 473 
 test \$exitcode = 0") || {
+Line 442 
 test \$exitcode = 0") || {
        s/-\n.*//
      ' >$as_me.lineno &&
    chmod +x "$as_me.lineno" ||
-     { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
+     { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
-    { (exit 1); exit 1; }; }
    # Don't try to exec as it changes $[0], causing all sort of problems
    # (the dirname of $[0] is not the place where we might find the
-Line 484 
 test \$exitcode = 0") || {
+Line 452 
 test \$exitcode = 0") || {
    exit
  }
- if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
-   as_dirname=dirname
- else
-   as_dirname=false
- fi
  ECHO_C= ECHO_N= ECHO_T=
- case `echo -n x` in
+ case `echo -n x` in #(((((
  -n*)
-   case `echo 'x\c'` in
+   case `echo 'xy\c'` in
    *c*) ECHO_T=' ';;     # ECHO_T is single tab character.
-   *)   ECHO_C='\c';;
+   xy)  ECHO_C='\c';;
+   *)   echo `echo ksh88 bug on AIX 6.1` > /dev/null
+        ECHO_T=' ';;
    esac;;
  *)
    ECHO_N='-n';;
  esac
- if expr a : '\(a\)' >/dev/null 2>&1 &&
-    test "X`expr 00001 : '.*\(...\)'`" = X001; then
-   as_expr=expr
- else
-   as_expr=false
- fi
  rm -f conf$$ conf$$.exe conf$$.file
  if test -d conf$$.dir; then
-Line 536 
 rm -f conf$$ conf$$.exe conf$$.dir/conf$
+Line 493 
 rm -f conf$$ conf$$.exe conf$$.dir/conf$
  rmdir conf$$.dir 2>/dev/null
  if mkdir -p . 2>/dev/null; then
-   as_mkdir_p=:
+   as_mkdir_p='mkdir -p "$as_dir"'
  else
    test -d ./-p && rmdir ./-p
    as_mkdir_p=false
-Line 555 
 else
+Line 512 
 else
        if test -d "$1"; then
          test -d "$1/.";
        else
-         case $1 in
+         case $1 in #(
          -*)set "./$1";;
          esac;
-         case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
+         case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
          ???[sx]*):;;*)false;;esac;fi
      '\'' sh
    '
-Line 572 
 as_tr_cpp="eval sed 'y%*$as_cr_letters%P
+Line 529 
 as_tr_cpp="eval sed 'y%*$as_cr_letters%P
  as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
+ test -n "$DJDIR" || exec 7<&0 </dev/null
- exec 7<&0 </dev/null 6>&1
+ exec 6>&1
  # Name of the host.
  # hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
-Line 591 
 cross_compiling=no
+Line 548 
 cross_compiling=no
  subdirs=
  MFLAGS=
  MAKEFLAGS=
- SHELL=${CONFIG_SHELL-/bin/sh}
  # Identity of this package.
  PACKAGE_NAME='GPXView'
  PACKAGE_TARNAME='gpxview'
- PACKAGE_VERSION='0.9.3'
+ PACKAGE_VERSION='0.9.4'
- PACKAGE_STRING='GPXView 0.9.3'
+ PACKAGE_STRING='GPXView 0.9.4'
  PACKAGE_BUGREPORT='till@harbaum.org'
+ PACKAGE_URL=''
  ac_unique_file="src/main.c"
  # Factoring default headers for most tests.
-Line 722 
 bindir
+Line 679 
 bindir
  program_transform_name
  prefix
  exec_prefix
+ PACKAGE_URL
  PACKAGE_BUGREPORT
  PACKAGE_STRING
  PACKAGE_VERSION
-Line 883 
 do
+Line 841 
 do
      ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
      # Reject names that are not valid shell variable names.
      expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-       { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2
+       as_fn_error "invalid feature name: $ac_useropt"
-    { (exit 1); exit 1; }; }
      ac_useropt_orig=$ac_useropt
      ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
      case $ac_user_opts in
-Line 910 
 do
+Line 867 
 do
      ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
      # Reject names that are not valid shell variable names.
      expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-       { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2
+       as_fn_error "invalid feature name: $ac_useropt"
-    { (exit 1); exit 1; }; }
      ac_useropt_orig=$ac_useropt
      ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
      case $ac_user_opts in
-Line 1115 
 do
+Line 1071 
 do
      ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
      # Reject names that are not valid shell variable names.
      expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-       { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2
+       as_fn_error "invalid package name: $ac_useropt"
-    { (exit 1); exit 1; }; }
      ac_useropt_orig=$ac_useropt
      ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
      case $ac_user_opts in
-Line 1132 
 do
+Line 1087 
 do
      ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
      # Reject names that are not valid shell variable names.
      expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-       { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2
+       as_fn_error "invalid package name: $ac_useropt"
-    { (exit 1); exit 1; }; }
      ac_useropt_orig=$ac_useropt
      ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
      case $ac_user_opts in
-Line 1163 
 do
+Line 1117 
 do
    | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
      x_libraries=$ac_optarg ;;
-   -*) { $as_echo "$as_me: error: unrecognized option: $ac_option
+   -*) as_fn_error "unrecognized option: \`$ac_option'
- Try \`$0 --help' for more information." >&2
+ Try \`$0 --help' for more information."
-    { (exit 1); exit 1; }; }
      ;;
    *=*)
      ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
      # Reject names that are not valid shell variable names.
-     expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
+     case $ac_envvar in #(
-       { $as_echo "$as_me: error: invalid variable name: $ac_envvar" >&2
+       '' | [0-9]* | *[!_$as_cr_alnum]* )
-    { (exit 1); exit 1; }; }
+       as_fn_error "invalid variable name: \`$ac_envvar'" ;;
+     esac
      eval $ac_envvar=\$ac_optarg
      export $ac_envvar ;;
-Line 1190 
 done
+Line 1144 
 done
  if test -n "$ac_prev"; then
    ac_option=--`echo $ac_prev | sed 's/_/-/g'`
-   { $as_echo "$as_me: error: missing argument to $ac_option" >&2
+   as_fn_error "missing argument to $ac_option"
-    { (exit 1); exit 1; }; }
  fi
  if test -n "$ac_unrecognized_opts"; then
    case $enable_option_checking in
      no) ;;
-     fatal) { $as_echo "$as_me: error: unrecognized options: $ac_unrecognized_opts" >&2
+     fatal) as_fn_error "unrecognized options: $ac_unrecognized_opts" ;;
-    { (exit 1); exit 1; }; } ;;
      *)     $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
    esac
  fi
-Line 1221 
 do
+Line 1173 
 do
      [\\/$]* | ?:[\\/]* )  continue;;
      NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
    esac
-   { $as_echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
+   as_fn_error "expected an absolute directory name for --$ac_var: $ac_val"
-    { (exit 1); exit 1; }; }
  done
  # There might be people who depend on the old broken behavior: `$host'
-Line 1252 
 test "$silent" = yes && exec 6>/dev/null
+Line 1203 
 test "$silent" = yes && exec 6>/dev/null
  ac_pwd=`pwd` && test -n "$ac_pwd" &&
  ac_ls_di=`ls -di .` &&
  ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
-   { $as_echo "$as_me: error: working directory cannot be determined" >&2
+   as_fn_error "working directory cannot be determined"
-    { (exit 1); exit 1; }; }
  test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
-   { $as_echo "$as_me: error: pwd does not report name of working directory" >&2
+   as_fn_error "pwd does not report name of working directory"
-    { (exit 1); exit 1; }; }
  # Find the source files, if location was not specified.
-Line 1295 
 else
+Line 1244 
 else
  fi
  if test ! -r "$srcdir/$ac_unique_file"; then
    test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
-   { $as_echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
+   as_fn_error "cannot find sources ($ac_unique_file) in $srcdir"
-    { (exit 1); exit 1; }; }
  fi
  ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
  ac_abs_confdir=`(
-         cd "$srcdir" && test -r "./$ac_unique_file" || { $as_echo "$as_me: error: $ac_msg" >&2
+         cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error "$ac_msg"
-    { (exit 1); exit 1; }; }
          pwd)`
  # When building in place, set srcdir=.
  if test "$ac_abs_confdir" = "$ac_pwd"; then
-Line 1327 
 if test "$ac_init_help" = "long"; then
+Line 1274 
 if test "$ac_init_help" = "long"; then
    # Omit some internal or obsolete options to make the list less imposing.
    # This message is too long to be a string in the A/UX 3.1 sh.
    cat <<_ACEOF
- \`configure' configures GPXView 0.9.3 to adapt to many kinds of systems.
+ \`configure' configures GPXView 0.9.4 to adapt to many kinds of systems.
  Usage: $0 [OPTION]... [VAR=VALUE]...
-Line 1388 
 fi
+Line 1335 
 fi
  if test -n "$ac_init_help"; then
    case $ac_init_help in
-      short | recursive ) echo "Configuration of GPXView 0.9.3:";;
+      short | recursive ) echo "Configuration of GPXView 0.9.4:";;
     esac
    cat <<\_ACEOF
-Line 1398 
 Some influential environment variables:
+Line 1345 
 Some influential environment variables:
    LDFLAGS     linker flags, e.g. -L<lib dir> if you have libraries in a
                nonstandard directory <lib dir>
    LIBS        libraries to pass to the linker, e.g. -l<library>
-   CPPFLAGS    C/C++/Objective C preprocessor flags, e.g. -I<include dir> if
+   CPPFLAGS    (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if
                you have headers in a nonstandard directory <include dir>
    PKG_CONFIG  path to pkg-config utility
    gnome_vfs_module_CFLAGS
-Line 1523 
 ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_
+Line 1470 
 ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_
    done
  fi
  test -n "$ac_init_help" && exit $ac_status
  if $ac_init_version; then
    cat <<\_ACEOF
- GPXView configure 0.9.3
+ GPXView configure 0.9.4
- generated by GNU Autoconf 2.63
+ generated by GNU Autoconf 2.65
+ Copyright (C) 2009 Free Software Foundation, Inc.
+ This configure script is free software; the Free Software Foundation
+ gives unlimited permission to copy, distribute and modify it.
+ _ACEOF
+   exit
+ fi
+ ## ------------------------ ##
+ ## Autoconf initialization. ##
+ ## ------------------------ ##
+ # ac_fn_c_try_compile LINENO
+ # --------------------------
+ # Try to compile conftest.$ac_ext, and return whether this succeeded.
+ ac_fn_c_try_compile ()
+ {
+   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+   rm -f conftest.$ac_objext
+   if { { ac_try="$ac_compile"
+ case "(($ac_try" in
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+ eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+ $as_echo "$ac_try_echo"; } >&5
+   (eval "$ac_compile") 2>conftest.err
+   ac_status=$?
+   if test -s conftest.err; then
+     grep -v '^ *+' conftest.err >conftest.er1
+     cat conftest.er1 >&5
+     mv -f conftest.er1 conftest.err
+   fi
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; } && {
+          test -z "$ac_c_werror_flag" ||
+          test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then :
+   ac_retval=0
+ else
+   $as_echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+         ac_retval=1
+ fi
+   eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+   as_fn_set_status $ac_retval
+ } # ac_fn_c_try_compile
+ # ac_fn_c_try_cpp LINENO
+ # ----------------------
+ # Try to preprocess conftest.$ac_ext, and return whether this succeeded.
+ ac_fn_c_try_cpp ()
+ {
+   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+   if { { ac_try="$ac_cpp conftest.$ac_ext"
+ case "(($ac_try" in
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+ eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+ $as_echo "$ac_try_echo"; } >&5
+   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err
+   ac_status=$?
+   if test -s conftest.err; then
+     grep -v '^ *+' conftest.err >conftest.er1
+     cat conftest.er1 >&5
+     mv -f conftest.er1 conftest.err
+   fi
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; } >/dev/null && {
+          test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+          test ! -s conftest.err
+        }; then :
+   ac_retval=0
+ else
+   $as_echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+     ac_retval=1
+ fi
+   eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+   as_fn_set_status $ac_retval
+ } # ac_fn_c_try_cpp
+ # ac_fn_c_check_header_mongrel LINENO HEADER VAR INCLUDES
+ # -------------------------------------------------------
+ # Tests whether HEADER exists, giving a warning if it cannot be compiled using
+ # the include files in INCLUDES and setting the cache variable VAR
+ # accordingly.
+ ac_fn_c_check_header_mongrel ()
+ {
+   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+   if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+ $as_echo_n "checking for $2... " >&6; }
+ if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
+   $as_echo_n "(cached) " >&6
+ fi
+ eval ac_res=\$$3
+                { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+ $as_echo "$ac_res" >&6; }
+ else
+   # Is the header compilable?
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 usability" >&5
+ $as_echo_n "checking $2 usability... " >&6; }
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ $4
+ #include <$2>
+ _ACEOF
+ if ac_fn_c_try_compile "$LINENO"; then :
+   ac_header_compiler=yes
+ else
+   ac_header_compiler=no
+ fi
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_compiler" >&5
+ $as_echo "$ac_header_compiler" >&6; }
+ # Is the header present?
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 presence" >&5
+ $as_echo_n "checking $2 presence... " >&6; }
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ #include <$2>
+ _ACEOF
+ if ac_fn_c_try_cpp "$LINENO"; then :
+   ac_header_preproc=yes
+ else
+   ac_header_preproc=no
+ fi
+ rm -f conftest.err conftest.$ac_ext
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5
+ $as_echo "$ac_header_preproc" >&6; }
+ # So?  What about this header?
+ case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in #((
+   yes:no: )
+     { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&5
+ $as_echo "$as_me: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&2;}
+     { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
+ $as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
+     ;;
+   no:yes:* )
+     { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: present but cannot be compiled" >&5
+ $as_echo "$as_me: WARNING: $2: present but cannot be compiled" >&2;}
+     { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2:     check for missing prerequisite headers?" >&5
+ $as_echo "$as_me: WARNING: $2:     check for missing prerequisite headers?" >&2;}
+     { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: see the Autoconf documentation" >&5
+ $as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;}
+     { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2:     section \"Present But Cannot Be Compiled\"" >&5
+ $as_echo "$as_me: WARNING: $2:     section \"Present But Cannot Be Compiled\"" >&2;}
+     { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
+ $as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
+ ( cat <<\_ASBOX
+ ## ------------------------------- ##
+ ## Report this to till@harbaum.org ##
+ ## ------------------------------- ##
+ _ASBOX
+      ) | sed "s/^/$as_me: WARNING:     /" >&2
+     ;;
+ esac
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+ $as_echo_n "checking for $2... " >&6; }
+ if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
+   $as_echo_n "(cached) " >&6
+ else
+   eval "$3=\$ac_header_compiler"
+ fi
+ eval ac_res=\$$3
+                { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+ $as_echo "$ac_res" >&6; }
+ fi
+   eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+ } # ac_fn_c_check_header_mongrel
- Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
+ # ac_fn_c_try_run LINENO
-, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+ # ----------------------
- This configure script is free software; the Free Software Foundation
+ # Try to link conftest.$ac_ext, and return whether this succeeded. Assumes
- gives unlimited permission to copy, distribute and modify it.
+ # that executables *can* be run.
+ ac_fn_c_try_run ()
+ {
+   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+   if { { ac_try="$ac_link"
+ case "(($ac_try" in
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+ eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+ $as_echo "$ac_try_echo"; } >&5
+   (eval "$ac_link") 2>&5
+   ac_status=$?
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; } && { ac_try='./conftest$ac_exeext'
+   { { case "(($ac_try" in
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+ eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+ $as_echo "$ac_try_echo"; } >&5
+   (eval "$ac_try") 2>&5
+   ac_status=$?
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; }; }; then :
+   ac_retval=0
+ else
+   $as_echo "$as_me: program exited with status $ac_status" >&5
+        $as_echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+        ac_retval=$ac_status
+ fi
+   rm -rf conftest.dSYM conftest_ipa8_conftest.oo
+   eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+   as_fn_set_status $ac_retval
+ } # ac_fn_c_try_run
+ # ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES
+ # -------------------------------------------------------
+ # Tests whether HEADER exists and can be compiled using the include files in
+ # INCLUDES, setting the cache variable VAR accordingly.
+ ac_fn_c_check_header_compile ()
+ {
+   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+ $as_echo_n "checking for $2... " >&6; }
+ if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
+   $as_echo_n "(cached) " >&6
+ else
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ $4
+ #include <$2>
  _ACEOF
-   exit
+ if ac_fn_c_try_compile "$LINENO"; then :
+   eval "$3=yes"
+ else
+   eval "$3=no"
+ fi
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
+ eval ac_res=\$$3
+                { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+ $as_echo "$ac_res" >&6; }
+   eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+ } # ac_fn_c_check_header_compile
  cat >config.log <<_ACEOF
  This file contains any messages produced by compilers while
  running configure, to aid debugging if configure makes a mistake.
- It was created by GPXView $as_me 0.9.3, which was
+ It was created by GPXView $as_me 0.9.4, which was
- generated by GNU Autoconf 2.63.  Invocation command line was
+ generated by GNU Autoconf 2.65.  Invocation command line was
    $ $0 $@
-Line 1577 
 for as_dir in $PATH
+Line 1768 
 for as_dir in $PATH
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
-   $as_echo "PATH: $as_dir"
+     $as_echo "PATH: $as_dir"
- done
+   done
  IFS=$as_save_IFS
  } >&5
-Line 1615 
 do
+Line 1806 
 do
        ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
      esac
      case $ac_pass in
-) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;;
+) as_fn_append ac_configure_args0 " '$ac_arg'" ;;
 )
-       ac_configure_args1="$ac_configure_args1 '$ac_arg'"
+       as_fn_append ac_configure_args1 " '$ac_arg'"
        if test $ac_must_keep_next = true; then
          ac_must_keep_next=false # Got value, back to normal.
        else
-Line 1633 
 do
+Line 1824 
 do
            -* ) ac_must_keep_next=true ;;
          esac
        fi
-       ac_configure_args="$ac_configure_args '$ac_arg'"
+       as_fn_append ac_configure_args " '$ac_arg'"
        ;;
      esac
    done
  done
- $as_unset ac_configure_args0 || test "${ac_configure_args0+set}" != set || { ac_configure_args0=; export ac_configure_args0; }
+ { ac_configure_args0=; unset ac_configure_args0;}
- $as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_configure_args1=; export ac_configure_args1; }
+ { ac_configure_args1=; unset ac_configure_args1;}
  # When interrupted or exit'd, cleanup temporary files, and complete
  # config.log.  We remove comments because anyway the quotes in there
-Line 1664 
 _ASBOX
+Line 1855 
 _ASBOX
      case $ac_val in #(
      *${as_nl}*)
        case $ac_var in #(
-       *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5
+       *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
  $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
        esac
        case $ac_var in #(
        _ | IFS | as_nl) ;; #(
        BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
-       *) $as_unset $ac_var ;;
+       *) { eval $ac_var=; unset $ac_var;} ;;
        esac ;;
      esac
    done
-Line 1742 
 _ASBOX
+Line 1933 
 _ASBOX
      exit $exit_status
  ' 0
  for ac_signal in 1 2 13 15; do
-   trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal
+   trap 'ac_signal='$ac_signal'; as_fn_exit 1' $ac_signal
  done
  ac_signal=0
  # confdefs.h avoids OS command line length limits that DEFS can exceed.
  rm -f -r conftest* confdefs.h
+ $as_echo "/* confdefs.h */" > confdefs.h
  # Predefined preprocessor variables.
  cat >>confdefs.h <<_ACEOF
  #define PACKAGE_NAME "$PACKAGE_NAME"
  _ACEOF
  cat >>confdefs.h <<_ACEOF
  #define PACKAGE_TARNAME "$PACKAGE_TARNAME"
  _ACEOF
  cat >>confdefs.h <<_ACEOF
  #define PACKAGE_VERSION "$PACKAGE_VERSION"
  _ACEOF
  cat >>confdefs.h <<_ACEOF
  #define PACKAGE_STRING "$PACKAGE_STRING"
  _ACEOF
  cat >>confdefs.h <<_ACEOF
  #define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT"
  _ACEOF
+ cat >>confdefs.h <<_ACEOF
+ #define PACKAGE_URL "$PACKAGE_URL"
+ _ACEOF
  # Let the site file select an alternate cache file if it wants to.
  # Prefer an explicitly selected file to automatically selected ones.
-Line 1792 
 fi
+Line 1985 
 fi
  for ac_site_file in "$ac_site_file1" "$ac_site_file2"
  do
    test "x$ac_site_file" = xNONE && continue
-   if test -r "$ac_site_file"; then
+   if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then
-     { $as_echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
+     { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
  $as_echo "$as_me: loading site script $ac_site_file" >&6;}
      sed 's/^/| /' "$ac_site_file" >&5
      . "$ac_site_file"
-Line 1801 
 $as_echo "$as_me: loading site script $a
+Line 1994 
 $as_echo "$as_me: loading site script $a
  done
  if test -r "$cache_file"; then
-   # Some versions of bash will fail to source /dev/null (special
+   # Some versions of bash will fail to source /dev/null (special files
-   # files actually), so we avoid doing that.
+   # actually), so we avoid doing that.  DJGPP emulates it as a regular file.
-   if test -f "$cache_file"; then
+   if test /dev/null != "$cache_file" && test -f "$cache_file"; then
-     { $as_echo "$as_me:$LINENO: loading cache $cache_file" >&5
+     { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5
  $as_echo "$as_me: loading cache $cache_file" >&6;}
      case $cache_file in
        [\\/]* | ?:[\\/]* ) . "$cache_file";;
-Line 1812 
 $as_echo "$as_me: loading cache $cache_f
+Line 2005 
 $as_echo "$as_me: loading cache $cache_f
      esac
    fi
  else
-   { $as_echo "$as_me:$LINENO: creating cache $cache_file" >&5
+   { $as_echo "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5
  $as_echo "$as_me: creating cache $cache_file" >&6;}
    >$cache_file
  fi
-Line 1827 
 for ac_var in $ac_precious_vars; do
+Line 2020 
 for ac_var in $ac_precious_vars; do
    eval ac_new_val=\$ac_env_${ac_var}_value
    case $ac_old_set,$ac_new_set in
      set,)
-       { $as_echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
+       { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
  $as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
        ac_cache_corrupted=: ;;
      ,set)
-       { $as_echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5
+       { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5
  $as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
        ac_cache_corrupted=: ;;
      ,);;
-Line 1841 
 $as_echo "$as_me: error: \`$ac_var' was
+Line 2034 
 $as_echo "$as_me: error: \`$ac_var' was
          ac_old_val_w=`echo x $ac_old_val`
          ac_new_val_w=`echo x $ac_new_val`
          if test "$ac_old_val_w" != "$ac_new_val_w"; then
-           { $as_echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
+           { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5
  $as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
            ac_cache_corrupted=:
          else
-           { $as_echo "$as_me:$LINENO: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5
+           { $as_echo "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5
  $as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;}
            eval $ac_var=\$ac_old_val
          fi
-         { $as_echo "$as_me:$LINENO:   former value:  \`$ac_old_val'" >&5
+         { $as_echo "$as_me:${as_lineno-$LINENO}:   former value:  \`$ac_old_val'" >&5
  $as_echo "$as_me:   former value:  \`$ac_old_val'" >&2;}
-         { $as_echo "$as_me:$LINENO:   current value: \`$ac_new_val'" >&5
+         { $as_echo "$as_me:${as_lineno-$LINENO}:   current value: \`$ac_new_val'" >&5
  $as_echo "$as_me:   current value: \`$ac_new_val'" >&2;}
        fi;;
    esac
-Line 1863 
 $as_echo "$as_me:   current value: \`$ac
+Line 2056 
 $as_echo "$as_me:   current value: \`$ac
      esac
      case " $ac_configure_args " in
        *" '$ac_arg' "*) ;; # Avoid dups.  Use of quotes ensures accuracy.
-       *) ac_configure_args="$ac_configure_args '$ac_arg'" ;;
+       *) as_fn_append ac_configure_args " '$ac_arg'" ;;
      esac
    fi
  done
  if $ac_cache_corrupted; then
-   { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+   { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
  $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-   { $as_echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5
+   { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
  $as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
-   { { $as_echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
+   as_fn_error "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
- $as_echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
-    { (exit 1); exit 1; }; }
  fi
+ ## -------------------- ##
+ ## Main body of script. ##
+ ## -------------------- ##
  ac_ext=c
  ac_cpp='$CPP $CPPFLAGS'
-Line 1923 
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
+Line 2093 
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
  if test -n "$ac_tool_prefix"; then
    # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
  set dummy ${ac_tool_prefix}gcc; ac_word=$2
- { $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  $as_echo_n "checking for $ac_word... " >&6; }
- if test "${ac_cv_prog_CC+set}" = set; then
+ if test "${ac_cv_prog_CC+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    if test -n "$CC"; then
-Line 1936 
 for as_dir in $PATH
+Line 2106 
 for as_dir in $PATH
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
-   for ac_exec_ext in '' $ac_executable_extensions; do
+     for ac_exec_ext in '' $ac_executable_extensions; do
    if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
      ac_cv_prog_CC="${ac_tool_prefix}gcc"
-     $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
    fi
  done
- done
+   done
  IFS=$as_save_IFS
  fi
  fi
  CC=$ac_cv_prog_CC
  if test -n "$CC"; then
-   { $as_echo "$as_me:$LINENO: result: $CC" >&5
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
  $as_echo "$CC" >&6; }
  else
-   { $as_echo "$as_me:$LINENO: result: no" >&5
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  $as_echo "no" >&6; }
  fi
-Line 1963 
 if test -z "$ac_cv_prog_CC"; then
+Line 2133 
 if test -z "$ac_cv_prog_CC"; then
    ac_ct_CC=$CC
    # Extract the first word of "gcc", so it can be a program name with args.
  set dummy gcc; ac_word=$2
- { $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  $as_echo_n "checking for $ac_word... " >&6; }
- if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
+ if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    if test -n "$ac_ct_CC"; then
-Line 1976 
 for as_dir in $PATH
+Line 2146 
 for as_dir in $PATH
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
-   for ac_exec_ext in '' $ac_executable_extensions; do
+     for ac_exec_ext in '' $ac_executable_extensions; do
    if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
      ac_cv_prog_ac_ct_CC="gcc"
-     $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
    fi
  done
- done
+   done
  IFS=$as_save_IFS
  fi
  fi
  ac_ct_CC=$ac_cv_prog_ac_ct_CC
  if test -n "$ac_ct_CC"; then
-   { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
  $as_echo "$ac_ct_CC" >&6; }
  else
-   { $as_echo "$as_me:$LINENO: result: no" >&5
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  $as_echo "no" >&6; }
  fi
-Line 2002 
 fi
+Line 2172 
 fi
    else
      case $cross_compiling:$ac_tool_warned in
  yes:)
- { $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
  $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
  ac_tool_warned=yes ;;
  esac
-Line 2016 
 if test -z "$CC"; then
+Line 2186 
 if test -z "$CC"; then
            if test -n "$ac_tool_prefix"; then
      # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
  set dummy ${ac_tool_prefix}cc; ac_word=$2
- { $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  $as_echo_n "checking for $ac_word... " >&6; }
- if test "${ac_cv_prog_CC+set}" = set; then
+ if test "${ac_cv_prog_CC+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    if test -n "$CC"; then
-Line 2029 
 for as_dir in $PATH
+Line 2199 
 for as_dir in $PATH
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
-   for ac_exec_ext in '' $ac_executable_extensions; do
+     for ac_exec_ext in '' $ac_executable_extensions; do
    if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
      ac_cv_prog_CC="${ac_tool_prefix}cc"
-     $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
    fi
  done
- done
+   done
  IFS=$as_save_IFS
  fi
  fi
  CC=$ac_cv_prog_CC
  if test -n "$CC"; then
-   { $as_echo "$as_me:$LINENO: result: $CC" >&5
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
  $as_echo "$CC" >&6; }
  else
-   { $as_echo "$as_me:$LINENO: result: no" >&5
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  $as_echo "no" >&6; }
  fi
-Line 2056 
 fi
+Line 2226 
 fi
  if test -z "$CC"; then
    # Extract the first word of "cc", so it can be a program name with args.
  set dummy cc; ac_word=$2
- { $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  $as_echo_n "checking for $ac_word... " >&6; }
- if test "${ac_cv_prog_CC+set}" = set; then
+ if test "${ac_cv_prog_CC+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    if test -n "$CC"; then
-Line 2070 
 for as_dir in $PATH
+Line 2240 
 for as_dir in $PATH
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
-   for ac_exec_ext in '' $ac_executable_extensions; do
+     for ac_exec_ext in '' $ac_executable_extensions; do
    if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
      if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
         ac_prog_rejected=yes
         continue
       fi
      ac_cv_prog_CC="cc"
-     $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
    fi
  done
- done
+   done
  IFS=$as_save_IFS
  if test $ac_prog_rejected = yes; then
-Line 2100 
 fi
+Line 2270 
 fi
  fi
  CC=$ac_cv_prog_CC
  if test -n "$CC"; then
-   { $as_echo "$as_me:$LINENO: result: $CC" >&5
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
  $as_echo "$CC" >&6; }
  else
-   { $as_echo "$as_me:$LINENO: result: no" >&5
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  $as_echo "no" >&6; }
  fi
-Line 2115 
 if test -z "$CC"; then
+Line 2285 
 if test -z "$CC"; then
    do
      # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
  set dummy $ac_tool_prefix$ac_prog; ac_word=$2
- { $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  $as_echo_n "checking for $ac_word... " >&6; }
- if test "${ac_cv_prog_CC+set}" = set; then
+ if test "${ac_cv_prog_CC+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    if test -n "$CC"; then
-Line 2128 
 for as_dir in $PATH
+Line 2298 
 for as_dir in $PATH
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
-   for ac_exec_ext in '' $ac_executable_extensions; do
+     for ac_exec_ext in '' $ac_executable_extensions; do
    if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
      ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
-     $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
    fi
  done
- done
+   done
  IFS=$as_save_IFS
  fi
  fi
  CC=$ac_cv_prog_CC
  if test -n "$CC"; then
-   { $as_echo "$as_me:$LINENO: result: $CC" >&5
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
  $as_echo "$CC" >&6; }
  else
-   { $as_echo "$as_me:$LINENO: result: no" >&5
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  $as_echo "no" >&6; }
  fi
-Line 2159 
 if test -z "$CC"; then
+Line 2329 
 if test -z "$CC"; then
  do
    # Extract the first word of "$ac_prog", so it can be a program name with args.
  set dummy $ac_prog; ac_word=$2
- { $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  $as_echo_n "checking for $ac_word... " >&6; }
- if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
+ if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    if test -n "$ac_ct_CC"; then
-Line 2172 
 for as_dir in $PATH
+Line 2342 
 for as_dir in $PATH
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
-   for ac_exec_ext in '' $ac_executable_extensions; do
+     for ac_exec_ext in '' $ac_executable_extensions; do
    if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
      ac_cv_prog_ac_ct_CC="$ac_prog"
-     $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
    fi
  done
- done
+   done
  IFS=$as_save_IFS
  fi
  fi
  ac_ct_CC=$ac_cv_prog_ac_ct_CC
  if test -n "$ac_ct_CC"; then
-   { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
  $as_echo "$ac_ct_CC" >&6; }
  else
-   { $as_echo "$as_me:$LINENO: result: no" >&5
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  $as_echo "no" >&6; }
  fi
-Line 2202 
 done
+Line 2372 
 done
    else
      case $cross_compiling:$ac_tool_warned in
  yes:)
- { $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
  $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
  ac_tool_warned=yes ;;
  esac
-Line 2213 
 fi
+Line 2383 
 fi
  fi
- test -z "$CC" && { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+ test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
  $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
- { { $as_echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
+ as_fn_error "no acceptable C compiler found in \$PATH
- See \`config.log' for more details." >&5
+ See \`config.log' for more details." "$LINENO" 5; }
- $as_echo "$as_me: error: no acceptable C compiler found in \$PATH
- See \`config.log' for more details." >&2;}
-    { (exit 1); exit 1; }; }; }
  # Provide some information about the compiler.
- $as_echo "$as_me:$LINENO: checking for C compiler version" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
  set X $ac_compile
  ac_compiler=$2
- { (ac_try="$ac_compiler --version >&5"
+ for ac_option in --version -v -V -qversion; do
- case "(($ac_try" in
+   { { ac_try="$ac_compiler $ac_option >&5"
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
- eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
- $as_echo "$ac_try_echo") >&5
-   (eval "$ac_compiler --version >&5") 2>&5
-   ac_status=$?
-   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }
- { (ac_try="$ac_compiler -v >&5"
- case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
- eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
- $as_echo "$ac_try_echo") >&5
-   (eval "$ac_compiler -v >&5") 2>&5
-   ac_status=$?
-   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }
- { (ac_try="$ac_compiler -V >&5"
  case "(($ac_try" in
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
- eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+ eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
- $as_echo "$ac_try_echo") >&5
+ $as_echo "$ac_try_echo"; } >&5
-   (eval "$ac_compiler -V >&5") 2>&5
+   (eval "$ac_compiler $ac_option >&5") 2>conftest.err
    ac_status=$?
-   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   if test -s conftest.err; then
-   (exit $ac_status); }
+     sed '10a\
+ ... rest of stderr output deleted ...
+q' conftest.err >conftest.er1
+     cat conftest.er1 >&5
+   fi
+   rm -f conftest.er1 conftest.err
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; }
+ done
- cat >conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  int
-Line 2279 
 ac_clean_files="$ac_clean_files a.out a.
+Line 2429 
 ac_clean_files="$ac_clean_files a.out a.
  # Try to create an executable without -o first, disregard a.out.
  # It will help us diagnose broken compilers, and finding out an intuition
  # of exeext.
- { $as_echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
- $as_echo_n "checking for C compiler default output file name... " >&6; }
+ $as_echo_n "checking whether the C compiler works... " >&6; }
  ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
  # The possible output files:
-Line 2296 
 do
+Line 2446 
 do
  done
  rm -f $ac_rmfiles
- if { (ac_try="$ac_link_default"
+ if { { ac_try="$ac_link_default"
  case "(($ac_try" in
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
- eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+ eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
- $as_echo "$ac_try_echo") >&5
+ $as_echo "$ac_try_echo"; } >&5
    (eval "$ac_link_default") 2>&5
    ac_status=$?
-   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
+   test $ac_status = 0; }; then :
    # Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
  # So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
  # in a Makefile.  We should not override ac_cv_exeext if it was cached,
-Line 2323 
 do
+Line 2473 
 do
          # certainly right.
          break;;
      *.* )
          if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;
          then :; else
             ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
          fi
-Line 2342 
 test "$ac_cv_exeext" = no && ac_cv_exeex
+Line 2492 
 test "$ac_cv_exeext" = no && ac_cv_exeex
  else
    ac_file=''
  fi
+ if test -z "$ac_file"; then :
- { $as_echo "$as_me:$LINENO: result: $ac_file" >&5
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "$ac_file" >&6; }
+ $as_echo "no" >&6; }
- if test -z "$ac_file"; then
+ $as_echo "$as_me: failed program was:" >&5
-   $as_echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
  $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
- { { $as_echo "$as_me:$LINENO: error: C compiler cannot create executables
+ { as_fn_set_status 77
- See \`config.log' for more details." >&5
+ as_fn_error "C compiler cannot create executables
- $as_echo "$as_me: error: C compiler cannot create executables
+ See \`config.log' for more details." "$LINENO" 5; }; }
- See \`config.log' for more details." >&2;}
+ else
-    { (exit 77); exit 77; }; }; }
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
  fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
+ $as_echo_n "checking for C compiler default output file name... " >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
+ $as_echo "$ac_file" >&6; }
  ac_exeext=$ac_cv_exeext
- # Check that the compiler produces executables we can run.  If not, either
- # the compiler is broken, or we cross compile.
- { $as_echo "$as_me:$LINENO: checking whether the C compiler works" >&5
- $as_echo_n "checking whether the C compiler works... " >&6; }
- # FIXME: These cross compiler hacks should be removed for Autoconf 3.0
- # If not cross compiling, check that we can run a simple program.
- if test "$cross_compiling" != yes; then
-   if { ac_try='./$ac_file'
-   { (case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
- eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
- $as_echo "$ac_try_echo") >&5
-   (eval "$ac_try") 2>&5
-   ac_status=$?
-   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-     cross_compiling=no
-   else
-     if test "$cross_compiling" = maybe; then
-         cross_compiling=yes
-     else
-         { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
- $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
- { { $as_echo "$as_me:$LINENO: error: cannot run C compiled programs.
- If you meant to cross compile, use \`--host'.
- See \`config.log' for more details." >&5
- $as_echo "$as_me: error: cannot run C compiled programs.
- If you meant to cross compile, use \`--host'.
- See \`config.log' for more details." >&2;}
-    { (exit 1); exit 1; }; }; }
-     fi
-   fi
- fi
- { $as_echo "$as_me:$LINENO: result: yes" >&5
- $as_echo "yes" >&6; }
  rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
  ac_clean_files=$ac_clean_files_save
- # Check that the compiler produces executables we can run.  If not, either
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5
- # the compiler is broken, or we cross compile.
- { $as_echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
- $as_echo_n "checking whether we are cross compiling... " >&6; }
- { $as_echo "$as_me:$LINENO: result: $cross_compiling" >&5
- $as_echo "$cross_compiling" >&6; }
- { $as_echo "$as_me:$LINENO: checking for suffix of executables" >&5
  $as_echo_n "checking for suffix of executables... " >&6; }
- if { (ac_try="$ac_link"
+ if { { ac_try="$ac_link"
  case "(($ac_try" in
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
- eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+ eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
- $as_echo "$ac_try_echo") >&5
+ $as_echo "$ac_try_echo"; } >&5
    (eval "$ac_link") 2>&5
    ac_status=$?
-   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
+   test $ac_status = 0; }; then :
    # If both `conftest.exe' and `conftest' are `present' (well, observable)
  # catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will
  # work properly (i.e., refer to `conftest.exe'), while it won't with
-Line 2434 
 for ac_file in conftest.exe conftest con
+Line 2542 
 for ac_file in conftest.exe conftest con
    esac
  done
  else
-   { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+   { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
  $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
- { { $as_echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
+ as_fn_error "cannot compute suffix of executables: cannot compile and link
- See \`config.log' for more details." >&5
+ See \`config.log' for more details." "$LINENO" 5; }
- $as_echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
- See \`config.log' for more details." >&2;}
-    { (exit 1); exit 1; }; }; }
  fi
+ rm -f conftest conftest$ac_cv_exeext
- rm -f conftest$ac_cv_exeext
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
- { $as_echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
  $as_echo "$ac_cv_exeext" >&6; }
  rm -f conftest.$ac_ext
  EXEEXT=$ac_cv_exeext
  ac_exeext=$EXEEXT
- { $as_echo "$as_me:$LINENO: checking for suffix of object files" >&5
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ #include <stdio.h>
+ int
+ main ()
+ {
+ FILE *f = fopen ("conftest.out", "w");
+  return ferror (f) || fclose (f) != 0;
+   ;
+   return 0;
+ }
+ _ACEOF
+ ac_clean_files="$ac_clean_files conftest.out"
+ # Check that the compiler produces executables we can run.  If not, either
+ # the compiler is broken, or we cross compile.
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
+ $as_echo_n "checking whether we are cross compiling... " >&6; }
+ if test "$cross_compiling" != yes; then
+   { { ac_try="$ac_link"
+ case "(($ac_try" in
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+ eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+ $as_echo "$ac_try_echo"; } >&5
+   (eval "$ac_link") 2>&5
+   ac_status=$?
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; }
+   if { ac_try='./conftest$ac_cv_exeext'
+   { { case "(($ac_try" in
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+ eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+ $as_echo "$ac_try_echo"; } >&5
+   (eval "$ac_try") 2>&5
+   ac_status=$?
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; }; }; then
+     cross_compiling=no
+   else
+     if test "$cross_compiling" = maybe; then
+         cross_compiling=yes
+     else
+         { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+ as_fn_error "cannot run C compiled programs.
+ If you meant to cross compile, use \`--host'.
+ See \`config.log' for more details." "$LINENO" 5; }
+     fi
+   fi
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
+ $as_echo "$cross_compiling" >&6; }
+ rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out
+ ac_clean_files=$ac_clean_files_save
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
  $as_echo_n "checking for suffix of object files... " >&6; }
- if test "${ac_cv_objext+set}" = set; then
+ if test "${ac_cv_objext+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
-   cat >conftest.$ac_ext <<_ACEOF
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  int
-Line 2471 
 main ()
+Line 2630 
 main ()
  }
  _ACEOF
  rm -f conftest.o conftest.obj
- if { (ac_try="$ac_compile"
+ if { { ac_try="$ac_compile"
  case "(($ac_try" in
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
- eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+ eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
- $as_echo "$ac_try_echo") >&5
+ $as_echo "$ac_try_echo"; } >&5
    (eval "$ac_compile") 2>&5
    ac_status=$?
-   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
+   test $ac_status = 0; }; then :
    for ac_file in conftest.o conftest.obj conftest.*; do
    test -f "$ac_file" || continue;
    case $ac_file in
-Line 2494 
 else
+Line 2653 
 else
    $as_echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
  $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
- { { $as_echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile
+ as_fn_error "cannot compute suffix of object files: cannot compile
- See \`config.log' for more details." >&5
+ See \`config.log' for more details." "$LINENO" 5; }
- $as_echo "$as_me: error: cannot compute suffix of object files: cannot compile
- See \`config.log' for more details." >&2;}
-    { (exit 1); exit 1; }; }; }
  fi
  rm -f conftest.$ac_cv_objext conftest.$ac_ext
  fi
- { $as_echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5
  $as_echo "$ac_cv_objext" >&6; }
  OBJEXT=$ac_cv_objext
  ac_objext=$OBJEXT
- { $as_echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
  $as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
- if test "${ac_cv_c_compiler_gnu+set}" = set; then
+ if test "${ac_cv_c_compiler_gnu+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
-   cat >conftest.$ac_ext <<_ACEOF
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  int
-Line 2532 
 main ()
+Line 2683 
 main ()
    return 0;
  }
  _ACEOF
- rm -f conftest.$ac_objext
+ if ac_fn_c_try_compile "$LINENO"; then :
- if { (ac_try="$ac_compile"
- case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
- eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
- $as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
-          test -z "$ac_c_werror_flag" ||
-          test ! -s conftest.err
-        } && test -s conftest.$ac_objext; then
    ac_compiler_gnu=yes
  else
-   $as_echo "$as_me: failed program was:" >&5
+   ac_compiler_gnu=no
- sed 's/^/| /' conftest.$ac_ext >&5
-         ac_compiler_gnu=no
  fi
  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  ac_cv_c_compiler_gnu=$ac_compiler_gnu
  fi
- { $as_echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5
  $as_echo "$ac_cv_c_compiler_gnu" >&6; }
  if test $ac_compiler_gnu = yes; then
    GCC=yes
-Line 2571 
 else
+Line 2701 
 else
  fi
  ac_test_CFLAGS=${CFLAGS+set}
  ac_save_CFLAGS=$CFLAGS
- { $as_echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
  $as_echo_n "checking whether $CC accepts -g... " >&6; }
- if test "${ac_cv_prog_cc_g+set}" = set; then
+ if test "${ac_cv_prog_cc_g+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    ac_save_c_werror_flag=$ac_c_werror_flag
     ac_c_werror_flag=yes
     ac_cv_prog_cc_g=no
     CFLAGS="-g"
-    cat >conftest.$ac_ext <<_ACEOF
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  int
-Line 2595 
 main ()
+Line 2721 
 main ()
    return 0;
  }
  _ACEOF
- rm -f conftest.$ac_objext
+ if ac_fn_c_try_compile "$LINENO"; then :
- if { (ac_try="$ac_compile"
- case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
- eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
- $as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
-          test -z "$ac_c_werror_flag" ||
-          test ! -s conftest.err
-        } && test -s conftest.$ac_objext; then
    ac_cv_prog_cc_g=yes
  else
-   $as_echo "$as_me: failed program was:" >&5
+   CFLAGS=""
- sed 's/^/| /' conftest.$ac_ext >&5
+       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-         CFLAGS=""
-       cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  int
-Line 2634 
 main ()
+Line 2736 
 main ()
    return 0;
  }
  _ACEOF
- rm -f conftest.$ac_objext
+ if ac_fn_c_try_compile "$LINENO"; then :
- if { (ac_try="$ac_compile"
- case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
- eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
- $as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
-          test -z "$ac_c_werror_flag" ||
-          test ! -s conftest.err
-        } && test -s conftest.$ac_objext; then
-   :
- else
-   $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-         ac_c_werror_flag=$ac_save_c_werror_flag
+ else
+   ac_c_werror_flag=$ac_save_c_werror_flag
           CFLAGS="-g"
-          cat >conftest.$ac_ext <<_ACEOF
+          cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  int
-Line 2674 
 main ()
+Line 2752 
 main ()
    return 0;
  }
  _ACEOF
- rm -f conftest.$ac_objext
+ if ac_fn_c_try_compile "$LINENO"; then :
- if { (ac_try="$ac_compile"
- case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
- eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
- $as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
-          test -z "$ac_c_werror_flag" ||
-          test ! -s conftest.err
-        } && test -s conftest.$ac_objext; then
    ac_cv_prog_cc_g=yes
- else
-   $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
  fi
  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
     ac_c_werror_flag=$ac_save_c_werror_flag
  fi
- { $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5
  $as_echo "$ac_cv_prog_cc_g" >&6; }
  if test "$ac_test_CFLAGS" = set; then
    CFLAGS=$ac_save_CFLAGS
-Line 2726 
 else
+Line 2779 
 else
      CFLAGS=
    fi
  fi
- { $as_echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
  $as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
- if test "${ac_cv_prog_cc_c89+set}" = set; then
+ if test "${ac_cv_prog_cc_c89+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    ac_cv_prog_cc_c89=no
  ac_save_CC=$CC
- cat >conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  #include <stdarg.h>
  #include <stdio.h>
-Line 2788 
 main ()
+Line 2837 
 main ()
  return f (e, argv, 0) != argv[0]  ||  f (e, argv, 1) != argv[1];
    ;
    return 0;
  }
  _ACEOF
  for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
          -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
  do
    CC="$ac_save_CC $ac_arg"
-   rm -f conftest.$ac_objext
+   if ac_fn_c_try_compile "$LINENO"; then :
- if { (ac_try="$ac_compile"
- case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
- eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
- $as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
-          test -z "$ac_c_werror_flag" ||
-          test ! -s conftest.err
-        } && test -s conftest.$ac_objext; then
    ac_cv_prog_cc_c89=$ac_arg
- else
-   $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
  fi
  rm -f core conftest.err conftest.$ac_objext
    test "x$ac_cv_prog_cc_c89" != "xno" && break
  done
-Line 2830 
 fi
+Line 2856 
 fi
  # AC_CACHE_VAL
  case "x$ac_cv_prog_cc_c89" in
    x)
-     { $as_echo "$as_me:$LINENO: result: none needed" >&5
+     { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
  $as_echo "none needed" >&6; } ;;
    xno)
-     { $as_echo "$as_me:$LINENO: result: unsupported" >&5
+     { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
  $as_echo "unsupported" >&6; } ;;
    *)
      CC="$CC $ac_cv_prog_cc_c89"
-     { $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
+     { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
  $as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
  esac
+ if test "x$ac_cv_prog_cc_c89" != xno; then :
+ fi
  ac_ext=c
  ac_cpp='$CPP $CPPFLAGS'
-Line 2850 
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
+Line 2878 
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
  ac_aux_dir=
  for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
-   if test -f "$ac_dir/install-sh"; then
+   for ac_t in install-sh install.sh shtool; do
-     ac_aux_dir=$ac_dir
+     if test -f "$ac_dir/$ac_t"; then
-     ac_install_sh="$ac_aux_dir/install-sh -c"
+       ac_aux_dir=$ac_dir
-     break
+       ac_install_sh="$ac_aux_dir/$ac_t -c"
-   elif test -f "$ac_dir/install.sh"; then
+       break 2
-     ac_aux_dir=$ac_dir
+     fi
-     ac_install_sh="$ac_aux_dir/install.sh -c"
+   done
-     break
-   elif test -f "$ac_dir/shtool"; then
-     ac_aux_dir=$ac_dir
-     ac_install_sh="$ac_aux_dir/shtool install -c"
-     break
-   fi
  done
  if test -z "$ac_aux_dir"; then
-   { { $as_echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&5
+   as_fn_error "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5
- $as_echo "$as_me: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&2;}
-    { (exit 1); exit 1; }; }
  fi
  # These three variables are undocumented and unsupported,
-Line 2893 
 ac_configure="$SHELL $ac_aux_dir/configu
+Line 2913 
 ac_configure="$SHELL $ac_aux_dir/configu
  # OS/2's system install, which has a completely different semantic
  # ./install, which can be erroneously created by make from ./install.sh.
  # Reject install programs that cannot install multiple files.
- { $as_echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5
  $as_echo_n "checking for a BSD-compatible install... " >&6; }
  if test -z "$INSTALL"; then
- if test "${ac_cv_path_install+set}" = set; then
+ if test "${ac_cv_path_install+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-Line 2904 
 for as_dir in $PATH
+Line 2924 
 for as_dir in $PATH
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
-   # Account for people who put trailing slashes in PATH elements.
+     # Account for people who put trailing slashes in PATH elements.
- case $as_dir/ in
+ case $as_dir/ in #((
-   ./ | .// | /cC/* | \
+   ./ | .// | /[cC]/* | \
    /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
-   ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \
+   ?:[\\/]os2[\\/]install[\\/]* | ?:[\\/]OS2[\\/]INSTALL[\\/]* | \
    /usr/ucb/* ) ;;
    *)
      # OSF1 and SCO ODT 3.0 have their own names for install.
-Line 2945 
 case $as_dir/ in
+Line 2965 
 case $as_dir/ in
      ;;
  esac
- done
+   done
  IFS=$as_save_IFS
  rm -rf conftest.one conftest.two conftest.dir
-Line 2961 
 fi
+Line 2981 
 fi
      INSTALL=$ac_install_sh
    fi
  fi
- { $as_echo "$as_me:$LINENO: result: $INSTALL" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5
  $as_echo "$INSTALL" >&6; }
  # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
-Line 2972 
 test -z "$INSTALL_SCRIPT" && INSTALL_SCR
+Line 2992 
 test -z "$INSTALL_SCRIPT" && INSTALL_SCR
  test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
- { $as_echo "$as_me:$LINENO: checking whether ln -s works" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5
  $as_echo_n "checking whether ln -s works... " >&6; }
  LN_S=$as_ln_s
  if test "$LN_S" = "ln -s"; then
-   { $as_echo "$as_me:$LINENO: result: yes" >&5
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
  $as_echo "yes" >&6; }
  else
-   { $as_echo "$as_me:$LINENO: result: no, using $LN_S" >&5
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, using $LN_S" >&5
  $as_echo "no, using $LN_S" >&6; }
  fi
- { $as_echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5
  $as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
  set x ${MAKE-make}
  ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
- if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then
+ if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then :
    $as_echo_n "(cached) " >&6
  else
    cat >conftest.make <<\_ACEOF
-Line 3005 
 esac
+Line 3025 
 esac
  rm -f conftest.make
  fi
  if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
-   { $as_echo "$as_me:$LINENO: result: yes" >&5
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
  $as_echo "yes" >&6; }
    SET_MAKE=
  else
-   { $as_echo "$as_me:$LINENO: result: no" >&5
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  $as_echo "no" >&6; }
    SET_MAKE="MAKE=${MAKE-make}"
  fi
-Line 3043 
 if test "x$ac_cv_env_PKG_CONFIG_set" !=
+Line 3063 
 if test "x$ac_cv_env_PKG_CONFIG_set" !=
          if test -n "$ac_tool_prefix"; then
    # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
  set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
- { $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  $as_echo_n "checking for $ac_word... " >&6; }
- if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
+ if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    case $PKG_CONFIG in
-Line 3058 
 for as_dir in $PATH
+Line 3078 
 for as_dir in $PATH
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
-   for ac_exec_ext in '' $ac_executable_extensions; do
+     for ac_exec_ext in '' $ac_executable_extensions; do
    if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
      ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-     $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
    fi
  done
- done
+   done
  IFS=$as_save_IFS
    ;;
-Line 3073 
 esac
+Line 3093 
 esac
  fi
  PKG_CONFIG=$ac_cv_path_PKG_CONFIG
  if test -n "$PKG_CONFIG"; then
-   { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
  $as_echo "$PKG_CONFIG" >&6; }
  else
-   { $as_echo "$as_me:$LINENO: result: no" >&5
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  $as_echo "no" >&6; }
  fi
-Line 3086 
 if test -z "$ac_cv_path_PKG_CONFIG"; the
+Line 3106 
 if test -z "$ac_cv_path_PKG_CONFIG"; the
    ac_pt_PKG_CONFIG=$PKG_CONFIG
    # Extract the first word of "pkg-config", so it can be a program name with args.
  set dummy pkg-config; ac_word=$2
- { $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  $as_echo_n "checking for $ac_word... " >&6; }
- if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then
+ if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    case $ac_pt_PKG_CONFIG in
-Line 3101 
 for as_dir in $PATH
+Line 3121 
 for as_dir in $PATH
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
-   for ac_exec_ext in '' $ac_executable_extensions; do
+     for ac_exec_ext in '' $ac_executable_extensions; do
    if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
      ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-     $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
    fi
  done
- done
+   done
  IFS=$as_save_IFS
    ;;
-Line 3116 
 esac
+Line 3136 
 esac
  fi
  ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
  if test -n "$ac_pt_PKG_CONFIG"; then
-   { $as_echo "$as_me:$LINENO: result: $ac_pt_PKG_CONFIG" >&5
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5
  $as_echo "$ac_pt_PKG_CONFIG" >&6; }
  else
-   { $as_echo "$as_me:$LINENO: result: no" >&5
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  $as_echo "no" >&6; }
  fi
-Line 3128 
 fi
+Line 3148 
 fi
    else
      case $cross_compiling:$ac_tool_warned in
  yes:)
- { $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
  $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
  ac_tool_warned=yes ;;
  esac
-Line 3141 
 fi
+Line 3161 
 fi
  fi
  if test -n "$PKG_CONFIG"; then
          _pkg_min_version=0.9.0
-         { $as_echo "$as_me:$LINENO: checking pkg-config is at least version $_pkg_min_version" >&5
+         { $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5
  $as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; }
          if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
-                 { $as_echo "$as_me:$LINENO: result: yes" >&5
+                 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
  $as_echo "yes" >&6; }
          else
-                 { $as_echo "$as_me:$LINENO: result: no" >&5
+                 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  $as_echo "no" >&6; }
                  PKG_CONFIG=""
          fi
-Line 3155 
 $as_echo "no" >&6; }
+Line 3175 
 $as_echo "no" >&6; }
  fi
  pkg_failed=no
- { $as_echo "$as_me:$LINENO: checking for gnome_vfs_module" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gnome_vfs_module" >&5
  $as_echo_n "checking for gnome_vfs_module... " >&6; }
  if test -n "$PKG_CONFIG"; then
-Line 3163 
 if test -n "$PKG_CONFIG"; then
+Line 3183 
 if test -n "$PKG_CONFIG"; then
          pkg_cv_gnome_vfs_module_CFLAGS="$gnome_vfs_module_CFLAGS"
      else
          if test -n "$PKG_CONFIG" && \
-     { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gnome-vfs-module-2.0\"") >&5
+     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gnome-vfs-module-2.0\""; } >&5
    ($PKG_CONFIG --exists --print-errors "gnome-vfs-module-2.0") 2>&5
    ac_status=$?
-   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
+   test $ac_status = 0; }; then
    pkg_cv_gnome_vfs_module_CFLAGS=`$PKG_CONFIG --cflags "gnome-vfs-module-2.0" 2>/dev/null`
  else
    pkg_failed=yes
-Line 3181 
 if test -n "$PKG_CONFIG"; then
+Line 3201 
 if test -n "$PKG_CONFIG"; then
          pkg_cv_gnome_vfs_module_LIBS="$gnome_vfs_module_LIBS"
      else
          if test -n "$PKG_CONFIG" && \
-     { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gnome-vfs-module-2.0\"") >&5
+     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gnome-vfs-module-2.0\""; } >&5
    ($PKG_CONFIG --exists --print-errors "gnome-vfs-module-2.0") 2>&5
    ac_status=$?
-   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
+   test $ac_status = 0; }; then
    pkg_cv_gnome_vfs_module_LIBS=`$PKG_CONFIG --libs "gnome-vfs-module-2.0" 2>/dev/null`
  else
    pkg_failed=yes
-Line 3212 
 fi
+Line 3232 
 fi
          # Put the nasty error message in config.log where it belongs
          echo "$gnome_vfs_module_PKG_ERRORS" >&5
-         { $as_echo "$as_me:$LINENO: result: no" >&5
+         { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  $as_echo "no" >&6; }
-                 { { $as_echo "$as_me:$LINENO: error: gnome-vfs-module-2.0 missing" >&5
+                 as_fn_error "gnome-vfs-module-2.0 missing" "$LINENO" 5
- $as_echo "$as_me: error: gnome-vfs-module-2.0 missing" >&2;}
-    { (exit 1); exit 1; }; }
  elif test $pkg_failed = untried; then
-         { { $as_echo "$as_me:$LINENO: error: gnome-vfs-module-2.0 missing" >&5
+         as_fn_error "gnome-vfs-module-2.0 missing" "$LINENO" 5
- $as_echo "$as_me: error: gnome-vfs-module-2.0 missing" >&2;}
-    { (exit 1); exit 1; }; }
  else
          gnome_vfs_module_CFLAGS=$pkg_cv_gnome_vfs_module_CFLAGS
          gnome_vfs_module_LIBS=$pkg_cv_gnome_vfs_module_LIBS
-         { $as_echo "$as_me:$LINENO: result: yes" >&5
+         { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
  $as_echo "yes" >&6; }
          :
  fi
-Line 3234 
 LIBS="$LIBS $gnome_vfs_module_LIBS"
+Line 3250 
 LIBS="$LIBS $gnome_vfs_module_LIBS"
  # check for libxml-2.0
  pkg_failed=no
- { $as_echo "$as_me:$LINENO: checking for libxml2" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libxml2" >&5
  $as_echo_n "checking for libxml2... " >&6; }
  if test -n "$PKG_CONFIG"; then
-Line 3242 
 if test -n "$PKG_CONFIG"; then
+Line 3258 
 if test -n "$PKG_CONFIG"; then
          pkg_cv_libxml2_CFLAGS="$libxml2_CFLAGS"
      else
          if test -n "$PKG_CONFIG" && \
-     { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libxml-2.0\"") >&5
+     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libxml-2.0\""; } >&5
    ($PKG_CONFIG --exists --print-errors "libxml-2.0") 2>&5
    ac_status=$?
-   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
+   test $ac_status = 0; }; then
    pkg_cv_libxml2_CFLAGS=`$PKG_CONFIG --cflags "libxml-2.0" 2>/dev/null`
  else
    pkg_failed=yes
-Line 3260 
 if test -n "$PKG_CONFIG"; then
+Line 3276 
 if test -n "$PKG_CONFIG"; then
          pkg_cv_libxml2_LIBS="$libxml2_LIBS"
      else
          if test -n "$PKG_CONFIG" && \
-     { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libxml-2.0\"") >&5
+     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libxml-2.0\""; } >&5
    ($PKG_CONFIG --exists --print-errors "libxml-2.0") 2>&5
    ac_status=$?
-   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
+   test $ac_status = 0; }; then
    pkg_cv_libxml2_LIBS=`$PKG_CONFIG --libs "libxml-2.0" 2>/dev/null`
  else
    pkg_failed=yes
-Line 3291 
 fi
+Line 3307 
 fi
          # Put the nasty error message in config.log where it belongs
          echo "$libxml2_PKG_ERRORS" >&5
-         { $as_echo "$as_me:$LINENO: result: no" >&5
+         { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  $as_echo "no" >&6; }
-                 { { $as_echo "$as_me:$LINENO: error: libxml-2.0 missing" >&5
+                 as_fn_error "libxml-2.0 missing" "$LINENO" 5
- $as_echo "$as_me: error: libxml-2.0 missing" >&2;}
-    { (exit 1); exit 1; }; }
  elif test $pkg_failed = untried; then
-         { { $as_echo "$as_me:$LINENO: error: libxml-2.0 missing" >&5
+         as_fn_error "libxml-2.0 missing" "$LINENO" 5
- $as_echo "$as_me: error: libxml-2.0 missing" >&2;}
-    { (exit 1); exit 1; }; }
  else
          libxml2_CFLAGS=$pkg_cv_libxml2_CFLAGS
          libxml2_LIBS=$pkg_cv_libxml2_LIBS
-         { $as_echo "$as_me:$LINENO: result: yes" >&5
+         { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
  $as_echo "yes" >&6; }
          :
  fi
-Line 3313 
 LIBS="$LIBS $libxml2_LIBS"
+Line 3325 
 LIBS="$LIBS $libxml2_LIBS"
  # check for libcurl
  pkg_failed=no
- { $as_echo "$as_me:$LINENO: checking for libcurl" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libcurl" >&5
  $as_echo_n "checking for libcurl... " >&6; }
  if test -n "$PKG_CONFIG"; then
-Line 3321 
 if test -n "$PKG_CONFIG"; then
+Line 3333 
 if test -n "$PKG_CONFIG"; then
          pkg_cv_libcurl_CFLAGS="$libcurl_CFLAGS"
      else
          if test -n "$PKG_CONFIG" && \
-     { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libcurl\"") >&5
+     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libcurl\""; } >&5
    ($PKG_CONFIG --exists --print-errors "libcurl") 2>&5
    ac_status=$?
-   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
+   test $ac_status = 0; }; then
    pkg_cv_libcurl_CFLAGS=`$PKG_CONFIG --cflags "libcurl" 2>/dev/null`
  else
    pkg_failed=yes
-Line 3339 
 if test -n "$PKG_CONFIG"; then
+Line 3351 
 if test -n "$PKG_CONFIG"; then
          pkg_cv_libcurl_LIBS="$libcurl_LIBS"
      else
          if test -n "$PKG_CONFIG" && \
-     { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libcurl\"") >&5
+     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libcurl\""; } >&5
    ($PKG_CONFIG --exists --print-errors "libcurl") 2>&5
    ac_status=$?
-   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
+   test $ac_status = 0; }; then
    pkg_cv_libcurl_LIBS=`$PKG_CONFIG --libs "libcurl" 2>/dev/null`
  else
    pkg_failed=yes
-Line 3370 
 fi
+Line 3382 
 fi
          # Put the nasty error message in config.log where it belongs
          echo "$libcurl_PKG_ERRORS" >&5
-         { $as_echo "$as_me:$LINENO: result: no" >&5
+         { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  $as_echo "no" >&6; }
-                 { { $as_echo "$as_me:$LINENO: error: libcurl missing" >&5
+                 as_fn_error "libcurl missing" "$LINENO" 5
- $as_echo "$as_me: error: libcurl missing" >&2;}
-    { (exit 1); exit 1; }; }
  elif test $pkg_failed = untried; then
-         { { $as_echo "$as_me:$LINENO: error: libcurl missing" >&5
+         as_fn_error "libcurl missing" "$LINENO" 5
- $as_echo "$as_me: error: libcurl missing" >&2;}
-    { (exit 1); exit 1; }; }
  else
          libcurl_CFLAGS=$pkg_cv_libcurl_CFLAGS
          libcurl_LIBS=$pkg_cv_libcurl_LIBS
-         { $as_echo "$as_me:$LINENO: result: yes" >&5
+         { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
  $as_echo "yes" >&6; }
          :
  fi
-Line 3392 
 LIBS="$LIBS $libcurl_LIBS"
+Line 3400 
 LIBS="$LIBS $libcurl_LIBS"
  # check for libsoup
  pkg_failed=no
- { $as_echo "$as_me:$LINENO: checking for libsoup24" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libsoup24" >&5
  $as_echo_n "checking for libsoup24... " >&6; }
  if test -n "$PKG_CONFIG"; then
-Line 3400 
 if test -n "$PKG_CONFIG"; then
+Line 3408 
 if test -n "$PKG_CONFIG"; then
          pkg_cv_libsoup24_CFLAGS="$libsoup24_CFLAGS"
      else
          if test -n "$PKG_CONFIG" && \
-     { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libsoup-2.4\"") >&5
+     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsoup-2.4\""; } >&5
    ($PKG_CONFIG --exists --print-errors "libsoup-2.4") 2>&5
    ac_status=$?
-   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
+   test $ac_status = 0; }; then
    pkg_cv_libsoup24_CFLAGS=`$PKG_CONFIG --cflags "libsoup-2.4" 2>/dev/null`
  else
    pkg_failed=yes
-Line 3418 
 if test -n "$PKG_CONFIG"; then
+Line 3426 
 if test -n "$PKG_CONFIG"; then
          pkg_cv_libsoup24_LIBS="$libsoup24_LIBS"
      else
          if test -n "$PKG_CONFIG" && \
-     { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libsoup-2.4\"") >&5
+     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsoup-2.4\""; } >&5
    ($PKG_CONFIG --exists --print-errors "libsoup-2.4") 2>&5
    ac_status=$?
-   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
+   test $ac_status = 0; }; then
    pkg_cv_libsoup24_LIBS=`$PKG_CONFIG --libs "libsoup-2.4" 2>/dev/null`
  else
    pkg_failed=yes
-Line 3449 
 fi
+Line 3457 
 fi
          # Put the nasty error message in config.log where it belongs
          echo "$libsoup24_PKG_ERRORS" >&5
-         { $as_echo "$as_me:$LINENO: result: no" >&5
+         { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  $as_echo "no" >&6; }
  pkg_failed=no
- { $as_echo "$as_me:$LINENO: checking for libsoup22" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libsoup22" >&5
  $as_echo_n "checking for libsoup22... " >&6; }
  if test -n "$PKG_CONFIG"; then
-Line 3462 
 if test -n "$PKG_CONFIG"; then
+Line 3470 
 if test -n "$PKG_CONFIG"; then
          pkg_cv_libsoup22_CFLAGS="$libsoup22_CFLAGS"
      else
          if test -n "$PKG_CONFIG" && \
-     { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libsoup-2.2\"") >&5
+     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsoup-2.2\""; } >&5
    ($PKG_CONFIG --exists --print-errors "libsoup-2.2") 2>&5
    ac_status=$?
-   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
+   test $ac_status = 0; }; then
    pkg_cv_libsoup22_CFLAGS=`$PKG_CONFIG --cflags "libsoup-2.2" 2>/dev/null`
  else
    pkg_failed=yes
-Line 3480 
 if test -n "$PKG_CONFIG"; then
+Line 3488 
 if test -n "$PKG_CONFIG"; then
          pkg_cv_libsoup22_LIBS="$libsoup22_LIBS"
      else
          if test -n "$PKG_CONFIG" && \
-     { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libsoup-2.2\"") >&5
+     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsoup-2.2\""; } >&5
    ($PKG_CONFIG --exists --print-errors "libsoup-2.2") 2>&5
    ac_status=$?
-   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
+   test $ac_status = 0; }; then
    pkg_cv_libsoup22_LIBS=`$PKG_CONFIG --libs "libsoup-2.2" 2>/dev/null`
  else
    pkg_failed=yes
-Line 3511 
 fi
+Line 3519 
 fi
          # Put the nasty error message in config.log where it belongs
          echo "$libsoup22_PKG_ERRORS" >&5
-         { $as_echo "$as_me:$LINENO: result: no" >&5
+         { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  $as_echo "no" >&6; }
-     { $as_echo "$as_me:$LINENO: WARNING: libsoup-2.4/2.2 missing, disabling internal map" >&5
+     { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: libsoup-2.4/2.2 missing, disabling internal map" >&5
  $as_echo "$as_me: WARNING: libsoup-2.4/2.2 missing, disabling internal map" >&6;}
  elif test $pkg_failed = untried; then
-     { $as_echo "$as_me:$LINENO: WARNING: libsoup-2.4/2.2 missing, disabling internal map" >&5
+     { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: libsoup-2.4/2.2 missing, disabling internal map" >&5
  $as_echo "$as_me: WARNING: libsoup-2.4/2.2 missing, disabling internal map" >&6;}
  else
          libsoup22_CFLAGS=$pkg_cv_libsoup22_CFLAGS
          libsoup22_LIBS=$pkg_cv_libsoup22_LIBS
-         { $as_echo "$as_me:$LINENO: result: yes" >&5
+         { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
  $as_echo "yes" >&6; }
      EXTRA_OBJS="$EXTRA_OBJS converter.o osm-gps-map.o map-tool.o osm-gps-map-osd-classic.o"
-Line 3538 
 elif test $pkg_failed = untried; then
+Line 3546 
 elif test $pkg_failed = untried; then
  pkg_failed=no
- { $as_echo "$as_me:$LINENO: checking for libsoup22" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libsoup22" >&5
  $as_echo_n "checking for libsoup22... " >&6; }
  if test -n "$PKG_CONFIG"; then
-Line 3546 
 if test -n "$PKG_CONFIG"; then
+Line 3554 
 if test -n "$PKG_CONFIG"; then
          pkg_cv_libsoup22_CFLAGS="$libsoup22_CFLAGS"
      else
          if test -n "$PKG_CONFIG" && \
-     { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libsoup-2.2\"") >&5
+     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsoup-2.2\""; } >&5
    ($PKG_CONFIG --exists --print-errors "libsoup-2.2") 2>&5
    ac_status=$?
-   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
+   test $ac_status = 0; }; then
    pkg_cv_libsoup22_CFLAGS=`$PKG_CONFIG --cflags "libsoup-2.2" 2>/dev/null`
  else
    pkg_failed=yes
-Line 3564 
 if test -n "$PKG_CONFIG"; then
+Line 3572 
 if test -n "$PKG_CONFIG"; then
          pkg_cv_libsoup22_LIBS="$libsoup22_LIBS"
      else
          if test -n "$PKG_CONFIG" && \
-     { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libsoup-2.2\"") >&5
+     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsoup-2.2\""; } >&5
    ($PKG_CONFIG --exists --print-errors "libsoup-2.2") 2>&5
    ac_status=$?
-   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
+   test $ac_status = 0; }; then
    pkg_cv_libsoup22_LIBS=`$PKG_CONFIG --libs "libsoup-2.2" 2>/dev/null`
  else
    pkg_failed=yes
-Line 3595 
 fi
+Line 3603 
 fi
          # Put the nasty error message in config.log where it belongs
          echo "$libsoup22_PKG_ERRORS" >&5
-         { $as_echo "$as_me:$LINENO: result: no" >&5
+         { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  $as_echo "no" >&6; }
-     { $as_echo "$as_me:$LINENO: WARNING: libsoup-2.4/2.2 missing, disabling internal map" >&5
+     { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: libsoup-2.4/2.2 missing, disabling internal map" >&5
  $as_echo "$as_me: WARNING: libsoup-2.4/2.2 missing, disabling internal map" >&6;}
  elif test $pkg_failed = untried; then
-     { $as_echo "$as_me:$LINENO: WARNING: libsoup-2.4/2.2 missing, disabling internal map" >&5
+     { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: libsoup-2.4/2.2 missing, disabling internal map" >&5
  $as_echo "$as_me: WARNING: libsoup-2.4/2.2 missing, disabling internal map" >&6;}
  else
          libsoup22_CFLAGS=$pkg_cv_libsoup22_CFLAGS
          libsoup22_LIBS=$pkg_cv_libsoup22_LIBS
-         { $as_echo "$as_me:$LINENO: result: yes" >&5
+         { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
  $as_echo "yes" >&6; }
      EXTRA_OBJS="$EXTRA_OBJS converter.o osm-gps-map.o map-tool.o osm-gps-map-osd-classic.o"
-Line 3621 
 fi
+Line 3629 
 fi
  else
          libsoup24_CFLAGS=$pkg_cv_libsoup24_CFLAGS
          libsoup24_LIBS=$pkg_cv_libsoup24_LIBS
-         { $as_echo "$as_me:$LINENO: result: yes" >&5
+         { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
  $as_echo "yes" >&6; }
    EXTRA_OBJS="$EXTRA_OBJS converter.o osm-gps-map.o map-tool.o osm-gps-map-osd-classic.o"
-Line 3633 
 fi
+Line 3641 
 fi
  # check for gtkhtml-3.14
  pkg_failed=no
- { $as_echo "$as_me:$LINENO: checking for libgtkhtml3_14" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libgtkhtml3_14" >&5
  $as_echo_n "checking for libgtkhtml3_14... " >&6; }
  if test -n "$PKG_CONFIG"; then
-Line 3641 
 if test -n "$PKG_CONFIG"; then
+Line 3649 
 if test -n "$PKG_CONFIG"; then
          pkg_cv_libgtkhtml3_14_CFLAGS="$libgtkhtml3_14_CFLAGS"
      else
          if test -n "$PKG_CONFIG" && \
-     { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgtkhtml-3.14\"") >&5
+     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libgtkhtml-3.14\""; } >&5
    ($PKG_CONFIG --exists --print-errors "libgtkhtml-3.14") 2>&5
    ac_status=$?
-   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
+   test $ac_status = 0; }; then
    pkg_cv_libgtkhtml3_14_CFLAGS=`$PKG_CONFIG --cflags "libgtkhtml-3.14" 2>/dev/null`
  else
    pkg_failed=yes
-Line 3659 
 if test -n "$PKG_CONFIG"; then
+Line 3667 
 if test -n "$PKG_CONFIG"; then
          pkg_cv_libgtkhtml3_14_LIBS="$libgtkhtml3_14_LIBS"
      else
          if test -n "$PKG_CONFIG" && \
-     { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgtkhtml-3.14\"") >&5
+     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libgtkhtml-3.14\""; } >&5
    ($PKG_CONFIG --exists --print-errors "libgtkhtml-3.14") 2>&5
    ac_status=$?
-   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
+   test $ac_status = 0; }; then
    pkg_cv_libgtkhtml3_14_LIBS=`$PKG_CONFIG --libs "libgtkhtml-3.14" 2>/dev/null`
  else
    pkg_failed=yes
-Line 3690 
 fi
+Line 3698 
 fi
          # Put the nasty error message in config.log where it belongs
          echo "$libgtkhtml3_14_PKG_ERRORS" >&5
-         { $as_echo "$as_me:$LINENO: result: no" >&5
+         { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  $as_echo "no" >&6; }
    # ok, we can also live with 3.8
  pkg_failed=no
- { $as_echo "$as_me:$LINENO: checking for libgtkhtml3_8" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libgtkhtml3_8" >&5
  $as_echo_n "checking for libgtkhtml3_8... " >&6; }
  if test -n "$PKG_CONFIG"; then
-Line 3704 
 if test -n "$PKG_CONFIG"; then
+Line 3712 
 if test -n "$PKG_CONFIG"; then
          pkg_cv_libgtkhtml3_8_CFLAGS="$libgtkhtml3_8_CFLAGS"
      else
          if test -n "$PKG_CONFIG" && \
-     { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgtkhtml-3.8\"") >&5
+     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libgtkhtml-3.8\""; } >&5
    ($PKG_CONFIG --exists --print-errors "libgtkhtml-3.8") 2>&5
    ac_status=$?
-   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
+   test $ac_status = 0; }; then
    pkg_cv_libgtkhtml3_8_CFLAGS=`$PKG_CONFIG --cflags "libgtkhtml-3.8" 2>/dev/null`
  else
    pkg_failed=yes
-Line 3722 
 if test -n "$PKG_CONFIG"; then
+Line 3730 
 if test -n "$PKG_CONFIG"; then
          pkg_cv_libgtkhtml3_8_LIBS="$libgtkhtml3_8_LIBS"
      else
          if test -n "$PKG_CONFIG" && \
-     { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgtkhtml-3.8\"") >&5
+     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libgtkhtml-3.8\""; } >&5
    ($PKG_CONFIG --exists --print-errors "libgtkhtml-3.8") 2>&5
    ac_status=$?
-   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
+   test $ac_status = 0; }; then
    pkg_cv_libgtkhtml3_8_LIBS=`$PKG_CONFIG --libs "libgtkhtml-3.8" 2>/dev/null`
  else
    pkg_failed=yes
-Line 3753 
 fi
+Line 3761 
 fi
          # Put the nasty error message in config.log where it belongs
          echo "$libgtkhtml3_8_PKG_ERRORS" >&5
-         { $as_echo "$as_me:$LINENO: result: no" >&5
+         { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  $as_echo "no" >&6; }
-                 { { $as_echo "$as_me:$LINENO: error: libgtkhtml-3 missing" >&5
+                 as_fn_error "libgtkhtml-3 missing" "$LINENO" 5
- $as_echo "$as_me: error: libgtkhtml-3 missing" >&2;}
-    { (exit 1); exit 1; }; }
  elif test $pkg_failed = untried; then
-         { { $as_echo "$as_me:$LINENO: error: libgtkhtml-3 missing" >&5
+         as_fn_error "libgtkhtml-3 missing" "$LINENO" 5
- $as_echo "$as_me: error: libgtkhtml-3 missing" >&2;}
-    { (exit 1); exit 1; }; }
  else
          libgtkhtml3_8_CFLAGS=$pkg_cv_libgtkhtml3_8_CFLAGS
          libgtkhtml3_8_LIBS=$pkg_cv_libgtkhtml3_8_LIBS
-         { $as_echo "$as_me:$LINENO: result: yes" >&5
+         { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
  $as_echo "yes" >&6; }
      CFLAGS="$CFLAGS $libgtkhtml3_8_CFLAGS"
-Line 3778 
 elif test $pkg_failed = untried; then
+Line 3782 
 elif test $pkg_failed = untried; then
    # ok, we can also live with 3.8
  pkg_failed=no
- { $as_echo "$as_me:$LINENO: checking for libgtkhtml3_8" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libgtkhtml3_8" >&5
  $as_echo_n "checking for libgtkhtml3_8... " >&6; }
  if test -n "$PKG_CONFIG"; then
-Line 3786 
 if test -n "$PKG_CONFIG"; then
+Line 3790 
 if test -n "$PKG_CONFIG"; then
          pkg_cv_libgtkhtml3_8_CFLAGS="$libgtkhtml3_8_CFLAGS"
      else
          if test -n "$PKG_CONFIG" && \
-     { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgtkhtml-3.8\"") >&5
+     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libgtkhtml-3.8\""; } >&5
    ($PKG_CONFIG --exists --print-errors "libgtkhtml-3.8") 2>&5
    ac_status=$?
-   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
+   test $ac_status = 0; }; then
    pkg_cv_libgtkhtml3_8_CFLAGS=`$PKG_CONFIG --cflags "libgtkhtml-3.8" 2>/dev/null`
  else
    pkg_failed=yes
-Line 3804 
 if test -n "$PKG_CONFIG"; then
+Line 3808 
 if test -n "$PKG_CONFIG"; then
          pkg_cv_libgtkhtml3_8_LIBS="$libgtkhtml3_8_LIBS"
      else
          if test -n "$PKG_CONFIG" && \
-     { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgtkhtml-3.8\"") >&5
+     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libgtkhtml-3.8\""; } >&5
    ($PKG_CONFIG --exists --print-errors "libgtkhtml-3.8") 2>&5
    ac_status=$?
-   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
+   test $ac_status = 0; }; then
    pkg_cv_libgtkhtml3_8_LIBS=`$PKG_CONFIG --libs "libgtkhtml-3.8" 2>/dev/null`
  else
    pkg_failed=yes
-Line 3835 
 fi
+Line 3839 
 fi
          # Put the nasty error message in config.log where it belongs
          echo "$libgtkhtml3_8_PKG_ERRORS" >&5
-         { $as_echo "$as_me:$LINENO: result: no" >&5
+         { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  $as_echo "no" >&6; }
-                 { { $as_echo "$as_me:$LINENO: error: libgtkhtml-3 missing" >&5
+                 as_fn_error "libgtkhtml-3 missing" "$LINENO" 5
- $as_echo "$as_me: error: libgtkhtml-3 missing" >&2;}
-    { (exit 1); exit 1; }; }
  elif test $pkg_failed = untried; then
-         { { $as_echo "$as_me:$LINENO: error: libgtkhtml-3 missing" >&5
+         as_fn_error "libgtkhtml-3 missing" "$LINENO" 5
- $as_echo "$as_me: error: libgtkhtml-3 missing" >&2;}
-    { (exit 1); exit 1; }; }
  else
          libgtkhtml3_8_CFLAGS=$pkg_cv_libgtkhtml3_8_CFLAGS
          libgtkhtml3_8_LIBS=$pkg_cv_libgtkhtml3_8_LIBS
-         { $as_echo "$as_me:$LINENO: result: yes" >&5
+         { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
  $as_echo "yes" >&6; }
      CFLAGS="$CFLAGS $libgtkhtml3_8_CFLAGS"
 Line 3858 
 fi
  else
          libgtkhtml3_14_CFLAGS=$pkg_cv_libgtkhtml3_14_CFLAGS
          libgtkhtml3_14_LIBS=$pkg_cv_libgtkhtml3_14_LIBS
-         { $as_echo "$as_me:$LINENO: result: yes" >&5
+         { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
  $as_echo "yes" >&6; }
    CFLAGS="$CFLAGS $libgtkhtml3_14_CFLAGS"
 Line 3867 
 $as_echo "yes" >&6; }
  fi
  # check for maemo
- { $as_echo "$as_me:$LINENO: checking for Maemo" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Maemo" >&5
  $as_echo_n "checking for Maemo... " >&6; }
  ac_ext=c
 Line 3875 
 ac_cpp='$CPP $CPPFLAGS'
  ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
  ac_compiler_gnu=$ac_cv_c_compiler_gnu
- { $as_echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5
  $as_echo_n "checking how to run the C preprocessor... " >&6; }
  # On Suns, sometimes $CPP names a directory.
  if test -n "$CPP" && test -d "$CPP"; then
    CPP=
  fi
  if test -z "$CPP"; then
-   if test "${ac_cv_prog_CPP+set}" = set; then
+   if test "${ac_cv_prog_CPP+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
        # Double quotes because CPP needs to be expanded
 Line 3897 
 do
    # <limits.h> exists even on freestanding compilers.
    # On the NeXT, cc -E runs the code through the compiler's parser,
    # not just through cpp. "Syntax error" is here to catch this case.
-   cat >conftest.$ac_ext <<_ACEOF
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  #ifdef __STDC__
  # include <limits.h>
-Line 3910 
 cat >>conftest.$ac_ext <<_ACEOF
+Line 3906 
 cat >>conftest.$ac_ext <<_ACEOF
  #endif
                       Syntax error
  _ACEOF
- if { (ac_try="$ac_cpp conftest.$ac_ext"
+ if ac_fn_c_try_cpp "$LINENO"; then :
- case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
- eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
- $as_echo "$ac_try_echo") >&5
-   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null && {
-          test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-          test ! -s conftest.err
-        }; then
-   :
- else
-   $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
+ else
    # Broken: fails on valid input.
  continue
  fi
  rm -f conftest.err conftest.$ac_ext
    # OK, works on sane cases.  Now check whether nonexistent headers
    # can be detected and how.
-   cat >conftest.$ac_ext <<_ACEOF
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  #include <ac_nonexistent.h>
  _ACEOF
- if { (ac_try="$ac_cpp conftest.$ac_ext"
+ if ac_fn_c_try_cpp "$LINENO"; then :
- case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
- eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
- $as_echo "$ac_try_echo") >&5
-   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null && {
-          test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-          test ! -s conftest.err
-        }; then
    # Broken: success on invalid input.
  continue
  else
-   $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
    # Passes both tests.
  ac_preproc_ok=:
  break
  fi
  rm -f conftest.err conftest.$ac_ext
  done
  # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
  rm -f conftest.err conftest.$ac_ext
- if $ac_preproc_ok; then
+ if $ac_preproc_ok; then :
    break
  fi
-Line 3993 
 fi
+Line 3945 
 fi
  else
    ac_cv_prog_CPP=$CPP
  fi
- { $as_echo "$as_me:$LINENO: result: $CPP" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5
  $as_echo "$CPP" >&6; }
  ac_preproc_ok=false
  for ac_c_preproc_warn_flag in '' yes
-Line 4004 
 do
+Line 3956 
 do
    # <limits.h> exists even on freestanding compilers.
    # On the NeXT, cc -E runs the code through the compiler's parser,
    # not just through cpp. "Syntax error" is here to catch this case.
-   cat >conftest.$ac_ext <<_ACEOF
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  #ifdef __STDC__
  # include <limits.h>
-Line 4017 
 cat >>conftest.$ac_ext <<_ACEOF
+Line 3965 
 cat >>conftest.$ac_ext <<_ACEOF
  #endif
                       Syntax error
  _ACEOF
- if { (ac_try="$ac_cpp conftest.$ac_ext"
+ if ac_fn_c_try_cpp "$LINENO"; then :
- case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
- eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
- $as_echo "$ac_try_echo") >&5
-   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null && {
-          test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-          test ! -s conftest.err
-        }; then
-   :
- else
-   $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
+ else
    # Broken: fails on valid input.
  continue
  fi
  rm -f conftest.err conftest.$ac_ext
    # OK, works on sane cases.  Now check whether nonexistent headers
    # can be detected and how.
-   cat >conftest.$ac_ext <<_ACEOF
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  #include <ac_nonexistent.h>
  _ACEOF
- if { (ac_try="$ac_cpp conftest.$ac_ext"
+ if ac_fn_c_try_cpp "$LINENO"; then :
- case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
- eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
- $as_echo "$ac_try_echo") >&5
-   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null && {
-          test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-          test ! -s conftest.err
-        }; then
    # Broken: success on invalid input.
  continue
  else
-   $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
    # Passes both tests.
  ac_preproc_ok=:
  break
  fi
  rm -f conftest.err conftest.$ac_ext
  done
  # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
  rm -f conftest.err conftest.$ac_ext
- if $ac_preproc_ok; then
+ if $ac_preproc_ok; then :
-   :
  else
-   { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+   { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
  $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
- { { $as_echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
+ as_fn_error "C preprocessor \"$CPP\" fails sanity check
- See \`config.log' for more details." >&5
+ See \`config.log' for more details." "$LINENO" 5; }
- $as_echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
- See \`config.log' for more details." >&2;}
-    { (exit 1); exit 1; }; }; }
  fi
  ac_ext=c
-Line 4107 
 ac_link='$CC -o conftest$ac_exeext $CFLA
+Line 4008 
 ac_link='$CC -o conftest$ac_exeext $CFLA
  ac_compiler_gnu=$ac_cv_c_compiler_gnu
- { $as_echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
  $as_echo_n "checking for grep that handles long lines and -e... " >&6; }
- if test "${ac_cv_path_GREP+set}" = set; then
+ if test "${ac_cv_path_GREP+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    if test -z "$GREP"; then
-Line 4120 
 for as_dir in $PATH$PATH_SEPARATOR/usr/x
+Line 4021 
 for as_dir in $PATH$PATH_SEPARATOR/usr/x
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
-   for ac_prog in grep ggrep; do
+     for ac_prog in grep ggrep; do
      for ac_exec_ext in '' $ac_executable_extensions; do
        ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
        { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
-Line 4140 
 case `"$ac_path_GREP" --version 2>&1` in
+Line 4041 
 case `"$ac_path_GREP" --version 2>&1` in
      $as_echo 'GREP' >> "conftest.nl"
      "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
      diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
-     ac_count=`expr $ac_count + 1`
+     as_fn_arith $ac_count + 1 && ac_count=$as_val
      if test $ac_count -gt ${ac_path_GREP_max-0}; then
        # Best one so far, save it but keep looking for a better one
        ac_cv_path_GREP="$ac_path_GREP"
-Line 4155 
 esac
+Line 4056 
 esac
        $ac_path_GREP_found && break 3
      done
    done
- done
+   done
  IFS=$as_save_IFS
    if test -z "$ac_cv_path_GREP"; then
-     { { $as_echo "$as_me:$LINENO: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
+     as_fn_error "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
- $as_echo "$as_me: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
-    { (exit 1); exit 1; }; }
    fi
  else
    ac_cv_path_GREP=$GREP
  fi
  fi
- { $as_echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5
  $as_echo "$ac_cv_path_GREP" >&6; }
   GREP="$ac_cv_path_GREP"
- { $as_echo "$as_me:$LINENO: checking for egrep" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
  $as_echo_n "checking for egrep... " >&6; }
- if test "${ac_cv_path_EGREP+set}" = set; then
+ if test "${ac_cv_path_EGREP+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
-Line 4188 
 for as_dir in $PATH$PATH_SEPARATOR/usr/x
+Line 4087 
 for as_dir in $PATH$PATH_SEPARATOR/usr/x
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
-   for ac_prog in egrep; do
+     for ac_prog in egrep; do
      for ac_exec_ext in '' $ac_executable_extensions; do
        ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
        { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
-Line 4208 
 case `"$ac_path_EGREP" --version 2>&1` i
+Line 4107 
 case `"$ac_path_EGREP" --version 2>&1` i
      $as_echo 'EGREP' >> "conftest.nl"
      "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
      diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
-     ac_count=`expr $ac_count + 1`
+     as_fn_arith $ac_count + 1 && ac_count=$as_val
      if test $ac_count -gt ${ac_path_EGREP_max-0}; then
        # Best one so far, save it but keep looking for a better one
        ac_cv_path_EGREP="$ac_path_EGREP"
-Line 4223 
 esac
+Line 4122 
 esac
        $ac_path_EGREP_found && break 3
      done
    done
- done
+   done
  IFS=$as_save_IFS
    if test -z "$ac_cv_path_EGREP"; then
-     { { $as_echo "$as_me:$LINENO: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
+     as_fn_error "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
- $as_echo "$as_me: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
-    { (exit 1); exit 1; }; }
    fi
  else
    ac_cv_path_EGREP=$EGREP
-Line 4236 
 fi
+Line 4133 
 fi
     fi
  fi
- { $as_echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5
  $as_echo "$ac_cv_path_EGREP" >&6; }
   EGREP="$ac_cv_path_EGREP"
- { $as_echo "$as_me:$LINENO: checking for ANSI C header files" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
  $as_echo_n "checking for ANSI C header files... " >&6; }
- if test "${ac_cv_header_stdc+set}" = set; then
+ if test "${ac_cv_header_stdc+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
-   cat >conftest.$ac_ext <<_ACEOF
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  #include <stdlib.h>
  #include <stdarg.h>
-Line 4265 
 main ()
+Line 4158 
 main ()
    return 0;
  }
  _ACEOF
- rm -f conftest.$ac_objext
+ if ac_fn_c_try_compile "$LINENO"; then :
- if { (ac_try="$ac_compile"
- case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
- eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
- $as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
-          test -z "$ac_c_werror_flag" ||
-          test ! -s conftest.err
-        } && test -s conftest.$ac_objext; then
    ac_cv_header_stdc=yes
  else
-   $as_echo "$as_me: failed program was:" >&5
+   ac_cv_header_stdc=no
- sed 's/^/| /' conftest.$ac_ext >&5
-         ac_cv_header_stdc=no
  fi
  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  if test $ac_cv_header_stdc = yes; then
    # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
-   cat >conftest.$ac_ext <<_ACEOF
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  #include <string.h>
  _ACEOF
  if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-   $EGREP "memchr" >/dev/null 2>&1; then
+   $EGREP "memchr" >/dev/null 2>&1; then :
-   :
  else
    ac_cv_header_stdc=no
  fi
-Line 4316 
 fi
+Line 4184 
 fi
  if test $ac_cv_header_stdc = yes; then
    # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
-   cat >conftest.$ac_ext <<_ACEOF
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  #include <stdlib.h>
  _ACEOF
  if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-   $EGREP "free" >/dev/null 2>&1; then
+   $EGREP "free" >/dev/null 2>&1; then :
-   :
  else
    ac_cv_header_stdc=no
  fi
-Line 4337 
 fi
+Line 4201 
 fi
  if test $ac_cv_header_stdc = yes; then
    # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
-   if test "$cross_compiling" = yes; then
+   if test "$cross_compiling" = yes; then :
    :
  else
-   cat >conftest.$ac_ext <<_ACEOF
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  #include <ctype.h>
  #include <stdlib.h>
-Line 4371 
 main ()
+Line 4231 
 main ()
    return 0;
  }
  _ACEOF
- rm -f conftest$ac_exeext
+ if ac_fn_c_try_run "$LINENO"; then :
- if { (ac_try="$ac_link"
- case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
- eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
- $as_echo "$ac_try_echo") >&5
-   (eval "$ac_link") 2>&5
-   ac_status=$?
-   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-   { (case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
- eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
- $as_echo "$ac_try_echo") >&5
-   (eval "$ac_try") 2>&5
-   ac_status=$?
-   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   :
- else
-   $as_echo "$as_me: program exited with status $ac_status" >&5
- $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- ( exit $ac_status )
+ else
- ac_cv_header_stdc=no
+   ac_cv_header_stdc=no
  fi
- rm -rf conftest.dSYM
+ rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
- rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+   conftest.$ac_objext conftest.beam conftest.$ac_ext
  fi
  fi
  fi
- { $as_echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5
  $as_echo "$ac_cv_header_stdc" >&6; }
  if test $ac_cv_header_stdc = yes; then
- cat >>confdefs.h <<\_ACEOF
+ $as_echo "#define STDC_HEADERS 1" >>confdefs.h
- #define STDC_HEADERS 1
- _ACEOF
  fi
  # On IRIX 5.3, sys/types and inttypes.h are conflicting.
  for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
                    inttypes.h stdint.h unistd.h
- do
+ do :
- as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
- { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+ ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
- $as_echo_n "checking for $ac_header... " >&6; }
+ "
- if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+ eval as_val=\$$as_ac_Header
-   $as_echo_n "(cached) " >&6
+    if test "x$as_val" = x""yes; then :
- else
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
- #include <$ac_header>
- _ACEOF
- rm -f conftest.$ac_objext
- if { (ac_try="$ac_compile"
- case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
- eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
- $as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
-          test -z "$ac_c_werror_flag" ||
-          test ! -s conftest.err
-        } && test -s conftest.$ac_objext; then
-   eval "$as_ac_Header=yes"
- else
-   $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-         eval "$as_ac_Header=no"
- fi
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
- ac_res=`eval 'as_val=${'$as_ac_Header'}
-                  $as_echo "$as_val"'`
-                { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
- $as_echo "$ac_res" >&6; }
- as_val=`eval 'as_val=${'$as_ac_Header'}
-                  $as_echo "$as_val"'`
-    if test "x$as_val" = x""yes; then
    cat >>confdefs.h <<_ACEOF
  #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
  _ACEOF
-Line 4493 
 done
+Line 4269 
 done
  if test -n "$PKG_CONFIG" && \
-     { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"maemo-version\"") >&5
+     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"maemo-version\""; } >&5
    ($PKG_CONFIG --exists --print-errors "maemo-version") 2>&5
    ac_status=$?
-   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
+   test $ac_status = 0; }; then
    MAEMO="yes"
-   { $as_echo "$as_me:$LINENO: result: yes" >&5
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
  $as_echo "yes" >&6; }
  pkg_failed=no
- { $as_echo "$as_me:$LINENO: checking for hildon" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for hildon" >&5
  $as_echo_n "checking for hildon... " >&6; }
  if test -n "$PKG_CONFIG"; then
-Line 4513 
 if test -n "$PKG_CONFIG"; then
+Line 4289 
 if test -n "$PKG_CONFIG"; then
          pkg_cv_hildon_CFLAGS="$hildon_CFLAGS"
      else
          if test -n "$PKG_CONFIG" && \
-     { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"hildon-1\"") >&5
+     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"hildon-1\""; } >&5
    ($PKG_CONFIG --exists --print-errors "hildon-1") 2>&5
    ac_status=$?
-   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
+   test $ac_status = 0; }; then
    pkg_cv_hildon_CFLAGS=`$PKG_CONFIG --cflags "hildon-1" 2>/dev/null`
  else
    pkg_failed=yes
-Line 4531 
 if test -n "$PKG_CONFIG"; then
+Line 4307 
 if test -n "$PKG_CONFIG"; then
          pkg_cv_hildon_LIBS="$hildon_LIBS"
      else
          if test -n "$PKG_CONFIG" && \
-     { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"hildon-1\"") >&5
+     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"hildon-1\""; } >&5
    ($PKG_CONFIG --exists --print-errors "hildon-1") 2>&5
    ac_status=$?
-   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
+   test $ac_status = 0; }; then
    pkg_cv_hildon_LIBS=`$PKG_CONFIG --libs "hildon-1" 2>/dev/null`
  else
    pkg_failed=yes
-Line 4562 
 fi
+Line 4338 
 fi
          # Put the nasty error message in config.log where it belongs
          echo "$hildon_PKG_ERRORS" >&5
-         { $as_echo "$as_me:$LINENO: result: no" >&5
+         { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  $as_echo "no" >&6; }
-                 { { $as_echo "$as_me:$LINENO: error: hildon-1 missing" >&5
+                 as_fn_error "hildon-1 missing" "$LINENO" 5
- $as_echo "$as_me: error: hildon-1 missing" >&2;}
-    { (exit 1); exit 1; }; }
  elif test $pkg_failed = untried; then
-         { { $as_echo "$as_me:$LINENO: error: hildon-1 missing" >&5
+         as_fn_error "hildon-1 missing" "$LINENO" 5
- $as_echo "$as_me: error: hildon-1 missing" >&2;}
-    { (exit 1); exit 1; }; }
  else
          hildon_CFLAGS=$pkg_cv_hildon_CFLAGS
          hildon_LIBS=$pkg_cv_hildon_LIBS
-         { $as_echo "$as_me:$LINENO: result: yes" >&5
+         { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
  $as_echo "yes" >&6; }
          :
  fi
-Line 4583 
 fi
+Line 4355 
 fi
  pkg_failed=no
- { $as_echo "$as_me:$LINENO: checking for osso" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for osso" >&5
  $as_echo_n "checking for osso... " >&6; }
  if test -n "$PKG_CONFIG"; then
-Line 4591 
 if test -n "$PKG_CONFIG"; then
+Line 4363 
 if test -n "$PKG_CONFIG"; then
          pkg_cv_osso_CFLAGS="$osso_CFLAGS"
      else
          if test -n "$PKG_CONFIG" && \
-     { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libosso\"") >&5
+     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libosso\""; } >&5
    ($PKG_CONFIG --exists --print-errors "libosso") 2>&5
    ac_status=$?
-   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
+   test $ac_status = 0; }; then
    pkg_cv_osso_CFLAGS=`$PKG_CONFIG --cflags "libosso" 2>/dev/null`
  else
    pkg_failed=yes
-Line 4609 
 if test -n "$PKG_CONFIG"; then
+Line 4381 
 if test -n "$PKG_CONFIG"; then
          pkg_cv_osso_LIBS="$osso_LIBS"
      else
          if test -n "$PKG_CONFIG" && \
-     { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libosso\"") >&5
+     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libosso\""; } >&5
    ($PKG_CONFIG --exists --print-errors "libosso") 2>&5
    ac_status=$?
-   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
+   test $ac_status = 0; }; then
    pkg_cv_osso_LIBS=`$PKG_CONFIG --libs "libosso" 2>/dev/null`
  else
    pkg_failed=yes
-Line 4640 
 fi
+Line 4412 
 fi
          # Put the nasty error message in config.log where it belongs
          echo "$osso_PKG_ERRORS" >&5
-         { $as_echo "$as_me:$LINENO: result: no" >&5
+         { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  $as_echo "no" >&6; }
-                 { { $as_echo "$as_me:$LINENO: error: libosso missing" >&5
+                 as_fn_error "libosso missing" "$LINENO" 5
- $as_echo "$as_me: error: libosso missing" >&2;}
-    { (exit 1); exit 1; }; }
  elif test $pkg_failed = untried; then
-         { { $as_echo "$as_me:$LINENO: error: libosso missing" >&5
+         as_fn_error "libosso missing" "$LINENO" 5
- $as_echo "$as_me: error: libosso missing" >&2;}
-    { (exit 1); exit 1; }; }
  else
          osso_CFLAGS=$pkg_cv_osso_CFLAGS
          osso_LIBS=$pkg_cv_osso_LIBS
-         { $as_echo "$as_me:$LINENO: result: yes" >&5
+         { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
  $as_echo "yes" >&6; }
          :
  fi
-Line 4661 
 fi
+Line 4429 
 fi
  pkg_failed=no
- { $as_echo "$as_me:$LINENO: checking for hildon_fm_2" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for hildon_fm_2" >&5
  $as_echo_n "checking for hildon_fm_2... " >&6; }
  if test -n "$PKG_CONFIG"; then
-Line 4669 
 if test -n "$PKG_CONFIG"; then
+Line 4437 
 if test -n "$PKG_CONFIG"; then
          pkg_cv_hildon_fm_2_CFLAGS="$hildon_fm_2_CFLAGS"
      else
          if test -n "$PKG_CONFIG" && \
-     { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"hildon-fm-2\"") >&5
+     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"hildon-fm-2\""; } >&5
    ($PKG_CONFIG --exists --print-errors "hildon-fm-2") 2>&5
    ac_status=$?
-   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
+   test $ac_status = 0; }; then
    pkg_cv_hildon_fm_2_CFLAGS=`$PKG_CONFIG --cflags "hildon-fm-2" 2>/dev/null`
  else
    pkg_failed=yes
-Line 4687 
 if test -n "$PKG_CONFIG"; then
+Line 4455 
 if test -n "$PKG_CONFIG"; then
          pkg_cv_hildon_fm_2_LIBS="$hildon_fm_2_LIBS"
      else
          if test -n "$PKG_CONFIG" && \
-     { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"hildon-fm-2\"") >&5
+     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"hildon-fm-2\""; } >&5
    ($PKG_CONFIG --exists --print-errors "hildon-fm-2") 2>&5
    ac_status=$?
-   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
+   test $ac_status = 0; }; then
    pkg_cv_hildon_fm_2_LIBS=`$PKG_CONFIG --libs "hildon-fm-2" 2>/dev/null`
  else
    pkg_failed=yes
-Line 4718 
 fi
+Line 4486 
 fi
          # Put the nasty error message in config.log where it belongs
          echo "$hildon_fm_2_PKG_ERRORS" >&5
-         { $as_echo "$as_me:$LINENO: result: no" >&5
+         { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  $as_echo "no" >&6; }
-                 { { $as_echo "$as_me:$LINENO: error: hildon-fm-2 missing" >&5
+                 as_fn_error "hildon-fm-2 missing" "$LINENO" 5
- $as_echo "$as_me: error: hildon-fm-2 missing" >&2;}
-    { (exit 1); exit 1; }; }
  elif test $pkg_failed = untried; then
-         { { $as_echo "$as_me:$LINENO: error: hildon-fm-2 missing" >&5
+         as_fn_error "hildon-fm-2 missing" "$LINENO" 5
- $as_echo "$as_me: error: hildon-fm-2 missing" >&2;}
-    { (exit 1); exit 1; }; }
  else
          hildon_fm_2_CFLAGS=$pkg_cv_hildon_fm_2_CFLAGS
          hildon_fm_2_LIBS=$pkg_cv_hildon_fm_2_LIBS
-         { $as_echo "$as_me:$LINENO: result: yes" >&5
+         { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
  $as_echo "yes" >&6; }
          :
  fi
-Line 4740 
 fi
+Line 4504 
 fi
    # check for sqlite3 for maemo mapper interface
  pkg_failed=no
- { $as_echo "$as_me:$LINENO: checking for sqlite3" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sqlite3" >&5
  $as_echo_n "checking for sqlite3... " >&6; }
  if test -n "$PKG_CONFIG"; then
-Line 4748 
 if test -n "$PKG_CONFIG"; then
+Line 4512 
 if test -n "$PKG_CONFIG"; then
          pkg_cv_sqlite3_CFLAGS="$sqlite3_CFLAGS"
      else
          if test -n "$PKG_CONFIG" && \
-     { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"sqlite3\"") >&5
+     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"sqlite3\""; } >&5
    ($PKG_CONFIG --exists --print-errors "sqlite3") 2>&5
    ac_status=$?
-   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
+   test $ac_status = 0; }; then
    pkg_cv_sqlite3_CFLAGS=`$PKG_CONFIG --cflags "sqlite3" 2>/dev/null`
  else
    pkg_failed=yes
-Line 4766 
 if test -n "$PKG_CONFIG"; then
+Line 4530 
 if test -n "$PKG_CONFIG"; then
          pkg_cv_sqlite3_LIBS="$sqlite3_LIBS"
      else
          if test -n "$PKG_CONFIG" && \
-     { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"sqlite3\"") >&5
+     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"sqlite3\""; } >&5
    ($PKG_CONFIG --exists --print-errors "sqlite3") 2>&5
    ac_status=$?
-   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
+   test $ac_status = 0; }; then
    pkg_cv_sqlite3_LIBS=`$PKG_CONFIG --libs "sqlite3" 2>/dev/null`
  else
    pkg_failed=yes
-Line 4797 
 fi
+Line 4561 
 fi
          # Put the nasty error message in config.log where it belongs
          echo "$sqlite3_PKG_ERRORS" >&5
-         { $as_echo "$as_me:$LINENO: result: no" >&5
+         { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  $as_echo "no" >&6; }
-                 { { $as_echo "$as_me:$LINENO: error: sqlite3 missing" >&5
+                 as_fn_error "sqlite3 missing" "$LINENO" 5
- $as_echo "$as_me: error: sqlite3 missing" >&2;}
-    { (exit 1); exit 1; }; }
  elif test $pkg_failed = untried; then
-         { { $as_echo "$as_me:$LINENO: error: sqlite3 missing" >&5
+         as_fn_error "sqlite3 missing" "$LINENO" 5
- $as_echo "$as_me: error: sqlite3 missing" >&2;}
-    { (exit 1); exit 1; }; }
  else
          sqlite3_CFLAGS=$pkg_cv_sqlite3_CFLAGS
          sqlite3_LIBS=$pkg_cv_sqlite3_LIBS
-         { $as_echo "$as_me:$LINENO: result: yes" >&5
+         { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
  $as_echo "yes" >&6; }
          :
  fi
-Line 4819 
 fi
+Line 4579 
 fi
    # check for hildon-help
  pkg_failed=no
- { $as_echo "$as_me:$LINENO: checking for hildon_help" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for hildon_help" >&5
  $as_echo_n "checking for hildon_help... " >&6; }
  if test -n "$PKG_CONFIG"; then
-Line 4827 
 if test -n "$PKG_CONFIG"; then
+Line 4587 
 if test -n "$PKG_CONFIG"; then
          pkg_cv_hildon_help_CFLAGS="$hildon_help_CFLAGS"
      else
          if test -n "$PKG_CONFIG" && \
-     { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"hildon-help\"") >&5
+     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"hildon-help\""; } >&5
    ($PKG_CONFIG --exists --print-errors "hildon-help") 2>&5
    ac_status=$?
-   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
+   test $ac_status = 0; }; then
    pkg_cv_hildon_help_CFLAGS=`$PKG_CONFIG --cflags "hildon-help" 2>/dev/null`
  else
    pkg_failed=yes
-Line 4845 
 if test -n "$PKG_CONFIG"; then
+Line 4605 
 if test -n "$PKG_CONFIG"; then
          pkg_cv_hildon_help_LIBS="$hildon_help_LIBS"
      else
          if test -n "$PKG_CONFIG" && \
-     { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"hildon-help\"") >&5
+     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"hildon-help\""; } >&5
    ($PKG_CONFIG --exists --print-errors "hildon-help") 2>&5
    ac_status=$?
-   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
+   test $ac_status = 0; }; then
    pkg_cv_hildon_help_LIBS=`$PKG_CONFIG --libs "hildon-help" 2>/dev/null`
  else
    pkg_failed=yes
-Line 4876 
 fi
+Line 4636 
 fi
          # Put the nasty error message in config.log where it belongs
          echo "$hildon_help_PKG_ERRORS" >&5
-         { $as_echo "$as_me:$LINENO: result: no" >&5
+         { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  $as_echo "no" >&6; }
-     { $as_echo "$as_me:$LINENO: WARNING: hildon-help missing" >&5
+     { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: hildon-help missing" >&5
  $as_echo "$as_me: WARNING: hildon-help missing" >&6;}
  elif test $pkg_failed = untried; then
-     { $as_echo "$as_me:$LINENO: WARNING: hildon-help missing" >&5
+     { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: hildon-help missing" >&5
  $as_echo "$as_me: WARNING: hildon-help missing" >&6;}
  else
          hildon_help_CFLAGS=$pkg_cv_hildon_help_CFLAGS
          hildon_help_LIBS=$pkg_cv_hildon_help_LIBS
-         { $as_echo "$as_me:$LINENO: result: yes" >&5
+         { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
  $as_echo "yes" >&6; }
      CFLAGS="-DHILDON_HELP $CFLAGS $hildon_help_CFLAGS"
-Line 4901 
 fi
+Line 4661 
 fi
    # prefer gpsbt over liblocation as we got complaints regarding liblocation
    # stability
    if test -n "$PKG_CONFIG" && \
-     { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gpsbt\"") >&5
+     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gpsbt\""; } >&5
    ($PKG_CONFIG --exists --print-errors "gpsbt") 2>&5
    ac_status=$?
-   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
+   test $ac_status = 0; }; then
  pkg_failed=no
- { $as_echo "$as_me:$LINENO: checking for gpsbt" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gpsbt" >&5
  $as_echo_n "checking for gpsbt... " >&6; }
  if test -n "$PKG_CONFIG"; then
-Line 4917 
 if test -n "$PKG_CONFIG"; then
+Line 4677 
 if test -n "$PKG_CONFIG"; then
          pkg_cv_gpsbt_CFLAGS="$gpsbt_CFLAGS"
      else
          if test -n "$PKG_CONFIG" && \
-     { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gpsbt\"") >&5
+     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gpsbt\""; } >&5
    ($PKG_CONFIG --exists --print-errors "gpsbt") 2>&5
    ac_status=$?
-   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
+   test $ac_status = 0; }; then
    pkg_cv_gpsbt_CFLAGS=`$PKG_CONFIG --cflags "gpsbt" 2>/dev/null`
  else
    pkg_failed=yes
-Line 4935 
 if test -n "$PKG_CONFIG"; then
+Line 4695 
 if test -n "$PKG_CONFIG"; then
          pkg_cv_gpsbt_LIBS="$gpsbt_LIBS"
      else
          if test -n "$PKG_CONFIG" && \
-     { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gpsbt\"") >&5
+     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gpsbt\""; } >&5
    ($PKG_CONFIG --exists --print-errors "gpsbt") 2>&5
    ac_status=$?
-   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
+   test $ac_status = 0; }; then
    pkg_cv_gpsbt_LIBS=`$PKG_CONFIG --libs "gpsbt" 2>/dev/null`
  else
    pkg_failed=yes
-Line 4966 
 fi
+Line 4726 
 fi
          # Put the nasty error message in config.log where it belongs
          echo "$gpsbt_PKG_ERRORS" >&5
-         { { $as_echo "$as_me:$LINENO: error: Package requirements (gpsbt) were not met:
+         as_fn_error "Package requirements (gpsbt) were not met:
- $gpsbt_PKG_ERRORS
- Consider adjusting the PKG_CONFIG_PATH environment variable if you
- installed software in a non-standard prefix.
- Alternatively, you may set the environment variables gpsbt_CFLAGS
- and gpsbt_LIBS to avoid the need to call pkg-config.
- See the pkg-config man page for more details.
- " >&5
- $as_echo "$as_me: error: Package requirements (gpsbt) were not met:
  $gpsbt_PKG_ERRORS
-Line 4987 
 installed software in a non-standard pre
+Line 4736 
 installed software in a non-standard pre
  Alternatively, you may set the environment variables gpsbt_CFLAGS
  and gpsbt_LIBS to avoid the need to call pkg-config.
  See the pkg-config man page for more details.
- " >&2;}
+ " "$LINENO" 5
-    { (exit 1); exit 1; }; }
  elif test $pkg_failed = untried; then
-         { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+         { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
  $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
- { { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old.  Make sure it
+ as_fn_error "The pkg-config script could not be found or is too old.  Make sure it
- is in your PATH or set the PKG_CONFIG environment variable to the full
- path to pkg-config.
- Alternatively, you may set the environment variables gpsbt_CFLAGS
- and gpsbt_LIBS to avoid the need to call pkg-config.
- See the pkg-config man page for more details.
- To get pkg-config, see <http://pkg-config.freedesktop.org/>.
- See \`config.log' for more details." >&5
- $as_echo "$as_me: error: The pkg-config script could not be found or is too old.  Make sure it
  is in your PATH or set the PKG_CONFIG environment variable to the full
  path to pkg-config.
-Line 5011 
 and gpsbt_LIBS to avoid the need to call
+Line 4749 
 and gpsbt_LIBS to avoid the need to call
  See the pkg-config man page for more details.
  To get pkg-config, see <http://pkg-config.freedesktop.org/>.
- See \`config.log' for more details." >&2;}
+ See \`config.log' for more details." "$LINENO" 5; }
-    { (exit 1); exit 1; }; }; }
  else
          gpsbt_CFLAGS=$pkg_cv_gpsbt_CFLAGS
          gpsbt_LIBS=$pkg_cv_gpsbt_LIBS
-         { $as_echo "$as_me:$LINENO: result: yes" >&5
+         { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
  $as_echo "yes" >&6; }
          :
  fi
-Line 5025 
 fi
+Line 4762 
 fi
  else
-     { $as_echo "$as_me:$LINENO: gpsbt not found, trying liblocation" >&5
+     { $as_echo "$as_me:${as_lineno-$LINENO}: gpsbt not found, trying liblocation" >&5
  $as_echo "$as_me: gpsbt not found, trying liblocation" >&6;}
      if test -n "$PKG_CONFIG" && \
-     { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"liblocation\"") >&5
+     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"liblocation\""; } >&5
    ($PKG_CONFIG --exists --print-errors "liblocation") 2>&5
    ac_status=$?
-   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
+   test $ac_status = 0; }; then
  pkg_failed=no
- { $as_echo "$as_me:$LINENO: checking for liblocation" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for liblocation" >&5
  $as_echo_n "checking for liblocation... " >&6; }
  if test -n "$PKG_CONFIG"; then
-Line 5045 
 if test -n "$PKG_CONFIG"; then
+Line 4782 
 if test -n "$PKG_CONFIG"; then
          pkg_cv_liblocation_CFLAGS="$liblocation_CFLAGS"
      else
          if test -n "$PKG_CONFIG" && \
-     { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"liblocation\"") >&5
+     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"liblocation\""; } >&5
    ($PKG_CONFIG --exists --print-errors "liblocation") 2>&5
    ac_status=$?
-   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
+   test $ac_status = 0; }; then
    pkg_cv_liblocation_CFLAGS=`$PKG_CONFIG --cflags "liblocation" 2>/dev/null`
  else
    pkg_failed=yes
-Line 5063 
 if test -n "$PKG_CONFIG"; then
+Line 4800 
 if test -n "$PKG_CONFIG"; then
          pkg_cv_liblocation_LIBS="$liblocation_LIBS"
      else
          if test -n "$PKG_CONFIG" && \
-     { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"liblocation\"") >&5
+     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"liblocation\""; } >&5
    ($PKG_CONFIG --exists --print-errors "liblocation") 2>&5
    ac_status=$?
-   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
+   test $ac_status = 0; }; then
    pkg_cv_liblocation_LIBS=`$PKG_CONFIG --libs "liblocation" 2>/dev/null`
  else
    pkg_failed=yes
-Line 5094 
 fi
+Line 4831 
 fi
          # Put the nasty error message in config.log where it belongs
          echo "$liblocation_PKG_ERRORS" >&5
-         { { $as_echo "$as_me:$LINENO: error: Package requirements (liblocation) were not met:
+         as_fn_error "Package requirements (liblocation) were not met:
- $liblocation_PKG_ERRORS
- Consider adjusting the PKG_CONFIG_PATH environment variable if you
- installed software in a non-standard prefix.
- Alternatively, you may set the environment variables liblocation_CFLAGS
- and liblocation_LIBS to avoid the need to call pkg-config.
- See the pkg-config man page for more details.
- " >&5
- $as_echo "$as_me: error: Package requirements (liblocation) were not met:
  $liblocation_PKG_ERRORS
-Line 5115 
 installed software in a non-standard pre
+Line 4841 
 installed software in a non-standard pre
  Alternatively, you may set the environment variables liblocation_CFLAGS
  and liblocation_LIBS to avoid the need to call pkg-config.
  See the pkg-config man page for more details.
- " >&2;}
+ " "$LINENO" 5
-    { (exit 1); exit 1; }; }
  elif test $pkg_failed = untried; then
-         { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+         { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
  $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
- { { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old.  Make sure it
+ as_fn_error "The pkg-config script could not be found or is too old.  Make sure it
- is in your PATH or set the PKG_CONFIG environment variable to the full
- path to pkg-config.
- Alternatively, you may set the environment variables liblocation_CFLAGS
- and liblocation_LIBS to avoid the need to call pkg-config.
- See the pkg-config man page for more details.
- To get pkg-config, see <http://pkg-config.freedesktop.org/>.
- See \`config.log' for more details." >&5
- $as_echo "$as_me: error: The pkg-config script could not be found or is too old.  Make sure it
  is in your PATH or set the PKG_CONFIG environment variable to the full
  path to pkg-config.
-Line 5139 
 and liblocation_LIBS to avoid the need t
+Line 4854 
 and liblocation_LIBS to avoid the need t
  See the pkg-config man page for more details.
  To get pkg-config, see <http://pkg-config.freedesktop.org/>.
- See \`config.log' for more details." >&2;}
+ See \`config.log' for more details." "$LINENO" 5; }
-    { (exit 1); exit 1; }; }; }
  else
          liblocation_CFLAGS=$pkg_cv_liblocation_CFLAGS
          liblocation_LIBS=$pkg_cv_liblocation_LIBS
-         { $as_echo "$as_me:$LINENO: result: yes" >&5
+         { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
  $as_echo "yes" >&6; }
          :
  fi
-Line 5153 
 fi
+Line 4867 
 fi
  else
-       { $as_echo "$as_me:$LINENO: WARNING: No liblocation nor gpsbt found, disabling gps auto start!" >&5
+       { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: No liblocation nor gpsbt found, disabling gps auto start!" >&5
  $as_echo "$as_me: WARNING: No liblocation nor gpsbt found, disabling gps auto start!" >&6;}
  fi
-Line 5161 
 fi
+Line 4875 
 fi
  fi
    if test -n "$PKG_CONFIG" && \
-     { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"tablet-browser-interface\"") >&5
+     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"tablet-browser-interface\""; } >&5
    ($PKG_CONFIG --exists --print-errors "tablet-browser-interface") 2>&5
    ac_status=$?
-   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
+   test $ac_status = 0; }; then
      CFLAGS="$CFLAGS -DENABLE_BROWSER_INTERFACE"
  else
-   { $as_echo "$as_me:$LINENO: WARNING: No tablet-browser-interface found, disabling microb interface!" >&5
+   { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: No tablet-browser-interface found, disabling microb interface!" >&5
  $as_echo "$as_me: WARNING: No tablet-browser-interface found, disabling microb interface!" >&6;}
  fi
    if test -n "$PKG_CONFIG" && \
-     { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"maemo-version\"") >&5
+     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"maemo-version\""; } >&5
    ($PKG_CONFIG --exists --print-errors "maemo-version") 2>&5
    ac_status=$?
-   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
+   test $ac_status = 0; }; then
      VERSION=`pkg-config --modversion maemo-version`
-     { $as_echo "$as_me:$LINENO: Configuring for Maemo $VERSION" >&5
+     { $as_echo "$as_me:${as_lineno-$LINENO}: Configuring for Maemo $VERSION" >&5
  $as_echo "$as_me: Configuring for Maemo $VERSION" >&6;}
      CFLAGS="$CFLAGS -DMAEMO_VERSION=\\\"$VERSION\\\""
      MAJOR=`echo $VERSION | cut -b1 -`
-Line 5193 
 $as_echo "$as_me: Configuring for Maemo
+Line 4907 
 $as_echo "$as_me: Configuring for Maemo
  else
-     { { $as_echo "$as_me:$LINENO: error: maemo-version not found" >&5
+     as_fn_error "maemo-version not found" "$LINENO" 5
- $as_echo "$as_me: error: maemo-version not found" >&2;}
-    { (exit 1); exit 1; }; }
  fi
    INSTALL_PLATTFORM="install-maemo"
    # fremantle uses icons of 48x48 pixels for the app installer,
    # older versions used 26x26
    if [ "$MAJOR" == "5" ]; then
       ICONNAME=48x48/gpxview.png
       datarootdir=/opt
         # check for libespeak (broken in diablo, hence doing it here)
+        for ac_header in espeak/speak_lib.h
- for ac_header in espeak/speak_lib.h
+ do :
- do
+   ac_fn_c_check_header_mongrel "$LINENO" "espeak/speak_lib.h" "ac_cv_header_espeak_speak_lib_h" "$ac_includes_default"
- as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ if test "x$ac_cv_header_espeak_speak_lib_h" = x""yes; then :
- if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-   { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
- $as_echo_n "checking for $ac_header... " >&6; }
- if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-   $as_echo_n "(cached) " >&6
- fi
- ac_res=`eval 'as_val=${'$as_ac_Header'}
-                  $as_echo "$as_val"'`
-                { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
- $as_echo "$ac_res" >&6; }
- else
-   # Is the header compilable?
- { $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
- $as_echo_n "checking $ac_header usability... " >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
- #include <$ac_header>
- _ACEOF
- rm -f conftest.$ac_objext
- if { (ac_try="$ac_compile"
- case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
- eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
- $as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
-          test -z "$ac_c_werror_flag" ||
-          test ! -s conftest.err
-        } && test -s conftest.$ac_objext; then
-   ac_header_compiler=yes
- else
-   $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-         ac_header_compiler=no
- fi
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- { $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
- $as_echo "$ac_header_compiler" >&6; }
- # Is the header present?
- { $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
- $as_echo_n "checking $ac_header presence... " >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- #include <$ac_header>
- _ACEOF
- if { (ac_try="$ac_cpp conftest.$ac_ext"
- case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
- eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
- $as_echo "$ac_try_echo") >&5
-   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null && {
-          test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-          test ! -s conftest.err
-        }; then
-   ac_header_preproc=yes
- else
-   $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-   ac_header_preproc=no
- fi
- rm -f conftest.err conftest.$ac_ext
- { $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
- $as_echo "$ac_header_preproc" >&6; }
- # So?  What about this header?
- case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-   yes:no: )
-     { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
- $as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-     { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
- $as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-     ac_header_preproc=yes
-     ;;
-   no:yes:* )
-     { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
- $as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-     { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
- $as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-     { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
- $as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-     { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
- $as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-     { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
- $as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-     { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
- $as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-     ( cat <<\_ASBOX
- ## ------------------------------- ##
- ## Report this to till@harbaum.org ##
- ## ------------------------------- ##
- _ASBOX
-      ) | sed "s/^/$as_me: WARNING:     /" >&2
-     ;;
- esac
- { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
- $as_echo_n "checking for $ac_header... " >&6; }
- if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-   $as_echo_n "(cached) " >&6
- else
-   eval "$as_ac_Header=\$ac_header_preproc"
- fi
- ac_res=`eval 'as_val=${'$as_ac_Header'}
-                  $as_echo "$as_val"'`
-                { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
- $as_echo "$ac_res" >&6; }
- fi
- as_val=`eval 'as_val=${'$as_ac_Header'}
-                  $as_echo "$as_val"'`
-    if test "x$as_val" = x""yes; then
    cat >>confdefs.h <<_ACEOF
- #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ #define HAVE_ESPEAK_SPEAK_LIB_H 1
  _ACEOF
           CFLAGS="$CFLAGS -DESPEAK"
-Line 5364 
 done
+Line 4937 
 done
    else
       ICONNAME=26x26/gpxview.png
-      { $as_echo "$as_me:$LINENO: Enabling Maemo Mapper support" >&5
+      { $as_echo "$as_me:${as_lineno-$LINENO}: Enabling Maemo Mapper support" >&5
  $as_echo "$as_me: Enabling Maemo Mapper support" >&6;}
    fi
-Line 5374 
 $as_echo "$as_me: Enabling Maemo Mapper
+Line 4947 
 $as_echo "$as_me: Enabling Maemo Mapper
    # maemo uses dbus for ipc with maemo mapper
    EXTRA_OBJS="$EXTRA_OBJS dbus.o"
-   { $as_echo "$as_me:$LINENO: Using application installer icon \"$ICONNAME\"" >&5
+   { $as_echo "$as_me:${as_lineno-$LINENO}: Using application installer icon \"$ICONNAME\"" >&5
  $as_echo "$as_me: Using application installer icon \"$ICONNAME\"" >&6;}
    # add icon entry to debian/control
-Line 5389 
 XB-Maemo-Icon-26:
+Line 4962 
 XB-Maemo-Icon-26:
  else
-   { $as_echo "$as_me:$LINENO: result: no" >&5
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  $as_echo "no" >&6; }
    EXTRA_OBJS="$EXTRA_OBJS bct.o"
-Line 5398 
 $as_echo "no" >&6; }
+Line 4971 
 $as_echo "no" >&6; }
    # check for gtk+-2.0
  pkg_failed=no
- { $as_echo "$as_me:$LINENO: checking for gtk" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gtk" >&5
  $as_echo_n "checking for gtk... " >&6; }
  if test -n "$PKG_CONFIG"; then
-Line 5406 
 if test -n "$PKG_CONFIG"; then
+Line 4979 
 if test -n "$PKG_CONFIG"; then
          pkg_cv_gtk_CFLAGS="$gtk_CFLAGS"
      else
          if test -n "$PKG_CONFIG" && \
-     { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0\"") >&5
+     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0\""; } >&5
    ($PKG_CONFIG --exists --print-errors "gtk+-2.0") 2>&5
    ac_status=$?
-   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
+   test $ac_status = 0; }; then
    pkg_cv_gtk_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0" 2>/dev/null`
  else
    pkg_failed=yes
-Line 5424 
 if test -n "$PKG_CONFIG"; then
+Line 4997 
 if test -n "$PKG_CONFIG"; then
          pkg_cv_gtk_LIBS="$gtk_LIBS"
      else
          if test -n "$PKG_CONFIG" && \
-     { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0\"") >&5
+     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0\""; } >&5
    ($PKG_CONFIG --exists --print-errors "gtk+-2.0") 2>&5
    ac_status=$?
-   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
+   test $ac_status = 0; }; then
    pkg_cv_gtk_LIBS=`$PKG_CONFIG --libs "gtk+-2.0" 2>/dev/null`
  else
    pkg_failed=yes
-Line 5455 
 fi
+Line 5028 
 fi
          # Put the nasty error message in config.log where it belongs
          echo "$gtk_PKG_ERRORS" >&5
-         { $as_echo "$as_me:$LINENO: result: no" >&5
+         { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  $as_echo "no" >&6; }
-                 { { $as_echo "$as_me:$LINENO: error: gtk+-2.0 missing!" >&5
+                 as_fn_error "gtk+-2.0 missing!" "$LINENO" 5
- $as_echo "$as_me: error: gtk+-2.0 missing!" >&2;}
-    { (exit 1); exit 1; }; }
  elif test $pkg_failed = untried; then
-         { { $as_echo "$as_me:$LINENO: error: gtk+-2.0 missing!" >&5
+         as_fn_error "gtk+-2.0 missing!" "$LINENO" 5
- $as_echo "$as_me: error: gtk+-2.0 missing!" >&2;}
-    { (exit 1); exit 1; }; }
  else
          gtk_CFLAGS=$pkg_cv_gtk_CFLAGS
          gtk_LIBS=$pkg_cv_gtk_LIBS
-         { $as_echo "$as_me:$LINENO: result: yes" >&5
+         { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
  $as_echo "yes" >&6; }
          :
  fi
-Line 5477 
 fi
+Line 5046 
 fi
    # non-maemo device use gnome to call the web browser
  pkg_failed=no
- { $as_echo "$as_me:$LINENO: checking for gnome2" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gnome2" >&5
  $as_echo_n "checking for gnome2... " >&6; }
  if test -n "$PKG_CONFIG"; then
-Line 5485 
 if test -n "$PKG_CONFIG"; then
+Line 5054 
 if test -n "$PKG_CONFIG"; then
          pkg_cv_gnome2_CFLAGS="$gnome2_CFLAGS"
      else
          if test -n "$PKG_CONFIG" && \
-     { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgnome-2.0\"") >&5
+     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libgnome-2.0\""; } >&5
    ($PKG_CONFIG --exists --print-errors "libgnome-2.0") 2>&5
    ac_status=$?
-   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
+   test $ac_status = 0; }; then
    pkg_cv_gnome2_CFLAGS=`$PKG_CONFIG --cflags "libgnome-2.0" 2>/dev/null`
  else
    pkg_failed=yes
-Line 5503 
 if test -n "$PKG_CONFIG"; then
+Line 5072 
 if test -n "$PKG_CONFIG"; then
          pkg_cv_gnome2_LIBS="$gnome2_LIBS"
      else
          if test -n "$PKG_CONFIG" && \
-     { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgnome-2.0\"") >&5
+     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libgnome-2.0\""; } >&5
    ($PKG_CONFIG --exists --print-errors "libgnome-2.0") 2>&5
    ac_status=$?
-   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
+   test $ac_status = 0; }; then
    pkg_cv_gnome2_LIBS=`$PKG_CONFIG --libs "libgnome-2.0" 2>/dev/null`
  else
    pkg_failed=yes
-Line 5534 
 fi
+Line 5103 
 fi
          # Put the nasty error message in config.log where it belongs
          echo "$gnome2_PKG_ERRORS" >&5
-         { $as_echo "$as_me:$LINENO: result: no" >&5
+         { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  $as_echo "no" >&6; }
-                 { { $as_echo "$as_me:$LINENO: error: libgnome-2.0 missing" >&5
+                 as_fn_error "libgnome-2.0 missing" "$LINENO" 5
- $as_echo "$as_me: error: libgnome-2.0 missing" >&2;}
-    { (exit 1); exit 1; }; }
  elif test $pkg_failed = untried; then
-         { { $as_echo "$as_me:$LINENO: error: libgnome-2.0 missing" >&5
+         as_fn_error "libgnome-2.0 missing" "$LINENO" 5
- $as_echo "$as_me: error: libgnome-2.0 missing" >&2;}
-    { (exit 1); exit 1; }; }
  else
          gnome2_CFLAGS=$pkg_cv_gnome2_CFLAGS
          gnome2_LIBS=$pkg_cv_gnome2_LIBS
-         { $as_echo "$as_me:$LINENO: result: yes" >&5
+         { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
  $as_echo "yes" >&6; }
          :
  fi
-Line 5554 
 fi
+Line 5119 
 fi
    LIBS="$LIBS $gnome2_LIBS"
    # check for libespeak
+   for ac_header in espeak/speak_lib.h
- for ac_header in espeak/speak_lib.h
+ do :
- do
+   ac_fn_c_check_header_mongrel "$LINENO" "espeak/speak_lib.h" "ac_cv_header_espeak_speak_lib_h" "$ac_includes_default"
- as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ if test "x$ac_cv_header_espeak_speak_lib_h" = x""yes; then :
- if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-   { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
- $as_echo_n "checking for $ac_header... " >&6; }
- if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-   $as_echo_n "(cached) " >&6
- fi
- ac_res=`eval 'as_val=${'$as_ac_Header'}
-                  $as_echo "$as_val"'`
-                { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
- $as_echo "$ac_res" >&6; }
- else
-   # Is the header compilable?
- { $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
- $as_echo_n "checking $ac_header usability... " >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
- #include <$ac_header>
- _ACEOF
- rm -f conftest.$ac_objext
- if { (ac_try="$ac_compile"
- case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
- eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
- $as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
-          test -z "$ac_c_werror_flag" ||
-          test ! -s conftest.err
-        } && test -s conftest.$ac_objext; then
-   ac_header_compiler=yes
- else
-   $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-         ac_header_compiler=no
- fi
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- { $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
- $as_echo "$ac_header_compiler" >&6; }
- # Is the header present?
- { $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
- $as_echo_n "checking $ac_header presence... " >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- #include <$ac_header>
- _ACEOF
- if { (ac_try="$ac_cpp conftest.$ac_ext"
- case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
- eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
- $as_echo "$ac_try_echo") >&5
-   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null && {
-          test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-          test ! -s conftest.err
-        }; then
-   ac_header_preproc=yes
- else
-   $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-   ac_header_preproc=no
- fi
- rm -f conftest.err conftest.$ac_ext
- { $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
- $as_echo "$ac_header_preproc" >&6; }
- # So?  What about this header?
- case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-   yes:no: )
-     { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
- $as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-     { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
- $as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-     ac_header_preproc=yes
-     ;;
-   no:yes:* )
-     { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
- $as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-     { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
- $as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-     { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
- $as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-     { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
- $as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-     { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
- $as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-     { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
- $as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-     ( cat <<\_ASBOX
- ## ------------------------------- ##
- ## Report this to till@harbaum.org ##
- ## ------------------------------- ##
- _ASBOX
-      ) | sed "s/^/$as_me: WARNING:     /" >&2
-     ;;
- esac
- { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
- $as_echo_n "checking for $ac_header... " >&6; }
- if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-   $as_echo_n "(cached) " >&6
- else
-   eval "$as_ac_Header=\$ac_header_preproc"
- fi
- ac_res=`eval 'as_val=${'$as_ac_Header'}
-                  $as_echo "$as_val"'`
-                { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
- $as_echo "$ac_res" >&6; }
- fi
- as_val=`eval 'as_val=${'$as_ac_Header'}
-                  $as_echo "$as_val"'`
-    if test "x$as_val" = x""yes; then
    cat >>confdefs.h <<_ACEOF
- #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ #define HAVE_ESPEAK_SPEAK_LIB_H 1
  _ACEOF
      CFLAGS="$CFLAGS -DESPEAK"
-Line 5748 
 _ACEOF
+Line 5174 
 _ACEOF
      case $ac_val in #(
      *${as_nl}*)
        case $ac_var in #(
-       *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5
+       *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
  $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
        esac
        case $ac_var in #(
        _ | IFS | as_nl) ;; #(
        BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
-       *) $as_unset $ac_var ;;
+       *) { eval $ac_var=; unset $ac_var;} ;;
        esac ;;
      esac
    done
-Line 5762 
 $as_echo "$as_me: WARNING: cache variabl
+Line 5188 
 $as_echo "$as_me: WARNING: cache variabl
    (set) 2>&1 |
      case $as_nl`(ac_space=' '; set) 2>&1` in #(
      *${as_nl}ac_space=\ *)
-       # `set' does not quote correctly, so add quotes (double-quote
+       # `set' does not quote correctly, so add quotes: double-quote
-       # substitution turns \\\\ into \\, and sed turns \\ into \).
+       # substitution turns \\\\ into \\, and sed turns \\ into \.
        sed -n \
          "s/'/'\\\\''/g;
            s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
-Line 5786 
 $as_echo "$as_me: WARNING: cache variabl
+Line 5212 
 $as_echo "$as_me: WARNING: cache variabl
  if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
    if test -w "$cache_file"; then
      test "x$cache_file" != "x/dev/null" &&
-       { $as_echo "$as_me:$LINENO: updating cache $cache_file" >&5
+       { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
  $as_echo "$as_me: updating cache $cache_file" >&6;}
      cat confcache >$cache_file
    else
-     { $as_echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5
+     { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
  $as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
    fi
  fi
-Line 5846 
 for ac_i in : $LIBOBJS; do test "x$ac_i"
+Line 5272 
 for ac_i in : $LIBOBJS; do test "x$ac_i"
    ac_i=`$as_echo "$ac_i" | sed "$ac_script"`
    # 2. Prepend LIBOBJDIR.  When used with automake>=1.10 LIBOBJDIR
    #    will be set to the directory where LIBOBJS objects are built.
-   ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext"
+   as_fn_append ac_libobjs " \${LIBOBJDIR}$ac_i\$U.$ac_objext"
-   ac_ltlibobjs="$ac_ltlibobjs \${LIBOBJDIR}$ac_i"'$U.lo'
+   as_fn_append ac_ltlibobjs " \${LIBOBJDIR}$ac_i"'$U.lo'
  done
  LIBOBJS=$ac_libobjs
-Line 5859 
 LTLIBOBJS=$ac_ltlibobjs
+Line 5285 
 LTLIBOBJS=$ac_ltlibobjs
  ac_write_fail=0
  ac_clean_files_save=$ac_clean_files
  ac_clean_files="$ac_clean_files $CONFIG_STATUS"
- { $as_echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5
  $as_echo "$as_me: creating $CONFIG_STATUS" >&6;}
- cat >$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+ as_write_fail=0
+ cat >$CONFIG_STATUS <<_ASEOF || as_write_fail=1
  #! $SHELL
  # Generated by $as_me.
  # Run this file to recreate the current configuration.
-Line 5871 
 cat >$CONFIG_STATUS <<_ACEOF || ac_write
+Line 5298 
 cat >$CONFIG_STATUS <<_ACEOF || ac_write
  debug=false
  ac_cs_recheck=false
  ac_cs_silent=false
- SHELL=\${CONFIG_SHELL-$SHELL}
- _ACEOF
- cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+ SHELL=\${CONFIG_SHELL-$SHELL}
- ## --------------------- ##
+ export SHELL
- ## M4sh Initialization.  ##
+ _ASEOF
- ## --------------------- ##
+ cat >>$CONFIG_STATUS <<\_ASEOF || as_write_fail=1
+ ## -------------------- ##
+ ## M4sh Initialization. ##
+ ## -------------------- ##
  # Be more Bourne compatible
  DUALCASE=1; export DUALCASE # for MKS sh
- if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+ if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
    emulate sh
    NULLCMD=:
    # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
-Line 5889 
 if test -n "${ZSH_VERSION+set}" && (emul
+Line 5317 
 if test -n "${ZSH_VERSION+set}" && (emul
    alias -g '${1+"$@"}'='"$@"'
    setopt NO_GLOB_SUBST
  else
-   case `(set -o) 2>/dev/null` in
+   case `(set -o) 2>/dev/null` in #(
-   *posix*) set -o posix ;;
+   *posix*) :
+     set -o posix ;; #(
+   *) :
+      ;;
  esac
  fi
- # PATH needs CR
- # Avoid depending upon Character Ranges.
- as_cr_letters='abcdefghijklmnopqrstuvwxyz'
- as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
- as_cr_Letters=$as_cr_letters$as_cr_LETTERS
- as_cr_digits='0123456789'
- as_cr_alnum=$as_cr_Letters$as_cr_digits
  as_nl='
  '
  export as_nl
-Line 5913 
 export as_nl
+Line 5333 
 export as_nl
  as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
  as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
  as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
- if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
+ # Prefer a ksh shell builtin over an external printf program on Solaris,
+ # but without wasting forks for bash or zsh.
+ if test -z "$BASH_VERSION$ZSH_VERSION" \
+     && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
+   as_echo='print -r --'
+   as_echo_n='print -rn --'
+ elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
    as_echo='printf %s\n'
    as_echo_n='printf %s'
  else
-Line 5924 
 else
+Line 5350 
 else
      as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
      as_echo_n_body='eval
        arg=$1;
-       case $arg in
+       case $arg in #(
        *"$as_nl"*)
          expr "X$arg" : "X\\(.*\\)$as_nl";
          arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
-Line 5947 
 if test "${PATH_SEPARATOR+set}" != set;
+Line 5373 
 if test "${PATH_SEPARATOR+set}" != set;
    }
  fi
- # Support unset when possible.
- if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
-   as_unset=unset
- else
-   as_unset=false
- fi
  # IFS
  # We need space, tab and new line, in precisely that order.  Quoting is
-Line 5963 
 fi
+Line 5382 
 fi
  IFS=" ""        $as_nl"
  # Find who we are.  Look in the path if we contain no directory separator.
- case $0 in
+ case $0 in #((
    *[\\/]* ) as_myself=$0 ;;
    *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  for as_dir in $PATH
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
-   test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
+     test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
- done
+   done
  IFS=$as_save_IFS
       ;;
-Line 5983 
 if test "x$as_myself" = x; then
+Line 5402 
 if test "x$as_myself" = x; then
  fi
  if test ! -f "$as_myself"; then
    $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
-   { (exit 1); exit 1; }
+   exit 1
  fi
- # Work around bugs in pre-3.0 UWIN ksh.
+ # Unset variables that we do not need and which cause bugs (e.g. in
- for as_var in ENV MAIL MAILPATH
+ # pre-3.0 UWIN ksh).  But do not cause bugs in bash 2.01; the "|| exit 1"
- do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
+ # suppresses any "Segmentation fault" message there.  '((' could
+ # trigger a bug in pdksh 5.2.14.
+ for as_var in BASH_ENV ENV MAIL MAILPATH
+ do eval test x\${$as_var+set} = xset \
+   && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
  done
  PS1='$ '
  PS2='> '
-Line 6000 
 export LC_ALL
+Line 5423 
 export LC_ALL
  LANGUAGE=C
  export LANGUAGE
- # Required to use basename.
+ # CDPATH.
+ (unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+ # as_fn_error ERROR [LINENO LOG_FD]
+ # ---------------------------------
+ # Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
+ # provided, also output the error to LOG_FD, referencing LINENO. Then exit the
+ # script with status $?, using 1 if that was 0.
+ as_fn_error ()
+ {
+   as_status=$?; test $as_status -eq 0 && as_status=1
+   if test "$3"; then
+     as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+     $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
+   fi
+   $as_echo "$as_me: error: $1" >&2
+   as_fn_exit $as_status
+ } # as_fn_error
+ # as_fn_set_status STATUS
+ # -----------------------
+ # Set $? to STATUS, without forking.
+ as_fn_set_status ()
+ {
+   return $1
+ } # as_fn_set_status
+ # as_fn_exit STATUS
+ # -----------------
+ # Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
+ as_fn_exit ()
+ {
+   set +e
+   as_fn_set_status $1
+   exit $1
+ } # as_fn_exit
+ # as_fn_unset VAR
+ # ---------------
+ # Portably unset VAR.
+ as_fn_unset ()
+ {
+   { eval $1=; unset $1;}
+ }
+ as_unset=as_fn_unset
+ # as_fn_append VAR VALUE
+ # ----------------------
+ # Append the text in VALUE to the end of the definition contained in VAR. Take
+ # advantage of any shell optimizations that allow amortized linear growth over
+ # repeated appends, instead of the typical quadratic growth present in naive
+ # implementations.
+ if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
+   eval 'as_fn_append ()
+   {
+     eval $1+=\$2
+   }'
+ else
+   as_fn_append ()
+   {
+     eval $1=\$$1\$2
+   }
+ fi # as_fn_append
+ # as_fn_arith ARG...
+ # ------------------
+ # Perform arithmetic evaluation on the ARGs, and store the result in the
+ # global $as_val. Take advantage of shells that can avoid forks. The arguments
+ # must be portable across $(()) and expr.
+ if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
+   eval 'as_fn_arith ()
+   {
+     as_val=$(( $* ))
+   }'
+ else
+   as_fn_arith ()
+   {
+     as_val=`expr "$@" || test $? -eq 1`
+   }
+ fi # as_fn_arith
  if expr a : '\(a\)' >/dev/null 2>&1 &&
     test "X`expr 00001 : '.*\(...\)'`" = X001; then
    as_expr=expr
-Line 6014 
 else
+Line 5519 
 else
    as_basename=false
  fi
+ if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
+   as_dirname=dirname
+ else
+   as_dirname=false
+ fi
- # Name of the executable.
  as_me=`$as_basename -- "$0" ||
  $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
           X"$0" : 'X\(//\)$' \| \
-Line 6035 
 $as_echo X/"$0" |
+Line 5544 
 $as_echo X/"$0" |
            }
            s/.*/./; q'`
- # CDPATH.
+ # Avoid depending upon Character Ranges.
- $as_unset CDPATH
+ as_cr_letters='abcdefghijklmnopqrstuvwxyz'
+ as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
+ as_cr_Letters=$as_cr_letters$as_cr_LETTERS
+ as_cr_digits='0123456789'
-   as_lineno_1=$LINENO
+ as_cr_alnum=$as_cr_Letters$as_cr_digits
-   as_lineno_2=$LINENO
-   test "x$as_lineno_1" != "x$as_lineno_2" &&
-   test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {
-   # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
-   # uniformly replaced by the line number.  The first 'sed' inserts a
-   # line-number line after each line using $LINENO; the second 'sed'
-   # does the real work.  The second script uses 'N' to pair each
-   # line-number line with the line containing $LINENO, and appends
-   # trailing '-' during substitution so that $LINENO is not a special
-   # case at line end.
-   # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
-   # scripts with optimization help from Paolo Bonzini.  Blame Lee
-   # E. McMahon (1931-1989) for sed's syntax.  :-)
-   sed -n '
-     p
-     /[$]LINENO/=
-   ' <$as_myself |
-     sed '
-       s/[$]LINENO.*/&-/
-       t lineno
-       b
-       :lineno
-       N
-       :loop
-       s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
-       t loop
-       s/-\n.*//
-     ' >$as_me.lineno &&
-   chmod +x "$as_me.lineno" ||
-     { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
-    { (exit 1); exit 1; }; }
-   # Don't try to exec as it changes $[0], causing all sort of problems
-   # (the dirname of $[0] is not the place where we might find the
-   # original and so on.  Autoconf is especially sensitive to this).
-   . "./$as_me.lineno"
-   # Exit status is that of the last command.
-   exit
- }
- if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
-   as_dirname=dirname
- else
-   as_dirname=false
- fi
  ECHO_C= ECHO_N= ECHO_T=
- case `echo -n x` in
+ case `echo -n x` in #(((((
  -n*)
-   case `echo 'x\c'` in
+   case `echo 'xy\c'` in
    *c*) ECHO_T=' ';;     # ECHO_T is single tab character.
-   *)   ECHO_C='\c';;
+   xy)  ECHO_C='\c';;
+   *)   echo `echo ksh88 bug on AIX 6.1` > /dev/null
+        ECHO_T=' ';;
    esac;;
  *)
    ECHO_N='-n';;
  esac
- if expr a : '\(a\)' >/dev/null 2>&1 &&
-    test "X`expr 00001 : '.*\(...\)'`" = X001; then
-   as_expr=expr
- else
-   as_expr=false
- fi
  rm -f conf$$ conf$$.exe conf$$.file
  if test -d conf$$.dir; then
-Line 6133 
 fi
+Line 5591 
 fi
  rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
  rmdir conf$$.dir 2>/dev/null
+ # as_fn_mkdir_p
+ # -------------
+ # Create "$as_dir" as a directory, including parents if necessary.
+ as_fn_mkdir_p ()
+ {
+   case $as_dir in #(
+   -*) as_dir=./$as_dir;;
+   esac
+   test -d "$as_dir" || eval $as_mkdir_p || {
+     as_dirs=
+     while :; do
+       case $as_dir in #(
+       *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
+       *) as_qdir=$as_dir;;
+       esac
+       as_dirs="'$as_qdir' $as_dirs"
+       as_dir=`$as_dirname -- "$as_dir" ||
+ $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+          X"$as_dir" : 'X\(//\)[^/]' \| \
+          X"$as_dir" : 'X\(//\)$' \| \
+          X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
+ $as_echo X"$as_dir" |
+     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+             s//\1/
+             q
+           }
+           /^X\(\/\/\)[^/].*/{
+             s//\1/
+             q
+           }
+           /^X\(\/\/\)$/{
+             s//\1/
+             q
+           }
+           /^X\(\/\).*/{
+             s//\1/
+             q
+           }
+           s/.*/./; q'`
+       test -d "$as_dir" && break
+     done
+     test -z "$as_dirs" || eval "mkdir $as_dirs"
+   } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
+ } # as_fn_mkdir_p
  if mkdir -p . 2>/dev/null; then
-   as_mkdir_p=:
+   as_mkdir_p='mkdir -p "$as_dir"'
  else
    test -d ./-p && rmdir ./-p
    as_mkdir_p=false
-Line 6153 
 else
+Line 5659 
 else
        if test -d "$1"; then
          test -d "$1/.";
        else
-         case $1 in
+         case $1 in #(
          -*)set "./$1";;
          esac;
-         case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
+         case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
          ???[sx]*):;;*)false;;esac;fi
      '\'' sh
    '
-Line 6171 
 as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr
+Line 5677 
 as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr
  exec 6>&1
+ ## ----------------------------------- ##
+ ## Main body of $CONFIG_STATUS script. ##
+ ## ----------------------------------- ##
+ _ASEOF
+ test $as_write_fail = 0 && chmod +x $CONFIG_STATUS || ac_write_fail=1
- # Save the log message, to keep $[0] and so on meaningful, and to
+ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+ # Save the log message, to keep $0 and so on meaningful, and to
  # report actual input values of CONFIG_FILES etc. instead of their
  # values after options handling.
  ac_log="
- This file was extended by GPXView $as_me 0.9.3, which was
+ This file was extended by GPXView $as_me 0.9.4, which was
- generated by GNU Autoconf 2.63.  Invocation command line was
+ generated by GNU Autoconf 2.65.  Invocation command line was
    CONFIG_FILES    = $CONFIG_FILES
    CONFIG_HEADERS  = $CONFIG_HEADERS
-Line 6204 
 _ACEOF
+Line 5716 
 _ACEOF
  cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
  ac_cs_usage="\
- \`$as_me' instantiates files from templates according to the
+ \`$as_me' instantiates files and other configuration actions
- current configuration.
+ from templates according to the current configuration.  Unless the files
+ and actions are specified as TAGs, all are instantiated by default.
- Usage: $0 [OPTION]... [FILE]...
+ Usage: $0 [OPTION]... [TAG]...
    -h, --help       print this help, then exit
    -V, --version    print version number and configuration settings, then exit
+       --config     print configuration, then exit
    -q, --quiet, --silent
                     do not print progress messages
    -d, --debug      don't remove temporary files
-Line 6221 
 Usage: $0 [OPTION]... [FILE]...
+Line 5735 
 Usage: $0 [OPTION]... [FILE]...
  Configuration files:
  $config_files
- Report bugs to <bug-autoconf@gnu.org>."
+ Report bugs to <till@harbaum.org>."
  _ACEOF
  cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+ ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
  ac_cs_version="\\
- GPXView config.status 0.9.3
+ GPXView config.status 0.9.4
- configured by $0, generated by GNU Autoconf 2.63,
+ configured by $0, generated by GNU Autoconf 2.65,
-   with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
+   with options \\"\$ac_cs_config\\"
- Copyright (C) 2008 Free Software Foundation, Inc.
+ Copyright (C) 2009 Free Software Foundation, Inc.
  This config.status script is free software; the Free Software Foundation
  gives unlimited permission to copy, distribute and modify it."
-Line 6264 
 do
+Line 5779 
 do
      ac_cs_recheck=: ;;
    --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
      $as_echo "$ac_cs_version"; exit ;;
+   --config | --confi | --conf | --con | --co | --c )
+     $as_echo "$ac_cs_config"; exit ;;
    --debug | --debu | --deb | --de | --d | -d )
      debug=: ;;
    --file | --fil | --fi | --f )
-Line 6271 
 do
+Line 5788 
 do
      case $ac_optarg in
      *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
      esac
-     CONFIG_FILES="$CONFIG_FILES '$ac_optarg'"
+     as_fn_append CONFIG_FILES " '$ac_optarg'"
      ac_need_defaults=false;;
    --he | --h |  --help | --hel | -h )
      $as_echo "$ac_cs_usage"; exit ;;
-Line 6280 
 do
+Line 5797 
 do
      ac_cs_silent=: ;;
    # This is an error.
-   -*) { $as_echo "$as_me: error: unrecognized option: $1
+   -*) as_fn_error "unrecognized option: \`$1'
- Try \`$0 --help' for more information." >&2
+ Try \`$0 --help' for more information." ;;
-    { (exit 1); exit 1; }; } ;;
-   *) ac_config_targets="$ac_config_targets $1"
+   *) as_fn_append ac_config_targets " $1"
       ac_need_defaults=false ;;
    esac
-Line 6335 
 do
+Line 5851 
 do
      "data/Makefile") CONFIG_FILES="$CONFIG_FILES data/Makefile" ;;
      "debian/control") CONFIG_FILES="$CONFIG_FILES debian/control" ;;
-   *) { { $as_echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
+   *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
- $as_echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
-    { (exit 1); exit 1; }; };;
    esac
  done
-Line 6362 
 $debug ||
+Line 5876 
 $debug ||
    trap 'exit_status=$?
    { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
  ' 0
-   trap '{ (exit 1); exit 1; }' 1 2 13 15
+   trap 'as_fn_exit 1' 1 2 13 15
  }
  # Create a (secure) tmp directory for tmp files.
-Line 6373 
 $debug ||
+Line 5887 
 $debug ||
  {
    tmp=./conf$$-$RANDOM
    (umask 077 && mkdir "$tmp")
- } ||
+ } || as_fn_error "cannot create a temporary directory in ." "$LINENO" 5
- {
-    $as_echo "$as_me: cannot create a temporary directory in ." >&2
-    { (exit 1); exit 1; }
- }
  # Set up the scripts for CONFIG_FILES section.
  # No need to generate them if there are no CONFIG_FILES.
-Line 6385 
 $debug ||
+Line 5895 
 $debug ||
  if test -n "$CONFIG_FILES"; then
- ac_cr='
'
+ ac_cr=`echo X | tr X '\015'`
+ # On cygwin, bash can eat \r inside `` if the user requested igncr.
+ # But we know of no other shell where ac_cr would be empty at this
+ # point, so we can use a bashism as a fallback.
+ if test "x$ac_cr" = x; then
+   eval ac_cr=\$\'\\r\'
+ fi
  ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
  if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
-   ac_cs_awk_cr='\\r'
+   ac_cs_awk_cr='\r'
  else
    ac_cs_awk_cr=$ac_cr
  fi
-Line 6402 
 _ACEOF
+Line 5918 
 _ACEOF
    echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
    echo "_ACEOF"
  } >conf$$subs.sh ||
-   { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
+   as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
- $as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
-    { (exit 1); exit 1; }; }
  ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'`
  ac_delim='%!_!# '
  for ac_last_try in false false false false false :; do
    . ./conf$$subs.sh ||
-     { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
+     as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
- $as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
-    { (exit 1); exit 1; }; }
    ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
    if test $ac_delim_n = $ac_delim_num; then
      break
    elif $ac_last_try; then
-     { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
+     as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
- $as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
-    { (exit 1); exit 1; }; }
    else
      ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
    fi
-Line 6441 
 s/'"$ac_delim"'$//
+Line 5951 
 s/'"$ac_delim"'$//
  t delim
  :nl
  h
- s/\(.\{148\}\).*/\1/
+ s/\(.\{148\}\)..*/\1/
  t more1
  s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/
  p
-Line 6455 
 s/.\{148\}//
+Line 5965 
 s/.\{148\}//
  t nl
  :delim
  h
- s/\(.\{148\}\).*/\1/
+ s/\(.\{148\}\)..*/\1/
  t more2
  s/["\\]/\\&/g; s/^/"/; s/$/"/
  p
-Line 6508 
 if sed "s/$ac_cr//" < /dev/null > /dev/n
+Line 6018 
 if sed "s/$ac_cr//" < /dev/null > /dev/n
  else
    cat
  fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
-   || { { $as_echo "$as_me:$LINENO: error: could not setup config files machinery" >&5
+   || as_fn_error "could not setup config files machinery" "$LINENO" 5
- $as_echo "$as_me: error: could not setup config files machinery" >&2;}
-    { (exit 1); exit 1; }; }
  _ACEOF
  # VPATH may cause trouble with some makes, so we remove $(srcdir),
-Line 6541 
 do
+Line 6049 
 do
    esac
    case $ac_mode$ac_tag in
    :[FHL]*:*);;
-   :L* | :C*:*) { { $as_echo "$as_me:$LINENO: error: invalid tag $ac_tag" >&5
+   :L* | :C*:*) as_fn_error "invalid tag \`$ac_tag'" "$LINENO" 5;;
- $as_echo "$as_me: error: invalid tag $ac_tag" >&2;}
-    { (exit 1); exit 1; }; };;
    :[FH]-) ac_tag=-:-;;
    :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
    esac
-Line 6571 
 $as_echo "$as_me: error: invalid tag $ac
+Line 6077 
 $as_echo "$as_me: error: invalid tag $ac
             [\\/$]*) false;;
             *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
             esac ||
-            { { $as_echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5
+            as_fn_error "cannot find input file: \`$ac_f'" "$LINENO" 5;;
- $as_echo "$as_me: error: cannot find input file: $ac_f" >&2;}
-    { (exit 1); exit 1; }; };;
        esac
        case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
-       ac_file_inputs="$ac_file_inputs '$ac_f'"
+       as_fn_append ac_file_inputs " '$ac_f'"
      done
      # Let's still pretend it is `configure' which instantiates (i.e., don't
-Line 6587 
 $as_echo "$as_me: error: cannot find inp
+Line 6091 
 $as_echo "$as_me: error: cannot find inp
          `' by configure.'
      if test x"$ac_file" != x-; then
        configure_input="$ac_file.  $configure_input"
-       { $as_echo "$as_me:$LINENO: creating $ac_file" >&5
+       { $as_echo "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5
  $as_echo "$as_me: creating $ac_file" >&6;}
      fi
      # Neutralize special characters interpreted by sed in replacement strings.
-Line 6600 
 $as_echo "$as_me: creating $ac_file" >&6
+Line 6104 
 $as_echo "$as_me: creating $ac_file" >&6
      case $ac_tag in
      *:-:* | *:-) cat >"$tmp/stdin" \
-       || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
+       || as_fn_error "could not create $ac_file" "$LINENO" 5 ;;
- $as_echo "$as_me: error: could not create $ac_file" >&2;}
-    { (exit 1); exit 1; }; } ;;
      esac
      ;;
    esac
-Line 6630 
 $as_echo X"$ac_file" |
+Line 6132 
 $as_echo X"$ac_file" |
              q
            }
            s/.*/./; q'`
-   { as_dir="$ac_dir"
+   as_dir="$ac_dir"; as_fn_mkdir_p
-   case $as_dir in #(
-   -*) as_dir=./$as_dir;;
-   esac
-   test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || {
-     as_dirs=
-     while :; do
-       case $as_dir in #(
-       *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
-       *) as_qdir=$as_dir;;
-       esac
-       as_dirs="'$as_qdir' $as_dirs"
-       as_dir=`$as_dirname -- "$as_dir" ||
- $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-          X"$as_dir" : 'X\(//\)[^/]' \| \
-          X"$as_dir" : 'X\(//\)$' \| \
-          X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
- $as_echo X"$as_dir" |
-     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-             s//\1/
-             q
-           }
-           /^X\(\/\/\)[^/].*/{
-             s//\1/
-             q
-           }
-           /^X\(\/\/\)$/{
-             s//\1/
-             q
-           }
-           /^X\(\/\).*/{
-             s//\1/
-             q
-           }
-           s/.*/./; q'`
-       test -d "$as_dir" && break
-     done
-     test -z "$as_dirs" || eval "mkdir $as_dirs"
-   } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
- $as_echo "$as_me: error: cannot create directory $as_dir" >&2;}
-    { (exit 1); exit 1; }; }; }
    ac_builddir=.
  case "$ac_dir" in
-Line 6722 
 cat >>$CONFIG_STATUS <<\_ACEOF || ac_wri
+Line 6184 
 cat >>$CONFIG_STATUS <<\_ACEOF || ac_wri
  # If the template does not know about datarootdir, expand it.
  # FIXME: This hack should be removed a few years after 2.60.
  ac_datarootdir_hack=; ac_datarootdir_seen=
  ac_sed_dataroot='
  /datarootdir/ {
    p
-Line 6732 
 ac_sed_dataroot='
+Line 6193 
 ac_sed_dataroot='
  /@docdir@/p
  /@infodir@/p
  /@localedir@/p
- /@mandir@/p
+ /@mandir@/p'
- '
  case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in
  *datarootdir*) ac_datarootdir_seen=yes;;
  *@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
-   { $as_echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
+   { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
  $as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
  _ACEOF
  cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-Line 6747 
 cat >>$CONFIG_STATUS <<_ACEOF || ac_writ
+Line 6207 
 cat >>$CONFIG_STATUS <<_ACEOF || ac_writ
    s&@infodir@&$infodir&g
    s&@localedir@&$localedir&g
    s&@mandir@&$mandir&g
-     s&\\\${datarootdir}&$datarootdir&g' ;;
+   s&\\\${datarootdir}&$datarootdir&g' ;;
  esac
  _ACEOF
-Line 6775 
 s&@INSTALL@&$ac_INSTALL&;t t
+Line 6235 
 s&@INSTALL@&$ac_INSTALL&;t t
  $ac_datarootdir_hack
  "
  eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
-   || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
+   || as_fn_error "could not create $ac_file" "$LINENO" 5
- $as_echo "$as_me: error: could not create $ac_file" >&2;}
-    { (exit 1); exit 1; }; }
  test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
    { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
    { ac_out=`sed -n '/^[  ]*datarootdir[  ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
-   { $as_echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+   { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
  which seems to be undefined.  Please make sure it is defined." >&5
  $as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
  which seems to be undefined.  Please make sure it is defined." >&2;}
-Line 6792 
 which seems to be undefined.  Please mak
+Line 6250 
 which seems to be undefined.  Please mak
    -) cat "$tmp/out" && rm -f "$tmp/out";;
    *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
    esac \
-   || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
+   || as_fn_error "could not create $ac_file" "$LINENO" 5
- $as_echo "$as_me: error: could not create $ac_file" >&2;}
-    { (exit 1); exit 1; }; }
   ;;
-Line 6804 
 $as_echo "$as_me: error: could not creat
+Line 6260 
 $as_echo "$as_me: error: could not creat
  done # for ac_tag
- { (exit 0); exit 0; }
+ as_fn_exit 0
  _ACEOF
- chmod +x $CONFIG_STATUS
  ac_clean_files=$ac_clean_files_save
  test $ac_write_fail = 0 ||
-   { { $as_echo "$as_me:$LINENO: error: write failure creating $CONFIG_STATUS" >&5
+   as_fn_error "write failure creating $CONFIG_STATUS" "$LINENO" 5
- $as_echo "$as_me: error: write failure creating $CONFIG_STATUS" >&2;}
-    { (exit 1); exit 1; }; }
  # configure is writing to config.log, and then calls config.status.
-Line 6833 
 if test "$no_create" != yes; then
+Line 6286 
 if test "$no_create" != yes; then
    exec 5>>config.log
    # Use ||, not &&, to avoid exiting from the if with $? = 1, which
    # would make configure fail if this is the last instruction.
-   $ac_cs_success || { (exit 1); exit 1; }
+   $ac_cs_success || as_fn_exit $?
  fi
  if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
-   { $as_echo "$as_me:$LINENO: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
+   { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
  $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
  fi

 Legend:



Removed from v.279
 


changed lines


 
Added in v.280
 Legend:



Removed from v.279
 


changed lines


 
Added in v.280
-Removed from v.279
+Added in v.280