[gpxview] Diff of /trunk/configure

Diff of /trunk/configure

Parent Directory | Revision Log | View Patch Patch

-revision 281 by harbaum,
Fri May 21 19:28:16 2010 UTC
+revision 282 by harbaum,
Wed May 26 19:21:47 2010 UTC
 Line 1
  #! /bin/sh
  # Guess values for system-dependent variables and create Makefiles.
- # Generated by GNU Autoconf 2.65 for GPXView 0.9.4.
+ # Generated by GNU Autoconf 2.61 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, 2009 Free Software Foundation,
+ # 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
- # 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
+   # Zsh 3.x and 4.x performs 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 #(
+   case `(set -o) 2>/dev/null` in
-   *posix*) :
+   *posix*) set -o posix ;;
-     set -o posix ;; #(
-   *) :
-      ;;
  esac
  fi
- as_nl='
- '
- export as_nl
+ # PATH needs CR
- # Printing a long string crashes Solaris 7 /usr/bin/printf.
+ # Avoid depending upon Character Ranges.
- as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+ as_cr_letters='abcdefghijklmnopqrstuvwxyz'
- as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
+ as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
- as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
+ as_cr_Letters=$as_cr_letters$as_cr_LETTERS
- # Prefer a ksh shell builtin over an external printf program on Solaris,
+ as_cr_digits='0123456789'
- # but without wasting forks for bash or zsh.
+ as_cr_alnum=$as_cr_Letters$as_cr_digits
- if test -z "$BASH_VERSION$ZSH_VERSION" \
-     && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
+ # The user is always right.
-   as_echo='print -r --'
+ if test "${PATH_SEPARATOR+set}" != set; then
-   as_echo_n='print -rn --'
+   echo "#! /bin/sh" >conf$$.sh
- elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
+   echo  "exit 0"   >>conf$$.sh
-   as_echo='printf %s\n'
+   chmod +x conf$$.sh
-   as_echo_n='printf %s'
+   if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
- else
+     PATH_SEPARATOR=';'
-   if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
-     as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
-     as_echo_n='/usr/ucb/echo -n'
    else
-     as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
+     PATH_SEPARATOR=:
-     as_echo_n_body='eval
-       arg=$1;
-       case $arg in #(
-       *"$as_nl"*)
-         expr "X$arg" : "X\\(.*\\)$as_nl";
-         arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
-       esac;
-       expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
-     '
-     export as_echo_n_body
-     as_echo_n='sh -c $as_echo_n_body as_echo'
    fi
-   export as_echo_body
+   rm -f conf$$.sh
-   as_echo='sh -c $as_echo_body as_echo'
  fi
- # The user is always right.
+ # Support unset when possible.
- if test "${PATH_SEPARATOR+set}" != set; then
+ if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
-   PATH_SEPARATOR=:
+   as_unset=unset
-   (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
+ else
-     (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
+   as_unset=false
-       PATH_SEPARATOR=';'
-   }
  fi
-Line 88 
 fi
+Line 65 
 fi
  # there to prevent editors from complaining about space-tab.
  # (If _AS_PATH_WALK were called with IFS unset, it would disable word
  # splitting by setting IFS to empty value.)
+ as_nl='
+ '
  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 110 
 if test "x$as_myself" = x; then
+Line 89 
 if test "x$as_myself" = x; then
    as_myself=$0
  fi
  if test ! -f "$as_myself"; then
-   $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+   echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
-   exit 1
+   { (exit 1); exit 1; }
  fi
- # Unset variables that we do not need and which cause bugs (e.g. in
+ # Work around bugs in pre-3.0 UWIN ksh.
- # pre-3.0 UWIN ksh).  But do not cause bugs in bash 2.01; the "|| exit 1"
+ for as_var in ENV MAIL MAILPATH
- # suppresses any "Segmentation fault" message there.  '((' could
+ do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
- # 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='> '
  PS4='+ '
  # NLS nuisances.
- LC_ALL=C
+ for as_var in \
- export LC_ALL
+   LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
- LANGUAGE=C
+   LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
- export LANGUAGE
+   LC_TELEPHONE LC_TIME
+ do
+   if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
+     eval $as_var=C; export $as_var
+   else
+     ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
+   fi
+ done
+ # 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 ||
+ echo X/"$0" |
+     sed '/^.*\/\([^/][^/]*\)\/*$/{
+             s//\1/
+             q
+           }
+           /^X\/\(\/\/\)$/{
+             s//\1/
+             q
+           }
+           /^X\/\(\/\).*/{
+             s//\1/
+             q
+           }
+           s/.*/./; q'`
  # CDPATH.
- (unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+ $as_unset CDPATH
  if test "x$CONFIG_SHELL" = x; then
-   as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
+   if (eval ":") 2>/dev/null; then
-   emulate sh
+   as_have_required=yes
-   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 #(
+   as_have_required=no
-   *posix*) :
-     set -o posix ;; #(
-   *) :
-      ;;
- esac
  fi
- "
-   as_required="as_fn_return () { (exit \$1); }
+   if test $as_have_required = yes &&     (eval ":
- as_fn_success () { as_fn_return 0; }
+ (as_func_return () {
- as_fn_failure () { as_fn_return 1; }
+   (exit \$1)
- as_fn_ret_success () { return 0; }
+ }
- as_fn_ret_failure () { return 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
- as_fn_success || { exitcode=1; echo as_fn_success failed.; }
+ if as_func_success; then
- as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; }
+   :
- as_fn_ret_success || { exitcode=1; echo as_fn_ret_success failed.; }
- as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; }
- if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then :
- else
-   exitcode=1; echo positional parameters were not saved.
- fi
- test x\$exitcode = x0 || exit 1"
-   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
-   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
-   as_have_required=no
+   exitcode=1
+   echo as_func_success failed.
+ fi
+ if as_func_failure; then
+   exitcode=1
+   echo as_func_failure succeeded.
  fi
-   if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then :
+ if as_func_ret_success; then
+   :
  else
-   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+   exitcode=1
- as_found=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
+   :
+ else
+   exitcode=1
+   echo positional parameters were not saved.
+ 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=.
-   as_found=:
+   case $as_dir in
-   case $as_dir in #(
           /*)
             for as_base in sh bash ksh sh5; do
-              # Try only shells that exist, to save several forks.
+              as_candidate_shells="$as_candidate_shells $as_dir/$as_base"
-              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
-       if test "x$CONFIG_SHELL" != x; then :
+       for as_shell in $as_candidate_shells $SHELL; do
-   # We cannot yet assume a decent shell, so we have to provide a
+          # Try only shells that exist, to save several forks.
-         # neutralization value for shells without unset; and this also
+          if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
-         # works around shells that cannot unset nonexistent variables.
+                 { ("$as_shell") 2> /dev/null <<\_ASEOF
-         BASH_ENV=/dev/null
+ if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-         ENV=/dev/null
+   emulate sh
-         (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
+   NULLCMD=:
-         export CONFIG_SHELL
+   # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
-         exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
+   # is contrary to our usage.  Disable this feature.
- fi
+   alias -g '${1+"$@"}'='"$@"'
+   setopt NO_GLOB_SUBST
-     if test x$as_have_required = xno; then :
+ else
-   $as_echo "$0: This script requires a shell more modern than all"
+   case `(set -o) 2>/dev/null` in
-   $as_echo "$0: the shells that I found on your system."
+   *posix*) set -o posix ;;
-   if test x${ZSH_VERSION+set} = xset ; then
+ esac
-     $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
  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=:
+   # Zsh 3.x and 4.x performs 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
- 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
- ## --------------------- ##
- ## M4sh Shell Functions. ##
+ :
- ## --------------------- ##
+ (as_func_return () {
- # as_fn_unset VAR
+   (exit $1)
- # ---------------
+ }
- # Portably unset VAR.
+ as_func_success () {
- as_fn_unset ()
+   as_func_return 0
- {
+ }
-   { eval $1=; unset $1;}
+ as_func_failure () {
+   as_func_return 1
+ }
+ as_func_ret_success () {
+   return 0
+ }
+ as_func_ret_failure () {
+   return 1
  }
- as_unset=as_fn_unset
- # as_fn_set_status STATUS
+ exitcode=0
- # -----------------------
+ if as_func_success; then
- # Set $? to STATUS, without forking.
+   :
- as_fn_set_status ()
+ else
- {
+   exitcode=1
-   return $1
+   echo as_func_success failed.
- } # as_fn_set_status
+ fi
- # as_fn_exit STATUS
+ if as_func_failure; then
- # -----------------
+   exitcode=1
- # Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
+   echo as_func_failure succeeded.
- as_fn_exit ()
+ fi
- {
-   set +e
-   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 #(
+ if as_func_ret_success; then
-   -*) as_dir=./$as_dir;;
+   :
-   esac
+ else
-   test -d "$as_dir" || eval $as_mkdir_p || {
+   exitcode=1
-     as_dirs=
+   echo as_func_ret_success failed.
-     while :; do
+ fi
-       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"
+ if as_func_ret_failure; then
+   exitcode=1
+   echo as_func_ret_failure succeeded.
+ fi
- } # as_fn_mkdir_p
+ if ( set x; as_func_ret_success y && test x = "$1" ); then
- # 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 ()
+   exitcode=1
-   {
+   echo positional parameters were not saved.
-     as_val=`expr "$@" || test $? -eq 1`
+ fi
-   }
- fi # as_fn_arith
+ test $exitcode = 0) || { (exit 1); exit 1; }
- # as_fn_error ERROR [LINENO LOG_FD]
+ (
- # ---------------------------------
+   as_lineno_1=$LINENO
- # Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
+   as_lineno_2=$LINENO
- # provided, also output the error to LOG_FD, referencing LINENO. Then exit the
+   test "x$as_lineno_1" != "x$as_lineno_2" &&
- # script with status $?, using 1 if that was 0.
+   test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2") || { (exit 1); exit 1; }
- 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
- if expr a : '\(a\)' >/dev/null 2>&1 &&
+ _ASEOF
-    test "X`expr 00001 : '.*\(...\)'`" = X001; then
+ }; then
-   as_expr=expr
+   break
+ fi
+ fi
+       done
+       if test "x$CONFIG_SHELL" != x; then
+   for as_var in BASH_ENV ENV
+         do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
+         done
+         export CONFIG_SHELL
+         exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
+ fi
+     if test $as_have_required = no; then
+   echo This script requires a shell more modern than all the
+       echo shells that I found on your system.  Please install a
+       echo modern shell, or manually run the script under such a
+       echo shell if you do have one.
+       { (exit 1); exit 1; }
+ fi
+ fi
+ fi
+ (eval "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
-   as_expr=false
+   exitcode=1
+   echo as_func_success failed.
  fi
- if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
+ if as_func_failure; then
-   as_basename=basename
+   exitcode=1
+   echo as_func_failure succeeded.
+ fi
+ if as_func_ret_success; then
+   :
  else
-   as_basename=false
+   exitcode=1
+   echo as_func_ret_success failed.
  fi
- if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
+ if as_func_ret_failure; then
-   as_dirname=dirname
+   exitcode=1
+   echo as_func_ret_failure succeeded.
+ fi
+ if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
+   :
  else
-   as_dirname=false
+   exitcode=1
+   echo positional parameters were not saved.
  fi
- as_me=`$as_basename -- "$0" ||
+ test \$exitcode = 0") || {
- $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
+   echo No shell found that supports shell functions.
-          X"$0" : 'X\(//\)$' \| \
+   echo Please tell autoconf@gnu.org about your system,
-          X"$0" : 'X\(/\)' \| . 2>/dev/null ||
+   echo including any error possibly output before this
- $as_echo X/"$0" |
+   echo message
-     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_1a=$LINENO
+   as_lineno_1=$LINENO
-   as_lineno_2=$LINENO as_lineno_2a=$LINENO
+   as_lineno_2=$LINENO
-   eval 'test "x$as_lineno_1'$as_run'" != "x$as_lineno_2'$as_run'" &&
+   test "x$as_lineno_1" != "x$as_lineno_2" &&
-   test "x`expr $as_lineno_1'$as_run' + 1`" = "x$as_lineno_2'$as_run'"' || {
+   test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {
-   # 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 442 
 as_cr_alnum=$as_cr_Letters$as_cr_digits
+Line 453 
 as_cr_alnum=$as_cr_Letters$as_cr_digits
        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_fn_exit 1; }
+     { 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
-Line 452 
 as_cr_alnum=$as_cr_Letters$as_cr_digits
+Line 464 
 as_cr_alnum=$as_cr_Letters$as_cr_digits
    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 'xy\c'` in
+   case `echo 'x\c'` in
    *c*) ECHO_T=' ';;     # ECHO_T is single tab character.
-   xy)  ECHO_C='\c';;
+   *)   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
    rm -f conf$$.dir/conf$$.file
  else
    rm -f conf$$.dir
-   mkdir conf$$.dir 2>/dev/null
+   mkdir conf$$.dir
  fi
- if (echo >conf$$.file) 2>/dev/null; then
+ echo >conf$$.file
-   if ln -s conf$$.file conf$$ 2>/dev/null; then
+ if ln -s conf$$.file conf$$ 2>/dev/null; then
-     as_ln_s='ln -s'
+   as_ln_s='ln -s'
-     # ... but there are two gotchas:
+   # ... but there are two gotchas:
-     # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
+   # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
-     # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
+   # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-     # In both cases, we have to default to `cp -p'.
+   # In both cases, we have to default to `cp -p'.
-     ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
+   ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
-       as_ln_s='cp -p'
-   elif ln conf$$.file conf$$ 2>/dev/null; then
-     as_ln_s=ln
-   else
      as_ln_s='cp -p'
-   fi
+ elif ln conf$$.file conf$$ 2>/dev/null; then
+   as_ln_s=ln
  else
    as_ln_s='cp -p'
  fi
-Line 493 
 rm -f conf$$ conf$$.exe conf$$.dir/conf$
+Line 514 
 rm -f conf$$ conf$$.exe conf$$.dir/conf$
  rmdir conf$$.dir 2>/dev/null
  if mkdir -p . 2>/dev/null; then
-   as_mkdir_p='mkdir -p "$as_dir"'
+   as_mkdir_p=:
  else
    test -d ./-p && rmdir ./-p
    as_mkdir_p=false
-Line 510 
 else
+Line 531 
 else
    as_test_x='
      eval sh -c '\''
        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 529 
 as_tr_cpp="eval sed 'y%*$as_cr_letters%P
+Line 550 
 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 6>&1
+ exec 7<&0 </dev/null 6>&1
  # Name of the host.
  # hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
-Line 548 
 cross_compiling=no
+Line 569 
 cross_compiling=no
  subdirs=
  MFLAGS=
  MAKEFLAGS=
+ SHELL=${CONFIG_SHELL-/bin/sh}
  # Identity of this package.
  PACKAGE_NAME='GPXView'
-Line 555 
 PACKAGE_TARNAME='gpxview'
+Line 577 
 PACKAGE_TARNAME='gpxview'
  PACKAGE_VERSION='0.9.4'
  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 593 
 ac_includes_default="\
+Line 614 
 ac_includes_default="\
  #ifdef HAVE_UNISTD_H
  # include <unistd.h>
  #endif"
- ac_subst_vars='LTLIBOBJS
+ ac_subst_vars='SHELL
- LIBOBJS
- INSTALL_PLATTFORM
- ICON
- EXTRA_OBJS
- gnome2_LIBS
- gnome2_CFLAGS
- gtk_LIBS
- gtk_CFLAGS
- EGREP
- GREP
- CPP
- MAEMO_VERSION_MAJOR
- liblocation_LIBS
- liblocation_CFLAGS
- gpsbt_LIBS
- gpsbt_CFLAGS
- hildon_help_LIBS
- hildon_help_CFLAGS
- sqlite3_LIBS
- sqlite3_CFLAGS
- hildon_fm_2_LIBS
- hildon_fm_2_CFLAGS
- osso_LIBS
- osso_CFLAGS
- hildon_LIBS
- hildon_CFLAGS
- libgtkhtml3_8_LIBS
- libgtkhtml3_8_CFLAGS
- libgtkhtml3_14_LIBS
- libgtkhtml3_14_CFLAGS
- libsoup22_LIBS
- libsoup22_CFLAGS
- libsoup24_LIBS
- libsoup24_CFLAGS
- libcurl_LIBS
- libcurl_CFLAGS
- libxml2_LIBS
- libxml2_CFLAGS
- gnome_vfs_module_LIBS
- gnome_vfs_module_CFLAGS
- PKG_CONFIG
- SET_MAKE
- LN_S
- INSTALL_DATA
- INSTALL_SCRIPT
- INSTALL_PROGRAM
- OBJEXT
- EXEEXT
- ac_ct_CC
- CPPFLAGS
- LDFLAGS
- CFLAGS
- CC
- PACKAGE
- target_alias
- host_alias
- build_alias
- LIBS
- ECHO_T
- ECHO_N
- ECHO_C
- DEFS
- mandir
- localedir
- libdir
- psdir
- pdfdir
- dvidir
- htmldir
- infodir
- docdir
- oldincludedir
- includedir
- localstatedir
- sharedstatedir
- sysconfdir
- datadir
- datarootdir
- libexecdir
- sbindir
- bindir
- program_transform_name
- prefix
- exec_prefix
- PACKAGE_URL
- PACKAGE_BUGREPORT
- PACKAGE_STRING
- PACKAGE_VERSION
- PACKAGE_TARNAME
- PACKAGE_NAME
  PATH_SEPARATOR
- SHELL'
+ PACKAGE_NAME
+ PACKAGE_TARNAME
+ PACKAGE_VERSION
+ PACKAGE_STRING
+ PACKAGE_BUGREPORT
+ exec_prefix
+ prefix
+ program_transform_name
+ bindir
+ sbindir
+ libexecdir
+ datarootdir
+ datadir
+ sysconfdir
+ sharedstatedir
+ localstatedir
+ includedir
+ oldincludedir
+ docdir
+ infodir
+ htmldir
+ dvidir
+ pdfdir
+ psdir
+ libdir
+ localedir
+ mandir
+ DEFS
+ ECHO_C
+ ECHO_N
+ ECHO_T
+ LIBS
+ build_alias
+ host_alias
+ target_alias
+ PACKAGE
+ CC
+ CFLAGS
+ LDFLAGS
+ CPPFLAGS
+ ac_ct_CC
+ EXEEXT
+ OBJEXT
+ INSTALL_PROGRAM
+ INSTALL_SCRIPT
+ INSTALL_DATA
+ LN_S
+ SET_MAKE
+ PKG_CONFIG
+ gnome_vfs_module_CFLAGS
+ gnome_vfs_module_LIBS
+ libxml2_CFLAGS
+ libxml2_LIBS
+ libcurl_CFLAGS
+ libcurl_LIBS
+ libsoup24_CFLAGS
+ libsoup24_LIBS
+ libsoup22_CFLAGS
+ libsoup22_LIBS
+ libgtkhtml3_14_CFLAGS
+ libgtkhtml3_14_LIBS
+ libgtkhtml3_8_CFLAGS
+ libgtkhtml3_8_LIBS
+ hildon_CFLAGS
+ hildon_LIBS
+ osso_CFLAGS
+ osso_LIBS
+ hildon_fm_2_CFLAGS
+ hildon_fm_2_LIBS
+ sqlite3_CFLAGS
+ sqlite3_LIBS
+ hildon_help_CFLAGS
+ hildon_help_LIBS
+ gpsbt_CFLAGS
+ gpsbt_LIBS
+ liblocation_CFLAGS
+ liblocation_LIBS
+ MAEMO_VERSION_MAJOR
+ CPP
+ GREP
+ EGREP
+ gtk_CFLAGS
+ gtk_LIBS
+ gnome2_CFLAGS
+ gnome2_LIBS
+ gps_CFLAGS
+ gps_LIBS
+ EXTRA_OBJS
+ ICON
+ INSTALL_PLATTFORM
+ LIBOBJS
+ LTLIBOBJS'
  ac_subst_files=''
- ac_user_opts='
- enable_option_checking
- '
        ac_precious_vars='build_alias
  host_alias
  target_alias
-Line 732 
 CPP
+Line 751 
 CPP
  gtk_CFLAGS
  gtk_LIBS
  gnome2_CFLAGS
- gnome2_LIBS'
+ gnome2_LIBS
+ gps_CFLAGS
+ gps_LIBS'
  # Initialize some variables set by options.
  ac_init_help=
  ac_init_version=false
- ac_unrecognized_opts=
- ac_unrecognized_sep=
  # The variables have the same names as the options, with
  # dashes changed to underlines.
  cache_file=/dev/null
-Line 838 
 do
+Line 857 
 do
      datarootdir=$ac_optarg ;;
    -disable-* | --disable-*)
-     ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
+     ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
      # Reject names that are not valid shell variable names.
-     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+     expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-       as_fn_error "invalid feature name: $ac_useropt"
+       { echo "$as_me: error: invalid feature name: $ac_feature" >&2
-     ac_useropt_orig=$ac_useropt
+    { (exit 1); exit 1; }; }
-     ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+     ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
-     case $ac_user_opts in
+     eval enable_$ac_feature=no ;;
-       *"
- "enable_$ac_useropt"
- "*) ;;
-       *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--disable-$ac_useropt_orig"
-          ac_unrecognized_sep=', ';;
-     esac
-     eval enable_$ac_useropt=no ;;
    -docdir | --docdir | --docdi | --doc | --do)
      ac_prev=docdir ;;
-Line 864 
 do
+Line 876 
 do
      dvidir=$ac_optarg ;;
    -enable-* | --enable-*)
-     ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
+     ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
      # Reject names that are not valid shell variable names.
-     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+     expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-       as_fn_error "invalid feature name: $ac_useropt"
+       { echo "$as_me: error: invalid feature name: $ac_feature" >&2
-     ac_useropt_orig=$ac_useropt
+    { (exit 1); exit 1; }; }
-     ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+     ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
-     case $ac_user_opts in
+     eval enable_$ac_feature=\$ac_optarg ;;
-       *"
- "enable_$ac_useropt"
- "*) ;;
-       *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--enable-$ac_useropt_orig"
-          ac_unrecognized_sep=', ';;
-     esac
-     eval enable_$ac_useropt=\$ac_optarg ;;
    -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
    | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
-Line 1068 
 do
+Line 1073 
 do
      ac_init_version=: ;;
    -with-* | --with-*)
-     ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
+     ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
      # Reject names that are not valid shell variable names.
-     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+     expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-       as_fn_error "invalid package name: $ac_useropt"
+       { echo "$as_me: error: invalid package name: $ac_package" >&2
-     ac_useropt_orig=$ac_useropt
+    { (exit 1); exit 1; }; }
-     ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+     ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
-     case $ac_user_opts in
+     eval with_$ac_package=\$ac_optarg ;;
-       *"
- "with_$ac_useropt"
- "*) ;;
-       *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--with-$ac_useropt_orig"
-          ac_unrecognized_sep=', ';;
-     esac
-     eval with_$ac_useropt=\$ac_optarg ;;
    -without-* | --without-*)
-     ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
+     ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'`
      # Reject names that are not valid shell variable names.
-     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+     expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-       as_fn_error "invalid package name: $ac_useropt"
+       { echo "$as_me: error: invalid package name: $ac_package" >&2
-     ac_useropt_orig=$ac_useropt
+    { (exit 1); exit 1; }; }
-     ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+     ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
-     case $ac_user_opts in
+     eval with_$ac_package=no ;;
-       *"
- "with_$ac_useropt"
- "*) ;;
-       *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--without-$ac_useropt_orig"
-          ac_unrecognized_sep=', ';;
-     esac
-     eval with_$ac_useropt=no ;;
    --x)
      # Obsolete; use --with-x.
-Line 1117 
 do
+Line 1108 
 do
    | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
      x_libraries=$ac_optarg ;;
-   -*) as_fn_error "unrecognized option: \`$ac_option'
+   -*) { echo "$as_me: error: unrecognized option: $ac_option
- Try \`$0 --help' for more information."
+ Try \`$0 --help' for more information." >&2
+    { (exit 1); exit 1; }; }
      ;;
    *=*)
      ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
      # Reject names that are not valid shell variable names.
-     case $ac_envvar in #(
+     expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
-       '' | [0-9]* | *[!_$as_cr_alnum]* )
+       { echo "$as_me: error: invalid variable name: $ac_envvar" >&2
-       as_fn_error "invalid variable name: \`$ac_envvar'" ;;
+    { (exit 1); exit 1; }; }
-     esac
      eval $ac_envvar=\$ac_optarg
      export $ac_envvar ;;
    *)
      # FIXME: should be removed in autoconf 3.0.
-     $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2
+     echo "$as_me: WARNING: you should use --build, --host, --target" >&2
      expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-       $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2
+       echo "$as_me: WARNING: invalid host type: $ac_option" >&2
      : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
      ;;
-Line 1144 
 done
+Line 1135 
 done
  if test -n "$ac_prev"; then
    ac_option=--`echo $ac_prev | sed 's/_/-/g'`
-   as_fn_error "missing argument to $ac_option"
+   { echo "$as_me: error: missing argument to $ac_option" >&2
- fi
+    { (exit 1); exit 1; }; }
- if test -n "$ac_unrecognized_opts"; then
-   case $enable_option_checking in
-     no) ;;
-     fatal) as_fn_error "unrecognized options: $ac_unrecognized_opts" ;;
-     *)     $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
-   esac
  fi
- # Check all directory arguments for consistency.
+ # Be sure to have absolute directory names.
  for ac_var in   exec_prefix prefix bindir sbindir libexecdir datarootdir \
                  datadir sysconfdir sharedstatedir localstatedir includedir \
                  oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
                  libdir localedir mandir
  do
    eval ac_val=\$$ac_var
-   # Remove trailing slashes.
-   case $ac_val in
-     */ )
-       ac_val=`expr "X$ac_val" : 'X\(.*[^/]\)' \| "X$ac_val" : 'X\(.*\)'`
-       eval $ac_var=\$ac_val;;
-   esac
-   # Be sure to have absolute directory names.
    case $ac_val in
      [\\/$]* | ?:[\\/]* )  continue;;
      NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
    esac
