[gpxview] Diff of /trunk/configure

Diff of /trunk/configure

Parent Directory | Revision Log | View Patch Patch

-revision 60 by harbaum,
Mon Aug 17 19:44:00 2009 UTC
+revision 61 by harbaum,
Tue Aug 18 14:32:45 2009 UTC
 Line 1
  #! /bin/sh
  # Guess values for system-dependent variables and create Makefiles.
- # Generated by GNU Autoconf 2.63 for GPXView 0.8.4.
+ # Generated by GNU Autoconf 2.61 for GPXView 0.8.5.
  #
  # Report bugs to <till@harbaum.org>.
  #
  # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
- # 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+ # 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
  # This configure script is free software; the Free Software Foundation
  # gives unlimited permission to copy, distribute and modify it.
  ## --------------------- ##
 Line 17 
 DUALCASE=1; export DUALCASE # for MKS sh
  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
 Line 39 
 as_cr_Letters=$as_cr_letters$as_cr_LETTE
  as_cr_digits='0123456789'
  as_cr_alnum=$as_cr_Letters$as_cr_digits
- as_nl='
- '
- export as_nl
- # Printing a long string crashes Solaris 7 /usr/bin/printf.
- as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
- as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
- as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
- if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
-   as_echo='printf %s\n'
-   as_echo_n='printf %s'
- else
-   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\\(.*\\)"'
-     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
-   as_echo='sh -c $as_echo_body as_echo'
- fi
  # The user is always right.
  if test "${PATH_SEPARATOR+set}" != set; then
-   PATH_SEPARATOR=:
+   echo "#! /bin/sh" >conf$$.sh
-   (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
+   echo  "exit 0"   >>conf$$.sh
-     (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
+   chmod +x conf$$.sh
-       PATH_SEPARATOR=';'
+   if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-   }
+     PATH_SEPARATOR=';'
+   else
+     PATH_SEPARATOR=:
+   fi
+   rm -f conf$$.sh
  fi
  # Support unset when possible.
-Line 93 
 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.
-Line 115 
 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; }
  fi
-Line 128 
 PS2='> '
+Line 102 
 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 &&