-   as_fn_error "expected an absolute directory name for --$ac_var: $ac_val"
+   { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
+    { (exit 1); exit 1; }; }
  done
  # There might be people who depend on the old broken behavior: `$host'
-Line 1187 
 target=$target_alias
+Line 1165 
 target=$target_alias
  if test "x$host_alias" != x; then
    if test "x$build_alias" = x; then
      cross_compiling=maybe
-     $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
+     echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
      If a cross compiler is detected then cross compile mode will be used." >&2
    elif test "x$build_alias" != "x$host_alias"; then
      cross_compiling=yes
-Line 1203 
 test "$silent" = yes && exec 6>/dev/null
+Line 1181 
 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_fn_error "working directory cannot be determined"
+   { echo "$as_me: error: Working directory cannot be determined" >&2
+    { (exit 1); exit 1; }; }
  test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
-   as_fn_error "pwd does not report name of working directory"
+   { echo "$as_me: error: pwd does not report name of working directory" >&2
+    { (exit 1); exit 1; }; }
  # Find the source files, if location was not specified.
  if test -z "$srcdir"; then
    ac_srcdir_defaulted=yes
    # Try the directory containing this script, then the parent directory.
-   ac_confdir=`$as_dirname -- "$as_myself" ||
+   ac_confdir=`$as_dirname -- "$0" ||
- $as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+ $as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-          X"$as_myself" : 'X\(//\)[^/]' \| \
+          X"$0" : 'X\(//\)[^/]' \| \
-          X"$as_myself" : 'X\(//\)$' \| \
+          X"$0" : 'X\(//\)$' \| \
-          X"$as_myself" : 'X\(/\)' \| . 2>/dev/null ||
+          X"$0" : 'X\(/\)' \| . 2>/dev/null ||
- $as_echo X"$as_myself" |
+ echo X"$0" |
      sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
              s//\1/
              q
-Line 1244 
 else
+Line 1224 
 else
  fi
  if test ! -r "$srcdir/$ac_unique_file"; then
    test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
-   as_fn_error "cannot find sources ($ac_unique_file) in $srcdir"
+   { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
+    { (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_fn_error "$ac_msg"
+         cd "$srcdir" && test -r "./$ac_unique_file" || { echo "$as_me: error: $ac_msg" >&2
+    { (exit 1); exit 1; }; }
          pwd)`
  # When building in place, set srcdir=.
  if test "$ac_abs_confdir" = "$ac_pwd"; then
-Line 1296 
 Configuration:
+Line 1278 
 Configuration:
  Installation directories:
    --prefix=PREFIX         install architecture-independent files in PREFIX
                            [$ac_default_prefix]
    --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
                            [PREFIX]
  By default, \`make install' will install all the files in
  \`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc.  You can specify
-Line 1308 
 for instance \`--prefix=\$HOME'.
+Line 1290 
 for instance \`--prefix=\$HOME'.
  For better control, use the options below.
  Fine tuning of the installation directories:
-   --bindir=DIR            user executables [EPREFIX/bin]
+   --bindir=DIR           user executables [EPREFIX/bin]
-   --sbindir=DIR           system admin executables [EPREFIX/sbin]
+   --sbindir=DIR          system admin executables [EPREFIX/sbin]
-   --libexecdir=DIR        program executables [EPREFIX/libexec]
+   --libexecdir=DIR       program executables [EPREFIX/libexec]
-   --sysconfdir=DIR        read-only single-machine data [PREFIX/etc]
+   --sysconfdir=DIR       read-only single-machine data [PREFIX/etc]
-   --sharedstatedir=DIR    modifiable architecture-independent data [PREFIX/com]
+   --sharedstatedir=DIR   modifiable architecture-independent data [PREFIX/com]
-   --localstatedir=DIR     modifiable single-machine data [PREFIX/var]
+   --localstatedir=DIR    modifiable single-machine data [PREFIX/var]
-   --libdir=DIR            object code libraries [EPREFIX/lib]
+   --libdir=DIR           object code libraries [EPREFIX/lib]
-   --includedir=DIR        C header files [PREFIX/include]
+   --includedir=DIR       C header files [PREFIX/include]
-   --oldincludedir=DIR     C header files for non-gcc [/usr/include]
+   --oldincludedir=DIR    C header files for non-gcc [/usr/include]
-   --datarootdir=DIR       read-only arch.-independent data root [PREFIX/share]
+   --datarootdir=DIR      read-only arch.-independent data root [PREFIX/share]
-   --datadir=DIR           read-only architecture-independent data [DATAROOTDIR]
+   --datadir=DIR          read-only architecture-independent data [DATAROOTDIR]
-   --infodir=DIR           info documentation [DATAROOTDIR/info]
+   --infodir=DIR          info documentation [DATAROOTDIR/info]
-   --localedir=DIR         locale-dependent data [DATAROOTDIR/locale]
+   --localedir=DIR        locale-dependent data [DATAROOTDIR/locale]
-   --mandir=DIR            man documentation [DATAROOTDIR/man]
+   --mandir=DIR           man documentation [DATAROOTDIR/man]
-   --docdir=DIR            documentation root [DATAROOTDIR/doc/gpxview]
+   --docdir=DIR           documentation root [DATAROOTDIR/doc/gpxview]
-   --htmldir=DIR           html documentation [DOCDIR]
+   --htmldir=DIR          html documentation [DOCDIR]
-   --dvidir=DIR            dvi documentation [DOCDIR]
+   --dvidir=DIR           dvi documentation [DOCDIR]
-   --pdfdir=DIR            pdf documentation [DOCDIR]
+   --pdfdir=DIR           pdf documentation [DOCDIR]
-   --psdir=DIR             ps documentation [DOCDIR]
+   --psdir=DIR            ps documentation [DOCDIR]
  _ACEOF
    cat <<\_ACEOF
-Line 1345 
 Some influential environment variables:
+Line 1327 
 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    (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if
+   CPPFLAGS    C/C++/Objective 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 1406 
 Some influential environment variables:
+Line 1388 
 Some influential environment variables:
    gnome2_CFLAGS
                C compiler flags for gnome2, overriding pkg-config
    gnome2_LIBS linker flags for gnome2, overriding pkg-config
+   gps_CFLAGS  C compiler flags for gps, overriding pkg-config
+   gps_LIBS    linker flags for gps, overriding pkg-config
  Use these variables to override the choices made by `configure' or to help
  it to find libraries and programs with nonstandard names/locations.
-Line 1418 
 fi
+Line 1402 
 fi
  if test "$ac_init_help" = "recursive"; then
    # If there are subdirs, report their specific --help.
    for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
-     test -d "$ac_dir" ||
+     test -d "$ac_dir" || continue
-       { cd "$srcdir" && ac_pwd=`pwd` && srcdir=. && test -d "$ac_dir"; } ||
-       continue
      ac_builddir=.
  case "$ac_dir" in
  .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
  *)
-   ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
+   ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
    # A ".." for each directory in $ac_dir_suffix.
-   ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
+   ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'`
    case $ac_top_builddir_sub in
    "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
    *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
-Line 1464 
 ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_
+Line 1446 
 ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_
        echo &&
        $SHELL "$ac_srcdir/configure" --help=recursive
      else
-       $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
+       echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
      fi || ac_status=$?
      cd "$ac_pwd" || { ac_status=$?; break; }
    done
-Line 1474 
 test -n "$ac_init_help" && exit $ac_stat
+Line 1456 
 test -n "$ac_init_help" && exit $ac_stat
  if $ac_init_version; then
    cat <<\_ACEOF
  GPXView configure 0.9.4
- generated by GNU Autoconf 2.65
+ generated by GNU Autoconf 2.61
- Copyright (C) 2009 Free Software Foundation, Inc.
+ Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
+, 2003, 2004, 2005, 2006 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
- # ac_fn_c_try_run LINENO
- # ----------------------
- # Try to link conftest.$ac_ext, and return whether this succeeded. Assumes
- # 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
- 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.4, which was
- generated by GNU Autoconf 2.65.  Invocation command line was
+ generated by GNU Autoconf 2.61.  Invocation command line was
    $ $0 $@
-Line 1768 
 for as_dir in $PATH
+Line 1506 
 for as_dir in $PATH
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
-     $as_echo "PATH: $as_dir"
+   echo "PATH: $as_dir"
-   done
+ done
  IFS=$as_save_IFS
  } >&5
-Line 1803 
 do
+Line 1541 
 do
      | -silent | --silent | --silen | --sile | --sil)
        continue ;;
      *\'*)
-       ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
+       ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
      esac
      case $ac_pass in
-) as_fn_append ac_configure_args0 " '$ac_arg'" ;;
+) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;;
 )
-       as_fn_append ac_configure_args1 " '$ac_arg'"
+       ac_configure_args1="$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 1824 
 do
+Line 1562 
 do
            -* ) ac_must_keep_next=true ;;
          esac
        fi
-       as_fn_append ac_configure_args " '$ac_arg'"
+       ac_configure_args="$ac_configure_args '$ac_arg'"
        ;;
      esac
    done
  done
- { ac_configure_args0=; unset ac_configure_args0;}
+ $as_unset ac_configure_args0 || test "${ac_configure_args0+set}" != set || { ac_configure_args0=; export ac_configure_args0; }
- { ac_configure_args1=; unset ac_configure_args1;}
+ $as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_configure_args1=; export 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 1855 
 _ASBOX
+Line 1593 
 _ASBOX
      case $ac_val in #(
      *${as_nl}*)
        case $ac_var in #(
-       *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
+       *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
- $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
+ 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 1890 
 _ASBOX
+Line 1627 
 _ASBOX
      do
        eval ac_val=\$$ac_var
        case $ac_val in
-       *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
+       *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
        esac
-       $as_echo "$ac_var='\''$ac_val'\''"
+       echo "$ac_var='\''$ac_val'\''"
      done | sort
      echo
-Line 1907 
 _ASBOX
+Line 1644 
 _ASBOX
        do
          eval ac_val=\$$ac_var
          case $ac_val in
-         *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
+         *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
          esac
-         $as_echo "$ac_var='\''$ac_val'\''"
+         echo "$ac_var='\''$ac_val'\''"
        done | sort
        echo
      fi
-Line 1925 
 _ASBOX
+Line 1662 
 _ASBOX
        echo
      fi
      test "$ac_signal" != 0 &&
-       $as_echo "$as_me: caught signal $ac_signal"
+       echo "$as_me: caught signal $ac_signal"
-     $as_echo "$as_me: exit $exit_status"
+     echo "$as_me: exit $exit_status"
    } >&5
    rm -f core *.core core.conftest.* &&
      rm -f -r conftest* confdefs* conf$$* $ac_clean_files &&
      exit $exit_status
  ' 0
  for ac_signal in 1 2 13 15; do
-   trap 'ac_signal='$ac_signal'; as_fn_exit 1' $ac_signal
+   trap 'ac_signal='$ac_signal'; { (exit 1); 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"
+ #define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT"
  _ACEOF
  # Let the site file select an alternate cache file if it wants to.
- # Prefer an explicitly selected file to automatically selected ones.
+ # Prefer explicitly selected file to automatically selected ones.
- ac_site_file1=NONE
- ac_site_file2=NONE
  if test -n "$CONFIG_SITE"; then
-   ac_site_file1=$CONFIG_SITE
+   set x "$CONFIG_SITE"
  elif test "x$prefix" != xNONE; then
-   ac_site_file1=$prefix/share/config.site
+   set x "$prefix/share/config.site" "$prefix/etc/config.site"
-   ac_site_file2=$prefix/etc/config.site
  else
-   ac_site_file1=$ac_default_prefix/share/config.site
+   set x "$ac_default_prefix/share/config.site" \
-   ac_site_file2=$ac_default_prefix/etc/config.site
+         "$ac_default_prefix/etc/config.site"
  fi
- for ac_site_file in "$ac_site_file1" "$ac_site_file2"
+ shift
+ for ac_site_file
  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
+     { 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
+ echo "$as_me: loading site script $ac_site_file" >&6;}
- $as_echo "$as_me: loading site script $ac_site_file" >&6;}
      sed 's/^/| /' "$ac_site_file" >&5
      . "$ac_site_file"
    fi
  done
  if test -r "$cache_file"; then
-   # Some versions of bash will fail to source /dev/null (special files
+   # Some versions of bash will fail to source /dev/null (special
-   # actually), so we avoid doing that.  DJGPP emulates it as a regular file.
+   # files actually), so we avoid doing that.
-   if test /dev/null != "$cache_file" && test -f "$cache_file"; then
+   if test -f "$cache_file"; then
-     { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5
+     { echo "$as_me:$LINENO: loading cache $cache_file" >&5
- $as_echo "$as_me: loading cache $cache_file" >&6;}
+ echo "$as_me: loading cache $cache_file" >&6;}
      case $cache_file in
        [\\/]* | ?:[\\/]* ) . "$cache_file";;
        *)                      . "./$cache_file";;
      esac
    fi
  else
-   { $as_echo "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5
+   { echo "$as_me:$LINENO: creating cache $cache_file" >&5
- $as_echo "$as_me: creating cache $cache_file" >&6;}
+ echo "$as_me: creating cache $cache_file" >&6;}
    >$cache_file
  fi
-Line 2020 
 for ac_var in $ac_precious_vars; do
+Line 1752 
 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:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
+       { echo "$as_me:$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;}
+ 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:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5
+       { echo "$as_me:$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;}
+ echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
        ac_cache_corrupted=: ;;
      ,);;
      *)
        if test "x$ac_old_val" != "x$ac_new_val"; then
-         # differences in whitespace do not lead to failure.
+         { echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
-         ac_old_val_w=`echo x $ac_old_val`
+ echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
-         ac_new_val_w=`echo x $ac_new_val`
+         { echo "$as_me:$LINENO:   former value:  $ac_old_val" >&5
-         if test "$ac_old_val_w" != "$ac_new_val_w"; then
+ echo "$as_me:   former value:  $ac_old_val" >&2;}
-           { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5
+         { echo "$as_me:$LINENO:   current value: $ac_new_val" >&5
- $as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
+ echo "$as_me:   current value: $ac_new_val" >&2;}
-           ac_cache_corrupted=:
+         ac_cache_corrupted=:
-         else
-           { $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:${as_lineno-$LINENO}:   former value:  \`$ac_old_val'" >&5
- $as_echo "$as_me:   former value:  \`$ac_old_val'" >&2;}
-         { $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
    # Pass precious variables to config.status.
    if test "$ac_new_set" = set; then
      case $ac_new_val in
-     *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
+     *\'*) ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
      *) ac_arg=$ac_var=$ac_new_val ;;
      esac
      case " $ac_configure_args " in
        *" '$ac_arg' "*) ;; # Avoid dups.  Use of quotes ensures accuracy.
-       *) as_fn_append ac_configure_args " '$ac_arg'" ;;
+       *) ac_configure_args="$ac_configure_args '$ac_arg'" ;;
      esac
    fi
  done
  if $ac_cache_corrupted; then
-   { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+   { echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5
- $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+ echo "$as_me: error: changes in the environment can compromise the build" >&2;}
-   { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
+   { { echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
- $as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
+ echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
-   as_fn_error "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
+    { (exit 1); exit 1; }; }
  fi
- ## -------------------- ##
- ## Main body of script. ##
- ## -------------------- ##
  ac_ext=c
  ac_cpp='$CPP $CPPFLAGS'
-Line 2093 
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
+Line 1837 
 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:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ { echo "$as_me:$LINENO: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_CC+set}" = set; then :
+ if test "${ac_cv_prog_CC+set}" = set; then
-   $as_echo_n "(cached) " >&6
+   echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    if test -n "$CC"; then
    ac_cv_prog_CC="$CC" # Let the user override the test.
-Line 2106 
 for as_dir in $PATH
+Line 1850 
 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:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     echo "$as_me:$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:${as_lineno-$LINENO}: result: $CC" >&5
+   { echo "$as_me:$LINENO: result: $CC" >&5
- $as_echo "$CC" >&6; }
+ echo "${ECHO_T}$CC" >&6; }
  else
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+   { echo "$as_me:$LINENO: result: no" >&5
- $as_echo "no" >&6; }
+ echo "${ECHO_T}no" >&6; }
  fi
-Line 2133 
 if test -z "$ac_cv_prog_CC"; then
+Line 1877 
 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:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ { echo "$as_me:$LINENO: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&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
+   echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    if test -n "$ac_ct_CC"; then
    ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-Line 2146 
 for as_dir in $PATH
+Line 1890 
 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:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     echo "$as_me:$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:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
+   { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
- $as_echo "$ac_ct_CC" >&6; }
+ echo "${ECHO_T}$ac_ct_CC" >&6; }
  else
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+   { echo "$as_me:$LINENO: result: no" >&5
- $as_echo "no" >&6; }
+ echo "${ECHO_T}no" >&6; }
  fi
    if test "x$ac_ct_CC" = x; then
-Line 2172 
 fi
+Line 1916 
 fi
    else
      case $cross_compiling:$ac_tool_warned in
  yes:)
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+ { echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
- $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ whose name does not start with the host triplet.  If you think this
+ configuration is useful to you, please write to autoconf@gnu.org." >&5
+ echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
+ whose name does not start with the host triplet.  If you think this
+ configuration is useful to you, please write to autoconf@gnu.org." >&2;}
  ac_tool_warned=yes ;;
  esac
      CC=$ac_ct_CC
-Line 2186 
 if test -z "$CC"; then
+Line 1934 
 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:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ { echo "$as_me:$LINENO: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_CC+set}" = set; then :
+ if test "${ac_cv_prog_CC+set}" = set; then
-   $as_echo_n "(cached) " >&6
+   echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    if test -n "$CC"; then
    ac_cv_prog_CC="$CC" # Let the user override the test.
-Line 2199 
 for as_dir in $PATH
+Line 1947 
 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:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     echo "$as_me:$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:${as_lineno-$LINENO}: result: $CC" >&5
+   { echo "$as_me:$LINENO: result: $CC" >&5
- $as_echo "$CC" >&6; }
+ echo "${ECHO_T}$CC" >&6; }
  else
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+   { echo "$as_me:$LINENO: result: no" >&5
- $as_echo "no" >&6; }
+ echo "${ECHO_T}no" >&6; }
  fi
-Line 2226 
 fi
+Line 1974 
 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:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ { echo "$as_me:$LINENO: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_CC+set}" = set; then :
+ if test "${ac_cv_prog_CC+set}" = set; then
-   $as_echo_n "(cached) " >&6
+   echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    if test -n "$CC"; then
    ac_cv_prog_CC="$CC" # Let the user override the test.
-Line 2240 
 for as_dir in $PATH
+Line 1988 
 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:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     echo "$as_me:$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 2270 
 fi
+Line 2018 
 fi
  fi
  CC=$ac_cv_prog_CC
  if test -n "$CC"; then
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+   { echo "$as_me:$LINENO: result: $CC" >&5
- $as_echo "$CC" >&6; }
+ echo "${ECHO_T}$CC" >&6; }
  else
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+   { echo "$as_me:$LINENO: result: no" >&5
- $as_echo "no" >&6; }
+ echo "${ECHO_T}no" >&6; }
  fi
-Line 2285 
 if test -z "$CC"; then
+Line 2033 
 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:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ { echo "$as_me:$LINENO: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_CC+set}" = set; then :
+ if test "${ac_cv_prog_CC+set}" = set; then
-   $as_echo_n "(cached) " >&6
+   echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    if test -n "$CC"; then
    ac_cv_prog_CC="$CC" # Let the user override the test.
-Line 2298 
 for as_dir in $PATH
+Line 2046 
 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:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     echo "$as_me:$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:${as_lineno-$LINENO}: result: $CC" >&5
+   { echo "$as_me:$LINENO: result: $CC" >&5
- $as_echo "$CC" >&6; }
+ echo "${ECHO_T}$CC" >&6; }
  else
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+   { echo "$as_me:$LINENO: result: no" >&5
- $as_echo "no" >&6; }
+ echo "${ECHO_T}no" >&6; }
  fi
-Line 2329 
 if test -z "$CC"; then
+Line 2077 
 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:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ { echo "$as_me:$LINENO: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&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
+   echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    if test -n "$ac_ct_CC"; then
    ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-Line 2342 
 for as_dir in $PATH
+Line 2090 
 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:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     echo "$as_me:$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:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
+   { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
- $as_echo "$ac_ct_CC" >&6; }
+ echo "${ECHO_T}$ac_ct_CC" >&6; }
  else
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+   { echo "$as_me:$LINENO: result: no" >&5
- $as_echo "no" >&6; }
+ echo "${ECHO_T}no" >&6; }
  fi
-Line 2372 
 done
+Line 2120 
 done
    else
      case $cross_compiling:$ac_tool_warned in
  yes:)
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+ { echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
- $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ whose name does not start with the host triplet.  If you think this
+ configuration is useful to you, please write to autoconf@gnu.org." >&5
+ echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
+ whose name does not start with the host triplet.  If you think this
+ configuration is useful to you, please write to autoconf@gnu.org." >&2;}
  ac_tool_warned=yes ;;
  esac
      CC=$ac_ct_CC
-Line 2383 
 fi
+Line 2135 
 fi
  fi
- test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
- $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+ See \`config.log' for more details." >&5
- as_fn_error "no acceptable C compiler found in \$PATH
+ echo "$as_me: error: no acceptable C compiler found in \$PATH
- See \`config.log' for more details." "$LINENO" 5; }
+ See \`config.log' for more details." >&2;}
+    { (exit 1); exit 1; }; }
  # Provide some information about the compiler.
- $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
+ echo "$as_me:$LINENO: checking for C compiler version" >&5
- set X $ac_compile
+ ac_compiler=`set X $ac_compile; echo $2`
- ac_compiler=$2
+ { (ac_try="$ac_compiler --version >&5"
- for ac_option in --version -v -V -qversion; do
-   { { ac_try="$ac_compiler $ac_option >&5"
  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\""
+ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- $as_echo "$ac_try_echo"; } >&5
+   (eval "$ac_compiler --version >&5") 2>&5
-   (eval "$ac_compiler $ac_option >&5") 2>conftest.err
+   ac_status=$?
-   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   if test -s conftest.err; then
+   (exit $ac_status); }
-     sed '10a\
+ { (ac_try="$ac_compiler -v >&5"
- ... rest of stderr output deleted ...
+ case "(($ac_try" in
-q' conftest.err >conftest.er1
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-     cat conftest.er1 >&5
+   *) ac_try_echo=$ac_try;;
-   fi
+ esac
-   rm -f conftest.er1 conftest.err
+ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   (eval "$ac_compiler -v >&5") 2>&5
-   test $ac_status = 0; }
+   ac_status=$?
- done
+   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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compiler -V >&5") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  int
-Line 2425 
 main ()
+Line 2191 
 main ()
  }
  _ACEOF
  ac_clean_files_save=$ac_clean_files
- ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out"
+ ac_clean_files="$ac_clean_files a.out a.exe b.out"
  # 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:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
+ { echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
- $as_echo_n "checking whether the C compiler works... " >&6; }
+ echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6; }
- ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
+ ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
+ #
- # The possible output files:
+ # List of possible output files, starting from the most likely.
- ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*"
+ # The algorithm is not robust to junk in `.', hence go to wildcards (a.*)
+ # only as a last resort.  b.out is created by i960 compilers.
+ ac_files='a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out'
+ #
+ # The IRIX 6 linker writes into existing files which may not be
+ # executable, retaining their permissions.  Remove them first so a
+ # subsequent execution test works.
  ac_rmfiles=
  for ac_file in $ac_files
  do
    case $ac_file in
-     *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
+     *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;;
      * ) ac_rmfiles="$ac_rmfiles $ac_file";;
    esac
  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:${as_lineno-$LINENO}: $ac_try_echo\""
+ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- $as_echo "$ac_try_echo"; } >&5
    (eval "$ac_link_default") 2>&5
    ac_status=$?
-   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   test $ac_status = 0; }; then :
+   (exit $ac_status); }; 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 2466 
 for ac_file in $ac_files ''
+Line 2236 
 for ac_file in $ac_files ''
  do
    test -f "$ac_file" || continue
    case $ac_file in
-     *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj )
+     *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj )
          ;;
      [ab].out )
          # We found the default executable, but exeext='' is most
          # 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 2492 
 test "$ac_cv_exeext" = no && ac_cv_exeex
+Line 2262 
 test "$ac_cv_exeext" = no && ac_cv_exeex
  else
    ac_file=''
  fi
- if test -z "$ac_file"; then :
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ { echo "$as_me:$LINENO: result: $ac_file" >&5
- $as_echo "no" >&6; }
+ echo "${ECHO_T}$ac_file" >&6; }
- $as_echo "$as_me: failed program was:" >&5
+ if test -z "$ac_file"; then
+   echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ { { echo "$as_me:$LINENO: error: C compiler cannot create executables
- $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+ See \`config.log' for more details." >&5
- { as_fn_set_status 77
+ echo "$as_me: error: C compiler cannot create executables
- as_fn_error "C compiler cannot create executables
+ See \`config.log' for more details." >&2;}
- See \`config.log' for more details." "$LINENO" 5; }; }
+    { (exit 77); exit 77; }; }
- else
+ fi
-   { $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
- rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
+ # Check that the compiler produces executables we can run.  If not, either
+ # the compiler is broken, or we cross compile.
+ { echo "$as_me:$LINENO: checking whether the C compiler works" >&5
+ echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_try") 2>&5
+   ac_status=$?
+   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
+         { { 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
+ 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
+ { echo "$as_me:$LINENO: result: yes" >&5
+ echo "${ECHO_T}yes" >&6; }
+ rm -f a.out a.exe conftest$ac_cv_exeext b.out
  ac_clean_files=$ac_clean_files_save
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5
+ # Check that the compiler produces executables we can run.  If not, either
- $as_echo_n "checking for suffix of executables... " >&6; }
+ # the compiler is broken, or we cross compile.
- if { { ac_try="$ac_link"
+ { echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
+ echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6; }
+ { echo "$as_me:$LINENO: result: $cross_compiling" >&5
+ echo "${ECHO_T}$cross_compiling" >&6; }
+ { echo "$as_me:$LINENO: checking for suffix of executables" >&5
+ echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6; }
+ 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\""
+ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- $as_echo "$ac_try_echo"; } >&5
    (eval "$ac_link") 2>&5
    ac_status=$?
-   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   test $ac_status = 0; }; then :
+   (exit $ac_status); }; 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 2535 
 $as_echo "$ac_try_echo"; } >&5
+Line 2341 
 $as_echo "$ac_try_echo"; } >&5
  for ac_file in conftest.exe conftest conftest.*; do
    test -f "$ac_file" || continue
    case $ac_file in
-     *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
+     *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;;
      *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
            break;;
      * ) break;;
    esac
  done
  else
-   { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+   { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
- $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+ See \`config.log' for more details." >&5
- as_fn_error "cannot compute suffix of executables: cannot compile and link
+ echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
- See \`config.log' for more details." "$LINENO" 5; }
+ See \`config.log' for more details." >&2;}
- fi
+    { (exit 1); exit 1; }; }
- rm -f conftest conftest$ac_cv_exeext
+ fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
- $as_echo "$ac_cv_exeext" >&6; }
+ rm -f conftest$ac_cv_exeext
+ { echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
+ echo "${ECHO_T}$ac_cv_exeext" >&6; }
  rm -f conftest.$ac_ext
  EXEEXT=$ac_cv_exeext
  ac_exeext=$EXEEXT
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ { echo "$as_me:$LINENO: checking for suffix of object files" >&5
- /* end confdefs.h.  */
+ echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6; }
- #include <stdio.h>
+ if test "${ac_cv_objext+set}" = set; then
- int
+   echo $ECHO_N "(cached) $ECHO_C" >&6
- 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 :
-   $as_echo_n "(cached) " >&6
  else
-   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  int
-Line 2630 
 main ()
+Line 2383 
 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:${as_lineno-$LINENO}: $ac_try_echo\""
+ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- $as_echo "$ac_try_echo"; } >&5
    (eval "$ac_compile") 2>&5
    ac_status=$?
-   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   test $ac_status = 0; }; then :
+   (exit $ac_status); }; then
    for ac_file in conftest.o conftest.obj conftest.*; do
    test -f "$ac_file" || continue;
    case $ac_file in
-     *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM ) ;;
+     *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf ) ;;
      *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
         break;;
    esac
  done
  else
-   $as_echo "$as_me: failed program was:" >&5
+   echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ { { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile
- $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+ See \`config.log' for more details." >&5
- as_fn_error "cannot compute suffix of object files: cannot compile
+ echo "$as_me: error: cannot compute suffix of object files: cannot compile
- See \`config.log' for more details." "$LINENO" 5; }
+ 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:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5
+ { echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
- $as_echo "$ac_cv_objext" >&6; }
+ echo "${ECHO_T}$ac_cv_objext" >&6; }
  OBJEXT=$ac_cv_objext
  ac_objext=$OBJEXT
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
+ { echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
- $as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
+ echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&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
+   echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  int
-Line 2683 
 main ()
+Line 2441 
 main ()
    return 0;
  }
  _ACEOF
- if ac_fn_c_try_compile "$LINENO"; then :
+ 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 "echo \"\$as_me:$LINENO: $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
+   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
-   ac_compiler_gnu=no
+   echo "$as_me: failed program was:" >&5
+ 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:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5
+ { echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
- $as_echo "$ac_cv_c_compiler_gnu" >&6; }
+ echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6; }
- if test $ac_compiler_gnu = yes; then
+ GCC=`test $ac_compiler_gnu = yes && echo yes`
-   GCC=yes
- else
-   GCC=
- fi
  ac_test_CFLAGS=${CFLAGS+set}
  ac_save_CFLAGS=$CFLAGS
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
+ { echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
- $as_echo_n "checking whether $CC accepts -g... " >&6; }
+ echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&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
+   echo $ECHO_N "(cached) $ECHO_C" >&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 confdefs.h - <<_ACEOF >conftest.$ac_ext
+    cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  int
-Line 2721 
 main ()
+Line 2499 
 main ()
    return 0;
  }
  _ACEOF
- if ac_fn_c_try_compile "$LINENO"; then :
+ 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 "echo \"\$as_me:$LINENO: $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
+   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
-   CFLAGS=""
+   echo "$as_me: failed program was:" >&5
-       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ sed 's/^/| /' conftest.$ac_ext >&5
+         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 2736 
 main ()
+Line 2537 
 main ()
    return 0;
  }
  _ACEOF
- if ac_fn_c_try_compile "$LINENO"; then :
+ 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 "echo \"\$as_me:$LINENO: $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
+   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
-   ac_c_werror_flag=$ac_save_c_werror_flag
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+         ac_c_werror_flag=$ac_save_c_werror_flag
           CFLAGS="-g"
-          cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+          cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  int
-Line 2752 
 main ()
+Line 2576 
 main ()
    return 0;
  }
  _ACEOF
- if ac_fn_c_try_compile "$LINENO"; then :
+ 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 "echo \"\$as_me:$LINENO: $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
+   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
+   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:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5
+ { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
- $as_echo "$ac_cv_prog_cc_g" >&6; }
+ echo "${ECHO_T}$ac_cv_prog_cc_g" >&6; }
  if test "$ac_test_CFLAGS" = set; then
    CFLAGS=$ac_save_CFLAGS
  elif test $ac_cv_prog_cc_g = yes; then
-Line 2779 
 else
+Line 2627 
 else
      CFLAGS=
    fi
  fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
+ { echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
- $as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
+ echo $ECHO_N "checking for $CC option to accept ISO C89... $ECHO_C" >&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
+   echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    ac_cv_prog_cc_c89=no
  ac_save_CC=$CC
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  #include <stdarg.h>
  #include <stdio.h>
-Line 2843 
 for ac_arg in '' -qlanglvl=extc89 -qlang
+Line 2695 
 for ac_arg in '' -qlanglvl=extc89 -qlang
          -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
  do
    CC="$ac_save_CC $ac_arg"
-   if ac_fn_c_try_compile "$LINENO"; then :
+   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 "echo \"\$as_me:$LINENO: $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
+   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
+   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 2856 
 fi
+Line 2730 
 fi
  # AC_CACHE_VAL
  case "x$ac_cv_prog_cc_c89" in
    x)
-     { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
+     { echo "$as_me:$LINENO: result: none needed" >&5
- $as_echo "none needed" >&6; } ;;
+ echo "${ECHO_T}none needed" >&6; } ;;
    xno)
-     { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
+     { echo "$as_me:$LINENO: result: unsupported" >&5
- $as_echo "unsupported" >&6; } ;;
+ echo "${ECHO_T}unsupported" >&6; } ;;
    *)
      CC="$CC $ac_cv_prog_cc_c89"
-     { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
+     { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
- $as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
+ echo "${ECHO_T}$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 2878 
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
+Line 2750 
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
  ac_aux_dir=
  for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
-   for ac_t in install-sh install.sh shtool; do
+   if test -f "$ac_dir/install-sh"; then
-     if test -f "$ac_dir/$ac_t"; then
+     ac_aux_dir=$ac_dir
-       ac_aux_dir=$ac_dir
+     ac_install_sh="$ac_aux_dir/install-sh -c"
-       ac_install_sh="$ac_aux_dir/$ac_t -c"
+     break
-       break 2
+   elif test -f "$ac_dir/install.sh"; then
-     fi
+     ac_aux_dir=$ac_dir
-   done
+     ac_install_sh="$ac_aux_dir/install.sh -c"
+     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_fn_error "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5
+   { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&5
+ 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 2912 
 ac_configure="$SHELL $ac_aux_dir/configu
+Line 2792 
 ac_configure="$SHELL $ac_aux_dir/configu
  # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
  # 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.
+ { 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
+ echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6; }
- $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
+   echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  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 2946 
 case $as_dir/ in #((
+Line 2825 
 case $as_dir/ in #((
              # program-specific install script used by HP pwplus--don't use.
              :
            else
-             rm -rf conftest.one conftest.two conftest.dir
+             ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
-             echo one > conftest.one
+             break 3
-             echo two > conftest.two
-             mkdir conftest.dir
-             if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" &&
-               test -s conftest.one && test -s conftest.two &&
-               test -s conftest.dir/conftest.one &&
-               test -s conftest.dir/conftest.two
-             then
-               ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
-               break 3
-             fi
            fi
          fi
        done
      done
      ;;
  esac
+ done
-   done
  IFS=$as_save_IFS
- rm -rf conftest.one conftest.two conftest.dir
  fi
    if test "${ac_cv_path_install+set}" = set; then
-Line 2981 
 fi
+Line 2848 
 fi
      INSTALL=$ac_install_sh
    fi
  fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5
+ { echo "$as_me:$LINENO: result: $INSTALL" >&5
- $as_echo "$INSTALL" >&6; }
+ echo "${ECHO_T}$INSTALL" >&6; }
  # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
  # It thinks the first close brace ends the variable substitution.
-Line 2992 
 test -z "$INSTALL_SCRIPT" && INSTALL_SCR
+Line 2859 
 test -z "$INSTALL_SCRIPT" && INSTALL_SCR
  test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5
+ { echo "$as_me:$LINENO: checking whether ln -s works" >&5
- $as_echo_n "checking whether ln -s works... " >&6; }
+ echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6; }
  LN_S=$as_ln_s
  if test "$LN_S" = "ln -s"; then
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+   { echo "$as_me:$LINENO: result: yes" >&5
- $as_echo "yes" >&6; }
+ echo "${ECHO_T}yes" >&6; }
  else
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, using $LN_S" >&5
+   { echo "$as_me:$LINENO: result: no, using $LN_S" >&5
- $as_echo "no, using $LN_S" >&6; }
+ echo "${ECHO_T}no, using $LN_S" >&6; }
  fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5
+ { echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
- $as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
+ echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6; }
- set x ${MAKE-make}
+ set x ${MAKE-make}; ac_make=`echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
- 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 :
+   echo $ECHO_N "(cached) $ECHO_C" >&6
-   $as_echo_n "(cached) " >&6
  else
    cat >conftest.make <<\_ACEOF
  SHELL = /bin/sh
-Line 3025 
 esac
+Line 2891 
 esac
  rm -f conftest.make
  fi
  if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+   { echo "$as_me:$LINENO: result: yes" >&5
- $as_echo "yes" >&6; }
+ echo "${ECHO_T}yes" >&6; }
    SET_MAKE=
  else
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+   { echo "$as_me:$LINENO: result: no" >&5
- $as_echo "no" >&6; }
+ echo "${ECHO_T}no" >&6; }
    SET_MAKE="MAKE=${MAKE-make}"
  fi
-Line 3063 
 if test "x$ac_cv_env_PKG_CONFIG_set" !=
+Line 2929 
 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:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ { echo "$as_me:$LINENO: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&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
+   echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    case $PKG_CONFIG in
    [\\/]* | ?:[\\/]*)
-Line 3078 
 for as_dir in $PATH
+Line 2944 
 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:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
    fi
  done
-   done
+ done
  IFS=$as_save_IFS
    ;;
-Line 3093 
 esac
+Line 2959 
 esac
  fi
  PKG_CONFIG=$ac_cv_path_PKG_CONFIG
  if test -n "$PKG_CONFIG"; then
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
+   { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
- $as_echo "$PKG_CONFIG" >&6; }
+ echo "${ECHO_T}$PKG_CONFIG" >&6; }
  else
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+   { echo "$as_me:$LINENO: result: no" >&5
- $as_echo "no" >&6; }
+ echo "${ECHO_T}no" >&6; }
  fi
-Line 3106 
 if test -z "$ac_cv_path_PKG_CONFIG"; the
+Line 2972 
 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:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ { echo "$as_me:$LINENO: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&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
+   echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    case $ac_pt_PKG_CONFIG in
    [\\/]* | ?:[\\/]*)
-Line 3121 
 for as_dir in $PATH
+Line 2987 
 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:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
    fi
  done
-   done
+ done
  IFS=$as_save_IFS
    ;;
-Line 3136 
 esac
+Line 3002 
 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:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5
+   { echo "$as_me:$LINENO: result: $ac_pt_PKG_CONFIG" >&5
- $as_echo "$ac_pt_PKG_CONFIG" >&6; }
+ echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6; }
  else
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+   { echo "$as_me:$LINENO: result: no" >&5
- $as_echo "no" >&6; }
+ echo "${ECHO_T}no" >&6; }
  fi
    if test "x$ac_pt_PKG_CONFIG" = x; then
-Line 3148 
 fi
+Line 3014 
 fi
    else
      case $cross_compiling:$ac_tool_warned in
  yes:)
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+ { echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
- $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ whose name does not start with the host triplet.  If you think this
+ configuration is useful to you, please write to autoconf@gnu.org." >&5
+ echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
+ whose name does not start with the host triplet.  If you think this
+ configuration is useful to you, please write to autoconf@gnu.org." >&2;}
  ac_tool_warned=yes ;;
  esac
      PKG_CONFIG=$ac_pt_PKG_CONFIG
-Line 3161 
 fi
+Line 3031 
 fi
  fi
  if test -n "$PKG_CONFIG"; then
          _pkg_min_version=0.9.0
-         { $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5
+         { echo "$as_me:$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; }
+ echo $ECHO_N "checking pkg-config is at least version $_pkg_min_version... $ECHO_C" >&6; }
          if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
-                 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+                 { echo "$as_me:$LINENO: result: yes" >&5
- $as_echo "yes" >&6; }
+ echo "${ECHO_T}yes" >&6; }
          else
-                 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+                 { echo "$as_me:$LINENO: result: no" >&5
- $as_echo "no" >&6; }
+ echo "${ECHO_T}no" >&6; }
                  PKG_CONFIG=""
          fi
  fi
  pkg_failed=no
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gnome_vfs_module" >&5
+ { echo "$as_me:$LINENO: checking for gnome_vfs_module" >&5
- $as_echo_n "checking for gnome_vfs_module... " >&6; }
+ echo $ECHO_N "checking for gnome_vfs_module... $ECHO_C" >&6; }
  if test -n "$PKG_CONFIG"; then
      if test -n "$gnome_vfs_module_CFLAGS"; then
          pkg_cv_gnome_vfs_module_CFLAGS="$gnome_vfs_module_CFLAGS"
      else
          if test -n "$PKG_CONFIG" && \
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gnome-vfs-module-2.0\""; } >&5
+     { (echo "$as_me:$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:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   test $ac_status = 0; }; then
+   (exit $ac_status); }; then
    pkg_cv_gnome_vfs_module_CFLAGS=`$PKG_CONFIG --cflags "gnome-vfs-module-2.0" 2>/dev/null`
  else
    pkg_failed=yes
-Line 3201 
 if test -n "$PKG_CONFIG"; then
+Line 3071 
 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:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gnome-vfs-module-2.0\""; } >&5