-Line 153 
 as_me=`$as_basename -- "$0" ||
+Line 134 
 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 179 
 else
+Line 160 
 else
    as_have_required=no
  fi
    if test $as_have_required = yes &&     (eval ":
  (as_func_return () {
    (exit \$1)
  }
-Line 261 
 IFS=$as_save_IFS
+Line 242 
 IFS=$as_save_IFS
  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
-Line 282 
 _ASEOF
+Line 263 
 _ASEOF
  if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
    emulate sh
    NULLCMD=:
-   # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
+   # 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
-Line 362 
 fi
+Line 343 
 fi
        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
-Line 434 
 fi
+Line 415 
 fi
  test \$exitcode = 0") || {
    echo No shell found that supports shell functions.
-   echo Please tell bug-autoconf@gnu.org about your system,
+   echo Please tell autoconf@gnu.org about your system,
-   echo including any error possibly output before this message.
+   echo including any error possibly output before this
-   echo This can help us improve future autoconf versions.
+   echo message
-   echo Configuration will now proceed without shell functions.
  }
-Line 473 
 test \$exitcode = 0") || {
+Line 453 
 test \$exitcode = 0") || {
        s/-\n.*//
      ' >$as_me.lineno &&
    chmod +x "$as_me.lineno" ||
-     { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
+     { 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
-Line 501 
 case `echo -n x` in
+Line 481 
 case `echo -n x` in
  *)
    ECHO_N='-n';;
  esac
  if expr a : '\(a\)' >/dev/null 2>&1 &&
     test "X`expr 00001 : '.*\(...\)'`" = X001; then
    as_expr=expr
-Line 513 
 if test -d conf$$.dir; then
+Line 494 
 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 553 
 else
+Line 531 
 else
    as_test_x='
      eval sh -c '\''
        if test -d "$1"; then
          test -d "$1/.";
        else
          case $1 in
          -*)set "./$1";;
          esac;
          case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
          ???[sx]*):;;*)false;;esac;fi
-Line 596 
 SHELL=${CONFIG_SHELL-/bin/sh}
+Line 574 
 SHELL=${CONFIG_SHELL-/bin/sh}
  # Identity of this package.
  PACKAGE_NAME='GPXView'
  PACKAGE_TARNAME='gpxview'
- PACKAGE_VERSION='0.8.4'
+ PACKAGE_VERSION='0.8.5'
- PACKAGE_STRING='GPXView 0.8.4'
+ PACKAGE_STRING='GPXView 0.8.5'
  PACKAGE_BUGREPORT='till@harbaum.org'
  ac_unique_file="src/main.c"
- ac_subst_vars='LTLIBOBJS
+ ac_subst_vars='SHELL
- LIBOBJS
- INSTALL_PLATTFORM
- EXTRA_OBJS
- gnome2_LIBS
- gnome2_CFLAGS
- gtk_LIBS
- gtk_CFLAGS
- 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
- 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_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
+ 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
+ gtk_CFLAGS
+ gtk_LIBS
+ gnome2_CFLAGS
+ gnome2_LIBS
+ EXTRA_OBJS
+ INSTALL_PLATTFORM
+ LIBOBJS
+ LTLIBOBJS'
  ac_subst_files=''
- ac_user_opts='
- enable_option_checking
- '
        ac_precious_vars='build_alias
  host_alias
  target_alias
-Line 734 
 gnome2_LIBS'
+Line 709 
 gnome2_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 834 
 do
+Line 807 
 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_echo "$as_me: error: invalid feature name: $ac_useropt" >&2
+       { echo "$as_me: error: invalid feature name: $ac_feature" >&2
     { (exit 1); exit 1; }; }
-     ac_useropt_orig=$ac_useropt
+     ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
-     ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+     eval enable_$ac_feature=no ;;
-     case $ac_user_opts in
-       *"
- "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 861 
 do
+Line 826 
 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_echo "$as_me: error: invalid feature name: $ac_useropt" >&2
+       { echo "$as_me: error: invalid feature name: $ac_feature" >&2
     { (exit 1); exit 1; }; }
-     ac_useropt_orig=$ac_useropt
+     ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
-     ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+     eval enable_$ac_feature=\$ac_optarg ;;
-     case $ac_user_opts in
-       *"
- "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 1066 
 do
+Line 1023 
 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_echo "$as_me: error: invalid package name: $ac_useropt" >&2
+       { echo "$as_me: error: invalid package name: $ac_package" >&2
     { (exit 1); exit 1; }; }
-     ac_useropt_orig=$ac_useropt
+     ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
-     ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+     eval with_$ac_package=\$ac_optarg ;;
-     case $ac_user_opts in
-       *"
- "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_echo "$as_me: error: invalid package name: $ac_useropt" >&2
+       { echo "$as_me: error: invalid package name: $ac_package" >&2
     { (exit 1); exit 1; }; }
-     ac_useropt_orig=$ac_useropt
+     ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
-     ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+     eval with_$ac_package=no ;;
-     case $ac_user_opts in
-       *"
- "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 1058 
 do
    | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
      x_libraries=$ac_optarg ;;
-   -*) { $as_echo "$as_me: error: unrecognized option: $ac_option
+   -*) { echo "$as_me: error: unrecognized option: $ac_option
  Try \`$0 --help' for more information." >&2
     { (exit 1); exit 1; }; }
      ;;
-Line 1126 
 Try \`$0 --help' for more information."
+Line 1067 
 Try \`$0 --help' for more information."
      ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
      # Reject names that are not valid shell variable names.
      expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
-       { $as_echo "$as_me: error: invalid variable name: $ac_envvar" >&2
+       { echo "$as_me: error: invalid variable name: $ac_envvar" >&2
     { (exit 1); exit 1; }; }
      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 1085 
 done
  if test -n "$ac_prev"; then
    ac_option=--`echo $ac_prev | sed 's/_/-/g'`
-   { $as_echo "$as_me: error: missing argument to $ac_option" >&2
+   { echo "$as_me: error: missing argument to $ac_option" >&2
     { (exit 1); exit 1; }; }
  fi
- if test -n "$ac_unrecognized_opts"; then
+ # Be sure to have absolute directory names.
-   case $enable_option_checking in
-     no) ;;
-     fatal) { $as_echo "$as_me: error: unrecognized options: $ac_unrecognized_opts" >&2
-    { (exit 1); exit 1; }; } ;;
-     *)     $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
-   esac
- fi
- # Check all directory arguments for consistency.
  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_echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
+   { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
     { (exit 1); exit 1; }; }
  done
-Line 1190 
 target=$target_alias
+Line 1115 
 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 1206 
 test "$silent" = yes && exec 6>/dev/null
+Line 1131 
 test "$silent" = yes && exec 6>/dev/null
  ac_pwd=`pwd` && test -n "$ac_pwd" &&
  ac_ls_di=`ls -di .` &&
  ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
-   { $as_echo "$as_me: error: working directory cannot be determined" >&2
+   { 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_echo "$as_me: error: pwd does not report name of working directory" >&2
+   { echo "$as_me: error: pwd does not report name of working directory" >&2
     { (exit 1); exit 1; }; }
-Line 1217 
 test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
+Line 1142 
 test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
  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 1249 
 else
+Line 1174 
 else
  fi
  if test ! -r "$srcdir/$ac_unique_file"; then
    test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
-   { $as_echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
+   { 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_echo "$as_me: error: $ac_msg" >&2
+         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=.
-Line 1281 
 if test "$ac_init_help" = "long"; then
+Line 1206 
 if test "$ac_init_help" = "long"; then
    # Omit some internal or obsolete options to make the list less imposing.
    # This message is too long to be a string in the A/UX 3.1 sh.
    cat <<_ACEOF
- \`configure' configures GPXView 0.8.4 to adapt to many kinds of systems.
+ \`configure' configures GPXView 0.8.5 to adapt to many kinds of systems.
  Usage: $0 [OPTION]... [VAR=VALUE]...
-Line 1303 
 Configuration:
+Line 1228 
 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 1315 
 for instance \`--prefix=\$HOME'.
+Line 1240 
 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 1342 
 fi
+Line 1267 
 fi
  if test -n "$ac_init_help"; then
    case $ac_init_help in
-      short | recursive ) echo "Configuration of GPXView 0.8.4:";;
+      short | recursive ) echo "Configuration of GPXView 0.8.5:";;
     esac
    cat <<\_ACEOF
-Line 1420 
 fi
+Line 1345 
 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 1466 
 ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_
+Line 1389 
 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 1475 
 fi
+Line 1398 
 fi
  test -n "$ac_init_help" && exit $ac_status
  if $ac_init_version; then
    cat <<\_ACEOF
- GPXView configure 0.8.4
+ GPXView configure 0.8.5
- generated by GNU Autoconf 2.63
+ generated by GNU Autoconf 2.61
  Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+, 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
-Line 1489 
 cat >config.log <<_ACEOF
+Line 1412 
 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.8.4, which was
+ It was created by GPXView $as_me 0.8.5, which was
- generated by GNU Autoconf 2.63.  Invocation command line was
+ generated by GNU Autoconf 2.61.  Invocation command line was
    $ $0 $@
-Line 1526 
 for as_dir in $PATH
+Line 1449 
 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
  IFS=$as_save_IFS
-Line 1561 
 do
+Line 1484 
 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
 ) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;;
-Line 1613 
 _ASBOX
+Line 1536 
 _ASBOX
      case $ac_val in #(
      *${as_nl}*)
        case $ac_var in #(
-       *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5
+       *_cv_*) { 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 ;;
        esac ;;
      esac
-Line 1648 
 _ASBOX
+Line 1570 
 _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 1665 
 _ASBOX
+Line 1587 
 _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 1683 
 _ASBOX
+Line 1605 
 _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 &&
-Line 1726 
 _ACEOF
+Line 1648 
 _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
-     { $as_echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
+     { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
- $as_echo "$as_me: loading site script $ac_site_file" >&6;}
+ echo "$as_me: loading site script $ac_site_file" >&6;}
      sed 's/^/| /' "$ac_site_file" >&5
      . "$ac_site_file"
    fi
-Line 1753 
 if test -r "$cache_file"; then
+Line 1672 
 if test -r "$cache_file"; then
    # Some versions of bash will fail to source /dev/null (special
    # files actually), so we avoid doing that.
    if test -f "$cache_file"; then
-     { $as_echo "$as_me:$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:$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 1776 
 for ac_var in $ac_precious_vars; do
+Line 1695 
 for ac_var in $ac_precious_vars; do
    eval ac_new_val=\$ac_env_${ac_var}_value
    case $ac_old_set,$ac_new_set in
      set,)
-       { $as_echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
+       { 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:$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:$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:$LINENO: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5
- $as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;}
-           eval $ac_var=\$ac_old_val
-         fi
-         { $as_echo "$as_me:$LINENO:   former value:  \`$ac_old_val'" >&5
- $as_echo "$as_me:   former value:  \`$ac_old_val'" >&2;}
-         { $as_echo "$as_me:$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
-Line 1817 
 $as_echo "$as_me:   current value: \`$ac
+Line 1727 
 $as_echo "$as_me:   current value: \`$ac
    fi
  done
  if $ac_cache_corrupted; then
-   { $as_echo "$as_me:$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:$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_echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
- $as_echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
     { (exit 1); exit 1; }; }
  fi
-Line 1872 
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
+Line 1780 
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
  if test -n "$ac_tool_prefix"; then
    # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
  set dummy ${ac_tool_prefix}gcc; ac_word=$2
- { $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+ { 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
-   $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 1888 
 do
+Line 1796 
 do
    for ac_exec_ext in '' $ac_executable_extensions; do
    if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
      ac_cv_prog_CC="${ac_tool_prefix}gcc"
-     $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
    fi
  done
-Line 1899 
 fi
+Line 1807 
 fi
  fi
  CC=$ac_cv_prog_CC
  if test -n "$CC"; then
-   { $as_echo "$as_me:$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:$LINENO: result: no" >&5
+   { echo "$as_me:$LINENO: result: no" >&5
- $as_echo "no" >&6; }
+ echo "${ECHO_T}no" >&6; }
  fi
-Line 1912 
 if test -z "$ac_cv_prog_CC"; then
+Line 1820 
 if test -z "$ac_cv_prog_CC"; then
    ac_ct_CC=$CC
    # Extract the first word of "gcc", so it can be a program name with args.
  set dummy gcc; ac_word=$2
- { $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+ { 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
-   $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 1928 
 do
+Line 1836 
 do
    for ac_exec_ext in '' $ac_executable_extensions; do
    if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
      ac_cv_prog_ac_ct_CC="gcc"
-     $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
    fi
  done
-Line 1939 
 fi
+Line 1847 
 fi
  fi
  ac_ct_CC=$ac_cv_prog_ac_ct_CC
  if test -n "$ac_ct_CC"; then
-   { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
+   { 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:$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 1951 
 fi
+Line 1859 
 fi
    else
      case $cross_compiling:$ac_tool_warned in
  yes:)
- { $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+ { 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 1965 
 if test -z "$CC"; then
+Line 1877 
 if test -z "$CC"; then
            if test -n "$ac_tool_prefix"; then
      # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
  set dummy ${ac_tool_prefix}cc; ac_word=$2
- { $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+ { 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
-   $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 1981 
 do
+Line 1893 
 do
    for ac_exec_ext in '' $ac_executable_extensions; do
    if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
      ac_cv_prog_CC="${ac_tool_prefix}cc"
-     $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
    fi
  done
-Line 1992 
 fi
+Line 1904 
 fi
  fi
  CC=$ac_cv_prog_CC
  if test -n "$CC"; then
-   { $as_echo "$as_me:$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:$LINENO: result: no" >&5
+   { echo "$as_me:$LINENO: result: no" >&5
- $as_echo "no" >&6; }
+ echo "${ECHO_T}no" >&6; }
  fi
-Line 2005 
 fi
+Line 1917 
 fi
  if test -z "$CC"; then
    # Extract the first word of "cc", so it can be a program name with args.
  set dummy cc; ac_word=$2
- { $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+ { 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
-   $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 2026 
 do
+Line 1938 
 do
         continue
       fi
      ac_cv_prog_CC="cc"
-     $as_echo "$as_me:$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
-Line 2049 
 fi
+Line 1961 
 fi
  fi
  CC=$ac_cv_prog_CC
  if test -n "$CC"; then
-   { $as_echo "$as_me:$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:$LINENO: result: no" >&5
+   { echo "$as_me:$LINENO: result: no" >&5
- $as_echo "no" >&6; }
+ echo "${ECHO_T}no" >&6; }
  fi
-Line 2064 
 if test -z "$CC"; then
+Line 1976 
 if test -z "$CC"; then
    do
      # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
  set dummy $ac_tool_prefix$ac_prog; ac_word=$2
- { $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+ { 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
-   $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 2080 
 do
+Line 1992 
 do
    for ac_exec_ext in '' $ac_executable_extensions; do
    if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
      ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
-     $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
    fi
  done
-Line 2091 
 fi
+Line 2003 
 fi
  fi
  CC=$ac_cv_prog_CC
  if test -n "$CC"; then
-   { $as_echo "$as_me:$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:$LINENO: result: no" >&5
+   { echo "$as_me:$LINENO: result: no" >&5
- $as_echo "no" >&6; }
+ echo "${ECHO_T}no" >&6; }
  fi
-Line 2108 
 if test -z "$CC"; then
+Line 2020 
 if test -z "$CC"; then
  do
    # Extract the first word of "$ac_prog", so it can be a program name with args.
  set dummy $ac_prog; ac_word=$2
- { $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+ { 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
-   $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 2124 
 do
+Line 2036 
 do
    for ac_exec_ext in '' $ac_executable_extensions; do
    if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
      ac_cv_prog_ac_ct_CC="$ac_prog"
-     $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
    fi
  done
-Line 2135 
 fi
+Line 2047 
 fi
  fi
  ac_ct_CC=$ac_cv_prog_ac_ct_CC
  if test -n "$ac_ct_CC"; then
-   { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
+   { 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:$LINENO: result: no" >&5
+   { echo "$as_me:$LINENO: result: no" >&5
- $as_echo "no" >&6; }
+ echo "${ECHO_T}no" >&6; }
  fi
-Line 2151 
 done
+Line 2063 
 done
    else
      case $cross_compiling:$ac_tool_warned in
  yes:)
- { $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+ { 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 2162 
 fi
+Line 2078 
 fi
  fi
- test -z "$CC" && { { $as_echo "$as_me:$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;}
- { { $as_echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
  See \`config.log' for more details." >&5
- $as_echo "$as_me: 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." >&2;}
-    { (exit 1); exit 1; }; }; }
+    { (exit 1); exit 1; }; }
  # Provide some information about the compiler.
- $as_echo "$as_me:$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"
  case "(($ac_try" in
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
- eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- $as_echo "$ac_try_echo") >&5
    (eval "$ac_compiler --version >&5") 2>&5
    ac_status=$?
-   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }
  { (ac_try="$ac_compiler -v >&5"
  case "(($ac_try" in
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
- eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- $as_echo "$ac_try_echo") >&5
    (eval "$ac_compiler -v >&5") 2>&5
    ac_status=$?
-   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }
  { (ac_try="$ac_compiler -V >&5"
  case "(($ac_try" in
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
- eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- $as_echo "$ac_try_echo") >&5
    (eval "$ac_compiler -V >&5") 2>&5
    ac_status=$?
-   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }
  cat >conftest.$ac_ext <<_ACEOF
-Line 2224 
 main ()
+Line 2134 
 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:$LINENO: checking for C compiler default output file name" >&5
+ { echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
- $as_echo_n "checking for C compiler default output file name... " >&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
-Line 2250 
 case "(($ac_try" in
+Line 2165 
 case "(($ac_try" in
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
- eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+ eval "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:$LINENO: \$? = $ac_status" >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (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'
-Line 2265 
 for ac_file in $ac_files ''
+Line 2179 
 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
-Line 2292 
 else
+Line 2206 
 else
    ac_file=''
  fi
- { $as_echo "$as_me:$LINENO: result: $ac_file" >&5
+ { echo "$as_me:$LINENO: result: $ac_file" >&5
- $as_echo "$ac_file" >&6; }
+ echo "${ECHO_T}$ac_file" >&6; }
  if test -z "$ac_file"; then
-   $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:$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;}
- { { $as_echo "$as_me:$LINENO: error: C compiler cannot create executables
  See \`config.log' for more details." >&5
- $as_echo "$as_me: error: C compiler cannot create executables
+ echo "$as_me: error: C compiler cannot create executables
  See \`config.log' for more details." >&2;}
-    { (exit 77); exit 77; }; }; }
+    { (exit 77); exit 77; }; }
  fi
  ac_exeext=$ac_cv_exeext
  # Check that the compiler produces executables we can run.  If not, either
  # the compiler is broken, or we cross compile.
- { $as_echo "$as_me:$LINENO: checking whether the C compiler works" >&5
+ { echo "$as_me:$LINENO: checking whether the C compiler works" >&5
- $as_echo_n "checking whether the C compiler works... " >&6; }
+ 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
-Line 2321 
 if test "$cross_compiling" != yes; then
+Line 2233 
 if test "$cross_compiling" != yes; then
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
- eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- $as_echo "$ac_try_echo") >&5
    (eval "$ac_try") 2>&5
    ac_status=$?
-   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
      cross_compiling=no
    else
      if test "$cross_compiling" = maybe; then
          cross_compiling=yes
      else
-         { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+         { { echo "$as_me:$LINENO: error: cannot run C compiled programs.
- $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
- { { $as_echo "$as_me:$LINENO: error: cannot run C compiled programs.
  If you meant to cross compile, use \`--host'.
  See \`config.log' for more details." >&5
- $as_echo "$as_me: error: cannot run C compiled programs.
+ 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; }; }; }
+    { (exit 1); exit 1; }; }
      fi
    fi
  fi
- { $as_echo "$as_me:$LINENO: result: yes" >&5
+ { echo "$as_me:$LINENO: result: yes" >&5
- $as_echo "yes" >&6; }
+ echo "${ECHO_T}yes" >&6; }
- rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
+ rm -f a.out a.exe conftest$ac_cv_exeext b.out
  ac_clean_files=$ac_clean_files_save
  # Check that the compiler produces executables we can run.  If not, either
  # the compiler is broken, or we cross compile.
- { $as_echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
+ { echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
- $as_echo_n "checking whether we are cross compiling... " >&6; }
+ echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6; }
- { $as_echo "$as_me:$LINENO: result: $cross_compiling" >&5
+ { echo "$as_me:$LINENO: result: $cross_compiling" >&5
- $as_echo "$cross_compiling" >&6; }
+ echo "${ECHO_T}$cross_compiling" >&6; }
- { $as_echo "$as_me:$LINENO: checking for suffix of executables" >&5
+ { echo "$as_me:$LINENO: checking for suffix of executables" >&5
- $as_echo_n "checking for suffix of executables... " >&6; }
+ 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:$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:$LINENO: \$? = $ac_status" >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; then
    # If both `conftest.exe' and `conftest' are `present' (well, observable)
  # catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will
-Line 2376 
 $as_echo "$ac_try_echo") >&5
+Line 2284 
 $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:$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;}
- { { $as_echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
  See \`config.log' for more details." >&5
- $as_echo "$as_me: 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." >&2;}
-    { (exit 1); exit 1; }; }; }
+    { (exit 1); exit 1; }; }
  fi
  rm -f conftest$ac_cv_exeext
- { $as_echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
+ { echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
- $as_echo "$ac_cv_exeext" >&6; }
+ echo "${ECHO_T}$ac_cv_exeext" >&6; }
  rm -f conftest.$ac_ext
  EXEEXT=$ac_cv_exeext
  ac_exeext=$EXEEXT
- { $as_echo "$as_me:$LINENO: checking for suffix of object files" >&5
+ { echo "$as_me:$LINENO: checking for suffix of object files" >&5
- $as_echo_n "checking for suffix of object files... " >&6; }
+ echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6; }
  if test "${ac_cv_objext+set}" = set; then
-   $as_echo_n "(cached) " >&6
+   echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
-Line 2425 
 case "(($ac_try" in
+Line 2331 
 case "(($ac_try" in
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
- eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+ eval "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:$LINENO: \$? = $ac_status" >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (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:$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;}
- { { $as_echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile
  See \`config.log' for more details." >&5
- $as_echo "$as_me: 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." >&2;}
-    { (exit 1); exit 1; }; }; }
+    { (exit 1); exit 1; }; }
  fi
  rm -f conftest.$ac_cv_objext conftest.$ac_ext
  fi
- { $as_echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
+ { 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:$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
-   $as_echo_n "(cached) " >&6
+   echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
-Line 2487 
 case "(($ac_try" in
+Line 2390 
 case "(($ac_try" in
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
- eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- $as_echo "$ac_try_echo") >&5
    (eval "$ac_compile") 2>conftest.er1
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
    cat conftest.err >&5
-   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
           test -z "$ac_c_werror_flag" ||
           test ! -s conftest.err
         } && test -s conftest.$ac_objext; then
    ac_compiler_gnu=yes
  else
-   $as_echo "$as_me: failed program was:" >&5
+   echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
          ac_compiler_gnu=no
-Line 2511 
 rm -f core conftest.err conftest.$ac_obj
+Line 2413 
 rm -f core conftest.err conftest.$ac_obj
  ac_cv_c_compiler_gnu=$ac_compiler_gnu
  fi
- { $as_echo "$as_me:$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:$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
-   $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
-Line 2550 
 case "(($ac_try" in
+Line 2448 
 case "(($ac_try" in
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
- eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- $as_echo "$ac_try_echo") >&5
    (eval "$ac_compile") 2>conftest.er1
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
    cat conftest.err >&5
-   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
           test -z "$ac_c_werror_flag" ||
           test ! -s conftest.err
         } && test -s conftest.$ac_objext; then
    ac_cv_prog_cc_g=yes
  else
-   $as_echo "$as_me: failed program was:" >&5
+   echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
          CFLAGS=""
-Line 2589 
 case "(($ac_try" in
+Line 2486 
 case "(($ac_try" in
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
- eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- $as_echo "$ac_try_echo") >&5
    (eval "$ac_compile") 2>conftest.er1
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
    cat conftest.err >&5
-   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
           test -z "$ac_c_werror_flag" ||
           test ! -s conftest.err
         } && test -s conftest.$ac_objext; then
    :
  else
-   $as_echo "$as_me: failed program was:" >&5
+   echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
          ac_c_werror_flag=$ac_save_c_werror_flag
-Line 2629 
 case "(($ac_try" in
+Line 2525 
 case "(($ac_try" in
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
- eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- $as_echo "$ac_try_echo") >&5
    (eval "$ac_compile") 2>conftest.er1
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
    cat conftest.err >&5
-   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
           test -z "$ac_c_werror_flag" ||
           test ! -s conftest.err
         } && test -s conftest.$ac_objext; then
    ac_cv_prog_cc_g=yes
  else
-   $as_echo "$as_me: failed program was:" >&5
+   echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
-Line 2658 
 fi
+Line 2553 
 fi
  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
     ac_c_werror_flag=$ac_save_c_werror_flag
  fi
- { $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
+ { 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 2675 
 else
+Line 2570 
 else
      CFLAGS=
    fi
  fi
- { $as_echo "$as_me:$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
-   $as_echo_n "(cached) " >&6
+   echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    ac_cv_prog_cc_c89=no
  ac_save_CC=$CC
-Line 2749 
 case "(($ac_try" in
+Line 2644 
 case "(($ac_try" in
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
- eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- $as_echo "$ac_try_echo") >&5
    (eval "$ac_compile") 2>conftest.er1
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
    cat conftest.err >&5
-   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
           test -z "$ac_c_werror_flag" ||
           test ! -s conftest.err
         } && test -s conftest.$ac_objext; then
    ac_cv_prog_cc_c89=$ac_arg
  else
-   $as_echo "$as_me: failed program was:" >&5
+   echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
-Line 2779 
 fi
+Line 2673 
 fi
  # AC_CACHE_VAL
  case "x$ac_cv_prog_cc_c89" in
    x)
-     { $as_echo "$as_me:$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:$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:$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
-Line 2814 
 for ac_dir in "$srcdir" "$srcdir/.." "$s
+Line 2708 
 for ac_dir in "$srcdir" "$srcdir/.." "$s
    fi
  done
  if test -z "$ac_aux_dir"; then
-   { { $as_echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&5
+   { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&5
- $as_echo "$as_me: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&2;}
+ echo "$as_me: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&2;}
     { (exit 1); exit 1; }; }
  fi
-Line 2841 
 ac_configure="$SHELL $ac_aux_dir/configu
+Line 2735 
 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:$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
-   $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
-Line 2875 
 case $as_dir/ in
+Line 2768 
 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
  IFS=$as_save_IFS
- rm -rf conftest.one conftest.two conftest.dir
  fi
    if test "${ac_cv_path_install+set}" = set; then
-Line 2910 
 fi
+Line 2791 
 fi
      INSTALL=$ac_install_sh
    fi
  fi
- { $as_echo "$as_me:$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 2921 
 test -z "$INSTALL_SCRIPT" && INSTALL_SCR
+Line 2802 
 test -z "$INSTALL_SCRIPT" && INSTALL_SCR
  test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
- { $as_echo "$as_me:$LINENO: checking whether ln -s works" >&5
+ { 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:$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:$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:$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
-   $as_echo_n "(cached) " >&6
+   echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.make <<\_ACEOF
  SHELL = /bin/sh
-Line 2954 
 esac
+Line 2834 
 esac
  rm -f conftest.make
  fi
  if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
-   { $as_echo "$as_me:$LINENO: result: yes" >&5
+   { echo "$as_me:$LINENO: result: yes" >&5
- $as_echo "yes" >&6; }
+ echo "${ECHO_T}yes" >&6; }
    SET_MAKE=
  else
-   { $as_echo "$as_me:$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 2992 
 if test "x$ac_cv_env_PKG_CONFIG_set" !=
+Line 2872 
 if test "x$ac_cv_env_PKG_CONFIG_set" !=
          if test -n "$ac_tool_prefix"; then
    # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
  set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
- { $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+ { 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
-   $as_echo_n "(cached) " >&6
+   echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    case $PKG_CONFIG in
    [\\/]* | ?:[\\/]*)
-Line 3010 
 do
+Line 2890 
 do
    for ac_exec_ext in '' $ac_executable_extensions; do
    if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
      ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-     $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
    fi
  done
-Line 3022 
 esac
+Line 2902 
 esac
  fi
  PKG_CONFIG=$ac_cv_path_PKG_CONFIG
  if test -n "$PKG_CONFIG"; then
-   { $as_echo "$as_me:$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:$LINENO: result: no" >&5
+   { echo "$as_me:$LINENO: result: no" >&5
- $as_echo "no" >&6; }
+ echo "${ECHO_T}no" >&6; }
  fi
-Line 3035 
 if test -z "$ac_cv_path_PKG_CONFIG"; the
+Line 2915 
 if test -z "$ac_cv_path_PKG_CONFIG"; the
    ac_pt_PKG_CONFIG=$PKG_CONFIG
    # Extract the first word of "pkg-config", so it can be a program name with args.
  set dummy pkg-config; ac_word=$2
- { $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+ { 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
-   $as_echo_n "(cached) " >&6
+   echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    case $ac_pt_PKG_CONFIG in
    [\\/]* | ?:[\\/]*)
-Line 3053 
 do
+Line 2933 
 do
    for ac_exec_ext in '' $ac_executable_extensions; do
    if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
      ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-     $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
    fi
  done
-Line 3065 
 esac
+Line 2945 
 esac
  fi
  ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
  if test -n "$ac_pt_PKG_CONFIG"; then
-   { $as_echo "$as_me:$LINENO: result: $ac_pt_PKG_CONFIG" >&5
+   { 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:$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 3077 
 fi
+Line 2957 
 fi
    else
      case $cross_compiling:$ac_tool_warned in
  yes:)
- { $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+ { 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 3090 
 fi
+Line 2974 
 fi
  fi
  if test -n "$PKG_CONFIG"; then
          _pkg_min_version=0.9.0
-         { $as_echo "$as_me:$LINENO: checking pkg-config is at least version $_pkg_min_version" >&5
+         { 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:$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:$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:$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:$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:$LINENO: \$? = $ac_status" >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; then
    pkg_cv_gnome_vfs_module_CFLAGS=`$PKG_CONFIG --cflags "gnome-vfs-module-2.0" 2>/dev/null`
  else
-Line 3130 
 if test -n "$PKG_CONFIG"; then
+Line 3014 
 if test -n "$PKG_CONFIG"; then
          pkg_cv_gnome_vfs_module_LIBS="$gnome_vfs_module_LIBS"
      else
          if test -n "$PKG_CONFIG" && \
-     { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gnome-vfs-module-2.0\"") >&5
+     { (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:$LINENO: \$? = $ac_status" >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; then
    pkg_cv_gnome_vfs_module_LIBS=`$PKG_CONFIG --libs "gnome-vfs-module-2.0" 2>/dev/null`
  else
-Line 3161 
 fi
+Line 3045 
 fi
          # Put the nasty error message in config.log where it belongs
          echo "$gnome_vfs_module_PKG_ERRORS" >&5
-         { $as_echo "$as_me:$LINENO: result: no" >&5
+         { echo "$as_me:$LINENO: result: no" >&5
- $as_echo "no" >&6; }
+ echo "${ECHO_T}no" >&6; }
-                 { { $as_echo "$as_me:$LINENO: error: gnome-vfs-module-2.0 missing" >&5
+                 { { echo "$as_me:$LINENO: error: gnome-vfs-module-2.0 missing" >&5
- $as_echo "$as_me: error: gnome-vfs-module-2.0 missing" >&2;}
+ echo "$as_me: error: gnome-vfs-module-2.0 missing" >&2;}
     { (exit 1); exit 1; }; }
  elif test $pkg_failed = untried; then
-         { { $as_echo "$as_me:$LINENO: error: gnome-vfs-module-2.0 missing" >&5
+         { { echo "$as_me:$LINENO: error: gnome-vfs-module-2.0 missing" >&5
- $as_echo "$as_me: error: gnome-vfs-module-2.0 missing" >&2;}
+ echo "$as_me: error: gnome-vfs-module-2.0 missing" >&2;}
     { (exit 1); exit 1; }; }
  else
          gnome_vfs_module_CFLAGS=$pkg_cv_gnome_vfs_module_CFLAGS
          gnome_vfs_module_LIBS=$pkg_cv_gnome_vfs_module_LIBS
-         { $as_echo "$as_me:$LINENO: result: yes" >&5
+         { echo "$as_me:$LINENO: result: yes" >&5
- $as_echo "yes" >&6; }
+ echo "${ECHO_T}yes" >&6; }
          :
  fi
  CFLAGS="$CFLAGS $gnome_vfs_module_CFLAGS"
-Line 3183 
 LIBS="$LIBS $gnome_vfs_module_LIBS"
+Line 3067 
 LIBS="$LIBS $gnome_vfs_module_LIBS"
  # check for libxml-2.0
  pkg_failed=no
- { $as_echo "$as_me:$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:$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:$LINENO: \$? = $ac_status" >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; then
    pkg_cv_libxml2_CFLAGS=`$PKG_CONFIG --cflags "libxml-2.0" 2>/dev/null`
  else
-Line 3209 
 if test -n "$PKG_CONFIG"; then
+Line 3093 
 if test -n "$PKG_CONFIG"; then
          pkg_cv_libxml2_LIBS="$libxml2_LIBS"
      else
          if test -n "$PKG_CONFIG" && \
-     { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libxml-2.0\"") >&5
+     { (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:$LINENO: \$? = $ac_status" >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; then
    pkg_cv_libxml2_LIBS=`$PKG_CONFIG --libs "libxml-2.0" 2>/dev/null`
  else
-Line 3240 
 fi
+Line 3124 
 fi
          # Put the nasty error message in config.log where it belongs
          echo "$libxml2_PKG_ERRORS" >&5
-         { $as_echo "$as_me:$LINENO: result: no" >&5
+         { echo "$as_me:$LINENO: result: no" >&5
- $as_echo "no" >&6; }
+ echo "${ECHO_T}no" >&6; }
-                 { { $as_echo "$as_me:$LINENO: error: libxml-2.0 missing" >&5
+                 { { echo "$as_me:$LINENO: error: libxml-2.0 missing" >&5
- $as_echo "$as_me: error: libxml-2.0 missing" >&2;}
+ echo "$as_me: error: libxml-2.0 missing" >&2;}
     { (exit 1); exit 1; }; }
  elif test $pkg_failed = untried; then
-         { { $as_echo "$as_me:$LINENO: error: libxml-2.0 missing" >&5
+         { { echo "$as_me:$LINENO: error: libxml-2.0 missing" >&5
- $as_echo "$as_me: error: libxml-2.0 missing" >&2;}
+ echo "$as_me: error: libxml-2.0 missing" >&2;}
     { (exit 1); exit 1; }; }
  else
          libxml2_CFLAGS=$pkg_cv_libxml2_CFLAGS
          libxml2_LIBS=$pkg_cv_libxml2_LIBS
-         { $as_echo "$as_me:$LINENO: result: yes" >&5
+         { echo "$as_me:$LINENO: result: yes" >&5
- $as_echo "yes" >&6; }
+ echo "${ECHO_T}yes" >&6; }
          :
  fi
  CFLAGS="$CFLAGS $libxml2_CFLAGS"
-Line 3261 
 LIBS="$LIBS $libxml2_LIBS"
+Line 3145 
 LIBS="$LIBS $libxml2_LIBS"
  # check for libsoup
  pkg_failed=no
- { $as_echo "$as_me:$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:$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:$LINENO: \$? = $ac_status" >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; then
    pkg_cv_libsoup24_CFLAGS=`$PKG_CONFIG --cflags "libsoup-2.4" 2>/dev/null`
  else
-Line 3287 
 if test -n "$PKG_CONFIG"; then
+Line 3171 
 if test -n "$PKG_CONFIG"; then
          pkg_cv_libsoup24_LIBS="$libsoup24_LIBS"
      else
          if test -n "$PKG_CONFIG" && \
-     { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libsoup-2.4\"") >&5
+     { (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:$LINENO: \$? = $ac_status" >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; then
    pkg_cv_libsoup24_LIBS=`$PKG_CONFIG --libs "libsoup-2.4" 2>/dev/null`
  else
-Line 3318 
 fi
+Line 3202 
 fi
          # Put the nasty error message in config.log where it belongs
          echo "$libsoup24_PKG_ERRORS" >&5
-         { $as_echo "$as_me:$LINENO: result: no" >&5
+         { echo "$as_me:$LINENO: result: no" >&5
- $as_echo "no" >&6; }
+ echo "${ECHO_T}no" >&6; }
  pkg_failed=no
- { $as_echo "$as_me:$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:$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:$LINENO: \$? = $ac_status" >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; then
    pkg_cv_libsoup22_CFLAGS=`$PKG_CONFIG --cflags "libsoup-2.2" 2>/dev/null`
  else
-Line 3349 
 if test -n "$PKG_CONFIG"; then
+Line 3233 
 if test -n "$PKG_CONFIG"; then
          pkg_cv_libsoup22_LIBS="$libsoup22_LIBS"
      else
          if test -n "$PKG_CONFIG" && \
-     { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libsoup-2.2\"") >&5
+     { (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:$LINENO: \$? = $ac_status" >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; then
    pkg_cv_libsoup22_LIBS=`$PKG_CONFIG --libs "libsoup-2.2" 2>/dev/null`
  else
-Line 3380 
 fi
+Line 3264 
 fi
          # Put the nasty error message in config.log where it belongs
          echo "$libsoup22_PKG_ERRORS" >&5
-         { $as_echo "$as_me:$LINENO: result: no" >&5
+         { echo "$as_me:$LINENO: result: no" >&5
- $as_echo "no" >&6; }
+ echo "${ECHO_T}no" >&6; }
-     { $as_echo "$as_me:$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:$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:$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"
      CFLAGS="$CFLAGS $libsoup22_CFLAGS -DLIBSOUP22 -DENABLE_OSM_GPS_MAP"
-Line 3407 
 elif test $pkg_failed = untried; then
+Line 3291 
 elif test $pkg_failed = untried; then
  pkg_failed=no
- { $as_echo "$as_me:$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:$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:$LINENO: \$? = $ac_status" >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; then
    pkg_cv_libsoup22_CFLAGS=`$PKG_CONFIG --cflags "libsoup-2.2" 2>/dev/null`
  else
-Line 3433 
 if test -n "$PKG_CONFIG"; then
+Line 3317 
 if test -n "$PKG_CONFIG"; then
          pkg_cv_libsoup22_LIBS="$libsoup22_LIBS"
      else
          if test -n "$PKG_CONFIG" && \
-     { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libsoup-2.2\"") >&5
+     { (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:$LINENO: \$? = $ac_status" >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; then
    pkg_cv_libsoup22_LIBS=`$PKG_CONFIG --libs "libsoup-2.2" 2>/dev/null`
  else
-Line 3464 
 fi
+Line 3348 
 fi
          # Put the nasty error message in config.log where it belongs
          echo "$libsoup22_PKG_ERRORS" >&5
-         { $as_echo "$as_me:$LINENO: result: no" >&5
+         { echo "$as_me:$LINENO: result: no" >&5
- $as_echo "no" >&6; }
+ echo "${ECHO_T}no" >&6; }
-     { $as_echo "$as_me:$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:$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:$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"
      CFLAGS="$CFLAGS $libsoup22_CFLAGS -DLIBSOUP22 -DENABLE_OSM_GPS_MAP"
-Line 3490 
 fi
+Line 3374 
 fi
  else
          libsoup24_CFLAGS=$pkg_cv_libsoup24_CFLAGS
          libsoup24_LIBS=$pkg_cv_libsoup24_LIBS
-         { $as_echo "$as_me:$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"
    CFLAGS="$CFLAGS $libsoup24_CFLAGS -DENABLE_OSM_GPS_MAP"
-Line 3502 
 fi
+Line 3386 
 fi
  # check for gtkhtml-3.14
  pkg_failed=no
- { $as_echo "$as_me:$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:$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:$LINENO: \$? = $ac_status" >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; then
    pkg_cv_libgtkhtml3_14_CFLAGS=`$PKG_CONFIG --cflags "libgtkhtml-3.14" 2>/dev/null`
  else
-Line 3528 
 if test -n "$PKG_CONFIG"; then
+Line 3412 
 if test -n "$PKG_CONFIG"; then
          pkg_cv_libgtkhtml3_14_LIBS="$libgtkhtml3_14_LIBS"
      else
          if test -n "$PKG_CONFIG" && \
-     { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgtkhtml-3.14\"") >&5
+     { (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:$LINENO: \$? = $ac_status" >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; then
    pkg_cv_libgtkhtml3_14_LIBS=`$PKG_CONFIG --libs "libgtkhtml-3.14" 2>/dev/null`
  else
-Line 3559 
 fi
+Line 3443 
 fi
          # Put the nasty error message in config.log where it belongs
          echo "$libgtkhtml3_14_PKG_ERRORS" >&5
-         { $as_echo "$as_me:$LINENO: result: no" >&5
+         { 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:$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:$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:$LINENO: \$? = $ac_status" >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; then
    pkg_cv_libgtkhtml3_8_CFLAGS=`$PKG_CONFIG --cflags "libgtkhtml-3.8" 2>/dev/null`
  else
-Line 3591 
 if test -n "$PKG_CONFIG"; then
+Line 3475 
 if test -n "$PKG_CONFIG"; then
          pkg_cv_libgtkhtml3_8_LIBS="$libgtkhtml3_8_LIBS"
      else
          if test -n "$PKG_CONFIG" && \
-     { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgtkhtml-3.8\"") >&5
+     { (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:$LINENO: \$? = $ac_status" >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; then
    pkg_cv_libgtkhtml3_8_LIBS=`$PKG_CONFIG --libs "libgtkhtml-3.8" 2>/dev/null`
  else
-Line 3622 
 fi
+Line 3506 
 fi
          # Put the nasty error message in config.log where it belongs
          echo "$libgtkhtml3_8_PKG_ERRORS" >&5
-         { $as_echo "$as_me:$LINENO: result: no" >&5
+         { echo "$as_me:$LINENO: result: no" >&5
- $as_echo "no" >&6; }
+ echo "${ECHO_T}no" >&6; }
-                 { { $as_echo "$as_me:$LINENO: error: libgtkhtml-3 missing" >&5
+                 { { echo "$as_me:$LINENO: error: libgtkhtml-3 missing" >&5
- $as_echo "$as_me: error: libgtkhtml-3 missing" >&2;}
+ echo "$as_me: error: libgtkhtml-3 missing" >&2;}
     { (exit 1); exit 1; }; }
  elif test $pkg_failed = untried; then
-         { { $as_echo "$as_me:$LINENO: error: libgtkhtml-3 missing" >&5
+         { { echo "$as_me:$LINENO: error: libgtkhtml-3 missing" >&5
- $as_echo "$as_me: error: libgtkhtml-3 missing" >&2;}
+ echo "$as_me: error: libgtkhtml-3 missing" >&2;}
     { (exit 1); exit 1; }; }
  else
          libgtkhtml3_8_CFLAGS=$pkg_cv_libgtkhtml3_8_CFLAGS
          libgtkhtml3_8_LIBS=$pkg_cv_libgtkhtml3_8_LIBS
-         { $as_echo "$as_me:$LINENO: result: yes" >&5
+         { 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 3647 
 elif test $pkg_failed = untried; then
+Line 3531 
 elif test $pkg_failed = untried; then
    # ok, we can also live with 3.8
  pkg_failed=no
- { $as_echo "$as_me:$LINENO: checking for libgtkhtml3_8" >&5
+ { 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:$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:$LINENO: \$? = $ac_status" >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; then
    pkg_cv_libgtkhtml3_8_CFLAGS=`$PKG_CONFIG --cflags "libgtkhtml-3.8" 2>/dev/null`
  else
-Line 3673 
 if test -n "$PKG_CONFIG"; then
+Line 3557 
 if test -n "$PKG_CONFIG"; then
          pkg_cv_libgtkhtml3_8_LIBS="$libgtkhtml3_8_LIBS"
      else
          if test -n "$PKG_CONFIG" && \
-     { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgtkhtml-3.8\"") >&5
+     { (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:$LINENO: \$? = $ac_status" >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; then
    pkg_cv_libgtkhtml3_8_LIBS=`$PKG_CONFIG --libs "libgtkhtml-3.8" 2>/dev/null`
  else
-Line 3704 
 fi
+Line 3588 
 fi
          # Put the nasty error message in config.log where it belongs
          echo "$libgtkhtml3_8_PKG_ERRORS" >&5
-         { $as_echo "$as_me:$LINENO: result: no" >&5
+         { echo "$as_me:$LINENO: result: no" >&5
- $as_echo "no" >&6; }
+ echo "${ECHO_T}no" >&6; }
-                 { { $as_echo "$as_me:$LINENO: error: libgtkhtml-3 missing" >&5
+                 { { echo "$as_me:$LINENO: error: libgtkhtml-3 missing" >&5
- $as_echo "$as_me: error: libgtkhtml-3 missing" >&2;}
+ echo "$as_me: error: libgtkhtml-3 missing" >&2;}
     { (exit 1); exit 1; }; }
  elif test $pkg_failed = untried; then
-         { { $as_echo "$as_me:$LINENO: error: libgtkhtml-3 missing" >&5
+         { { echo "$as_me:$LINENO: error: libgtkhtml-3 missing" >&5
- $as_echo "$as_me: error: libgtkhtml-3 missing" >&2;}
+ echo "$as_me: error: libgtkhtml-3 missing" >&2;}
     { (exit 1); exit 1; }; }
  else
          libgtkhtml3_8_CFLAGS=$pkg_cv_libgtkhtml3_8_CFLAGS
          libgtkhtml3_8_LIBS=$pkg_cv_libgtkhtml3_8_LIBS
-         { $as_echo "$as_me:$LINENO: result: yes" >&5
+         { 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 3727 
 fi
+Line 3611 
 fi
  else
          libgtkhtml3_14_CFLAGS=$pkg_cv_libgtkhtml3_14_CFLAGS
          libgtkhtml3_14_LIBS=$pkg_cv_libgtkhtml3_14_LIBS
-         { $as_echo "$as_me:$LINENO: result: yes" >&5
+         { 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 3736 
 $as_echo "yes" >&6; }
+Line 3620 
 $as_echo "yes" >&6; }
  fi
  # check for maemo
- { $as_echo "$as_me:$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; }
  if test -n "$PKG_CONFIG" && \
-     { ($as_echo "$as_me:$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:$LINENO: \$? = $ac_status" >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; then
    MAEMO="yes"
-   { $as_echo "$as_me:$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:$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:$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:$LINENO: \$? = $ac_status" >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; then
    pkg_cv_hildon_CFLAGS=`$PKG_CONFIG --cflags "hildon-1" 2>/dev/null`
  else
-Line 3777 
 if test -n "$PKG_CONFIG"; then
+Line 3661 
 if test -n "$PKG_CONFIG"; then
          pkg_cv_hildon_LIBS="$hildon_LIBS"
      else
          if test -n "$PKG_CONFIG" && \
-     { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"hildon-1\"") >&5
+     { (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:$LINENO: \$? = $ac_status" >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; then
    pkg_cv_hildon_LIBS=`$PKG_CONFIG --libs "hildon-1" 2>/dev/null`
  else
-Line 3808 
 fi
+Line 3692 
 fi
          # Put the nasty error message in config.log where it belongs
          echo "$hildon_PKG_ERRORS" >&5
-         { $as_echo "$as_me:$LINENO: result: no" >&5
+         { echo "$as_me:$LINENO: result: no" >&5
- $as_echo "no" >&6; }
+ echo "${ECHO_T}no" >&6; }
-                 { { $as_echo "$as_me:$LINENO: error: hildon-1 missing" >&5
+                 { { echo "$as_me:$LINENO: error: hildon-1 missing" >&5
- $as_echo "$as_me: error: hildon-1 missing" >&2;}
+ echo "$as_me: error: hildon-1 missing" >&2;}
     { (exit 1); exit 1; }; }
  elif test $pkg_failed = untried; then
-         { { $as_echo "$as_me:$LINENO: error: hildon-1 missing" >&5
+         { { echo "$as_me:$LINENO: error: hildon-1 missing" >&5
- $as_echo "$as_me: error: hildon-1 missing" >&2;}
+ echo "$as_me: error: hildon-1 missing" >&2;}
     { (exit 1); exit 1; }; }
  else
          hildon_CFLAGS=$pkg_cv_hildon_CFLAGS
          hildon_LIBS=$pkg_cv_hildon_LIBS
-         { $as_echo "$as_me:$LINENO: result: yes" >&5
+         { echo "$as_me:$LINENO: result: yes" >&5
- $as_echo "yes" >&6; }
+ echo "${ECHO_T}yes" >&6; }
          :
  fi
    CFLAGS="$CFLAGS  -DUSE_MAEMO $hildon_CFLAGS"
-Line 3829 
 fi
+Line 3713 
 fi
  pkg_failed=no
- { $as_echo "$as_me:$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:$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:$LINENO: \$? = $ac_status" >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; then
    pkg_cv_osso_CFLAGS=`$PKG_CONFIG --cflags "libosso" 2>/dev/null`
  else
-Line 3855 
 if test -n "$PKG_CONFIG"; then
+Line 3739 
 if test -n "$PKG_CONFIG"; then
          pkg_cv_osso_LIBS="$osso_LIBS"
      else
          if test -n "$PKG_CONFIG" && \
-     { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libosso\"") >&5
+     { (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:$LINENO: \$? = $ac_status" >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; then
    pkg_cv_osso_LIBS=`$PKG_CONFIG --libs "libosso" 2>/dev/null`
  else
-Line 3886 
 fi
+Line 3770 
 fi
          # Put the nasty error message in config.log where it belongs
          echo "$osso_PKG_ERRORS" >&5
-         { $as_echo "$as_me:$LINENO: result: no" >&5
+         { echo "$as_me:$LINENO: result: no" >&5
- $as_echo "no" >&6; }
+ echo "${ECHO_T}no" >&6; }
-                 { { $as_echo "$as_me:$LINENO: error: libosso missing" >&5
+                 { { echo "$as_me:$LINENO: error: libosso missing" >&5
- $as_echo "$as_me: error: libosso missing" >&2;}
+ echo "$as_me: error: libosso missing" >&2;}
     { (exit 1); exit 1; }; }
  elif test $pkg_failed = untried; then
-         { { $as_echo "$as_me:$LINENO: error: libosso missing" >&5
+         { { echo "$as_me:$LINENO: error: libosso missing" >&5
- $as_echo "$as_me: error: libosso missing" >&2;}
+ echo "$as_me: error: libosso missing" >&2;}
     { (exit 1); exit 1; }; }
  else
          osso_CFLAGS=$pkg_cv_osso_CFLAGS
          osso_LIBS=$pkg_cv_osso_LIBS
-         { $as_echo "$as_me:$LINENO: result: yes" >&5
+         { echo "$as_me:$LINENO: result: yes" >&5
- $as_echo "yes" >&6; }
+ echo "${ECHO_T}yes" >&6; }
          :
  fi
    CFLAGS="$CFLAGS $osso_CFLAGS"
-Line 3907 
 fi
+Line 3791 
 fi
  pkg_failed=no
- { $as_echo "$as_me:$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:$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:$LINENO: \$? = $ac_status" >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; then
    pkg_cv_hildon_fm_2_CFLAGS=`$PKG_CONFIG --cflags "hildon-fm-2" 2>/dev/null`
  else
-Line 3933 
 if test -n "$PKG_CONFIG"; then
+Line 3817 
 if test -n "$PKG_CONFIG"; then
          pkg_cv_hildon_fm_2_LIBS="$hildon_fm_2_LIBS"
      else
          if test -n "$PKG_CONFIG" && \
-     { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"hildon-fm-2\"") >&5
+     { (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:$LINENO: \$? = $ac_status" >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; then
    pkg_cv_hildon_fm_2_LIBS=`$PKG_CONFIG --libs "hildon-fm-2" 2>/dev/null`
  else
-Line 3964 
 fi
+Line 3848 
 fi
          # Put the nasty error message in config.log where it belongs
          echo "$hildon_fm_2_PKG_ERRORS" >&5
-         { $as_echo "$as_me:$LINENO: result: no" >&5
+         { echo "$as_me:$LINENO: result: no" >&5
- $as_echo "no" >&6; }
+ echo "${ECHO_T}no" >&6; }
-                 { { $as_echo "$as_me:$LINENO: error: hildon-fm-2 missing" >&5
+                 { { echo "$as_me:$LINENO: error: hildon-fm-2 missing" >&5
- $as_echo "$as_me: error: hildon-fm-2 missing" >&2;}
+ echo "$as_me: error: hildon-fm-2 missing" >&2;}
     { (exit 1); exit 1; }; }
  elif test $pkg_failed = untried; then
-         { { $as_echo "$as_me:$LINENO: error: hildon-fm-2 missing" >&5
+         { { echo "$as_me:$LINENO: error: hildon-fm-2 missing" >&5
- $as_echo "$as_me: error: hildon-fm-2 missing" >&2;}
+ echo "$as_me: error: hildon-fm-2 missing" >&2;}
     { (exit 1); exit 1; }; }
  else
          hildon_fm_2_CFLAGS=$pkg_cv_hildon_fm_2_CFLAGS
          hildon_fm_2_LIBS=$pkg_cv_hildon_fm_2_LIBS
-         { $as_echo "$as_me:$LINENO: result: yes" >&5
+         { echo "$as_me:$LINENO: result: yes" >&5
- $as_echo "yes" >&6; }
+ echo "${ECHO_T}yes" >&6; }
          :
  fi
    CFLAGS="$CFLAGS $hildon_fm_2_CFLAGS"
-Line 3986 
 fi
+Line 3870 
 fi
    # check for sqlite3 for maemo mapper interface
  pkg_failed=no
- { $as_echo "$as_me:$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:$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:$LINENO: \$? = $ac_status" >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; then
    pkg_cv_sqlite3_CFLAGS=`$PKG_CONFIG --cflags "sqlite3" 2>/dev/null`
  else
-Line 4012 
 if test -n "$PKG_CONFIG"; then
+Line 3896 
 if test -n "$PKG_CONFIG"; then
          pkg_cv_sqlite3_LIBS="$sqlite3_LIBS"
      else
          if test -n "$PKG_CONFIG" && \
-     { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"sqlite3\"") >&5
+     { (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:$LINENO: \$? = $ac_status" >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; then
    pkg_cv_sqlite3_LIBS=`$PKG_CONFIG --libs "sqlite3" 2>/dev/null`
  else
-Line 4043 
 fi
+Line 3927 
 fi
          # Put the nasty error message in config.log where it belongs
          echo "$sqlite3_PKG_ERRORS" >&5
-         { $as_echo "$as_me:$LINENO: result: no" >&5
+         { echo "$as_me:$LINENO: result: no" >&5
- $as_echo "no" >&6; }
+ echo "${ECHO_T}no" >&6; }
-                 { { $as_echo "$as_me:$LINENO: error: sqlite3 missing" >&5
+                 { { echo "$as_me:$LINENO: error: sqlite3 missing" >&5
- $as_echo "$as_me: error: sqlite3 missing" >&2;}
+ echo "$as_me: error: sqlite3 missing" >&2;}
     { (exit 1); exit 1; }; }
  elif test $pkg_failed = untried; then
-         { { $as_echo "$as_me:$LINENO: error: sqlite3 missing" >&5
+         { { echo "$as_me:$LINENO: error: sqlite3 missing" >&5
- $as_echo "$as_me: error: sqlite3 missing" >&2;}
+ echo "$as_me: error: sqlite3 missing" >&2;}
     { (exit 1); exit 1; }; }
  else
          sqlite3_CFLAGS=$pkg_cv_sqlite3_CFLAGS
          sqlite3_LIBS=$pkg_cv_sqlite3_LIBS
-         { $as_echo "$as_me:$LINENO: result: yes" >&5
+         { echo "$as_me:$LINENO: result: yes" >&5
- $as_echo "yes" >&6; }
+ echo "${ECHO_T}yes" >&6; }
          :
  fi
    CFLAGS="$CFLAGS $sqlite3_CFLAGS"
-Line 4065 
 fi
+Line 3949 
 fi
    # check for hildon-help
  pkg_failed=no
- { $as_echo "$as_me:$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:$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:$LINENO: \$? = $ac_status" >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; then
    pkg_cv_hildon_help_CFLAGS=`$PKG_CONFIG --cflags "hildon-help" 2>/dev/null`
  else
-Line 4091 
 if test -n "$PKG_CONFIG"; then
+Line 3975 
 if test -n "$PKG_CONFIG"; then
          pkg_cv_hildon_help_LIBS="$hildon_help_LIBS"
      else
          if test -n "$PKG_CONFIG" && \
-     { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"hildon-help\"") >&5
+     { (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:$LINENO: \$? = $ac_status" >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; then
    pkg_cv_hildon_help_LIBS=`$PKG_CONFIG --libs "hildon-help" 2>/dev/null`
  else
-Line 4122 
 fi
+Line 4006 
 fi
          # Put the nasty error message in config.log where it belongs
          echo "$hildon_help_PKG_ERRORS" >&5
-         { $as_echo "$as_me:$LINENO: result: no" >&5
+         { echo "$as_me:$LINENO: result: no" >&5
- $as_echo "no" >&6; }
+ echo "${ECHO_T}no" >&6; }
-     { $as_echo "$as_me:$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:$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:$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 4147 
 fi
+Line 4031 
 fi
    # prefer gpsbt over liblocation as we got complaints regarding liblocation
    # stability
    if test -n "$PKG_CONFIG" && \
-     { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gpsbt\"") >&5
+     { (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:$LINENO: \$? = $ac_status" >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; then
  pkg_failed=no
- { $as_echo "$as_me:$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:$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:$LINENO: \$? = $ac_status" >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; then
    pkg_cv_gpsbt_CFLAGS=`$PKG_CONFIG --cflags "gpsbt" 2>/dev/null`
  else
-Line 4181 
 if test -n "$PKG_CONFIG"; then
+Line 4065 
 if test -n "$PKG_CONFIG"; then
          pkg_cv_gpsbt_LIBS="$gpsbt_LIBS"
      else
          if test -n "$PKG_CONFIG" && \
-     { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gpsbt\"") >&5
+     { (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:$LINENO: \$? = $ac_status" >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; then
    pkg_cv_gpsbt_LIBS=`$PKG_CONFIG --libs "gpsbt" 2>/dev/null`
  else
-Line 4212 
 fi
+Line 4096 
 fi
          # Put the nasty error message in config.log where it belongs
          echo "$gpsbt_PKG_ERRORS" >&5
-         { { $as_echo "$as_me:$LINENO: error: Package requirements (gpsbt) were not met:
+         { { echo "$as_me:$LINENO: error: Package requirements (gpsbt) were not met:
  $gpsbt_PKG_ERRORS
-Line 4223 
 Alternatively, you may set the environme
+Line 4107 
 Alternatively, you may set the environme
  and gpsbt_LIBS to avoid the need to call pkg-config.
  See the pkg-config man page for more details.
  " >&5
- $as_echo "$as_me: error: Package requirements (gpsbt) were not met:
+ echo "$as_me: error: Package requirements (gpsbt) were not met:
  $gpsbt_PKG_ERRORS
-Line 4236 
 See the pkg-config man page for more det
+Line 4120 
 See the pkg-config man page for more det
  " >&2;}
     { (exit 1); exit 1; }; }
  elif test $pkg_failed = untried; then
-         { { $as_echo "$as_me:$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;}
- { { $as_echo "$as_me:$LINENO: 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 4248 
 See the pkg-config man page for more det
+Line 4130 
 See the pkg-config man page for more det
  To get pkg-config, see <http://pkg-config.freedesktop.org/>.
  See \`config.log' for more details." >&5
- $as_echo "$as_me: error: The pkg-config script could not be found or is too old.  Make sure it
+ 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 4258 
 See the pkg-config man page for more det
+Line 4140 
 See the pkg-config man page for more det
  To get pkg-config, see <http://pkg-config.freedesktop.org/>.
  See \`config.log' for more details." >&2;}
-    { (exit 1); exit 1; }; }; }
+    { (exit 1); exit 1; }; }
  else
          gpsbt_CFLAGS=$pkg_cv_gpsbt_CFLAGS
          gpsbt_LIBS=$pkg_cv_gpsbt_LIBS
-         { $as_echo "$as_me:$LINENO: result: yes" >&5
+         { echo "$as_me:$LINENO: result: yes" >&5
- $as_echo "yes" >&6; }
+ echo "${ECHO_T}yes" >&6; }
          :
  fi
      CFLAGS="$CFLAGS -DENABLE_GPSBT $gpsbt_CFLAGS"
-Line 4271 
 fi
+Line 4153 
 fi
  else
-     { $as_echo "$as_me:$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:$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:$LINENO: \$? = $ac_status" >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; then
  pkg_failed=no
- { $as_echo "$as_me:$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:$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:$LINENO: \$? = $ac_status" >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; then
    pkg_cv_liblocation_CFLAGS=`$PKG_CONFIG --cflags "liblocation" 2>/dev/null`
  else
-Line 4309 
 if test -n "$PKG_CONFIG"; then
+Line 4191 
 if test -n "$PKG_CONFIG"; then
          pkg_cv_liblocation_LIBS="$liblocation_LIBS"
      else
          if test -n "$PKG_CONFIG" && \
-     { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"liblocation\"") >&5
+     { (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:$LINENO: \$? = $ac_status" >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; then
    pkg_cv_liblocation_LIBS=`$PKG_CONFIG --libs "liblocation" 2>/dev/null`
  else
-Line 4340 
 fi
+Line 4222 
 fi
          # Put the nasty error message in config.log where it belongs
          echo "$liblocation_PKG_ERRORS" >&5
-         { { $as_echo "$as_me:$LINENO: error: Package requirements (liblocation) were not met:
+         { { echo "$as_me:$LINENO: error: Package requirements (liblocation) were not met:
  $liblocation_PKG_ERRORS
-Line 4351 
 Alternatively, you may set the environme
+Line 4233 
 Alternatively, you may set the environme
  and liblocation_LIBS to avoid the need to call pkg-config.
  See the pkg-config man page for more details.
  " >&5
- $as_echo "$as_me: error: Package requirements (liblocation) were not met:
+ echo "$as_me: error: Package requirements (liblocation) were not met:
  $liblocation_PKG_ERRORS
-Line 4364 
 See the pkg-config man page for more det
+Line 4246 
 See the pkg-config man page for more det
  " >&2;}
     { (exit 1); exit 1; }; }
  elif test $pkg_failed = untried; then
-         { { $as_echo "$as_me:$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;}
- { { $as_echo "$as_me:$LINENO: 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 4376 
 See the pkg-config man page for more det
+Line 4256 
 See the pkg-config man page for more det
  To get pkg-config, see <http://pkg-config.freedesktop.org/>.
  See \`config.log' for more details." >&5
- $as_echo "$as_me: error: The pkg-config script could not be found or is too old.  Make sure it
+ 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 4386 
 See the pkg-config man page for more det
+Line 4266 
 See the pkg-config man page for more det
  To get pkg-config, see <http://pkg-config.freedesktop.org/>.
  See \`config.log' for more details." >&2;}
-    { (exit 1); exit 1; }; }; }
+    { (exit 1); exit 1; }; }
  else
          liblocation_CFLAGS=$pkg_cv_liblocation_CFLAGS
          liblocation_LIBS=$pkg_cv_liblocation_LIBS
-         { $as_echo "$as_me:$LINENO: result: yes" >&5
+         { echo "$as_me:$LINENO: result: yes" >&5
- $as_echo "yes" >&6; }
+ echo "${ECHO_T}yes" >&6; }
          :
  fi
        CFLAGS="$CFLAGS -DENABLE_LIBLOCATION $liblocation_CFLAGS"
-Line 4399 
 fi
+Line 4279 
 fi
  else
-       { $as_echo "$as_me:$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:$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:$LINENO: \$? = $ac_status" >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; then
      CFLAGS="$CFLAGS -DENABLE_BROWSER_INTERFACE"
  else
-   { $as_echo "$as_me:$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:$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:$LINENO: \$? = $ac_status" >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; then
      VERSION=`pkg-config --modversion maemo-version`
-     { $as_echo "$as_me:$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"
  else
-     { { $as_echo "$as_me:$LINENO: error: maemo-version not found" >&5
+     { { echo "$as_me:$LINENO: error: maemo-version not found" >&5
- $as_echo "$as_me: error: maemo-version not found" >&2;}
+ echo "$as_me: error: maemo-version not found" >&2;}
     { (exit 1); exit 1; }; }
  fi
-Line 4450 
 fi
+Line 4330 
 fi
  else
-   { $as_echo "$as_me:$LINENO: result: no" >&5
+   { echo "$as_me:$LINENO: result: no" >&5
- $as_echo "no" >&6; }
+ echo "${ECHO_T}no" >&6; }
    # check for gtk+-2.0
  pkg_failed=no
- { $as_echo "$as_me:$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:$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:$LINENO: \$? = $ac_status" >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; then
    pkg_cv_gtk_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0" 2>/dev/null`
  else