+     { (echo "$as_me:$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:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   test $ac_status = 0; }; then
+   (exit $ac_status); }; then
    pkg_cv_gnome_vfs_module_LIBS=`$PKG_CONFIG --libs "gnome-vfs-module-2.0" 2>/dev/null`
  else
    pkg_failed=yes
-Line 3232 
 fi
+Line 3102 
 fi
          # Put the nasty error message in config.log where it belongs
          echo "$gnome_vfs_module_PKG_ERRORS" >&5
-         { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+         { echo "$as_me:$LINENO: result: no" >&5
- $as_echo "no" >&6; }
+ echo "${ECHO_T}no" >&6; }
-                 as_fn_error "gnome-vfs-module-2.0 missing" "$LINENO" 5
+                 { { echo "$as_me:$LINENO: error: gnome-vfs-module-2.0 missing" >&5
+ echo "$as_me: error: gnome-vfs-module-2.0 missing" >&2;}
+    { (exit 1); exit 1; }; }
  elif test $pkg_failed = untried; then
-         as_fn_error "gnome-vfs-module-2.0 missing" "$LINENO" 5
+         { { echo "$as_me:$LINENO: error: gnome-vfs-module-2.0 missing" >&5
+ 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:${as_lineno-$LINENO}: result: yes" >&5
+         { echo "$as_me:$LINENO: result: yes" >&5
- $as_echo "yes" >&6; }
+ echo "${ECHO_T}yes" >&6; }
          :
  fi
  CFLAGS="$CFLAGS $gnome_vfs_module_CFLAGS"
-Line 3250 
 LIBS="$LIBS $gnome_vfs_module_LIBS"
+Line 3124 
 LIBS="$LIBS $gnome_vfs_module_LIBS"
  # check for libxml-2.0
  pkg_failed=no
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libxml2" >&5
+ { echo "$as_me:$LINENO: checking for libxml2" >&5
- $as_echo_n "checking for libxml2... " >&6; }
+ echo $ECHO_N "checking for libxml2... $ECHO_C" >&6; }
  if test -n "$PKG_CONFIG"; then
      if test -n "$libxml2_CFLAGS"; then
          pkg_cv_libxml2_CFLAGS="$libxml2_CFLAGS"
      else
          if test -n "$PKG_CONFIG" && \
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libxml-2.0\""; } >&5
+     { (echo "$as_me:$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:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   test $ac_status = 0; }; then
+   (exit $ac_status); }; then
    pkg_cv_libxml2_CFLAGS=`$PKG_CONFIG --cflags "libxml-2.0" 2>/dev/null`
  else
    pkg_failed=yes
-Line 3276 
 if test -n "$PKG_CONFIG"; then
+Line 3150 
 if test -n "$PKG_CONFIG"; then
          pkg_cv_libxml2_LIBS="$libxml2_LIBS"
      else
          if test -n "$PKG_CONFIG" && \
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libxml-2.0\""; } >&5
+     { (echo "$as_me:$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:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   test $ac_status = 0; }; then
+   (exit $ac_status); }; then
    pkg_cv_libxml2_LIBS=`$PKG_CONFIG --libs "libxml-2.0" 2>/dev/null`
  else
    pkg_failed=yes
-Line 3307 
 fi
+Line 3181 
 fi
          # Put the nasty error message in config.log where it belongs
          echo "$libxml2_PKG_ERRORS" >&5
-         { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+         { echo "$as_me:$LINENO: result: no" >&5
- $as_echo "no" >&6; }
+ echo "${ECHO_T}no" >&6; }
-                 as_fn_error "libxml-2.0 missing" "$LINENO" 5
+                 { { echo "$as_me:$LINENO: error: libxml-2.0 missing" >&5
+ echo "$as_me: error: libxml-2.0 missing" >&2;}
+    { (exit 1); exit 1; }; }
  elif test $pkg_failed = untried; then
-         as_fn_error "libxml-2.0 missing" "$LINENO" 5
+         { { echo "$as_me:$LINENO: error: libxml-2.0 missing" >&5
+ 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:${as_lineno-$LINENO}: result: yes" >&5
+         { echo "$as_me:$LINENO: result: yes" >&5
- $as_echo "yes" >&6; }
+ echo "${ECHO_T}yes" >&6; }
          :
  fi
  CFLAGS="$CFLAGS $libxml2_CFLAGS"
-Line 3325 
 LIBS="$LIBS $libxml2_LIBS"
+Line 3203 
 LIBS="$LIBS $libxml2_LIBS"
  # check for libcurl
  pkg_failed=no
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libcurl" >&5
+ { echo "$as_me:$LINENO: checking for libcurl" >&5
- $as_echo_n "checking for libcurl... " >&6; }
+ echo $ECHO_N "checking for libcurl... $ECHO_C" >&6; }
  if test -n "$PKG_CONFIG"; then
      if test -n "$libcurl_CFLAGS"; then
          pkg_cv_libcurl_CFLAGS="$libcurl_CFLAGS"
      else
          if test -n "$PKG_CONFIG" && \
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libcurl\""; } >&5
+     { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libcurl\"") >&5
    ($PKG_CONFIG --exists --print-errors "libcurl") 2>&5
    ac_status=$?
-   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   test $ac_status = 0; }; then
+   (exit $ac_status); }; then
    pkg_cv_libcurl_CFLAGS=`$PKG_CONFIG --cflags "libcurl" 2>/dev/null`
  else
    pkg_failed=yes
-Line 3351 
 if test -n "$PKG_CONFIG"; then
+Line 3229 
 if test -n "$PKG_CONFIG"; then
          pkg_cv_libcurl_LIBS="$libcurl_LIBS"
      else
          if test -n "$PKG_CONFIG" && \
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libcurl\""; } >&5
+     { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libcurl\"") >&5
    ($PKG_CONFIG --exists --print-errors "libcurl") 2>&5
    ac_status=$?
-   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   test $ac_status = 0; }; then
+   (exit $ac_status); }; then
    pkg_cv_libcurl_LIBS=`$PKG_CONFIG --libs "libcurl" 2>/dev/null`
  else
    pkg_failed=yes
-Line 3382 
 fi
+Line 3260 
 fi
          # Put the nasty error message in config.log where it belongs
          echo "$libcurl_PKG_ERRORS" >&5
-         { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+         { echo "$as_me:$LINENO: result: no" >&5
- $as_echo "no" >&6; }
+ echo "${ECHO_T}no" >&6; }
-                 as_fn_error "libcurl missing" "$LINENO" 5
+                 { { echo "$as_me:$LINENO: error: libcurl missing" >&5
+ echo "$as_me: error: libcurl missing" >&2;}
+    { (exit 1); exit 1; }; }
  elif test $pkg_failed = untried; then
-         as_fn_error "libcurl missing" "$LINENO" 5
+         { { echo "$as_me:$LINENO: error: libcurl missing" >&5
+ 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:${as_lineno-$LINENO}: result: yes" >&5
+         { echo "$as_me:$LINENO: result: yes" >&5
- $as_echo "yes" >&6; }
+ echo "${ECHO_T}yes" >&6; }
          :
  fi
  CFLAGS="$CFLAGS $libcurl_CFLAGS"
-Line 3400 
 LIBS="$LIBS $libcurl_LIBS"
+Line 3282 
 LIBS="$LIBS $libcurl_LIBS"
  # check for libsoup
  pkg_failed=no
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libsoup24" >&5
+ { echo "$as_me:$LINENO: checking for libsoup24" >&5
- $as_echo_n "checking for libsoup24... " >&6; }
+ echo $ECHO_N "checking for libsoup24... $ECHO_C" >&6; }
  if test -n "$PKG_CONFIG"; then
      if test -n "$libsoup24_CFLAGS"; then
          pkg_cv_libsoup24_CFLAGS="$libsoup24_CFLAGS"
      else
          if test -n "$PKG_CONFIG" && \
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsoup-2.4\""; } >&5
+     { (echo "$as_me:$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:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   test $ac_status = 0; }; then
+   (exit $ac_status); }; then
    pkg_cv_libsoup24_CFLAGS=`$PKG_CONFIG --cflags "libsoup-2.4" 2>/dev/null`
  else
    pkg_failed=yes
-Line 3426 
 if test -n "$PKG_CONFIG"; then
+Line 3308 
 if test -n "$PKG_CONFIG"; then
          pkg_cv_libsoup24_LIBS="$libsoup24_LIBS"
      else
          if test -n "$PKG_CONFIG" && \
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsoup-2.4\""; } >&5
+     { (echo "$as_me:$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:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   test $ac_status = 0; }; then
+   (exit $ac_status); }; then
    pkg_cv_libsoup24_LIBS=`$PKG_CONFIG --libs "libsoup-2.4" 2>/dev/null`
  else
    pkg_failed=yes
-Line 3457 
 fi
+Line 3339 
 fi
          # Put the nasty error message in config.log where it belongs
          echo "$libsoup24_PKG_ERRORS" >&5
-         { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+         { echo "$as_me:$LINENO: result: no" >&5
- $as_echo "no" >&6; }
+ echo "${ECHO_T}no" >&6; }
  pkg_failed=no
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libsoup22" >&5
+ { echo "$as_me:$LINENO: checking for libsoup22" >&5
- $as_echo_n "checking for libsoup22... " >&6; }
+ echo $ECHO_N "checking for libsoup22... $ECHO_C" >&6; }
  if test -n "$PKG_CONFIG"; then
      if test -n "$libsoup22_CFLAGS"; then
          pkg_cv_libsoup22_CFLAGS="$libsoup22_CFLAGS"
      else
          if test -n "$PKG_CONFIG" && \
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsoup-2.2\""; } >&5
+     { (echo "$as_me:$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:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   test $ac_status = 0; }; then
+   (exit $ac_status); }; then
    pkg_cv_libsoup22_CFLAGS=`$PKG_CONFIG --cflags "libsoup-2.2" 2>/dev/null`
  else
    pkg_failed=yes
-Line 3488 
 if test -n "$PKG_CONFIG"; then
+Line 3370 
 if test -n "$PKG_CONFIG"; then
          pkg_cv_libsoup22_LIBS="$libsoup22_LIBS"
      else
          if test -n "$PKG_CONFIG" && \
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsoup-2.2\""; } >&5
+     { (echo "$as_me:$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:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   test $ac_status = 0; }; then
+   (exit $ac_status); }; then
    pkg_cv_libsoup22_LIBS=`$PKG_CONFIG --libs "libsoup-2.2" 2>/dev/null`
  else
    pkg_failed=yes
-Line 3519 
 fi
+Line 3401 
 fi
          # Put the nasty error message in config.log where it belongs
          echo "$libsoup22_PKG_ERRORS" >&5
-         { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+         { echo "$as_me:$LINENO: result: no" >&5
- $as_echo "no" >&6; }
+ echo "${ECHO_T}no" >&6; }
-     { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: libsoup-2.4/2.2 missing, disabling internal map" >&5
+     { echo "$as_me:$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;}
+ echo "$as_me: WARNING: libsoup-2.4/2.2 missing, disabling internal map" >&6;}
  elif test $pkg_failed = untried; then
-     { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: libsoup-2.4/2.2 missing, disabling internal map" >&5
+     { echo "$as_me:$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;}
+ 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:${as_lineno-$LINENO}: result: yes" >&5
+         { echo "$as_me:$LINENO: result: yes" >&5
- $as_echo "yes" >&6; }
+ echo "${ECHO_T}yes" >&6; }
      EXTRA_OBJS="$EXTRA_OBJS converter.o osm-gps-map.o map-tool.o osm-gps-map-osd-classic.o"
      CFLAGS="$CFLAGS $libsoup22_CFLAGS -DLIBSOUP22 -DENABLE_OSM_GPS_MAP"
-Line 3546 
 elif test $pkg_failed = untried; then
+Line 3428 
 elif test $pkg_failed = untried; then
  pkg_failed=no
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libsoup22" >&5
+ { echo "$as_me:$LINENO: checking for libsoup22" >&5
- $as_echo_n "checking for libsoup22... " >&6; }
+ echo $ECHO_N "checking for libsoup22... $ECHO_C" >&6; }
  if test -n "$PKG_CONFIG"; then
      if test -n "$libsoup22_CFLAGS"; then
          pkg_cv_libsoup22_CFLAGS="$libsoup22_CFLAGS"
      else
          if test -n "$PKG_CONFIG" && \
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsoup-2.2\""; } >&5
+     { (echo "$as_me:$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:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   test $ac_status = 0; }; then
+   (exit $ac_status); }; then
    pkg_cv_libsoup22_CFLAGS=`$PKG_CONFIG --cflags "libsoup-2.2" 2>/dev/null`
  else
    pkg_failed=yes
-Line 3572 
 if test -n "$PKG_CONFIG"; then
+Line 3454 
 if test -n "$PKG_CONFIG"; then
          pkg_cv_libsoup22_LIBS="$libsoup22_LIBS"
      else
          if test -n "$PKG_CONFIG" && \
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsoup-2.2\""; } >&5
+     { (echo "$as_me:$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:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   test $ac_status = 0; }; then
+   (exit $ac_status); }; then
    pkg_cv_libsoup22_LIBS=`$PKG_CONFIG --libs "libsoup-2.2" 2>/dev/null`
  else
    pkg_failed=yes
-Line 3603 
 fi
+Line 3485 
 fi
          # Put the nasty error message in config.log where it belongs
          echo "$libsoup22_PKG_ERRORS" >&5
-         { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+         { echo "$as_me:$LINENO: result: no" >&5
- $as_echo "no" >&6; }
+ echo "${ECHO_T}no" >&6; }
-     { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: libsoup-2.4/2.2 missing, disabling internal map" >&5
+     { echo "$as_me:$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;}
+ echo "$as_me: WARNING: libsoup-2.4/2.2 missing, disabling internal map" >&6;}
  elif test $pkg_failed = untried; then
-     { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: libsoup-2.4/2.2 missing, disabling internal map" >&5
+     { echo "$as_me:$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;}
+ 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:${as_lineno-$LINENO}: result: yes" >&5
+         { echo "$as_me:$LINENO: result: yes" >&5
- $as_echo "yes" >&6; }
+ echo "${ECHO_T}yes" >&6; }
      EXTRA_OBJS="$EXTRA_OBJS converter.o osm-gps-map.o map-tool.o osm-gps-map-osd-classic.o"
      CFLAGS="$CFLAGS $libsoup22_CFLAGS -DLIBSOUP22 -DENABLE_OSM_GPS_MAP"
-Line 3629 
 fi
+Line 3511 
 fi
  else
          libsoup24_CFLAGS=$pkg_cv_libsoup24_CFLAGS
          libsoup24_LIBS=$pkg_cv_libsoup24_LIBS
-         { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+         { echo "$as_me:$LINENO: result: yes" >&5
- $as_echo "yes" >&6; }
+ echo "${ECHO_T}yes" >&6; }
    EXTRA_OBJS="$EXTRA_OBJS converter.o osm-gps-map.o map-tool.o osm-gps-map-osd-classic.o"
    CFLAGS="$CFLAGS $libsoup24_CFLAGS -DENABLE_OSM_GPS_MAP"
-Line 3641 
 fi
+Line 3523 
 fi
  # check for gtkhtml-3.14
  pkg_failed=no
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libgtkhtml3_14" >&5
+ { echo "$as_me:$LINENO: checking for libgtkhtml3_14" >&5
- $as_echo_n "checking for libgtkhtml3_14... " >&6; }
+ echo $ECHO_N "checking for libgtkhtml3_14... $ECHO_C" >&6; }
  if test -n "$PKG_CONFIG"; then
      if test -n "$libgtkhtml3_14_CFLAGS"; then
          pkg_cv_libgtkhtml3_14_CFLAGS="$libgtkhtml3_14_CFLAGS"
      else
          if test -n "$PKG_CONFIG" && \
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libgtkhtml-3.14\""; } >&5
+     { (echo "$as_me:$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:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   test $ac_status = 0; }; then
+   (exit $ac_status); }; then
    pkg_cv_libgtkhtml3_14_CFLAGS=`$PKG_CONFIG --cflags "libgtkhtml-3.14" 2>/dev/null`
  else
    pkg_failed=yes
-Line 3667 
 if test -n "$PKG_CONFIG"; then
+Line 3549 
 if test -n "$PKG_CONFIG"; then
          pkg_cv_libgtkhtml3_14_LIBS="$libgtkhtml3_14_LIBS"
      else
          if test -n "$PKG_CONFIG" && \
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libgtkhtml-3.14\""; } >&5
+     { (echo "$as_me:$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:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   test $ac_status = 0; }; then
+   (exit $ac_status); }; then
    pkg_cv_libgtkhtml3_14_LIBS=`$PKG_CONFIG --libs "libgtkhtml-3.14" 2>/dev/null`
  else
    pkg_failed=yes
-Line 3698 
 fi
+Line 3580 
 fi
          # Put the nasty error message in config.log where it belongs
          echo "$libgtkhtml3_14_PKG_ERRORS" >&5
-         { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+         { echo "$as_me:$LINENO: result: no" >&5
- $as_echo "no" >&6; }
+ echo "${ECHO_T}no" >&6; }
    # ok, we can also live with 3.8
  pkg_failed=no
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libgtkhtml3_8" >&5
+ { echo "$as_me:$LINENO: checking for libgtkhtml3_8" >&5
- $as_echo_n "checking for libgtkhtml3_8... " >&6; }
+ echo $ECHO_N "checking for libgtkhtml3_8... $ECHO_C" >&6; }
  if test -n "$PKG_CONFIG"; then
      if test -n "$libgtkhtml3_8_CFLAGS"; then
          pkg_cv_libgtkhtml3_8_CFLAGS="$libgtkhtml3_8_CFLAGS"
      else
          if test -n "$PKG_CONFIG" && \
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libgtkhtml-3.8\""; } >&5
+     { (echo "$as_me:$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:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   test $ac_status = 0; }; then
+   (exit $ac_status); }; then
    pkg_cv_libgtkhtml3_8_CFLAGS=`$PKG_CONFIG --cflags "libgtkhtml-3.8" 2>/dev/null`
  else
    pkg_failed=yes
-Line 3730 
 if test -n "$PKG_CONFIG"; then
+Line 3612 
 if test -n "$PKG_CONFIG"; then
          pkg_cv_libgtkhtml3_8_LIBS="$libgtkhtml3_8_LIBS"
      else
          if test -n "$PKG_CONFIG" && \
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libgtkhtml-3.8\""; } >&5
+     { (echo "$as_me:$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:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   test $ac_status = 0; }; then
+   (exit $ac_status); }; then
    pkg_cv_libgtkhtml3_8_LIBS=`$PKG_CONFIG --libs "libgtkhtml-3.8" 2>/dev/null`
  else
    pkg_failed=yes
-Line 3761 
 fi
+Line 3643 
 fi
          # Put the nasty error message in config.log where it belongs
          echo "$libgtkhtml3_8_PKG_ERRORS" >&5
-         { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+         { echo "$as_me:$LINENO: result: no" >&5
- $as_echo "no" >&6; }
+ echo "${ECHO_T}no" >&6; }
-                 as_fn_error "libgtkhtml-3 missing" "$LINENO" 5
+                 { { echo "$as_me:$LINENO: error: libgtkhtml-3 missing" >&5
+ echo "$as_me: error: libgtkhtml-3 missing" >&2;}
+    { (exit 1); exit 1; }; }
  elif test $pkg_failed = untried; then
-         as_fn_error "libgtkhtml-3 missing" "$LINENO" 5
+         { { echo "$as_me:$LINENO: error: libgtkhtml-3 missing" >&5
+ 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:${as_lineno-$LINENO}: result: yes" >&5
+         { echo "$as_me:$LINENO: result: yes" >&5
- $as_echo "yes" >&6; }
+ echo "${ECHO_T}yes" >&6; }
      CFLAGS="$CFLAGS $libgtkhtml3_8_CFLAGS"
      LIBS="$LIBS $libgtkhtml3_8_LIBS"
-Line 3782 
 elif test $pkg_failed = untried; then
+Line 3668 
 elif test $pkg_failed = untried; then
    # ok, we can also live with 3.8
  pkg_failed=no
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libgtkhtml3_8" >&5
+ { echo "$as_me:$LINENO: checking for libgtkhtml3_8" >&5
- $as_echo_n "checking for libgtkhtml3_8... " >&6; }
+ echo $ECHO_N "checking for libgtkhtml3_8... $ECHO_C" >&6; }
  if test -n "$PKG_CONFIG"; then
      if test -n "$libgtkhtml3_8_CFLAGS"; then
          pkg_cv_libgtkhtml3_8_CFLAGS="$libgtkhtml3_8_CFLAGS"
      else
          if test -n "$PKG_CONFIG" && \
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libgtkhtml-3.8\""; } >&5
+     { (echo "$as_me:$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:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   test $ac_status = 0; }; then
+   (exit $ac_status); }; then
    pkg_cv_libgtkhtml3_8_CFLAGS=`$PKG_CONFIG --cflags "libgtkhtml-3.8" 2>/dev/null`
  else
    pkg_failed=yes
-Line 3808 
 if test -n "$PKG_CONFIG"; then
+Line 3694 
 if test -n "$PKG_CONFIG"; then
          pkg_cv_libgtkhtml3_8_LIBS="$libgtkhtml3_8_LIBS"
      else
          if test -n "$PKG_CONFIG" && \
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libgtkhtml-3.8\""; } >&5
+     { (echo "$as_me:$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:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   test $ac_status = 0; }; then
+   (exit $ac_status); }; then
    pkg_cv_libgtkhtml3_8_LIBS=`$PKG_CONFIG --libs "libgtkhtml-3.8" 2>/dev/null`
  else
    pkg_failed=yes
-Line 3839 
 fi
+Line 3725 
 fi
          # Put the nasty error message in config.log where it belongs
          echo "$libgtkhtml3_8_PKG_ERRORS" >&5
-         { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+         { echo "$as_me:$LINENO: result: no" >&5
- $as_echo "no" >&6; }
+ echo "${ECHO_T}no" >&6; }
-                 as_fn_error "libgtkhtml-3 missing" "$LINENO" 5
+                 { { echo "$as_me:$LINENO: error: libgtkhtml-3 missing" >&5
+ echo "$as_me: error: libgtkhtml-3 missing" >&2;}
+    { (exit 1); exit 1; }; }
  elif test $pkg_failed = untried; then
-         as_fn_error "libgtkhtml-3 missing" "$LINENO" 5
+         { { echo "$as_me:$LINENO: error: libgtkhtml-3 missing" >&5
+ 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:${as_lineno-$LINENO}: result: yes" >&5
+         { echo "$as_me:$LINENO: result: yes" >&5
- $as_echo "yes" >&6; }
+ echo "${ECHO_T}yes" >&6; }
      CFLAGS="$CFLAGS $libgtkhtml3_8_CFLAGS"
      LIBS="$LIBS $libgtkhtml3_8_LIBS"
-Line 3858 
 fi
+Line 3748 
 fi
  else
          libgtkhtml3_14_CFLAGS=$pkg_cv_libgtkhtml3_14_CFLAGS
          libgtkhtml3_14_LIBS=$pkg_cv_libgtkhtml3_14_LIBS
-         { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+         { echo "$as_me:$LINENO: result: yes" >&5
- $as_echo "yes" >&6; }
+ echo "${ECHO_T}yes" >&6; }
    CFLAGS="$CFLAGS $libgtkhtml3_14_CFLAGS"
    LIBS="$LIBS $libgtkhtml3_14_LIBS"
-Line 3867 
 $as_echo "yes" >&6; }
+Line 3757 
 $as_echo "yes" >&6; }
  fi
  # check for maemo
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Maemo" >&5
+ { echo "$as_me:$LINENO: checking for Maemo" >&5
- $as_echo_n "checking for Maemo... " >&6; }
+ echo $ECHO_N "checking for Maemo... $ECHO_C" >&6; }
  ac_ext=c
  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:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5
+ { echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
- $as_echo_n "checking how to run the C preprocessor... " >&6; }
+ echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&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
+   echo $ECHO_N "(cached) $ECHO_C" >&6
  else
        # Double quotes because CPP needs to be expanded
      for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
-Line 3897 
 do
+Line 3787 
 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 confdefs.h - <<_ACEOF >conftest.$ac_ext
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  #ifdef __STDC__
  # include <limits.h>
-Line 3906 
 do
+Line 3800 
 do
  #endif
                       Syntax error
  _ACEOF
- if ac_fn_c_try_cpp "$LINENO"; then :
+ if { (ac_try="$ac_cpp conftest.$ac_ext"
+ case "(($ac_try" in
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+ eval "echo \"\$as_me:$LINENO: $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
+   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
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
    # 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 confdefs.h - <<_ACEOF >conftest.$ac_ext
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  #include <ac_nonexistent.h>
  _ACEOF
- if ac_fn_c_try_cpp "$LINENO"; then :
+ if { (ac_try="$ac_cpp conftest.$ac_ext"
+ case "(($ac_try" in
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+ eval "echo \"\$as_me:$LINENO: $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
+   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
+   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 3945 
 fi
+Line 3881 
 fi
  else
    ac_cv_prog_CPP=$CPP
  fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5
+ { echo "$as_me:$LINENO: result: $CPP" >&5
- $as_echo "$CPP" >&6; }
+ echo "${ECHO_T}$CPP" >&6; }
  ac_preproc_ok=false
  for ac_c_preproc_warn_flag in '' yes
  do
-Line 3956 
 do
+Line 3892 
 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 confdefs.h - <<_ACEOF >conftest.$ac_ext
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  #ifdef __STDC__
  # include <limits.h>
-Line 3965 
 do
+Line 3905 
 do
  #endif
                       Syntax error
  _ACEOF
- if ac_fn_c_try_cpp "$LINENO"; then :
+ if { (ac_try="$ac_cpp conftest.$ac_ext"
+ case "(($ac_try" in
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+ eval "echo \"\$as_me:$LINENO: $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
+   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
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
    # 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 confdefs.h - <<_ACEOF >conftest.$ac_ext
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  #include <ac_nonexistent.h>
  _ACEOF
- if ac_fn_c_try_cpp "$LINENO"; then :
+ if { (ac_try="$ac_cpp conftest.$ac_ext"
+ case "(($ac_try" in
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+ eval "echo \"\$as_me:$LINENO: $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
+   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
+   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:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+   { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
- $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+ See \`config.log' for more details." >&5
- as_fn_error "C preprocessor \"$CPP\" fails sanity check
+ echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
- See \`config.log' for more details." "$LINENO" 5; }
+ See \`config.log' for more details." >&2;}
+    { (exit 1); exit 1; }; }
  fi
  ac_ext=c
-Line 4008 
 ac_link='$CC -o conftest$ac_exeext $CFLA
+Line 3991 
 ac_link='$CC -o conftest$ac_exeext $CFLA
  ac_compiler_gnu=$ac_cv_c_compiler_gnu
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
+ { echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5
- $as_echo_n "checking for grep that handles long lines and -e... " >&6; }
+ echo $ECHO_N "checking for grep that handles long lines and -e... $ECHO_C" >&6; }
- if test "${ac_cv_path_GREP+set}" = set; then :
+ if test "${ac_cv_path_GREP+set}" = set; then
-   $as_echo_n "(cached) " >&6
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   # Extract the first word of "grep ggrep" to use in msg output
+ if test -z "$GREP"; then
+ set dummy grep ggrep; ac_prog_name=$2
+ if test "${ac_cv_path_GREP+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-   if test -z "$GREP"; then
    ac_path_GREP_found=false
-   # Loop through the user's path and test for each of PROGNAME-LIST
+ # Loop through the user's path and test for each of PROGNAME-LIST
-   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
  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
+   for ac_exec_ext in '' $ac_executable_extensions; do
-       ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
+     ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
-       { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
+     { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
- # Check for GNU ac_path_GREP and select it if it is found.
+     # Check for GNU ac_path_GREP and select it if it is found.
    # Check for GNU $ac_path_GREP
  case `"$ac_path_GREP" --version 2>&1` in
  *GNU*)
    ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;;
  *)
    ac_count=0
-   $as_echo_n 0123456789 >"conftest.in"
+   echo $ECHO_N "0123456789$ECHO_C" >"conftest.in"
    while :
    do
      cat "conftest.in" "conftest.in" >"conftest.tmp"
      mv "conftest.tmp" "conftest.in"
      cp "conftest.in" "conftest.nl"
-     $as_echo 'GREP' >> "conftest.nl"
+     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
-     as_fn_arith $ac_count + 1 && ac_count=$as_val
+     ac_count=`expr $ac_count + 1`
      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 4053 
 case `"$ac_path_GREP" --version 2>&1` in
+Line 4041 
 case `"$ac_path_GREP" --version 2>&1` in
    rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
  esac
-       $ac_path_GREP_found && break 3
-     done
+     $ac_path_GREP_found && break 3
-   done
    done
+ done
+ done
  IFS=$as_save_IFS
-   if test -z "$ac_cv_path_GREP"; then
-     as_fn_error "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
-   fi
+ fi
+ GREP="$ac_cv_path_GREP"
+ if test -z "$GREP"; then
+   { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
+ echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
  else
    ac_cv_path_GREP=$GREP
  fi
  fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5
+ { echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5
- $as_echo "$ac_cv_path_GREP" >&6; }
+ echo "${ECHO_T}$ac_cv_path_GREP" >&6; }
   GREP="$ac_cv_path_GREP"
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
+ { echo "$as_me:$LINENO: checking for egrep" >&5
- $as_echo_n "checking for egrep... " >&6; }
+ echo $ECHO_N "checking for egrep... $ECHO_C" >&6; }
- if test "${ac_cv_path_EGREP+set}" = set; then :
+ if test "${ac_cv_path_EGREP+set}" = set; then
-   $as_echo_n "(cached) " >&6
+   echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
     then ac_cv_path_EGREP="$GREP -E"
     else
-      if test -z "$EGREP"; then
+      # Extract the first word of "egrep" to use in msg output
+ if test -z "$EGREP"; then
+ set dummy egrep; ac_prog_name=$2
+ if test "${ac_cv_path_EGREP+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
    ac_path_EGREP_found=false
-   # Loop through the user's path and test for each of PROGNAME-LIST
+ # Loop through the user's path and test for each of PROGNAME-LIST
-   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
  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
+   for ac_exec_ext in '' $ac_executable_extensions; do
-       ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
+     ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
-       { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
+     { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
- # Check for GNU ac_path_EGREP and select it if it is found.
+     # Check for GNU ac_path_EGREP and select it if it is found.
    # Check for GNU $ac_path_EGREP
  case `"$ac_path_EGREP" --version 2>&1` in
  *GNU*)
    ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;;
  *)
    ac_count=0
-   $as_echo_n 0123456789 >"conftest.in"
+   echo $ECHO_N "0123456789$ECHO_C" >"conftest.in"
    while :
    do
      cat "conftest.in" "conftest.in" >"conftest.tmp"
      mv "conftest.tmp" "conftest.in"
      cp "conftest.in" "conftest.nl"
-     $as_echo 'EGREP' >> "conftest.nl"
+     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
-     as_fn_arith $ac_count + 1 && ac_count=$as_val
+     ac_count=`expr $ac_count + 1`
      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 4119 
 case `"$ac_path_EGREP" --version 2>&1` i
+Line 4123 
 case `"$ac_path_EGREP" --version 2>&1` i
    rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
  esac
-       $ac_path_EGREP_found && break 3
-     done
+     $ac_path_EGREP_found && break 3
-   done
    done
+ done
+ done
  IFS=$as_save_IFS
-   if test -z "$ac_cv_path_EGREP"; then
-     as_fn_error "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
-   fi
+ fi
+ EGREP="$ac_cv_path_EGREP"
+ if test -z "$EGREP"; then
+   { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
+ echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
  else
    ac_cv_path_EGREP=$EGREP
  fi
     fi
  fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5
+ { echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5
- $as_echo "$ac_cv_path_EGREP" >&6; }
+ echo "${ECHO_T}$ac_cv_path_EGREP" >&6; }
   EGREP="$ac_cv_path_EGREP"
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
+ { echo "$as_me:$LINENO: checking for ANSI C header files" >&5
- $as_echo_n "checking for ANSI C header files... " >&6; }
+ echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6; }
- if test "${ac_cv_header_stdc+set}" = set; then :
+ if test "${ac_cv_header_stdc+set}" = set; then
-   $as_echo_n "(cached) " >&6
+   echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  #include <stdlib.h>
  #include <stdarg.h>
-Line 4158 
 main ()
+Line 4177 
 main ()
    return 0;
  }
  _ACEOF
- if ac_fn_c_try_compile "$LINENO"; then :
+ 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 "echo \"\$as_me:$LINENO: $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
+   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
-   ac_cv_header_stdc=no
+   echo "$as_me: failed program was:" >&5
+ 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 confdefs.h - <<_ACEOF >conftest.$ac_ext
+   cat >conftest.$ac_ext <<_ACEOF
+ /* 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 4184 
 fi
+Line 4227 
 fi
  if test $ac_cv_header_stdc = yes; then
    # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
-   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+   cat >conftest.$ac_ext <<_ACEOF
+ /* 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 4201 
 fi
+Line 4248 
 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 confdefs.h - <<_ACEOF >conftest.$ac_ext
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  #include <ctype.h>
  #include <stdlib.h>
-Line 4231 
 main ()
+Line 4282 
 main ()
    return 0;
  }
  _ACEOF
- if ac_fn_c_try_run "$LINENO"; then :
+ rm -f conftest$ac_exeext
+ if { (ac_try="$ac_link"
+ case "(($ac_try" in
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>&5
+   ac_status=$?
+   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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   :
  else
-   ac_cv_header_stdc=no
+   echo "$as_me: program exited with status $ac_status" >&5
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ ( exit $ac_status )
+ ac_cv_header_stdc=no
  fi
- 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:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5
+ { echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
- $as_echo "$ac_cv_header_stdc" >&6; }
+ echo "${ECHO_T}$ac_cv_header_stdc" >&6; }
  if test $ac_cv_header_stdc = yes; then
- $as_echo "#define STDC_HEADERS 1" >>confdefs.h
+ cat >>confdefs.h <<\_ACEOF
+ #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=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
- ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
+ { echo "$as_me:$LINENO: checking for $ac_header" >&5
- "
+ echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
- eval as_val=\$$as_ac_Header
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-    if test "x$as_val" = x""yes; then :
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ 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 "echo \"\$as_me:$LINENO: $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
+   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
+   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 echo '${'$as_ac_Header'}'`
+                { echo "$as_me:$LINENO: result: $ac_res" >&5
+ echo "${ECHO_T}$ac_res" >&6; }
+ if test `eval echo '${'$as_ac_Header'}'` = yes; then
    cat >>confdefs.h <<_ACEOF
- #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
  _ACEOF
  fi
-Line 4269 
 done
+Line 4397 
 done
  if test -n "$PKG_CONFIG" && \
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"maemo-version\""; } >&5
+     { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"maemo-version\"") >&5
    ($PKG_CONFIG --exists --print-errors "maemo-version") 2>&5
    ac_status=$?
-   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   test $ac_status = 0; }; then
+   (exit $ac_status); }; then
    MAEMO="yes"
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+   { echo "$as_me:$LINENO: result: yes" >&5
- $as_echo "yes" >&6; }
+ echo "${ECHO_T}yes" >&6; }
  pkg_failed=no
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for hildon" >&5
+ { echo "$as_me:$LINENO: checking for hildon" >&5
- $as_echo_n "checking for hildon... " >&6; }
+ echo $ECHO_N "checking for hildon... $ECHO_C" >&6; }
  if test -n "$PKG_CONFIG"; then
      if test -n "$hildon_CFLAGS"; then
          pkg_cv_hildon_CFLAGS="$hildon_CFLAGS"
      else
          if test -n "$PKG_CONFIG" && \
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"hildon-1\""; } >&5
+     { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"hildon-1\"") >&5
    ($PKG_CONFIG --exists --print-errors "hildon-1") 2>&5
    ac_status=$?
-   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   test $ac_status = 0; }; then
+   (exit $ac_status); }; then
    pkg_cv_hildon_CFLAGS=`$PKG_CONFIG --cflags "hildon-1" 2>/dev/null`
  else
    pkg_failed=yes
-Line 4307 
 if test -n "$PKG_CONFIG"; then
+Line 4435 
 if test -n "$PKG_CONFIG"; then
          pkg_cv_hildon_LIBS="$hildon_LIBS"
      else
          if test -n "$PKG_CONFIG" && \
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"hildon-1\""; } >&5
+     { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"hildon-1\"") >&5
    ($PKG_CONFIG --exists --print-errors "hildon-1") 2>&5
    ac_status=$?
-   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   test $ac_status = 0; }; then
+   (exit $ac_status); }; then
    pkg_cv_hildon_LIBS=`$PKG_CONFIG --libs "hildon-1" 2>/dev/null`
  else
    pkg_failed=yes
-Line 4338 
 fi
+Line 4466 
 fi
          # Put the nasty error message in config.log where it belongs
          echo "$hildon_PKG_ERRORS" >&5
-         { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+         { echo "$as_me:$LINENO: result: no" >&5
- $as_echo "no" >&6; }
+ echo "${ECHO_T}no" >&6; }
-                 as_fn_error "hildon-1 missing" "$LINENO" 5
+                 { { echo "$as_me:$LINENO: error: hildon-1 missing" >&5
+ echo "$as_me: error: hildon-1 missing" >&2;}
+    { (exit 1); exit 1; }; }
  elif test $pkg_failed = untried; then
-         as_fn_error "hildon-1 missing" "$LINENO" 5
+         { { echo "$as_me:$LINENO: error: hildon-1 missing" >&5
+ 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:${as_lineno-$LINENO}: result: yes" >&5
+         { echo "$as_me:$LINENO: result: yes" >&5
- $as_echo "yes" >&6; }
+ echo "${ECHO_T}yes" >&6; }
          :
  fi
    CFLAGS="$CFLAGS  -DUSE_MAEMO $hildon_CFLAGS"
-Line 4355 
 fi
+Line 4487 
 fi
  pkg_failed=no
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for osso" >&5
+ { echo "$as_me:$LINENO: checking for osso" >&5
- $as_echo_n "checking for osso... " >&6; }
+ echo $ECHO_N "checking for osso... $ECHO_C" >&6; }
  if test -n "$PKG_CONFIG"; then
      if test -n "$osso_CFLAGS"; then
          pkg_cv_osso_CFLAGS="$osso_CFLAGS"
      else
          if test -n "$PKG_CONFIG" && \
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libosso\""; } >&5
+     { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libosso\"") >&5
    ($PKG_CONFIG --exists --print-errors "libosso") 2>&5
    ac_status=$?
-   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   test $ac_status = 0; }; then
+   (exit $ac_status); }; then
    pkg_cv_osso_CFLAGS=`$PKG_CONFIG --cflags "libosso" 2>/dev/null`
  else
    pkg_failed=yes
-Line 4381 
 if test -n "$PKG_CONFIG"; then
+Line 4513 
 if test -n "$PKG_CONFIG"; then
          pkg_cv_osso_LIBS="$osso_LIBS"
      else
          if test -n "$PKG_CONFIG" && \
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libosso\""; } >&5
+     { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libosso\"") >&5
    ($PKG_CONFIG --exists --print-errors "libosso") 2>&5
    ac_status=$?
-   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   test $ac_status = 0; }; then
+   (exit $ac_status); }; then
    pkg_cv_osso_LIBS=`$PKG_CONFIG --libs "libosso" 2>/dev/null`
  else
    pkg_failed=yes
-Line 4412 
 fi
+Line 4544 
 fi
          # Put the nasty error message in config.log where it belongs
          echo "$osso_PKG_ERRORS" >&5
-         { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+         { echo "$as_me:$LINENO: result: no" >&5
- $as_echo "no" >&6; }
+ echo "${ECHO_T}no" >&6; }
-                 as_fn_error "libosso missing" "$LINENO" 5
+                 { { echo "$as_me:$LINENO: error: libosso missing" >&5
+ echo "$as_me: error: libosso missing" >&2;}
+    { (exit 1); exit 1; }; }
  elif test $pkg_failed = untried; then
-         as_fn_error "libosso missing" "$LINENO" 5
+         { { echo "$as_me:$LINENO: error: libosso missing" >&5
+ 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:${as_lineno-$LINENO}: result: yes" >&5
+         { echo "$as_me:$LINENO: result: yes" >&5
- $as_echo "yes" >&6; }
+ echo "${ECHO_T}yes" >&6; }
          :
  fi
    CFLAGS="$CFLAGS $osso_CFLAGS"
-Line 4429 
 fi
+Line 4565 
 fi
  pkg_failed=no
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for hildon_fm_2" >&5
+ { echo "$as_me:$LINENO: checking for hildon_fm_2" >&5
- $as_echo_n "checking for hildon_fm_2... " >&6; }
+ echo $ECHO_N "checking for hildon_fm_2... $ECHO_C" >&6; }
  if test -n "$PKG_CONFIG"; then
      if test -n "$hildon_fm_2_CFLAGS"; then
          pkg_cv_hildon_fm_2_CFLAGS="$hildon_fm_2_CFLAGS"
      else
          if test -n "$PKG_CONFIG" && \
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"hildon-fm-2\""; } >&5
+     { (echo "$as_me:$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:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   test $ac_status = 0; }; then
+   (exit $ac_status); }; then
    pkg_cv_hildon_fm_2_CFLAGS=`$PKG_CONFIG --cflags "hildon-fm-2" 2>/dev/null`
  else
    pkg_failed=yes
-Line 4455 
 if test -n "$PKG_CONFIG"; then
+Line 4591 
 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:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"hildon-fm-2\""; } >&5
+     { (echo "$as_me:$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:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   test $ac_status = 0; }; then
+   (exit $ac_status); }; then
    pkg_cv_hildon_fm_2_LIBS=`$PKG_CONFIG --libs "hildon-fm-2" 2>/dev/null`
  else
    pkg_failed=yes
-Line 4486 
 fi
+Line 4622 
 fi
          # Put the nasty error message in config.log where it belongs
          echo "$hildon_fm_2_PKG_ERRORS" >&5
-         { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+         { echo "$as_me:$LINENO: result: no" >&5
- $as_echo "no" >&6; }
+ echo "${ECHO_T}no" >&6; }
-                 as_fn_error "hildon-fm-2 missing" "$LINENO" 5
+                 { { echo "$as_me:$LINENO: error: hildon-fm-2 missing" >&5
+ echo "$as_me: error: hildon-fm-2 missing" >&2;}
+    { (exit 1); exit 1; }; }
  elif test $pkg_failed = untried; then
-         as_fn_error "hildon-fm-2 missing" "$LINENO" 5
+         { { echo "$as_me:$LINENO: error: hildon-fm-2 missing" >&5
+ 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:${as_lineno-$LINENO}: result: yes" >&5
+         { echo "$as_me:$LINENO: result: yes" >&5
- $as_echo "yes" >&6; }
+ echo "${ECHO_T}yes" >&6; }
          :
  fi
    CFLAGS="$CFLAGS $hildon_fm_2_CFLAGS"
-Line 4504 
 fi
+Line 4644 
 fi
    # check for sqlite3 for maemo mapper interface
  pkg_failed=no
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sqlite3" >&5
+ { echo "$as_me:$LINENO: checking for sqlite3" >&5
- $as_echo_n "checking for sqlite3... " >&6; }
+ echo $ECHO_N "checking for sqlite3... $ECHO_C" >&6; }
  if test -n "$PKG_CONFIG"; then
      if test -n "$sqlite3_CFLAGS"; then
          pkg_cv_sqlite3_CFLAGS="$sqlite3_CFLAGS"
      else
          if test -n "$PKG_CONFIG" && \
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"sqlite3\""; } >&5
+     { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"sqlite3\"") >&5
    ($PKG_CONFIG --exists --print-errors "sqlite3") 2>&5
    ac_status=$?
-   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   test $ac_status = 0; }; then
+   (exit $ac_status); }; then
    pkg_cv_sqlite3_CFLAGS=`$PKG_CONFIG --cflags "sqlite3" 2>/dev/null`
  else
    pkg_failed=yes
-Line 4530 
 if test -n "$PKG_CONFIG"; then
+Line 4670 
 if test -n "$PKG_CONFIG"; then
          pkg_cv_sqlite3_LIBS="$sqlite3_LIBS"
      else
          if test -n "$PKG_CONFIG" && \
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"sqlite3\""; } >&5
+     { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"sqlite3\"") >&5
    ($PKG_CONFIG --exists --print-errors "sqlite3") 2>&5
    ac_status=$?
-   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   test $ac_status = 0; }; then
+   (exit $ac_status); }; then
    pkg_cv_sqlite3_LIBS=`$PKG_CONFIG --libs "sqlite3" 2>/dev/null`
  else
    pkg_failed=yes
-Line 4561 
 fi
+Line 4701 
 fi
          # Put the nasty error message in config.log where it belongs
          echo "$sqlite3_PKG_ERRORS" >&5
-         { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+         { echo "$as_me:$LINENO: result: no" >&5
- $as_echo "no" >&6; }
+ echo "${ECHO_T}no" >&6; }
-                 as_fn_error "sqlite3 missing" "$LINENO" 5
+                 { { echo "$as_me:$LINENO: error: sqlite3 missing" >&5
+ echo "$as_me: error: sqlite3 missing" >&2;}
+    { (exit 1); exit 1; }; }
  elif test $pkg_failed = untried; then
-         as_fn_error "sqlite3 missing" "$LINENO" 5
+         { { echo "$as_me:$LINENO: error: sqlite3 missing" >&5
+ 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:${as_lineno-$LINENO}: result: yes" >&5
+         { echo "$as_me:$LINENO: result: yes" >&5
- $as_echo "yes" >&6; }
+ echo "${ECHO_T}yes" >&6; }
          :
  fi
    CFLAGS="$CFLAGS $sqlite3_CFLAGS"
-Line 4579 
 fi
+Line 4723 
 fi
    # check for hildon-help
  pkg_failed=no
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for hildon_help" >&5
+ { echo "$as_me:$LINENO: checking for hildon_help" >&5
- $as_echo_n "checking for hildon_help... " >&6; }
+ echo $ECHO_N "checking for hildon_help... $ECHO_C" >&6; }
  if test -n "$PKG_CONFIG"; then
      if test -n "$hildon_help_CFLAGS"; then
          pkg_cv_hildon_help_CFLAGS="$hildon_help_CFLAGS"
      else
          if test -n "$PKG_CONFIG" && \
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"hildon-help\""; } >&5
+     { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"hildon-help\"") >&5
    ($PKG_CONFIG --exists --print-errors "hildon-help") 2>&5
    ac_status=$?
-   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   test $ac_status = 0; }; then
+   (exit $ac_status); }; then
    pkg_cv_hildon_help_CFLAGS=`$PKG_CONFIG --cflags "hildon-help" 2>/dev/null`
  else
    pkg_failed=yes
-Line 4605 
 if test -n "$PKG_CONFIG"; then
+Line 4749 
 if test -n "$PKG_CONFIG"; then
          pkg_cv_hildon_help_LIBS="$hildon_help_LIBS"
      else
          if test -n "$PKG_CONFIG" && \
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"hildon-help\""; } >&5
+     { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"hildon-help\"") >&5
    ($PKG_CONFIG --exists --print-errors "hildon-help") 2>&5
    ac_status=$?
-   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   test $ac_status = 0; }; then
+   (exit $ac_status); }; then
    pkg_cv_hildon_help_LIBS=`$PKG_CONFIG --libs "hildon-help" 2>/dev/null`
  else
    pkg_failed=yes
-Line 4636 
 fi
+Line 4780 
 fi
          # Put the nasty error message in config.log where it belongs
          echo "$hildon_help_PKG_ERRORS" >&5
-         { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+         { echo "$as_me:$LINENO: result: no" >&5
- $as_echo "no" >&6; }
+ echo "${ECHO_T}no" >&6; }
-     { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: hildon-help missing" >&5
+     { echo "$as_me:$LINENO: WARNING: hildon-help missing" >&5
- $as_echo "$as_me: WARNING: hildon-help missing" >&6;}
+ echo "$as_me: WARNING: hildon-help missing" >&6;}
  elif test $pkg_failed = untried; then
-     { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: hildon-help missing" >&5
+     { echo "$as_me:$LINENO: WARNING: hildon-help missing" >&5
- $as_echo "$as_me: WARNING: hildon-help missing" >&6;}
+ 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:${as_lineno-$LINENO}: result: yes" >&5
+         { echo "$as_me:$LINENO: result: yes" >&5
- $as_echo "yes" >&6; }
+ echo "${ECHO_T}yes" >&6; }
      CFLAGS="-DHILDON_HELP $CFLAGS $hildon_help_CFLAGS"
      LIBS="$LIBS $hildon_help_LIBS"
-Line 4661 
 fi
+Line 4805 
 fi
    # prefer gpsbt over liblocation as we got complaints regarding liblocation
    # stability
    if test -n "$PKG_CONFIG" && \
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gpsbt\""; } >&5
+     { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gpsbt\"") >&5
    ($PKG_CONFIG --exists --print-errors "gpsbt") 2>&5
    ac_status=$?
-   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   test $ac_status = 0; }; then
+   (exit $ac_status); }; then
  pkg_failed=no
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gpsbt" >&5
+ { echo "$as_me:$LINENO: checking for gpsbt" >&5
- $as_echo_n "checking for gpsbt... " >&6; }
+ echo $ECHO_N "checking for gpsbt... $ECHO_C" >&6; }
  if test -n "$PKG_CONFIG"; then
      if test -n "$gpsbt_CFLAGS"; then
          pkg_cv_gpsbt_CFLAGS="$gpsbt_CFLAGS"
      else
          if test -n "$PKG_CONFIG" && \
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gpsbt\""; } >&5
+     { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gpsbt\"") >&5
    ($PKG_CONFIG --exists --print-errors "gpsbt") 2>&5
    ac_status=$?
-   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   test $ac_status = 0; }; then
+   (exit $ac_status); }; then
    pkg_cv_gpsbt_CFLAGS=`$PKG_CONFIG --cflags "gpsbt" 2>/dev/null`
  else
    pkg_failed=yes
-Line 4695 
 if test -n "$PKG_CONFIG"; then
+Line 4839 
 if test -n "$PKG_CONFIG"; then
          pkg_cv_gpsbt_LIBS="$gpsbt_LIBS"
      else
          if test -n "$PKG_CONFIG" && \
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gpsbt\""; } >&5
+     { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gpsbt\"") >&5
    ($PKG_CONFIG --exists --print-errors "gpsbt") 2>&5
    ac_status=$?
-   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   test $ac_status = 0; }; then
+   (exit $ac_status); }; then
    pkg_cv_gpsbt_LIBS=`$PKG_CONFIG --libs "gpsbt" 2>/dev/null`
  else
    pkg_failed=yes
-Line 4726 
 fi
+Line 4870 
 fi
          # Put the nasty error message in config.log where it belongs
          echo "$gpsbt_PKG_ERRORS" >&5