-Line 4482 
 if test -n "$PKG_CONFIG"; then
+Line 4362 
 if test -n "$PKG_CONFIG"; then
          pkg_cv_gtk_LIBS="$gtk_LIBS"
      else
          if test -n "$PKG_CONFIG" && \
-     { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0\"") >&5
+     { (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:$LINENO: \$? = $ac_status" >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; then
    pkg_cv_gtk_LIBS=`$PKG_CONFIG --libs "gtk+-2.0" 2>/dev/null`
  else
-Line 4513 
 fi
+Line 4393 
 fi
          # Put the nasty error message in config.log where it belongs
          echo "$gtk_PKG_ERRORS" >&5
-         { $as_echo "$as_me:$LINENO: result: no" >&5
+         { echo "$as_me:$LINENO: result: no" >&5
- $as_echo "no" >&6; }
+ echo "${ECHO_T}no" >&6; }
-                 { { $as_echo "$as_me:$LINENO: error: gtk+-2.0 missing!" >&5
+                 { { echo "$as_me:$LINENO: error: gtk+-2.0 missing!" >&5
- $as_echo "$as_me: error: gtk+-2.0 missing!" >&2;}
+ echo "$as_me: error: gtk+-2.0 missing!" >&2;}
     { (exit 1); exit 1; }; }
  elif test $pkg_failed = untried; then
-         { { $as_echo "$as_me:$LINENO: error: gtk+-2.0 missing!" >&5
+         { { echo "$as_me:$LINENO: error: gtk+-2.0 missing!" >&5
- $as_echo "$as_me: error: gtk+-2.0 missing!" >&2;}
+ echo "$as_me: error: gtk+-2.0 missing!" >&2;}
     { (exit 1); exit 1; }; }
  else
          gtk_CFLAGS=$pkg_cv_gtk_CFLAGS
          gtk_LIBS=$pkg_cv_gtk_LIBS
-         { $as_echo "$as_me:$LINENO: result: yes" >&5
+         { echo "$as_me:$LINENO: result: yes" >&5
- $as_echo "yes" >&6; }
+ echo "${ECHO_T}yes" >&6; }
          :
  fi
    CFLAGS="$CFLAGS $gtk_CFLAGS"
-Line 4535 
 fi
+Line 4415 
 fi
    # non-maemo device use gnome to call the web browser
  pkg_failed=no
- { $as_echo "$as_me:$LINENO: checking for gnome2" >&5
+ { echo "$as_me:$LINENO: checking for gnome2" >&5
- $as_echo_n "checking for gnome2... " >&6; }
+ 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" && \
-     { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgnome-2.0\"") >&5
+     { (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=$?
-   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   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
-Line 4561 
 if test -n "$PKG_CONFIG"; then
+Line 4441 
 if test -n "$PKG_CONFIG"; then
          pkg_cv_gnome2_LIBS="$gnome2_LIBS"
      else
          if test -n "$PKG_CONFIG" && \
-     { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgnome-2.0\"") >&5
+     { (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=$?
-   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   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
-Line 4592 
 fi
+Line 4472 
 fi
          # Put the nasty error message in config.log where it belongs
          echo "$gnome2_PKG_ERRORS" >&5
-         { $as_echo "$as_me:$LINENO: result: no" >&5
+         { echo "$as_me:$LINENO: result: no" >&5
- $as_echo "no" >&6; }
+ echo "${ECHO_T}no" >&6; }
-                 { { $as_echo "$as_me:$LINENO: error: libgnome-2.0 missing" >&5
+                 { { echo "$as_me:$LINENO: error: libgnome-2.0 missing" >&5
- $as_echo "$as_me: error: libgnome-2.0 missing" >&2;}
+ echo "$as_me: error: libgnome-2.0 missing" >&2;}
     { (exit 1); exit 1; }; }
  elif test $pkg_failed = untried; then
-         { { $as_echo "$as_me:$LINENO: error: libgnome-2.0 missing" >&5
+         { { echo "$as_me:$LINENO: error: libgnome-2.0 missing" >&5
- $as_echo "$as_me: error: libgnome-2.0 missing" >&2;}
+ echo "$as_me: error: libgnome-2.0 missing" >&2;}
     { (exit 1); exit 1; }; }
  else
          gnome2_CFLAGS=$pkg_cv_gnome2_CFLAGS
          gnome2_LIBS=$pkg_cv_gnome2_LIBS
-         { $as_echo "$as_me:$LINENO: result: yes" >&5
+         { echo "$as_me:$LINENO: result: yes" >&5
- $as_echo "yes" >&6; }
+ echo "${ECHO_T}yes" >&6; }
          :
  fi
    CFLAGS="$CFLAGS $gnome2_CFLAGS -DENABLE_BROWSER_INTERFACE"
-Line 4647 
 _ACEOF
+Line 4527 
 _ACEOF
      case $ac_val in #(
      *${as_nl}*)
        case $ac_var in #(
-       *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5
+       *_cv_*) { 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 ;;
        esac ;;
      esac
-Line 4685 
 $as_echo "$as_me: WARNING: cache variabl
+Line 4564 
 $as_echo "$as_me: WARNING: cache variabl
  if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
    if test -w "$cache_file"; then
      test "x$cache_file" != "x/dev/null" &&
-       { $as_echo "$as_me:$LINENO: updating cache $cache_file" >&5
+       { 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:$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 4707 
 test "x$exec_prefix" = xNONE && exec_pre
+Line 4586 
 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 4742 
 ac_ltlibobjs=
+Line 4615 
 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.
    ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext"
-Line 4755 
 LTLIBOBJS=$ac_ltlibobjs
+Line 4628 
 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:$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;}
- cat >$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+ cat >$CONFIG_STATUS <<_ACEOF
  #! $SHELL
  # Generated by $as_me.
  # Run this file to recreate the current configuration.
-Line 4773 
 ac_cs_silent=false
+Line 4645 
 ac_cs_silent=false
  SHELL=\${CONFIG_SHELL-$SHELL}
  _ACEOF
- cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+ cat >>$CONFIG_STATUS <<\_ACEOF
  ## --------------------- ##
  ## M4sh Initialization.  ##
  ## --------------------- ##
-Line 4783 
 DUALCASE=1; export DUALCASE # for MKS sh
+Line 4655 
 DUALCASE=1; export DUALCASE # for MKS sh
  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
-Line 4805 
 as_cr_Letters=$as_cr_letters$as_cr_LETTE
+Line 4677 
 as_cr_Letters=$as_cr_letters$as_cr_LETTE
  as_cr_digits='0123456789'
  as_cr_alnum=$as_cr_Letters$as_cr_digits
- as_nl='
- '
- export as_nl
- # Printing a long string crashes Solaris 7 /usr/bin/printf.
- as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
- as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
- as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
- if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
-   as_echo='printf %s\n'
-   as_echo_n='printf %s'
- else
-   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\\(.*\\)"'
-     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
-   as_echo='sh -c $as_echo_body as_echo'
- fi
  # The user is always right.
  if test "${PATH_SEPARATOR+set}" != set; then
-   PATH_SEPARATOR=:
+   echo "#! /bin/sh" >conf$$.sh
-   (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
+   echo  "exit 0"   >>conf$$.sh
-     (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
+   chmod +x conf$$.sh
-       PATH_SEPARATOR=';'
+   if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-   }
+     PATH_SEPARATOR=';'
+   else
+     PATH_SEPARATOR=:
+   fi
+   rm -f conf$$.sh
  fi
  # Support unset when possible.
-Line 4859 
 fi
+Line 4703 
 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.
-Line 4881 
 if test "x$as_myself" = x; then
+Line 4727 
 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; }
  fi
-Line 4894 
 PS2='> '
+Line 4740 
 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 &&
-Line 4919 
 as_me=`$as_basename -- "$0" ||
+Line 4772 
 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 4970 
 $as_unset CDPATH
+Line 4823 
 $as_unset CDPATH
        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
+     { 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
-Line 4998 
 case `echo -n x` in
+Line 4851 
 case `echo -n x` in
  *)
    ECHO_N='-n';;
  esac
  if expr a : '\(a\)' >/dev/null 2>&1 &&
     test "X`expr 00001 : '.*\(...\)'`" = X001; then
    as_expr=expr
-Line 5010 
 if test -d conf$$.dir; then
+Line 4864 
 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 5050 
 else
+Line 4901 
 else
    as_test_x='
      eval sh -c '\''
        if test -d "$1"; then
          test -d "$1/.";
        else
          case $1 in
          -*)set "./$1";;
          esac;
          case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
          ???[sx]*):;;*)false;;esac;fi
-Line 5075 
 exec 6>&1
+Line 4926 
 exec 6>&1
  # 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.8.4, which was
+ This file was extended by GPXView $as_me 0.8.5, which was
- generated by GNU Autoconf 2.63.  Invocation command line was
+ generated by GNU Autoconf 2.61.  Invocation command line was
    CONFIG_FILES    = $CONFIG_FILES
    CONFIG_HEADERS  = $CONFIG_HEADERS
-Line 5089 
 on `(hostname || uname -n) 2>/dev/null |
+Line 4940 
 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 from templates according to the
  current configuration.
- Usage: $0 [OPTION]... [FILE]...
+ Usage: $0 [OPTIONS] [FILE]...
    -h, --help       print this help, then exit
    -V, --version    print version number and configuration settings, then exit
-   -q, --quiet, --silent
+   -q, --quiet      do not print progress messages
-                    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
-Line 5123 
 $config_files
+Line 4967 
 $config_files
  Report bugs to <bug-autoconf@gnu.org>."
  _ACEOF
- cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+ cat >>$CONFIG_STATUS <<_ACEOF
  ac_cs_version="\\
- GPXView config.status 0.8.4
+ GPXView config.status 0.8.5
- configured by $0, generated by GNU Autoconf 2.63,
+ configured by $0, generated by GNU Autoconf 2.61,
-   with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
+   with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
- Copyright (C) 2008 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 5162 
 do
+Line 5006 
 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 ;;
    --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
-     CONFIG_FILES="$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_echo "$as_me: error: unrecognized option: $1
+   -*) { echo "$as_me: error: unrecognized option: $1
  Try \`$0 --help' for more information." >&2
     { (exit 1); exit 1; }; } ;;
-Line 5198 
 if $ac_cs_silent; then
+Line 5039 
 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 5233 
 do
+Line 5072 
 do
      "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
      "data/Makefile") CONFIG_FILES="$CONFIG_FILES data/Makefile" ;;
-   *) { { $as_echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
+   *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
- $as_echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
+ echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
     { (exit 1); exit 1; }; };;
    esac
  done
-Line 5273 
 $debug ||
+Line 5112 
 $debug ||
    (umask 077 && mkdir "$tmp")
  } ||
  {
-    $as_echo "$as_me: cannot create a temporary directory in ." >&2
+    echo "$me: cannot create a temporary directory in ." >&2
     { (exit 1); exit 1; }
  }
- # Set up the scripts for CONFIG_FILES section.
+ #
- # No need to generate them if there are no CONFIG_FILES.
+ # Set up the sed scripts for CONFIG_FILES section.
- # This happens for instance with `./config.status config.h'.
+ #
- if test -n "$CONFIG_FILES"; then
- ac_cr='
'
+ # No need to generate the scripts if there are no CONFIG_FILES.
- ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
+ # This happens for instance when ./config.status config.h
- if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
+ if test -n "$CONFIG_FILES"; 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_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
- $as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
-    { (exit 1); exit 1; }; }
- ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'`
  ac_delim='%!_!# '
  for ac_last_try in false false false false false :; do
-   . ./conf$$subs.sh ||
+   cat >conf$$subs.sed <<_ACEOF
-     { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
+ SHELL!$SHELL$ac_delim
- $as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
+ PATH_SEPARATOR!$PATH_SEPARATOR$ac_delim
-    { (exit 1); exit 1; }; }
+ 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
+ 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
+ gtk_CFLAGS!$gtk_CFLAGS$ac_delim
+ gtk_LIBS!$gtk_LIBS$ac_delim
+ gnome2_CFLAGS!$gnome2_CFLAGS$ac_delim
+ gnome2_LIBS!$gnome2_LIBS$ac_delim
+ EXTRA_OBJS!$EXTRA_OBJS$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` = 85; then
-   if test $ac_delim_n = $ac_delim_num; then
      break
    elif $ac_last_try; then
-     { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
+     { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
- $as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
+ 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_echo "$as_me:$LINENO: error: could not setup config files machinery" >&5
- $as_echo "$as_me: error: could not setup config files machinery" >&2;}
-    { (exit 1); exit 1; }; }
- _ACEOF
  # VPATH may cause trouble with some makes, so we remove $(srcdir),
  # ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
-Line 5426 
 s/^[^=]*=[      ]*$//
+Line 5271 
 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_echo "$as_me:$LINENO: error: invalid tag $ac_tag" >&5
+   :L* | :C*:*) { { echo "$as_me:$LINENO: error: Invalid tag $ac_tag." >&5
- $as_echo "$as_me: error: invalid tag $ac_tag" >&2;}
+ echo "$as_me: error: Invalid tag $ac_tag." >&2;}
     { (exit 1); exit 1; }; };;
    :[FH]-) ac_tag=-:-;;
    :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
-Line 5469 
 $as_echo "$as_me: error: invalid tag $ac
+Line 5312 
 $as_echo "$as_me: error: invalid tag $ac
             [\\/$]*) false;;
             *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
             esac ||
-            { { $as_echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5
+            { { echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5
- $as_echo "$as_me: error: cannot find input file: $ac_f" >&2;}
+ 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"
-       ac_file_inputs="$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:$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_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
- $as_echo "$as_me: error: could not create $ac_file" >&2;}
-    { (exit 1); exit 1; }; } ;;
      esac
      ;;
    esac
-Line 5510 
 $as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^
+Line 5341 
 $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
-Line 5536 
 $as_echo X"$ac_file" |
+Line 5367 
 $as_echo X"$ac_file" |
      as_dirs=
      while :; do
        case $as_dir in #(
-       *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
+       *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #(
        *) as_qdir=$as_dir;;
        esac
        as_dirs="'$as_qdir' $as_dirs"
-Line 5545 
 $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/
+Line 5376 
 $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" |
+ echo X"$as_dir" |
      sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
              s//\1/
              q
-Line 5566 
 $as_echo X"$as_dir" |
+Line 5397 
 $as_echo X"$as_dir" |
        test -d "$as_dir" && break
      done
      test -z "$as_dirs" || eval "mkdir $as_dirs"
-   } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
+   } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
- $as_echo "$as_me: error: cannot create directory $as_dir" >&2;}
+ 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 5616 
 ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_
+Line 5447 
 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='
+ case `sed -n '/datarootdir/ {
- /datarootdir/ {
    p
    q
  }
-Line 5631 
 ac_sed_dataroot='
+Line 5461 
 ac_sed_dataroot='
  /@infodir@/p
  /@localedir@/p
  /@mandir@/p
- '
+ ' $ac_file_inputs` in
- case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in
  *datarootdir*) ac_datarootdir_seen=yes;;
  *@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
-   { $as_echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
+   { 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
-Line 5652 
 _ACEOF
+Line 5481 
 _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 5671 
 s&@abs_builddir@&$ac_abs_builddir&;t t
+Line 5499 
 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_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
- $as_echo "$as_me: error: could not create $ac_file" >&2;}
-    { (exit 1); exit 1; }; }
  test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
    { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
    { ac_out=`sed -n '/^[  ]*datarootdir[  ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
-   { $as_echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+   { 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_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
- $as_echo "$as_me: error: could not create $ac_file" >&2;}
-    { (exit 1); exit 1; }; }
   ;;
-Line 5707 
 _ACEOF
+Line 5528 
 _ACEOF
  chmod +x $CONFIG_STATUS
  ac_clean_files=$ac_clean_files_save
- test $ac_write_fail = 0 ||
-   { { $as_echo "$as_me:$LINENO: error: write failure creating $CONFIG_STATUS" >&5
- $as_echo "$as_me: error: write failure creating $CONFIG_STATUS" >&2;}
-    { (exit 1); exit 1; }; }
  # configure is writing to config.log, and then calls config.status.
  # config.status does its own redirection, appending to config.log.
-Line 5733 
 if test "$no_create" != yes; then
+Line 5549 
 if test "$no_create" != yes; then
    # would make configure fail if this is the last instruction.
    $ac_cs_success || { (exit 1); exit 1; }
  fi
- if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
-   { $as_echo "$as_me:$LINENO: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
- $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
- fi

 Legend:



Removed from v.60
 


changed lines


 
Added in v.61
 Legend:



Removed from v.60
 


changed lines


 
Added in v.61
-Removed from v.60
+Added in v.61