-         as_fn_error "Package requirements (gpsbt) were not met:
+         { { echo "$as_me:$LINENO: 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
+ echo "$as_me: error: Package requirements (gpsbt) were not met:
  $gpsbt_PKG_ERRORS
-Line 4736 
 installed software in a non-standard pre
+Line 4891 
 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.
- " "$LINENO" 5
+ " >&2;}
+    { (exit 1); exit 1; }; }
  elif test $pkg_failed = untried; then
-         { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+         { { echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old.  Make sure it
- $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+ is in your PATH or set the PKG_CONFIG environment variable to the full
- as_fn_error "The pkg-config script could not be found or is too old.  Make sure it
+ 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
+ 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 4749 
 and gpsbt_LIBS to avoid the need to call
+Line 4913 
 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." "$LINENO" 5; }
+ See \`config.log' for more details." >&2;}
+    { (exit 1); exit 1; }; }
  else
          gpsbt_CFLAGS=$pkg_cv_gpsbt_CFLAGS
          gpsbt_LIBS=$pkg_cv_gpsbt_LIBS
-         { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+         { echo "$as_me:$LINENO: result: yes" >&5
- $as_echo "yes" >&6; }
+ echo "${ECHO_T}yes" >&6; }
          :
  fi
      CFLAGS="$CFLAGS -DENABLE_GPSBT $gpsbt_CFLAGS"
-Line 4762 
 fi
+Line 4927 
 fi
  else
-     { $as_echo "$as_me:${as_lineno-$LINENO}: gpsbt not found, trying liblocation" >&5
+     { echo "$as_me:$LINENO: gpsbt not found, trying liblocation" >&5
- $as_echo "$as_me: gpsbt not found, trying liblocation" >&6;}
+ echo "$as_me: gpsbt not found, trying liblocation" >&6;}
      if test -n "$PKG_CONFIG" && \
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"liblocation\""; } >&5
+     { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"liblocation\"") >&5
    ($PKG_CONFIG --exists --print-errors "liblocation") 2>&5
    ac_status=$?
-   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   test $ac_status = 0; }; then
+   (exit $ac_status); }; then
  pkg_failed=no
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for liblocation" >&5
+ { echo "$as_me:$LINENO: checking for liblocation" >&5
- $as_echo_n "checking for liblocation... " >&6; }
+ echo $ECHO_N "checking for liblocation... $ECHO_C" >&6; }
  if test -n "$PKG_CONFIG"; then
      if test -n "$liblocation_CFLAGS"; then
          pkg_cv_liblocation_CFLAGS="$liblocation_CFLAGS"
      else
          if test -n "$PKG_CONFIG" && \
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"liblocation\""; } >&5
+     { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"liblocation\"") >&5
    ($PKG_CONFIG --exists --print-errors "liblocation") 2>&5
    ac_status=$?
-   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   test $ac_status = 0; }; then
+   (exit $ac_status); }; then
    pkg_cv_liblocation_CFLAGS=`$PKG_CONFIG --cflags "liblocation" 2>/dev/null`
  else
    pkg_failed=yes
-Line 4800 
 if test -n "$PKG_CONFIG"; then
+Line 4965 
 if test -n "$PKG_CONFIG"; then
          pkg_cv_liblocation_LIBS="$liblocation_LIBS"
      else
          if test -n "$PKG_CONFIG" && \
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"liblocation\""; } >&5
+     { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"liblocation\"") >&5
    ($PKG_CONFIG --exists --print-errors "liblocation") 2>&5
    ac_status=$?
-   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   test $ac_status = 0; }; then
+   (exit $ac_status); }; then
    pkg_cv_liblocation_LIBS=`$PKG_CONFIG --libs "liblocation" 2>/dev/null`
  else
    pkg_failed=yes
-Line 4831 
 fi
+Line 4996 
 fi
          # Put the nasty error message in config.log where it belongs
          echo "$liblocation_PKG_ERRORS" >&5
-         as_fn_error "Package requirements (liblocation) were not met:
+         { { echo "$as_me:$LINENO: 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
+ echo "$as_me: error: Package requirements (liblocation) were not met:
  $liblocation_PKG_ERRORS
-Line 4841 
 installed software in a non-standard pre
+Line 5017 
 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.
- " "$LINENO" 5
+ " >&2;}
+    { (exit 1); exit 1; }; }
  elif test $pkg_failed = untried; then
-         { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+         { { echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old.  Make sure it
- $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+ is in your PATH or set the PKG_CONFIG environment variable to the full
- as_fn_error "The pkg-config script could not be found or is too old.  Make sure it
+ 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
+ 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 4854 
 and liblocation_LIBS to avoid the need t
+Line 5039 
 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." "$LINENO" 5; }
+ See \`config.log' for more details." >&2;}
+    { (exit 1); exit 1; }; }
  else
          liblocation_CFLAGS=$pkg_cv_liblocation_CFLAGS
          liblocation_LIBS=$pkg_cv_liblocation_LIBS
-         { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+         { echo "$as_me:$LINENO: result: yes" >&5
- $as_echo "yes" >&6; }
+ echo "${ECHO_T}yes" >&6; }
          :
  fi
        CFLAGS="$CFLAGS -DENABLE_LIBLOCATION $liblocation_CFLAGS"
-Line 4867 
 fi
+Line 5053 
 fi
  else
-       { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: No liblocation nor gpsbt found, disabling gps auto start!" >&5
+       { echo "$as_me:$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;}
+ echo "$as_me: WARNING: No liblocation nor gpsbt found, disabling gps auto start!" >&6;}
  fi
  fi
    if test -n "$PKG_CONFIG" && \
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"tablet-browser-interface\""; } >&5
+     { (echo "$as_me:$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:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   test $ac_status = 0; }; then
+   (exit $ac_status); }; then
      CFLAGS="$CFLAGS -DENABLE_BROWSER_INTERFACE"
  else
-   { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: No tablet-browser-interface found, disabling microb interface!" >&5
+   { echo "$as_me:$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;}
+ echo "$as_me: WARNING: No tablet-browser-interface found, disabling microb interface!" >&6;}
  fi
    if test -n "$PKG_CONFIG" && \
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"maemo-version\""; } >&5
+     { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"maemo-version\"") >&5
    ($PKG_CONFIG --exists --print-errors "maemo-version") 2>&5
    ac_status=$?
-   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   test $ac_status = 0; }; then
+   (exit $ac_status); }; then
      VERSION=`pkg-config --modversion maemo-version`
-     { $as_echo "$as_me:${as_lineno-$LINENO}: Configuring for Maemo $VERSION" >&5
+     { echo "$as_me:$LINENO: Configuring for Maemo $VERSION" >&5
- $as_echo "$as_me: Configuring for Maemo $VERSION" >&6;}
+ echo "$as_me: Configuring for Maemo $VERSION" >&6;}
      CFLAGS="$CFLAGS -DMAEMO_VERSION=\\\"$VERSION\\\""
      MAJOR=`echo $VERSION | cut -b1 -`
      CFLAGS="$CFLAGS -DMAEMO_VERSION_MAJOR=$MAJOR"
-Line 4907 
 $as_echo "$as_me: Configuring for Maemo
+Line 5093 
 $as_echo "$as_me: Configuring for Maemo
  else
-     as_fn_error "maemo-version not found" "$LINENO" 5
+     { { echo "$as_me:$LINENO: error: maemo-version not found" >&5
+ echo "$as_me: error: maemo-version not found" >&2;}
+    { (exit 1); exit 1; }; }
  fi
-Line 4920 
 fi
+Line 5108 
 fi
       datarootdir=/opt
         # check for libespeak (broken in diablo, hence doing it here)
-        for ac_header in espeak/speak_lib.h
- do :
+ for ac_header in espeak/speak_lib.h
-   ac_fn_c_check_header_mongrel "$LINENO" "espeak/speak_lib.h" "ac_cv_header_espeak_speak_lib_h" "$ac_includes_default"
+ do
- if test "x$ac_cv_header_espeak_speak_lib_h" = x""yes; then :
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+   { echo "$as_me:$LINENO: checking for $ac_header" >&5
+ echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+ ac_res=`eval echo '${'$as_ac_Header'}'`
+                { echo "$as_me:$LINENO: result: $ac_res" >&5
+ echo "${ECHO_T}$ac_res" >&6; }
+ else
+   # Is the header compilable?
+ { echo "$as_me:$LINENO: checking $ac_header usability" >&5
+ echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&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 "echo \"\$as_me:$LINENO: $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
+   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
+   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
+ { echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+ echo "${ECHO_T}$ac_header_compiler" >&6; }
+ # Is the header present?
+ { echo "$as_me:$LINENO: checking $ac_header presence" >&5
+ echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&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 "echo \"\$as_me:$LINENO: $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
+   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
+   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
+ { echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+ echo "${ECHO_T}$ac_header_preproc" >&6; }
+ # So?  What about this header?
+ case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+   yes:no: )
+     { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+ echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+     { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+ echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+     ac_header_preproc=yes
+     ;;
+   no:yes:* )
+     { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+ echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+     { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+ echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+     { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+ echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+     { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+ echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+     { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+ echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+     { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+ echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+     ( cat <<\_ASBOX
+ ## ------------------------------- ##
+ ## Report this to till@harbaum.org ##
+ ## ------------------------------- ##
+ _ASBOX
+      ) | sed "s/^/$as_me: WARNING:     /" >&2
+     ;;
+ esac
+ { echo "$as_me:$LINENO: checking for $ac_header" >&5
+ echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   eval "$as_ac_Header=\$ac_header_preproc"
+ fi
+ ac_res=`eval echo '${'$as_ac_Header'}'`
+                { echo "$as_me:$LINENO: result: $ac_res" >&5
+ echo "${ECHO_T}$ac_res" >&6; }
+ fi
+ if test `eval echo '${'$as_ac_Header'}'` = yes; then
    cat >>confdefs.h <<_ACEOF
- #define HAVE_ESPEAK_SPEAK_LIB_H 1
+ #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
  _ACEOF
           CFLAGS="$CFLAGS -DESPEAK"
-Line 4937 
 done
+Line 5258 
 done
    else
       ICONNAME=26x26/gpxview.png
-      { $as_echo "$as_me:${as_lineno-$LINENO}: Enabling Maemo Mapper support" >&5
+      { echo "$as_me:$LINENO: Enabling Maemo Mapper support" >&5
- $as_echo "$as_me: Enabling Maemo Mapper support" >&6;}
+ echo "$as_me: Enabling Maemo Mapper support" >&6;}
    fi
    CFLAGS="$CFLAGS -DENABLE_MAEMO_MAPPER"
-Line 4947 
 $as_echo "$as_me: Enabling Maemo Mapper
+Line 5268 
 $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:${as_lineno-$LINENO}: Using application installer icon \"$ICONNAME\"" >&5
+   { echo "$as_me:$LINENO: Using application installer icon \"$ICONNAME\"" >&5
- $as_echo "$as_me: Using application installer icon \"$ICONNAME\"" >&6;}
+ echo "$as_me: Using application installer icon \"$ICONNAME\"" >&6;}
    # add icon entry to debian/control
    ICON=" Maemo icon $ICONNAME
-Line 4962 
 XB-Maemo-Icon-26:
+Line 5283 
 XB-Maemo-Icon-26:
  else
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+   { echo "$as_me:$LINENO: result: no" >&5
- $as_echo "no" >&6; }
+ echo "${ECHO_T}no" >&6; }
    EXTRA_OBJS="$EXTRA_OBJS bct.o"
    CFLAGS="$CFLAGS -DBCT"
-Line 4971 
 $as_echo "no" >&6; }
+Line 5292 
 $as_echo "no" >&6; }
    # check for gtk+-2.0
  pkg_failed=no
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gtk" >&5
+ { echo "$as_me:$LINENO: checking for gtk" >&5
- $as_echo_n "checking for gtk... " >&6; }
+ echo $ECHO_N "checking for gtk... $ECHO_C" >&6; }
  if test -n "$PKG_CONFIG"; then
      if test -n "$gtk_CFLAGS"; then
          pkg_cv_gtk_CFLAGS="$gtk_CFLAGS"
      else
          if test -n "$PKG_CONFIG" && \
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0\""; } >&5
+     { (echo "$as_me:$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:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   test $ac_status = 0; }; then
+   (exit $ac_status); }; then
    pkg_cv_gtk_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0" 2>/dev/null`
  else
    pkg_failed=yes
-Line 4997 
 if test -n "$PKG_CONFIG"; then
+Line 5318 
 if test -n "$PKG_CONFIG"; then
          pkg_cv_gtk_LIBS="$gtk_LIBS"
      else
          if test -n "$PKG_CONFIG" && \
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0\""; } >&5
+     { (echo "$as_me:$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:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   test $ac_status = 0; }; then
+   (exit $ac_status); }; then
    pkg_cv_gtk_LIBS=`$PKG_CONFIG --libs "gtk+-2.0" 2>/dev/null`
  else
    pkg_failed=yes
-Line 5028 
 fi
+Line 5349 
 fi
          # Put the nasty error message in config.log where it belongs
          echo "$gtk_PKG_ERRORS" >&5
-         { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+         { echo "$as_me:$LINENO: result: no" >&5
- $as_echo "no" >&6; }
+ echo "${ECHO_T}no" >&6; }
-                 as_fn_error "gtk+-2.0 missing!" "$LINENO" 5
+                 { { echo "$as_me:$LINENO: error: gtk+-2.0 missing!" >&5
- elif test $pkg_failed = untried; then
+ echo "$as_me: error: gtk+-2.0 missing!" >&2;}
-         as_fn_error "gtk+-2.0 missing!" "$LINENO" 5
+    { (exit 1); exit 1; }; }
- else
+ elif test $pkg_failed = untried; then
-         gtk_CFLAGS=$pkg_cv_gtk_CFLAGS
+         { { echo "$as_me:$LINENO: error: gtk+-2.0 missing!" >&5
-         gtk_LIBS=$pkg_cv_gtk_LIBS
+ echo "$as_me: error: gtk+-2.0 missing!" >&2;}
-         { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+    { (exit 1); exit 1; }; }
- $as_echo "yes" >&6; }
+ else
-         :
+         gtk_CFLAGS=$pkg_cv_gtk_CFLAGS
+         gtk_LIBS=$pkg_cv_gtk_LIBS
+         { echo "$as_me:$LINENO: result: yes" >&5
+ echo "${ECHO_T}yes" >&6; }
+         :
+ fi
+   CFLAGS="$CFLAGS $gtk_CFLAGS"
+   LIBS="$LIBS $gtk_LIBS"
+   # non-maemo device use gnome to call the web browser
+ pkg_failed=no
+ { echo "$as_me:$LINENO: checking for gnome2" >&5
+ echo $ECHO_N "checking for gnome2... $ECHO_C" >&6; }
+ if test -n "$PKG_CONFIG"; then
+     if test -n "$gnome2_CFLAGS"; then
+         pkg_cv_gnome2_CFLAGS="$gnome2_CFLAGS"
+     else
+         if test -n "$PKG_CONFIG" && \
+     { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgnome-2.0\"") >&5
+   ($PKG_CONFIG --exists --print-errors "libgnome-2.0") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; then
+   pkg_cv_gnome2_CFLAGS=`$PKG_CONFIG --cflags "libgnome-2.0" 2>/dev/null`
+ else
+   pkg_failed=yes
+ fi
+     fi
+ else
+         pkg_failed=untried
+ fi
+ if test -n "$PKG_CONFIG"; then
+     if test -n "$gnome2_LIBS"; then
+         pkg_cv_gnome2_LIBS="$gnome2_LIBS"
+     else
+         if test -n "$PKG_CONFIG" && \
+     { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgnome-2.0\"") >&5
+   ($PKG_CONFIG --exists --print-errors "libgnome-2.0") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; then
+   pkg_cv_gnome2_LIBS=`$PKG_CONFIG --libs "libgnome-2.0" 2>/dev/null`
+ else
+   pkg_failed=yes
+ fi
+     fi
+ else
+         pkg_failed=untried
+ fi
+ if test $pkg_failed = yes; then
+ if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+         _pkg_short_errors_supported=yes
+ else
+         _pkg_short_errors_supported=no
+ fi
+         if test $_pkg_short_errors_supported = yes; then
+                 gnome2_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libgnome-2.0"`
+         else
+                 gnome2_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libgnome-2.0"`
+         fi
+         # Put the nasty error message in config.log where it belongs
+         echo "$gnome2_PKG_ERRORS" >&5
+         { echo "$as_me:$LINENO: result: no" >&5
+ echo "${ECHO_T}no" >&6; }
+                 { { echo "$as_me:$LINENO: error: libgnome-2.0 missing" >&5
+ echo "$as_me: error: libgnome-2.0 missing" >&2;}
+    { (exit 1); exit 1; }; }
+ elif test $pkg_failed = untried; then
+         { { echo "$as_me:$LINENO: error: libgnome-2.0 missing" >&5
+ 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
+         { echo "$as_me:$LINENO: result: yes" >&5
+ echo "${ECHO_T}yes" >&6; }
+         :
+ fi
+   CFLAGS="$CFLAGS $gnome2_CFLAGS -DENABLE_BROWSER_INTERFACE"
+   LIBS="$LIBS $gnome2_LIBS"
+   # check for libespeak
+ for ac_header in espeak/speak_lib.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+   { echo "$as_me:$LINENO: checking for $ac_header" >&5
+ echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+ ac_res=`eval echo '${'$as_ac_Header'}'`
+                { echo "$as_me:$LINENO: result: $ac_res" >&5
+ echo "${ECHO_T}$ac_res" >&6; }
+ else
+   # Is the header compilable?
+ { echo "$as_me:$LINENO: checking $ac_header usability" >&5
+ echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&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 "echo \"\$as_me:$LINENO: $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
+   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
+   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
+ { echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+ echo "${ECHO_T}$ac_header_compiler" >&6; }
+ # Is the header present?
+ { echo "$as_me:$LINENO: checking $ac_header presence" >&5
+ echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&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 "echo \"\$as_me:$LINENO: $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
+   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
+   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
+ { echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+ echo "${ECHO_T}$ac_header_preproc" >&6; }
+ # So?  What about this header?
+ case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+   yes:no: )
+     { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+ echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+     { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+ echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+     ac_header_preproc=yes
+     ;;
+   no:yes:* )
+     { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+ echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+     { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+ echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+     { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+ echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+     { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+ echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+     { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+ echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+     { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+ echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+     ( cat <<\_ASBOX
+ ## ------------------------------- ##
+ ## Report this to till@harbaum.org ##
+ ## ------------------------------- ##
+ _ASBOX
+      ) | sed "s/^/$as_me: WARNING:     /" >&2
+     ;;
+ esac
+ { echo "$as_me:$LINENO: checking for $ac_header" >&5
+ echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   eval "$as_ac_Header=\$ac_header_preproc"
+ fi
+ ac_res=`eval echo '${'$as_ac_Header'}'`
+                { echo "$as_me:$LINENO: result: $ac_res" >&5
+ echo "${ECHO_T}$ac_res" >&6; }
+ fi
+ if test `eval echo '${'$as_ac_Header'}'` = yes; then
+   cat >>confdefs.h <<_ACEOF
+ #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ _ACEOF
+     CFLAGS="$CFLAGS -DESPEAK"
+     LIBS="$LIBS -lespeak"
  fi
-   CFLAGS="$CFLAGS $gtk_CFLAGS"
-   LIBS="$LIBS $gtk_LIBS"
-   # non-maemo device use gnome to call the web browser
+ done
+   # check for libgps
  pkg_failed=no
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gnome2" >&5
+ { echo "$as_me:$LINENO: checking for gps" >&5
- $as_echo_n "checking for gnome2... " >&6; }
+ echo $ECHO_N "checking for gps... $ECHO_C" >&6; }
  if test -n "$PKG_CONFIG"; then
-     if test -n "$gnome2_CFLAGS"; then
+     if test -n "$gps_CFLAGS"; then
-         pkg_cv_gnome2_CFLAGS="$gnome2_CFLAGS"
+         pkg_cv_gps_CFLAGS="$gps_CFLAGS"
      else
          if test -n "$PKG_CONFIG" && \
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libgnome-2.0\""; } >&5
+     { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgps\"") >&5
-   ($PKG_CONFIG --exists --print-errors "libgnome-2.0") 2>&5
+   ($PKG_CONFIG --exists --print-errors "libgps") 2>&5
    ac_status=$?
-   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   test $ac_status = 0; }; then
+   (exit $ac_status); }; then
-   pkg_cv_gnome2_CFLAGS=`$PKG_CONFIG --cflags "libgnome-2.0" 2>/dev/null`
+   pkg_cv_gps_CFLAGS=`$PKG_CONFIG --cflags "libgps" 2>/dev/null`
  else
    pkg_failed=yes
  fi
-Line 5068 
 else
+Line 5622 
 else
          pkg_failed=untried
  fi
  if test -n "$PKG_CONFIG"; then
-     if test -n "$gnome2_LIBS"; then
+     if test -n "$gps_LIBS"; then
-         pkg_cv_gnome2_LIBS="$gnome2_LIBS"
+         pkg_cv_gps_LIBS="$gps_LIBS"
      else
          if test -n "$PKG_CONFIG" && \
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libgnome-2.0\""; } >&5
+     { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgps\"") >&5
-   ($PKG_CONFIG --exists --print-errors "libgnome-2.0") 2>&5
+   ($PKG_CONFIG --exists --print-errors "libgps") 2>&5
    ac_status=$?
-   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   test $ac_status = 0; }; then
+   (exit $ac_status); }; then
-   pkg_cv_gnome2_LIBS=`$PKG_CONFIG --libs "libgnome-2.0" 2>/dev/null`
+   pkg_cv_gps_LIBS=`$PKG_CONFIG --libs "libgps" 2>/dev/null`
  else
    pkg_failed=yes
  fi
-Line 5096 
 else
+Line 5650 
 else
          _pkg_short_errors_supported=no
  fi
          if test $_pkg_short_errors_supported = yes; then
-                 gnome2_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libgnome-2.0"`
+                 gps_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libgps"`
          else
-                 gnome2_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libgnome-2.0"`
+                 gps_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libgps"`
          fi
          # Put the nasty error message in config.log where it belongs
-         echo "$gnome2_PKG_ERRORS" >&5
+         echo "$gps_PKG_ERRORS" >&5
-         { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+         { echo "$as_me:$LINENO: result: no" >&5
- $as_echo "no" >&6; }
+ echo "${ECHO_T}no" >&6; }
-                 as_fn_error "libgnome-2.0 missing" "$LINENO" 5
+                 { echo "$as_me:$LINENO: No libgps found, using direct GPSD" >&5
+ echo "$as_me: No libgps found, using direct GPSD" >&6;}
  elif test $pkg_failed = untried; then
-         as_fn_error "libgnome-2.0 missing" "$LINENO" 5
+         { echo "$as_me:$LINENO: No libgps found, using direct GPSD" >&5
+ echo "$as_me: No libgps found, using direct GPSD" >&6;}
  else
-         gnome2_CFLAGS=$pkg_cv_gnome2_CFLAGS
+         gps_CFLAGS=$pkg_cv_gps_CFLAGS
-         gnome2_LIBS=$pkg_cv_gnome2_LIBS
+         gps_LIBS=$pkg_cv_gps_LIBS
-         { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+         { echo "$as_me:$LINENO: result: yes" >&5
- $as_echo "yes" >&6; }
+ echo "${ECHO_T}yes" >&6; }
-         :
- fi
-   CFLAGS="$CFLAGS $gnome2_CFLAGS -DENABLE_BROWSER_INTERFACE"
-   LIBS="$LIBS $gnome2_LIBS"
-   # check for libespeak
-   for ac_header in espeak/speak_lib.h
- do :
-   ac_fn_c_check_header_mongrel "$LINENO" "espeak/speak_lib.h" "ac_cv_header_espeak_speak_lib_h" "$ac_includes_default"
- if test "x$ac_cv_header_espeak_speak_lib_h" = x""yes; then :
-   cat >>confdefs.h <<_ACEOF
- #define HAVE_ESPEAK_SPEAK_LIB_H 1
- _ACEOF
-     CFLAGS="$CFLAGS -DESPEAK"
+     CFLAGS="$CFLAGS $gps_CFLAGS -DUSE_LIBGPS"
-     LIBS="$LIBS -lespeak"
+     LIBS="$LIBS $gps_LIBS"
  fi
- done
    INSTALL_PLATTFORM="install-debian"
    ICON=" No icon"
-Line 5174 
 _ACEOF
+Line 5714 
 _ACEOF
      case $ac_val in #(
      *${as_nl}*)
        case $ac_var in #(
-       *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
+       *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
- $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
+ 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 5188 
 $as_echo "$as_me: WARNING: cache variabl
+Line 5727 
 $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 5212 
 $as_echo "$as_me: WARNING: cache variabl
+Line 5751 
 $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:${as_lineno-$LINENO}: updating cache $cache_file" >&5
+       { echo "$as_me:$LINENO: updating cache $cache_file" >&5
- $as_echo "$as_me: updating cache $cache_file" >&6;}
+ echo "$as_me: updating cache $cache_file" >&6;}
      cat confcache >$cache_file
    else
-     { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
+     { echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5
- $as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
+ echo "$as_me: not updating unwritable cache $cache_file" >&6;}
    fi
  fi
  rm -f confcache
-Line 5234 
 test "x$exec_prefix" = xNONE && exec_pre
+Line 5773 
 test "x$exec_prefix" = xNONE && exec_pre
  # take arguments), then branch to the quote section.  Otherwise,
  # look for a macro that doesn't take arguments.
  ac_script='
- :mline
- /\\$/{
-  N
-  s,\\\n,,
-  b mline
- }
  t clear
  :clear
  s/^[     ]*#[    ]*define[       ][      ]*\([^  (][^    (]*([^)]*)\)[   ]*\(.*\)/-D\1=\2/g
-Line 5269 
 ac_ltlibobjs=
+Line 5802 
 ac_ltlibobjs=
  for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
    # 1. Remove the extension, and $U if already installed.
    ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
-   ac_i=`$as_echo "$ac_i" | sed "$ac_script"`
+   ac_i=`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.
-   as_fn_append ac_libobjs " \${LIBOBJDIR}$ac_i\$U.$ac_objext"
+   ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext"
-   as_fn_append ac_ltlibobjs " \${LIBOBJDIR}$ac_i"'$U.lo'
+   ac_ltlibobjs="$ac_ltlibobjs \${LIBOBJDIR}$ac_i"'$U.lo'
  done
  LIBOBJS=$ac_libobjs
-Line 5282 
 LTLIBOBJS=$ac_ltlibobjs
+Line 5815 
 LTLIBOBJS=$ac_ltlibobjs
  : ${CONFIG_STATUS=./config.status}
- ac_write_fail=0
  ac_clean_files_save=$ac_clean_files
  ac_clean_files="$ac_clean_files $CONFIG_STATUS"
- { $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5
+ { echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5
- $as_echo "$as_me: creating $CONFIG_STATUS" >&6;}
+ echo "$as_me: creating $CONFIG_STATUS" >&6;}
- as_write_fail=0
+ cat >$CONFIG_STATUS <<_ACEOF
- cat >$CONFIG_STATUS <<_ASEOF || as_write_fail=1
  #! $SHELL
  # Generated by $as_me.
  # Run this file to recreate the current configuration.
-Line 5298 
 cat >$CONFIG_STATUS <<_ASEOF || as_write
+Line 5829 
 cat >$CONFIG_STATUS <<_ASEOF || as_write
  debug=false
  ac_cs_recheck=false
  ac_cs_silent=false
  SHELL=\${CONFIG_SHELL-$SHELL}
- export SHELL
+ _ACEOF
- _ASEOF
- cat >>$CONFIG_STATUS <<\_ASEOF || as_write_fail=1
+ cat >>$CONFIG_STATUS <<\_ACEOF
- ## -------------------- ##
+ ## --------------------- ##
- ## 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
+   # Zsh 3.x and 4.x performs 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 #(
+   case `(set -o) 2>/dev/null` in
-   *posix*) :
+   *posix*) set -o posix ;;
-     set -o posix ;; #(
-   *) :
-      ;;
  esac
  fi
- as_nl='
- '
- export as_nl
+ # PATH needs CR
- # Printing a long string crashes Solaris 7 /usr/bin/printf.
+ # Avoid depending upon Character Ranges.
- as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+ as_cr_letters='abcdefghijklmnopqrstuvwxyz'
- as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
+ as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
- as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
+ as_cr_Letters=$as_cr_letters$as_cr_LETTERS
- # Prefer a ksh shell builtin over an external printf program on Solaris,
+ as_cr_digits='0123456789'
- # but without wasting forks for bash or zsh.
+ as_cr_alnum=$as_cr_Letters$as_cr_digits
- if test -z "$BASH_VERSION$ZSH_VERSION" \
-     && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
+ # The user is always right.
-   as_echo='print -r --'
+ if test "${PATH_SEPARATOR+set}" != set; then
-   as_echo_n='print -rn --'
+   echo "#! /bin/sh" >conf$$.sh
- elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
+   echo  "exit 0"   >>conf$$.sh
-   as_echo='printf %s\n'
+   chmod +x conf$$.sh
-   as_echo_n='printf %s'
+   if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
- else
+     PATH_SEPARATOR=';'
-   if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
-     as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
-     as_echo_n='/usr/ucb/echo -n'
    else
-     as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
+     PATH_SEPARATOR=:
-     as_echo_n_body='eval
-       arg=$1;
-       case $arg in #(
-       *"$as_nl"*)
-         expr "X$arg" : "X\\(.*\\)$as_nl";
-         arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
-       esac;
-       expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
-     '
-     export as_echo_n_body
-     as_echo_n='sh -c $as_echo_n_body as_echo'
    fi
-   export as_echo_body
+   rm -f conf$$.sh
-   as_echo='sh -c $as_echo_body as_echo'
  fi
- # The user is always right.
+ # Support unset when possible.
- if test "${PATH_SEPARATOR+set}" != set; then
+ if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
-   PATH_SEPARATOR=:
+   as_unset=unset
-   (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
+ else
-     (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
+   as_unset=false
-       PATH_SEPARATOR=';'
-   }
  fi
-Line 5379 
 fi
+Line 5890 
 fi
  # there to prevent editors from complaining about space-tab.
  # (If _AS_PATH_WALK were called with IFS unset, it would disable word
  # splitting by setting IFS to empty value.)
+ as_nl='
+ '
  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 5401 
 if test "x$as_myself" = x; then
+Line 5914 
 if test "x$as_myself" = x; then
    as_myself=$0
  fi
  if test ! -f "$as_myself"; then
-   $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+   echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
-   exit 1
+   { (exit 1); exit 1; }
  fi
- # Unset variables that we do not need and which cause bugs (e.g. in
+ # Work around bugs in pre-3.0 UWIN ksh.
- # pre-3.0 UWIN ksh).  But do not cause bugs in bash 2.01; the "|| exit 1"
+ for as_var in ENV MAIL MAILPATH
- # suppresses any "Segmentation fault" message there.  '((' could
+ do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
- # 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='> '
  PS4='+ '
  # NLS nuisances.
- LC_ALL=C
+ for as_var in \
- export LC_ALL
+   LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
- LANGUAGE=C
+   LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
- export LANGUAGE
+   LC_TELEPHONE LC_TIME
+ do
- # CDPATH.
+   if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
- (unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+     eval $as_var=C; export $as_var
+   else
+     ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
- # 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
+ done
-   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
+ # Required to use basename.
  if expr a : '\(a\)' >/dev/null 2>&1 &&
     test "X`expr 00001 : '.*\(...\)'`" = X001; then
    as_expr=expr
-Line 5519 
 else
+Line 5953 
 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\(//\)$' \| \
           X"$0" : 'X\(/\)' \| . 2>/dev/null ||
- $as_echo X/"$0" |
+ echo X/"$0" |
      sed '/^.*\/\([^/][^/]*\)\/*$/{
              s//\1/
              q
-Line 5544 
 $as_echo X/"$0" |
+Line 5974 
 $as_echo X/"$0" |
            }
            s/.*/./; q'`
- # Avoid depending upon Character Ranges.
+ # CDPATH.
- as_cr_letters='abcdefghijklmnopqrstuvwxyz'
+ $as_unset CDPATH
- 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_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" ||
+     { 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 'xy\c'` in
+   case `echo 'x\c'` in
    *c*) ECHO_T=' ';;     # ECHO_T is single tab character.
-   xy)  ECHO_C='\c';;
+   *)   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
    rm -f conf$$.dir/conf$$.file
  else
    rm -f conf$$.dir
-   mkdir conf$$.dir 2>/dev/null
+   mkdir conf$$.dir
  fi
- if (echo >conf$$.file) 2>/dev/null; then
+ echo >conf$$.file
-   if ln -s conf$$.file conf$$ 2>/dev/null; then
+ if ln -s conf$$.file conf$$ 2>/dev/null; then
-     as_ln_s='ln -s'
+   as_ln_s='ln -s'
-     # ... but there are two gotchas:
+   # ... but there are two gotchas:
-     # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
+   # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
-     # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
+   # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-     # In both cases, we have to default to `cp -p'.
+   # In both cases, we have to default to `cp -p'.
-     ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
+   ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
-       as_ln_s='cp -p'
-   elif ln conf$$.file conf$$ 2>/dev/null; then
-     as_ln_s=ln
-   else
      as_ln_s='cp -p'
-   fi
+ elif ln conf$$.file conf$$ 2>/dev/null; then
+   as_ln_s=ln
  else
    as_ln_s='cp -p'
  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='mkdir -p "$as_dir"'
+   as_mkdir_p=:
  else
    test -d ./-p && rmdir ./-p
    as_mkdir_p=false
-Line 5657 
 else
+Line 6088 
 else
    as_test_x='
      eval sh -c '\''
        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 5677 
 as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr
+Line 6108 
 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
- cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+ # Save the log message, to keep $[0] and so on meaningful, and to
- # 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.4, which was
- generated by GNU Autoconf 2.65.  Invocation command line was
+ generated by GNU Autoconf 2.61.  Invocation command line was
    CONFIG_FILES    = $CONFIG_FILES
    CONFIG_HEADERS  = $CONFIG_HEADERS
-Line 5702 
 on `(hostname || uname -n) 2>/dev/null |
+Line 6127 
 on `(hostname || uname -n) 2>/dev/null |
  _ACEOF
- case $ac_config_files in *"
+ cat >>$CONFIG_STATUS <<_ACEOF
- "*) set x $ac_config_files; shift; ac_config_files=$*;;
- esac
- cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
  # Files that config.status was made for.
  config_files="$ac_config_files"
  _ACEOF
- cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+ cat >>$CONFIG_STATUS <<\_ACEOF
  ac_cs_usage="\
- \`$as_me' instantiates files and other configuration actions
+ \`$as_me' instantiates files from templates according to the
- from templates according to the current configuration.  Unless the files
+ current configuration.
- and actions are specified as TAGs, all are instantiated by default.
- Usage: $0 [OPTION]... [TAG]...
+ Usage: $0 [OPTIONS] [FILE]...
    -h, --help       print this help, then exit
    -V, --version    print version number and configuration settings, then exit
-       --config     print configuration, then exit
+   -q, --quiet      do not print progress messages
-   -q, --quiet, --silent
-                    do not print progress messages
    -d, --debug      don't remove temporary files
        --recheck    update $as_me by reconfiguring in the same conditions
-       --file=FILE[:TEMPLATE]
+   --file=FILE[:TEMPLATE]
                     instantiate the configuration file FILE
  Configuration files:
  $config_files
- Report bugs to <till@harbaum.org>."
+ Report bugs to <bug-autoconf@gnu.org>."
  _ACEOF
- cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+ cat >>$CONFIG_STATUS <<_ACEOF
- ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
  ac_cs_version="\\
  GPXView config.status 0.9.4
- configured by $0, generated by GNU Autoconf 2.65,
+ configured by $0, generated by GNU Autoconf 2.61,
-   with options \\"\$ac_cs_config\\"
+   with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
- Copyright (C) 2009 Free Software Foundation, Inc.
+ Copyright (C) 2006 Free Software Foundation, Inc.
  This config.status script is free software; the Free Software Foundation
  gives unlimited permission to copy, distribute and modify it."
  ac_pwd='$ac_pwd'
  srcdir='$srcdir'
  INSTALL='$INSTALL'
- test -n "\$AWK" || AWK=awk
  _ACEOF
- cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+ cat >>$CONFIG_STATUS <<\_ACEOF
- # The default lists apply if the user does not specify any file.
+ # If no file are specified by the user, then we need to provide default
+ # value.  By we need to know if files were specified by the user.
  ac_need_defaults=:
  while test $# != 0
  do
-Line 5778 
 do
+Line 6193 
 do
    -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
      ac_cs_recheck=: ;;
    --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
-     $as_echo "$ac_cs_version"; exit ;;
+     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 )
      $ac_shift
-     case $ac_optarg in
+     CONFIG_FILES="$CONFIG_FILES $ac_optarg"
-     *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
-     esac
-     as_fn_append CONFIG_FILES " '$ac_optarg'"
      ac_need_defaults=false;;
    --he | --h |  --help | --hel | -h )
-     $as_echo "$ac_cs_usage"; exit ;;
+     echo "$ac_cs_usage"; exit ;;
    -q | -quiet | --quiet | --quie | --qui | --qu | --q \
    | -silent | --silent | --silen | --sile | --sil | --si | --s)
      ac_cs_silent=: ;;
    # This is an error.
-   -*) as_fn_error "unrecognized option: \`$1'
+   -*) { echo "$as_me: error: unrecognized option: $1
- Try \`$0 --help' for more information." ;;
+ Try \`$0 --help' for more information." >&2
+    { (exit 1); exit 1; }; } ;;
-   *) as_fn_append ac_config_targets " $1"
+   *) ac_config_targets="$ac_config_targets $1"
       ac_need_defaults=false ;;
    esac
-Line 5815 
 if $ac_cs_silent; then
+Line 6226 
 if $ac_cs_silent; then
  fi
  _ACEOF
- cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+ cat >>$CONFIG_STATUS <<_ACEOF
  if \$ac_cs_recheck; then
-   set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
+   echo "running CONFIG_SHELL=$SHELL $SHELL $0 "$ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6
-   shift
+   CONFIG_SHELL=$SHELL
-   \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
-   CONFIG_SHELL='$SHELL'
    export CONFIG_SHELL
-   exec "\$@"
+   exec $SHELL "$0"$ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
  fi
  _ACEOF
- cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+ cat >>$CONFIG_STATUS <<\_ACEOF
  exec 5>>config.log
  {
    echo
    sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
  ## Running $as_me. ##
  _ASBOX
-   $as_echo "$ac_log"
+   echo "$ac_log"
  } >&5
  _ACEOF
- cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+ cat >>$CONFIG_STATUS <<_ACEOF
  _ACEOF
- cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+ cat >>$CONFIG_STATUS <<\_ACEOF
  # Handling of arguments.
  for ac_config_target in $ac_config_targets
-Line 5851 
 do
+Line 6260 
 do
      "data/Makefile") CONFIG_FILES="$CONFIG_FILES data/Makefile" ;;
      "debian/control") CONFIG_FILES="$CONFIG_FILES debian/control" ;;
-   *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
+   *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
+ echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
+    { (exit 1); exit 1; }; };;
    esac
  done
-Line 5876 
 $debug ||
+Line 6287 
 $debug ||
    trap 'exit_status=$?
    { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
  ' 0
-   trap 'as_fn_exit 1' 1 2 13 15
+   trap '{ (exit 1); exit 1; }' 1 2 13 15
  }
  # Create a (secure) tmp directory for tmp files.
-Line 5887 
 $debug ||
+Line 6298 
 $debug ||
  {
    tmp=./conf$$-$RANDOM
    (umask 077 && mkdir "$tmp")
- } || as_fn_error "cannot create a temporary directory in ." "$LINENO" 5
+ } ||
+ {
- # Set up the scripts for CONFIG_FILES section.
+    echo "$me: cannot create a temporary directory in ." >&2
- # No need to generate them if there are no CONFIG_FILES.
+    { (exit 1); exit 1; }
- # This happens for instance with `./config.status config.h'.
+ }
- if test -n "$CONFIG_FILES"; then
+ #
+ # Set up the sed scripts for CONFIG_FILES section.
+ #
- ac_cr=`echo X | tr X '\015'`
+ # No need to generate the scripts if there are no CONFIG_FILES.
- # On cygwin, bash can eat \r inside `` if the user requested igncr.
+ # This happens for instance when ./config.status config.h
- # But we know of no other shell where ac_cr would be empty at this
+ if test -n "$CONFIG_FILES"; then
- # 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'
- else
-   ac_cs_awk_cr=$ac_cr
- fi
- echo 'BEGIN {' >"$tmp/subs1.awk" &&
  _ACEOF
- {
-   echo "cat >conf$$subs.awk <<_ACEOF" &&
-   echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
-   echo "_ACEOF"
- } >conf$$subs.sh ||
-   as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
- 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 ||
+   cat >conf$$subs.sed <<_ACEOF
-     as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
+ SHELL!$SHELL$ac_delim
+ PATH_SEPARATOR!$PATH_SEPARATOR$ac_delim
+ PACKAGE_NAME!$PACKAGE_NAME$ac_delim
+ PACKAGE_TARNAME!$PACKAGE_TARNAME$ac_delim
+ PACKAGE_VERSION!$PACKAGE_VERSION$ac_delim
+ PACKAGE_STRING!$PACKAGE_STRING$ac_delim
+ PACKAGE_BUGREPORT!$PACKAGE_BUGREPORT$ac_delim
+ exec_prefix!$exec_prefix$ac_delim
+ prefix!$prefix$ac_delim
+ program_transform_name!$program_transform_name$ac_delim
+ bindir!$bindir$ac_delim
+ sbindir!$sbindir$ac_delim
+ libexecdir!$libexecdir$ac_delim
+ datarootdir!$datarootdir$ac_delim
+ datadir!$datadir$ac_delim
+ sysconfdir!$sysconfdir$ac_delim
+ sharedstatedir!$sharedstatedir$ac_delim
+ localstatedir!$localstatedir$ac_delim
+ includedir!$includedir$ac_delim
+ oldincludedir!$oldincludedir$ac_delim
+ docdir!$docdir$ac_delim
+ infodir!$infodir$ac_delim
+ htmldir!$htmldir$ac_delim
+ dvidir!$dvidir$ac_delim
+ pdfdir!$pdfdir$ac_delim
+ psdir!$psdir$ac_delim
+ libdir!$libdir$ac_delim
+ localedir!$localedir$ac_delim
+ mandir!$mandir$ac_delim
+ DEFS!$DEFS$ac_delim
+ ECHO_C!$ECHO_C$ac_delim
+ ECHO_N!$ECHO_N$ac_delim
+ ECHO_T!$ECHO_T$ac_delim
+ LIBS!$LIBS$ac_delim
+ build_alias!$build_alias$ac_delim
+ host_alias!$host_alias$ac_delim
+ target_alias!$target_alias$ac_delim
+ PACKAGE!$PACKAGE$ac_delim
+ CC!$CC$ac_delim
+ CFLAGS!$CFLAGS$ac_delim
+ LDFLAGS!$LDFLAGS$ac_delim
+ CPPFLAGS!$CPPFLAGS$ac_delim
+ ac_ct_CC!$ac_ct_CC$ac_delim
+ EXEEXT!$EXEEXT$ac_delim
+ OBJEXT!$OBJEXT$ac_delim
+ INSTALL_PROGRAM!$INSTALL_PROGRAM$ac_delim
+ INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim
+ INSTALL_DATA!$INSTALL_DATA$ac_delim
+ LN_S!$LN_S$ac_delim
+ SET_MAKE!$SET_MAKE$ac_delim
+ PKG_CONFIG!$PKG_CONFIG$ac_delim
+ gnome_vfs_module_CFLAGS!$gnome_vfs_module_CFLAGS$ac_delim
+ gnome_vfs_module_LIBS!$gnome_vfs_module_LIBS$ac_delim
+ libxml2_CFLAGS!$libxml2_CFLAGS$ac_delim
+ libxml2_LIBS!$libxml2_LIBS$ac_delim
+ libcurl_CFLAGS!$libcurl_CFLAGS$ac_delim
+ libcurl_LIBS!$libcurl_LIBS$ac_delim
+ libsoup24_CFLAGS!$libsoup24_CFLAGS$ac_delim
+ libsoup24_LIBS!$libsoup24_LIBS$ac_delim
+ libsoup22_CFLAGS!$libsoup22_CFLAGS$ac_delim
+ libsoup22_LIBS!$libsoup22_LIBS$ac_delim
+ libgtkhtml3_14_CFLAGS!$libgtkhtml3_14_CFLAGS$ac_delim
+ libgtkhtml3_14_LIBS!$libgtkhtml3_14_LIBS$ac_delim
+ libgtkhtml3_8_CFLAGS!$libgtkhtml3_8_CFLAGS$ac_delim
+ libgtkhtml3_8_LIBS!$libgtkhtml3_8_LIBS$ac_delim
+ hildon_CFLAGS!$hildon_CFLAGS$ac_delim
+ hildon_LIBS!$hildon_LIBS$ac_delim
+ osso_CFLAGS!$osso_CFLAGS$ac_delim
+ osso_LIBS!$osso_LIBS$ac_delim
+ hildon_fm_2_CFLAGS!$hildon_fm_2_CFLAGS$ac_delim
+ hildon_fm_2_LIBS!$hildon_fm_2_LIBS$ac_delim
+ sqlite3_CFLAGS!$sqlite3_CFLAGS$ac_delim
+ sqlite3_LIBS!$sqlite3_LIBS$ac_delim
+ hildon_help_CFLAGS!$hildon_help_CFLAGS$ac_delim
+ hildon_help_LIBS!$hildon_help_LIBS$ac_delim
+ gpsbt_CFLAGS!$gpsbt_CFLAGS$ac_delim
+ gpsbt_LIBS!$gpsbt_LIBS$ac_delim
+ liblocation_CFLAGS!$liblocation_CFLAGS$ac_delim
+ liblocation_LIBS!$liblocation_LIBS$ac_delim
+ MAEMO_VERSION_MAJOR!$MAEMO_VERSION_MAJOR$ac_delim
+ CPP!$CPP$ac_delim
+ GREP!$GREP$ac_delim
+ EGREP!$EGREP$ac_delim
+ gtk_CFLAGS!$gtk_CFLAGS$ac_delim
+ gtk_LIBS!$gtk_LIBS$ac_delim
+ gnome2_CFLAGS!$gnome2_CFLAGS$ac_delim
+ gnome2_LIBS!$gnome2_LIBS$ac_delim
+ gps_CFLAGS!$gps_CFLAGS$ac_delim
+ gps_LIBS!$gps_LIBS$ac_delim
+ EXTRA_OBJS!$EXTRA_OBJS$ac_delim
+ ICON!$ICON$ac_delim
+ INSTALL_PLATTFORM!$INSTALL_PLATTFORM$ac_delim
+ LIBOBJS!$LIBOBJS$ac_delim
+ LTLIBOBJS!$LTLIBOBJS$ac_delim
+ _ACEOF
-   ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
+   if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 94; then
-   if test $ac_delim_n = $ac_delim_num; then
      break
    elif $ac_last_try; then
-     as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
+     { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
+ echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
+    { (exit 1); exit 1; }; }
    else
      ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
    fi
  done
- rm -f conf$$subs.sh
- cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+ ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
- cat >>"\$tmp/subs1.awk" <<\\_ACAWK &&
+ if test -n "$ac_eof"; then
+   ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`
+   ac_eof=`expr $ac_eof + 1`
+ fi
+ cat >>$CONFIG_STATUS <<_ACEOF
+ cat >"\$tmp/subs-1.sed" <<\CEOF$ac_eof
+ /@[a-zA-Z_][a-zA-Z_0-9]*@/!b end
+ _ACEOF
+ sed '
+ s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
+ s/^/s,@/; s/!/@,|#_!!_#|/
+ :n
+ t n
+ s/'"$ac_delim"'$/,g/; t
+ s/$/\\/; p
+ N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
+ ' >>$CONFIG_STATUS <conf$$subs.sed
+ rm -f conf$$subs.sed
+ cat >>$CONFIG_STATUS <<_ACEOF
+ :end
+ s/|#_!!_#|//g
+ CEOF$ac_eof
  _ACEOF
- sed -n '
- h
- s/^/S["/; s/!.*/"]=/
- p
- g
- s/^[^!]*!//
- :repl
- t repl
- s/'"$ac_delim"'$//
- t delim
- :nl
- h
- s/\(.\{148\}\)..*/\1/
- t more1
- s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/
- p
- n
- b repl
- :more1
- s/["\\]/\\&/g; s/^/"/; s/$/"\\/
- p
- g
- s/.\{148\}//
- t nl
- :delim
- h
- s/\(.\{148\}\)..*/\1/
- t more2
- s/["\\]/\\&/g; s/^/"/; s/$/"/
- p
- b
- :more2
- s/["\\]/\\&/g; s/^/"/; s/$/"\\/
- p
- g
- s/.\{148\}//
- t delim
- ' <conf$$subs.awk | sed '
- /^[^""]/{
-   N
-   s/\n//
- }
- ' >>$CONFIG_STATUS || ac_write_fail=1
- rm -f conf$$subs.awk
- cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
- _ACAWK
- cat >>"\$tmp/subs1.awk" <<_ACAWK &&
-   for (key in S) S_is_set[key] = 1
-   FS = ""
- }
- {
-   line = $ 0
-   nfields = split(line, field, "@")
-   substed = 0
-   len = length(field[1])
-   for (i = 2; i < nfields; i++) {
-     key = field[i]
-     keylen = length(key)
-     if (S_is_set[key]) {
-       value = S[key]
-       line = substr(line, 1, len) "" value "" substr(line, len + keylen + 3)
-       len += length(value) + length(field[++i])
-       substed = 1
-     } else
-       len += 1 + keylen
-   }
-   print line
- }
- _ACAWK
- _ACEOF
- cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
- if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then
-   sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"
- else
-   cat
- fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
-   || as_fn_error "could not setup config files machinery" "$LINENO" 5
- _ACEOF
  # VPATH may cause trouble with some makes, so we remove $(srcdir),
  # ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
-Line 6036 
 s/^[^=]*=[      ]*$//
+Line 6468 
 s/^[^=]*=[      ]*$//
  }'
  fi
- cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+ cat >>$CONFIG_STATUS <<\_ACEOF
  fi # test -n "$CONFIG_FILES"
- eval set X "  :F $CONFIG_FILES      "
+ for ac_tag in  :F $CONFIG_FILES
- shift
- for ac_tag
  do
    case $ac_tag in
    :[FHLC]) ac_mode=$ac_tag; continue;;
    esac
    case $ac_mode$ac_tag in
    :[FHL]*:*);;
-   :L* | :C*:*) as_fn_error "invalid tag \`$ac_tag'" "$LINENO" 5;;
+   :L* | :C*:*) { { echo "$as_me:$LINENO: error: Invalid tag $ac_tag." >&5
+ 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 6077 
 do
+Line 6509 
 do
             [\\/$]*) false;;
             *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
             esac ||
-            as_fn_error "cannot find input file: \`$ac_f'" "$LINENO" 5;;
+            { { echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5
+ 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
      # use $as_me), people would be surprised to read:
      #    /* config.h.  Generated by config.status.  */
-     configure_input='Generated from '`
+     configure_input="Generated from "`IFS=:
-           $as_echo "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g'
+           echo $* | sed 's|^[^:]*/||;s|:[^:]*/|, |g'`" by configure."
-         `' by configure.'
      if test x"$ac_file" != x-; then
        configure_input="$ac_file.  $configure_input"
-       { $as_echo "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5
+       { echo "$as_me:$LINENO: creating $ac_file" >&5
- $as_echo "$as_me: creating $ac_file" >&6;}
+ echo "$as_me: creating $ac_file" >&6;}
      fi
-     # Neutralize special characters interpreted by sed in replacement strings.
-     case $configure_input in #(
-     *\&* | *\|* | *\\* )
-        ac_sed_conf_input=`$as_echo "$configure_input" |
-        sed 's/[\\\\&|]/\\\\&/g'`;; #(
-     *) ac_sed_conf_input=$configure_input;;
-     esac
      case $ac_tag in
-     *:-:* | *:-) cat >"$tmp/stdin" \
+     *:-:* | *:-) cat >"$tmp/stdin";;
-       || as_fn_error "could not create $ac_file" "$LINENO" 5 ;;
      esac
      ;;
    esac
-Line 6114 
 $as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^
+Line 6538 
 $as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^
           X"$ac_file" : 'X\(//\)[^/]' \| \
           X"$ac_file" : 'X\(//\)$' \| \
           X"$ac_file" : 'X\(/\)' \| . 2>/dev/null ||
- $as_echo X"$ac_file" |
+ echo X"$ac_file" |
+     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+             s//\1/
+             q
+           }
+           /^X\(\/\/\)[^/].*/{
+             s//\1/
+             q
+           }
+           /^X\(\/\/\)$/{
+             s//\1/
+             q
+           }
+           /^X\(\/\).*/{
+             s//\1/
+             q
+           }
+           s/.*/./; q'`
+   { as_dir="$ac_dir"
+   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=`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 ||
+ echo X"$as_dir" |
      sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
              s//\1/
              q
-Line 6132 
 $as_echo X"$ac_file" |
+Line 6591 
 $as_echo X"$ac_file" |
              q
            }
            s/.*/./; q'`
-   as_dir="$ac_dir"; as_fn_mkdir_p
+       test -d "$as_dir" && break
+     done
+     test -z "$as_dirs" || eval "mkdir $as_dirs"
+   } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
+ echo "$as_me: error: cannot create directory $as_dir" >&2;}
+    { (exit 1); exit 1; }; }; }
    ac_builddir=.
  case "$ac_dir" in
  .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
  *)
-   ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
+   ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
    # A ".." for each directory in $ac_dir_suffix.
-   ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
+   ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'`
    case $ac_top_builddir_sub in
    "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
    *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
-Line 6180 
 ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_
+Line 6644 
 ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_
    esac
  _ACEOF
- cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+ cat >>$CONFIG_STATUS <<\_ACEOF
  # 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/ {
+ case `sed -n '/datarootdir/ {
    p
    q
  }
-Line 6193 
 ac_sed_dataroot='
+Line 6657 
 ac_sed_dataroot='
  /@docdir@/p
  /@infodir@/p
  /@localedir@/p
- /@mandir@/p'
+ /@mandir@/p
- case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in
+ ' $ac_file_inputs` in
  *datarootdir*) ac_datarootdir_seen=yes;;
  *@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
-   { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
+   { echo "$as_me:$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;}
+ echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
  _ACEOF
- cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+ cat >>$CONFIG_STATUS <<_ACEOF
    ac_datarootdir_hack='
    s&@datadir@&$datadir&g
    s&@docdir@&$docdir&g
    s&@infodir@&$infodir&g
    s&@localedir@&$localedir&g
    s&@mandir@&$mandir&g
-   s&\\\${datarootdir}&$datarootdir&g' ;;
+     s&\\\${datarootdir}&$datarootdir&g' ;;
  esac
  _ACEOF
  # Neutralize VPATH when `$srcdir' = `.'.
  # Shell code in configure.ac might set extrasub.
  # FIXME: do we really want to maintain this feature?
- cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+ cat >>$CONFIG_STATUS <<_ACEOF
- ac_sed_extra="$ac_vpsub
+   sed "$ac_vpsub
  $extrasub
  _ACEOF
- cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+ cat >>$CONFIG_STATUS <<\_ACEOF
  :t
  /@[a-zA-Z_][a-zA-Z_0-9]*@/!b
- s|@configure_input@|$ac_sed_conf_input|;t t
+ s&@configure_input@&$configure_input&;t t
  s&@top_builddir@&$ac_top_builddir_sub&;t t
- s&@top_build_prefix@&$ac_top_build_prefix&;t t
  s&@srcdir@&$ac_srcdir&;t t
  s&@abs_srcdir@&$ac_abs_srcdir&;t t
  s&@top_srcdir@&$ac_top_srcdir&;t t
-Line 6233 
 s&@abs_builddir@&$ac_abs_builddir&;t t
+Line 6696 
 s&@abs_builddir@&$ac_abs_builddir&;t t
  s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
  s&@INSTALL@&$ac_INSTALL&;t t
  $ac_datarootdir_hack
- "
+ " $ac_file_inputs | sed -f "$tmp/subs-1.sed" >$tmp/out
- eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
-   || as_fn_error "could not create $ac_file" "$LINENO" 5
  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:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+   { echo "$as_me:$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'
+ 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;}
    rm -f "$tmp/stdin"
    case $ac_file in
-   -) cat "$tmp/out" && rm -f "$tmp/out";;
+   -) cat "$tmp/out"; rm -f "$tmp/out";;
-   *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
+   *) rm -f "$ac_file"; mv "$tmp/out" $ac_file;;
-   esac \
+   esac
-   || as_fn_error "could not create $ac_file" "$LINENO" 5
   ;;
-Line 6260 
 which seems to be undefined.  Please mak
+Line 6720 
 which seems to be undefined.  Please mak
  done # for ac_tag
- as_fn_exit 0
+ { (exit 0); exit 0; }
  _ACEOF
+ chmod +x $CONFIG_STATUS
  ac_clean_files=$ac_clean_files_save
- test $ac_write_fail = 0 ||
-   as_fn_error "write failure creating $CONFIG_STATUS" "$LINENO" 5
  # configure is writing to config.log, and then calls config.status.
  # config.status does its own redirection, appending to config.log.
-Line 6286 
 if test "$no_create" != yes; then
+Line 6744 
 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 || as_fn_exit $?
+   $ac_cs_success || { (exit 1); exit 1; }
- fi
- if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
-   { $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.281
 


changed lines


 
Added in v.282
 Legend:



Removed from v.281
 


changed lines


 
Added in v.282
-Removed from v.281
+Added in v.282