r21061 - in /desktop/experimental/epiphany-webkit/debian: changelog patches/99_autoreconf.patch

kov at users.alioth.debian.org kov at users.alioth.debian.org
Tue Aug 25 14:48:22 UTC 2009


Author: kov
Date: Tue Aug 25 14:48:22 2009
New Revision: 21061

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=21061
Log:
Refreshed debian/patches/99_autoreconf.patch

Modified:
    desktop/experimental/epiphany-webkit/debian/changelog
    desktop/experimental/epiphany-webkit/debian/patches/99_autoreconf.patch

Modified: desktop/experimental/epiphany-webkit/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/epiphany-webkit/debian/changelog?rev=21061&op=diff
==============================================================================
--- desktop/experimental/epiphany-webkit/debian/changelog [utf-8] (original)
+++ desktop/experimental/epiphany-webkit/debian/changelog [utf-8] Tue Aug 25 14:48:22 2009
@@ -5,7 +5,8 @@
   - updated build-deps; soup >= 2.27.91, webkit >= 1.1.13
   * debian/patches/16_reimplement_search_on_locationbar.patch:
   - updated from upstream's bugzilla
-  * debian/patches/07_bookmarks.patch:
+  * debian/patches/07_bookmarks.patch,
+    debian/patches/99_autoreconf.patch:
   - refreshed
 
  -- Gustavo Noronha Silva <kov at debian.org>  Tue, 25 Aug 2009 11:45:49 -0300

Modified: desktop/experimental/epiphany-webkit/debian/patches/99_autoreconf.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/epiphany-webkit/debian/patches/99_autoreconf.patch?rev=21061&op=diff
==============================================================================
--- desktop/experimental/epiphany-webkit/debian/patches/99_autoreconf.patch [utf-8] (original)
+++ desktop/experimental/epiphany-webkit/debian/patches/99_autoreconf.patch [utf-8] Tue Aug 25 14:48:22 2009
@@ -2,15 +2,15 @@
 aclocal-1.10 -I m4
 automake-1.10
 autoconf
-Index: epiphany-webkit-2.27.5/configure
+Index: epiphany-webkit-2.27.91/configure
 ===================================================================
---- epiphany-webkit-2.27.5.orig/configure	2009-07-22 10:32:30.000000000 +0200
-+++ epiphany-webkit-2.27.5/configure	2009-07-30 17:40:10.382291928 +0200
+--- epiphany-webkit-2.27.91.orig/configure	2009-08-24 14:12:01.000000000 -0300
++++ epiphany-webkit-2.27.91/configure	2009-08-25 11:47:13.078350669 -0300
 @@ -1,20 +1,22 @@
  #! /bin/sh
  # Guess values for system-dependent variables and create Makefiles.
--# Generated by GNU Autoconf 2.63 for GNOME Web Browser 2.27.5.
-+# Generated by GNU Autoconf 2.64 for GNOME Web Browser 2.27.5.
+-# Generated by GNU Autoconf 2.63 for GNOME Web Browser 2.27.91.
++# Generated by GNU Autoconf 2.64 for GNOME Web Browser 2.27.91.
  #
  # Report bugs to <http://bugzilla.gnome.org/enter_bug.cgi?product=epiphany>.
  #
@@ -805,34 +805,14 @@
  PACKAGE_NAME='GNOME Web Browser'
 -PACKAGE_TARNAME='epiphany'
 +PACKAGE_TARNAME='epiphany-webkit'
- PACKAGE_VERSION='2.27.5'
- PACKAGE_STRING='GNOME Web Browser 2.27.5'
+ PACKAGE_VERSION='2.27.91'
+ PACKAGE_STRING='GNOME Web Browser 2.27.91'
  PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=epiphany'
 +PACKAGE_URL=''
  
  ac_unique_file="configure.ac"
  # Factoring default headers for most tests.
-@@ -786,9 +741,7 @@
- # include <unistd.h>
- #endif"
- 
--ac_subst_vars='am__EXEEXT_FALSE
--am__EXEEXT_TRUE
--LTLIBOBJS
-+ac_subst_vars='LTLIBOBJS
- LIBOBJS
- GTK_BUILDER_CONVERT
- SVN_BRANCH
-@@ -953,8 +906,6 @@
- MAINT
- MAINTAINER_MODE_FALSE
- MAINTAINER_MODE_TRUE
--AM_BACKSLASH
--AM_DEFAULT_VERBOSITY
- am__untar
- am__tar
- AMTAR
-@@ -1016,6 +967,7 @@
+@@ -1019,6 +974,7 @@
  program_transform_name
  prefix
  exec_prefix
@@ -840,15 +820,7 @@
  PACKAGE_BUGREPORT
  PACKAGE_STRING
  PACKAGE_VERSION
-@@ -1026,7 +978,6 @@
- ac_subst_files=''
- ac_user_opts='
- enable_option_checking
--enable_silent_rules
- enable_maintainer_mode
- enable_shared
- enable_static
-@@ -1187,8 +1138,7 @@
+@@ -1190,8 +1146,7 @@
      ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
      # Reject names that are not valid shell variable names.
      expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
@@ -858,7 +830,7 @@
      ac_useropt_orig=$ac_useropt
      ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
      case $ac_user_opts in
-@@ -1214,8 +1164,7 @@
+@@ -1217,8 +1172,7 @@
      ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
      # Reject names that are not valid shell variable names.
      expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
@@ -868,7 +840,7 @@
      ac_useropt_orig=$ac_useropt
      ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
      case $ac_user_opts in
-@@ -1419,8 +1368,7 @@
+@@ -1422,8 +1376,7 @@
      ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
      # Reject names that are not valid shell variable names.
      expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
@@ -878,7 +850,7 @@
      ac_useropt_orig=$ac_useropt
      ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
      case $ac_user_opts in
-@@ -1436,8 +1384,7 @@
+@@ -1439,8 +1392,7 @@
      ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
      # Reject names that are not valid shell variable names.
      expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
@@ -888,7 +860,7 @@
      ac_useropt_orig=$ac_useropt
      ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
      case $ac_user_opts in
-@@ -1467,17 +1414,17 @@
+@@ -1470,17 +1422,17 @@
    | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
      x_libraries=$ac_optarg ;;
  
@@ -912,7 +884,7 @@
      eval $ac_envvar=\$ac_optarg
      export $ac_envvar ;;
  
-@@ -1494,15 +1441,13 @@
+@@ -1497,15 +1449,13 @@
  
  if test -n "$ac_prev"; then
    ac_option=--`echo $ac_prev | sed 's/_/-/g'`
@@ -930,7 +902,7 @@
      *)     $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
    esac
  fi
-@@ -1525,8 +1470,7 @@
+@@ -1528,8 +1478,7 @@
      [\\/$]* | ?:[\\/]* )  continue;;
      NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
    esac
@@ -940,7 +912,7 @@
  done
  
  # There might be people who depend on the old broken behavior: `$host'
-@@ -1556,11 +1500,9 @@
+@@ -1559,11 +1508,9 @@
  ac_pwd=`pwd` && test -n "$ac_pwd" &&
  ac_ls_di=`ls -di .` &&
  ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
@@ -954,7 +926,7 @@
  
  
  # Find the source files, if location was not specified.
-@@ -1599,13 +1541,11 @@
+@@ -1602,13 +1549,11 @@
  fi
  if test ! -r "$srcdir/$ac_unique_file"; then
    test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
@@ -970,7 +942,7 @@
  	pwd)`
  # When building in place, set srcdir=.
  if test "$ac_abs_confdir" = "$ac_pwd"; then
-@@ -1679,7 +1619,7 @@
+@@ -1682,7 +1627,7 @@
    --infodir=DIR           info documentation [DATAROOTDIR/info]
    --localedir=DIR         locale-dependent data [DATAROOTDIR/locale]
    --mandir=DIR            man documentation [DATAROOTDIR/man]
@@ -979,21 +951,20 @@
    --htmldir=DIR           html documentation [DOCDIR]
    --dvidir=DIR            dvi documentation [DOCDIR]
    --pdfdir=DIR            pdf documentation [DOCDIR]
-@@ -1709,9 +1649,7 @@
-   --disable-option-checking  ignore unrecognized --enable/--with options
-   --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
-   --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
--  --enable-silent-rules          less verbose build output (undo: `make V=1')
--  --disable-silent-rules         verbose build output (undo: `make V=0')
--  --disable-maintainer-mode  disable make rules and dependencies not useful
-+  --enable-maintainer-mode  enable make rules and dependencies not useful
- 			  (and sometimes confusing) to the casual installer
-   --enable-shared[=PKGS]  build shared libraries [default=yes]
-   --enable-static[=PKGS]  build static libraries [default=no]
-@@ -1855,21 +1793,378 @@
+@@ -1729,7 +1674,8 @@
+                           Turn on compiler warnings
+   --enable-iso-c          Try to warn if code is not ISO C
+   --enable-tests          Wheter to build tests (default: yes)
+-  --disable-schemas-install	Disable the schemas installation
++  --disable-schemas-install
++                          Disable the schemas installation
+   --enable-introspection  Enable GObject introspection (default: disabled)
+   --enable-seed           Enable Seed support (default: disabled)
+   --disable-zeroconf      Whether to enable zeroconf bookmarks support
+@@ -1857,21 +1803,432 @@
  if $ac_init_version; then
    cat <<\_ACEOF
- GNOME Web Browser configure 2.27.5
+ GNOME Web Browser configure 2.27.91
 -generated by GNU Autoconf 2.63
 +generated by GNU Autoconf 2.64
  
@@ -1363,17 +1334,71 @@
 +  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
 +
 +} # ac_fn_c_check_header_mongrel
++
++# ac_fn_c_check_type LINENO TYPE VAR INCLUDES
++# -------------------------------------------
++# Tests whether TYPE exists after having included INCLUDES, setting cache
++# variable VAR accordingly.
++ac_fn_c_check_type ()
++{
++  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
++$as_echo_n "checking for $2... " >&6; }
++if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
++  $as_echo_n "(cached) " >&6
++else
++  eval "$3=no"
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
++$4
++int
++main ()
++{
++if (sizeof ($2))
++	 return 0;
++  ;
++  return 0;
++}
++_ACEOF
++if ac_fn_c_try_compile "$LINENO"; then :
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
++$4
++int
++main ()
++{
++if (sizeof (($2)))
++	    return 0;
++  ;
++  return 0;
++}
++_ACEOF
++if ac_fn_c_try_compile "$LINENO"; then :
++
++else
++  eval "$3=yes"
++fi
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++eval ac_res=\$$3
++	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
++$as_echo "$ac_res" >&6; }
++  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
++
++} # ac_fn_c_check_type
  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 GNOME Web Browser $as_me 2.27.5, which was
+ It was created by GNOME Web Browser $as_me 2.27.91, which was
 -generated by GNU Autoconf 2.63.  Invocation command line was
 +generated by GNU Autoconf 2.64.  Invocation command line was
  
    $ $0 $@
  
-@@ -1905,8 +2200,8 @@
+@@ -1907,8 +2264,8 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -1384,7 +1409,7 @@
  IFS=$as_save_IFS
  
  } >&5
-@@ -1943,9 +2238,9 @@
+@@ -1945,9 +2302,9 @@
        ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
      esac
      case $ac_pass in
@@ -1396,7 +1421,7 @@
        if test $ac_must_keep_next = true; then
  	ac_must_keep_next=false # Got value, back to normal.
        else
-@@ -1961,13 +2256,13 @@
+@@ -1963,13 +2320,13 @@
  	  -* ) ac_must_keep_next=true ;;
  	esac
        fi
@@ -1413,7 +1438,7 @@
  
  # When interrupted or exit'd, cleanup temporary files, and complete
  # config.log.  We remove comments because anyway the quotes in there
-@@ -1992,13 +2287,13 @@
+@@ -1994,13 +2351,13 @@
      case $ac_val in #(
      *${as_nl}*)
        case $ac_var in #(
@@ -1429,7 +1454,7 @@
        esac ;;
      esac
    done
-@@ -2070,39 +2365,41 @@
+@@ -2072,39 +2429,41 @@
      exit $exit_status
  ' 0
  for ac_signal in 1 2 13 15; do
@@ -1476,7 +1501,7 @@
  
  # Let the site file select an alternate cache file if it wants to.
  # Prefer an explicitly selected file to automatically selected ones.
-@@ -2121,7 +2418,7 @@
+@@ -2123,7 +2482,7 @@
  do
    test "x$ac_site_file" = xNONE && continue
    if test -r "$ac_site_file"; then
@@ -1485,7 +1510,7 @@
  $as_echo "$as_me: loading site script $ac_site_file" >&6;}
      sed 's/^/| /' "$ac_site_file" >&5
      . "$ac_site_file"
-@@ -2132,7 +2429,7 @@
+@@ -2134,7 +2493,7 @@
    # Some versions of bash will fail to source /dev/null (special
    # files actually), so we avoid doing that.
    if test -f "$cache_file"; then
@@ -1494,7 +1519,7 @@
  $as_echo "$as_me: loading cache $cache_file" >&6;}
      case $cache_file in
        [\\/]* | ?:[\\/]* ) . "$cache_file";;
-@@ -2140,7 +2437,7 @@
+@@ -2142,14 +2501,14 @@
      esac
    fi
  else
@@ -1503,7 +1528,17 @@
  $as_echo "$as_me: creating cache $cache_file" >&6;}
    >$cache_file
  fi
-@@ -2155,11 +2452,11 @@
+ 
+-ac_header_list="$ac_header_list sys/time.h"
+-ac_header_list="$ac_header_list unistd.h"
+-ac_func_list="$ac_func_list alarm"
++as_fn_append ac_header_list " sys/time.h"
++as_fn_append ac_header_list " unistd.h"
++as_fn_append ac_func_list " alarm"
+ # Check that the precious variables saved in the cache have kept the same
+ # value.
+ ac_cache_corrupted=false
+@@ -2160,11 +2519,11 @@
    eval ac_new_val=\$ac_env_${ac_var}_value
    case $ac_old_set,$ac_new_set in
      set,)
@@ -1517,7 +1552,7 @@
  $as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
        ac_cache_corrupted=: ;;
      ,);;
-@@ -2169,17 +2466,17 @@
+@@ -2174,17 +2533,17 @@
  	ac_old_val_w=`echo x $ac_old_val`
  	ac_new_val_w=`echo x $ac_new_val`
  	if test "$ac_old_val_w" != "$ac_new_val_w"; then
@@ -1539,7 +1574,7 @@
  $as_echo "$as_me:   current value: \`$ac_new_val'" >&2;}
        fi;;
    esac
-@@ -2191,43 +2488,20 @@
+@@ -2196,43 +2555,20 @@
      esac
      case " $ac_configure_args " in
        *" '$ac_arg' "*) ;; # Avoid dups.  Use of quotes ensures accuracy.
@@ -1590,12 +1625,7 @@
  
  ac_ext=c
  ac_cpp='$CPP $CPPFLAGS'
-@@ -2277,28 +2551,20 @@
- BUILDID="$(TZ=UTC0 date +'%Y%m%d')"
- 
- 
--am__api_version='1.11'
-+am__api_version='1.10'
+@@ -2286,24 +2622,16 @@
  
  ac_aux_dir=
  for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
@@ -1628,7 +1658,7 @@
  fi
  
  # These three variables are undocumented and unsupported,
-@@ -2324,10 +2590,10 @@
+@@ -2329,10 +2657,10 @@
  # 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.
@@ -1641,7 +1671,7 @@
    $as_echo_n "(cached) " >&6
  else
    as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-@@ -2335,11 +2601,11 @@
+@@ -2340,11 +2668,11 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -1657,7 +1687,7 @@
    /usr/ucb/* ) ;;
    *)
      # OSF1 and SCO ODT 3.0 have their own names for install.
-@@ -2376,7 +2642,7 @@
+@@ -2381,7 +2709,7 @@
      ;;
  esac
  
@@ -1666,7 +1696,7 @@
  IFS=$as_save_IFS
  
  rm -rf conftest.one conftest.two conftest.dir
-@@ -2392,7 +2658,7 @@
+@@ -2397,7 +2725,7 @@
      INSTALL=$ac_install_sh
    fi
  fi
@@ -1675,7 +1705,7 @@
  $as_echo "$INSTALL" >&6; }
  
  # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
-@@ -2403,38 +2669,21 @@
+@@ -2408,7 +2736,7 @@
  
  test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
  
@@ -1684,40 +1714,25 @@
  $as_echo_n "checking whether build environment is sane... " >&6; }
  # Just in case
  sleep 1
- echo timestamp > conftest.file
--# Reject unsafe characters in $srcdir or the absolute working directory
--# name.  Accept space and tab only in the latter.
--am_lf='
--'
--case `pwd` in
--  *[\\\"\#\$\&\'\`$am_lf]*)
+@@ -2419,15 +2747,11 @@
+ '
+ case `pwd` in
+   *[\\\"\#\$\&\'\`$am_lf]*)
 -    { { $as_echo "$as_me:$LINENO: error: unsafe absolute working directory name" >&5
 -$as_echo "$as_me: error: unsafe absolute working directory name" >&2;}
 -   { (exit 1); exit 1; }; };;
--esac
--case $srcdir in
--  *[\\\"\#\$\&\'\`$am_lf\ \	]*)
++    as_fn_error "unsafe absolute working directory name" "$LINENO" 5;;
+ esac
+ case $srcdir in
+   *[\\\"\#\$\&\'\`$am_lf\ \	]*)
 -    { { $as_echo "$as_me:$LINENO: error: unsafe srcdir value: \`$srcdir'" >&5
 -$as_echo "$as_me: error: unsafe srcdir value: \`$srcdir'" >&2;}
 -   { (exit 1); exit 1; }; };;
--esac
--
++    as_fn_error "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;;
+ esac
+ 
  # Do `set' in a subshell so we don't clobber the current shell's
- # arguments.  Must try -L first in case configure is actually a
- # symlink; some systems play weird games with the mod time of symlinks
- # (eg FreeBSD returns the mod time of the symlink's containing
- # directory).
- if (
--   set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
-+   set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null`
-    if test "$*" = "X"; then
-       # -L didn't work.
--      set X `ls -t "$srcdir/configure" conftest.file`
-+      set X `ls -t $srcdir/configure conftest.file`
-    fi
-    rm -f conftest.file
-    if test "$*" != "X $srcdir/configure conftest.file" \
-@@ -2444,11 +2693,8 @@
+@@ -2449,11 +2773,8 @@
        # if, for instance, CONFIG_SHELL is bash and it inherits a
        # broken ls alias from the environment.  This has actually
        # happened.  Such a system could not be considered "sane".
@@ -1731,7 +1746,7 @@
     fi
  
     test "$2" = conftest.file
-@@ -2457,13 +2703,10 @@
+@@ -2462,13 +2783,10 @@
     # Ok.
     :
  else
@@ -1748,21 +1763,7 @@
  $as_echo "yes" >&6; }
  test "$program_prefix" != NONE &&
    program_transform_name="s&^&$program_prefix&;$program_transform_name"
-@@ -2478,144 +2721,28 @@
- # expand $ac_aux_dir to an absolute path
- am_aux_dir=`cd $ac_aux_dir && pwd`
- 
--if test x"${MISSING+set}" != xset; then
--  case $am_aux_dir in
--  *\ * | *\	*)
--    MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;;
--  *)
--    MISSING="\${SHELL} $am_aux_dir/missing" ;;
--  esac
--fi
-+test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
- # Use eval to expand $SHELL
- if eval "$MISSING --run true"; then
+@@ -2496,7 +2814,7 @@
    am_missing_run="$MISSING --run "
  else
    am_missing_run=
@@ -1771,138 +1772,122 @@
  $as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
  fi
  
--if test x"${install_sh}" != xset; then
--  case $am_aux_dir in
--  *\ * | *\	*)
--    install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
--  *)
--    install_sh="\${SHELL} $am_aux_dir/install-sh"
--  esac
--fi
--
--# Installed binaries are usually stripped using `strip' when the user
--# run `make install-strip'.  However `strip' might not be the right
--# tool to use in cross-compilation environments, therefore Automake
--# will honor the `STRIP' environment variable to overrule this program.
--if test "$cross_compiling" != no; then
--  if test -n "$ac_tool_prefix"; then
--  # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
--set dummy ${ac_tool_prefix}strip; ac_word=$2
+@@ -2517,9 +2835,9 @@
+   if test -n "$ac_tool_prefix"; then
+   # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
+ set dummy ${ac_tool_prefix}strip; ac_word=$2
 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
--$as_echo_n "checking for $ac_word... " >&6; }
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
 -if test "${ac_cv_prog_STRIP+set}" = set; then
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a thread-safe mkdir -p" >&5
-+$as_echo_n "checking for a thread-safe mkdir -p... " >&6; }
-+if test -z "$MKDIR_P"; then
-+  if test "${ac_cv_path_mkdir+set}" = set; then :
++if test "${ac_cv_prog_STRIP+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
--  if test -n "$STRIP"; then
--  ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
--else
--as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
--for as_dir in $PATH
-+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin
+   if test -n "$STRIP"; then
+@@ -2530,24 +2848,24 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
 -  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_STRIP="${ac_tool_prefix}strip"
++    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_STRIP="${ac_tool_prefix}strip"
 -    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
--    break 2
--  fi
++    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+ done
 -done
++  done
+ IFS=$as_save_IFS
+ 
+ fi
+ fi
+ STRIP=$ac_cv_prog_STRIP
+ if test -n "$STRIP"; then
+-  { $as_echo "$as_me:$LINENO: result: $STRIP" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5
+ $as_echo "$STRIP" >&6; }
+ else
+-  { $as_echo "$as_me:$LINENO: result: no" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ fi
+ 
+@@ -2557,9 +2875,9 @@
+   ac_ct_STRIP=$STRIP
+   # Extract the first word of "strip", so it can be a program name with args.
+ set dummy strip; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
++if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test -n "$ac_ct_STRIP"; then
+@@ -2570,24 +2888,24 @@
+ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+-  for ac_exec_ext in '' $ac_executable_extensions; do
++    for ac_exec_ext in '' $ac_executable_extensions; do
+   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_prog_ac_ct_STRIP="strip"
+-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+ done
 -done
--IFS=$as_save_IFS
--
--fi
--fi
--STRIP=$ac_cv_prog_STRIP
--if test -n "$STRIP"; then
--  { $as_echo "$as_me:$LINENO: result: $STRIP" >&5
--$as_echo "$STRIP" >&6; }
--else
++  done
+ IFS=$as_save_IFS
+ 
+ fi
+ fi
+ ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
+ if test -n "$ac_ct_STRIP"; then
+-  { $as_echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5
+ $as_echo "$ac_ct_STRIP" >&6; }
+ else
 -  { $as_echo "$as_me:$LINENO: result: no" >&5
--$as_echo "no" >&6; }
--fi
--
--
--fi
--if test -z "$ac_cv_prog_STRIP"; then
--  ac_ct_STRIP=$STRIP
--  # Extract the first word of "strip", so it can be a program name with args.
--set dummy strip; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
--$as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
--  $as_echo_n "(cached) " >&6
--else
--  if test -n "$ac_ct_STRIP"; then
--  ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
--else
--as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
--for as_dir in $PATH
--do
--  IFS=$as_save_IFS
--  test -z "$as_dir" && as_dir=.
--  for ac_exec_ext in '' $ac_executable_extensions; do
--  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_STRIP="strip"
--    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
--    break 2
--  fi
--done
--done
--IFS=$as_save_IFS
--
--fi
--fi
--ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
--if test -n "$ac_ct_STRIP"; then
--  { $as_echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
--$as_echo "$ac_ct_STRIP" >&6; }
--else
--  { $as_echo "$as_me:$LINENO: result: no" >&5
--$as_echo "no" >&6; }
--fi
--
--  if test "x$ac_ct_STRIP" = x; then
--    STRIP=":"
--  else
--    case $cross_compiling:$ac_tool_warned in
--yes:)
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ fi
+ 
+@@ -2596,7 +2914,7 @@
+   else
+     case $cross_compiling:$ac_tool_warned in
+ yes:)
 -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
--$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
--ac_tool_warned=yes ;;
--esac
--    STRIP=$ac_ct_STRIP
--  fi
--else
--  STRIP="$ac_cv_prog_STRIP"
--fi
--
--fi
--INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
--
++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+ $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ ac_tool_warned=yes ;;
+ esac
+@@ -2609,10 +2927,10 @@
+ fi
+ INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
+ 
 -{ $as_echo "$as_me:$LINENO: checking for a thread-safe mkdir -p" >&5
--$as_echo_n "checking for a thread-safe mkdir -p... " >&6; }
--if test -z "$MKDIR_P"; then
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a thread-safe mkdir -p" >&5
+ $as_echo_n "checking for a thread-safe mkdir -p... " >&6; }
+ if test -z "$MKDIR_P"; then
 -  if test "${ac_cv_path_mkdir+set}" = set; then
--  $as_echo_n "(cached) " >&6
--else
--  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
--for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin
--do
--  IFS=$as_save_IFS
--  test -z "$as_dir" && as_dir=.
++  if test "${ac_cv_path_mkdir+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+@@ -2620,7 +2938,7 @@
+ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
 -  for ac_prog in mkdir gmkdir; do
 +    for ac_prog in mkdir gmkdir; do
  	 for ac_exec_ext in '' $ac_executable_extensions; do
  	   { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue
  	   case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
-@@ -2627,7 +2754,7 @@
+@@ -2632,7 +2950,7 @@
  	   esac
  	 done
         done
@@ -1911,7 +1896,7 @@
  IFS=$as_save_IFS
  
  fi
-@@ -2643,7 +2770,7 @@
+@@ -2648,7 +2966,7 @@
      MKDIR_P="$ac_install_sh -d"
    fi
  fi
@@ -1920,7 +1905,7 @@
  $as_echo "$MKDIR_P" >&6; }
  
  mkdir_p="$MKDIR_P"
-@@ -2656,9 +2783,9 @@
+@@ -2661,9 +2979,9 @@
  do
    # Extract the first word of "$ac_prog", so it can be a program name with args.
  set dummy $ac_prog; ac_word=$2
@@ -1932,7 +1917,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$AWK"; then
-@@ -2669,24 +2796,24 @@
+@@ -2674,24 +2992,24 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -1962,7 +1947,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -2694,11 +2821,11 @@
+@@ -2699,11 +3017,11 @@
    test -n "$AWK" && break
  done
  
@@ -1976,7 +1961,7 @@
    $as_echo_n "(cached) " >&6
  else
    cat >conftest.make <<\_ACEOF
-@@ -2716,11 +2843,11 @@
+@@ -2721,11 +3039,11 @@
  rm -f conftest.make
  fi
  if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
@@ -1990,7 +1975,7 @@
  $as_echo "no" >&6; }
    SET_MAKE="MAKE=${MAKE-make}"
  fi
-@@ -2740,9 +2867,7 @@
+@@ -2745,9 +3063,7 @@
    am__isrc=' -I$(srcdir)'
    # test to see if srcdir already configured
    if test -f $srcdir/config.status; then
@@ -2001,125 +1986,16 @@
    fi
  fi
  
-@@ -2757,7 +2882,7 @@
+@@ -2762,7 +3078,7 @@
  
  
  # Define the identity of the package.
 - PACKAGE='epiphany'
 + PACKAGE='epiphany-webkit'
-  VERSION='2.27.5'
- 
- 
-@@ -2786,6 +2911,108 @@
- 
- MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
- 
-+install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"}
-+
-+# Installed binaries are usually stripped using `strip' when the user
-+# run `make install-strip'.  However `strip' might not be the right
-+# tool to use in cross-compilation environments, therefore Automake
-+# will honor the `STRIP' environment variable to overrule this program.
-+if test "$cross_compiling" != no; then
-+  if test -n "$ac_tool_prefix"; then
-+  # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
-+set dummy ${ac_tool_prefix}strip; ac_word=$2
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
-+if test "${ac_cv_prog_STRIP+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  if test -n "$STRIP"; then
-+  ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
-+else
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+    ac_cv_prog_STRIP="${ac_tool_prefix}strip"
-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
-+  done
-+IFS=$as_save_IFS
-+
-+fi
-+fi
-+STRIP=$ac_cv_prog_STRIP
-+if test -n "$STRIP"; then
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5
-+$as_echo "$STRIP" >&6; }
-+else
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+fi
-+
-+
-+fi
-+if test -z "$ac_cv_prog_STRIP"; then
-+  ac_ct_STRIP=$STRIP
-+  # Extract the first word of "strip", so it can be a program name with args.
-+set dummy strip; ac_word=$2
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
-+if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  if test -n "$ac_ct_STRIP"; then
-+  ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
-+else
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-+  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_STRIP="strip"
-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
-+  done
-+IFS=$as_save_IFS
-+
-+fi
-+fi
-+ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
-+if test -n "$ac_ct_STRIP"; then
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5
-+$as_echo "$ac_ct_STRIP" >&6; }
-+else
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+fi
-+
-+  if test "x$ac_ct_STRIP" = x; then
-+    STRIP=":"
-+  else
-+    case $cross_compiling:$ac_tool_warned in
-+yes:)
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-+ac_tool_warned=yes ;;
-+esac
-+    STRIP=$ac_ct_STRIP
-+  fi
-+else
-+  STRIP="$ac_cv_prog_STRIP"
-+fi
-+
-+fi
-+INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
-+
- # We need awk for the "check" target.  The system "awk" is bad on
- # some platforms.
- # Always define AMTAR for backward compatibility.
-@@ -2793,7 +3020,7 @@
+  VERSION='2.27.91'
+ 
+ 
+@@ -2798,7 +3114,7 @@
  AMTAR=${AMTAR-"${am_missing_run}tar"}
  
  
@@ -2128,7 +2004,7 @@
  $as_echo_n "checking how to create a ustar tar archive... " >&6; }
  # Loop over all known methods to create a tar archive until one works.
  _am_tools='gnutar plaintar pax cpio none'
-@@ -2866,13 +3093,13 @@
+@@ -2871,13 +3187,13 @@
  done
  rm -rf conftest.dir
  
@@ -2144,38 +2020,28 @@
  $as_echo "$am_cv_prog_tar_ustar" >&6; }
  
  
-@@ -2881,33 +3108,21 @@
- 
+@@ -2887,7 +3203,7 @@
  
  # Use AM_SILENT_RULES if present
--# Check whether --enable-silent-rules was given.
+ # Check whether --enable-silent-rules was given.
 -if test "${enable_silent_rules+set}" = set; then
--  enableval=$enable_silent_rules;
--fi
--
--case $enable_silent_rules in
--yes) AM_DEFAULT_VERBOSITY=0;;
--no)  AM_DEFAULT_VERBOSITY=1;;
--*)   AM_DEFAULT_VERBOSITY=0;;
--esac
--AM_BACKSLASH='\'
- 
- 
- if test -z "$enable_maintainer_mode"; then
++if test "${enable_silent_rules+set}" = set; then :
+   enableval=$enable_silent_rules;
+ fi
+ 
+@@ -2903,16 +3219,16 @@
    enable_maintainer_mode=yes
  fi
--
+ 
 -{ $as_echo "$as_me:$LINENO: checking whether to disable maintainer-specific portions of Makefiles" >&5
--$as_echo_n "checking whether to disable maintainer-specific portions of Makefiles... " >&6; }
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5
-+$as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; }
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to disable maintainer-specific portions of Makefiles" >&5
+ $as_echo_n "checking whether to disable maintainer-specific portions of Makefiles... " >&6; }
      # Check whether --enable-maintainer-mode was given.
 -if test "${enable_maintainer_mode+set}" = set; then
 +if test "${enable_maintainer_mode+set}" = set; then :
    enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval
  else
--  USE_MAINTAINER_MODE=yes
-+  USE_MAINTAINER_MODE=no
+   USE_MAINTAINER_MODE=yes
  fi
  
 -  { $as_echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5
@@ -2183,7 +2049,7 @@
  $as_echo "$USE_MAINTAINER_MODE" >&6; }
     if test $USE_MAINTAINER_MODE = yes; then
    MAINTAINER_MODE_TRUE=
-@@ -2922,7 +3137,7 @@
+@@ -2927,7 +3243,7 @@
  
  
  # Check whether --enable-shared was given.
@@ -2192,7 +2058,7 @@
    enableval=$enable_shared; p=${PACKAGE-default}
      case $enableval in
      yes) enable_shared=yes ;;
-@@ -2953,7 +3168,7 @@
+@@ -2958,7 +3274,7 @@
  
  
  # Check whether --enable-static was given.
@@ -2201,7 +2067,7 @@
    enableval=$enable_static; p=${PACKAGE-default}
      case $enableval in
      yes) enable_static=yes ;;
-@@ -2990,7 +3205,7 @@
+@@ -2995,7 +3311,7 @@
  
  case `pwd` in
    *\ * | *\	*)
@@ -2210,7 +2076,7 @@
  $as_echo "$as_me: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&2;} ;;
  esac
  
-@@ -3015,35 +3230,27 @@
+@@ -3020,35 +3336,27 @@
  
  # Make sure we can run config.sub.
  $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
@@ -2253,7 +2119,7 @@
  esac
  build=$ac_cv_build
  ac_save_IFS=$IFS; IFS='-'
-@@ -3059,28 +3266,24 @@
+@@ -3064,28 +3372,24 @@
  case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
  
  
@@ -2287,12 +2153,7 @@
  esac
  host=$ac_cv_host
  ac_save_IFS=$IFS; IFS='-'
-@@ -3104,44 +3307,44 @@
- am_make=${MAKE-make}
- cat > confinc << 'END'
- am__doit:
--	@echo this is the am__doit target
-+	@echo done
+@@ -3113,7 +3417,7 @@
  .PHONY: am__doit
  END
  # If we don't find an include directive, just comment out the code.
@@ -2301,42 +2162,7 @@
  $as_echo_n "checking for style of include used by $am_make... " >&6; }
  am__include="#"
  am__quote=
- _am_result=none
- # First try GNU make style include.
- echo "include confinc" > confmf
--# Ignore all kinds of additional output from `make'.
--case `$am_make -s -f confmf 2> /dev/null` in #(
--*the\ am__doit\ target*)
--  am__include=include
--  am__quote=
--  _am_result=GNU
--  ;;
--esac
-+# We grep out `Entering directory' and `Leaving directory'
-+# messages which can occur if `w' ends up in MAKEFLAGS.
-+# In particular we don't look at `^make:' because GNU make might
-+# be invoked under some other name (usually "gmake"), in which
-+# case it prints its new name instead of `make'.
-+if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then
-+   am__include=include
-+   am__quote=
-+   _am_result=GNU
-+fi
- # Now try BSD make style include.
- if test "$am__include" = "#"; then
-    echo '.include "confinc"' > confmf
--   case `$am_make -s -f confmf 2> /dev/null` in #(
--   *the\ am__doit\ target*)
--     am__include=.include
--     am__quote="\""
--     _am_result=BSD
--     ;;
--   esac
-+   if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then
-+      am__include=.include
-+      am__quote="\""
-+      _am_result=BSD
-+   fi
+@@ -3141,12 +3445,12 @@
  fi
  
  
@@ -2351,7 +2177,7 @@
    enableval=$enable_dependency_tracking;
  fi
  
-@@ -3166,9 +3369,9 @@
+@@ -3171,9 +3475,9 @@
  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
@@ -2363,7 +2189,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$CC"; then
-@@ -3179,24 +3382,24 @@
+@@ -3184,24 +3488,24 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -2393,7 +2219,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -3206,9 +3409,9 @@
+@@ -3211,9 +3515,9 @@
    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
@@ -2405,7 +2231,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$ac_ct_CC"; then
-@@ -3219,24 +3422,24 @@
+@@ -3224,24 +3528,24 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -2435,7 +2261,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -3245,7 +3448,7 @@
+@@ -3250,7 +3554,7 @@
    else
      case $cross_compiling:$ac_tool_warned in
  yes:)
@@ -2444,7 +2270,7 @@
  $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
  ac_tool_warned=yes ;;
  esac
-@@ -3259,9 +3462,9 @@
+@@ -3264,9 +3568,9 @@
            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
@@ -2456,7 +2282,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$CC"; then
-@@ -3272,24 +3475,24 @@
+@@ -3277,24 +3581,24 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -2486,7 +2312,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -3299,9 +3502,9 @@
+@@ -3304,9 +3608,9 @@
  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
@@ -2498,7 +2324,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$CC"; then
-@@ -3313,18 +3516,18 @@
+@@ -3318,18 +3622,18 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -2520,7 +2346,7 @@
  IFS=$as_save_IFS
  
  if test $ac_prog_rejected = yes; then
-@@ -3343,10 +3546,10 @@
+@@ -3348,10 +3652,10 @@
  fi
  CC=$ac_cv_prog_CC
  if test -n "$CC"; then
@@ -2533,7 +2359,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -3358,9 +3561,9 @@
+@@ -3363,9 +3667,9 @@
    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
@@ -2545,7 +2371,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$CC"; then
-@@ -3371,24 +3574,24 @@
+@@ -3376,24 +3680,24 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -2575,7 +2401,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -3402,9 +3605,9 @@
+@@ -3407,9 +3711,9 @@
  do
    # Extract the first word of "$ac_prog", so it can be a program name with args.
  set dummy $ac_prog; ac_word=$2
@@ -2587,7 +2413,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$ac_ct_CC"; then
-@@ -3415,24 +3618,24 @@
+@@ -3420,24 +3724,24 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -2617,7 +2443,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -3445,7 +3648,7 @@
+@@ -3450,7 +3754,7 @@
    else
      case $cross_compiling:$ac_tool_warned in
  yes:)
@@ -2626,7 +2452,7 @@
  $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
  ac_tool_warned=yes ;;
  esac
-@@ -3456,73 +3659,55 @@
+@@ -3461,73 +3765,55 @@
  fi
  
  
@@ -2658,6 +2484,17 @@
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }
 -{ (ac_try="$ac_compiler -v >&5"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_compiler -v >&5") 2>&5
+-  ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }
+-{ (ac_try="$ac_compiler -V >&5"
 +for ac_option in --version -v -V -qversion; do
 +  { { ac_try="$ac_compiler $ac_option >&5"
  case "(($ac_try" in
@@ -2666,25 +2503,13 @@
  esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
--  (eval "$ac_compiler -v >&5") 2>&5
--  ac_status=$?
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }
--{ (ac_try="$ac_compiler -V >&5"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
 -  (eval "$ac_compiler -V >&5") 2>&5
--  ac_status=$?
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }
 +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
 +$as_echo "$ac_try_echo"; } >&5
 +  (eval "$ac_compiler $ac_option >&5") 2>conftest.err
-+  ac_status=$?
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }
 +  if test -s conftest.err; then
 +    sed '10a\
 +... rest of stderr output deleted ...
@@ -2726,7 +2551,7 @@
  $as_echo_n "checking for C compiler default output file name... " >&6; }
  ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
  
-@@ -3539,17 +3724,17 @@
+@@ -3544,17 +3830,17 @@
  done
  rm -f $ac_rmfiles
  
@@ -2749,7 +2574,7 @@
    # Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
  # So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
  # in a Makefile.  We should not override ac_cv_exeext if it was cached,
-@@ -3566,7 +3751,7 @@
+@@ -3571,7 +3857,7 @@
  	# certainly right.
  	break;;
      *.* )
@@ -2758,7 +2583,7 @@
  	then :; else
  	   ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
  	fi
-@@ -3585,84 +3770,75 @@
+@@ -3590,84 +3876,75 @@
  else
    ac_file=''
  fi
@@ -2868,7 +2693,7 @@
    # If both `conftest.exe' and `conftest' are `present' (well, observable)
  # catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will
  # work properly (i.e., refer to `conftest.exe'), while it won't with
-@@ -3677,32 +3853,24 @@
+@@ -3682,32 +3959,24 @@
    esac
  done
  else
@@ -2908,7 +2733,7 @@
  /* end confdefs.h.  */
  
  int
-@@ -3714,17 +3882,17 @@
+@@ -3719,17 +3988,17 @@
  }
  _ACEOF
  rm -f conftest.o conftest.obj
@@ -2931,7 +2756,7 @@
    for ac_file in conftest.o conftest.obj conftest.*; do
    test -f "$ac_file" || continue;
    case $ac_file in
-@@ -3737,31 +3905,23 @@
+@@ -3742,31 +4011,23 @@
    $as_echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -2970,7 +2795,7 @@
  /* end confdefs.h.  */
  
  int
-@@ -3775,37 +3935,16 @@
+@@ -3780,37 +4041,16 @@
    return 0;
  }
  _ACEOF
@@ -3011,7 +2836,7 @@
  $as_echo "$ac_cv_c_compiler_gnu" >&6; }
  if test $ac_compiler_gnu = yes; then
    GCC=yes
-@@ -3814,20 +3953,16 @@
+@@ -3819,20 +4059,16 @@
  fi
  ac_test_CFLAGS=${CFLAGS+set}
  ac_save_CFLAGS=$CFLAGS
@@ -3035,7 +2860,7 @@
  /* end confdefs.h.  */
  
  int
-@@ -3838,35 +3973,11 @@
+@@ -3843,35 +4079,11 @@
    return 0;
  }
  _ACEOF
@@ -3074,7 +2899,7 @@
  /* end confdefs.h.  */
  
  int
-@@ -3877,36 +3988,12 @@
+@@ -3882,36 +4094,12 @@
    return 0;
  }
  _ACEOF
@@ -3115,7 +2940,7 @@
  /* end confdefs.h.  */
  
  int
-@@ -3917,42 +4004,17 @@
+@@ -3922,42 +4110,17 @@
    return 0;
  }
  _ACEOF
@@ -3160,7 +2985,7 @@
  $as_echo "$ac_cv_prog_cc_g" >&6; }
  if test "$ac_test_CFLAGS" = set; then
    CFLAGS=$ac_save_CFLAGS
-@@ -3969,18 +4031,14 @@
+@@ -3974,18 +4137,14 @@
      CFLAGS=
    fi
  fi
@@ -3182,7 +3007,7 @@
  /* end confdefs.h.  */
  #include <stdarg.h>
  #include <stdio.h>
-@@ -4037,32 +4095,9 @@
+@@ -4042,32 +4201,9 @@
  	-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
  do
    CC="$ac_save_CC $ac_arg"
@@ -3216,7 +3041,7 @@
  rm -f core conftest.err conftest.$ac_objext
    test "x$ac_cv_prog_cc_c89" != "xno" && break
  done
-@@ -4073,17 +4108,19 @@
+@@ -4078,17 +4214,19 @@
  # AC_CACHE_VAL
  case "x$ac_cv_prog_cc_c89" in
    x)
@@ -3239,7 +3064,7 @@
  
  ac_ext=c
  ac_cpp='$CPP $CPPFLAGS'
-@@ -4093,9 +4130,9 @@
+@@ -4098,9 +4236,9 @@
  
  depcc="$CC"   am_compiler_list=
  
@@ -3251,67 +3076,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-@@ -4121,11 +4158,6 @@
-   if test "$am_compiler_list" = ""; then
-      am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
-   fi
--  am__universal=false
--  case " $depcc " in #(
--     *\ -arch\ *\ -arch\ *) am__universal=true ;;
--     esac
--
-   for depmode in $am_compiler_list; do
-     # Setup a source with many dependencies, because some compilers
-     # like to wrap large dependency lists on column 80 (with \), and
-@@ -4143,17 +4175,7 @@
-     done
-     echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
- 
--    # We check with `-c' and `-o' for the sake of the "dashmstdout"
--    # mode.  It turns out that the SunPro C++ compiler does not properly
--    # handle `-M -o', and we need to detect this.  Also, some Intel
--    # versions had trouble with output in subdirs
--    am__obj=sub/conftest.${OBJEXT-o}
--    am__minus_obj="-o $am__obj"
-     case $depmode in
--    gcc)
--      # This depmode causes a compiler race in universal mode.
--      test "$am__universal" = false || continue
--      ;;
-     nosideeffect)
-       # after this tag, mechanisms are not by side-effect, so they'll
-       # only be used when explicitly requested
-@@ -4163,23 +4185,19 @@
- 	break
-       fi
-       ;;
--    msvisualcpp | msvcmsys)
--      # This compiler won't grok `-c -o', but also, the minuso test has
--      # not run yet.  These depmodes are late enough in the game, and
--      # so weak that their functioning should not be impacted.
--      am__obj=conftest.${OBJEXT-o}
--      am__minus_obj=
--      ;;
-     none) break ;;
-     esac
-+    # We check with `-c' and `-o' for the sake of the "dashmstdout"
-+    # mode.  It turns out that the SunPro C++ compiler does not properly
-+    # handle `-M -o', and we need to detect this.
-     if depmode=$depmode \
--       source=sub/conftest.c object=$am__obj \
-+       source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
-        depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
--       $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
-+       $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
-          >/dev/null 2>conftest.err &&
-        grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
-        grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
--       grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
-+       grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
-        ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
-       # icc doesn't choke on unknown options, it will just issue warnings
-       # or remarks (even with -Werror).  So we grep stderr for any message
-@@ -4203,7 +4221,7 @@
+@@ -4208,7 +4346,7 @@
  fi
  
  fi
@@ -3320,7 +3085,7 @@
  $as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }
  CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
  
-@@ -4218,9 +4236,9 @@
+@@ -4223,9 +4361,9 @@
  fi
  
  
@@ -3332,7 +3097,7 @@
    $as_echo_n "(cached) " >&6
  else
              ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
-@@ -4228,7 +4246,7 @@
+@@ -4233,7 +4371,7 @@
         ac_script="$ac_script$as_nl$ac_script"
       done
       echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed
@@ -3341,7 +3106,7 @@
       if test -z "$SED"; then
    ac_path_SED_found=false
    # Loop through the user's path and test for each of PROGNAME-LIST
-@@ -4237,7 +4255,7 @@
+@@ -4242,7 +4380,7 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -3350,7 +3115,7 @@
      for ac_exec_ext in '' $ac_executable_extensions; do
        ac_path_SED="$as_dir/$ac_prog$ac_exec_ext"
        { test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue
-@@ -4257,7 +4275,7 @@
+@@ -4262,7 +4400,7 @@
      $as_echo '' >> "conftest.nl"
      "$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break
      diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
@@ -3359,7 +3124,7 @@
      if test $ac_count -gt ${ac_path_SED_max-0}; then
        # Best one so far, save it but keep looking for a better one
        ac_cv_path_SED="$ac_path_SED"
-@@ -4272,19 +4290,17 @@
+@@ -4277,19 +4415,17 @@
        $ac_path_SED_found && break 3
      done
    done
@@ -3382,7 +3147,7 @@
  $as_echo "$ac_cv_path_SED" >&6; }
   SED="$ac_cv_path_SED"
    rm -f conftest.sed
-@@ -4302,9 +4318,9 @@
+@@ -4307,9 +4443,9 @@
  
  
  
@@ -3394,7 +3159,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -z "$GREP"; then
-@@ -4315,7 +4331,7 @@
+@@ -4320,7 +4456,7 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -3403,7 +3168,7 @@
      for ac_exec_ext in '' $ac_executable_extensions; do
        ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
        { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
-@@ -4335,7 +4351,7 @@
+@@ -4340,7 +4476,7 @@
      $as_echo 'GREP' >> "conftest.nl"
      "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
      diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
@@ -3412,7 +3177,7 @@
      if test $ac_count -gt ${ac_path_GREP_max-0}; then
        # Best one so far, save it but keep looking for a better one
        ac_cv_path_GREP="$ac_path_GREP"
-@@ -4350,26 +4366,24 @@
+@@ -4355,26 +4491,24 @@
        $ac_path_GREP_found && break 3
      done
    done
@@ -3444,7 +3209,7 @@
    $as_echo_n "(cached) " >&6
  else
    if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
-@@ -4383,7 +4397,7 @@
+@@ -4388,7 +4522,7 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -3453,7 +3218,7 @@
      for ac_exec_ext in '' $ac_executable_extensions; do
        ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
        { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
-@@ -4403,7 +4417,7 @@
+@@ -4408,7 +4542,7 @@
      $as_echo 'EGREP' >> "conftest.nl"
      "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
      diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
@@ -3462,7 +3227,7 @@
      if test $ac_count -gt ${ac_path_EGREP_max-0}; then
        # Best one so far, save it but keep looking for a better one
        ac_cv_path_EGREP="$ac_path_EGREP"
-@@ -4418,12 +4432,10 @@
+@@ -4423,12 +4557,10 @@
        $ac_path_EGREP_found && break 3
      done
    done
@@ -3477,7 +3242,7 @@
    fi
  else
    ac_cv_path_EGREP=$EGREP
-@@ -4431,14 +4443,14 @@
+@@ -4436,14 +4568,14 @@
  
     fi
  fi
@@ -3495,7 +3260,7 @@
    $as_echo_n "(cached) " >&6
  else
    if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1
-@@ -4452,7 +4464,7 @@
+@@ -4457,7 +4589,7 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -3504,7 +3269,7 @@
      for ac_exec_ext in '' $ac_executable_extensions; do
        ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext"
        { test -f "$ac_path_FGREP" && $as_test_x "$ac_path_FGREP"; } || continue
-@@ -4472,7 +4484,7 @@
+@@ -4477,7 +4609,7 @@
      $as_echo 'FGREP' >> "conftest.nl"
      "$ac_path_FGREP" FGREP < "conftest.nl" >"conftest.out" 2>/dev/null || break
      diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
@@ -3513,7 +3278,7 @@
      if test $ac_count -gt ${ac_path_FGREP_max-0}; then
        # Best one so far, save it but keep looking for a better one
        ac_cv_path_FGREP="$ac_path_FGREP"
-@@ -4487,12 +4499,10 @@
+@@ -4492,12 +4624,10 @@
        $ac_path_FGREP_found && break 3
      done
    done
@@ -3528,7 +3293,7 @@
    fi
  else
    ac_cv_path_FGREP=$FGREP
-@@ -4500,7 +4510,7 @@
+@@ -4505,7 +4635,7 @@
  
     fi
  fi
@@ -3537,7 +3302,7 @@
  $as_echo "$ac_cv_path_FGREP" >&6; }
   FGREP="$ac_cv_path_FGREP"
  
-@@ -4526,7 +4536,7 @@
+@@ -4531,7 +4661,7 @@
  
  
  # Check whether --with-gnu-ld was given.
@@ -3546,7 +3311,7 @@
    withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes
  else
    with_gnu_ld=no
-@@ -4535,7 +4545,7 @@
+@@ -4540,7 +4670,7 @@
  ac_prog=ld
  if test "$GCC" = yes; then
    # Check if gcc -print-prog-name=ld gives a path.
@@ -3555,7 +3320,7 @@
  $as_echo_n "checking for ld used by $CC... " >&6; }
    case $host in
    *-*-mingw*)
-@@ -4565,13 +4575,13 @@
+@@ -4570,13 +4700,13 @@
      ;;
    esac
  elif test "$with_gnu_ld" = yes; then
@@ -3572,7 +3337,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -z "$LD"; then
-@@ -4602,18 +4612,16 @@
+@@ -4607,18 +4737,16 @@
  
  LD="$lt_cv_path_LD"
  if test -n "$LD"; then
@@ -3596,7 +3361,7 @@
    $as_echo_n "(cached) " >&6
  else
    # I'd rather use --version here, but apparently some GNU lds only accept -v.
-@@ -4626,7 +4634,7 @@
+@@ -4631,7 +4759,7 @@
    ;;
  esac
  fi
@@ -3605,7 +3370,7 @@
  $as_echo "$lt_cv_prog_gnu_ld" >&6; }
  with_gnu_ld=$lt_cv_prog_gnu_ld
  
-@@ -4638,9 +4646,9 @@
+@@ -4643,9 +4771,9 @@
  
  
  
@@ -3617,7 +3382,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$NM"; then
-@@ -4687,7 +4695,7 @@
+@@ -4692,7 +4820,7 @@
    : ${lt_cv_path_NM=no}
  fi
  fi
@@ -3626,7 +3391,7 @@
  $as_echo "$lt_cv_path_NM" >&6; }
  if test "$lt_cv_path_NM" != "no"; then
    NM="$lt_cv_path_NM"
-@@ -4698,9 +4706,9 @@
+@@ -4703,9 +4831,9 @@
    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
@@ -3638,7 +3403,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$DUMPBIN"; then
-@@ -4711,24 +4719,24 @@
+@@ -4716,24 +4844,24 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -3668,7 +3433,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -4742,9 +4750,9 @@
+@@ -4747,9 +4875,9 @@
  do
    # Extract the first word of "$ac_prog", so it can be a program name with args.
  set dummy $ac_prog; ac_word=$2
@@ -3680,7 +3445,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$ac_ct_DUMPBIN"; then
-@@ -4755,24 +4763,24 @@
+@@ -4760,24 +4888,24 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -3710,7 +3475,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -4785,7 +4793,7 @@
+@@ -4790,7 +4918,7 @@
    else
      case $cross_compiling:$ac_tool_warned in
  yes:)
@@ -3719,7 +3484,7 @@
  $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
  ac_tool_warned=yes ;;
  esac
-@@ -4805,44 +4813,44 @@
+@@ -4810,44 +4938,44 @@
  
  
  
@@ -3732,16 +3497,16 @@
  else
    lt_cv_nm_interface="BSD nm"
    echo "int some_variable = 0;" > conftest.$ac_ext
--  (eval echo "\"\$as_me:4815: $ac_compile\"" >&5)
-+  (eval echo "\"\$as_me:4823: $ac_compile\"" >&5)
+-  (eval echo "\"\$as_me:4820: $ac_compile\"" >&5)
++  (eval echo "\"\$as_me:4948: $ac_compile\"" >&5)
    (eval "$ac_compile" 2>conftest.err)
    cat conftest.err >&5
--  (eval echo "\"\$as_me:4818: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
-+  (eval echo "\"\$as_me:4826: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+-  (eval echo "\"\$as_me:4823: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
++  (eval echo "\"\$as_me:4951: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
    (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
    cat conftest.err >&5
--  (eval echo "\"\$as_me:4821: output\"" >&5)
-+  (eval echo "\"\$as_me:4829: output\"" >&5)
+-  (eval echo "\"\$as_me:4826: output\"" >&5)
++  (eval echo "\"\$as_me:4954: output\"" >&5)
    cat conftest.out >&5
    if $GREP 'External.*some_variable' conftest.out > /dev/null; then
      lt_cv_nm_interface="MS dumpbin"
@@ -3775,7 +3540,7 @@
    $as_echo_n "(cached) " >&6
  else
      i=0
-@@ -4960,10 +4968,10 @@
+@@ -4965,10 +5093,10 @@
  fi
  
  if test -n $lt_cv_sys_max_cmd_len ; then
@@ -3788,7 +3553,7 @@
  $as_echo "none" >&6; }
  fi
  max_cmd_len=$lt_cv_sys_max_cmd_len
-@@ -4977,7 +4985,7 @@
+@@ -4982,7 +5110,7 @@
  : ${MV="mv -f"}
  : ${RM="rm -f"}
  
@@ -3797,7 +3562,7 @@
  $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; }
  # Try some XSI features
  xsi_shell=no
-@@ -4987,17 +4995,17 @@
+@@ -4992,17 +5120,17 @@
      && eval 'test $(( 1 + 1 )) -eq 2 \
      && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
    && xsi_shell=yes
@@ -3818,7 +3583,7 @@
  $as_echo "$lt_shell_append" >&6; }
  
  
-@@ -5032,14 +5040,14 @@
+@@ -5037,14 +5165,14 @@
  
  
  
@@ -3836,7 +3601,7 @@
  $as_echo "$lt_cv_ld_reload_flag" >&6; }
  reload_flag=$lt_cv_ld_reload_flag
  case $reload_flag in
-@@ -5068,9 +5076,9 @@
+@@ -5073,9 +5201,9 @@
  if test -n "$ac_tool_prefix"; then
    # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args.
  set dummy ${ac_tool_prefix}objdump; ac_word=$2
@@ -3848,7 +3613,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$OBJDUMP"; then
-@@ -5081,24 +5089,24 @@
+@@ -5086,24 +5214,24 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -3878,7 +3643,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -5108,9 +5116,9 @@
+@@ -5113,9 +5241,9 @@
    ac_ct_OBJDUMP=$OBJDUMP
    # Extract the first word of "objdump", so it can be a program name with args.
  set dummy objdump; ac_word=$2
@@ -3890,7 +3655,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$ac_ct_OBJDUMP"; then
-@@ -5121,24 +5129,24 @@
+@@ -5126,24 +5254,24 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -3920,7 +3685,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -5147,7 +5155,7 @@
+@@ -5152,7 +5280,7 @@
    else
      case $cross_compiling:$ac_tool_warned in
  yes:)
@@ -3929,7 +3694,7 @@
  $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
  ac_tool_warned=yes ;;
  esac
-@@ -5167,9 +5175,9 @@
+@@ -5172,9 +5300,9 @@
  
  
  
@@ -3941,7 +3706,7 @@
    $as_echo_n "(cached) " >&6
  else
    lt_cv_file_magic_cmd='$MAGIC_CMD'
-@@ -5363,7 +5371,7 @@
+@@ -5368,7 +5496,7 @@
  esac
  
  fi
@@ -3950,7 +3715,7 @@
  $as_echo "$lt_cv_deplibs_check_method" >&6; }
  file_magic_cmd=$lt_cv_file_magic_cmd
  deplibs_check_method=$lt_cv_deplibs_check_method
-@@ -5383,9 +5391,9 @@
+@@ -5388,9 +5516,9 @@
  if test -n "$ac_tool_prefix"; then
    # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
  set dummy ${ac_tool_prefix}ar; ac_word=$2
@@ -3962,7 +3727,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$AR"; then
-@@ -5396,24 +5404,24 @@
+@@ -5401,24 +5529,24 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -3992,7 +3757,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -5423,9 +5431,9 @@
+@@ -5428,9 +5556,9 @@
    ac_ct_AR=$AR
    # Extract the first word of "ar", so it can be a program name with args.
  set dummy ar; ac_word=$2
@@ -4004,7 +3769,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$ac_ct_AR"; then
-@@ -5436,24 +5444,24 @@
+@@ -5441,24 +5569,24 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -4034,7 +3799,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -5462,7 +5470,7 @@
+@@ -5467,7 +5595,7 @@
    else
      case $cross_compiling:$ac_tool_warned in
  yes:)
@@ -4043,7 +3808,7 @@
  $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
  ac_tool_warned=yes ;;
  esac
-@@ -5488,9 +5496,9 @@
+@@ -5493,9 +5621,9 @@
  if test -n "$ac_tool_prefix"; then
    # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
  set dummy ${ac_tool_prefix}strip; ac_word=$2
@@ -4055,7 +3820,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$STRIP"; then
-@@ -5501,24 +5509,24 @@
+@@ -5506,24 +5634,24 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -4085,7 +3850,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -5528,9 +5536,9 @@
+@@ -5533,9 +5661,9 @@
    ac_ct_STRIP=$STRIP
    # Extract the first word of "strip", so it can be a program name with args.
  set dummy strip; ac_word=$2
@@ -4097,7 +3862,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$ac_ct_STRIP"; then
-@@ -5541,24 +5549,24 @@
+@@ -5546,24 +5674,24 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -4127,7 +3892,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -5567,7 +5575,7 @@
+@@ -5572,7 +5700,7 @@
    else
      case $cross_compiling:$ac_tool_warned in
  yes:)
@@ -4136,7 +3901,7 @@
  $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
  ac_tool_warned=yes ;;
  esac
-@@ -5587,9 +5595,9 @@
+@@ -5592,9 +5720,9 @@
  if test -n "$ac_tool_prefix"; then
    # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
  set dummy ${ac_tool_prefix}ranlib; ac_word=$2
@@ -4148,7 +3913,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$RANLIB"; then
-@@ -5600,24 +5608,24 @@
+@@ -5605,24 +5733,24 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -4178,7 +3943,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -5627,9 +5635,9 @@
+@@ -5632,9 +5760,9 @@
    ac_ct_RANLIB=$RANLIB
    # Extract the first word of "ranlib", so it can be a program name with args.
  set dummy ranlib; ac_word=$2
@@ -4190,7 +3955,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$ac_ct_RANLIB"; then
-@@ -5640,24 +5648,24 @@
+@@ -5645,24 +5773,24 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -4220,7 +3985,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -5666,7 +5674,7 @@
+@@ -5671,7 +5799,7 @@
    else
      case $cross_compiling:$ac_tool_warned in
  yes:)
@@ -4229,7 +3994,7 @@
  $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
  ac_tool_warned=yes ;;
  esac
-@@ -5744,9 +5752,9 @@
+@@ -5749,9 +5877,9 @@
  
  
  # Check for command to grab the raw symbol name followed by C symbol from nm.
@@ -4241,7 +4006,7 @@
    $as_echo_n "(cached) " >&6
  else
  
-@@ -5862,18 +5870,18 @@
+@@ -5867,18 +5995,18 @@
  int main(){nm_test_var='a';nm_test_func();return(0);}
  _LT_EOF
  
@@ -4266,7 +4031,7 @@
        # Try sorting and uniquifying the output.
        if sort "$nlist" | uniq > "$nlist"T; then
  	mv -f "$nlist"T "$nlist"
-@@ -5926,11 +5934,11 @@
+@@ -5931,11 +6059,11 @@
  	  lt_save_CFLAGS="$CFLAGS"
  	  LIBS="conftstm.$ac_objext"
  	  CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
@@ -4281,7 +4046,7 @@
  	    pipe_works=yes
  	  fi
  	  LIBS="$lt_save_LIBS"
-@@ -5964,10 +5972,10 @@
+@@ -5969,10 +6097,10 @@
    lt_cv_sys_global_symbol_to_cdecl=
  fi
  if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then
@@ -4294,7 +4059,7 @@
  $as_echo "ok" >&6; }
  fi
  
-@@ -5994,7 +6002,7 @@
+@@ -5999,7 +6127,7 @@
  
  
  # Check whether --enable-libtool-lock was given.
@@ -4303,7 +4068,7 @@
    enableval=$enable_libtool_lock;
  fi
  
-@@ -6006,11 +6014,11 @@
+@@ -6011,11 +6139,11 @@
  ia64-*-hpux*)
    # Find out which ABI we are using.
    echo 'int i;' > conftest.$ac_ext
@@ -4318,13 +4083,13 @@
      case `/usr/bin/file conftest.$ac_objext` in
        *ELF-32*)
  	HPUX_IA64_MODE="32"
-@@ -6024,12 +6032,12 @@
+@@ -6029,12 +6157,12 @@
    ;;
  *-*-irix6*)
    # Find out which ABI we are using.
--  echo '#line 6027 "configure"' > conftest.$ac_ext
+-  echo '#line 6032 "configure"' > conftest.$ac_ext
 -  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+  echo '#line 6035 "configure"' > conftest.$ac_ext
++  echo '#line 6160 "configure"' > conftest.$ac_ext
 +  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
@@ -4335,7 +4100,7 @@
      if test "$lt_cv_prog_gnu_ld" = yes; then
        case `/usr/bin/file conftest.$ac_objext` in
  	*32-bit*)
-@@ -6063,11 +6071,11 @@
+@@ -6068,11 +6196,11 @@
  s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
    # Find out which ABI we are using.
    echo 'int i;' > conftest.$ac_ext
@@ -4350,7 +4115,7 @@
      case `/usr/bin/file conftest.o` in
        *32-bit*)
  	case $host in
-@@ -6116,9 +6124,9 @@
+@@ -6121,9 +6249,9 @@
    # On SCO OpenServer 5, we need -belf to get full-featured binaries.
    SAVE_CFLAGS="$CFLAGS"
    CFLAGS="$CFLAGS -belf"
@@ -4362,7 +4127,7 @@
    $as_echo_n "(cached) " >&6
  else
    ac_ext=c
-@@ -6127,11 +6135,7 @@
+@@ -6132,11 +6260,7 @@
  ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
  ac_compiler_gnu=$ac_cv_c_compiler_gnu
  
@@ -4375,7 +4140,7 @@
  /* end confdefs.h.  */
  
  int
-@@ -6142,38 +6146,13 @@
+@@ -6147,38 +6271,13 @@
    return 0;
  }
  _ACEOF
@@ -4418,7 +4183,7 @@
       ac_ext=c
  ac_cpp='$CPP $CPPFLAGS'
  ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -6181,7 +6160,7 @@
+@@ -6186,7 +6285,7 @@
  ac_compiler_gnu=$ac_cv_c_compiler_gnu
  
  fi
@@ -4427,7 +4192,7 @@
  $as_echo "$lt_cv_cc_needs_belf" >&6; }
    if test x"$lt_cv_cc_needs_belf" != x"yes"; then
      # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
-@@ -6191,11 +6170,11 @@
+@@ -6196,11 +6295,11 @@
  sparc*-*solaris*)
    # Find out which ABI we are using.
    echo 'int i;' > conftest.$ac_ext
@@ -4442,7 +4207,7 @@
      case `/usr/bin/file conftest.o` in
      *64-bit*)
        case $lt_cv_prog_gnu_ld in
-@@ -6221,9 +6200,9 @@
+@@ -6226,9 +6325,9 @@
      if test -n "$ac_tool_prefix"; then
    # Extract the first word of "${ac_tool_prefix}dsymutil", so it can be a program name with args.
  set dummy ${ac_tool_prefix}dsymutil; ac_word=$2
@@ -4454,7 +4219,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$DSYMUTIL"; then
-@@ -6234,24 +6213,24 @@
+@@ -6239,24 +6338,24 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -4484,7 +4249,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -6261,9 +6240,9 @@
+@@ -6266,9 +6365,9 @@
    ac_ct_DSYMUTIL=$DSYMUTIL
    # Extract the first word of "dsymutil", so it can be a program name with args.
  set dummy dsymutil; ac_word=$2
@@ -4496,7 +4261,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$ac_ct_DSYMUTIL"; then
-@@ -6274,24 +6253,24 @@
+@@ -6279,24 +6378,24 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -4526,7 +4291,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -6300,7 +6279,7 @@
+@@ -6305,7 +6404,7 @@
    else
      case $cross_compiling:$ac_tool_warned in
  yes:)
@@ -4535,7 +4300,7 @@
  $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
  ac_tool_warned=yes ;;
  esac
-@@ -6313,9 +6292,9 @@
+@@ -6318,9 +6417,9 @@
      if test -n "$ac_tool_prefix"; then
    # Extract the first word of "${ac_tool_prefix}nmedit", so it can be a program name with args.
  set dummy ${ac_tool_prefix}nmedit; ac_word=$2
@@ -4547,7 +4312,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$NMEDIT"; then
-@@ -6326,24 +6305,24 @@
+@@ -6331,24 +6430,24 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -4577,7 +4342,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -6353,9 +6332,9 @@
+@@ -6358,9 +6457,9 @@
    ac_ct_NMEDIT=$NMEDIT
    # Extract the first word of "nmedit", so it can be a program name with args.
  set dummy nmedit; ac_word=$2
@@ -4589,7 +4354,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$ac_ct_NMEDIT"; then
-@@ -6366,24 +6345,24 @@
+@@ -6371,24 +6470,24 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -4619,7 +4384,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -6392,7 +6371,7 @@
+@@ -6397,7 +6496,7 @@
    else
      case $cross_compiling:$ac_tool_warned in
  yes:)
@@ -4628,7 +4393,7 @@
  $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
  ac_tool_warned=yes ;;
  esac
-@@ -6405,9 +6384,9 @@
+@@ -6410,9 +6509,9 @@
      if test -n "$ac_tool_prefix"; then
    # Extract the first word of "${ac_tool_prefix}lipo", so it can be a program name with args.
  set dummy ${ac_tool_prefix}lipo; ac_word=$2
@@ -4640,7 +4405,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$LIPO"; then
-@@ -6418,24 +6397,24 @@
+@@ -6423,24 +6522,24 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -4670,7 +4435,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -6445,9 +6424,9 @@
+@@ -6450,9 +6549,9 @@
    ac_ct_LIPO=$LIPO
    # Extract the first word of "lipo", so it can be a program name with args.
  set dummy lipo; ac_word=$2
@@ -4682,7 +4447,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$ac_ct_LIPO"; then
-@@ -6458,24 +6437,24 @@
+@@ -6463,24 +6562,24 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -4712,7 +4477,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -6484,7 +6463,7 @@
+@@ -6489,7 +6588,7 @@
    else
      case $cross_compiling:$ac_tool_warned in
  yes:)
@@ -4721,7 +4486,7 @@
  $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
  ac_tool_warned=yes ;;
  esac
-@@ -6497,9 +6476,9 @@
+@@ -6502,9 +6601,9 @@
      if test -n "$ac_tool_prefix"; then
    # Extract the first word of "${ac_tool_prefix}otool", so it can be a program name with args.
  set dummy ${ac_tool_prefix}otool; ac_word=$2
@@ -4733,7 +4498,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$OTOOL"; then
-@@ -6510,24 +6489,24 @@
+@@ -6515,24 +6614,24 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -4763,7 +4528,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -6537,9 +6516,9 @@
+@@ -6542,9 +6641,9 @@
    ac_ct_OTOOL=$OTOOL
    # Extract the first word of "otool", so it can be a program name with args.
  set dummy otool; ac_word=$2
@@ -4775,7 +4540,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$ac_ct_OTOOL"; then
-@@ -6550,24 +6529,24 @@
+@@ -6555,24 +6654,24 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -4805,7 +4570,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -6576,7 +6555,7 @@
+@@ -6581,7 +6680,7 @@
    else
      case $cross_compiling:$ac_tool_warned in
  yes:)
@@ -4814,7 +4579,7 @@
  $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
  ac_tool_warned=yes ;;
  esac
-@@ -6589,9 +6568,9 @@
+@@ -6594,9 +6693,9 @@
      if test -n "$ac_tool_prefix"; then
    # Extract the first word of "${ac_tool_prefix}otool64", so it can be a program name with args.
  set dummy ${ac_tool_prefix}otool64; ac_word=$2
@@ -4826,7 +4591,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$OTOOL64"; then
-@@ -6602,24 +6581,24 @@
+@@ -6607,24 +6706,24 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -4856,7 +4621,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -6629,9 +6608,9 @@
+@@ -6634,9 +6733,9 @@
    ac_ct_OTOOL64=$OTOOL64
    # Extract the first word of "otool64", so it can be a program name with args.
  set dummy otool64; ac_word=$2
@@ -4868,7 +4633,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$ac_ct_OTOOL64"; then
-@@ -6642,24 +6621,24 @@
+@@ -6647,24 +6746,24 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -4898,7 +4663,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -6668,7 +6647,7 @@
+@@ -6673,7 +6772,7 @@
    else
      case $cross_compiling:$ac_tool_warned in
  yes:)
@@ -4907,7 +4672,7 @@
  $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
  ac_tool_warned=yes ;;
  esac
-@@ -6704,9 +6683,9 @@
+@@ -6709,9 +6808,9 @@
  
  
  
@@ -4919,7 +4684,7 @@
    $as_echo_n "(cached) " >&6
  else
    lt_cv_apple_cc_single_mod=no
-@@ -6731,22 +6710,18 @@
+@@ -6736,22 +6835,18 @@
  	rm -f conftest.*
        fi
  fi
@@ -4946,7 +4711,7 @@
  /* end confdefs.h.  */
  
  int
-@@ -6757,42 +6732,17 @@
+@@ -6762,42 +6857,17 @@
    return 0;
  }
  _ACEOF
@@ -4994,7 +4759,7 @@
  $as_echo "$lt_cv_ld_exported_symbols_list" >&6; }
      case $host_os in
      rhapsody* | darwin1.[012])
-@@ -6834,14 +6784,14 @@
+@@ -6839,14 +6909,14 @@
  ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
  ac_compiler_gnu=$ac_cv_c_compiler_gnu
@@ -5011,7 +4776,7 @@
    $as_echo_n "(cached) " >&6
  else
        # Double quotes because CPP needs to be expanded
-@@ -6856,11 +6806,7 @@
+@@ -6861,11 +6931,7 @@
    # <limits.h> exists even on freestanding compilers.
    # On the NeXT, cc -E runs the code through the compiler's parser,
    # not just through cpp. "Syntax error" is here to catch this case.
@@ -5024,7 +4789,7 @@
  /* end confdefs.h.  */
  #ifdef __STDC__
  # include <limits.h>
-@@ -6869,78 +6815,34 @@
+@@ -6874,78 +6940,34 @@
  #endif
  		     Syntax error
  _ACEOF
@@ -5108,7 +4873,7 @@
    break
  fi
  
-@@ -6952,7 +6854,7 @@
+@@ -6957,7 +6979,7 @@
  else
    ac_cv_prog_CPP=$CPP
  fi
@@ -5117,7 +4882,7 @@
  $as_echo "$CPP" >&6; }
  ac_preproc_ok=false
  for ac_c_preproc_warn_flag in '' yes
-@@ -6963,11 +6865,7 @@
+@@ -6968,11 +6990,7 @@
    # <limits.h> exists even on freestanding compilers.
    # On the NeXT, cc -E runs the code through the compiler's parser,
    # not just through cpp. "Syntax error" is here to catch this case.
@@ -5130,7 +4895,7 @@
  /* end confdefs.h.  */
  #ifdef __STDC__
  # include <limits.h>
-@@ -6976,87 +6874,40 @@
+@@ -6981,87 +6999,40 @@
  #endif
  		     Syntax error
  _ACEOF
@@ -5227,7 +4992,7 @@
  fi
  
  ac_ext=c
-@@ -7066,16 +6917,12 @@
+@@ -7071,16 +7042,12 @@
  ac_compiler_gnu=$ac_cv_c_compiler_gnu
  
  
@@ -5247,7 +5012,7 @@
  /* end confdefs.h.  */
  #include <stdlib.h>
  #include <stdarg.h>
-@@ -7090,48 +6937,23 @@
+@@ -7095,48 +7062,23 @@
    return 0;
  }
  _ACEOF
@@ -5301,7 +5066,7 @@
  else
    ac_cv_header_stdc=no
  fi
-@@ -7141,18 +6963,14 @@
+@@ -7146,18 +7088,14 @@
  
  if test $ac_cv_header_stdc = yes; then
    # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
@@ -5323,7 +5088,7 @@
  else
    ac_cv_header_stdc=no
  fi
-@@ -7162,14 +6980,10 @@
+@@ -7167,14 +7105,10 @@
  
  if test $ac_cv_header_stdc = yes; then
    # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
@@ -5340,7 +5105,7 @@
  /* end confdefs.h.  */
  #include <ctype.h>
  #include <stdlib.h>
-@@ -7196,188 +7010,55 @@
+@@ -7201,118 +7135,34 @@
    return 0;
  }
  _ACEOF
@@ -5400,39 +5165,17 @@
  fi
  
  # On IRIX 5.3, sys/types and inttypes.h are conflicting.
-+for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
-+		  inttypes.h stdint.h unistd.h
-+do :
-+  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-+ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
-+"
-+eval as_val=\$$as_ac_Header
-+   if test "x$as_val" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-+_ACEOF
- 
-+fi
- 
-+done
- 
- 
-+for ac_header in dlfcn.h
-+do :
-+  ac_fn_c_check_header_compile "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default
-+"
-+if test "x$ac_cv_header_dlfcn_h" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE_DLFCN_H 1
-+_ACEOF
- 
-+fi
- 
--
--
--
--for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
--		  inttypes.h stdint.h unistd.h
+-
+-
+-
+-
+-
+-
+-
+-
+-
+ for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
+ 		  inttypes.h stdint.h unistd.h
 -do
 -as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 -{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
@@ -5485,17 +5228,21 @@
 -as_val=`eval 'as_val=${'$as_ac_Header'}
 -		 $as_echo "$as_val"'`
 -   if test "x$as_val" = x""yes; then
--  cat >>confdefs.h <<_ACEOF
--#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
--_ACEOF
--
--fi
--
--done
--
--
--
--for ac_header in dlfcn.h
++do :
++  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
++ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
++"
++eval as_val=\$$as_ac_Header
++   if test "x$as_val" = x""yes; then :
+   cat >>confdefs.h <<_ACEOF
+ #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ _ACEOF
+@@ -7322,62 +7172,13 @@
+ done
+ 
+ 
+-
+ for ac_header in dlfcn.h
 -do
 -as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 -{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
@@ -5548,18 +5295,17 @@
 -as_val=`eval 'as_val=${'$as_ac_Header'}
 -		 $as_echo "$as_val"'`
 -   if test "x$as_val" = x""yes; then
--  cat >>confdefs.h <<_ACEOF
++do :
++  ac_fn_c_check_header_compile "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default
++"
++if test "x$ac_cv_header_dlfcn_h" = x""yes; then :
+   cat >>confdefs.h <<_ACEOF
 -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
--_ACEOF
--
--fi
--
--done
-+done
- 
- 
- 
-@@ -7393,7 +7074,7 @@
++#define HAVE_DLFCN_H 1
+ _ACEOF
+ 
+ fi
+@@ -7398,7 +7199,7 @@
  
  
  # Check whether --with-pic was given.
@@ -5568,7 +5314,7 @@
    withval=$with_pic; pic_mode="$withval"
  else
    pic_mode=default
-@@ -7409,7 +7090,7 @@
+@@ -7414,7 +7215,7 @@
  
  
    # Check whether --enable-fast-install was given.
@@ -5577,7 +5323,7 @@
    enableval=$enable_fast_install; p=${PACKAGE-default}
      case $enableval in
      yes) enable_fast_install=yes ;;
-@@ -7490,9 +7171,9 @@
+@@ -7495,9 +7296,9 @@
     setopt NO_GLOB_SUBST
  fi
  
@@ -5589,7 +5335,7 @@
    $as_echo_n "(cached) " >&6
  else
    rm -f .libs 2>/dev/null
-@@ -7505,7 +7186,7 @@
+@@ -7510,7 +7311,7 @@
  fi
  rmdir .libs 2>/dev/null
  fi
@@ -5598,7 +5344,7 @@
  $as_echo "$lt_cv_objdir" >&6; }
  objdir=$lt_cv_objdir
  
-@@ -7598,9 +7279,9 @@
+@@ -7603,9 +7404,9 @@
  case $deplibs_check_method in
  file_magic*)
    if test "$file_magic_cmd" = '$MAGIC_CMD'; then
@@ -5610,7 +5356,7 @@
    $as_echo_n "(cached) " >&6
  else
    case $MAGIC_CMD in
-@@ -7651,10 +7332,10 @@
+@@ -7656,10 +7457,10 @@
  
  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
  if test -n "$MAGIC_CMD"; then
@@ -5623,7 +5369,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -7664,9 +7345,9 @@
+@@ -7669,9 +7470,9 @@
  
  if test -z "$lt_cv_path_MAGIC_CMD"; then
    if test -n "$ac_tool_prefix"; then
@@ -5635,7 +5381,7 @@
    $as_echo_n "(cached) " >&6
  else
    case $MAGIC_CMD in
-@@ -7717,10 +7398,10 @@
+@@ -7722,10 +7523,10 @@
  
  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
  if test -n "$MAGIC_CMD"; then
@@ -5648,7 +5394,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -7801,9 +7482,9 @@
+@@ -7806,9 +7607,9 @@
  if test "$GCC" = yes; then
    lt_prog_compiler_no_builtin_flag=' -fno-builtin'
  
@@ -5660,21 +5406,21 @@
    $as_echo_n "(cached) " >&6
  else
    lt_cv_prog_compiler_rtti_exceptions=no
-@@ -7819,11 +7500,11 @@
+@@ -7824,11 +7625,11 @@
     -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:7822: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:7503: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:7827: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:7628: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
--   echo "$as_me:7826: \$? = $ac_status" >&5
-+   echo "$as_me:7507: \$? = $ac_status" >&5
+-   echo "$as_me:7831: \$? = $ac_status" >&5
++   echo "$as_me:7632: \$? = $ac_status" >&5
     if (exit $ac_status) && test -s "$ac_outfile"; then
       # The compiler can only warn and ignore the option if not recognized
       # So say no if there are warnings other than the usual output.
-@@ -7836,7 +7517,7 @@
+@@ -7841,7 +7642,7 @@
     $RM conftest*
  
  fi
@@ -5683,7 +5429,7 @@
  $as_echo "$lt_cv_prog_compiler_rtti_exceptions" >&6; }
  
  if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then
-@@ -7856,7 +7537,7 @@
+@@ -7861,7 +7662,7 @@
  lt_prog_compiler_pic=
  lt_prog_compiler_static=
  
@@ -5692,7 +5438,7 @@
  $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
  
    if test "$GCC" = yes; then
-@@ -8128,7 +7809,7 @@
+@@ -8133,7 +7934,7 @@
      lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
      ;;
  esac
@@ -5701,7 +5447,7 @@
  $as_echo "$lt_prog_compiler_pic" >&6; }
  
  
-@@ -8140,9 +7821,9 @@
+@@ -8145,9 +7946,9 @@
  # Check to make sure the PIC flag actually works.
  #
  if test -n "$lt_prog_compiler_pic"; then
@@ -5713,21 +5459,21 @@
    $as_echo_n "(cached) " >&6
  else
    lt_cv_prog_compiler_pic_works=no
-@@ -8158,11 +7839,11 @@
+@@ -8163,11 +7964,11 @@
     -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:8161: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:7842: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:8166: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:7967: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
--   echo "$as_me:8165: \$? = $ac_status" >&5
-+   echo "$as_me:7846: \$? = $ac_status" >&5
+-   echo "$as_me:8170: \$? = $ac_status" >&5
++   echo "$as_me:7971: \$? = $ac_status" >&5
     if (exit $ac_status) && test -s "$ac_outfile"; then
       # The compiler can only warn and ignore the option if not recognized
       # So say no if there are warnings other than the usual output.
-@@ -8175,7 +7856,7 @@
+@@ -8180,7 +7981,7 @@
     $RM conftest*
  
  fi
@@ -5736,7 +5482,7 @@
  $as_echo "$lt_cv_prog_compiler_pic_works" >&6; }
  
  if test x"$lt_cv_prog_compiler_pic_works" = xyes; then
-@@ -8199,9 +7880,9 @@
+@@ -8204,9 +8005,9 @@
  # Check to make sure the static flag actually works.
  #
  wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\"
@@ -5748,7 +5494,7 @@
    $as_echo_n "(cached) " >&6
  else
    lt_cv_prog_compiler_static_works=no
-@@ -8227,7 +7908,7 @@
+@@ -8232,7 +8033,7 @@
     LDFLAGS="$save_LDFLAGS"
  
  fi
@@ -5757,7 +5503,7 @@
  $as_echo "$lt_cv_prog_compiler_static_works" >&6; }
  
  if test x"$lt_cv_prog_compiler_static_works" = xyes; then
-@@ -8242,9 +7923,9 @@
+@@ -8247,9 +8048,9 @@
  
  
  
@@ -5769,21 +5515,21 @@
    $as_echo_n "(cached) " >&6
  else
    lt_cv_prog_compiler_c_o=no
-@@ -8263,11 +7944,11 @@
+@@ -8268,11 +8069,11 @@
     -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:8266: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:7947: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:8271: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:8072: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>out/conftest.err)
     ac_status=$?
     cat out/conftest.err >&5
--   echo "$as_me:8270: \$? = $ac_status" >&5
-+   echo "$as_me:7951: \$? = $ac_status" >&5
+-   echo "$as_me:8275: \$? = $ac_status" >&5
++   echo "$as_me:8076: \$? = $ac_status" >&5
     if (exit $ac_status) && test -s out/conftest2.$ac_objext
     then
       # The compiler can only warn and ignore the option if not recognized
-@@ -8289,7 +7970,7 @@
+@@ -8294,7 +8095,7 @@
     $RM conftest*
  
  fi
@@ -5792,7 +5538,7 @@
  $as_echo "$lt_cv_prog_compiler_c_o" >&6; }
  
  
-@@ -8297,9 +7978,9 @@
+@@ -8302,9 +8103,9 @@
  
  
  
@@ -5804,21 +5550,21 @@
    $as_echo_n "(cached) " >&6
  else
    lt_cv_prog_compiler_c_o=no
-@@ -8318,11 +7999,11 @@
+@@ -8323,11 +8124,11 @@
     -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:8321: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:8002: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:8326: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:8127: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>out/conftest.err)
     ac_status=$?
     cat out/conftest.err >&5
--   echo "$as_me:8325: \$? = $ac_status" >&5
-+   echo "$as_me:8006: \$? = $ac_status" >&5
+-   echo "$as_me:8330: \$? = $ac_status" >&5
++   echo "$as_me:8131: \$? = $ac_status" >&5
     if (exit $ac_status) && test -s out/conftest2.$ac_objext
     then
       # The compiler can only warn and ignore the option if not recognized
-@@ -8344,7 +8025,7 @@
+@@ -8349,7 +8150,7 @@
     $RM conftest*
  
  fi
@@ -5827,7 +5573,7 @@
  $as_echo "$lt_cv_prog_compiler_c_o" >&6; }
  
  
-@@ -8353,7 +8034,7 @@
+@@ -8358,7 +8159,7 @@
  hard_links="nottested"
  if test "$lt_cv_prog_compiler_c_o" = no && test "$need_locks" != no; then
    # do not overwrite the value of need_locks provided by the user
@@ -5836,7 +5582,7 @@
  $as_echo_n "checking if we can lock with hard links... " >&6; }
    hard_links=yes
    $RM conftest*
-@@ -8361,10 +8042,10 @@
+@@ -8366,10 +8167,10 @@
    touch conftest.a
    ln conftest.a conftest.b 2>&5 || hard_links=no
    ln conftest.a conftest.b 2>/dev/null && hard_links=no
@@ -5849,7 +5595,7 @@
  $as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
      need_locks=warn
    fi
-@@ -8377,7 +8058,7 @@
+@@ -8382,7 +8183,7 @@
  
  
  
@@ -5858,7 +5604,7 @@
  $as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
  
    runpath_var=
-@@ -8819,11 +8500,7 @@
+@@ -8824,11 +8625,7 @@
  	allow_undefined_flag='-berok'
          # Determine the default libpath from the value encoded in an
          # empty executable.
@@ -5871,7 +5617,7 @@
  /* end confdefs.h.  */
  
  int
-@@ -8834,27 +8511,7 @@
+@@ -8839,27 +8636,7 @@
    return 0;
  }
  _ACEOF
@@ -5900,7 +5646,7 @@
  
  lt_aix_libpath_sed='
      /Import File Strings/,/^$/ {
-@@ -8868,16 +8525,9 @@
+@@ -8873,16 +8650,9 @@
  if test -z "$aix_libpath"; then
    aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
  fi
@@ -5919,7 +5665,7 @@
  if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  
          hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
-@@ -8890,11 +8540,7 @@
+@@ -8895,11 +8665,7 @@
  	else
  	 # Determine the default libpath from the value encoded in an
  	 # empty executable.
@@ -5932,7 +5678,7 @@
  /* end confdefs.h.  */
  
  int
-@@ -8905,27 +8551,7 @@
+@@ -8910,27 +8676,7 @@
    return 0;
  }
  _ACEOF
@@ -5961,7 +5707,7 @@
  
  lt_aix_libpath_sed='
      /Import File Strings/,/^$/ {
-@@ -8939,16 +8565,9 @@
+@@ -8944,16 +8690,9 @@
  if test -z "$aix_libpath"; then
    aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
  fi
@@ -5980,7 +5726,7 @@
  if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  
  	 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
-@@ -9160,42 +8779,16 @@
+@@ -9165,42 +8904,16 @@
  	# implicitly export all symbols.
          save_LDFLAGS="$LDFLAGS"
          LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
@@ -6028,7 +5774,7 @@
          LDFLAGS="$save_LDFLAGS"
        else
  	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
-@@ -9451,7 +9044,7 @@
+@@ -9456,7 +9169,7 @@
      fi
    fi
  
@@ -6037,7 +5783,7 @@
  $as_echo "$ld_shlibs" >&6; }
  test "$ld_shlibs" = no && can_build_shared=no
  
-@@ -9488,16 +9081,16 @@
+@@ -9493,16 +9206,16 @@
        # Test whether the compiler implicitly links with -lc since on some
        # systems, -lgcc has to come before -lc. If gcc already passes -lc
        # to ld, don't add -lc before -lgcc.
@@ -6058,7 +5804,7 @@
          soname=conftest
          lib=conftest
          libobjs=conftest.$ac_objext
-@@ -9511,11 +9104,11 @@
+@@ -9516,11 +9229,11 @@
          libname=conftest
          lt_save_allow_undefined_flag=$allow_undefined_flag
          allow_undefined_flag=
@@ -6073,7 +5819,7 @@
          then
  	  archive_cmds_need_lc=no
          else
-@@ -9526,7 +9119,7 @@
+@@ -9531,7 +9244,7 @@
          cat conftest.err 1>&5
        fi
        $RM conftest*
@@ -6082,7 +5828,7 @@
  $as_echo "$archive_cmds_need_lc" >&6; }
        ;;
      esac
-@@ -9690,7 +9283,7 @@
+@@ -9695,7 +9408,7 @@
  
  
  
@@ -6091,7 +5837,7 @@
  $as_echo_n "checking dynamic linker characteristics... " >&6; }
  
  if test "$GCC" = yes; then
-@@ -10112,11 +9705,7 @@
+@@ -10117,11 +9830,7 @@
    save_libdir=$libdir
    eval "libdir=/foo; wl=\"$lt_prog_compiler_wl\"; \
         LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec\""
@@ -6104,7 +5850,7 @@
  /* end confdefs.h.  */
  
  int
-@@ -10127,41 +9716,13 @@
+@@ -10132,41 +9841,13 @@
    return 0;
  }
  _ACEOF
@@ -6150,7 +5896,7 @@
    LDFLAGS=$save_LDFLAGS
    libdir=$save_libdir
  
-@@ -10376,7 +9937,7 @@
+@@ -10381,7 +10062,7 @@
    dynamic_linker=no
    ;;
  esac
@@ -6159,7 +5905,7 @@
  $as_echo "$dynamic_linker" >&6; }
  test "$dynamic_linker" = no && can_build_shared=no
  
-@@ -10478,7 +10039,7 @@
+@@ -10483,7 +10164,7 @@
  
  
  
@@ -6168,7 +5914,7 @@
  $as_echo_n "checking how to hardcode library paths into programs... " >&6; }
  hardcode_action=
  if test -n "$hardcode_libdir_flag_spec" ||
-@@ -10503,7 +10064,7 @@
+@@ -10508,7 +10189,7 @@
    # directories.
    hardcode_action=unsupported
  fi
@@ -6177,7 +5923,7 @@
  $as_echo "$hardcode_action" >&6; }
  
  if test "$hardcode_action" = relink ||
-@@ -10548,18 +10109,14 @@
+@@ -10553,18 +10234,14 @@
  
    darwin*)
    # if libdl is installed we need to link against it
@@ -6199,7 +5945,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -10577,43 +10134,18 @@
+@@ -10582,43 +10259,18 @@
    return 0;
  }
  _ACEOF
@@ -6249,7 +5995,7 @@
    lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
  else
  
-@@ -10626,33 +10158,19 @@
+@@ -10631,33 +10283,19 @@
      ;;
  
    *)
@@ -6293,7 +6039,7 @@
  
  /* Override any GCC internal prototype to avoid an error.
     Use char because int might match the return type of a GCC
-@@ -10661,13 +10179,6 @@
+@@ -10666,13 +10304,6 @@
  extern "C"
  #endif
  char shl_load ();
@@ -6307,7 +6053,7 @@
  int
  main ()
  {
-@@ -10676,56 +10187,32 @@
+@@ -10681,212 +10312,32 @@
    return 0;
  }
  _ACEOF
@@ -6354,50 +6100,36 @@
 -$as_echo "$ac_cv_func_shl_load" >&6; }
 -if test "x$ac_cv_func_shl_load" = x""yes; then
 -  lt_cv_dlopen="shl_load"
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5
-+$as_echo "$ac_cv_lib_dld_shl_load" >&6; }
-+if test "x$ac_cv_lib_dld_shl_load" = x""yes; then :
-+  lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"
- else
+-else
 -  { $as_echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5
 -$as_echo_n "checking for shl_load in -ldld... " >&6; }
 -if test "${ac_cv_lib_dld_shl_load+set}" = set; then
-+  ac_fn_c_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen"
-+if test "x$ac_cv_func_dlopen" = x""yes; then :
-+  lt_cv_dlopen="dlopen"
-+else
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
-+$as_echo_n "checking for dlopen in -ldl... " >&6; }
-+if test "${ac_cv_lib_dl_dlopen+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
+-  $as_echo_n "(cached) " >&6
+-else
+-  ac_check_lib_save_LIBS=$LIBS
 -LIBS="-ldld  $LIBS"
 -cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
 -_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
-+LIBS="-ldl  $LIBS"
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- 
- /* Override any GCC internal prototype to avoid an error.
-@@ -10734,222 +10221,37 @@
- #ifdef __cplusplus
- extern "C"
- #endif
+-/* end confdefs.h.  */
+-
+-/* Override any GCC internal prototype to avoid an error.
+-   Use char because int might match the return type of a GCC
+-   builtin and then its argument prototype would still apply.  */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
 -char shl_load ();
-+char dlopen ();
- int
- main ()
- {
+-int
+-main ()
+-{
 -return shl_load ();
-+return dlopen ();
-   ;
-   return 0;
- }
- _ACEOF
+-  ;
+-  return 0;
+-}
+-_ACEOF
 -rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (ac_try="$ac_link"
 -case "(($ac_try" in
@@ -6420,40 +6152,30 @@
 -	 $as_test_x conftest$ac_exeext
 -       }; then
 -  ac_cv_lib_dld_shl_load=yes
-+if ac_fn_c_try_link "$LINENO"; then :
-+  ac_cv_lib_dl_dlopen=yes
- else
+-else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
 -
 -	ac_cv_lib_dld_shl_load=no
-+  ac_cv_lib_dl_dlopen=no
- fi
+-fi
 -
 -rm -rf conftest.dSYM
 -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
 -      conftest$ac_exeext conftest.$ac_ext
-+rm -f core conftest.err conftest.$ac_objext \
-+    conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
+-LIBS=$ac_check_lib_save_LIBS
+-fi
 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
--$as_echo "$ac_cv_lib_dld_shl_load" >&6; }
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5
+ $as_echo "$ac_cv_lib_dld_shl_load" >&6; }
 -if test "x$ac_cv_lib_dld_shl_load" = x""yes; then
--  lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
-+$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
-+if test "x$ac_cv_lib_dl_dlopen" = x""yes; then :
-+  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
++if test "x$ac_cv_lib_dld_shl_load" = x""yes; then :
+   lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"
  else
 -  { $as_echo "$as_me:$LINENO: checking for dlopen" >&5
 -$as_echo_n "checking for dlopen... " >&6; }
 -if test "${ac_cv_func_dlopen+set}" = set; then
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lsvld" >&5
-+$as_echo_n "checking for dlopen in -lsvld... " >&6; }
-+if test "${ac_cv_lib_svld_dlopen+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
+-  $as_echo_n "(cached) " >&6
+-else
 -  cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
 -_ACEOF
@@ -6535,37 +6257,32 @@
 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5
 -$as_echo "$ac_cv_func_dlopen" >&6; }
 -if test "x$ac_cv_func_dlopen" = x""yes; then
--  lt_cv_dlopen="dlopen"
--else
++  ac_fn_c_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen"
++if test "x$ac_cv_func_dlopen" = x""yes; then :
+   lt_cv_dlopen="dlopen"
+ else
 -  { $as_echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
--$as_echo_n "checking for dlopen in -ldl... " >&6; }
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
+ $as_echo_n "checking for dlopen in -ldl... " >&6; }
 -if test "${ac_cv_lib_dl_dlopen+set}" = set; then
--  $as_echo_n "(cached) " >&6
--else
--  ac_check_lib_save_LIBS=$LIBS
--LIBS="-ldl  $LIBS"
++if test "${ac_cv_lib_dl_dlopen+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldl  $LIBS"
 -cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
 -_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--
--/* Override any GCC internal prototype to avoid an error.
--   Use char because int might match the return type of a GCC
--   builtin and then its argument prototype would still apply.  */
--#ifdef __cplusplus
--extern "C"
--#endif
--char dlopen ();
--int
--main ()
--{
--return dlopen ();
--  ;
--  return 0;
--}
--_ACEOF
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+ /* Override any GCC internal prototype to avoid an error.
+@@ -10904,57 +10355,28 @@
+   return 0;
+ }
+ _ACEOF
 -rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (ac_try="$ac_link"
 -case "(($ac_try" in
@@ -6587,43 +6304,49 @@
 -	 test "$cross_compiling" = yes ||
 -	 $as_test_x conftest$ac_exeext
 -       }; then
--  ac_cv_lib_dl_dlopen=yes
--else
++if ac_fn_c_try_link "$LINENO"; then :
+   ac_cv_lib_dl_dlopen=yes
+ else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
 -
 -	ac_cv_lib_dl_dlopen=no
--fi
++  ac_cv_lib_dl_dlopen=no
+ fi
 -
 -rm -rf conftest.dSYM
 -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
 -      conftest$ac_exeext conftest.$ac_ext
--LIBS=$ac_check_lib_save_LIBS
--fi
++rm -f core conftest.err conftest.$ac_objext \
++    conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
--$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
+ $as_echo "$ac_cv_lib_dl_dlopen" >&6; }
 -if test "x$ac_cv_lib_dl_dlopen" = x""yes; then
--  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
--else
++if test "x$ac_cv_lib_dl_dlopen" = x""yes; then :
+   lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
+ else
 -  { $as_echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5
--$as_echo_n "checking for dlopen in -lsvld... " >&6; }
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lsvld" >&5
+ $as_echo_n "checking for dlopen in -lsvld... " >&6; }
 -if test "${ac_cv_lib_svld_dlopen+set}" = set; then
--  $as_echo_n "(cached) " >&6
--else
--  ac_check_lib_save_LIBS=$LIBS
--LIBS="-lsvld  $LIBS"
++if test "${ac_cv_lib_svld_dlopen+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lsvld  $LIBS"
 -cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
 -_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lsvld  $LIBS"
 +cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -10967,57 +10269,28 @@
+@@ -10972,57 +10394,28 @@
    return 0;
  }
  _ACEOF
@@ -6690,7 +6413,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -11035,43 +10308,18 @@
+@@ -11040,43 +10433,18 @@
    return 0;
  }
  _ACEOF
@@ -6740,7 +6463,7 @@
    lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"
  fi
  
-@@ -11110,9 +10358,9 @@
+@@ -11115,9 +10483,9 @@
      save_LIBS="$LIBS"
      LIBS="$lt_cv_dlopen_libs $LIBS"
  
@@ -6752,16 +6475,16 @@
    $as_echo_n "(cached) " >&6
  else
    	  if test "$cross_compiling" = yes; then :
-@@ -11121,7 +10369,7 @@
+@@ -11126,7 +10494,7 @@
    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
    lt_status=$lt_dlunknown
    cat > conftest.$ac_ext <<_LT_EOF
--#line 11124 "configure"
-+#line 10372 "configure"
+-#line 11129 "configure"
++#line 10497 "configure"
  #include "confdefs.h"
  
  #if HAVE_DLFCN_H
-@@ -11180,11 +10428,11 @@
+@@ -11185,11 +10553,11 @@
    return status;
  }
  _LT_EOF
@@ -6776,7 +6499,7 @@
      (./conftest; exit; ) >&5 2>/dev/null
      lt_status=$?
      case x$lt_status in
-@@ -11201,14 +10449,14 @@
+@@ -11206,14 +10574,14 @@
  
  
  fi
@@ -6794,16 +6517,16 @@
    $as_echo_n "(cached) " >&6
  else
    	  if test "$cross_compiling" = yes; then :
-@@ -11217,7 +10465,7 @@
+@@ -11222,7 +10590,7 @@
    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
    lt_status=$lt_dlunknown
    cat > conftest.$ac_ext <<_LT_EOF
--#line 11220 "configure"
-+#line 10468 "configure"
+-#line 11225 "configure"
++#line 10593 "configure"
  #include "confdefs.h"
  
  #if HAVE_DLFCN_H
-@@ -11276,11 +10524,11 @@
+@@ -11281,11 +10649,11 @@
    return status;
  }
  _LT_EOF
@@ -6818,7 +6541,7 @@
      (./conftest; exit; ) >&5 2>/dev/null
      lt_status=$?
      case x$lt_status in
-@@ -11297,7 +10545,7 @@
+@@ -11302,7 +10670,7 @@
  
  
  fi
@@ -6827,7 +6550,7 @@
  $as_echo "$lt_cv_dlopen_self_static" >&6; }
      fi
  
-@@ -11336,12 +10584,12 @@
+@@ -11341,12 +10709,12 @@
  
  striplib=
  old_striplib=
@@ -6842,7 +6565,7 @@
  $as_echo "yes" >&6; }
  else
  # FIXME - insert some real tests, host_os isn't really good enough
-@@ -11350,15 +10598,15 @@
+@@ -11355,15 +10723,15 @@
      if test -n "$STRIP" ; then
        striplib="$STRIP -x"
        old_striplib="$STRIP -S"
@@ -6861,7 +6584,7 @@
  $as_echo "no" >&6; }
      ;;
    esac
-@@ -11376,12 +10624,12 @@
+@@ -11381,12 +10749,12 @@
  
  
    # Report which library types will actually be built
@@ -6877,7 +6600,7 @@
  $as_echo_n "checking whether to build shared libraries... " >&6; }
    test "$can_build_shared" = "no" && enable_shared=no
  
-@@ -11402,14 +10650,14 @@
+@@ -11407,14 +10775,14 @@
      fi
      ;;
    esac
@@ -6895,7 +6618,7 @@
  $as_echo "$enable_static" >&6; }
  
  
-@@ -11450,9 +10698,9 @@
+@@ -11455,9 +10823,9 @@
  # Josh Triplett <josh at freedesktop.org>
  # Extract the first word of "bash", so it can be a program name with args.
  set dummy bash; ac_word=$2
@@ -6907,7 +6630,7 @@
    $as_echo_n "(cached) " >&6
  else
    case $DOLT_BASH in
-@@ -11465,14 +10713,14 @@
+@@ -11470,14 +10838,14 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -6925,7 +6648,7 @@
  IFS=$as_save_IFS
  
    ;;
-@@ -11480,15 +10728,15 @@
+@@ -11485,15 +10853,15 @@
  fi
  DOLT_BASH=$ac_cv_path_DOLT_BASH
  if test -n "$DOLT_BASH"; then
@@ -6944,7 +6667,7 @@
  $as_echo_n "checking if dolt supports this host... " >&6; }
  dolt_supported=yes
  if test x$DOLT_BASH = x; then
-@@ -11510,12 +10758,12 @@
+@@ -11515,12 +10883,12 @@
      ;;
  esac
  if test x$dolt_supported = xno ; then
@@ -6959,7 +6682,7 @@
  $as_echo "yes, replacing libtool" >&6; }
  
      cat <<__DOLTCOMPILE__EOF__ >doltcompile
-@@ -11643,17 +10891,13 @@
+@@ -11648,17 +11016,13 @@
  # end dolt
  
  
@@ -6980,7 +6703,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -11678,54 +10922,27 @@
+@@ -11683,54 +11047,27 @@
      ac_res=-l$ac_lib
      LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
    fi
@@ -7043,7 +6766,7 @@
    test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
  
  fi
-@@ -11738,9 +10955,9 @@
+@@ -11743,9 +11080,9 @@
  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
@@ -7055,7 +6778,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$CC"; then
-@@ -11751,24 +10968,24 @@
+@@ -11756,24 +11093,24 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -7085,7 +6808,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -11778,9 +10995,9 @@
+@@ -11783,9 +11120,9 @@
    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
@@ -7097,7 +6820,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$ac_ct_CC"; then
-@@ -11791,24 +11008,24 @@
+@@ -11796,24 +11133,24 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -7127,7 +6850,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -11817,7 +11034,7 @@
+@@ -11822,7 +11159,7 @@
    else
      case $cross_compiling:$ac_tool_warned in
  yes:)
@@ -7136,7 +6859,7 @@
  $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
  ac_tool_warned=yes ;;
  esac
-@@ -11831,9 +11048,9 @@
+@@ -11836,9 +11173,9 @@
            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
@@ -7148,7 +6871,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$CC"; then
-@@ -11844,24 +11061,24 @@
+@@ -11849,24 +11186,24 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -7178,7 +6901,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -11871,9 +11088,9 @@
+@@ -11876,9 +11213,9 @@
  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
@@ -7190,7 +6913,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$CC"; then
-@@ -11885,18 +11102,18 @@
+@@ -11890,18 +11227,18 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -7212,7 +6935,7 @@
  IFS=$as_save_IFS
  
  if test $ac_prog_rejected = yes; then
-@@ -11915,10 +11132,10 @@
+@@ -11920,10 +11257,10 @@
  fi
  CC=$ac_cv_prog_CC
  if test -n "$CC"; then
@@ -7225,7 +6948,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -11930,9 +11147,9 @@
+@@ -11935,9 +11272,9 @@
    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
@@ -7237,7 +6960,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$CC"; then
-@@ -11943,24 +11160,24 @@
+@@ -11948,24 +11285,24 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -7267,7 +6990,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -11974,9 +11191,9 @@
+@@ -11979,9 +11316,9 @@
  do
    # Extract the first word of "$ac_prog", so it can be a program name with args.
  set dummy $ac_prog; ac_word=$2
@@ -7279,7 +7002,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$ac_ct_CC"; then
-@@ -11987,24 +11204,24 @@
+@@ -11992,24 +11329,24 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -7309,7 +7032,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -12017,7 +11234,7 @@
+@@ -12022,7 +11359,7 @@
    else
      case $cross_compiling:$ac_tool_warned in
  yes:)
@@ -7318,719 +7041,7 @@
  $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
  ac_tool_warned=yes ;;
  esac
-@@ -12028,62 +11245,42 @@
- fi
- 
- 
--test -z "$CC" && { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-+test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
- $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
--{ { $as_echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
--See \`config.log' for more details." >&5
--$as_echo "$as_me: error: no acceptable C compiler found in \$PATH
--See \`config.log' for more details." >&2;}
--   { (exit 1); exit 1; }; }; }
-+as_fn_error "no acceptable C compiler found in \$PATH
-+See \`config.log' for more details." "$LINENO" 5; }
- 
- # Provide some information about the compiler.
--$as_echo "$as_me:$LINENO: checking for C compiler version" >&5
-+$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
- set X $ac_compile
- ac_compiler=$2
--{ (ac_try="$ac_compiler --version >&5"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
--  (eval "$ac_compiler --version >&5") 2>&5
--  ac_status=$?
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }
--{ (ac_try="$ac_compiler -v >&5"
-+for ac_option in --version -v -V -qversion; do
-+  { { ac_try="$ac_compiler $ac_option >&5"
- case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
--  (eval "$ac_compiler -v >&5") 2>&5
--  ac_status=$?
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }
--{ (ac_try="$ac_compiler -V >&5"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
--  (eval "$ac_compiler -V >&5") 2>&5
--  ac_status=$?
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }
-+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-+$as_echo "$ac_try_echo"; } >&5
-+  (eval "$ac_compiler $ac_option >&5") 2>conftest.err
-+  ac_status=$?
-+  if test -s conftest.err; then
-+    sed '10a\
-+... rest of stderr output deleted ...
-+         10q' conftest.err >conftest.er1
-+    cat conftest.er1 >&5
-+    rm -f conftest.er1 conftest.err
-+  fi
-+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+  test $ac_status = 0; }
-+done
- 
--{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
- $as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
--if test "${ac_cv_c_compiler_gnu+set}" = set; then
-+if test "${ac_cv_c_compiler_gnu+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
--  cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- 
- int
-@@ -12097,37 +11294,16 @@
-   return 0;
- }
- _ACEOF
--rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
--  (eval "$ac_compile") 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && {
--	 test -z "$ac_c_werror_flag" ||
--	 test ! -s conftest.err
--       } && test -s conftest.$ac_objext; then
-+if ac_fn_c_try_compile "$LINENO"; then :
-   ac_compiler_gnu=yes
- else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--	ac_compiler_gnu=no
-+  ac_compiler_gnu=no
- fi
--
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- ac_cv_c_compiler_gnu=$ac_compiler_gnu
- 
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5
- $as_echo "$ac_cv_c_compiler_gnu" >&6; }
- if test $ac_compiler_gnu = yes; then
-   GCC=yes
-@@ -12136,20 +11312,16 @@
- fi
- ac_test_CFLAGS=${CFLAGS+set}
- ac_save_CFLAGS=$CFLAGS
--{ $as_echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
- $as_echo_n "checking whether $CC accepts -g... " >&6; }
--if test "${ac_cv_prog_cc_g+set}" = set; then
-+if test "${ac_cv_prog_cc_g+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   ac_save_c_werror_flag=$ac_c_werror_flag
-    ac_c_werror_flag=yes
-    ac_cv_prog_cc_g=no
-    CFLAGS="-g"
--   cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- 
- int
-@@ -12160,35 +11332,11 @@
-   return 0;
- }
- _ACEOF
--rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
--  (eval "$ac_compile") 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && {
--	 test -z "$ac_c_werror_flag" ||
--	 test ! -s conftest.err
--       } && test -s conftest.$ac_objext; then
-+if ac_fn_c_try_compile "$LINENO"; then :
-   ac_cv_prog_cc_g=yes
- else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--	CFLAGS=""
--      cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+  CFLAGS=""
-+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- 
- int
-@@ -12199,36 +11347,12 @@
-   return 0;
- }
- _ACEOF
--rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
--  (eval "$ac_compile") 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && {
--	 test -z "$ac_c_werror_flag" ||
--	 test ! -s conftest.err
--       } && test -s conftest.$ac_objext; then
--  :
--else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
-+if ac_fn_c_try_compile "$LINENO"; then :
- 
--	ac_c_werror_flag=$ac_save_c_werror_flag
-+else
-+  ac_c_werror_flag=$ac_save_c_werror_flag
- 	 CFLAGS="-g"
--	 cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- 
- int
-@@ -12239,42 +11363,17 @@
-   return 0;
- }
- _ACEOF
--rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
--  (eval "$ac_compile") 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && {
--	 test -z "$ac_c_werror_flag" ||
--	 test ! -s conftest.err
--       } && test -s conftest.$ac_objext; then
-+if ac_fn_c_try_compile "$LINENO"; then :
-   ac_cv_prog_cc_g=yes
--else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--
- fi
--
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-    ac_c_werror_flag=$ac_save_c_werror_flag
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5
- $as_echo "$ac_cv_prog_cc_g" >&6; }
- if test "$ac_test_CFLAGS" = set; then
-   CFLAGS=$ac_save_CFLAGS
-@@ -12291,18 +11390,14 @@
-     CFLAGS=
-   fi
- fi
--{ $as_echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
- $as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
--if test "${ac_cv_prog_cc_c89+set}" = set; then
-+if test "${ac_cv_prog_cc_c89+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   ac_cv_prog_cc_c89=no
- ac_save_CC=$CC
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- #include <stdarg.h>
- #include <stdio.h>
-@@ -12359,32 +11454,9 @@
- 	-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
- do
-   CC="$ac_save_CC $ac_arg"
--  rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
--  (eval "$ac_compile") 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && {
--	 test -z "$ac_c_werror_flag" ||
--	 test ! -s conftest.err
--       } && test -s conftest.$ac_objext; then
-+  if ac_fn_c_try_compile "$LINENO"; then :
-   ac_cv_prog_cc_c89=$ac_arg
--else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--
- fi
--
- rm -f core conftest.err conftest.$ac_objext
-   test "x$ac_cv_prog_cc_c89" != "xno" && break
- done
-@@ -12395,17 +11467,19 @@
- # AC_CACHE_VAL
- case "x$ac_cv_prog_cc_c89" in
-   x)
--    { $as_echo "$as_me:$LINENO: result: none needed" >&5
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
- $as_echo "none needed" >&6; } ;;
-   xno)
--    { $as_echo "$as_me:$LINENO: result: unsupported" >&5
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
- $as_echo "unsupported" >&6; } ;;
-   *)
-     CC="$CC $ac_cv_prog_cc_c89"
--    { $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
- $as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
- esac
-+if test "x$ac_cv_prog_cc_c89" != xno; then :
- 
-+fi
- 
- ac_ext=c
- ac_cpp='$CPP $CPPFLAGS'
-@@ -12415,9 +11489,9 @@
- 
- depcc="$CC"   am_compiler_list=
- 
--{ $as_echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
- $as_echo_n "checking dependency style of $depcc... " >&6; }
--if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then
-+if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-@@ -12443,11 +11517,6 @@
-   if test "$am_compiler_list" = ""; then
-      am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
-   fi
--  am__universal=false
--  case " $depcc " in #(
--     *\ -arch\ *\ -arch\ *) am__universal=true ;;
--     esac
--
-   for depmode in $am_compiler_list; do
-     # Setup a source with many dependencies, because some compilers
-     # like to wrap large dependency lists on column 80 (with \), and
-@@ -12465,17 +11534,7 @@
-     done
-     echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
- 
--    # We check with `-c' and `-o' for the sake of the "dashmstdout"
--    # mode.  It turns out that the SunPro C++ compiler does not properly
--    # handle `-M -o', and we need to detect this.  Also, some Intel
--    # versions had trouble with output in subdirs
--    am__obj=sub/conftest.${OBJEXT-o}
--    am__minus_obj="-o $am__obj"
-     case $depmode in
--    gcc)
--      # This depmode causes a compiler race in universal mode.
--      test "$am__universal" = false || continue
--      ;;
-     nosideeffect)
-       # after this tag, mechanisms are not by side-effect, so they'll
-       # only be used when explicitly requested
-@@ -12485,23 +11544,19 @@
- 	break
-       fi
-       ;;
--    msvisualcpp | msvcmsys)
--      # This compiler won't grok `-c -o', but also, the minuso test has
--      # not run yet.  These depmodes are late enough in the game, and
--      # so weak that their functioning should not be impacted.
--      am__obj=conftest.${OBJEXT-o}
--      am__minus_obj=
--      ;;
-     none) break ;;
-     esac
--    if depmode=$depmode \
--       source=sub/conftest.c object=$am__obj \
-+    # We check with `-c' and `-o' for the sake of the "dashmstdout"
-+    # mode.  It turns out that the SunPro C++ compiler does not properly
-+    # handle `-M -o', and we need to detect this.
-+    if depmode=$depmode \
-+       source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
-        depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
--       $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
-+       $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
-          >/dev/null 2>conftest.err &&
-        grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
-        grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
--       grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
-+       grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
-        ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
-       # icc doesn't choke on unknown options, it will just issue warnings
-       # or remarks (even with -Werror).  So we grep stderr for any message
-@@ -12525,7 +11580,7 @@
- fi
- 
- fi
--{ $as_echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5
- $as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }
- CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
- 
-@@ -12548,9 +11603,9 @@
- if test -n "$ac_tool_prefix"; then
-   # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
- set dummy ${ac_tool_prefix}gcc; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_prog_CC+set}" = set; then
-+if test "${ac_cv_prog_CC+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   if test -n "$CC"; then
-@@ -12561,24 +11616,24 @@
- do
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
--  for ac_exec_ext in '' $ac_executable_extensions; do
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-     ac_cv_prog_CC="${ac_tool_prefix}gcc"
--    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-   fi
- done
--done
-+  done
- IFS=$as_save_IFS
- 
- fi
- fi
- CC=$ac_cv_prog_CC
- if test -n "$CC"; then
--  { $as_echo "$as_me:$LINENO: result: $CC" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
- $as_echo "$CC" >&6; }
- else
--  { $as_echo "$as_me:$LINENO: result: no" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- fi
- 
-@@ -12588,9 +11643,9 @@
-   ac_ct_CC=$CC
-   # Extract the first word of "gcc", so it can be a program name with args.
- set dummy gcc; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
-+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   if test -n "$ac_ct_CC"; then
-@@ -12601,24 +11656,24 @@
- do
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
--  for ac_exec_ext in '' $ac_executable_extensions; do
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-     ac_cv_prog_ac_ct_CC="gcc"
--    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-   fi
- done
--done
-+  done
- IFS=$as_save_IFS
- 
- fi
- fi
- ac_ct_CC=$ac_cv_prog_ac_ct_CC
- if test -n "$ac_ct_CC"; then
--  { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
- $as_echo "$ac_ct_CC" >&6; }
- else
--  { $as_echo "$as_me:$LINENO: result: no" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- fi
- 
-@@ -12627,7 +11682,7 @@
-   else
-     case $cross_compiling:$ac_tool_warned in
- yes:)
--{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
- $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
- ac_tool_warned=yes ;;
- esac
-@@ -12641,9 +11696,9 @@
-           if test -n "$ac_tool_prefix"; then
-     # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
- set dummy ${ac_tool_prefix}cc; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_prog_CC+set}" = set; then
-+if test "${ac_cv_prog_CC+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   if test -n "$CC"; then
-@@ -12654,24 +11709,24 @@
- do
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
--  for ac_exec_ext in '' $ac_executable_extensions; do
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-     ac_cv_prog_CC="${ac_tool_prefix}cc"
--    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-   fi
- done
--done
-+  done
- IFS=$as_save_IFS
- 
- fi
- fi
- CC=$ac_cv_prog_CC
- if test -n "$CC"; then
--  { $as_echo "$as_me:$LINENO: result: $CC" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
- $as_echo "$CC" >&6; }
- else
--  { $as_echo "$as_me:$LINENO: result: no" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- fi
- 
-@@ -12681,9 +11736,9 @@
- if test -z "$CC"; then
-   # Extract the first word of "cc", so it can be a program name with args.
- set dummy cc; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_prog_CC+set}" = set; then
-+if test "${ac_cv_prog_CC+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   if test -n "$CC"; then
-@@ -12695,18 +11750,18 @@
- do
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
--  for ac_exec_ext in '' $ac_executable_extensions; do
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-     if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
-        ac_prog_rejected=yes
-        continue
-      fi
-     ac_cv_prog_CC="cc"
--    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-   fi
- done
--done
-+  done
- IFS=$as_save_IFS
- 
- if test $ac_prog_rejected = yes; then
-@@ -12725,10 +11780,10 @@
- fi
- CC=$ac_cv_prog_CC
- if test -n "$CC"; then
--  { $as_echo "$as_me:$LINENO: result: $CC" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
- $as_echo "$CC" >&6; }
- else
--  { $as_echo "$as_me:$LINENO: result: no" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- fi
- 
-@@ -12740,9 +11795,9 @@
-   do
-     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
- set dummy $ac_tool_prefix$ac_prog; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_prog_CC+set}" = set; then
-+if test "${ac_cv_prog_CC+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   if test -n "$CC"; then
-@@ -12753,24 +11808,24 @@
- do
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
--  for ac_exec_ext in '' $ac_executable_extensions; do
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-     ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
--    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-   fi
- done
--done
-+  done
- IFS=$as_save_IFS
- 
- fi
- fi
- CC=$ac_cv_prog_CC
- if test -n "$CC"; then
--  { $as_echo "$as_me:$LINENO: result: $CC" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
- $as_echo "$CC" >&6; }
- else
--  { $as_echo "$as_me:$LINENO: result: no" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- fi
- 
-@@ -12784,9 +11839,9 @@
- do
-   # Extract the first word of "$ac_prog", so it can be a program name with args.
- set dummy $ac_prog; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
-+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   if test -n "$ac_ct_CC"; then
-@@ -12797,24 +11852,24 @@
- do
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
--  for ac_exec_ext in '' $ac_executable_extensions; do
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-     ac_cv_prog_ac_ct_CC="$ac_prog"
--    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-   fi
- done
--done
-+  done
- IFS=$as_save_IFS
- 
- fi
- fi
- ac_ct_CC=$ac_cv_prog_ac_ct_CC
- if test -n "$ac_ct_CC"; then
--  { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
- $as_echo "$ac_ct_CC" >&6; }
- else
--  { $as_echo "$as_me:$LINENO: result: no" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- fi
- 
-@@ -12827,7 +11882,7 @@
-   else
-     case $cross_compiling:$ac_tool_warned in
- yes:)
--{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
- $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
- ac_tool_warned=yes ;;
- esac
-@@ -12838,62 +11893,42 @@
+@@ -12033,62 +11370,42 @@
  fi
  
  
@@ -8082,13 +7093,12 @@
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 -  (eval "$ac_compiler -V >&5") 2>&5
--  ac_status=$?
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }
 +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
 +$as_echo "$ac_try_echo"; } >&5
 +  (eval "$ac_compiler $ac_option >&5") 2>conftest.err
-+  ac_status=$?
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }
 +  if test -s conftest.err; then
 +    sed '10a\
 +... rest of stderr output deleted ...
@@ -8116,7 +7126,7 @@
  /* end confdefs.h.  */
  
  int
-@@ -12907,37 +11942,16 @@
+@@ -12102,37 +11419,16 @@
    return 0;
  }
  _ACEOF
@@ -8157,7 +7167,7 @@
  $as_echo "$ac_cv_c_compiler_gnu" >&6; }
  if test $ac_compiler_gnu = yes; then
    GCC=yes
-@@ -12946,20 +11960,16 @@
+@@ -12141,20 +11437,16 @@
  fi
  ac_test_CFLAGS=${CFLAGS+set}
  ac_save_CFLAGS=$CFLAGS
@@ -8181,7 +7191,7 @@
  /* end confdefs.h.  */
  
  int
-@@ -12970,35 +11980,11 @@
+@@ -12165,35 +11457,11 @@
    return 0;
  }
  _ACEOF
@@ -8220,7 +7230,7 @@
  /* end confdefs.h.  */
  
  int
-@@ -13009,36 +11995,12 @@
+@@ -12204,36 +11472,12 @@
    return 0;
  }
  _ACEOF
@@ -8261,7 +7271,7 @@
  /* end confdefs.h.  */
  
  int
-@@ -13049,42 +12011,17 @@
+@@ -12244,42 +11488,17 @@
    return 0;
  }
  _ACEOF
@@ -8306,7 +7316,7 @@
  $as_echo "$ac_cv_prog_cc_g" >&6; }
  if test "$ac_test_CFLAGS" = set; then
    CFLAGS=$ac_save_CFLAGS
-@@ -13101,18 +12038,14 @@
+@@ -12296,18 +11515,14 @@
      CFLAGS=
    fi
  fi
@@ -8328,7 +7338,7 @@
  /* end confdefs.h.  */
  #include <stdarg.h>
  #include <stdio.h>
-@@ -13169,32 +12102,9 @@
+@@ -12364,32 +11579,9 @@
  	-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
  do
    CC="$ac_save_CC $ac_arg"
@@ -8362,7 +7372,7 @@
  rm -f core conftest.err conftest.$ac_objext
    test "x$ac_cv_prog_cc_c89" != "xno" && break
  done
-@@ -13205,17 +12115,19 @@
+@@ -12400,17 +11592,19 @@
  # AC_CACHE_VAL
  case "x$ac_cv_prog_cc_c89" in
    x)
@@ -8385,7 +7395,7 @@
  
  ac_ext=c
  ac_cpp='$CPP $CPPFLAGS'
-@@ -13225,9 +12137,9 @@
+@@ -12420,9 +11614,9 @@
  
  depcc="$CC"   am_compiler_list=
  
@@ -8397,67 +7407,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-@@ -13253,11 +12165,6 @@
-   if test "$am_compiler_list" = ""; then
-      am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
-   fi
--  am__universal=false
--  case " $depcc " in #(
--     *\ -arch\ *\ -arch\ *) am__universal=true ;;
--     esac
--
-   for depmode in $am_compiler_list; do
-     # Setup a source with many dependencies, because some compilers
-     # like to wrap large dependency lists on column 80 (with \), and
-@@ -13275,17 +12182,7 @@
-     done
-     echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
- 
--    # We check with `-c' and `-o' for the sake of the "dashmstdout"
--    # mode.  It turns out that the SunPro C++ compiler does not properly
--    # handle `-M -o', and we need to detect this.  Also, some Intel
--    # versions had trouble with output in subdirs
--    am__obj=sub/conftest.${OBJEXT-o}
--    am__minus_obj="-o $am__obj"
-     case $depmode in
--    gcc)
--      # This depmode causes a compiler race in universal mode.
--      test "$am__universal" = false || continue
--      ;;
-     nosideeffect)
-       # after this tag, mechanisms are not by side-effect, so they'll
-       # only be used when explicitly requested
-@@ -13295,23 +12192,19 @@
- 	break
-       fi
-       ;;
--    msvisualcpp | msvcmsys)
--      # This compiler won't grok `-c -o', but also, the minuso test has
--      # not run yet.  These depmodes are late enough in the game, and
--      # so weak that their functioning should not be impacted.
--      am__obj=conftest.${OBJEXT-o}
--      am__minus_obj=
--      ;;
-     none) break ;;
-     esac
-+    # We check with `-c' and `-o' for the sake of the "dashmstdout"
-+    # mode.  It turns out that the SunPro C++ compiler does not properly
-+    # handle `-M -o', and we need to detect this.
-     if depmode=$depmode \
--       source=sub/conftest.c object=$am__obj \
-+       source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
-        depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
--       $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
-+       $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
-          >/dev/null 2>conftest.err &&
-        grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
-        grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
--       grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
-+       grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
-        ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
-       # icc doesn't choke on unknown options, it will just issue warnings
-       # or remarks (even with -Werror).  So we grep stderr for any message
-@@ -13335,7 +12228,7 @@
+@@ -12530,7 +11724,7 @@
  fi
  
  fi
@@ -8466,7 +7416,657 @@
  $as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }
  CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
  
-@@ -13353,16 +12246,12 @@
+@@ -12553,9 +11747,9 @@
+ if test -n "$ac_tool_prefix"; then
+   # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
+ set dummy ${ac_tool_prefix}gcc; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_CC+set}" = set; then
++if test "${ac_cv_prog_CC+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test -n "$CC"; then
+@@ -12566,24 +11760,24 @@
+ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+-  for ac_exec_ext in '' $ac_executable_extensions; do
++    for ac_exec_ext in '' $ac_executable_extensions; do
+   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_prog_CC="${ac_tool_prefix}gcc"
+-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+ done
+-done
++  done
+ IFS=$as_save_IFS
+ 
+ fi
+ fi
+ CC=$ac_cv_prog_CC
+ if test -n "$CC"; then
+-  { $as_echo "$as_me:$LINENO: result: $CC" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+ $as_echo "$CC" >&6; }
+ else
+-  { $as_echo "$as_me:$LINENO: result: no" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ fi
+ 
+@@ -12593,9 +11787,9 @@
+   ac_ct_CC=$CC
+   # Extract the first word of "gcc", so it can be a program name with args.
+ set dummy gcc; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
++if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test -n "$ac_ct_CC"; then
+@@ -12606,24 +11800,24 @@
+ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+-  for ac_exec_ext in '' $ac_executable_extensions; do
++    for ac_exec_ext in '' $ac_executable_extensions; do
+   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_prog_ac_ct_CC="gcc"
+-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+ done
+-done
++  done
+ IFS=$as_save_IFS
+ 
+ fi
+ fi
+ ac_ct_CC=$ac_cv_prog_ac_ct_CC
+ if test -n "$ac_ct_CC"; then
+-  { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
+ $as_echo "$ac_ct_CC" >&6; }
+ else
+-  { $as_echo "$as_me:$LINENO: result: no" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ fi
+ 
+@@ -12632,7 +11826,7 @@
+   else
+     case $cross_compiling:$ac_tool_warned in
+ yes:)
+-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+ $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ ac_tool_warned=yes ;;
+ esac
+@@ -12646,9 +11840,9 @@
+           if test -n "$ac_tool_prefix"; then
+     # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
+ set dummy ${ac_tool_prefix}cc; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_CC+set}" = set; then
++if test "${ac_cv_prog_CC+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test -n "$CC"; then
+@@ -12659,24 +11853,24 @@
+ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+-  for ac_exec_ext in '' $ac_executable_extensions; do
++    for ac_exec_ext in '' $ac_executable_extensions; do
+   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_prog_CC="${ac_tool_prefix}cc"
+-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+ done
+-done
++  done
+ IFS=$as_save_IFS
+ 
+ fi
+ fi
+ CC=$ac_cv_prog_CC
+ if test -n "$CC"; then
+-  { $as_echo "$as_me:$LINENO: result: $CC" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+ $as_echo "$CC" >&6; }
+ else
+-  { $as_echo "$as_me:$LINENO: result: no" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ fi
+ 
+@@ -12686,9 +11880,9 @@
+ if test -z "$CC"; then
+   # Extract the first word of "cc", so it can be a program name with args.
+ set dummy cc; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_CC+set}" = set; then
++if test "${ac_cv_prog_CC+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test -n "$CC"; then
+@@ -12700,18 +11894,18 @@
+ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+-  for ac_exec_ext in '' $ac_executable_extensions; do
++    for ac_exec_ext in '' $ac_executable_extensions; do
+   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+     if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
+        ac_prog_rejected=yes
+        continue
+      fi
+     ac_cv_prog_CC="cc"
+-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+ done
+-done
++  done
+ IFS=$as_save_IFS
+ 
+ if test $ac_prog_rejected = yes; then
+@@ -12730,10 +11924,10 @@
+ fi
+ CC=$ac_cv_prog_CC
+ if test -n "$CC"; then
+-  { $as_echo "$as_me:$LINENO: result: $CC" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+ $as_echo "$CC" >&6; }
+ else
+-  { $as_echo "$as_me:$LINENO: result: no" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ fi
+ 
+@@ -12745,9 +11939,9 @@
+   do
+     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
+ set dummy $ac_tool_prefix$ac_prog; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_CC+set}" = set; then
++if test "${ac_cv_prog_CC+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test -n "$CC"; then
+@@ -12758,24 +11952,24 @@
+ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+-  for ac_exec_ext in '' $ac_executable_extensions; do
++    for ac_exec_ext in '' $ac_executable_extensions; do
+   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
+-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+ done
+-done
++  done
+ IFS=$as_save_IFS
+ 
+ fi
+ fi
+ CC=$ac_cv_prog_CC
+ if test -n "$CC"; then
+-  { $as_echo "$as_me:$LINENO: result: $CC" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+ $as_echo "$CC" >&6; }
+ else
+-  { $as_echo "$as_me:$LINENO: result: no" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ fi
+ 
+@@ -12789,9 +11983,9 @@
+ do
+   # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
++if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test -n "$ac_ct_CC"; then
+@@ -12802,24 +11996,24 @@
+ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+-  for ac_exec_ext in '' $ac_executable_extensions; do
++    for ac_exec_ext in '' $ac_executable_extensions; do
+   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_prog_ac_ct_CC="$ac_prog"
+-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+ done
+-done
++  done
+ IFS=$as_save_IFS
+ 
+ fi
+ fi
+ ac_ct_CC=$ac_cv_prog_ac_ct_CC
+ if test -n "$ac_ct_CC"; then
+-  { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
+ $as_echo "$ac_ct_CC" >&6; }
+ else
+-  { $as_echo "$as_me:$LINENO: result: no" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ fi
+ 
+@@ -12832,7 +12026,7 @@
+   else
+     case $cross_compiling:$ac_tool_warned in
+ yes:)
+-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+ $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ ac_tool_warned=yes ;;
+ esac
+@@ -12843,62 +12037,42 @@
+ fi
+ 
+ 
+-test -z "$CC" && { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
++test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-{ { $as_echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
+-See \`config.log' for more details." >&5
+-$as_echo "$as_me: error: no acceptable C compiler found in \$PATH
+-See \`config.log' for more details." >&2;}
+-   { (exit 1); exit 1; }; }; }
++as_fn_error "no acceptable C compiler found in \$PATH
++See \`config.log' for more details." "$LINENO" 5; }
+ 
+ # Provide some information about the compiler.
+-$as_echo "$as_me:$LINENO: checking for C compiler version" >&5
++$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
+ set X $ac_compile
+ ac_compiler=$2
+-{ (ac_try="$ac_compiler --version >&5"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_compiler --version >&5") 2>&5
+-  ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }
+-{ (ac_try="$ac_compiler -v >&5"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_compiler -v >&5") 2>&5
+-  ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }
+-{ (ac_try="$ac_compiler -V >&5"
++for ac_option in --version -v -V -qversion; do
++  { { ac_try="$ac_compiler $ac_option >&5"
+ case "(($ac_try" in
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_compiler -V >&5") 2>&5
++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
++$as_echo "$ac_try_echo"; } >&5
++  (eval "$ac_compiler $ac_option >&5") 2>conftest.err
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }
++  if test -s conftest.err; then
++    sed '10a\
++... rest of stderr output deleted ...
++         10q' conftest.err >conftest.er1
++    cat conftest.er1 >&5
++    rm -f conftest.er1 conftest.err
++  fi
++  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++  test $ac_status = 0; }
++done
+ 
+-{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
+ $as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
+-if test "${ac_cv_c_compiler_gnu+set}" = set; then
++if test "${ac_cv_c_compiler_gnu+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+ int
+@@ -12912,37 +12086,16 @@
+   return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_compile") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest.$ac_objext; then
++if ac_fn_c_try_compile "$LINENO"; then :
+   ac_compiler_gnu=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_compiler_gnu=no
++  ac_compiler_gnu=no
+ fi
+-
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ ac_cv_c_compiler_gnu=$ac_compiler_gnu
+ 
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5
+ $as_echo "$ac_cv_c_compiler_gnu" >&6; }
+ if test $ac_compiler_gnu = yes; then
+   GCC=yes
+@@ -12951,20 +12104,16 @@
+ fi
+ ac_test_CFLAGS=${CFLAGS+set}
+ ac_save_CFLAGS=$CFLAGS
+-{ $as_echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
+ $as_echo_n "checking whether $CC accepts -g... " >&6; }
+-if test "${ac_cv_prog_cc_g+set}" = set; then
++if test "${ac_cv_prog_cc_g+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_save_c_werror_flag=$ac_c_werror_flag
+    ac_c_werror_flag=yes
+    ac_cv_prog_cc_g=no
+    CFLAGS="-g"
+-   cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+ int
+@@ -12975,35 +12124,11 @@
+   return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_compile") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest.$ac_objext; then
++if ac_fn_c_try_compile "$LINENO"; then :
+   ac_cv_prog_cc_g=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	CFLAGS=""
+-      cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++  CFLAGS=""
++      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+ int
+@@ -13014,36 +12139,12 @@
+   return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_compile") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest.$ac_objext; then
+-  :
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
++if ac_fn_c_try_compile "$LINENO"; then :
+ 
+-	ac_c_werror_flag=$ac_save_c_werror_flag
++else
++  ac_c_werror_flag=$ac_save_c_werror_flag
+ 	 CFLAGS="-g"
+-	 cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+ int
+@@ -13054,42 +12155,17 @@
+   return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_compile") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest.$ac_objext; then
++if ac_fn_c_try_compile "$LINENO"; then :
+   ac_cv_prog_cc_g=yes
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-
+ fi
+-
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+    ac_c_werror_flag=$ac_save_c_werror_flag
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5
+ $as_echo "$ac_cv_prog_cc_g" >&6; }
+ if test "$ac_test_CFLAGS" = set; then
+   CFLAGS=$ac_save_CFLAGS
+@@ -13106,18 +12182,14 @@
+     CFLAGS=
+   fi
+ fi
+-{ $as_echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
+ $as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
+-if test "${ac_cv_prog_cc_c89+set}" = set; then
++if test "${ac_cv_prog_cc_c89+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_cv_prog_cc_c89=no
+ ac_save_CC=$CC
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ #include <stdarg.h>
+ #include <stdio.h>
+@@ -13174,32 +12246,9 @@
+ 	-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
+ do
+   CC="$ac_save_CC $ac_arg"
+-  rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_compile") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest.$ac_objext; then
++  if ac_fn_c_try_compile "$LINENO"; then :
+   ac_cv_prog_cc_c89=$ac_arg
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-
+ fi
+-
+ rm -f core conftest.err conftest.$ac_objext
+   test "x$ac_cv_prog_cc_c89" != "xno" && break
+ done
+@@ -13210,17 +12259,19 @@
+ # AC_CACHE_VAL
+ case "x$ac_cv_prog_cc_c89" in
+   x)
+-    { $as_echo "$as_me:$LINENO: result: none needed" >&5
++    { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
+ $as_echo "none needed" >&6; } ;;
+   xno)
+-    { $as_echo "$as_me:$LINENO: result: unsupported" >&5
++    { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
+ $as_echo "unsupported" >&6; } ;;
+   *)
+     CC="$CC $ac_cv_prog_cc_c89"
+-    { $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
++    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
+ $as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
+ esac
++if test "x$ac_cv_prog_cc_c89" != xno; then :
+ 
++fi
+ 
+ ac_ext=c
+ ac_cpp='$CPP $CPPFLAGS'
+@@ -13230,9 +12281,9 @@
+ 
+ depcc="$CC"   am_compiler_list=
+ 
+-{ $as_echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
+ $as_echo_n "checking dependency style of $depcc... " >&6; }
+-if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then
++if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
+@@ -13340,7 +12391,7 @@
+ fi
+ 
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5
+ $as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }
+ CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
+ 
+@@ -13358,16 +12409,12 @@
  
  am_cv_prog_cc_stdc=$ac_cv_prog_cc_stdc
  
@@ -8486,7 +8086,7 @@
  /* end confdefs.h.  */
  #include <stdlib.h>
  #include <stdarg.h>
-@@ -13377,48 +12266,23 @@
+@@ -13382,48 +12429,23 @@
    return 0;
  }
  _ACEOF
@@ -8540,7 +8140,7 @@
  else
    ac_cv_header_stdc=no
  fi
-@@ -13428,18 +12292,14 @@
+@@ -13433,18 +12455,14 @@
  
  if test $ac_cv_header_stdc = yes; then
    # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
@@ -8562,7 +8162,7 @@
  else
    ac_cv_header_stdc=no
  fi
-@@ -13449,14 +12309,10 @@
+@@ -13454,14 +12472,10 @@
  
  if test $ac_cv_header_stdc = yes; then
    # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
@@ -8579,7 +8179,7 @@
  /* end confdefs.h.  */
  #include <ctype.h>
  #include <stdlib.h>
-@@ -13483,60 +12339,31 @@
+@@ -13488,60 +12502,31 @@
    return 0;
  }
  _ACEOF
@@ -8649,7 +8249,7 @@
    $as_echo_n "(cached) " >&6
  else
    case $GLIB_GENMARSHAL in
-@@ -13549,14 +12376,14 @@
+@@ -13554,14 +12539,14 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -8667,7 +8267,7 @@
  IFS=$as_save_IFS
  
    ;;
-@@ -13564,19 +12391,19 @@
+@@ -13569,19 +12554,19 @@
  fi
  GLIB_GENMARSHAL=$ac_cv_path_GLIB_GENMARSHAL
  if test -n "$GLIB_GENMARSHAL"; then
@@ -8691,7 +8291,7 @@
    $as_echo_n "(cached) " >&6
  else
    case $GLIB_MKENUMS in
-@@ -13589,14 +12416,14 @@
+@@ -13594,14 +12579,14 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -8709,7 +8309,7 @@
  IFS=$as_save_IFS
  
    ;;
-@@ -13604,26 +12431,26 @@
+@@ -13609,26 +12594,26 @@
  fi
  GLIB_MKENUMS=$ac_cv_path_GLIB_MKENUMS
  if test -n "$GLIB_MKENUMS"; then
@@ -8741,7 +8341,7 @@
  $as_echo "$USE_NLS" >&6; }
  
  
-@@ -13631,35 +12458,31 @@
+@@ -13636,35 +12621,31 @@
  
  case "$am__api_version" in
      1.01234)
@@ -8783,7 +8383,7 @@
    $as_echo_n "(cached) " >&6
  else
    case $INTLTOOL_UPDATE in
-@@ -13672,14 +12495,14 @@
+@@ -13677,14 +12658,14 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -8801,7 +8401,7 @@
  IFS=$as_save_IFS
  
    ;;
-@@ -13687,19 +12510,19 @@
+@@ -13692,19 +12673,19 @@
  fi
  INTLTOOL_UPDATE=$ac_cv_path_INTLTOOL_UPDATE
  if test -n "$INTLTOOL_UPDATE"; then
@@ -8825,7 +8425,7 @@
    $as_echo_n "(cached) " >&6
  else
    case $INTLTOOL_MERGE in
-@@ -13712,14 +12535,14 @@
+@@ -13717,14 +12698,14 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -8843,7 +8443,7 @@
  IFS=$as_save_IFS
  
    ;;
-@@ -13727,19 +12550,19 @@
+@@ -13732,19 +12713,19 @@
  fi
  INTLTOOL_MERGE=$ac_cv_path_INTLTOOL_MERGE
  if test -n "$INTLTOOL_MERGE"; then
@@ -8867,7 +8467,7 @@
    $as_echo_n "(cached) " >&6
  else
    case $INTLTOOL_EXTRACT in
-@@ -13752,14 +12575,14 @@
+@@ -13757,14 +12738,14 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -8885,7 +8485,7 @@
  IFS=$as_save_IFS
  
    ;;
-@@ -13767,18 +12590,16 @@
+@@ -13772,18 +12753,16 @@
  fi
  INTLTOOL_EXTRACT=$ac_cv_path_INTLTOOL_EXTRACT
  if test -n "$INTLTOOL_EXTRACT"; then
@@ -8907,7 +8507,7 @@
  fi
  
    INTLTOOL_DESKTOP_RULE='%.desktop:   %.desktop.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-@@ -13824,9 +12645,9 @@
+@@ -13829,9 +12808,9 @@
  # Check the gettext tools to make sure they are GNU
  # Extract the first word of "xgettext", so it can be a program name with args.
  set dummy xgettext; ac_word=$2
@@ -8919,7 +8519,7 @@
    $as_echo_n "(cached) " >&6
  else
    case $XGETTEXT in
-@@ -13839,14 +12660,14 @@
+@@ -13844,14 +12823,14 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -8937,7 +8537,7 @@
  IFS=$as_save_IFS
  
    ;;
-@@ -13854,19 +12675,19 @@
+@@ -13859,19 +12838,19 @@
  fi
  XGETTEXT=$ac_cv_path_XGETTEXT
  if test -n "$XGETTEXT"; then
@@ -8961,7 +8561,7 @@
    $as_echo_n "(cached) " >&6
  else
    case $MSGMERGE in
-@@ -13879,14 +12700,14 @@
+@@ -13884,14 +12863,14 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -8979,7 +8579,7 @@
  IFS=$as_save_IFS
  
    ;;
-@@ -13894,19 +12715,19 @@
+@@ -13899,19 +12878,19 @@
  fi
  MSGMERGE=$ac_cv_path_MSGMERGE
  if test -n "$MSGMERGE"; then
@@ -9003,7 +8603,7 @@
    $as_echo_n "(cached) " >&6
  else
    case $MSGFMT in
-@@ -13919,14 +12740,14 @@
+@@ -13924,14 +12903,14 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -9021,7 +8621,7 @@
  IFS=$as_save_IFS
  
    ;;
-@@ -13934,19 +12755,19 @@
+@@ -13939,19 +12918,19 @@
  fi
  MSGFMT=$ac_cv_path_MSGFMT
  if test -n "$MSGFMT"; then
@@ -9045,7 +8645,7 @@
    $as_echo_n "(cached) " >&6
  else
    case $GMSGFMT in
-@@ -13959,14 +12780,14 @@
+@@ -13964,14 +12943,14 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -9063,7 +8663,7 @@
  IFS=$as_save_IFS
  
    test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT"
-@@ -13975,33 +12796,29 @@
+@@ -13980,33 +12959,29 @@
  fi
  GMSGFMT=$ac_cv_path_GMSGFMT
  if test -n "$GMSGFMT"; then
@@ -9103,7 +8703,7 @@
    $as_echo_n "(cached) " >&6
  else
    case $INTLTOOL_PERL in
-@@ -14014,14 +12831,14 @@
+@@ -14019,14 +12994,14 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -9121,7 +8721,7 @@
  IFS=$as_save_IFS
  
    ;;
-@@ -14029,34 +12846,28 @@
+@@ -14034,34 +13009,28 @@
  fi
  INTLTOOL_PERL=$ac_cv_path_INTLTOOL_PERL
  if test -n "$INTLTOOL_PERL"; then
@@ -9163,7 +8763,7 @@
     fi
  fi
  
-@@ -14066,11 +12877,7 @@
+@@ -14071,11 +13040,7 @@
  # Set DATADIRNAME correctly if it is not set yet
  # (copied from glib-gettext.m4)
  if test -z "$DATADIRNAME"; then
@@ -9176,7 +8776,7 @@
  /* end confdefs.h.  */
  
  int
-@@ -14082,120 +12889,13 @@
+@@ -14087,136 +13052,27 @@
    return 0;
  }
  _ACEOF
@@ -9214,7 +8814,10 @@
 -$as_echo_n "checking for bind_textdomain_codeset... " >&6; }
 -if test "${ac_cv_func_bind_textdomain_codeset+set}" = set; then
 -  $as_echo_n "(cached) " >&6
--else
++                        ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset"
++if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then :
++  DATADIRNAME=share
+ else
 -  cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
 -_ACEOF
@@ -9224,7 +8827,9 @@
 -/* Define bind_textdomain_codeset to an innocuous variant, in case <limits.h> declares bind_textdomain_codeset.
 -   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
 -#define bind_textdomain_codeset innocuous_bind_textdomain_codeset
--
++  DATADIRNAME=lib
++fi
+ 
 -/* System header to define __stub macros and hopefully few prototypes,
 -    which can conflict with char bind_textdomain_codeset (); below.
 -    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
@@ -9296,25 +8901,35 @@
 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_bind_textdomain_codeset" >&5
 -$as_echo "$ac_cv_func_bind_textdomain_codeset" >&6; }
 -if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then
-+                        ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset"
-+if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then :
-   DATADIRNAME=share
- else
-   DATADIRNAME=lib
-@@ -14207,10 +12907,8 @@
-     ;;
-     esac
- fi
+-  DATADIRNAME=share
+-else
+-  DATADIRNAME=lib
+-fi
+-
+-    ;;
+-    *)
+-    DATADIRNAME=lib
+-    ;;
+-    esac
+-fi
 -
 -rm -rf conftest.dSYM
 -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
 -      conftest$ac_exeext conftest.$ac_ext
+-fi
++    ;;
++    *)
++    DATADIRNAME=lib
++    ;;
++    esac
++fi
 +rm -f core conftest.err conftest.$ac_objext \
 +    conftest$ac_exeext conftest.$ac_ext
- fi
- 
- 
-@@ -14224,9 +12922,9 @@
++fi
+ 
+ 
+ 
+@@ -14229,9 +13085,9 @@
  	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
@@ -9326,7 +8941,7 @@
    $as_echo_n "(cached) " >&6
  else
    case $PKG_CONFIG in
-@@ -14239,14 +12937,14 @@
+@@ -14244,14 +13100,14 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -9344,7 +8959,7 @@
  IFS=$as_save_IFS
  
    ;;
-@@ -14254,10 +12952,10 @@
+@@ -14259,10 +13115,10 @@
  fi
  PKG_CONFIG=$ac_cv_path_PKG_CONFIG
  if test -n "$PKG_CONFIG"; then
@@ -9357,7 +8972,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -14267,9 +12965,9 @@
+@@ -14272,9 +13128,9 @@
    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
@@ -9369,7 +8984,7 @@
    $as_echo_n "(cached) " >&6
  else
    case $ac_pt_PKG_CONFIG in
-@@ -14282,14 +12980,14 @@
+@@ -14287,14 +13143,14 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -9387,7 +9002,7 @@
  IFS=$as_save_IFS
  
    ;;
-@@ -14297,10 +12995,10 @@
+@@ -14302,10 +13158,10 @@
  fi
  ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
  if test -n "$ac_pt_PKG_CONFIG"; then
@@ -9400,7 +9015,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -14309,7 +13007,7 @@
+@@ -14314,7 +13170,7 @@
    else
      case $cross_compiling:$ac_tool_warned in
  yes:)
@@ -9409,7 +9024,7 @@
  $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
  ac_tool_warned=yes ;;
  esac
-@@ -14322,13 +13020,13 @@
+@@ -14327,13 +13183,13 @@
  fi
  if test -n "$PKG_CONFIG"; then
  	_pkg_min_version=0.9.0
@@ -9426,7 +9041,7 @@
  $as_echo "no" >&6; }
  		PKG_CONFIG=""
  	fi
-@@ -14337,7 +13035,7 @@
+@@ -14342,7 +13198,7 @@
  
  
  	# Check whether --enable-debug was given.
@@ -9435,7 +9050,7 @@
    enableval=$enable_debug;
  else
    enable_debug=no
-@@ -14346,16 +13044,14 @@
+@@ -14351,16 +13207,14 @@
  
  	if test x$enable_debug = xyes ; then
  
@@ -9454,7 +9069,7 @@
    enableval=$enable_compile_warnings;
  else
    enable_compile_warnings="maximum"
-@@ -14386,13 +13082,9 @@
+@@ -14391,13 +13245,9 @@
  	for option in -Wno-sign-compare; do
  		SAVE_CFLAGS="$CFLAGS"
  		CFLAGS="$CFLAGS $option"
@@ -9470,7 +9085,7 @@
  /* end confdefs.h.  */
  
  int
-@@ -14403,35 +13095,14 @@
+@@ -14408,35 +13258,14 @@
    return 0;
  }
  _ACEOF
@@ -9509,7 +9124,7 @@
  $as_echo "$has_option" >&6; }
  		if test $has_option = yes; then
  		  warning_flags="$warning_flags $option"
-@@ -14445,26 +13116,24 @@
+@@ -14450,26 +13279,24 @@
  	fi
  	;;
      *)
@@ -9541,7 +9156,7 @@
  $as_echo_n "checking what language compliance flags to pass to the C compiler... " >&6; }
      complCFLAGS=
      if test "x$enable_iso_c" != "xno"; then
-@@ -14479,7 +13148,7 @@
+@@ -14484,7 +13311,7 @@
  	esac
  	fi
      fi
@@ -9550,7 +9165,7 @@
  $as_echo "$complCFLAGS" >&6; }
  
      WARN_CFLAGS="$warning_flags $complCFLAGS"
-@@ -14501,9 +13170,7 @@
+@@ -14506,9 +13333,7 @@
  
  if test "$enable_maintainer_mode" = "yes"; then
  
@@ -9561,8 +9176,8 @@
  
  	enable_debug=yes
  	DEPRECATION_FLAGS="-DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DGCONF_DISABLE_DEPRECATED -DPANGO_DISABLE_DEPRECATED -DGNOME_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED"
-@@ -14520,11 +13187,11 @@
- LIBSOUP_GNOME_REQUIRED=2.26.0
+@@ -14526,11 +13351,11 @@
+ GNOME_KEYRING_REQUIRED=2.26.0
  
  if test -n "$PKG_CONFIG" && \
 -    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libnotify >= \$LIBNOTIFY_REQUIRED\"") >&5
@@ -9576,7 +9191,7 @@
    have_libnotify=yes
  else
    have_libnotify=no
-@@ -14534,24 +13201,22 @@
+@@ -14540,24 +13365,22 @@
  if test "$have_libnotify" = "yes"; then
    LIBNOTIFY_PACKAGE="libnotify >= $LIBNOTIFY_REQUIRED"
  
@@ -9605,7 +9220,7 @@
  $as_echo "$enable_tests" >&6; }
  
   if test "$enable_tests" = "yes"; then
-@@ -14565,14 +13230,15 @@
+@@ -14571,14 +13394,15 @@
  
  
  pkg_failed=no
@@ -9627,17 +9242,17 @@
  		  glib-2.0 >= \$GLIB_REQUIRED
  		  gmodule-2.0
  		  gthread-2.0
-@@ -14588,7 +13254,7 @@
- 		  \$LIBNOTIFY_PACKAGE
+@@ -14596,7 +13420,7 @@
  		  webkit-1.0 >= \$WEBKIT_GTK_REQUIRED
  		  libsoup-gnome-2.4 >= \$LIBSOUP_GNOME_REQUIRED
+ 		  gnome-keyring-1 >= \$GNOME_KEYRING_REQUIRED
 -		  \"") >&5
 +		  \""; } >&5
    ($PKG_CONFIG --exists --print-errors "
  		  glib-2.0 >= $GLIB_REQUIRED
  		  gmodule-2.0
-@@ -14607,8 +13273,8 @@
- 		  libsoup-gnome-2.4 >= $LIBSOUP_GNOME_REQUIRED
+@@ -14617,8 +13441,8 @@
+ 		  gnome-keyring-1 >= $GNOME_KEYRING_REQUIRED
  		  ") 2>&5
    ac_status=$?
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -9647,7 +9262,7 @@
    pkg_cv_DEPENDENCIES_CFLAGS=`$PKG_CONFIG --cflags "
  		  glib-2.0 >= $GLIB_REQUIRED
  		  gmodule-2.0
-@@ -14629,14 +13295,16 @@
+@@ -14641,14 +13465,16 @@
  else
    pkg_failed=yes
  fi
@@ -9671,17 +9286,17 @@
  		  glib-2.0 >= \$GLIB_REQUIRED
  		  gmodule-2.0
  		  gthread-2.0
-@@ -14652,7 +13320,7 @@
- 		  \$LIBNOTIFY_PACKAGE
+@@ -14666,7 +13492,7 @@
  		  webkit-1.0 >= \$WEBKIT_GTK_REQUIRED
  		  libsoup-gnome-2.4 >= \$LIBSOUP_GNOME_REQUIRED
+ 		  gnome-keyring-1 >= \$GNOME_KEYRING_REQUIRED
 -		  \"") >&5
 +		  \""; } >&5
    ($PKG_CONFIG --exists --print-errors "
  		  glib-2.0 >= $GLIB_REQUIRED
  		  gmodule-2.0
-@@ -14671,8 +13339,8 @@
- 		  libsoup-gnome-2.4 >= $LIBSOUP_GNOME_REQUIRED
+@@ -14687,8 +13513,8 @@
+ 		  gnome-keyring-1 >= $GNOME_KEYRING_REQUIRED
  		  ") 2>&5
    ac_status=$?
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -9691,7 +9306,7 @@
    pkg_cv_DEPENDENCIES_LIBS=`$PKG_CONFIG --libs "
  		  glib-2.0 >= $GLIB_REQUIRED
  		  gmodule-2.0
-@@ -14693,8 +13361,9 @@
+@@ -14711,8 +13537,9 @@
  else
    pkg_failed=yes
  fi
@@ -9703,7 +9318,7 @@
  fi
  
  
-@@ -14707,7 +13376,7 @@
+@@ -14725,7 +13552,7 @@
          _pkg_short_errors_supported=no
  fi
          if test $_pkg_short_errors_supported = yes; then
@@ -9712,10 +9327,10 @@
  		  glib-2.0 >= $GLIB_REQUIRED
  		  gmodule-2.0
  		  gthread-2.0
-@@ -14723,9 +13392,9 @@
- 		  $LIBNOTIFY_PACKAGE
+@@ -14743,9 +13570,9 @@
  		  webkit-1.0 >= $WEBKIT_GTK_REQUIRED
  		  libsoup-gnome-2.4 >= $LIBSOUP_GNOME_REQUIRED
+ 		  gnome-keyring-1 >= $GNOME_KEYRING_REQUIRED
 -		  " 2>&1`
 +		  "`
          else
@@ -9724,10 +9339,10 @@
  		  glib-2.0 >= $GLIB_REQUIRED
  		  gmodule-2.0
  		  gthread-2.0
-@@ -14741,39 +13410,12 @@
- 		  $LIBNOTIFY_PACKAGE
+@@ -14763,41 +13590,12 @@
  		  webkit-1.0 >= $WEBKIT_GTK_REQUIRED
  		  libsoup-gnome-2.4 >= $LIBSOUP_GNOME_REQUIRED
+ 		  gnome-keyring-1 >= $GNOME_KEYRING_REQUIRED
 -		  " 2>&1`
 +		  "`
          fi
@@ -9741,6 +9356,7 @@
 -		  gio-unix-2.0 >= $GLIB_REQUIRED
 -		  gtk+-2.0 >= $GTK_REQUIRED
 -		  gtk+-unix-print-2.0 >= $GTK_REQUIRED
+-		  ice
 -		  x11
 -		  sm
 -		  libxml-2.0 >= $LIBXML_REQUIRED
@@ -9750,6 +9366,7 @@
 -		  $LIBNOTIFY_PACKAGE
 -		  webkit-1.0 >= $WEBKIT_GTK_REQUIRED
 -		  libsoup-gnome-2.4 >= $LIBSOUP_GNOME_REQUIRED
+-		  gnome-keyring-1 >= $GNOME_KEYRING_REQUIRED
 -		  ) were not met:
 -
 -$DEPENDENCIES_PKG_ERRORS
@@ -9766,7 +9383,7 @@
  		  glib-2.0 >= $GLIB_REQUIRED
  		  gmodule-2.0
  		  gthread-2.0
-@@ -14799,22 +13441,11 @@
+@@ -14825,22 +13623,11 @@
  Alternatively, you may set the environment variables DEPENDENCIES_CFLAGS
  and DEPENDENCIES_LIBS to avoid the need to call pkg-config.
  See the pkg-config man page for more details.
@@ -9792,7 +9409,7 @@
  is in your PATH or set the PKG_CONFIG environment variable to the full
  path to pkg-config.
  
-@@ -14823,12 +13454,11 @@
+@@ -14849,12 +13636,11 @@
  See the pkg-config man page for more details.
  
  To get pkg-config, see <http://pkg-config.freedesktop.org/>.
@@ -9807,7 +9424,7 @@
  $as_echo "yes" >&6; }
  	:
  fi
-@@ -14839,40 +13469,44 @@
+@@ -14865,40 +13651,44 @@
  
  
  pkg_failed=no
@@ -9871,7 +9488,7 @@
  fi
  
  
-@@ -14885,25 +13519,14 @@
+@@ -14911,25 +13701,14 @@
          _pkg_short_errors_supported=no
  fi
          if test $_pkg_short_errors_supported = yes; then
@@ -9900,7 +9517,7 @@
  
  $DBUS_PKG_ERRORS
  
-@@ -14913,22 +13536,11 @@
+@@ -14939,22 +13718,11 @@
  Alternatively, you may set the environment variables DBUS_CFLAGS
  and DBUS_LIBS to avoid the need to call pkg-config.
  See the pkg-config man page for more details.
@@ -9926,7 +9543,7 @@
  is in your PATH or set the PKG_CONFIG environment variable to the full
  path to pkg-config.
  
-@@ -14937,21 +13549,20 @@
+@@ -14963,21 +13731,20 @@
  See the pkg-config man page for more details.
  
  To get pkg-config, see <http://pkg-config.freedesktop.org/>.
@@ -9952,7 +9569,7 @@
    $as_echo_n "(cached) " >&6
  else
    case $DBUS_BINDING_TOOL in
-@@ -14964,14 +13575,14 @@
+@@ -14990,14 +13757,14 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -9970,7 +9587,7 @@
  IFS=$as_save_IFS
  
    test -z "$ac_cv_path_DBUS_BINDING_TOOL" && ac_cv_path_DBUS_BINDING_TOOL="no"
-@@ -14980,19 +13591,17 @@
+@@ -15006,19 +13773,17 @@
  fi
  DBUS_BINDING_TOOL=$ac_cv_path_DBUS_BINDING_TOOL
  if test -n "$DBUS_BINDING_TOOL"; then
@@ -9993,7 +9610,7 @@
  fi
  
  # *****
-@@ -15008,13 +13617,13 @@
+@@ -15034,13 +13799,13 @@
  
  
  # Check whether --with-gconf-source was given.
@@ -10009,7 +9626,7 @@
  $as_echo "Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation" >&6; }
  
    if test "x$GCONF_SCHEMA_FILE_DIR" = "x"; then
-@@ -15023,22 +13632,20 @@
+@@ -15049,22 +13814,20 @@
  
  
  # Check whether --with-gconf-schema-file-dir was given.
@@ -10036,7 +9653,7 @@
        esac
  fi
  
-@@ -15054,9 +13661,9 @@
+@@ -15080,9 +13843,9 @@
  
  # Extract the first word of "gconftool-2", so it can be a program name with args.
  set dummy gconftool-2; ac_word=$2
@@ -10048,7 +9665,7 @@
    $as_echo_n "(cached) " >&6
  else
    case $GCONFTOOL in
-@@ -15069,14 +13676,14 @@
+@@ -15095,14 +13858,14 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -10066,7 +9683,7 @@
  IFS=$as_save_IFS
  
    test -z "$ac_cv_path_GCONFTOOL" && ac_cv_path_GCONFTOOL="no"
-@@ -15085,121 +13692,29 @@
+@@ -15111,134 +13874,160 @@
  fi
  GCONFTOOL=$ac_cv_path_GCONFTOOL
  if test -n "$GCONFTOOL"; then
@@ -10092,21 +9709,65 @@
  # Portability checks
  # ******************
  
--
- for ac_func in mkdtemp
++for ac_func in localtime_r memchr memmove memset mkdir mkdtemp realpath sqrt strchr strcspn strdup strerror strrchr strtol strtoul strstr
++do :
++  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
++ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
++eval as_val=\$$as_ac_var
++   if test "x$as_val" = x""yes; then :
++  cat >>confdefs.h <<_ACEOF
++#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
++_ACEOF
+ 
++fi
++done
+ 
+ 
++# for backtrace()
++for ac_header in execinfo.h fcntl.h
++do :
++  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
++ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
++eval as_val=\$$as_ac_Header
++   if test "x$as_val" = x""yes; then :
++  cat >>confdefs.h <<_ACEOF
++#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
++_ACEOF
+ 
++fi
+ 
++done
+ 
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-for ac_func in localtime_r memchr memmove memset mkdir mkdtemp realpath sqrt strchr strcspn strdup strerror strrchr strtol strtoul strstr
 -do
 -as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 -{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
 -$as_echo_n "checking for $ac_func... " >&6; }
 -if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
--  $as_echo_n "(cached) " >&6
--else
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for inline" >&5
++$as_echo_n "checking for inline... " >&6; }
++if test "${ac_cv_c_inline+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
 -  cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
 -_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
++  ac_cv_c_inline=no
++for ac_kw in inline __inline__ __inline; do
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
 -/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
 -   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
 -#define $ac_func innocuous_$ac_func
@@ -10120,10 +9781,25 @@
 -# include <limits.h>
 -#else
 -# include <assert.h>
--#endif
--
++#ifndef __cplusplus
++typedef int foo_t;
++static $ac_kw foo_t static_foo () {return 0; }
++$ac_kw foo_t foo () {return 0; }
+ #endif
+ 
 -#undef $ac_func
--
++_ACEOF
++if ac_fn_c_try_compile "$LINENO"; then :
++  ac_cv_c_inline=$ac_kw
++fi
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++  test "$ac_cv_c_inline" != no && break
++done
++
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_inline" >&5
++$as_echo "$ac_cv_c_inline" >&6; }
+ 
 -/* Override any GCC internal prototype to avoid an error.
 -   Use char because int might match the return type of a GCC
 -   builtin and then its argument prototype would still apply.  */
@@ -10136,16 +9812,42 @@
 -    something starting with __ and the normal name is an alias.  */
 -#if defined __stub_$ac_func || defined __stub___$ac_func
 -choke me
--#endif
--
--int
--main ()
--{
++case $ac_cv_c_inline in
++  inline | yes) ;;
++  *)
++    case $ac_cv_c_inline in
++      no) ac_val=;;
++      *) ac_val=$ac_cv_c_inline;;
++    esac
++    cat >>confdefs.h <<_ACEOF
++#ifndef __cplusplus
++#define inline $ac_val
+ #endif
++_ACEOF
++    ;;
++esac
++
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether time.h and sys/time.h may both be included" >&5
++$as_echo_n "checking whether time.h and sys/time.h may both be included... " >&6; }
++if test "${ac_cv_header_time+set}" = set; then :
++  $as_echo_n "(cached) " >&6
++else
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
++#include <sys/types.h>
++#include <sys/time.h>
++#include <time.h>
+ 
+ int
+ main ()
+ {
 -return $ac_func ();
--  ;
--  return 0;
--}
--_ACEOF
++if ((struct tm *) 0)
++return 0;
+   ;
+   return 0;
+ }
+ _ACEOF
 -rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (ac_try="$ac_link"
 -case "(($ac_try" in
@@ -10168,17 +9870,42 @@
 -	 $as_test_x conftest$ac_exeext
 -       }; then
 -  eval "$as_ac_var=yes"
--else
++if ac_fn_c_try_compile "$LINENO"; then :
++  ac_cv_header_time=yes
+ else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
--
++  ac_cv_header_time=no
++fi
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_time" >&5
++$as_echo "$ac_cv_header_time" >&6; }
++if test $ac_cv_header_time = yes; then
++
++$as_echo "#define TIME_WITH_SYS_TIME 1" >>confdefs.h
+ 
 -	eval "$as_ac_var=no"
--fi
--
+ fi
+ 
 -rm -rf conftest.dSYM
 -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
 -      conftest$ac_exeext conftest.$ac_ext
--fi
++
++
++
++  for ac_header in $ac_header_list
++do :
++  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
++ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
++"
++eval as_val=\$$as_ac_Header
++   if test "x$as_val" = x""yes; then :
++  cat >>confdefs.h <<_ACEOF
++#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
++_ACEOF
++
+ fi
 -ac_res=`eval 'as_val=${'$as_ac_var'}
 -		 $as_echo "$as_val"'`
 -	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
@@ -10186,21 +9913,33 @@
 -as_val=`eval 'as_val=${'$as_ac_var'}
 -		 $as_echo "$as_val"'`
 -   if test "x$as_val" = x""yes; then
++
++done
++
++
++
++
++
++
++
++
++  for ac_func in $ac_func_list
 +do :
-+  ac_fn_c_check_func "$LINENO" "mkdtemp" "ac_cv_func_mkdtemp"
-+if test "x$ac_cv_func_mkdtemp" = x""yes; then :
++  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
++ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
++eval as_val=\$$as_ac_var
++   if test "x$as_val" = x""yes; then :
    cat >>confdefs.h <<_ACEOF
--#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-+#define HAVE_MKDTEMP 1
+ #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
  _ACEOF
- 
- fi
-@@ -15207,151 +13722,12 @@
- 
- 
- # for backtrace()
--
- for ac_header in execinfo.h
+@@ -15247,582 +14036,18 @@
+ done
+ 
+ 
+-# for backtrace()
+ 
+ 
+-for ac_header in execinfo.h fcntl.h
 -do
 -as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
@@ -10342,16 +10081,866 @@
 -as_val=`eval 'as_val=${'$as_ac_Header'}
 -		 $as_echo "$as_val"'`
 -   if test "x$as_val" = x""yes; then
-+do :
-+  ac_fn_c_check_header_mongrel "$LINENO" "execinfo.h" "ac_cv_header_execinfo_h" "$ac_includes_default"
-+if test "x$ac_cv_header_execinfo_h" = x""yes; then :
-   cat >>confdefs.h <<_ACEOF
+-  cat >>confdefs.h <<_ACEOF
 -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-+#define HAVE_EXECINFO_H 1
+-_ACEOF
+-
+-fi
+-
+-done
+-
+-{ $as_echo "$as_me:$LINENO: checking for inline" >&5
+-$as_echo_n "checking for inline... " >&6; }
+-if test "${ac_cv_c_inline+set}" = set; then
+-  $as_echo_n "(cached) " >&6
+-else
+-  ac_cv_c_inline=no
+-for ac_kw in inline __inline__ __inline; do
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-#ifndef __cplusplus
+-typedef int foo_t;
+-static $ac_kw foo_t static_foo () {return 0; }
+-$ac_kw foo_t foo () {return 0; }
+-#endif
+-
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_compile") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest.$ac_objext; then
+-  ac_cv_c_inline=$ac_kw
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-
+-fi
+-
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-  test "$ac_cv_c_inline" != no && break
+-done
+-
+-fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_inline" >&5
+-$as_echo "$ac_cv_c_inline" >&6; }
+-
+-
+-case $ac_cv_c_inline in
+-  inline | yes) ;;
+-  *)
+-    case $ac_cv_c_inline in
+-      no) ac_val=;;
+-      *) ac_val=$ac_cv_c_inline;;
+-    esac
+-    cat >>confdefs.h <<_ACEOF
+-#ifndef __cplusplus
+-#define inline $ac_val
+-#endif
+-_ACEOF
+-    ;;
+-esac
+-
+-{ $as_echo "$as_me:$LINENO: checking whether time.h and sys/time.h may both be included" >&5
+-$as_echo_n "checking whether time.h and sys/time.h may both be included... " >&6; }
+-if test "${ac_cv_header_time+set}" = set; then
+-  $as_echo_n "(cached) " >&6
+-else
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-#include <sys/types.h>
+-#include <sys/time.h>
+-#include <time.h>
+-
+-int
+-main ()
+-{
+-if ((struct tm *) 0)
+-return 0;
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_compile") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest.$ac_objext; then
+-  ac_cv_header_time=yes
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_header_time=no
+-fi
+-
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_time" >&5
+-$as_echo "$ac_cv_header_time" >&6; }
+-if test $ac_cv_header_time = yes; then
+-
+-cat >>confdefs.h <<\_ACEOF
+-#define TIME_WITH_SYS_TIME 1
+-_ACEOF
+-
+-fi
+-
+-
+-
+-
+-
+-for ac_header in $ac_header_list
+-do
+-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+-$as_echo_n "checking for $ac_header... " >&6; }
+-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
+-fi
+-ac_res=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
+-else
+-  # Is the header compilable?
+-{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+-$as_echo_n "checking $ac_header usability... " >&6; }
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-$ac_includes_default
+-#include <$ac_header>
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_compile") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest.$ac_objext; then
+-  ac_header_compiler=yes
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_header_compiler=no
+-fi
+-
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-$as_echo "$ac_header_compiler" >&6; }
+-
+-# Is the header present?
+-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+-$as_echo_n "checking $ac_header presence... " >&6; }
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-#include <$ac_header>
+-_ACEOF
+-if { (ac_try="$ac_cpp conftest.$ac_ext"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } >/dev/null && {
+-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       }; then
+-  ac_header_preproc=yes
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-  ac_header_preproc=no
+-fi
+-
+-rm -f conftest.err conftest.$ac_ext
+-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-$as_echo "$ac_header_preproc" >&6; }
+-
+-# So?  What about this header?
+-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+-  yes:no: )
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+-$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+-$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+-    ac_header_preproc=yes
+-    ;;
+-  no:yes:* )
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+-$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+-$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+-$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+-$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+-$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+-$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+-    ( cat <<\_ASBOX
+-## ----------------------------------------------------------------------- ##
+-## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=epiphany ##
+-## ----------------------------------------------------------------------- ##
+-_ASBOX
+-     ) | sed "s/^/$as_me: WARNING:     /" >&2
+-    ;;
+-esac
+-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+-$as_echo_n "checking for $ac_header... " >&6; }
+-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
+-else
+-  eval "$as_ac_Header=\$ac_header_preproc"
+-fi
+-ac_res=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
+-
+-fi
+-as_val=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-   if test "x$as_val" = x""yes; then
+-  cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+-_ACEOF
+-
+-fi
+ 
+-done
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-for ac_func in $ac_func_list
+-do
+-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+-$as_echo_n "checking for $ac_func... " >&6; }
+-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
+-else
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
+-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+-#define $ac_func innocuous_$ac_func
+-
+-/* System header to define __stub macros and hopefully few prototypes,
+-    which can conflict with char $ac_func (); below.
+-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+-    <limits.h> exists even on freestanding compilers.  */
+-
+-#ifdef __STDC__
+-# include <limits.h>
+-#else
+-# include <assert.h>
+-#endif
+-
+-#undef $ac_func
+-
+-/* Override any GCC internal prototype to avoid an error.
+-   Use char because int might match the return type of a GCC
+-   builtin and then its argument prototype would still apply.  */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-char $ac_func ();
+-/* The GNU C library defines this for functions which it implements
+-    to always fail with ENOSYS.  Some functions are actually named
+-    something starting with __ and the normal name is an alias.  */
+-#if defined __stub_$ac_func || defined __stub___$ac_func
+-choke me
+-#endif
+-
+-int
+-main ()
+-{
+-return $ac_func ();
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_link") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
+-  eval "$as_ac_var=yes"
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	eval "$as_ac_var=no"
+-fi
+-
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+-      conftest$ac_exeext conftest.$ac_ext
+-fi
+-ac_res=`eval 'as_val=${'$as_ac_var'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
+-as_val=`eval 'as_val=${'$as_ac_var'}
+-		 $as_echo "$as_val"'`
+-   if test "x$as_val" = x""yes; then
+-  cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+-_ACEOF
+-
+-fi
+-done
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-{ $as_echo "$as_me:$LINENO: checking for working mktime" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working mktime" >&5
+ $as_echo_n "checking for working mktime... " >&6; }
+-if test "${ac_cv_func_working_mktime+set}" = set; then
++if test "${ac_cv_func_working_mktime+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+-  if test "$cross_compiling" = yes; then
++  if test "$cross_compiling" = yes; then :
+   ac_cv_func_working_mktime=no
+ else
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ /* Test program from Paul Eggert and Tony Leneis.  */
+ #ifdef TIME_WITH_SYS_TIME
+@@ -16019,44 +14244,17 @@
+   return ! (irix_6_4_bug () && spring_forward_gap () && year_2050_test ());
+ }
  _ACEOF
- 
- fi
-@@ -15373,48 +13749,23 @@
+-rm -f conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_link") 2>&5
+-  ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++if ac_fn_c_try_run "$LINENO"; then :
+   ac_cv_func_working_mktime=yes
+ else
+-  $as_echo "$as_me: program exited with status $ac_status" >&5
+-$as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-( exit $ac_status )
+-ac_cv_func_working_mktime=no
++  ac_cv_func_working_mktime=no
+ fi
+-rm -rf conftest.dSYM
+-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
++  conftest.$ac_objext conftest.beam conftest.$ac_ext
+ fi
+ 
+-
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_working_mktime" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_working_mktime" >&5
+ $as_echo "$ac_cv_func_working_mktime" >&6; }
+ if test $ac_cv_func_working_mktime = no; then
+   case " $LIBOBJS " in
+@@ -16067,19 +14265,15 @@
+ 
+ fi
+ 
+-{ $as_echo "$as_me:$LINENO: checking for working strtod" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working strtod" >&5
+ $as_echo_n "checking for working strtod... " >&6; }
+-if test "${ac_cv_func_strtod+set}" = set; then
++if test "${ac_cv_func_strtod+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+-  if test "$cross_compiling" = yes; then
++  if test "$cross_compiling" = yes; then :
+   ac_cv_func_strtod=no
+ else
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+ $ac_includes_default
+@@ -16112,44 +14306,17 @@
+ }
+ 
+ _ACEOF
+-rm -f conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_link") 2>&5
+-  ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++if ac_fn_c_try_run "$LINENO"; then :
+   ac_cv_func_strtod=yes
+ else
+-  $as_echo "$as_me: program exited with status $ac_status" >&5
+-$as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-( exit $ac_status )
+-ac_cv_func_strtod=no
++  ac_cv_func_strtod=no
+ fi
+-rm -rf conftest.dSYM
+-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
++  conftest.$ac_objext conftest.beam conftest.$ac_ext
+ fi
+ 
+-
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_strtod" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_strtod" >&5
+ $as_echo "$ac_cv_func_strtod" >&6; }
+ if test $ac_cv_func_strtod = no; then
+   case " $LIBOBJS " in
+@@ -16158,265 +14325,62 @@
+  ;;
+ esac
+ 
+-{ $as_echo "$as_me:$LINENO: checking for pow" >&5
+-$as_echo_n "checking for pow... " >&6; }
+-if test "${ac_cv_func_pow+set}" = set; then
+-  $as_echo_n "(cached) " >&6
+-else
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-/* Define pow to an innocuous variant, in case <limits.h> declares pow.
+-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+-#define pow innocuous_pow
+-
+-/* System header to define __stub macros and hopefully few prototypes,
+-    which can conflict with char pow (); below.
+-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+-    <limits.h> exists even on freestanding compilers.  */
+-
+-#ifdef __STDC__
+-# include <limits.h>
+-#else
+-# include <assert.h>
+-#endif
+-
+-#undef pow
+-
+-/* Override any GCC internal prototype to avoid an error.
+-   Use char because int might match the return type of a GCC
+-   builtin and then its argument prototype would still apply.  */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-char pow ();
+-/* The GNU C library defines this for functions which it implements
+-    to always fail with ENOSYS.  Some functions are actually named
+-    something starting with __ and the normal name is an alias.  */
+-#if defined __stub_pow || defined __stub___pow
+-choke me
+-#endif
+-
+-int
+-main ()
+-{
+-return pow ();
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_link") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
+-  ac_cv_func_pow=yes
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_func_pow=no
+-fi
++ac_fn_c_check_func "$LINENO" "pow" "ac_cv_func_pow"
++if test "x$ac_cv_func_pow" = x""yes; then :
+ 
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+-      conftest$ac_exeext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_pow" >&5
+-$as_echo "$ac_cv_func_pow" >&6; }
+ 
+ if test $ac_cv_func_pow = no; then
+-  { $as_echo "$as_me:$LINENO: checking for pow in -lm" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pow in -lm" >&5
+ $as_echo_n "checking for pow in -lm... " >&6; }
+-if test "${ac_cv_lib_m_pow+set}" = set; then
++if test "${ac_cv_lib_m_pow+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lm  $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+-/* Override any GCC internal prototype to avoid an error.
+-   Use char because int might match the return type of a GCC
+-   builtin and then its argument prototype would still apply.  */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-char pow ();
+-int
+-main ()
+-{
+-return pow ();
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_link") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
+-  ac_cv_lib_m_pow=yes
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_lib_m_pow=no
+-fi
+-
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+-      conftest$ac_exeext conftest.$ac_ext
+-LIBS=$ac_check_lib_save_LIBS
+-fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_m_pow" >&5
+-$as_echo "$ac_cv_lib_m_pow" >&6; }
+-if test "x$ac_cv_lib_m_pow" = x""yes; then
+-  POW_LIB=-lm
+-else
+-  { $as_echo "$as_me:$LINENO: WARNING: cannot find library containing definition of pow" >&5
+-$as_echo "$as_me: WARNING: cannot find library containing definition of pow" >&2;}
+-fi
+-
+-fi
+-
+-fi
+-
+-{ $as_echo "$as_me:$LINENO: checking for size_t" >&5
+-$as_echo_n "checking for size_t... " >&6; }
+-if test "${ac_cv_type_size_t+set}" = set; then
+-  $as_echo_n "(cached) " >&6
+-else
+-  ac_cv_type_size_t=no
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-$ac_includes_default
+-int
+-main ()
+-{
+-if (sizeof (size_t))
+-       return 0;
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_compile") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest.$ac_objext; then
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-$ac_includes_default
++/* Override any GCC internal prototype to avoid an error.
++   Use char because int might match the return type of a GCC
++   builtin and then its argument prototype would still apply.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++char pow ();
+ int
+ main ()
+ {
+-if (sizeof ((size_t)))
+-	  return 0;
++return pow ();
+   ;
+   return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_compile") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest.$ac_objext; then
+-  :
++if ac_fn_c_try_link "$LINENO"; then :
++  ac_cv_lib_m_pow=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_type_size_t=yes
++  ac_cv_lib_m_pow=no
+ fi
+-
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext \
++    conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_pow" >&5
++$as_echo "$ac_cv_lib_m_pow" >&6; }
++if test "x$ac_cv_lib_m_pow" = x""yes; then :
++  POW_LIB=-lm
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
++  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cannot find library containing definition of pow" >&5
++$as_echo "$as_me: WARNING: cannot find library containing definition of pow" >&2;}
++fi
+ 
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5
+-$as_echo "$ac_cv_type_size_t" >&6; }
+-if test "x$ac_cv_type_size_t" = x""yes; then
+-  :
++
++ac_fn_c_check_type "$LINENO" "size_t" "ac_cv_type_size_t" "$ac_includes_default"
++if test "x$ac_cv_type_size_t" = x""yes; then :
++
+ else
+ 
+ cat >>confdefs.h <<_ACEOF
+@@ -16440,48 +14404,23 @@
  	_SAVE_CFLAGS=$CFLAGS
  	CFLAGS="$CFLAGS $_FLAGS"
  
@@ -10406,7 +10995,7 @@
  $as_echo "$ac_cv_have_declaration_after_statement" >&6; }
  
  	if test "$ac_cv_have_declaration_after_statement" = "yes"; then
-@@ -15433,151 +13784,12 @@
+@@ -16500,151 +14439,12 @@
  # Multimedia keys
  # ***************
  
@@ -10553,17 +11142,16 @@
 -as_val=`eval 'as_val=${'$as_ac_Header'}
 -		 $as_echo "$as_val"'`
 -   if test "x$as_val" = x""yes; then
--  cat >>confdefs.h <<_ACEOF
--#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 +do :
 +  ac_fn_c_check_header_mongrel "$LINENO" "X11/XF86keysym.h" "ac_cv_header_X11_XF86keysym_h" "$ac_includes_default"
 +if test "x$ac_cv_header_X11_XF86keysym_h" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
+   cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 +#define HAVE_X11_XF86KEYSYM_H 1
  _ACEOF
  
  fi
-@@ -15591,16 +13803,16 @@
+@@ -16658,16 +14458,16 @@
  # GObject Introspection
  # *********************
  
@@ -10583,7 +11171,7 @@
  $as_echo "$enable_introspection" >&6; }
  
  G_IR_SCANNER=
-@@ -15615,40 +13827,44 @@
+@@ -16682,40 +14482,44 @@
    GOBJECT_INTROSPECTION_REQUIRED=0.6.2
  
  pkg_failed=no
@@ -10647,7 +11235,7 @@
  fi
  
  
-@@ -15661,25 +13877,14 @@
+@@ -16728,25 +14532,14 @@
          _pkg_short_errors_supported=no
  fi
          if test $_pkg_short_errors_supported = yes; then
@@ -10676,7 +11264,7 @@
  
  $INTROSPECTION_PKG_ERRORS
  
-@@ -15689,12 +13894,11 @@
+@@ -16756,22 +14549,11 @@
  Alternatively, you may set the environment variables INTROSPECTION_CFLAGS
  and INTROSPECTION_LIBS to avoid the need to call pkg-config.
  See the pkg-config man page for more details.
@@ -10688,24 +11276,24 @@
 +	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
  $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 -{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old.  Make sure it
+-is in your PATH or set the PKG_CONFIG environment variable to the full
+-path to pkg-config.
+-
+-Alternatively, you may set the environment variables INTROSPECTION_CFLAGS
+-and INTROSPECTION_LIBS to avoid the need to call pkg-config.
+-See the pkg-config man page for more details.
+-
+-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+-See \`config.log' for more details." >&5
+-$as_echo "$as_me: error: The pkg-config script could not be found or is too old.  Make sure it
 +as_fn_error "The pkg-config script could not be found or is too old.  Make sure it
  is in your PATH or set the PKG_CONFIG environment variable to the full
  path to pkg-config.
  
-@@ -15703,22 +13907,11 @@
+@@ -16780,12 +14562,11 @@
  See the pkg-config man page for more details.
  
  To get pkg-config, see <http://pkg-config.freedesktop.org/>.
--See \`config.log' for more details." >&5
--$as_echo "$as_me: error: The pkg-config script could not be found or is too old.  Make sure it
--is in your PATH or set the PKG_CONFIG environment variable to the full
--path to pkg-config.
--
--Alternatively, you may set the environment variables INTROSPECTION_CFLAGS
--and INTROSPECTION_LIBS to avoid the need to call pkg-config.
--See the pkg-config man page for more details.
--
--To get pkg-config, see <http://pkg-config.freedesktop.org/>.
 -See \`config.log' for more details." >&2;}
 -   { (exit 1); exit 1; }; }; }
 +See \`config.log' for more details." "$LINENO" 5; }
@@ -10717,7 +11305,7 @@
  $as_echo "yes" >&6; }
  	:
  fi
-@@ -15730,9 +13923,7 @@
+@@ -16797,9 +14578,7 @@
    GIRTYPELIBDIR="$($PKG_CONFIG --variable=typelibdir gobject-introspection-1.0)"
  
  
@@ -10728,7 +11316,7 @@
  
  fi
  
-@@ -15755,22 +13946,20 @@
+@@ -16822,22 +14601,20 @@
  # Seed
  # ****
  
@@ -10755,8 +11343,8 @@
  fi
  
  if test "$enable_seed" = "yes"; then
-@@ -15779,40 +13968,44 @@
-   SEED_REQUIRED=0
+@@ -16846,40 +14623,44 @@
+   SEED_REQUIRED=2.27.91
  
  pkg_failed=no
 -{ $as_echo "$as_me:$LINENO: checking for SEED" >&5
@@ -10819,7 +11407,7 @@
  fi
  
  
-@@ -15825,14 +14018,14 @@
+@@ -16892,25 +14673,14 @@
          _pkg_short_errors_supported=no
  fi
          if test $_pkg_short_errors_supported = yes; then
@@ -10833,25 +11421,25 @@
  	echo "$SEED_PKG_ERRORS" >&5
  
 -	{ { $as_echo "$as_me:$LINENO: error: Package requirements (seed >= $SEED_REQUIRED) were not met:
+-
+-$SEED_PKG_ERRORS
+-
+-Consider adjusting the PKG_CONFIG_PATH environment variable if you
+-installed software in a non-standard prefix.
+-
+-Alternatively, you may set the environment variables SEED_CFLAGS
+-and SEED_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 (seed >= $SEED_REQUIRED) were not met:
 +	as_fn_error "Package requirements (seed >= $SEED_REQUIRED) were not met:
  
  $SEED_PKG_ERRORS
  
-@@ -15842,23 +14035,11 @@
+@@ -16920,22 +14690,11 @@
  Alternatively, you may set the environment variables SEED_CFLAGS
  and SEED_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 (seed >= $SEED_REQUIRED) were not met:
--
--$SEED_PKG_ERRORS
--
--Consider adjusting the PKG_CONFIG_PATH environment variable if you
--installed software in a non-standard prefix.
--
--Alternatively, you may set the environment variables SEED_CFLAGS
--and SEED_LIBS to avoid the need to call pkg-config.
--See the pkg-config man page for more details.
 -" >&2;}
 -   { (exit 1); exit 1; }; }
 +" "$LINENO" 5
@@ -10860,24 +11448,24 @@
 +	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
  $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 -{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old.  Make sure it
+-is in your PATH or set the PKG_CONFIG environment variable to the full
+-path to pkg-config.
+-
+-Alternatively, you may set the environment variables SEED_CFLAGS
+-and SEED_LIBS to avoid the need to call pkg-config.
+-See the pkg-config man page for more details.
+-
+-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+-See \`config.log' for more details." >&5
+-$as_echo "$as_me: error: The pkg-config script could not be found or is too old.  Make sure it
 +as_fn_error "The pkg-config script could not be found or is too old.  Make sure it
  is in your PATH or set the PKG_CONFIG environment variable to the full
  path to pkg-config.
  
-@@ -15867,30 +14048,17 @@
+@@ -16944,20 +14703,17 @@
  See the pkg-config man page for more details.
  
  To get pkg-config, see <http://pkg-config.freedesktop.org/>.
--See \`config.log' for more details." >&5
--$as_echo "$as_me: error: The pkg-config script could not be found or is too old.  Make sure it
--is in your PATH or set the PKG_CONFIG environment variable to the full
--path to pkg-config.
--
--Alternatively, you may set the environment variables SEED_CFLAGS
--and SEED_LIBS to avoid the need to call pkg-config.
--See the pkg-config man page for more details.
--
--To get pkg-config, see <http://pkg-config.freedesktop.org/>.
 -See \`config.log' for more details." >&2;}
 -   { (exit 1); exit 1; }; }; }
 +See \`config.log' for more details." "$LINENO" 5; }
@@ -10898,7 +11486,7 @@
  
  fi
  
-@@ -15911,16 +14079,16 @@
+@@ -16978,16 +14734,16 @@
  
  # Zeroconf bookmarks sites
  
@@ -10918,7 +11506,7 @@
  $as_echo "$enable_zeroconf" >&6; }
  
  if test "$enable_zeroconf" != "no"; then
-@@ -15928,52 +14096,56 @@
+@@ -16995,52 +14751,56 @@
  
  
  pkg_failed=no
@@ -10996,7 +11584,7 @@
  fi
  
  
-@@ -15986,18 +14158,18 @@
+@@ -17053,18 +14813,18 @@
          _pkg_short_errors_supported=no
  fi
          if test $_pkg_short_errors_supported = yes; then
@@ -11020,7 +11608,7 @@
  $as_echo "no" >&6; }
                  have_avahi=no
  elif test $pkg_failed = untried; then
-@@ -16005,15 +14177,13 @@
+@@ -17072,15 +14832,13 @@
  else
  	AVAHI_CFLAGS=$pkg_cv_AVAHI_CFLAGS
  	AVAHI_LIBS=$pkg_cv_AVAHI_LIBS
@@ -11038,7 +11626,7 @@
          elif test "$have_avahi" = "yes"; then
                  enable_zeroconf=yes
          else
-@@ -16023,9 +14193,7 @@
+@@ -17090,9 +14848,7 @@
  
  if test "$enable_zeroconf" = "yes"; then
  
@@ -11049,7 +11637,7 @@
  
  fi
  
-@@ -16040,55 +14208,59 @@
+@@ -17107,55 +14863,59 @@
  
  # NetworkManager
  
@@ -11131,7 +11719,7 @@
  fi
  
  
-@@ -16101,14 +14273,14 @@
+@@ -17168,14 +14928,14 @@
          _pkg_short_errors_supported=no
  fi
          if test $_pkg_short_errors_supported = yes; then
@@ -11149,7 +11737,7 @@
  $as_echo "no" >&6; }
                  have_network_manager=no
  elif test $pkg_failed = untried; then
-@@ -16116,26 +14288,22 @@
+@@ -17183,26 +14943,22 @@
  else
  	NETWORK_MANAGER_CFLAGS=$pkg_cv_NETWORK_MANAGER_CFLAGS
  	NETWORK_MANAGER_LIBS=$pkg_cv_NETWORK_MANAGER_LIBS
@@ -11180,63 +11768,60 @@
  
  fi
  
-@@ -16176,18 +14344,18 @@
+@@ -17242,201 +14998,58 @@
+ 
  ISO_CODES_REQUIRED=0.35
  
- if test -n "$PKG_CONFIG" && \
+-if test -n "$PKG_CONFIG" && \
 -    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"iso-codes >= \$ISO_CODES_REQUIRED\"") >&5
-+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"iso-codes >= \$ISO_CODES_REQUIRED\""; } >&5
-   ($PKG_CONFIG --exists --print-errors "iso-codes >= $ISO_CODES_REQUIRED") 2>&5
-   ac_status=$?
+-  ($PKG_CONFIG --exists --print-errors "iso-codes >= $ISO_CODES_REQUIRED") 2>&5
+-  ac_status=$?
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; then
-+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+  test $ac_status = 0; }; then
-   have_iso_codes=yes
- else
-   have_iso_codes=no
- fi
- 
- if test "$have_iso_codes" = "yes"; then
+-  have_iso_codes=yes
+-else
+-  have_iso_codes=no
+-fi
+-
+-if test "$have_iso_codes" = "yes"; then
 -	{ $as_echo "$as_me:$LINENO: checking whether iso-codes has iso-639 and iso-3166 domains" >&5
-+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether iso-codes has iso-639 and iso-3166 domains" >&5
- $as_echo_n "checking whether iso-codes has iso-639 and iso-3166 domains... " >&6; }
- 	if $PKG_CONFIG --variable=domains iso-codes | grep -q 639 && \
- 	   $PKG_CONFIG --variable=domains iso-codes | grep -q 3166 ; then
-@@ -16196,7 +14364,7 @@
- 		result=no
- 		have_iso_codes=no
- 	fi
+-$as_echo_n "checking whether iso-codes has iso-639 and iso-3166 domains... " >&6; }
+-	if $PKG_CONFIG --variable=domains iso-codes | grep -q 639 && \
+-	   $PKG_CONFIG --variable=domains iso-codes | grep -q 3166 ; then
+-		result=yes
+-	else
+-		result=no
+-		have_iso_codes=no
+-	fi
 -	{ $as_echo "$as_me:$LINENO: result: $result" >&5
-+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
- $as_echo "$result" >&6; }
- fi
- 
-@@ -16207,17 +14375,13 @@
- _ACEOF
- 
- 
+-$as_echo "$result" >&6; }
+-fi
+-
+-if test "$have_iso_codes" = "yes"; then
+-
+-cat >>confdefs.h <<_ACEOF
+-#define ISO_CODES_PREFIX "`$PKG_CONFIG --variable=prefix iso-codes`"
+-_ACEOF
+-
+-
 -cat >>confdefs.h <<\_ACEOF
 -#define HAVE_ISO_CODES 1
 -_ACEOF
-+$as_echo "#define HAVE_ISO_CODES 1" >>confdefs.h
- 
- else
+-
+-else
 -	{ { $as_echo "$as_me:$LINENO: error: iso-codes is required" >&5
 -$as_echo "$as_me: error: iso-codes is required" >&2;}
 -   { (exit 1); exit 1; }; }
-+	as_fn_error "iso-codes is required" "$LINENO" 5
- fi
- 
+-fi
+-
 -GETTEXT_PACKAGE=epiphany
-+GETTEXT_PACKAGE=epiphany-webkit
- 
- 
- cat >>confdefs.h <<_ACEOF
-@@ -16225,151 +14389,12 @@
- _ACEOF
- 
- 
+-
+-
+-cat >>confdefs.h <<_ACEOF
+-#define GETTEXT_PACKAGE "$GETTEXT_PACKAGE"
+-_ACEOF
+-
+-
 -
 -for ac_header in locale.h
 -do
@@ -11283,17 +11868,39 @@
 -	 test ! -s conftest.err
 -       } && test -s conftest.$ac_objext; then
 -  ac_header_compiler=yes
--else
++if test -n "$PKG_CONFIG" && \
++    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"iso-codes >= \$ISO_CODES_REQUIRED\""; } >&5
++  ($PKG_CONFIG --exists --print-errors "iso-codes >= $ISO_CODES_REQUIRED") 2>&5
++  ac_status=$?
++  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++  test $ac_status = 0; }; then
++  have_iso_codes=yes
+ else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
--
++  have_iso_codes=no
++fi
+ 
 -	ac_header_compiler=no
--fi
--
++if test "$have_iso_codes" = "yes"; then
++	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether iso-codes has iso-639 and iso-3166 domains" >&5
++$as_echo_n "checking whether iso-codes has iso-639 and iso-3166 domains... " >&6; }
++	if $PKG_CONFIG --variable=domains iso-codes | grep -q 639 && \
++	   $PKG_CONFIG --variable=domains iso-codes | grep -q 3166 ; then
++		result=yes
++	else
++		result=no
++		have_iso_codes=no
++	fi
++	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
++$as_echo "$result" >&6; }
+ fi
+ 
 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 -{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
 -$as_echo "$ac_header_compiler" >&6; }
--
++if test "$have_iso_codes" = "yes"; then
+ 
 -# Is the header present?
 -{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
 -$as_echo_n "checking $ac_header presence... " >&6; }
@@ -11304,7 +11911,9 @@
 -cat >>conftest.$ac_ext <<_ACEOF
 -/* end confdefs.h.  */
 -#include <$ac_header>
--_ACEOF
++cat >>confdefs.h <<_ACEOF
++#define ISO_CODES_PREFIX "`$PKG_CONFIG --variable=prefix iso-codes`"
+ _ACEOF
 -if { (ac_try="$ac_cpp conftest.$ac_ext"
 -case "(($ac_try" in
 -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -11326,14 +11935,15 @@
 -else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
--
+ 
 -  ac_header_preproc=no
 -fi
--
+ 
 -rm -f conftest.err conftest.$ac_ext
 -{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
 -$as_echo "$ac_header_preproc" >&6; }
--
++$as_echo "#define HAVE_ISO_CODES 1" >>confdefs.h
+ 
 -# So?  What about this header?
 -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
 -  yes:no: )
@@ -11368,18 +11978,27 @@
 -$as_echo_n "checking for $ac_header... " >&6; }
 -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
 -  $as_echo_n "(cached) " >&6
--else
+ else
 -  eval "$as_ac_Header=\$ac_header_preproc"
--fi
++	as_fn_error "iso-codes is required" "$LINENO" 5
+ fi
 -ac_res=`eval 'as_val=${'$as_ac_Header'}
 -		 $as_echo "$as_val"'`
 -	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
 -$as_echo "$ac_res" >&6; }
--
+ 
 -fi
 -as_val=`eval 'as_val=${'$as_ac_Header'}
 -		 $as_echo "$as_val"'`
 -   if test "x$as_val" = x""yes; then
++GETTEXT_PACKAGE=epiphany-webkit
++
++
++cat >>confdefs.h <<_ACEOF
++#define GETTEXT_PACKAGE "$GETTEXT_PACKAGE"
++_ACEOF
++
++
 +   for ac_header in locale.h
 +do :
 +  ac_fn_c_check_header_mongrel "$LINENO" "locale.h" "ac_cv_header_locale_h" "$ac_includes_default"
@@ -11390,7 +12009,7 @@
  _ACEOF
  
  fi
-@@ -16377,16 +14402,12 @@
+@@ -17444,16 +15057,12 @@
  done
  
      if test $ac_cv_header_locale_h = yes; then
@@ -11410,7 +12029,7 @@
  /* end confdefs.h.  */
  #include <locale.h>
  int
-@@ -16397,46 +14418,19 @@
+@@ -17464,46 +15073,19 @@
    return 0;
  }
  _ACEOF
@@ -11463,7 +12082,7 @@
  
      fi
    fi
-@@ -16449,155 +14443,20 @@
+@@ -17516,155 +15098,20 @@
      XGETTEXT=:
      INTLLIBS=
  
@@ -11624,7 +12243,7 @@
  /* end confdefs.h.  */
  
  #include <libintl.h>
-@@ -16610,54 +14469,25 @@
+@@ -17677,54 +15124,25 @@
    return 0;
  }
  _ACEOF
@@ -11687,7 +12306,7 @@
  /* end confdefs.h.  */
  
  #include <libintl.h>
-@@ -16670,141 +14500,26 @@
+@@ -17737,141 +15155,26 @@
    return 0;
  }
  _ACEOF
@@ -11839,7 +12458,7 @@
  _ACEOF
  
  fi
-@@ -16819,18 +14534,14 @@
+@@ -17886,18 +15189,14 @@
  	 || test "$gt_cv_func_ngettext_libc" != "yes" \
           || test "$ac_cv_func_bind_textdomain_codeset" != "yes" ; then
  
@@ -11861,10 +12480,12 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -16844,59 +14555,30 @@
+@@ -17909,61 +15208,32 @@
+ char bindtextdomain ();
+ int
  main ()
- {
- return bindtextdomain ();
+-{
+-return bindtextdomain ();
 -  ;
 -  return 0;
 -}
@@ -11890,6 +12511,8 @@
 -	 test "$cross_compiling" = yes ||
 -	 $as_test_x conftest$ac_exeext
 -       }; then
++{
++return bindtextdomain ();
 +  ;
 +  return 0;
 +}
@@ -11934,7 +12557,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -16914,55 +14596,26 @@
+@@ -17981,55 +15251,26 @@
    return 0;
  }
  _ACEOF
@@ -11999,7 +12622,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -16980,43 +14633,18 @@
+@@ -18047,43 +15288,18 @@
    return 0;
  }
  _ACEOF
@@ -12049,7 +12672,7 @@
    gt_cv_func_dgettext_libintl=yes
  fi
  
-@@ -17026,22 +14654,18 @@
+@@ -18093,22 +15309,18 @@
  
  
  	if test "$gt_cv_func_dgettext_libintl" != "yes" ; then
@@ -12077,7 +12700,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -17059,55 +14683,26 @@
+@@ -18126,55 +15338,26 @@
    return 0;
  }
  _ACEOF
@@ -12142,7 +12765,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -17125,43 +14720,18 @@
+@@ -18192,43 +15375,18 @@
    return 0;
  }
  _ACEOF
@@ -12192,7 +12815,7 @@
    gt_cv_func_dgettext_libintl=yes
  			libintl_extra_libs=-liconv
  else
-@@ -17183,102 +14753,12 @@
+@@ -18250,102 +15408,12 @@
            glib_save_LIBS="$LIBS"
            LIBS="$LIBS -lintl $libintl_extra_libs"
            unset ac_cv_func_bind_textdomain_codeset
@@ -12300,7 +12923,7 @@
  _ACEOF
  
  fi
-@@ -17308,15 +14788,13 @@
+@@ -18375,15 +15443,13 @@
  
        if test "$gt_cv_have_gettext" = "yes"; then
  
@@ -12319,7 +12942,7 @@
    $as_echo_n "(cached) " >&6
  else
    case "$MSGFMT" in
-@@ -17341,118 +14819,28 @@
+@@ -18408,118 +15474,28 @@
  fi
  MSGFMT="$ac_cv_path_MSGFMT"
  if test "$MSGFMT" != "no"; then
@@ -12446,7 +13069,7 @@
  $as_echo_n "checking if msgfmt accepts -c... " >&6; }
  	  cat >conftest.foo <<_ACEOF
  
-@@ -17467,14 +14855,14 @@
+@@ -18534,14 +15510,14 @@
  "Content-Transfer-Encoding: 8bit\n"
  
  _ACEOF
@@ -12466,7 +13089,7 @@
  $as_echo "no" >&6; }
  echo "$as_me: failed input was:" >&5
  sed 's/^/| /' conftest.foo >&5
-@@ -17482,9 +14870,9 @@
+@@ -18549,9 +15525,9 @@
  
  	  # Extract the first word of "gmsgfmt", so it can be a program name with args.
  set dummy gmsgfmt; ac_word=$2
@@ -12478,7 +13101,7 @@
    $as_echo_n "(cached) " >&6
  else
    case $GMSGFMT in
-@@ -17497,14 +14885,14 @@
+@@ -18564,14 +15540,14 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -12496,7 +13119,7 @@
  IFS=$as_save_IFS
  
    test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT"
-@@ -17513,19 +14901,19 @@
+@@ -18580,19 +15556,19 @@
  fi
  GMSGFMT=$ac_cv_path_GMSGFMT
  if test -n "$GMSGFMT"; then
@@ -12520,7 +13143,7 @@
    $as_echo_n "(cached) " >&6
  else
    case "$XGETTEXT" in
-@@ -17550,18 +14938,14 @@
+@@ -18617,144 +15593,33 @@
  fi
  XGETTEXT="$ac_cv_path_XGETTEXT"
  if test "$XGETTEXT" != ":"; then
@@ -12529,99 +13152,21 @@
  $as_echo "$XGETTEXT" >&6; }
  else
 -  { $as_echo "$as_me:$LINENO: result: no" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- fi
- 
+-$as_echo "no" >&6; }
+-fi
+-
 -	  cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
 -_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
-+	  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- 
- int
-@@ -17573,121 +14957,14 @@
-   return 0;
- }
- _ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
--  (eval "$ac_link") 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && {
--	 test -z "$ac_c_werror_flag" ||
--	 test ! -s conftest.err
--       } && test -s conftest$ac_exeext && {
--	 test "$cross_compiling" = yes ||
--	 $as_test_x conftest$ac_exeext
--       }; then
-+if ac_fn_c_try_link "$LINENO"; then :
-   CATOBJEXT=.gmo
--             DATADIRNAME=share
--else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--	case $host in
--	    *-*-solaris*)
--	    	                	    	                { $as_echo "$as_me:$LINENO: checking for bind_textdomain_codeset" >&5
--$as_echo_n "checking for bind_textdomain_codeset... " >&6; }
--if test "${ac_cv_func_bind_textdomain_codeset+set}" = set; then
--  $as_echo_n "(cached) " >&6
--else
--  cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
 -/* end confdefs.h.  */
--/* Define bind_textdomain_codeset to an innocuous variant, in case <limits.h> declares bind_textdomain_codeset.
--   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
--#define bind_textdomain_codeset innocuous_bind_textdomain_codeset
--
--/* System header to define __stub macros and hopefully few prototypes,
--    which can conflict with char bind_textdomain_codeset (); below.
--    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
--    <limits.h> exists even on freestanding compilers.  */
--
--#ifdef __STDC__
--# include <limits.h>
--#else
--# include <assert.h>
--#endif
--
--#undef bind_textdomain_codeset
--
--/* Override any GCC internal prototype to avoid an error.
--   Use char because int might match the return type of a GCC
--   builtin and then its argument prototype would still apply.  */
--#ifdef __cplusplus
--extern "C"
--#endif
--char bind_textdomain_codeset ();
--/* The GNU C library defines this for functions which it implements
--    to always fail with ENOSYS.  Some functions are actually named
--    something starting with __ and the normal name is an alias.  */
--#if defined __stub_bind_textdomain_codeset || defined __stub___bind_textdomain_codeset
--choke me
--#endif
 -
 -int
 -main ()
 -{
--return bind_textdomain_codeset ();
+-extern int _nl_msg_cat_cntr;
+-			 return _nl_msg_cat_cntr
 -  ;
 -  return 0;
 -}
@@ -12647,7 +13192,96 @@
 -	 test "$cross_compiling" = yes ||
 -	 $as_test_x conftest$ac_exeext
 -       }; then
+-  CATOBJEXT=.gmo
+-             DATADIRNAME=share
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	case $host in
+-	    *-*-solaris*)
+-	    	                	    	                { $as_echo "$as_me:$LINENO: checking for bind_textdomain_codeset" >&5
+-$as_echo_n "checking for bind_textdomain_codeset... " >&6; }
+-if test "${ac_cv_func_bind_textdomain_codeset+set}" = set; then
+-  $as_echo_n "(cached) " >&6
+-else
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-/* Define bind_textdomain_codeset to an innocuous variant, in case <limits.h> declares bind_textdomain_codeset.
+-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+-#define bind_textdomain_codeset innocuous_bind_textdomain_codeset
+-
+-/* System header to define __stub macros and hopefully few prototypes,
+-    which can conflict with char bind_textdomain_codeset (); below.
+-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+-    <limits.h> exists even on freestanding compilers.  */
+-
+-#ifdef __STDC__
+-# include <limits.h>
+-#else
+-# include <assert.h>
+-#endif
+-
+-#undef bind_textdomain_codeset
+-
+-/* Override any GCC internal prototype to avoid an error.
+-   Use char because int might match the return type of a GCC
+-   builtin and then its argument prototype would still apply.  */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-char bind_textdomain_codeset ();
+-/* The GNU C library defines this for functions which it implements
+-    to always fail with ENOSYS.  Some functions are actually named
+-    something starting with __ and the normal name is an alias.  */
+-#if defined __stub_bind_textdomain_codeset || defined __stub___bind_textdomain_codeset
+-choke me
+-#endif
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
++fi
++
++	  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
+ 
+ int
+ main ()
+ {
+-return bind_textdomain_codeset ();
++extern int _nl_msg_cat_cntr;
++			 return _nl_msg_cat_cntr
+   ;
+   return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_link") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
 -  ac_cv_func_bind_textdomain_codeset=yes
++if ac_fn_c_try_link "$LINENO"; then :
++  CATOBJEXT=.gmo
 +             DATADIRNAME=share
  else
 -  $as_echo "$as_me: failed program was:" >&5
@@ -12670,7 +13304,7 @@
    CATOBJEXT=.gmo
                 DATADIRNAME=share
  else
-@@ -17702,10 +14979,8 @@
+@@ -18769,10 +15634,8 @@
  	    ;;
  	    esac
  fi
@@ -12683,7 +13317,7 @@
            LIBS="$glib_save_LIBS"
  	  INSTOBJEXT=.mo
  	else
-@@ -17719,9 +14994,7 @@
+@@ -18786,9 +15649,7 @@
  
      if test "$gt_cv_have_gettext" = "yes" ; then
  
@@ -12694,7 +13328,7 @@
  
      fi
  
-@@ -17729,7 +15002,7 @@
+@@ -18796,7 +15657,7 @@
                    if $XGETTEXT --omit-header /dev/null 2> /dev/null; then
          : ;
        else
@@ -12703,7 +13337,7 @@
  $as_echo "found xgettext program is not GNU xgettext; ignore it" >&6; }
          XGETTEXT=":"
        fi
-@@ -17762,7 +15035,7 @@
+@@ -18829,7 +15690,7 @@
       if test "x$ALL_LINGUAS" = "x"; then
         LINGUAS=
       else
@@ -12712,7 +13346,7 @@
  $as_echo_n "checking for catalogs to be installed... " >&6; }
         NEW_LINGUAS=
         for presentlang in $ALL_LINGUAS; do
-@@ -17787,7 +15060,7 @@
+@@ -18854,7 +15715,7 @@
           fi
         done
         LINGUAS=$NEW_LINGUAS
@@ -12721,7 +13355,7 @@
  $as_echo "$LINGUAS" >&6; }
       fi
  
-@@ -17835,7 +15108,7 @@
+@@ -18902,7 +15763,7 @@
  
  
  # Check whether --with-distributor-name was given.
@@ -12730,7 +13364,7 @@
    withval=$with_distributor_name; LSB_DISTRIBUTOR="$withval"
  fi
  
-@@ -17845,9 +15118,9 @@
+@@ -18912,9 +15773,9 @@
  do
    # Extract the first word of "$ac_prog", so it can be a program name with args.
  set dummy $ac_prog; ac_word=$2
@@ -12742,7 +13376,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$LSB_RELEASE"; then
-@@ -17858,24 +15131,24 @@
+@@ -18925,24 +15786,24 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -12772,7 +13406,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -17906,11 +15179,11 @@
+@@ -18973,11 +15834,11 @@
  gdu_cv_version_required=0.3.2
  
  if test -n "$PKG_CONFIG" && \
@@ -12787,7 +13421,7 @@
    gdu_cv_have_gdu=yes
  else
    gdu_cv_have_gdu=no
-@@ -17919,15 +15192,13 @@
+@@ -18986,15 +15847,13 @@
  if test "$gdu_cv_have_gdu" = "yes"; then
  	:
  else
@@ -12805,7 +13439,7 @@
    withval=$with_help_dir;
  else
    with_help_dir='${datadir}/gnome/help'
-@@ -17938,7 +15209,7 @@
+@@ -19005,7 +15864,7 @@
  
  
  # Check whether --with-omf-dir was given.
@@ -12814,7 +13448,7 @@
    withval=$with_omf_dir;
  else
    with_omf_dir='${datadir}/omf'
-@@ -17949,7 +15220,7 @@
+@@ -19016,7 +15875,7 @@
  
  
  # Check whether --with-help-formats was given.
@@ -12823,7 +13457,7 @@
    withval=$with_help_formats;
  else
    with_help_formats=''
-@@ -17959,7 +15230,7 @@
+@@ -19026,7 +15885,7 @@
  
  
  # Check whether --enable-scrollkeeper was given.
@@ -12832,7 +13466,7 @@
    enableval=$enable_scrollkeeper;
  else
    enable_scrollkeeper=yes
-@@ -17991,9 +15262,9 @@
+@@ -19058,9 +15917,9 @@
  
      # Extract the first word of "gtkdoc-check", so it can be a program name with args.
  set dummy gtkdoc-check; ac_word=$2
@@ -12844,7 +13478,7 @@
    $as_echo_n "(cached) " >&6
  else
    case $GTKDOC_CHECK in
-@@ -18006,14 +15277,14 @@
+@@ -19073,14 +15932,14 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -12862,7 +13496,7 @@
  IFS=$as_save_IFS
  
    ;;
-@@ -18021,10 +15292,10 @@
+@@ -19088,10 +15947,10 @@
  fi
  GTKDOC_CHECK=$ac_cv_path_GTKDOC_CHECK
  if test -n "$GTKDOC_CHECK"; then
@@ -12875,7 +13509,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -18033,9 +15304,9 @@
+@@ -19100,9 +15959,9 @@
  do
    # Extract the first word of "$ac_prog", so it can be a program name with args.
  set dummy $ac_prog; ac_word=$2
@@ -12887,7 +13521,7 @@
    $as_echo_n "(cached) " >&6
  else
    case $GTKDOC_REBASE in
-@@ -18048,14 +15319,14 @@
+@@ -19115,14 +15974,14 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -12905,7 +13539,7 @@
  IFS=$as_save_IFS
  
    ;;
-@@ -18063,10 +15334,10 @@
+@@ -19130,10 +15989,10 @@
  fi
  GTKDOC_REBASE=$ac_cv_path_GTKDOC_REBASE
  if test -n "$GTKDOC_REBASE"; then
@@ -12918,7 +13552,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -18077,9 +15348,9 @@
+@@ -19144,9 +16003,9 @@
  
    # Extract the first word of "gtkdoc-mkpdf", so it can be a program name with args.
  set dummy gtkdoc-mkpdf; ac_word=$2
@@ -12930,7 +13564,7 @@
    $as_echo_n "(cached) " >&6
  else
    case $GTKDOC_MKPDF in
-@@ -18092,14 +15363,14 @@
+@@ -19159,14 +16018,14 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -12948,7 +13582,7 @@
  IFS=$as_save_IFS
  
    ;;
-@@ -18107,10 +15378,10 @@
+@@ -19174,10 +16033,10 @@
  fi
  GTKDOC_MKPDF=$ac_cv_path_GTKDOC_MKPDF
  if test -n "$GTKDOC_MKPDF"; then
@@ -12961,7 +13595,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -18118,7 +15389,7 @@
+@@ -19185,7 +16044,7 @@
  
  
  # Check whether --with-html-dir was given.
@@ -12970,7 +13604,7 @@
    withval=$with_html_dir;
  else
    with_html_dir='${datadir}/gtk-doc/html'
-@@ -18128,7 +15399,7 @@
+@@ -19195,7 +16054,7 @@
  
  
      # Check whether --enable-gtk-doc was given.
@@ -12979,7 +13613,7 @@
    enableval=$enable_gtk_doc;
  else
    enable_gtk_doc=no
-@@ -18137,33 +15408,31 @@
+@@ -19204,33 +16063,31 @@
  
    if test x$enable_gtk_doc = xyes; then
      if test -n "$PKG_CONFIG" && \
@@ -13021,7 +13655,7 @@
    enableval=$enable_gtk_doc_pdf;
  else
    enable_gtk_doc_pdf=no
-@@ -18234,9 +15503,9 @@
+@@ -19301,9 +16158,9 @@
  
  # Extract the first word of "gtk-builder-convert", so it can be a program name with args.
  set dummy gtk-builder-convert; ac_word=$2
@@ -13033,7 +13667,7 @@
    $as_echo_n "(cached) " >&6
  else
    case $GTK_BUILDER_CONVERT in
-@@ -18249,14 +15518,14 @@
+@@ -19316,14 +16173,14 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -13051,7 +13685,7 @@
  IFS=$as_save_IFS
  
    test -z "$ac_cv_path_GTK_BUILDER_CONVERT" && ac_cv_path_GTK_BUILDER_CONVERT="false"
-@@ -18265,18 +15534,16 @@
+@@ -19332,18 +16189,16 @@
  fi
  GTK_BUILDER_CONVERT=$ac_cv_path_GTK_BUILDER_CONVERT
  if test -n "$GTK_BUILDER_CONVERT"; then
@@ -13073,7 +13707,7 @@
  fi
  
  # ************
-@@ -18284,9 +15551,7 @@
+@@ -19351,9 +16206,7 @@
  # ************
  
  
@@ -13084,7 +13718,7 @@
  
  
  ac_config_files="$ac_config_files Makefile data/Makefile data/epiphany-${EPIPHANY_API_VERSION}.pc:data/epiphany.pc.in data/epiphany.desktop.in data/bme.desktop.in data/glade/Makefile data/icons/Makefile data/art/Makefile data/ui/Makefile doc/Makefile doc/reference/Makefile lib/Makefile lib/egg/Makefile lib/widgets/Makefile embed/Makefile src/Makefile src/bookmarks/Makefile src/epiphany.h help/Makefile po/Makefile.in tests/Makefile"
-@@ -18319,13 +15584,13 @@
+@@ -19386,13 +16239,13 @@
      case $ac_val in #(
      *${as_nl}*)
        case $ac_var in #(
@@ -13100,7 +13734,7 @@
        esac ;;
      esac
    done
-@@ -18333,8 +15598,8 @@
+@@ -19400,8 +16253,8 @@
    (set) 2>&1 |
      case $as_nl`(ac_space=' '; set) 2>&1` in #(
      *${as_nl}ac_space=\ *)
@@ -13111,7 +13745,7 @@
        sed -n \
  	"s/'/'\\\\''/g;
  	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
-@@ -18357,11 +15622,11 @@
+@@ -19424,11 +16277,11 @@
  if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
    if test -w "$cache_file"; then
      test "x$cache_file" != "x/dev/null" &&
@@ -13125,7 +13759,7 @@
  $as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
    fi
  fi
-@@ -18381,167 +15646,103 @@
+@@ -19448,8 +16301,8 @@
    ac_i=`$as_echo "$ac_i" | sed "$ac_script"`
    # 2. Prepend LIBOBJDIR.  When used with automake>=1.10 LIBOBJDIR
    #    will be set to the directory where LIBOBJS objects are built.
@@ -13136,17 +13770,9 @@
  done
  LIBOBJS=$ac_libobjs
  
- LTLIBOBJS=$ac_ltlibobjs
- 
- 
-- if test -n "$EXEEXT"; then
--  am__EXEEXT_TRUE=
--  am__EXEEXT_FALSE='#'
--else
--  am__EXEEXT_TRUE='#'
--  am__EXEEXT_FALSE=
--fi
--
+@@ -19465,150 +16318,94 @@
+ fi
+ 
  if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then
 -  { { $as_echo "$as_me:$LINENO: error: conditional \"MAINTAINER_MODE\" was never defined.
 -Usually this means the macro was only invoked conditionally." >&5
@@ -13336,7 +13962,7 @@
  #! $SHELL
  # Generated by $as_me.
  # Run this file to recreate the current configuration.
-@@ -18551,17 +15752,18 @@
+@@ -19618,17 +16415,18 @@
  debug=false
  ac_cs_recheck=false
  ac_cs_silent=false
@@ -13362,7 +13988,7 @@
    emulate sh
    NULLCMD=:
    # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
-@@ -18569,23 +15771,15 @@
+@@ -19636,23 +16434,15 @@
    alias -g '${1+"$@"}'='"$@"'
    setopt NO_GLOB_SUBST
  else
@@ -13391,7 +14017,7 @@
  as_nl='
  '
  export as_nl
-@@ -18593,7 +15787,13 @@
+@@ -19660,7 +16450,13 @@
  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
@@ -13406,7 +14032,7 @@
    as_echo='printf %s\n'
    as_echo_n='printf %s'
  else
-@@ -18604,7 +15804,7 @@
+@@ -19671,7 +16467,7 @@
      as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
      as_echo_n_body='eval
        arg=$1;
@@ -13415,7 +14041,7 @@
        *"$as_nl"*)
  	expr "X$arg" : "X\\(.*\\)$as_nl";
  	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
-@@ -18627,13 +15827,6 @@
+@@ -19694,13 +16490,6 @@
    }
  fi
  
@@ -13429,7 +14055,7 @@
  
  # IFS
  # We need space, tab and new line, in precisely that order.  Quoting is
-@@ -18643,15 +15836,15 @@
+@@ -19710,15 +16499,15 @@
  IFS=" ""	$as_nl"
  
  # Find who we are.  Look in the path if we contain no directory separator.
@@ -13448,7 +14074,7 @@
  IFS=$as_save_IFS
  
       ;;
-@@ -18663,12 +15856,16 @@
+@@ -19730,12 +16519,16 @@
  fi
  if test ! -f "$as_myself"; then
    $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
@@ -13469,7 +14095,7 @@
  done
  PS1='$ '
  PS2='> '
-@@ -18680,7 +15877,89 @@
+@@ -19747,7 +16540,89 @@
  LANGUAGE=C
  export LANGUAGE
  
@@ -13560,7 +14186,7 @@
  if expr a : '\(a\)' >/dev/null 2>&1 &&
     test "X`expr 00001 : '.*\(...\)'`" = X001; then
    as_expr=expr
-@@ -18694,8 +15973,12 @@
+@@ -19761,8 +16636,12 @@
    as_basename=false
  fi
  
@@ -13574,7 +14200,7 @@
  as_me=`$as_basename -- "$0" ||
  $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
  	 X"$0" : 'X\(//\)$' \| \
-@@ -18715,76 +15998,25 @@
+@@ -19782,76 +16661,25 @@
  	  }
  	  s/.*/./; q'`
  
@@ -13662,7 +14288,7 @@
  
  rm -f conf$$ conf$$.exe conf$$.file
  if test -d conf$$.dir; then
-@@ -18813,8 +16045,56 @@
+@@ -19880,8 +16708,56 @@
  rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
  rmdir conf$$.dir 2>/dev/null
  
@@ -13720,7 +14346,7 @@
  else
    test -d ./-p && rmdir ./-p
    as_mkdir_p=false
-@@ -18833,10 +16113,10 @@
+@@ -19900,10 +16776,10 @@
        if test -d "$1"; then
  	test -d "$1/.";
        else
@@ -13733,7 +14359,7 @@
  	???[sx]*):;;*)false;;esac;fi
      '\'' sh
    '
-@@ -18851,13 +16131,19 @@
+@@ -19918,13 +16794,19 @@
  
  
  exec 6>&1
@@ -13749,13 +14375,13 @@
  # report actual input values of CONFIG_FILES etc. instead of their
  # values after options handling.
  ac_log="
- This file was extended by GNOME Web Browser $as_me 2.27.5, which was
+ This file was extended by GNOME Web Browser $as_me 2.27.91, which was
 -generated by GNU Autoconf 2.63.  Invocation command line was
 +generated by GNU Autoconf 2.64.  Invocation command line was
  
    CONFIG_FILES    = $CONFIG_FILES
    CONFIG_HEADERS  = $CONFIG_HEADERS
-@@ -18889,10 +16175,11 @@
+@@ -19956,10 +16838,11 @@
  
  cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
  ac_cs_usage="\
@@ -13770,7 +14396,7 @@
  
    -h, --help       print this help, then exit
    -V, --version    print version number and configuration settings, then exit
-@@ -18914,16 +16201,16 @@
+@@ -19981,16 +16864,16 @@
  Configuration commands:
  $config_commands
  
@@ -13780,7 +14406,7 @@
  _ACEOF
  cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
  ac_cs_version="\\
- GNOME Web Browser config.status 2.27.5
+ GNOME Web Browser config.status 2.27.91
 -configured by $0, generated by GNU Autoconf 2.63,
 +configured by $0, generated by GNU Autoconf 2.64,
    with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
@@ -13790,7 +14416,7 @@
  This config.status script is free software; the Free Software Foundation
  gives unlimited permission to copy, distribute and modify it."
  
-@@ -18966,20 +16253,19 @@
+@@ -20033,20 +16916,19 @@
      case $ac_optarg in
      *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
      esac
@@ -13815,7 +14441,7 @@
    --help | --hel | -h )
      $as_echo "$ac_cs_usage"; exit ;;
    -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-@@ -18987,11 +16273,10 @@
+@@ -20054,11 +16936,10 @@
      ac_cs_silent=: ;;
  
    # This is an error.
@@ -13830,7 +14456,7 @@
       ac_need_defaults=false ;;
  
    esac
-@@ -19326,9 +16611,7 @@
+@@ -20393,9 +17274,7 @@
      "tests/Makefile") CONFIG_FILES="$CONFIG_FILES tests/Makefile" ;;
      "po/stamp-it") CONFIG_COMMANDS="$CONFIG_COMMANDS po/stamp-it" ;;
  
@@ -13841,7 +14467,7 @@
    esac
  done
  
-@@ -19355,7 +16638,7 @@
+@@ -20422,7 +17301,7 @@
    trap 'exit_status=$?
    { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
  ' 0
@@ -13850,7 +14476,7 @@
  }
  # Create a (secure) tmp directory for tmp files.
  
-@@ -19366,11 +16649,7 @@
+@@ -20433,11 +17312,7 @@
  {
    tmp=./conf$$-$RANDOM
    (umask 077 && mkdir "$tmp")
@@ -13863,7 +14489,7 @@
  
  # Set up the scripts for CONFIG_FILES section.
  # No need to generate them if there are no CONFIG_FILES.
-@@ -19378,10 +16657,16 @@
+@@ -20445,10 +17320,16 @@
  if test -n "$CONFIG_FILES"; then
  
  
@@ -13882,7 +14508,7 @@
  else
    ac_cs_awk_cr=$ac_cr
  fi
-@@ -19395,24 +16680,18 @@
+@@ -20462,24 +17343,18 @@
    echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
    echo "_ACEOF"
  } >conf$$subs.sh ||
@@ -13910,7 +14536,7 @@
    else
      ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
    fi
-@@ -19501,9 +16780,7 @@
+@@ -20568,9 +17443,7 @@
  else
    cat
  fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
@@ -13921,7 +14547,7 @@
  _ACEOF
  
  # VPATH may cause trouble with some makes, so we remove $(srcdir),
-@@ -19544,9 +16821,7 @@
+@@ -20611,9 +17484,7 @@
    if test -z "$ac_t"; then
      break
    elif $ac_last_try; then
@@ -13932,7 +14558,7 @@
    else
      ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
    fi
-@@ -19631,9 +16906,7 @@
+@@ -20698,9 +17569,7 @@
  _ACAWK
  _ACEOF
  cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
@@ -13943,7 +14569,7 @@
  fi # test -n "$CONFIG_HEADERS"
  
  
-@@ -19646,9 +16919,7 @@
+@@ -20713,9 +17582,7 @@
    esac
    case $ac_mode$ac_tag in
    :[FHL]*:*);;
@@ -13954,7 +14580,7 @@
    :[FH]-) ac_tag=-:-;;
    :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
    esac
-@@ -19676,12 +16947,10 @@
+@@ -20743,12 +17610,10 @@
  	   [\\/$]*) false;;
  	   *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
  	   esac ||
@@ -13969,7 +14595,7 @@
      done
  
      # Let's still pretend it is `configure' which instantiates (i.e., don't
-@@ -19692,7 +16961,7 @@
+@@ -20759,7 +17624,7 @@
  	`' by configure.'
      if test x"$ac_file" != x-; then
        configure_input="$ac_file.  $configure_input"
@@ -13978,7 +14604,7 @@
  $as_echo "$as_me: creating $ac_file" >&6;}
      fi
      # Neutralize special characters interpreted by sed in replacement strings.
-@@ -19705,9 +16974,7 @@
+@@ -20772,9 +17637,7 @@
  
      case $ac_tag in
      *:-:* | *:-) cat >"$tmp/stdin" \
@@ -13989,7 +14615,7 @@
      esac
      ;;
    esac
-@@ -19735,47 +17002,7 @@
+@@ -20802,47 +17665,7 @@
  	    q
  	  }
  	  s/.*/./; q'`
@@ -14038,7 +14664,7 @@
    ac_builddir=.
  
  case "$ac_dir" in
-@@ -19832,7 +17059,6 @@
+@@ -20899,7 +17722,6 @@
  # 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=
@@ -14046,7 +14672,7 @@
  ac_sed_dataroot='
  /datarootdir/ {
    p
-@@ -19842,12 +17068,11 @@
+@@ -20909,12 +17731,11 @@
  /@docdir@/p
  /@infodir@/p
  /@localedir@/p
@@ -14061,7 +14687,7 @@
  $as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
  _ACEOF
  cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-@@ -19857,7 +17082,7 @@
+@@ -20924,7 +17745,7 @@
    s&@infodir@&$infodir&g
    s&@localedir@&$localedir&g
    s&@mandir@&$mandir&g
@@ -14070,7 +14696,7 @@
  esac
  _ACEOF
  
-@@ -19886,14 +17111,12 @@
+@@ -20953,14 +17774,12 @@
  $ac_datarootdir_hack
  "
  eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
@@ -14087,7 +14713,7 @@
  which seems to be undefined.  Please make sure it is defined." >&5
  $as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
  which seems to be undefined.  Please make sure it is defined." >&2;}
-@@ -19903,9 +17126,7 @@
+@@ -20970,9 +17789,7 @@
    -) cat "$tmp/out" && rm -f "$tmp/out";;
    *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
    esac \
@@ -14098,7 +14724,7 @@
   ;;
    :H)
    #
-@@ -19916,25 +17137,19 @@
+@@ -20983,25 +17800,19 @@
        $as_echo "/* $configure_input  */" \
        && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
      } >"$tmp/config.h" \
@@ -14128,7 +14754,7 @@
    fi
  # Compute "$ac_file"'s index in $config_headers.
  _am_arg="$ac_file"
-@@ -19972,35 +17187,34 @@
+@@ -21039,7 +17850,7 @@
  	  s/.*/./; q'`/stamp-h$_am_stamp_count
   ;;
  
@@ -14137,107 +14763,7 @@
  $as_echo "$as_me: executing $ac_file commands" >&6;}
   ;;
    esac
- 
- 
-   case $ac_file$ac_mode in
--    "depfiles":C) test x"$AMDEP_TRUE" != x"" || {
--  # Autoconf 2.62 quotes --file arguments for eval, but not when files
--  # are listed without --file.  Let's play safe and only enable the eval
--  # if we detect the quoting.
--  case $CONFIG_FILES in
--  *\'*) eval set x "$CONFIG_FILES" ;;
--  *)   set x $CONFIG_FILES ;;
--  esac
--  shift
--  for mf
--  do
--    # Strip MF so we end up with the name of the file.
--    mf=`echo "$mf" | sed -e 's/:.*$//'`
--    # Check whether this is an Automake generated Makefile or not.
--    # We used to match only the files named `Makefile.in', but
--    # some people rename them; so instead we look at the file content.
--    # Grep'ing the first line is not enough: some people post-process
--    # each Makefile.in and add a new line on top of each file to say so.
--    # Grep'ing the whole file is not good either: AIX grep has a line
--    # limit of 2048, but all sed's we know have understand at least 4000.
--    if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
--      dirpart=`$as_dirname -- "$mf" ||
-+    "depfiles":C) test x"$AMDEP_TRUE" != x"" || # Autoconf 2.62 quotes --file arguments for eval, but not when files
-+# are listed without --file.  Let's play safe and only enable the eval
-+# if we detect the quoting.
-+case $CONFIG_FILES in
-+*\'*) eval set x "$CONFIG_FILES" ;;
-+*)   set x $CONFIG_FILES ;;
-+esac
-+shift
-+for mf
-+do
-+  # Strip MF so we end up with the name of the file.
-+  mf=`echo "$mf" | sed -e 's/:.*$//'`
-+  # Check whether this is an Automake generated Makefile or not.
-+  # We used to match only the files named `Makefile.in', but
-+  # some people rename them; so instead we look at the file content.
-+  # Grep'ing the first line is not enough: some people post-process
-+  # each Makefile.in and add a new line on top of each file to say so.
-+  # Grep'ing the whole file is not good either: AIX grep has a line
-+  # limit of 2048, but all sed's we know have understand at least 4000.
-+  if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
-+    dirpart=`$as_dirname -- "$mf" ||
- $as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
- 	 X"$mf" : 'X\(//\)[^/]' \| \
- 	 X"$mf" : 'X\(//\)$' \| \
-@@ -20023,28 +17237,28 @@
- 	    q
- 	  }
- 	  s/.*/./; q'`
--    else
--      continue
--    fi
--    # Extract the definition of DEPDIR, am__include, and am__quote
--    # from the Makefile without running `make'.
--    DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
--    test -z "$DEPDIR" && continue
--    am__include=`sed -n 's/^am__include = //p' < "$mf"`
--    test -z "am__include" && continue
--    am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
--    # When using ansi2knr, U may be empty or an underscore; expand it
--    U=`sed -n 's/^U = //p' < "$mf"`
--    # Find all dependency output files, they are included files with
--    # $(DEPDIR) in their names.  We invoke sed twice because it is the
--    # simplest approach to changing $(DEPDIR) to its actual value in the
--    # expansion.
--    for file in `sed -n "
--      s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
--	 sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
--      # Make sure the directory exists.
--      test -f "$dirpart/$file" && continue
--      fdir=`$as_dirname -- "$file" ||
-+  else
-+    continue
-+  fi
-+  # Extract the definition of DEPDIR, am__include, and am__quote
-+  # from the Makefile without running `make'.
-+  DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
-+  test -z "$DEPDIR" && continue
-+  am__include=`sed -n 's/^am__include = //p' < "$mf"`
-+  test -z "am__include" && continue
-+  am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
-+  # When using ansi2knr, U may be empty or an underscore; expand it
-+  U=`sed -n 's/^U = //p' < "$mf"`
-+  # Find all dependency output files, they are included files with
-+  # $(DEPDIR) in their names.  We invoke sed twice because it is the
-+  # simplest approach to changing $(DEPDIR) to its actual value in the
-+  # expansion.
-+  for file in `sed -n "
-+    s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
-+       sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
-+    # Make sure the directory exists.
-+    test -f "$dirpart/$file" && continue
-+    fdir=`$as_dirname -- "$file" ||
- $as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
- 	 X"$file" : 'X\(//\)[^/]' \| \
- 	 X"$file" : 'X\(//\)$' \| \
-@@ -20067,52 +17281,11 @@
+@@ -21134,47 +17945,7 @@
  	    q
  	  }
  	  s/.*/./; q'`
@@ -14282,19 +14808,11 @@
 -  } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
 -$as_echo "$as_me: error: cannot create directory $as_dir" >&2;}
 -   { (exit 1); exit 1; }; }; }
--      # echo "creating $dirpart/$file"
--      echo '# dummy' > "$dirpart/$file"
--    done
-+    as_dir=$dirpart/$fdir; as_fn_mkdir_p
-+    # echo "creating $dirpart/$file"
-+    echo '# dummy' > "$dirpart/$file"
-   done
--}
-+done
-  ;;
-     "libtool":C)
- 
-@@ -20754,9 +17927,7 @@
++      as_dir=$dirpart/$fdir; as_fn_mkdir_p
+       # echo "creating $dirpart/$file"
+       echo '# dummy' > "$dirpart/$file"
+     done
+@@ -21821,9 +18592,7 @@
        esac ;;
      "po/stamp-it":C)
      if  ! grep "^# INTLTOOL_MAKEFILE$" "po/Makefile.in" ; then
@@ -14305,7 +14823,7 @@
      fi
      rm -f "po/stamp-it" "po/stamp-it.tmp" "po/POTFILES" "po/Makefile.tmp"
      >"po/stamp-it.tmp"
-@@ -20779,15 +17950,12 @@
+@@ -21846,15 +18615,12 @@
  done # for ac_tag
  
  
@@ -14323,7 +14841,7 @@
  
  
  # configure is writing to config.log, and then calls config.status.
-@@ -20808,10 +17976,10 @@
+@@ -21875,10 +18641,10 @@
    exec 5>>config.log
    # Use ||, not &&, to avoid exiting from the if with $? = 1, which
    # would make configure fail if this is the last instruction.
@@ -14336,152 +14854,11 @@
  $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
  fi
  
-Index: epiphany-webkit-2.27.5/lib/Makefile.in
+Index: epiphany-webkit-2.27.91/lib/Makefile.in
 ===================================================================
---- epiphany-webkit-2.27.5.orig/lib/Makefile.in	2009-07-22 10:32:33.000000000 +0200
-+++ epiphany-webkit-2.27.5/lib/Makefile.in	2009-07-30 17:40:12.066291532 +0200
-@@ -1,9 +1,8 @@
--# Makefile.in generated by automake 1.11 from Makefile.am.
-+# Makefile.in generated by automake 1.10.2 from Makefile.am.
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
--# Inc.
-+# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -18,9 +17,8 @@
- 
- VPATH = @srcdir@
- pkgdatadir = $(datadir)/@PACKAGE@
--pkgincludedir = $(includedir)/@PACKAGE@
- pkglibdir = $(libdir)/@PACKAGE@
--pkglibexecdir = $(libexecdir)/@PACKAGE@
-+pkgincludedir = $(includedir)/@PACKAGE@
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
- install_sh_DATA = $(install_sh) -c -m 644
- install_sh_PROGRAM = $(install_sh) -c
-@@ -59,7 +57,6 @@
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = $(top_builddir)/config.h
- CONFIG_CLEAN_FILES =
--CONFIG_CLEAN_VPATH_FILES =
- LTLIBRARIES = $(noinst_LTLIBRARIES)
- am__DEPENDENCIES_1 =
- libephymisc_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
-@@ -104,35 +101,18 @@
- nodist_libephymisc_la_OBJECTS = $(am__objects_3)
- libephymisc_la_OBJECTS = $(am_libephymisc_la_OBJECTS) \
- 	$(nodist_libephymisc_la_OBJECTS)
--AM_V_lt = $(am__v_lt_$(V))
--am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
--am__v_lt_0 = --silent
--libephymisc_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
--	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
--	$(libephymisc_la_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o \
--	$@
-+libephymisc_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
-+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(libephymisc_la_CFLAGS) \
-+	$(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
- depcomp = $(SHELL) $(top_srcdir)/depcomp
- am__depfiles_maybe = depfiles
--am__mv = mv -f
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
--AM_V_CC = $(am__v_CC_$(V))
--am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY))
--am__v_CC_0 = @echo "  CC    " $@;
--AM_V_at = $(am__v_at_$(V))
--am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
--am__v_at_0 = @
- CCLD = $(CC)
--LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
--	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
--	$(AM_LDFLAGS) $(LDFLAGS) -o $@
--AM_V_CCLD = $(am__v_CCLD_$(V))
--am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY))
--am__v_CCLD_0 = @echo "  CCLD  " $@;
--AM_V_GEN = $(am__v_GEN_$(V))
--am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
--am__v_GEN_0 = @echo "  GEN   " $@;
-+LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-+	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-+	$(LDFLAGS) -o $@
- SOURCES = $(libephymisc_la_SOURCES) $(nodist_libephymisc_la_SOURCES)
- DIST_SOURCES = $(am__libephymisc_la_SOURCES_DIST)
- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-@@ -147,65 +127,22 @@
-     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-     *) f=$$p;; \
-   esac;
--am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
--am__install_max = 40
--am__nobase_strip_setup = \
--  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
--am__nobase_strip = \
--  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
--am__nobase_list = $(am__nobase_strip_setup); \
--  for p in $$list; do echo "$$p $$p"; done | \
--  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
--  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
--    if (++n[$$2] == $(am__install_max)) \
--      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
--    END { for (dir in files) print dir, files[dir] }'
--am__base_list = \
--  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
--  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
- am__installdirs = "$(DESTDIR)$(headerdir)"
-+headerDATA_INSTALL = $(INSTALL_DATA)
- DATA = $(header_DATA)
- RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
-   distclean-recursive maintainer-clean-recursive
--AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
--	$(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
--	distdir
- ETAGS = etags
- CTAGS = ctags
- DIST_SUBDIRS = $(SUBDIRS)
- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
--am__relativize = \
--  dir0=`pwd`; \
--  sed_first='s,^\([^/]*\)/.*$$,\1,'; \
--  sed_rest='s,^[^/]*/*,,'; \
--  sed_last='s,^.*/\([^/]*\)$$,\1,'; \
--  sed_butlast='s,/*[^/]*$$,,'; \
--  while test -n "$$dir1"; do \
--    first=`echo "$$dir1" | sed -e "$$sed_first"`; \
--    if test "$$first" != "."; then \
--      if test "$$first" = ".."; then \
--        dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
--        dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
--      else \
--        first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
--        if test "$$first2" = "$$first"; then \
--          dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
--        else \
--          dir2="../$$dir2"; \
--        fi; \
--        dir0="$$dir0"/"$$first"; \
--      fi; \
--    fi; \
--    dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
--  done; \
--  reldir="$$dir2"
- ACLOCAL = @ACLOCAL@
- ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
- ALL_LINGUAS = @ALL_LINGUAS@
- AMTAR = @AMTAR@
- AM_CFLAGS = @AM_CFLAGS@
- AM_CPPFLAGS = @AM_CPPFLAGS@
--AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
- AM_LDFLAGS = @AM_LDFLAGS@
- AR = @AR@
- AUTOCONF = @AUTOCONF@
-@@ -334,6 +271,7 @@
+--- epiphany-webkit-2.27.91.orig/lib/Makefile.in	2009-08-24 14:11:59.000000000 -0300
++++ epiphany-webkit-2.27.91/lib/Makefile.in	2009-08-25 11:47:15.346851681 -0300
+@@ -334,6 +334,7 @@
  PACKAGE_NAME = @PACKAGE_NAME@
  PACKAGE_STRING = @PACKAGE_STRING@
  PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -14489,7 +14866,7 @@
  PACKAGE_VERSION = @PACKAGE_VERSION@
  PATH_SEPARATOR = @PATH_SEPARATOR@
  PKG_CONFIG = @PKG_CONFIG@
-@@ -465,7 +403,7 @@
+@@ -465,7 +466,7 @@
  	-I$(top_srcdir)/lib/egg			\
  	-DDATADIR="\"$(datadir)\""		\
  	-DSHARE_DIR=\"$(pkgdatadir)\" 		\
@@ -14498,594 +14875,10 @@
  	$(AM_CPPFLAGS)
  
  libephymisc_la_CFLAGS = $(DEPENDENCIES_CFLAGS) $(AM_CFLAGS) \
-@@ -503,9 +441,9 @@
- 	      exit 1;; \
- 	  esac; \
- 	done; \
--	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign lib/Makefile'; \
--	$(am__cd) $(top_srcdir) && \
--	  $(AUTOMAKE) --foreign lib/Makefile
-+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  lib/Makefile'; \
-+	cd $(top_srcdir) && \
-+	  $(AUTOMAKE) --foreign  lib/Makefile
- .PRECIOUS: Makefile
- Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- 	@case '$?' in \
-@@ -523,7 +461,6 @@
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
--$(am__aclocal_m4_deps):
- 
- clean-noinstLTLIBRARIES:
- 	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
-@@ -534,7 +471,7 @@
- 	  rm -f "$${dir}/so_locations"; \
- 	done
- libephymisc.la: $(libephymisc_la_OBJECTS) $(libephymisc_la_DEPENDENCIES) 
--	$(AM_V_CCLD)$(libephymisc_la_LINK)  $(libephymisc_la_OBJECTS) $(libephymisc_la_LIBADD) $(LIBS)
-+	$(libephymisc_la_LINK)  $(libephymisc_la_OBJECTS) $(libephymisc_la_LIBADD) $(LIBS)
- 
- mostlyclean-compile:
- 	-rm -f *.$(OBJEXT)
-@@ -569,228 +506,200 @@
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libephymisc_la-ephy-zoom.Plo at am__quote@
- 
- .c.o:
-- at am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-- at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-- at am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-+ at am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-+ at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@	$(COMPILE) -c $<
- 
- .c.obj:
-- at am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-- at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-- at am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-+ at am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-+ at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
- 
- .c.lo:
-- at am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-- at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-- at am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-+ at am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-+ at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
- 
- libephymisc_la-eel-gconf-extensions.lo: eel-gconf-extensions.c
-- at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephymisc_la_CPPFLAGS) $(CPPFLAGS) $(libephymisc_la_CFLAGS) $(CFLAGS) -MT libephymisc_la-eel-gconf-extensions.lo -MD -MP -MF $(DEPDIR)/libephymisc_la-eel-gconf-extensions.Tpo -c -o libephymisc_la-eel-gconf-extensions.lo `test -f 'eel-gconf-extensions.c' || echo '$(srcdir)/'`eel-gconf-extensions.c
-- at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libephymisc_la-eel-gconf-extensions.Tpo $(DEPDIR)/libephymisc_la-eel-gconf-extensions.Plo
-- at am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-+ at am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephymisc_la_CPPFLAGS) $(CPPFLAGS) $(libephymisc_la_CFLAGS) $(CFLAGS) -MT libephymisc_la-eel-gconf-extensions.lo -MD -MP -MF $(DEPDIR)/libephymisc_la-eel-gconf-extensions.Tpo -c -o libephymisc_la-eel-gconf-extensions.lo `test -f 'eel-gconf-extensions.c' || echo '$(srcdir)/'`eel-gconf-extensions.c
-+ at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libephymisc_la-eel-gconf-extensions.Tpo $(DEPDIR)/libephymisc_la-eel-gconf-extensions.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='eel-gconf-extensions.c' object='libephymisc_la-eel-gconf-extensions.lo' libtool=yes @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- at am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephymisc_la_CPPFLAGS) $(CPPFLAGS) $(libephymisc_la_CFLAGS) $(CFLAGS) -c -o libephymisc_la-eel-gconf-extensions.lo `test -f 'eel-gconf-extensions.c' || echo '$(srcdir)/'`eel-gconf-extensions.c
-+ at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephymisc_la_CPPFLAGS) $(CPPFLAGS) $(libephymisc_la_CFLAGS) $(CFLAGS) -c -o libephymisc_la-eel-gconf-extensions.lo `test -f 'eel-gconf-extensions.c' || echo '$(srcdir)/'`eel-gconf-extensions.c
- 
- libephymisc_la-ephy-debug.lo: ephy-debug.c
-- at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephymisc_la_CPPFLAGS) $(CPPFLAGS) $(libephymisc_la_CFLAGS) $(CFLAGS) -MT libephymisc_la-ephy-debug.lo -MD -MP -MF $(DEPDIR)/libephymisc_la-ephy-debug.Tpo -c -o libephymisc_la-ephy-debug.lo `test -f 'ephy-debug.c' || echo '$(srcdir)/'`ephy-debug.c
-- at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libephymisc_la-ephy-debug.Tpo $(DEPDIR)/libephymisc_la-ephy-debug.Plo
-- at am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-+ at am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephymisc_la_CPPFLAGS) $(CPPFLAGS) $(libephymisc_la_CFLAGS) $(CFLAGS) -MT libephymisc_la-ephy-debug.lo -MD -MP -MF $(DEPDIR)/libephymisc_la-ephy-debug.Tpo -c -o libephymisc_la-ephy-debug.lo `test -f 'ephy-debug.c' || echo '$(srcdir)/'`ephy-debug.c
-+ at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libephymisc_la-ephy-debug.Tpo $(DEPDIR)/libephymisc_la-ephy-debug.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ephy-debug.c' object='libephymisc_la-ephy-debug.lo' libtool=yes @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- at am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephymisc_la_CPPFLAGS) $(CPPFLAGS) $(libephymisc_la_CFLAGS) $(CFLAGS) -c -o libephymisc_la-ephy-debug.lo `test -f 'ephy-debug.c' || echo '$(srcdir)/'`ephy-debug.c
-+ at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephymisc_la_CPPFLAGS) $(CPPFLAGS) $(libephymisc_la_CFLAGS) $(CFLAGS) -c -o libephymisc_la-ephy-debug.lo `test -f 'ephy-debug.c' || echo '$(srcdir)/'`ephy-debug.c
- 
- libephymisc_la-ephy-dialog.lo: ephy-dialog.c
-- at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephymisc_la_CPPFLAGS) $(CPPFLAGS) $(libephymisc_la_CFLAGS) $(CFLAGS) -MT libephymisc_la-ephy-dialog.lo -MD -MP -MF $(DEPDIR)/libephymisc_la-ephy-dialog.Tpo -c -o libephymisc_la-ephy-dialog.lo `test -f 'ephy-dialog.c' || echo '$(srcdir)/'`ephy-dialog.c
-- at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libephymisc_la-ephy-dialog.Tpo $(DEPDIR)/libephymisc_la-ephy-dialog.Plo
-- at am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-+ at am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephymisc_la_CPPFLAGS) $(CPPFLAGS) $(libephymisc_la_CFLAGS) $(CFLAGS) -MT libephymisc_la-ephy-dialog.lo -MD -MP -MF $(DEPDIR)/libephymisc_la-ephy-dialog.Tpo -c -o libephymisc_la-ephy-dialog.lo `test -f 'ephy-dialog.c' || echo '$(srcdir)/'`ephy-dialog.c
-+ at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libephymisc_la-ephy-dialog.Tpo $(DEPDIR)/libephymisc_la-ephy-dialog.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ephy-dialog.c' object='libephymisc_la-ephy-dialog.lo' libtool=yes @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- at am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephymisc_la_CPPFLAGS) $(CPPFLAGS) $(libephymisc_la_CFLAGS) $(CFLAGS) -c -o libephymisc_la-ephy-dialog.lo `test -f 'ephy-dialog.c' || echo '$(srcdir)/'`ephy-dialog.c
-+ at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephymisc_la_CPPFLAGS) $(CPPFLAGS) $(libephymisc_la_CFLAGS) $(CFLAGS) -c -o libephymisc_la-ephy-dialog.lo `test -f 'ephy-dialog.c' || echo '$(srcdir)/'`ephy-dialog.c
- 
- libephymisc_la-ephy-dnd.lo: ephy-dnd.c
-- at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephymisc_la_CPPFLAGS) $(CPPFLAGS) $(libephymisc_la_CFLAGS) $(CFLAGS) -MT libephymisc_la-ephy-dnd.lo -MD -MP -MF $(DEPDIR)/libephymisc_la-ephy-dnd.Tpo -c -o libephymisc_la-ephy-dnd.lo `test -f 'ephy-dnd.c' || echo '$(srcdir)/'`ephy-dnd.c
-- at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libephymisc_la-ephy-dnd.Tpo $(DEPDIR)/libephymisc_la-ephy-dnd.Plo
-- at am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-+ at am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephymisc_la_CPPFLAGS) $(CPPFLAGS) $(libephymisc_la_CFLAGS) $(CFLAGS) -MT libephymisc_la-ephy-dnd.lo -MD -MP -MF $(DEPDIR)/libephymisc_la-ephy-dnd.Tpo -c -o libephymisc_la-ephy-dnd.lo `test -f 'ephy-dnd.c' || echo '$(srcdir)/'`ephy-dnd.c
-+ at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libephymisc_la-ephy-dnd.Tpo $(DEPDIR)/libephymisc_la-ephy-dnd.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ephy-dnd.c' object='libephymisc_la-ephy-dnd.lo' libtool=yes @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- at am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephymisc_la_CPPFLAGS) $(CPPFLAGS) $(libephymisc_la_CFLAGS) $(CFLAGS) -c -o libephymisc_la-ephy-dnd.lo `test -f 'ephy-dnd.c' || echo '$(srcdir)/'`ephy-dnd.c
-+ at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephymisc_la_CPPFLAGS) $(CPPFLAGS) $(libephymisc_la_CFLAGS) $(CFLAGS) -c -o libephymisc_la-ephy-dnd.lo `test -f 'ephy-dnd.c' || echo '$(srcdir)/'`ephy-dnd.c
- 
- libephymisc_la-ephy-file-chooser.lo: ephy-file-chooser.c
-- at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephymisc_la_CPPFLAGS) $(CPPFLAGS) $(libephymisc_la_CFLAGS) $(CFLAGS) -MT libephymisc_la-ephy-file-chooser.lo -MD -MP -MF $(DEPDIR)/libephymisc_la-ephy-file-chooser.Tpo -c -o libephymisc_la-ephy-file-chooser.lo `test -f 'ephy-file-chooser.c' || echo '$(srcdir)/'`ephy-file-chooser.c
-- at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libephymisc_la-ephy-file-chooser.Tpo $(DEPDIR)/libephymisc_la-ephy-file-chooser.Plo
-- at am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-+ at am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephymisc_la_CPPFLAGS) $(CPPFLAGS) $(libephymisc_la_CFLAGS) $(CFLAGS) -MT libephymisc_la-ephy-file-chooser.lo -MD -MP -MF $(DEPDIR)/libephymisc_la-ephy-file-chooser.Tpo -c -o libephymisc_la-ephy-file-chooser.lo `test -f 'ephy-file-chooser.c' || echo '$(srcdir)/'`ephy-file-chooser.c
-+ at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libephymisc_la-ephy-file-chooser.Tpo $(DEPDIR)/libephymisc_la-ephy-file-chooser.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ephy-file-chooser.c' object='libephymisc_la-ephy-file-chooser.lo' libtool=yes @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- at am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephymisc_la_CPPFLAGS) $(CPPFLAGS) $(libephymisc_la_CFLAGS) $(CFLAGS) -c -o libephymisc_la-ephy-file-chooser.lo `test -f 'ephy-file-chooser.c' || echo '$(srcdir)/'`ephy-file-chooser.c
-+ at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephymisc_la_CPPFLAGS) $(CPPFLAGS) $(libephymisc_la_CFLAGS) $(CFLAGS) -c -o libephymisc_la-ephy-file-chooser.lo `test -f 'ephy-file-chooser.c' || echo '$(srcdir)/'`ephy-file-chooser.c
- 
- libephymisc_la-ephy-file-helpers.lo: ephy-file-helpers.c
-- at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephymisc_la_CPPFLAGS) $(CPPFLAGS) $(libephymisc_la_CFLAGS) $(CFLAGS) -MT libephymisc_la-ephy-file-helpers.lo -MD -MP -MF $(DEPDIR)/libephymisc_la-ephy-file-helpers.Tpo -c -o libephymisc_la-ephy-file-helpers.lo `test -f 'ephy-file-helpers.c' || echo '$(srcdir)/'`ephy-file-helpers.c
-- at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libephymisc_la-ephy-file-helpers.Tpo $(DEPDIR)/libephymisc_la-ephy-file-helpers.Plo
-- at am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-+ at am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephymisc_la_CPPFLAGS) $(CPPFLAGS) $(libephymisc_la_CFLAGS) $(CFLAGS) -MT libephymisc_la-ephy-file-helpers.lo -MD -MP -MF $(DEPDIR)/libephymisc_la-ephy-file-helpers.Tpo -c -o libephymisc_la-ephy-file-helpers.lo `test -f 'ephy-file-helpers.c' || echo '$(srcdir)/'`ephy-file-helpers.c
-+ at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libephymisc_la-ephy-file-helpers.Tpo $(DEPDIR)/libephymisc_la-ephy-file-helpers.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ephy-file-helpers.c' object='libephymisc_la-ephy-file-helpers.lo' libtool=yes @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- at am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephymisc_la_CPPFLAGS) $(CPPFLAGS) $(libephymisc_la_CFLAGS) $(CFLAGS) -c -o libephymisc_la-ephy-file-helpers.lo `test -f 'ephy-file-helpers.c' || echo '$(srcdir)/'`ephy-file-helpers.c
-+ at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephymisc_la_CPPFLAGS) $(CPPFLAGS) $(libephymisc_la_CFLAGS) $(CFLAGS) -c -o libephymisc_la-ephy-file-helpers.lo `test -f 'ephy-file-helpers.c' || echo '$(srcdir)/'`ephy-file-helpers.c
- 
- libephymisc_la-ephy-gui.lo: ephy-gui.c
-- at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephymisc_la_CPPFLAGS) $(CPPFLAGS) $(libephymisc_la_CFLAGS) $(CFLAGS) -MT libephymisc_la-ephy-gui.lo -MD -MP -MF $(DEPDIR)/libephymisc_la-ephy-gui.Tpo -c -o libephymisc_la-ephy-gui.lo `test -f 'ephy-gui.c' || echo '$(srcdir)/'`ephy-gui.c
-- at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libephymisc_la-ephy-gui.Tpo $(DEPDIR)/libephymisc_la-ephy-gui.Plo
-- at am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-+ at am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephymisc_la_CPPFLAGS) $(CPPFLAGS) $(libephymisc_la_CFLAGS) $(CFLAGS) -MT libephymisc_la-ephy-gui.lo -MD -MP -MF $(DEPDIR)/libephymisc_la-ephy-gui.Tpo -c -o libephymisc_la-ephy-gui.lo `test -f 'ephy-gui.c' || echo '$(srcdir)/'`ephy-gui.c
-+ at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libephymisc_la-ephy-gui.Tpo $(DEPDIR)/libephymisc_la-ephy-gui.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ephy-gui.c' object='libephymisc_la-ephy-gui.lo' libtool=yes @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- at am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephymisc_la_CPPFLAGS) $(CPPFLAGS) $(libephymisc_la_CFLAGS) $(CFLAGS) -c -o libephymisc_la-ephy-gui.lo `test -f 'ephy-gui.c' || echo '$(srcdir)/'`ephy-gui.c
-+ at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephymisc_la_CPPFLAGS) $(CPPFLAGS) $(libephymisc_la_CFLAGS) $(CFLAGS) -c -o libephymisc_la-ephy-gui.lo `test -f 'ephy-gui.c' || echo '$(srcdir)/'`ephy-gui.c
- 
- libephymisc_la-ephy-langs.lo: ephy-langs.c
-- at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephymisc_la_CPPFLAGS) $(CPPFLAGS) $(libephymisc_la_CFLAGS) $(CFLAGS) -MT libephymisc_la-ephy-langs.lo -MD -MP -MF $(DEPDIR)/libephymisc_la-ephy-langs.Tpo -c -o libephymisc_la-ephy-langs.lo `test -f 'ephy-langs.c' || echo '$(srcdir)/'`ephy-langs.c
-- at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libephymisc_la-ephy-langs.Tpo $(DEPDIR)/libephymisc_la-ephy-langs.Plo
-- at am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-+ at am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephymisc_la_CPPFLAGS) $(CPPFLAGS) $(libephymisc_la_CFLAGS) $(CFLAGS) -MT libephymisc_la-ephy-langs.lo -MD -MP -MF $(DEPDIR)/libephymisc_la-ephy-langs.Tpo -c -o libephymisc_la-ephy-langs.lo `test -f 'ephy-langs.c' || echo '$(srcdir)/'`ephy-langs.c
-+ at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libephymisc_la-ephy-langs.Tpo $(DEPDIR)/libephymisc_la-ephy-langs.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ephy-langs.c' object='libephymisc_la-ephy-langs.lo' libtool=yes @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- at am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephymisc_la_CPPFLAGS) $(CPPFLAGS) $(libephymisc_la_CFLAGS) $(CFLAGS) -c -o libephymisc_la-ephy-langs.lo `test -f 'ephy-langs.c' || echo '$(srcdir)/'`ephy-langs.c
-+ at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephymisc_la_CPPFLAGS) $(CPPFLAGS) $(libephymisc_la_CFLAGS) $(CFLAGS) -c -o libephymisc_la-ephy-langs.lo `test -f 'ephy-langs.c' || echo '$(srcdir)/'`ephy-langs.c
- 
- libephymisc_la-ephy-loader.lo: ephy-loader.c
-- at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephymisc_la_CPPFLAGS) $(CPPFLAGS) $(libephymisc_la_CFLAGS) $(CFLAGS) -MT libephymisc_la-ephy-loader.lo -MD -MP -MF $(DEPDIR)/libephymisc_la-ephy-loader.Tpo -c -o libephymisc_la-ephy-loader.lo `test -f 'ephy-loader.c' || echo '$(srcdir)/'`ephy-loader.c
-- at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libephymisc_la-ephy-loader.Tpo $(DEPDIR)/libephymisc_la-ephy-loader.Plo
-- at am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-+ at am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephymisc_la_CPPFLAGS) $(CPPFLAGS) $(libephymisc_la_CFLAGS) $(CFLAGS) -MT libephymisc_la-ephy-loader.lo -MD -MP -MF $(DEPDIR)/libephymisc_la-ephy-loader.Tpo -c -o libephymisc_la-ephy-loader.lo `test -f 'ephy-loader.c' || echo '$(srcdir)/'`ephy-loader.c
-+ at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libephymisc_la-ephy-loader.Tpo $(DEPDIR)/libephymisc_la-ephy-loader.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ephy-loader.c' object='libephymisc_la-ephy-loader.lo' libtool=yes @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- at am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephymisc_la_CPPFLAGS) $(CPPFLAGS) $(libephymisc_la_CFLAGS) $(CFLAGS) -c -o libephymisc_la-ephy-loader.lo `test -f 'ephy-loader.c' || echo '$(srcdir)/'`ephy-loader.c
-+ at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephymisc_la_CPPFLAGS) $(CPPFLAGS) $(libephymisc_la_CFLAGS) $(CFLAGS) -c -o libephymisc_la-ephy-loader.lo `test -f 'ephy-loader.c' || echo '$(srcdir)/'`ephy-loader.c
- 
- libephymisc_la-ephy-module.lo: ephy-module.c
-- at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephymisc_la_CPPFLAGS) $(CPPFLAGS) $(libephymisc_la_CFLAGS) $(CFLAGS) -MT libephymisc_la-ephy-module.lo -MD -MP -MF $(DEPDIR)/libephymisc_la-ephy-module.Tpo -c -o libephymisc_la-ephy-module.lo `test -f 'ephy-module.c' || echo '$(srcdir)/'`ephy-module.c
-- at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libephymisc_la-ephy-module.Tpo $(DEPDIR)/libephymisc_la-ephy-module.Plo
-- at am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-+ at am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephymisc_la_CPPFLAGS) $(CPPFLAGS) $(libephymisc_la_CFLAGS) $(CFLAGS) -MT libephymisc_la-ephy-module.lo -MD -MP -MF $(DEPDIR)/libephymisc_la-ephy-module.Tpo -c -o libephymisc_la-ephy-module.lo `test -f 'ephy-module.c' || echo '$(srcdir)/'`ephy-module.c
-+ at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libephymisc_la-ephy-module.Tpo $(DEPDIR)/libephymisc_la-ephy-module.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ephy-module.c' object='libephymisc_la-ephy-module.lo' libtool=yes @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- at am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephymisc_la_CPPFLAGS) $(CPPFLAGS) $(libephymisc_la_CFLAGS) $(CFLAGS) -c -o libephymisc_la-ephy-module.lo `test -f 'ephy-module.c' || echo '$(srcdir)/'`ephy-module.c
-+ at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephymisc_la_CPPFLAGS) $(CPPFLAGS) $(libephymisc_la_CFLAGS) $(CFLAGS) -c -o libephymisc_la-ephy-module.lo `test -f 'ephy-module.c' || echo '$(srcdir)/'`ephy-module.c
- 
- libephymisc_la-ephy-node.lo: ephy-node.c
-- at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephymisc_la_CPPFLAGS) $(CPPFLAGS) $(libephymisc_la_CFLAGS) $(CFLAGS) -MT libephymisc_la-ephy-node.lo -MD -MP -MF $(DEPDIR)/libephymisc_la-ephy-node.Tpo -c -o libephymisc_la-ephy-node.lo `test -f 'ephy-node.c' || echo '$(srcdir)/'`ephy-node.c
-- at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libephymisc_la-ephy-node.Tpo $(DEPDIR)/libephymisc_la-ephy-node.Plo
-- at am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-+ at am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephymisc_la_CPPFLAGS) $(CPPFLAGS) $(libephymisc_la_CFLAGS) $(CFLAGS) -MT libephymisc_la-ephy-node.lo -MD -MP -MF $(DEPDIR)/libephymisc_la-ephy-node.Tpo -c -o libephymisc_la-ephy-node.lo `test -f 'ephy-node.c' || echo '$(srcdir)/'`ephy-node.c
-+ at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libephymisc_la-ephy-node.Tpo $(DEPDIR)/libephymisc_la-ephy-node.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ephy-node.c' object='libephymisc_la-ephy-node.lo' libtool=yes @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- at am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephymisc_la_CPPFLAGS) $(CPPFLAGS) $(libephymisc_la_CFLAGS) $(CFLAGS) -c -o libephymisc_la-ephy-node.lo `test -f 'ephy-node.c' || echo '$(srcdir)/'`ephy-node.c
-+ at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephymisc_la_CPPFLAGS) $(CPPFLAGS) $(libephymisc_la_CFLAGS) $(CFLAGS) -c -o libephymisc_la-ephy-node.lo `test -f 'ephy-node.c' || echo '$(srcdir)/'`ephy-node.c
- 
- libephymisc_la-ephy-node-filter.lo: ephy-node-filter.c
-- at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephymisc_la_CPPFLAGS) $(CPPFLAGS) $(libephymisc_la_CFLAGS) $(CFLAGS) -MT libephymisc_la-ephy-node-filter.lo -MD -MP -MF $(DEPDIR)/libephymisc_la-ephy-node-filter.Tpo -c -o libephymisc_la-ephy-node-filter.lo `test -f 'ephy-node-filter.c' || echo '$(srcdir)/'`ephy-node-filter.c
-- at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libephymisc_la-ephy-node-filter.Tpo $(DEPDIR)/libephymisc_la-ephy-node-filter.Plo
-- at am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-+ at am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephymisc_la_CPPFLAGS) $(CPPFLAGS) $(libephymisc_la_CFLAGS) $(CFLAGS) -MT libephymisc_la-ephy-node-filter.lo -MD -MP -MF $(DEPDIR)/libephymisc_la-ephy-node-filter.Tpo -c -o libephymisc_la-ephy-node-filter.lo `test -f 'ephy-node-filter.c' || echo '$(srcdir)/'`ephy-node-filter.c
-+ at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libephymisc_la-ephy-node-filter.Tpo $(DEPDIR)/libephymisc_la-ephy-node-filter.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ephy-node-filter.c' object='libephymisc_la-ephy-node-filter.lo' libtool=yes @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- at am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephymisc_la_CPPFLAGS) $(CPPFLAGS) $(libephymisc_la_CFLAGS) $(CFLAGS) -c -o libephymisc_la-ephy-node-filter.lo `test -f 'ephy-node-filter.c' || echo '$(srcdir)/'`ephy-node-filter.c
-+ at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephymisc_la_CPPFLAGS) $(CPPFLAGS) $(libephymisc_la_CFLAGS) $(CFLAGS) -c -o libephymisc_la-ephy-node-filter.lo `test -f 'ephy-node-filter.c' || echo '$(srcdir)/'`ephy-node-filter.c
- 
- libephymisc_la-ephy-node-db.lo: ephy-node-db.c
-- at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephymisc_la_CPPFLAGS) $(CPPFLAGS) $(libephymisc_la_CFLAGS) $(CFLAGS) -MT libephymisc_la-ephy-node-db.lo -MD -MP -MF $(DEPDIR)/libephymisc_la-ephy-node-db.Tpo -c -o libephymisc_la-ephy-node-db.lo `test -f 'ephy-node-db.c' || echo '$(srcdir)/'`ephy-node-db.c
-- at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libephymisc_la-ephy-node-db.Tpo $(DEPDIR)/libephymisc_la-ephy-node-db.Plo
-- at am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-+ at am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephymisc_la_CPPFLAGS) $(CPPFLAGS) $(libephymisc_la_CFLAGS) $(CFLAGS) -MT libephymisc_la-ephy-node-db.lo -MD -MP -MF $(DEPDIR)/libephymisc_la-ephy-node-db.Tpo -c -o libephymisc_la-ephy-node-db.lo `test -f 'ephy-node-db.c' || echo '$(srcdir)/'`ephy-node-db.c
-+ at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libephymisc_la-ephy-node-db.Tpo $(DEPDIR)/libephymisc_la-ephy-node-db.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ephy-node-db.c' object='libephymisc_la-ephy-node-db.lo' libtool=yes @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- at am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephymisc_la_CPPFLAGS) $(CPPFLAGS) $(libephymisc_la_CFLAGS) $(CFLAGS) -c -o libephymisc_la-ephy-node-db.lo `test -f 'ephy-node-db.c' || echo '$(srcdir)/'`ephy-node-db.c
-+ at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephymisc_la_CPPFLAGS) $(CPPFLAGS) $(libephymisc_la_CFLAGS) $(CFLAGS) -c -o libephymisc_la-ephy-node-db.lo `test -f 'ephy-node-db.c' || echo '$(srcdir)/'`ephy-node-db.c
- 
- libephymisc_la-ephy-object-helpers.lo: ephy-object-helpers.c
-- at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephymisc_la_CPPFLAGS) $(CPPFLAGS) $(libephymisc_la_CFLAGS) $(CFLAGS) -MT libephymisc_la-ephy-object-helpers.lo -MD -MP -MF $(DEPDIR)/libephymisc_la-ephy-object-helpers.Tpo -c -o libephymisc_la-ephy-object-helpers.lo `test -f 'ephy-object-helpers.c' || echo '$(srcdir)/'`ephy-object-helpers.c
-- at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libephymisc_la-ephy-object-helpers.Tpo $(DEPDIR)/libephymisc_la-ephy-object-helpers.Plo
-- at am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-+ at am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephymisc_la_CPPFLAGS) $(CPPFLAGS) $(libephymisc_la_CFLAGS) $(CFLAGS) -MT libephymisc_la-ephy-object-helpers.lo -MD -MP -MF $(DEPDIR)/libephymisc_la-ephy-object-helpers.Tpo -c -o libephymisc_la-ephy-object-helpers.lo `test -f 'ephy-object-helpers.c' || echo '$(srcdir)/'`ephy-object-helpers.c
-+ at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libephymisc_la-ephy-object-helpers.Tpo $(DEPDIR)/libephymisc_la-ephy-object-helpers.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ephy-object-helpers.c' object='libephymisc_la-ephy-object-helpers.lo' libtool=yes @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- at am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephymisc_la_CPPFLAGS) $(CPPFLAGS) $(libephymisc_la_CFLAGS) $(CFLAGS) -c -o libephymisc_la-ephy-object-helpers.lo `test -f 'ephy-object-helpers.c' || echo '$(srcdir)/'`ephy-object-helpers.c
-+ at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephymisc_la_CPPFLAGS) $(CPPFLAGS) $(libephymisc_la_CFLAGS) $(CFLAGS) -c -o libephymisc_la-ephy-object-helpers.lo `test -f 'ephy-object-helpers.c' || echo '$(srcdir)/'`ephy-object-helpers.c
- 
- libephymisc_la-ephy-print-utils.lo: ephy-print-utils.c
-- at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephymisc_la_CPPFLAGS) $(CPPFLAGS) $(libephymisc_la_CFLAGS) $(CFLAGS) -MT libephymisc_la-ephy-print-utils.lo -MD -MP -MF $(DEPDIR)/libephymisc_la-ephy-print-utils.Tpo -c -o libephymisc_la-ephy-print-utils.lo `test -f 'ephy-print-utils.c' || echo '$(srcdir)/'`ephy-print-utils.c
-- at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libephymisc_la-ephy-print-utils.Tpo $(DEPDIR)/libephymisc_la-ephy-print-utils.Plo
-- at am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-+ at am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephymisc_la_CPPFLAGS) $(CPPFLAGS) $(libephymisc_la_CFLAGS) $(CFLAGS) -MT libephymisc_la-ephy-print-utils.lo -MD -MP -MF $(DEPDIR)/libephymisc_la-ephy-print-utils.Tpo -c -o libephymisc_la-ephy-print-utils.lo `test -f 'ephy-print-utils.c' || echo '$(srcdir)/'`ephy-print-utils.c
-+ at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libephymisc_la-ephy-print-utils.Tpo $(DEPDIR)/libephymisc_la-ephy-print-utils.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ephy-print-utils.c' object='libephymisc_la-ephy-print-utils.lo' libtool=yes @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- at am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephymisc_la_CPPFLAGS) $(CPPFLAGS) $(libephymisc_la_CFLAGS) $(CFLAGS) -c -o libephymisc_la-ephy-print-utils.lo `test -f 'ephy-print-utils.c' || echo '$(srcdir)/'`ephy-print-utils.c
-+ at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephymisc_la_CPPFLAGS) $(CPPFLAGS) $(libephymisc_la_CFLAGS) $(CFLAGS) -c -o libephymisc_la-ephy-print-utils.lo `test -f 'ephy-print-utils.c' || echo '$(srcdir)/'`ephy-print-utils.c
- 
- libephymisc_la-ephy-shlib-loader.lo: ephy-shlib-loader.c
-- at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephymisc_la_CPPFLAGS) $(CPPFLAGS) $(libephymisc_la_CFLAGS) $(CFLAGS) -MT libephymisc_la-ephy-shlib-loader.lo -MD -MP -MF $(DEPDIR)/libephymisc_la-ephy-shlib-loader.Tpo -c -o libephymisc_la-ephy-shlib-loader.lo `test -f 'ephy-shlib-loader.c' || echo '$(srcdir)/'`ephy-shlib-loader.c
-- at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libephymisc_la-ephy-shlib-loader.Tpo $(DEPDIR)/libephymisc_la-ephy-shlib-loader.Plo
-- at am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-+ at am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephymisc_la_CPPFLAGS) $(CPPFLAGS) $(libephymisc_la_CFLAGS) $(CFLAGS) -MT libephymisc_la-ephy-shlib-loader.lo -MD -MP -MF $(DEPDIR)/libephymisc_la-ephy-shlib-loader.Tpo -c -o libephymisc_la-ephy-shlib-loader.lo `test -f 'ephy-shlib-loader.c' || echo '$(srcdir)/'`ephy-shlib-loader.c
-+ at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libephymisc_la-ephy-shlib-loader.Tpo $(DEPDIR)/libephymisc_la-ephy-shlib-loader.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ephy-shlib-loader.c' object='libephymisc_la-ephy-shlib-loader.lo' libtool=yes @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- at am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephymisc_la_CPPFLAGS) $(CPPFLAGS) $(libephymisc_la_CFLAGS) $(CFLAGS) -c -o libephymisc_la-ephy-shlib-loader.lo `test -f 'ephy-shlib-loader.c' || echo '$(srcdir)/'`ephy-shlib-loader.c
-+ at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephymisc_la_CPPFLAGS) $(CPPFLAGS) $(libephymisc_la_CFLAGS) $(CFLAGS) -c -o libephymisc_la-ephy-shlib-loader.lo `test -f 'ephy-shlib-loader.c' || echo '$(srcdir)/'`ephy-shlib-loader.c
- 
- libephymisc_la-ephy-signal-accumulator.lo: ephy-signal-accumulator.c
-- at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephymisc_la_CPPFLAGS) $(CPPFLAGS) $(libephymisc_la_CFLAGS) $(CFLAGS) -MT libephymisc_la-ephy-signal-accumulator.lo -MD -MP -MF $(DEPDIR)/libephymisc_la-ephy-signal-accumulator.Tpo -c -o libephymisc_la-ephy-signal-accumulator.lo `test -f 'ephy-signal-accumulator.c' || echo '$(srcdir)/'`ephy-signal-accumulator.c
-- at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libephymisc_la-ephy-signal-accumulator.Tpo $(DEPDIR)/libephymisc_la-ephy-signal-accumulator.Plo
-- at am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-+ at am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephymisc_la_CPPFLAGS) $(CPPFLAGS) $(libephymisc_la_CFLAGS) $(CFLAGS) -MT libephymisc_la-ephy-signal-accumulator.lo -MD -MP -MF $(DEPDIR)/libephymisc_la-ephy-signal-accumulator.Tpo -c -o libephymisc_la-ephy-signal-accumulator.lo `test -f 'ephy-signal-accumulator.c' || echo '$(srcdir)/'`ephy-signal-accumulator.c
-+ at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libephymisc_la-ephy-signal-accumulator.Tpo $(DEPDIR)/libephymisc_la-ephy-signal-accumulator.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ephy-signal-accumulator.c' object='libephymisc_la-ephy-signal-accumulator.lo' libtool=yes @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- at am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephymisc_la_CPPFLAGS) $(CPPFLAGS) $(libephymisc_la_CFLAGS) $(CFLAGS) -c -o libephymisc_la-ephy-signal-accumulator.lo `test -f 'ephy-signal-accumulator.c' || echo '$(srcdir)/'`ephy-signal-accumulator.c
-+ at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephymisc_la_CPPFLAGS) $(CPPFLAGS) $(libephymisc_la_CFLAGS) $(CFLAGS) -c -o libephymisc_la-ephy-signal-accumulator.lo `test -f 'ephy-signal-accumulator.c' || echo '$(srcdir)/'`ephy-signal-accumulator.c
- 
- libephymisc_la-ephy-state.lo: ephy-state.c
-- at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephymisc_la_CPPFLAGS) $(CPPFLAGS) $(libephymisc_la_CFLAGS) $(CFLAGS) -MT libephymisc_la-ephy-state.lo -MD -MP -MF $(DEPDIR)/libephymisc_la-ephy-state.Tpo -c -o libephymisc_la-ephy-state.lo `test -f 'ephy-state.c' || echo '$(srcdir)/'`ephy-state.c
-- at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libephymisc_la-ephy-state.Tpo $(DEPDIR)/libephymisc_la-ephy-state.Plo
-- at am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-+ at am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephymisc_la_CPPFLAGS) $(CPPFLAGS) $(libephymisc_la_CFLAGS) $(CFLAGS) -MT libephymisc_la-ephy-state.lo -MD -MP -MF $(DEPDIR)/libephymisc_la-ephy-state.Tpo -c -o libephymisc_la-ephy-state.lo `test -f 'ephy-state.c' || echo '$(srcdir)/'`ephy-state.c
-+ at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libephymisc_la-ephy-state.Tpo $(DEPDIR)/libephymisc_la-ephy-state.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ephy-state.c' object='libephymisc_la-ephy-state.lo' libtool=yes @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- at am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephymisc_la_CPPFLAGS) $(CPPFLAGS) $(libephymisc_la_CFLAGS) $(CFLAGS) -c -o libephymisc_la-ephy-state.lo `test -f 'ephy-state.c' || echo '$(srcdir)/'`ephy-state.c
-+ at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephymisc_la_CPPFLAGS) $(CPPFLAGS) $(libephymisc_la_CFLAGS) $(CFLAGS) -c -o libephymisc_la-ephy-state.lo `test -f 'ephy-state.c' || echo '$(srcdir)/'`ephy-state.c
- 
- libephymisc_la-ephy-string.lo: ephy-string.c
-- at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephymisc_la_CPPFLAGS) $(CPPFLAGS) $(libephymisc_la_CFLAGS) $(CFLAGS) -MT libephymisc_la-ephy-string.lo -MD -MP -MF $(DEPDIR)/libephymisc_la-ephy-string.Tpo -c -o libephymisc_la-ephy-string.lo `test -f 'ephy-string.c' || echo '$(srcdir)/'`ephy-string.c
-- at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libephymisc_la-ephy-string.Tpo $(DEPDIR)/libephymisc_la-ephy-string.Plo
-- at am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-+ at am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephymisc_la_CPPFLAGS) $(CPPFLAGS) $(libephymisc_la_CFLAGS) $(CFLAGS) -MT libephymisc_la-ephy-string.lo -MD -MP -MF $(DEPDIR)/libephymisc_la-ephy-string.Tpo -c -o libephymisc_la-ephy-string.lo `test -f 'ephy-string.c' || echo '$(srcdir)/'`ephy-string.c
-+ at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libephymisc_la-ephy-string.Tpo $(DEPDIR)/libephymisc_la-ephy-string.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ephy-string.c' object='libephymisc_la-ephy-string.lo' libtool=yes @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- at am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephymisc_la_CPPFLAGS) $(CPPFLAGS) $(libephymisc_la_CFLAGS) $(CFLAGS) -c -o libephymisc_la-ephy-string.lo `test -f 'ephy-string.c' || echo '$(srcdir)/'`ephy-string.c
-+ at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephymisc_la_CPPFLAGS) $(CPPFLAGS) $(libephymisc_la_CFLAGS) $(CFLAGS) -c -o libephymisc_la-ephy-string.lo `test -f 'ephy-string.c' || echo '$(srcdir)/'`ephy-string.c
- 
- libephymisc_la-ephy-stock-icons.lo: ephy-stock-icons.c
-- at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephymisc_la_CPPFLAGS) $(CPPFLAGS) $(libephymisc_la_CFLAGS) $(CFLAGS) -MT libephymisc_la-ephy-stock-icons.lo -MD -MP -MF $(DEPDIR)/libephymisc_la-ephy-stock-icons.Tpo -c -o libephymisc_la-ephy-stock-icons.lo `test -f 'ephy-stock-icons.c' || echo '$(srcdir)/'`ephy-stock-icons.c
-- at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libephymisc_la-ephy-stock-icons.Tpo $(DEPDIR)/libephymisc_la-ephy-stock-icons.Plo
-- at am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-+ at am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephymisc_la_CPPFLAGS) $(CPPFLAGS) $(libephymisc_la_CFLAGS) $(CFLAGS) -MT libephymisc_la-ephy-stock-icons.lo -MD -MP -MF $(DEPDIR)/libephymisc_la-ephy-stock-icons.Tpo -c -o libephymisc_la-ephy-stock-icons.lo `test -f 'ephy-stock-icons.c' || echo '$(srcdir)/'`ephy-stock-icons.c
-+ at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libephymisc_la-ephy-stock-icons.Tpo $(DEPDIR)/libephymisc_la-ephy-stock-icons.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ephy-stock-icons.c' object='libephymisc_la-ephy-stock-icons.lo' libtool=yes @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- at am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephymisc_la_CPPFLAGS) $(CPPFLAGS) $(libephymisc_la_CFLAGS) $(CFLAGS) -c -o libephymisc_la-ephy-stock-icons.lo `test -f 'ephy-stock-icons.c' || echo '$(srcdir)/'`ephy-stock-icons.c
-+ at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephymisc_la_CPPFLAGS) $(CPPFLAGS) $(libephymisc_la_CFLAGS) $(CFLAGS) -c -o libephymisc_la-ephy-stock-icons.lo `test -f 'ephy-stock-icons.c' || echo '$(srcdir)/'`ephy-stock-icons.c
- 
- libephymisc_la-ephy-time-helpers.lo: ephy-time-helpers.c
-- at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephymisc_la_CPPFLAGS) $(CPPFLAGS) $(libephymisc_la_CFLAGS) $(CFLAGS) -MT libephymisc_la-ephy-time-helpers.lo -MD -MP -MF $(DEPDIR)/libephymisc_la-ephy-time-helpers.Tpo -c -o libephymisc_la-ephy-time-helpers.lo `test -f 'ephy-time-helpers.c' || echo '$(srcdir)/'`ephy-time-helpers.c
-- at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libephymisc_la-ephy-time-helpers.Tpo $(DEPDIR)/libephymisc_la-ephy-time-helpers.Plo
-- at am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-+ at am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephymisc_la_CPPFLAGS) $(CPPFLAGS) $(libephymisc_la_CFLAGS) $(CFLAGS) -MT libephymisc_la-ephy-time-helpers.lo -MD -MP -MF $(DEPDIR)/libephymisc_la-ephy-time-helpers.Tpo -c -o libephymisc_la-ephy-time-helpers.lo `test -f 'ephy-time-helpers.c' || echo '$(srcdir)/'`ephy-time-helpers.c
-+ at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libephymisc_la-ephy-time-helpers.Tpo $(DEPDIR)/libephymisc_la-ephy-time-helpers.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ephy-time-helpers.c' object='libephymisc_la-ephy-time-helpers.lo' libtool=yes @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- at am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephymisc_la_CPPFLAGS) $(CPPFLAGS) $(libephymisc_la_CFLAGS) $(CFLAGS) -c -o libephymisc_la-ephy-time-helpers.lo `test -f 'ephy-time-helpers.c' || echo '$(srcdir)/'`ephy-time-helpers.c
-+ at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephymisc_la_CPPFLAGS) $(CPPFLAGS) $(libephymisc_la_CFLAGS) $(CFLAGS) -c -o libephymisc_la-ephy-time-helpers.lo `test -f 'ephy-time-helpers.c' || echo '$(srcdir)/'`ephy-time-helpers.c
- 
- libephymisc_la-ephy-zoom.lo: ephy-zoom.c
-- at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephymisc_la_CPPFLAGS) $(CPPFLAGS) $(libephymisc_la_CFLAGS) $(CFLAGS) -MT libephymisc_la-ephy-zoom.lo -MD -MP -MF $(DEPDIR)/libephymisc_la-ephy-zoom.Tpo -c -o libephymisc_la-ephy-zoom.lo `test -f 'ephy-zoom.c' || echo '$(srcdir)/'`ephy-zoom.c
-- at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libephymisc_la-ephy-zoom.Tpo $(DEPDIR)/libephymisc_la-ephy-zoom.Plo
-- at am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-+ at am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephymisc_la_CPPFLAGS) $(CPPFLAGS) $(libephymisc_la_CFLAGS) $(CFLAGS) -MT libephymisc_la-ephy-zoom.lo -MD -MP -MF $(DEPDIR)/libephymisc_la-ephy-zoom.Tpo -c -o libephymisc_la-ephy-zoom.lo `test -f 'ephy-zoom.c' || echo '$(srcdir)/'`ephy-zoom.c
-+ at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libephymisc_la-ephy-zoom.Tpo $(DEPDIR)/libephymisc_la-ephy-zoom.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ephy-zoom.c' object='libephymisc_la-ephy-zoom.lo' libtool=yes @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- at am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephymisc_la_CPPFLAGS) $(CPPFLAGS) $(libephymisc_la_CFLAGS) $(CFLAGS) -c -o libephymisc_la-ephy-zoom.lo `test -f 'ephy-zoom.c' || echo '$(srcdir)/'`ephy-zoom.c
-+ at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephymisc_la_CPPFLAGS) $(CPPFLAGS) $(libephymisc_la_CFLAGS) $(CFLAGS) -c -o libephymisc_la-ephy-zoom.lo `test -f 'ephy-zoom.c' || echo '$(srcdir)/'`ephy-zoom.c
- 
- libephymisc_la-ephy-spell-check.lo: ephy-spell-check.c
-- at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephymisc_la_CPPFLAGS) $(CPPFLAGS) $(libephymisc_la_CFLAGS) $(CFLAGS) -MT libephymisc_la-ephy-spell-check.lo -MD -MP -MF $(DEPDIR)/libephymisc_la-ephy-spell-check.Tpo -c -o libephymisc_la-ephy-spell-check.lo `test -f 'ephy-spell-check.c' || echo '$(srcdir)/'`ephy-spell-check.c
-- at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libephymisc_la-ephy-spell-check.Tpo $(DEPDIR)/libephymisc_la-ephy-spell-check.Plo
-- at am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-+ at am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephymisc_la_CPPFLAGS) $(CPPFLAGS) $(libephymisc_la_CFLAGS) $(CFLAGS) -MT libephymisc_la-ephy-spell-check.lo -MD -MP -MF $(DEPDIR)/libephymisc_la-ephy-spell-check.Tpo -c -o libephymisc_la-ephy-spell-check.lo `test -f 'ephy-spell-check.c' || echo '$(srcdir)/'`ephy-spell-check.c
-+ at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libephymisc_la-ephy-spell-check.Tpo $(DEPDIR)/libephymisc_la-ephy-spell-check.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ephy-spell-check.c' object='libephymisc_la-ephy-spell-check.lo' libtool=yes @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- at am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephymisc_la_CPPFLAGS) $(CPPFLAGS) $(libephymisc_la_CFLAGS) $(CFLAGS) -c -o libephymisc_la-ephy-spell-check.lo `test -f 'ephy-spell-check.c' || echo '$(srcdir)/'`ephy-spell-check.c
-+ at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephymisc_la_CPPFLAGS) $(CPPFLAGS) $(libephymisc_la_CFLAGS) $(CFLAGS) -c -o libephymisc_la-ephy-spell-check.lo `test -f 'ephy-spell-check.c' || echo '$(srcdir)/'`ephy-spell-check.c
- 
- libephymisc_la-ephy-lib-type-builtins.lo: ephy-lib-type-builtins.c
-- at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephymisc_la_CPPFLAGS) $(CPPFLAGS) $(libephymisc_la_CFLAGS) $(CFLAGS) -MT libephymisc_la-ephy-lib-type-builtins.lo -MD -MP -MF $(DEPDIR)/libephymisc_la-ephy-lib-type-builtins.Tpo -c -o libephymisc_la-ephy-lib-type-builtins.lo `test -f 'ephy-lib-type-builtins.c' || echo '$(srcdir)/'`ephy-lib-type-builtins.c
-- at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libephymisc_la-ephy-lib-type-builtins.Tpo $(DEPDIR)/libephymisc_la-ephy-lib-type-builtins.Plo
-- at am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-+ at am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephymisc_la_CPPFLAGS) $(CPPFLAGS) $(libephymisc_la_CFLAGS) $(CFLAGS) -MT libephymisc_la-ephy-lib-type-builtins.lo -MD -MP -MF $(DEPDIR)/libephymisc_la-ephy-lib-type-builtins.Tpo -c -o libephymisc_la-ephy-lib-type-builtins.lo `test -f 'ephy-lib-type-builtins.c' || echo '$(srcdir)/'`ephy-lib-type-builtins.c
-+ at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libephymisc_la-ephy-lib-type-builtins.Tpo $(DEPDIR)/libephymisc_la-ephy-lib-type-builtins.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ephy-lib-type-builtins.c' object='libephymisc_la-ephy-lib-type-builtins.lo' libtool=yes @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- at am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephymisc_la_CPPFLAGS) $(CPPFLAGS) $(libephymisc_la_CFLAGS) $(CFLAGS) -c -o libephymisc_la-ephy-lib-type-builtins.lo `test -f 'ephy-lib-type-builtins.c' || echo '$(srcdir)/'`ephy-lib-type-builtins.c
-+ at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephymisc_la_CPPFLAGS) $(CPPFLAGS) $(libephymisc_la_CFLAGS) $(CFLAGS) -c -o libephymisc_la-ephy-lib-type-builtins.lo `test -f 'ephy-lib-type-builtins.c' || echo '$(srcdir)/'`ephy-lib-type-builtins.c
- 
- libephymisc_la-ephy-marshal.lo: ephy-marshal.c
-- at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephymisc_la_CPPFLAGS) $(CPPFLAGS) $(libephymisc_la_CFLAGS) $(CFLAGS) -MT libephymisc_la-ephy-marshal.lo -MD -MP -MF $(DEPDIR)/libephymisc_la-ephy-marshal.Tpo -c -o libephymisc_la-ephy-marshal.lo `test -f 'ephy-marshal.c' || echo '$(srcdir)/'`ephy-marshal.c
-- at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libephymisc_la-ephy-marshal.Tpo $(DEPDIR)/libephymisc_la-ephy-marshal.Plo
-- at am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-+ at am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephymisc_la_CPPFLAGS) $(CPPFLAGS) $(libephymisc_la_CFLAGS) $(CFLAGS) -MT libephymisc_la-ephy-marshal.lo -MD -MP -MF $(DEPDIR)/libephymisc_la-ephy-marshal.Tpo -c -o libephymisc_la-ephy-marshal.lo `test -f 'ephy-marshal.c' || echo '$(srcdir)/'`ephy-marshal.c
-+ at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libephymisc_la-ephy-marshal.Tpo $(DEPDIR)/libephymisc_la-ephy-marshal.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ephy-marshal.c' object='libephymisc_la-ephy-marshal.lo' libtool=yes @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- at am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephymisc_la_CPPFLAGS) $(CPPFLAGS) $(libephymisc_la_CFLAGS) $(CFLAGS) -c -o libephymisc_la-ephy-marshal.lo `test -f 'ephy-marshal.c' || echo '$(srcdir)/'`ephy-marshal.c
-+ at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephymisc_la_CPPFLAGS) $(CPPFLAGS) $(libephymisc_la_CFLAGS) $(CFLAGS) -c -o libephymisc_la-ephy-marshal.lo `test -f 'ephy-marshal.c' || echo '$(srcdir)/'`ephy-marshal.c
- 
- mostlyclean-libtool:
- 	-rm -f *.lo
-@@ -800,23 +709,20 @@
- install-headerDATA: $(header_DATA)
- 	@$(NORMAL_INSTALL)
- 	test -z "$(headerdir)" || $(MKDIR_P) "$(DESTDIR)$(headerdir)"
--	@list='$(header_DATA)'; test -n "$(headerdir)" || list=; \
--	for p in $$list; do \
-+	@list='$(header_DATA)'; for p in $$list; do \
- 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
--	  echo "$$d$$p"; \
--	done | $(am__base_list) | \
--	while read files; do \
--	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(headerdir)'"; \
--	  $(INSTALL_DATA) $$files "$(DESTDIR)$(headerdir)" || exit $$?; \
-+	  f=$(am__strip_dir) \
-+	  echo " $(headerDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(headerdir)/$$f'"; \
-+	  $(headerDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(headerdir)/$$f"; \
- 	done
- 
- uninstall-headerDATA:
- 	@$(NORMAL_UNINSTALL)
--	@list='$(header_DATA)'; test -n "$(headerdir)" || list=; \
--	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
--	test -n "$$files" || exit 0; \
--	echo " ( cd '$(DESTDIR)$(headerdir)' && rm -f" $$files ")"; \
--	cd "$(DESTDIR)$(headerdir)" && rm -f $$files
-+	@list='$(header_DATA)'; for p in $$list; do \
-+	  f=$(am__strip_dir) \
-+	  echo " rm -f '$(DESTDIR)$(headerdir)/$$f'"; \
-+	  rm -f "$(DESTDIR)$(headerdir)/$$f"; \
-+	done
- 
- # This directory's subdirectories are mostly independent; you can cd
- # into them and run `make' without going through this Makefile.
-@@ -842,7 +748,7 @@
- 	  else \
- 	    local_target="$$target"; \
- 	  fi; \
--	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-+	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
- 	  || eval $$failcom; \
- 	done; \
- 	if test "$$dot_seen" = "no"; then \
-@@ -876,16 +782,16 @@
- 	  else \
- 	    local_target="$$target"; \
- 	  fi; \
--	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-+	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
- 	  || eval $$failcom; \
- 	done && test -z "$$fail"
- tags-recursive:
- 	list='$(SUBDIRS)'; for subdir in $$list; do \
--	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
-+	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
- 	done
- ctags-recursive:
- 	list='$(SUBDIRS)'; for subdir in $$list; do \
--	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
-+	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
- 	done
- 
- ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-@@ -900,7 +806,7 @@
- 
- TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
- 		$(TAGS_FILES) $(LISP)
--	set x; \
-+	tags=; \
- 	here=`pwd`; \
- 	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
- 	  include_option=--etags-include; \
-@@ -912,7 +818,7 @@
- 	list='$(SUBDIRS)'; for subdir in $$list; do \
- 	  if test "$$subdir" = .; then :; else \
- 	    test ! -f $$subdir/TAGS || \
--	      set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
-+	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
- 	  fi; \
- 	done; \
- 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-@@ -921,34 +827,29 @@
- 	  done | \
- 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
--	shift; \
--	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
-+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
- 	  test -n "$$unique" || unique=$$empty_fix; \
--	  if test $$# -gt 0; then \
--	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
--	      "$$@" $$unique; \
--	  else \
--	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
--	      $$unique; \
--	  fi; \
-+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-+	    $$tags $$unique; \
- 	fi
- ctags: CTAGS
- CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
- 		$(TAGS_FILES) $(LISP)
-+	tags=; \
- 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
- 	unique=`for i in $$list; do \
- 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- 	  done | \
- 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
--	test -z "$(CTAGS_ARGS)$$unique" \
-+	test -z "$(CTAGS_ARGS)$$tags$$unique" \
- 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
--	     $$unique
-+	     $$tags $$unique
- 
- GTAGS:
- 	here=`$(am__cd) $(top_builddir) && pwd` \
--	  && $(am__cd) $(top_srcdir) \
--	  && gtags -i $(GTAGS_ARGS) "$$here"
-+	  && cd $(top_srcdir) \
-+	  && gtags -i $(GTAGS_ARGS) $$here
- 
- distclean-tags:
- 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-@@ -969,44 +870,29 @@
- 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- 	  if test -d $$d/$$file; then \
- 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
--	    if test -d "$(distdir)/$$file"; then \
--	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
--	    fi; \
- 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
--	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
--	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
- 	    fi; \
--	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
- 	  else \
--	    test -f "$(distdir)/$$file" \
--	    || cp -p $$d/$$file "$(distdir)/$$file" \
-+	    test -f $(distdir)/$$file \
-+	    || cp -p $$d/$$file $(distdir)/$$file \
- 	    || exit 1; \
- 	  fi; \
- 	done
--	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
-+	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
- 	  if test "$$subdir" = .; then :; else \
- 	    test -d "$(distdir)/$$subdir" \
- 	    || $(MKDIR_P) "$(distdir)/$$subdir" \
- 	    || exit 1; \
--	  fi; \
--	done
--	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
--	  if test "$$subdir" = .; then :; else \
--	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
--	    $(am__relativize); \
--	    new_distdir=$$reldir; \
--	    dir1=$$subdir; dir2="$(top_distdir)"; \
--	    $(am__relativize); \
--	    new_top_distdir=$$reldir; \
--	    echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
--	    echo "     am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
--	    ($(am__cd) $$subdir && \
-+	    distdir=`$(am__cd) $(distdir) && pwd`; \
-+	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
-+	    (cd $$subdir && \
- 	      $(MAKE) $(AM_MAKEFLAGS) \
--	        top_distdir="$$new_top_distdir" \
--	        distdir="$$new_distdir" \
-+	        top_distdir="$$top_distdir" \
-+	        distdir="$$distdir/$$subdir" \
- 		am__remove_distdir=: \
- 		am__skip_length_check=: \
--		am__skip_mode_fix=: \
- 	        distdir) \
- 	      || exit 1; \
- 	  fi; \
-@@ -1042,7 +928,6 @@
- 
- distclean-generic:
- 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
--	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
- 	-test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
- 
- maintainer-clean-generic:
-@@ -1067,8 +952,6 @@
- 
- html: html-recursive
- 
--html-am:
--
- info: info-recursive
- 
- info-am:
-@@ -1077,28 +960,18 @@
- 
- install-dvi: install-dvi-recursive
- 
--install-dvi-am:
--
- install-exec-am:
- 
- install-html: install-html-recursive
- 
--install-html-am:
--
- install-info: install-info-recursive
- 
--install-info-am:
--
- install-man:
- 
- install-pdf: install-pdf-recursive
- 
--install-pdf-am:
--
- install-ps: install-ps-recursive
- 
--install-ps-am:
--
- installcheck-am:
- 
- maintainer-clean: maintainer-clean-recursive
-@@ -1121,9 +994,8 @@
- 
- uninstall-am: uninstall-headerDATA
- 
--.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all check \
--	ctags-recursive install install-am install-strip \
--	tags-recursive
-+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
-+	install-strip
- 
- .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
- 	all all-am check check-am clean clean-generic clean-libtool \
-@@ -1195,7 +1067,6 @@
- 	&& ( cmp -s xgen-$(@F) $(@F:stamp-%=%) || cp xgen-$(@F) $(@F:stamp-%=%) ) \
- 	&& rm -f xgen-$(@F) \
- 	&& echo timestamp > $(@F)
--
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
- .NOEXPORT:
-Index: epiphany-webkit-2.27.5/ltmain.sh
+Index: epiphany-webkit-2.27.91/ltmain.sh
 ===================================================================
---- epiphany-webkit-2.27.5.orig/ltmain.sh	2009-07-22 10:32:22.000000000 +0200
-+++ epiphany-webkit-2.27.5/ltmain.sh	2009-07-30 17:40:02.390792214 +0200
+--- epiphany-webkit-2.27.91.orig/ltmain.sh	2009-08-21 05:02:57.000000000 -0300
++++ epiphany-webkit-2.27.91/ltmain.sh	2009-08-25 11:47:02.670350851 -0300
 @@ -4202,6 +4202,11 @@
  	    prev=
  	    continue
@@ -15098,169 +14891,11 @@
  	  esac
  	  ;;
  	expsyms)
-Index: epiphany-webkit-2.27.5/src/Makefile.in
+Index: epiphany-webkit-2.27.91/src/Makefile.in
 ===================================================================
---- epiphany-webkit-2.27.5.orig/src/Makefile.in	2009-07-22 10:32:34.000000000 +0200
-+++ epiphany-webkit-2.27.5/src/Makefile.in	2009-07-30 17:40:12.534291880 +0200
-@@ -1,9 +1,8 @@
--# Makefile.in generated by automake 1.11 from Makefile.am.
-+# Makefile.in generated by automake 1.10.2 from Makefile.am.
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
--# Inc.
-+# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -19,9 +18,8 @@
- 
- VPATH = @srcdir@
- pkgdatadir = $(datadir)/@PACKAGE@
--pkgincludedir = $(includedir)/@PACKAGE@
- pkglibdir = $(libdir)/@PACKAGE@
--pkglibexecdir = $(libexecdir)/@PACKAGE@
-+pkgincludedir = $(includedir)/@PACKAGE@
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
- install_sh_DATA = $(install_sh) -c -m 644
- install_sh_PROGRAM = $(install_sh) -c
-@@ -76,7 +74,6 @@
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = $(top_builddir)/config.h
- CONFIG_CLEAN_FILES = epiphany.h
--CONFIG_CLEAN_VPATH_FILES =
- LTLIBRARIES = $(noinst_LTLIBRARIES)
- libephymain_la_LIBADD =
- am__libephymain_la_SOURCES_DIST = ephy-activation.c \
-@@ -150,15 +147,12 @@
- nodist_libephymain_la_OBJECTS = $(am__objects_7)
- libephymain_la_OBJECTS = $(am_libephymain_la_OBJECTS) \
- 	$(nodist_libephymain_la_OBJECTS)
--AM_V_lt = $(am__v_lt_$(V))
--am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
--am__v_lt_0 = --silent
--libephymain_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
--	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
--	$(libephymain_la_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o \
--	$@
-+libephymain_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
-+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(libephymain_la_CFLAGS) \
-+	$(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(girdir)" \
- 	"$(DESTDIR)$(headerdir)" "$(DESTDIR)$(typelibsdir)"
-+binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
- PROGRAMS = $(bin_PROGRAMS)
- am_epiphany_OBJECTS = epiphany-ephy-main.$(OBJEXT)
- epiphany_OBJECTS = $(am_epiphany_OBJECTS)
-@@ -175,31 +169,18 @@
- 	$(top_builddir)/lib/egg/libegg.la $(am__DEPENDENCIES_1) \
- 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2) \
- 	$(am__DEPENDENCIES_3) $(am__DEPENDENCIES_4)
--epiphany_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
--	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(epiphany_CFLAGS) \
--	$(CFLAGS) $(epiphany_LDFLAGS) $(LDFLAGS) -o $@
-+epiphany_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-+	--mode=link $(CCLD) $(epiphany_CFLAGS) $(CFLAGS) \
-+	$(epiphany_LDFLAGS) $(LDFLAGS) -o $@
- DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
- depcomp = $(SHELL) $(top_srcdir)/depcomp
- am__depfiles_maybe = depfiles
--am__mv = mv -f
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
--AM_V_CC = $(am__v_CC_$(V))
--am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY))
--am__v_CC_0 = @echo "  CC    " $@;
--AM_V_at = $(am__v_at_$(V))
--am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
--am__v_at_0 = @
- CCLD = $(CC)
--LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
--	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
--	$(AM_LDFLAGS) $(LDFLAGS) -o $@
--AM_V_CCLD = $(am__v_CCLD_$(V))
--am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY))
--am__v_CCLD_0 = @echo "  CCLD  " $@;
--AM_V_GEN = $(am__v_GEN_$(V))
--am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
--am__v_GEN_0 = @echo "  GEN   " $@;
-+LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-+	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-+	$(LDFLAGS) -o $@
- SOURCES = $(libephymain_la_SOURCES) $(nodist_libephymain_la_SOURCES) \
- 	$(epiphany_SOURCES)
- DIST_SOURCES = $(am__libephymain_la_SOURCES_DIST) $(epiphany_SOURCES)
-@@ -215,64 +196,23 @@
-     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-     *) f=$$p;; \
-   esac;
--am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
--am__install_max = 40
--am__nobase_strip_setup = \
--  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
--am__nobase_strip = \
--  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
--am__nobase_list = $(am__nobase_strip_setup); \
--  for p in $$list; do echo "$$p $$p"; done | \
--  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
--  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
--    if (++n[$$2] == $(am__install_max)) \
--      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
--    END { for (dir in files) print dir, files[dir] }'
--am__base_list = \
--  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
--  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-+girDATA_INSTALL = $(INSTALL_DATA)
-+headerDATA_INSTALL = $(INSTALL_DATA)
-+typelibsDATA_INSTALL = $(INSTALL_DATA)
- DATA = $(gir_DATA) $(header_DATA) $(typelibs_DATA)
- RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
-   distclean-recursive maintainer-clean-recursive
--AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
--	$(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
--	distdir
- ETAGS = etags
- CTAGS = ctags
- DIST_SUBDIRS = $(SUBDIRS)
- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
--am__relativize = \
--  dir0=`pwd`; \
--  sed_first='s,^\([^/]*\)/.*$$,\1,'; \
--  sed_rest='s,^[^/]*/*,,'; \
--  sed_last='s,^.*/\([^/]*\)$$,\1,'; \
--  sed_butlast='s,/*[^/]*$$,,'; \
--  while test -n "$$dir1"; do \
--    first=`echo "$$dir1" | sed -e "$$sed_first"`; \
--    if test "$$first" != "."; then \
--      if test "$$first" = ".."; then \
--        dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
--        dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
--      else \
--        first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
--        if test "$$first2" = "$$first"; then \
--          dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
--        else \
--          dir2="../$$dir2"; \
--        fi; \
--        dir0="$$dir0"/"$$first"; \
--      fi; \
--    fi; \
--    dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
--  done; \
--  reldir="$$dir2"
- ACLOCAL = @ACLOCAL@
- ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
- ALL_LINGUAS = @ALL_LINGUAS@
- AMTAR = @AMTAR@
- AM_CFLAGS = @AM_CFLAGS@
- AM_CPPFLAGS = @AM_CPPFLAGS@
--AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
- AM_LDFLAGS = @AM_LDFLAGS@
- AR = @AR@
- AUTOCONF = @AUTOCONF@
-@@ -401,6 +341,7 @@
+--- epiphany-webkit-2.27.91.orig/src/Makefile.in	2009-08-24 14:12:00.000000000 -0300
++++ epiphany-webkit-2.27.91/src/Makefile.in	2009-08-25 11:47:15.970851533 -0300
+@@ -402,6 +402,7 @@
  PACKAGE_NAME = @PACKAGE_NAME@
  PACKAGE_STRING = @PACKAGE_STRING@
  PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -15268,7 +14903,7 @@
  PACKAGE_VERSION = @PACKAGE_VERSION@
  PATH_SEPARATOR = @PATH_SEPARATOR@
  PKG_CONFIG = @PKG_CONFIG@
-@@ -532,8 +473,8 @@
+@@ -534,8 +535,8 @@
  	-I$(top_srcdir)/lib/egg		\
  	-I$(top_srcdir)/lib/widgets   	\
  	-I$(top_srcdir)/src/bookmarks   \
@@ -15279,861 +14914,3 @@
  	-DDATADIR=\""$(pkgdatadir)"\" 	\
  	-DGNOMELOCALEDIR=\"$(datadir)/locale\"	\
  	$(AM_CPPFLAGS)
-@@ -634,9 +575,9 @@
- 	      exit 1;; \
- 	  esac; \
- 	done; \
--	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/Makefile'; \
--	$(am__cd) $(top_srcdir) && \
--	  $(AUTOMAKE) --foreign src/Makefile
-+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/Makefile'; \
-+	cd $(top_srcdir) && \
-+	  $(AUTOMAKE) --foreign  src/Makefile
- .PRECIOUS: Makefile
- Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- 	@case '$?' in \
-@@ -654,7 +595,6 @@
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
--$(am__aclocal_m4_deps):
- epiphany.h: $(top_builddir)/config.status $(srcdir)/epiphany.h.in
- 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
- 
-@@ -667,53 +607,38 @@
- 	  rm -f "$${dir}/so_locations"; \
- 	done
- libephymain.la: $(libephymain_la_OBJECTS) $(libephymain_la_DEPENDENCIES) 
--	$(AM_V_CCLD)$(libephymain_la_LINK)  $(libephymain_la_OBJECTS) $(libephymain_la_LIBADD) $(LIBS)
-+	$(libephymain_la_LINK)  $(libephymain_la_OBJECTS) $(libephymain_la_LIBADD) $(LIBS)
- install-binPROGRAMS: $(bin_PROGRAMS)
- 	@$(NORMAL_INSTALL)
- 	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
--	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
--	for p in $$list; do echo "$$p $$p"; done | \
--	sed 's/$(EXEEXT)$$//' | \
--	while read p p1; do if test -f $$p || test -f $$p1; \
--	  then echo "$$p"; echo "$$p"; else :; fi; \
--	done | \
--	sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \
--	    -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
--	sed 'N;N;N;s,\n, ,g' | \
--	$(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
--	  { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
--	    if ($$2 == $$4) files[d] = files[d] " " $$1; \
--	    else { print "f", $$3 "/" $$4, $$1; } } \
--	  END { for (d in files) print "f", d, files[d] }' | \
--	while read type dir files; do \
--	    if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
--	    test -z "$$files" || { \
--	    echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(bindir)$$dir'"; \
--	    $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \
--	    } \
--	; done
-+	@list='$(bin_PROGRAMS)'; for p in $$list; do \
-+	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
-+	  if test -f $$p \
-+	     || test -f $$p1 \
-+	  ; then \
-+	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
-+	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
-+	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
-+	  else :; fi; \
-+	done
- 
- uninstall-binPROGRAMS:
- 	@$(NORMAL_UNINSTALL)
--	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
--	files=`for p in $$list; do echo "$$p"; done | \
--	  sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
--	      -e 's/$$/$(EXEEXT)/' `; \
--	test -n "$$list" || exit 0; \
--	echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \
--	cd "$(DESTDIR)$(bindir)" && rm -f $$files
-+	@list='$(bin_PROGRAMS)'; for p in $$list; do \
-+	  f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
-+	  echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \
-+	  rm -f "$(DESTDIR)$(bindir)/$$f"; \
-+	done
- 
- clean-binPROGRAMS:
--	@list='$(bin_PROGRAMS)'; test -n "$$list" || exit 0; \
--	echo " rm -f" $$list; \
--	rm -f $$list || exit $$?; \
--	test -n "$(EXEEXT)" || exit 0; \
--	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
--	echo " rm -f" $$list; \
--	rm -f $$list
-+	@list='$(bin_PROGRAMS)'; for p in $$list; do \
-+	  f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
-+	  echo " rm -f $$p $$f"; \
-+	  rm -f $$p $$f ; \
-+	done
- epiphany$(EXEEXT): $(epiphany_OBJECTS) $(epiphany_DEPENDENCIES) 
- 	@rm -f epiphany$(EXEEXT)
--	$(AM_V_CCLD)$(epiphany_LINK) $(epiphany_OBJECTS) $(epiphany_LDADD) $(LIBS)
-+	$(epiphany_LINK) $(epiphany_OBJECTS) $(epiphany_LDADD) $(LIBS)
- 
- mostlyclean-compile:
- 	-rm -f *.$(OBJEXT)
-@@ -761,337 +686,295 @@
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libephymain_la-window-commands.Plo at am__quote@
- 
- .c.o:
-- at am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-- at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-- at am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-+ at am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-+ at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@	$(COMPILE) -c $<
- 
- .c.obj:
-- at am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-- at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-- at am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-+ at am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-+ at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
- 
- .c.lo:
-- at am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-- at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-- at am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-+ at am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-+ at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
- 
- libephymain_la-ephy-activation.lo: ephy-activation.c
-- at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephymain_la_CPPFLAGS) $(CPPFLAGS) $(libephymain_la_CFLAGS) $(CFLAGS) -MT libephymain_la-ephy-activation.lo -MD -MP -MF $(DEPDIR)/libephymain_la-ephy-activation.Tpo -c -o libephymain_la-ephy-activation.lo `test -f 'ephy-activation.c' || echo '$(srcdir)/'`ephy-activation.c
-- at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libephymain_la-ephy-activation.Tpo $(DEPDIR)/libephymain_la-ephy-activation.Plo
-- at am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-+ at am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephymain_la_CPPFLAGS) $(CPPFLAGS) $(libephymain_la_CFLAGS) $(CFLAGS) -MT libephymain_la-ephy-activation.lo -MD -MP -MF $(DEPDIR)/libephymain_la-ephy-activation.Tpo -c -o libephymain_la-ephy-activation.lo `test -f 'ephy-activation.c' || echo '$(srcdir)/'`ephy-activation.c
-+ at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libephymain_la-ephy-activation.Tpo $(DEPDIR)/libephymain_la-ephy-activation.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ephy-activation.c' object='libephymain_la-ephy-activation.lo' libtool=yes @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- at am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephymain_la_CPPFLAGS) $(CPPFLAGS) $(libephymain_la_CFLAGS) $(CFLAGS) -c -o libephymain_la-ephy-activation.lo `test -f 'ephy-activation.c' || echo '$(srcdir)/'`ephy-activation.c
-+ at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephymain_la_CPPFLAGS) $(CPPFLAGS) $(libephymain_la_CFLAGS) $(CFLAGS) -c -o libephymain_la-ephy-activation.lo `test -f 'ephy-activation.c' || echo '$(srcdir)/'`ephy-activation.c
- 
- libephymain_la-ephy-action-helper.lo: ephy-action-helper.c
-- at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephymain_la_CPPFLAGS) $(CPPFLAGS) $(libephymain_la_CFLAGS) $(CFLAGS) -MT libephymain_la-ephy-action-helper.lo -MD -MP -MF $(DEPDIR)/libephymain_la-ephy-action-helper.Tpo -c -o libephymain_la-ephy-action-helper.lo `test -f 'ephy-action-helper.c' || echo '$(srcdir)/'`ephy-action-helper.c
-- at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libephymain_la-ephy-action-helper.Tpo $(DEPDIR)/libephymain_la-ephy-action-helper.Plo
-- at am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-+ at am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephymain_la_CPPFLAGS) $(CPPFLAGS) $(libephymain_la_CFLAGS) $(CFLAGS) -MT libephymain_la-ephy-action-helper.lo -MD -MP -MF $(DEPDIR)/libephymain_la-ephy-action-helper.Tpo -c -o libephymain_la-ephy-action-helper.lo `test -f 'ephy-action-helper.c' || echo '$(srcdir)/'`ephy-action-helper.c
-+ at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libephymain_la-ephy-action-helper.Tpo $(DEPDIR)/libephymain_la-ephy-action-helper.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ephy-action-helper.c' object='libephymain_la-ephy-action-helper.lo' libtool=yes @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- at am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephymain_la_CPPFLAGS) $(CPPFLAGS) $(libephymain_la_CFLAGS) $(CFLAGS) -c -o libephymain_la-ephy-action-helper.lo `test -f 'ephy-action-helper.c' || echo '$(srcdir)/'`ephy-action-helper.c
-+ at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephymain_la_CPPFLAGS) $(CPPFLAGS) $(libephymain_la_CFLAGS) $(CFLAGS) -c -o libephymain_la-ephy-action-helper.lo `test -f 'ephy-action-helper.c' || echo '$(srcdir)/'`ephy-action-helper.c
- 
- libephymain_la-ephy-completion-model.lo: ephy-completion-model.c
-- at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephymain_la_CPPFLAGS) $(CPPFLAGS) $(libephymain_la_CFLAGS) $(CFLAGS) -MT libephymain_la-ephy-completion-model.lo -MD -MP -MF $(DEPDIR)/libephymain_la-ephy-completion-model.Tpo -c -o libephymain_la-ephy-completion-model.lo `test -f 'ephy-completion-model.c' || echo '$(srcdir)/'`ephy-completion-model.c
-- at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libephymain_la-ephy-completion-model.Tpo $(DEPDIR)/libephymain_la-ephy-completion-model.Plo
-- at am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-+ at am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephymain_la_CPPFLAGS) $(CPPFLAGS) $(libephymain_la_CFLAGS) $(CFLAGS) -MT libephymain_la-ephy-completion-model.lo -MD -MP -MF $(DEPDIR)/libephymain_la-ephy-completion-model.Tpo -c -o libephymain_la-ephy-completion-model.lo `test -f 'ephy-completion-model.c' || echo '$(srcdir)/'`ephy-completion-model.c
-+ at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libephymain_la-ephy-completion-model.Tpo $(DEPDIR)/libephymain_la-ephy-completion-model.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ephy-completion-model.c' object='libephymain_la-ephy-completion-model.lo' libtool=yes @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- at am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephymain_la_CPPFLAGS) $(CPPFLAGS) $(libephymain_la_CFLAGS) $(CFLAGS) -c -o libephymain_la-ephy-completion-model.lo `test -f 'ephy-completion-model.c' || echo '$(srcdir)/'`ephy-completion-model.c
-+ at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephymain_la_CPPFLAGS) $(CPPFLAGS) $(libephymain_la_CFLAGS) $(CFLAGS) -c -o libephymain_la-ephy-completion-model.lo `test -f 'ephy-completion-model.c' || echo '$(srcdir)/'`ephy-completion-model.c
- 
- libephymain_la-ephy-dbus.lo: ephy-dbus.c
-- at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephymain_la_CPPFLAGS) $(CPPFLAGS) $(libephymain_la_CFLAGS) $(CFLAGS) -MT libephymain_la-ephy-dbus.lo -MD -MP -MF $(DEPDIR)/libephymain_la-ephy-dbus.Tpo -c -o libephymain_la-ephy-dbus.lo `test -f 'ephy-dbus.c' || echo '$(srcdir)/'`ephy-dbus.c
-- at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libephymain_la-ephy-dbus.Tpo $(DEPDIR)/libephymain_la-ephy-dbus.Plo
-- at am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-+ at am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephymain_la_CPPFLAGS) $(CPPFLAGS) $(libephymain_la_CFLAGS) $(CFLAGS) -MT libephymain_la-ephy-dbus.lo -MD -MP -MF $(DEPDIR)/libephymain_la-ephy-dbus.Tpo -c -o libephymain_la-ephy-dbus.lo `test -f 'ephy-dbus.c' || echo '$(srcdir)/'`ephy-dbus.c
-+ at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libephymain_la-ephy-dbus.Tpo $(DEPDIR)/libephymain_la-ephy-dbus.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ephy-dbus.c' object='libephymain_la-ephy-dbus.lo' libtool=yes @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- at am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephymain_la_CPPFLAGS) $(CPPFLAGS) $(libephymain_la_CFLAGS) $(CFLAGS) -c -o libephymain_la-ephy-dbus.lo `test -f 'ephy-dbus.c' || echo '$(srcdir)/'`ephy-dbus.c
-+ at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephymain_la_CPPFLAGS) $(CPPFLAGS) $(libephymain_la_CFLAGS) $(CFLAGS) -c -o libephymain_la-ephy-dbus.lo `test -f 'ephy-dbus.c' || echo '$(srcdir)/'`ephy-dbus.c
- 
- libephymain_la-ephy-encoding-dialog.lo: ephy-encoding-dialog.c
-- at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephymain_la_CPPFLAGS) $(CPPFLAGS) $(libephymain_la_CFLAGS) $(CFLAGS) -MT libephymain_la-ephy-encoding-dialog.lo -MD -MP -MF $(DEPDIR)/libephymain_la-ephy-encoding-dialog.Tpo -c -o libephymain_la-ephy-encoding-dialog.lo `test -f 'ephy-encoding-dialog.c' || echo '$(srcdir)/'`ephy-encoding-dialog.c
-- at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libephymain_la-ephy-encoding-dialog.Tpo $(DEPDIR)/libephymain_la-ephy-encoding-dialog.Plo
-- at am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-+ at am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephymain_la_CPPFLAGS) $(CPPFLAGS) $(libephymain_la_CFLAGS) $(CFLAGS) -MT libephymain_la-ephy-encoding-dialog.lo -MD -MP -MF $(DEPDIR)/libephymain_la-ephy-encoding-dialog.Tpo -c -o libephymain_la-ephy-encoding-dialog.lo `test -f 'ephy-encoding-dialog.c' || echo '$(srcdir)/'`ephy-encoding-dialog.c
-+ at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libephymain_la-ephy-encoding-dialog.Tpo $(DEPDIR)/libephymain_la-ephy-encoding-dialog.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ephy-encoding-dialog.c' object='libephymain_la-ephy-encoding-dialog.lo' libtool=yes @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- at am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephymain_la_CPPFLAGS) $(CPPFLAGS) $(libephymain_la_CFLAGS) $(CFLAGS) -c -o libephymain_la-ephy-encoding-dialog.lo `test -f 'ephy-encoding-dialog.c' || echo '$(srcdir)/'`ephy-encoding-dialog.c
-+ at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephymain_la_CPPFLAGS) $(CPPFLAGS) $(libephymain_la_CFLAGS) $(CFLAGS) -c -o libephymain_la-ephy-encoding-dialog.lo `test -f 'ephy-encoding-dialog.c' || echo '$(srcdir)/'`ephy-encoding-dialog.c
- 
- libephymain_la-ephy-encoding-menu.lo: ephy-encoding-menu.c
-- at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephymain_la_CPPFLAGS) $(CPPFLAGS) $(libephymain_la_CFLAGS) $(CFLAGS) -MT libephymain_la-ephy-encoding-menu.lo -MD -MP -MF $(DEPDIR)/libephymain_la-ephy-encoding-menu.Tpo -c -o libephymain_la-ephy-encoding-menu.lo `test -f 'ephy-encoding-menu.c' || echo '$(srcdir)/'`ephy-encoding-menu.c
-- at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libephymain_la-ephy-encoding-menu.Tpo $(DEPDIR)/libephymain_la-ephy-encoding-menu.Plo
-- at am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-+ at am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephymain_la_CPPFLAGS) $(CPPFLAGS) $(libephymain_la_CFLAGS) $(CFLAGS) -MT libephymain_la-ephy-encoding-menu.lo -MD -MP -MF $(DEPDIR)/libephymain_la-ephy-encoding-menu.Tpo -c -o libephymain_la-ephy-encoding-menu.lo `test -f 'ephy-encoding-menu.c' || echo '$(srcdir)/'`ephy-encoding-menu.c
-+ at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libephymain_la-ephy-encoding-menu.Tpo $(DEPDIR)/libephymain_la-ephy-encoding-menu.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ephy-encoding-menu.c' object='libephymain_la-ephy-encoding-menu.lo' libtool=yes @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- at am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephymain_la_CPPFLAGS) $(CPPFLAGS) $(libephymain_la_CFLAGS) $(CFLAGS) -c -o libephymain_la-ephy-encoding-menu.lo `test -f 'ephy-encoding-menu.c' || echo '$(srcdir)/'`ephy-encoding-menu.c
-+ at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephymain_la_CPPFLAGS) $(CPPFLAGS) $(libephymain_la_CFLAGS) $(CFLAGS) -c -o libephymain_la-ephy-encoding-menu.lo `test -f 'ephy-encoding-menu.c' || echo '$(srcdir)/'`ephy-encoding-menu.c
- 
- libephymain_la-ephy-extension.lo: ephy-extension.c
-- at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephymain_la_CPPFLAGS) $(CPPFLAGS) $(libephymain_la_CFLAGS) $(CFLAGS) -MT libephymain_la-ephy-extension.lo -MD -MP -MF $(DEPDIR)/libephymain_la-ephy-extension.Tpo -c -o libephymain_la-ephy-extension.lo `test -f 'ephy-extension.c' || echo '$(srcdir)/'`ephy-extension.c
-- at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libephymain_la-ephy-extension.Tpo $(DEPDIR)/libephymain_la-ephy-extension.Plo
-- at am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-+ at am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephymain_la_CPPFLAGS) $(CPPFLAGS) $(libephymain_la_CFLAGS) $(CFLAGS) -MT libephymain_la-ephy-extension.lo -MD -MP -MF $(DEPDIR)/libephymain_la-ephy-extension.Tpo -c -o libephymain_la-ephy-extension.lo `test -f 'ephy-extension.c' || echo '$(srcdir)/'`ephy-extension.c
-+ at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libephymain_la-ephy-extension.Tpo $(DEPDIR)/libephymain_la-ephy-extension.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ephy-extension.c' object='libephymain_la-ephy-extension.lo' libtool=yes @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- at am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephymain_la_CPPFLAGS) $(CPPFLAGS) $(libephymain_la_CFLAGS) $(CFLAGS) -c -o libephymain_la-ephy-extension.lo `test -f 'ephy-extension.c' || echo '$(srcdir)/'`ephy-extension.c
-+ at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephymain_la_CPPFLAGS) $(CPPFLAGS) $(libephymain_la_CFLAGS) $(CFLAGS) -c -o libephymain_la-ephy-extension.lo `test -f 'ephy-extension.c' || echo '$(srcdir)/'`ephy-extension.c
- 
- libephymain_la-ephy-extensions-manager.lo: ephy-extensions-manager.c
-- at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephymain_la_CPPFLAGS) $(CPPFLAGS) $(libephymain_la_CFLAGS) $(CFLAGS) -MT libephymain_la-ephy-extensions-manager.lo -MD -MP -MF $(DEPDIR)/libephymain_la-ephy-extensions-manager.Tpo -c -o libephymain_la-ephy-extensions-manager.lo `test -f 'ephy-extensions-manager.c' || echo '$(srcdir)/'`ephy-extensions-manager.c
-- at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libephymain_la-ephy-extensions-manager.Tpo $(DEPDIR)/libephymain_la-ephy-extensions-manager.Plo
-- at am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-+ at am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephymain_la_CPPFLAGS) $(CPPFLAGS) $(libephymain_la_CFLAGS) $(CFLAGS) -MT libephymain_la-ephy-extensions-manager.lo -MD -MP -MF $(DEPDIR)/libephymain_la-ephy-extensions-manager.Tpo -c -o libephymain_la-ephy-extensions-manager.lo `test -f 'ephy-extensions-manager.c' || echo '$(srcdir)/'`ephy-extensions-manager.c
-+ at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libephymain_la-ephy-extensions-manager.Tpo $(DEPDIR)/libephymain_la-ephy-extensions-manager.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ephy-extensions-manager.c' object='libephymain_la-ephy-extensions-manager.lo' libtool=yes @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- at am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephymain_la_CPPFLAGS) $(CPPFLAGS) $(libephymain_la_CFLAGS) $(CFLAGS) -c -o libephymain_la-ephy-extensions-manager.lo `test -f 'ephy-extensions-manager.c' || echo '$(srcdir)/'`ephy-extensions-manager.c
-+ at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephymain_la_CPPFLAGS) $(CPPFLAGS) $(libephymain_la_CFLAGS) $(CFLAGS) -c -o libephymain_la-ephy-extensions-manager.lo `test -f 'ephy-extensions-manager.c' || echo '$(srcdir)/'`ephy-extensions-manager.c
- 
- libephymain_la-ephy-find-toolbar.lo: ephy-find-toolbar.c
-- at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephymain_la_CPPFLAGS) $(CPPFLAGS) $(libephymain_la_CFLAGS) $(CFLAGS) -MT libephymain_la-ephy-find-toolbar.lo -MD -MP -MF $(DEPDIR)/libephymain_la-ephy-find-toolbar.Tpo -c -o libephymain_la-ephy-find-toolbar.lo `test -f 'ephy-find-toolbar.c' || echo '$(srcdir)/'`ephy-find-toolbar.c
-- at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libephymain_la-ephy-find-toolbar.Tpo $(DEPDIR)/libephymain_la-ephy-find-toolbar.Plo
-- at am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-+ at am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephymain_la_CPPFLAGS) $(CPPFLAGS) $(libephymain_la_CFLAGS) $(CFLAGS) -MT libephymain_la-ephy-find-toolbar.lo -MD -MP -MF $(DEPDIR)/libephymain_la-ephy-find-toolbar.Tpo -c -o libephymain_la-ephy-find-toolbar.lo `test -f 'ephy-find-toolbar.c' || echo '$(srcdir)/'`ephy-find-toolbar.c
-+ at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libephymain_la-ephy-find-toolbar.Tpo $(DEPDIR)/libephymain_la-ephy-find-toolbar.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ephy-find-toolbar.c' object='libephymain_la-ephy-find-toolbar.lo' libtool=yes @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- at am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephymain_la_CPPFLAGS) $(CPPFLAGS) $(libephymain_la_CFLAGS) $(CFLAGS) -c -o libephymain_la-ephy-find-toolbar.lo `test -f 'ephy-find-toolbar.c' || echo '$(srcdir)/'`ephy-find-toolbar.c
-+ at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephymain_la_CPPFLAGS) $(CPPFLAGS) $(libephymain_la_CFLAGS) $(CFLAGS) -c -o libephymain_la-ephy-find-toolbar.lo `test -f 'ephy-find-toolbar.c' || echo '$(srcdir)/'`ephy-find-toolbar.c
- 
- libephymain_la-ephy-fullscreen-popup.lo: ephy-fullscreen-popup.c
-- at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephymain_la_CPPFLAGS) $(CPPFLAGS) $(libephymain_la_CFLAGS) $(CFLAGS) -MT libephymain_la-ephy-fullscreen-popup.lo -MD -MP -MF $(DEPDIR)/libephymain_la-ephy-fullscreen-popup.Tpo -c -o libephymain_la-ephy-fullscreen-popup.lo `test -f 'ephy-fullscreen-popup.c' || echo '$(srcdir)/'`ephy-fullscreen-popup.c
-- at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libephymain_la-ephy-fullscreen-popup.Tpo $(DEPDIR)/libephymain_la-ephy-fullscreen-popup.Plo
-- at am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-+ at am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephymain_la_CPPFLAGS) $(CPPFLAGS) $(libephymain_la_CFLAGS) $(CFLAGS) -MT libephymain_la-ephy-fullscreen-popup.lo -MD -MP -MF $(DEPDIR)/libephymain_la-ephy-fullscreen-popup.Tpo -c -o libephymain_la-ephy-fullscreen-popup.lo `test -f 'ephy-fullscreen-popup.c' || echo '$(srcdir)/'`ephy-fullscreen-popup.c
-+ at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libephymain_la-ephy-fullscreen-popup.Tpo $(DEPDIR)/libephymain_la-ephy-fullscreen-popup.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ephy-fullscreen-popup.c' object='libephymain_la-ephy-fullscreen-popup.lo' libtool=yes @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- at am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephymain_la_CPPFLAGS) $(CPPFLAGS) $(libephymain_la_CFLAGS) $(CFLAGS) -c -o libephymain_la-ephy-fullscreen-popup.lo `test -f 'ephy-fullscreen-popup.c' || echo '$(srcdir)/'`ephy-fullscreen-popup.c
-+ at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephymain_la_CPPFLAGS) $(CPPFLAGS) $(libephymain_la_CFLAGS) $(CFLAGS) -c -o libephymain_la-ephy-fullscreen-popup.lo `test -f 'ephy-fullscreen-popup.c' || echo '$(srcdir)/'`ephy-fullscreen-popup.c
- 
- libephymain_la-ephy-go-action.lo: ephy-go-action.c
-- at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephymain_la_CPPFLAGS) $(CPPFLAGS) $(libephymain_la_CFLAGS) $(CFLAGS) -MT libephymain_la-ephy-go-action.lo -MD -MP -MF $(DEPDIR)/libephymain_la-ephy-go-action.Tpo -c -o libephymain_la-ephy-go-action.lo `test -f 'ephy-go-action.c' || echo '$(srcdir)/'`ephy-go-action.c
-- at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libephymain_la-ephy-go-action.Tpo $(DEPDIR)/libephymain_la-ephy-go-action.Plo
-- at am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-+ at am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephymain_la_CPPFLAGS) $(CPPFLAGS) $(libephymain_la_CFLAGS) $(CFLAGS) -MT libephymain_la-ephy-go-action.lo -MD -MP -MF $(DEPDIR)/libephymain_la-ephy-go-action.Tpo -c -o libephymain_la-ephy-go-action.lo `test -f 'ephy-go-action.c' || echo '$(srcdir)/'`ephy-go-action.c
-+ at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libephymain_la-ephy-go-action.Tpo $(DEPDIR)/libephymain_la-ephy-go-action.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ephy-go-action.c' object='libephymain_la-ephy-go-action.lo' libtool=yes @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- at am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephymain_la_CPPFLAGS) $(CPPFLAGS) $(libephymain_la_CFLAGS) $(CFLAGS) -c -o libephymain_la-ephy-go-action.lo `test -f 'ephy-go-action.c' || echo '$(srcdir)/'`ephy-go-action.c
-+ at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephymain_la_CPPFLAGS) $(CPPFLAGS) $(libephymain_la_CFLAGS) $(CFLAGS) -c -o libephymain_la-ephy-go-action.lo `test -f 'ephy-go-action.c' || echo '$(srcdir)/'`ephy-go-action.c
- 
- libephymain_la-ephy-home-action.lo: ephy-home-action.c
-- at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephymain_la_CPPFLAGS) $(CPPFLAGS) $(libephymain_la_CFLAGS) $(CFLAGS) -MT libephymain_la-ephy-home-action.lo -MD -MP -MF $(DEPDIR)/libephymain_la-ephy-home-action.Tpo -c -o libephymain_la-ephy-home-action.lo `test -f 'ephy-home-action.c' || echo '$(srcdir)/'`ephy-home-action.c
-- at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libephymain_la-ephy-home-action.Tpo $(DEPDIR)/libephymain_la-ephy-home-action.Plo
-- at am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-+ at am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephymain_la_CPPFLAGS) $(CPPFLAGS) $(libephymain_la_CFLAGS) $(CFLAGS) -MT libephymain_la-ephy-home-action.lo -MD -MP -MF $(DEPDIR)/libephymain_la-ephy-home-action.Tpo -c -o libephymain_la-ephy-home-action.lo `test -f 'ephy-home-action.c' || echo '$(srcdir)/'`ephy-home-action.c
-+ at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libephymain_la-ephy-home-action.Tpo $(DEPDIR)/libephymain_la-ephy-home-action.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ephy-home-action.c' object='libephymain_la-ephy-home-action.lo' libtool=yes @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- at am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephymain_la_CPPFLAGS) $(CPPFLAGS) $(libephymain_la_CFLAGS) $(CFLAGS) -c -o libephymain_la-ephy-home-action.lo `test -f 'ephy-home-action.c' || echo '$(srcdir)/'`ephy-home-action.c
-+ at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephymain_la_CPPFLAGS) $(CPPFLAGS) $(libephymain_la_CFLAGS) $(CFLAGS) -c -o libephymain_la-ephy-home-action.lo `test -f 'ephy-home-action.c' || echo '$(srcdir)/'`ephy-home-action.c
- 
- libephymain_la-ephy-history-window.lo: ephy-history-window.c
-- at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephymain_la_CPPFLAGS) $(CPPFLAGS) $(libephymain_la_CFLAGS) $(CFLAGS) -MT libephymain_la-ephy-history-window.lo -MD -MP -MF $(DEPDIR)/libephymain_la-ephy-history-window.Tpo -c -o libephymain_la-ephy-history-window.lo `test -f 'ephy-history-window.c' || echo '$(srcdir)/'`ephy-history-window.c
-- at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libephymain_la-ephy-history-window.Tpo $(DEPDIR)/libephymain_la-ephy-history-window.Plo
-- at am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-+ at am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephymain_la_CPPFLAGS) $(CPPFLAGS) $(libephymain_la_CFLAGS) $(CFLAGS) -MT libephymain_la-ephy-history-window.lo -MD -MP -MF $(DEPDIR)/libephymain_la-ephy-history-window.Tpo -c -o libephymain_la-ephy-history-window.lo `test -f 'ephy-history-window.c' || echo '$(srcdir)/'`ephy-history-window.c
-+ at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libephymain_la-ephy-history-window.Tpo $(DEPDIR)/libephymain_la-ephy-history-window.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ephy-history-window.c' object='libephymain_la-ephy-history-window.lo' libtool=yes @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- at am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephymain_la_CPPFLAGS) $(CPPFLAGS) $(libephymain_la_CFLAGS) $(CFLAGS) -c -o libephymain_la-ephy-history-window.lo `test -f 'ephy-history-window.c' || echo '$(srcdir)/'`ephy-history-window.c
-+ at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephymain_la_CPPFLAGS) $(CPPFLAGS) $(libephymain_la_CFLAGS) $(CFLAGS) -c -o libephymain_la-ephy-history-window.lo `test -f 'ephy-history-window.c' || echo '$(srcdir)/'`ephy-history-window.c
- 
- libephymain_la-ephy-link.lo: ephy-link.c
-- at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephymain_la_CPPFLAGS) $(CPPFLAGS) $(libephymain_la_CFLAGS) $(CFLAGS) -MT libephymain_la-ephy-link.lo -MD -MP -MF $(DEPDIR)/libephymain_la-ephy-link.Tpo -c -o libephymain_la-ephy-link.lo `test -f 'ephy-link.c' || echo '$(srcdir)/'`ephy-link.c
-- at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libephymain_la-ephy-link.Tpo $(DEPDIR)/libephymain_la-ephy-link.Plo
-- at am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-+ at am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephymain_la_CPPFLAGS) $(CPPFLAGS) $(libephymain_la_CFLAGS) $(CFLAGS) -MT libephymain_la-ephy-link.lo -MD -MP -MF $(DEPDIR)/libephymain_la-ephy-link.Tpo -c -o libephymain_la-ephy-link.lo `test -f 'ephy-link.c' || echo '$(srcdir)/'`ephy-link.c
-+ at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libephymain_la-ephy-link.Tpo $(DEPDIR)/libephymain_la-ephy-link.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ephy-link.c' object='libephymain_la-ephy-link.lo' libtool=yes @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- at am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephymain_la_CPPFLAGS) $(CPPFLAGS) $(libephymain_la_CFLAGS) $(CFLAGS) -c -o libephymain_la-ephy-link.lo `test -f 'ephy-link.c' || echo '$(srcdir)/'`ephy-link.c
-+ at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephymain_la_CPPFLAGS) $(CPPFLAGS) $(libephymain_la_CFLAGS) $(CFLAGS) -c -o libephymain_la-ephy-link.lo `test -f 'ephy-link.c' || echo '$(srcdir)/'`ephy-link.c
- 
- libephymain_la-ephy-link-action.lo: ephy-link-action.c
-- at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephymain_la_CPPFLAGS) $(CPPFLAGS) $(libephymain_la_CFLAGS) $(CFLAGS) -MT libephymain_la-ephy-link-action.lo -MD -MP -MF $(DEPDIR)/libephymain_la-ephy-link-action.Tpo -c -o libephymain_la-ephy-link-action.lo `test -f 'ephy-link-action.c' || echo '$(srcdir)/'`ephy-link-action.c
-- at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libephymain_la-ephy-link-action.Tpo $(DEPDIR)/libephymain_la-ephy-link-action.Plo
-- at am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-+ at am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephymain_la_CPPFLAGS) $(CPPFLAGS) $(libephymain_la_CFLAGS) $(CFLAGS) -MT libephymain_la-ephy-link-action.lo -MD -MP -MF $(DEPDIR)/libephymain_la-ephy-link-action.Tpo -c -o libephymain_la-ephy-link-action.lo `test -f 'ephy-link-action.c' || echo '$(srcdir)/'`ephy-link-action.c
-+ at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libephymain_la-ephy-link-action.Tpo $(DEPDIR)/libephymain_la-ephy-link-action.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ephy-link-action.c' object='libephymain_la-ephy-link-action.lo' libtool=yes @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- at am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephymain_la_CPPFLAGS) $(CPPFLAGS) $(libephymain_la_CFLAGS) $(CFLAGS) -c -o libephymain_la-ephy-link-action.lo `test -f 'ephy-link-action.c' || echo '$(srcdir)/'`ephy-link-action.c
-+ at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephymain_la_CPPFLAGS) $(CPPFLAGS) $(libephymain_la_CFLAGS) $(CFLAGS) -c -o libephymain_la-ephy-link-action.lo `test -f 'ephy-link-action.c' || echo '$(srcdir)/'`ephy-link-action.c
- 
- libephymain_la-ephy-location-action.lo: ephy-location-action.c
-- at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephymain_la_CPPFLAGS) $(CPPFLAGS) $(libephymain_la_CFLAGS) $(CFLAGS) -MT libephymain_la-ephy-location-action.lo -MD -MP -MF $(DEPDIR)/libephymain_la-ephy-location-action.Tpo -c -o libephymain_la-ephy-location-action.lo `test -f 'ephy-location-action.c' || echo '$(srcdir)/'`ephy-location-action.c
-- at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libephymain_la-ephy-location-action.Tpo $(DEPDIR)/libephymain_la-ephy-location-action.Plo
-- at am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-+ at am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephymain_la_CPPFLAGS) $(CPPFLAGS) $(libephymain_la_CFLAGS) $(CFLAGS) -MT libephymain_la-ephy-location-action.lo -MD -MP -MF $(DEPDIR)/libephymain_la-ephy-location-action.Tpo -c -o libephymain_la-ephy-location-action.lo `test -f 'ephy-location-action.c' || echo '$(srcdir)/'`ephy-location-action.c
-+ at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libephymain_la-ephy-location-action.Tpo $(DEPDIR)/libephymain_la-ephy-location-action.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ephy-location-action.c' object='libephymain_la-ephy-location-action.lo' libtool=yes @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- at am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephymain_la_CPPFLAGS) $(CPPFLAGS) $(libephymain_la_CFLAGS) $(CFLAGS) -c -o libephymain_la-ephy-location-action.lo `test -f 'ephy-location-action.c' || echo '$(srcdir)/'`ephy-location-action.c
-+ at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephymain_la_CPPFLAGS) $(CPPFLAGS) $(libephymain_la_CFLAGS) $(CFLAGS) -c -o libephymain_la-ephy-location-action.lo `test -f 'ephy-location-action.c' || echo '$(srcdir)/'`ephy-location-action.c
- 
- libephymain_la-ephy-lockdown.lo: ephy-lockdown.c
-- at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephymain_la_CPPFLAGS) $(CPPFLAGS) $(libephymain_la_CFLAGS) $(CFLAGS) -MT libephymain_la-ephy-lockdown.lo -MD -MP -MF $(DEPDIR)/libephymain_la-ephy-lockdown.Tpo -c -o libephymain_la-ephy-lockdown.lo `test -f 'ephy-lockdown.c' || echo '$(srcdir)/'`ephy-lockdown.c
-- at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libephymain_la-ephy-lockdown.Tpo $(DEPDIR)/libephymain_la-ephy-lockdown.Plo
-- at am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-+ at am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephymain_la_CPPFLAGS) $(CPPFLAGS) $(libephymain_la_CFLAGS) $(CFLAGS) -MT libephymain_la-ephy-lockdown.lo -MD -MP -MF $(DEPDIR)/libephymain_la-ephy-lockdown.Tpo -c -o libephymain_la-ephy-lockdown.lo `test -f 'ephy-lockdown.c' || echo '$(srcdir)/'`ephy-lockdown.c
-+ at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libephymain_la-ephy-lockdown.Tpo $(DEPDIR)/libephymain_la-ephy-lockdown.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ephy-lockdown.c' object='libephymain_la-ephy-lockdown.lo' libtool=yes @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- at am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephymain_la_CPPFLAGS) $(CPPFLAGS) $(libephymain_la_CFLAGS) $(CFLAGS) -c -o libephymain_la-ephy-lockdown.lo `test -f 'ephy-lockdown.c' || echo '$(srcdir)/'`ephy-lockdown.c
-+ at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephymain_la_CPPFLAGS) $(CPPFLAGS) $(libephymain_la_CFLAGS) $(CFLAGS) -c -o libephymain_la-ephy-lockdown.lo `test -f 'ephy-lockdown.c' || echo '$(srcdir)/'`ephy-lockdown.c
- 
- libephymain_la-ephy-navigation-action.lo: ephy-navigation-action.c
-- at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephymain_la_CPPFLAGS) $(CPPFLAGS) $(libephymain_la_CFLAGS) $(CFLAGS) -MT libephymain_la-ephy-navigation-action.lo -MD -MP -MF $(DEPDIR)/libephymain_la-ephy-navigation-action.Tpo -c -o libephymain_la-ephy-navigation-action.lo `test -f 'ephy-navigation-action.c' || echo '$(srcdir)/'`ephy-navigation-action.c
-- at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libephymain_la-ephy-navigation-action.Tpo $(DEPDIR)/libephymain_la-ephy-navigation-action.Plo
-- at am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-+ at am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephymain_la_CPPFLAGS) $(CPPFLAGS) $(libephymain_la_CFLAGS) $(CFLAGS) -MT libephymain_la-ephy-navigation-action.lo -MD -MP -MF $(DEPDIR)/libephymain_la-ephy-navigation-action.Tpo -c -o libephymain_la-ephy-navigation-action.lo `test -f 'ephy-navigation-action.c' || echo '$(srcdir)/'`ephy-navigation-action.c
-+ at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libephymain_la-ephy-navigation-action.Tpo $(DEPDIR)/libephymain_la-ephy-navigation-action.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ephy-navigation-action.c' object='libephymain_la-ephy-navigation-action.lo' libtool=yes @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- at am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephymain_la_CPPFLAGS) $(CPPFLAGS) $(libephymain_la_CFLAGS) $(CFLAGS) -c -o libephymain_la-ephy-navigation-action.lo `test -f 'ephy-navigation-action.c' || echo '$(srcdir)/'`ephy-navigation-action.c
-+ at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephymain_la_CPPFLAGS) $(CPPFLAGS) $(libephymain_la_CFLAGS) $(CFLAGS) -c -o libephymain_la-ephy-navigation-action.lo `test -f 'ephy-navigation-action.c' || echo '$(srcdir)/'`ephy-navigation-action.c
- 
- libephymain_la-ephy-notebook.lo: ephy-notebook.c
-- at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephymain_la_CPPFLAGS) $(CPPFLAGS) $(libephymain_la_CFLAGS) $(CFLAGS) -MT libephymain_la-ephy-notebook.lo -MD -MP -MF $(DEPDIR)/libephymain_la-ephy-notebook.Tpo -c -o libephymain_la-ephy-notebook.lo `test -f 'ephy-notebook.c' || echo '$(srcdir)/'`ephy-notebook.c
-- at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libephymain_la-ephy-notebook.Tpo $(DEPDIR)/libephymain_la-ephy-notebook.Plo
-- at am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-+ at am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephymain_la_CPPFLAGS) $(CPPFLAGS) $(libephymain_la_CFLAGS) $(CFLAGS) -MT libephymain_la-ephy-notebook.lo -MD -MP -MF $(DEPDIR)/libephymain_la-ephy-notebook.Tpo -c -o libephymain_la-ephy-notebook.lo `test -f 'ephy-notebook.c' || echo '$(srcdir)/'`ephy-notebook.c
-+ at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libephymain_la-ephy-notebook.Tpo $(DEPDIR)/libephymain_la-ephy-notebook.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ephy-notebook.c' object='libephymain_la-ephy-notebook.lo' libtool=yes @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- at am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephymain_la_CPPFLAGS) $(CPPFLAGS) $(libephymain_la_CFLAGS) $(CFLAGS) -c -o libephymain_la-ephy-notebook.lo `test -f 'ephy-notebook.c' || echo '$(srcdir)/'`ephy-notebook.c
-+ at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephymain_la_CPPFLAGS) $(CPPFLAGS) $(libephymain_la_CFLAGS) $(CFLAGS) -c -o libephymain_la-ephy-notebook.lo `test -f 'ephy-notebook.c' || echo '$(srcdir)/'`ephy-notebook.c
- 
- libephymain_la-ephy-profile-migration.lo: ephy-profile-migration.c
-- at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephymain_la_CPPFLAGS) $(CPPFLAGS) $(libephymain_la_CFLAGS) $(CFLAGS) -MT libephymain_la-ephy-profile-migration.lo -MD -MP -MF $(DEPDIR)/libephymain_la-ephy-profile-migration.Tpo -c -o libephymain_la-ephy-profile-migration.lo `test -f 'ephy-profile-migration.c' || echo '$(srcdir)/'`ephy-profile-migration.c
-- at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libephymain_la-ephy-profile-migration.Tpo $(DEPDIR)/libephymain_la-ephy-profile-migration.Plo
-- at am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-+ at am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephymain_la_CPPFLAGS) $(CPPFLAGS) $(libephymain_la_CFLAGS) $(CFLAGS) -MT libephymain_la-ephy-profile-migration.lo -MD -MP -MF $(DEPDIR)/libephymain_la-ephy-profile-migration.Tpo -c -o libephymain_la-ephy-profile-migration.lo `test -f 'ephy-profile-migration.c' || echo '$(srcdir)/'`ephy-profile-migration.c
-+ at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libephymain_la-ephy-profile-migration.Tpo $(DEPDIR)/libephymain_la-ephy-profile-migration.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ephy-profile-migration.c' object='libephymain_la-ephy-profile-migration.lo' libtool=yes @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- at am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephymain_la_CPPFLAGS) $(CPPFLAGS) $(libephymain_la_CFLAGS) $(CFLAGS) -c -o libephymain_la-ephy-profile-migration.lo `test -f 'ephy-profile-migration.c' || echo '$(srcdir)/'`ephy-profile-migration.c
-+ at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephymain_la_CPPFLAGS) $(CPPFLAGS) $(libephymain_la_CFLAGS) $(CFLAGS) -c -o libephymain_la-ephy-profile-migration.lo `test -f 'ephy-profile-migration.c' || echo '$(srcdir)/'`ephy-profile-migration.c
- 
- libephymain_la-ephy-session.lo: ephy-session.c
-- at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephymain_la_CPPFLAGS) $(CPPFLAGS) $(libephymain_la_CFLAGS) $(CFLAGS) -MT libephymain_la-ephy-session.lo -MD -MP -MF $(DEPDIR)/libephymain_la-ephy-session.Tpo -c -o libephymain_la-ephy-session.lo `test -f 'ephy-session.c' || echo '$(srcdir)/'`ephy-session.c
-- at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libephymain_la-ephy-session.Tpo $(DEPDIR)/libephymain_la-ephy-session.Plo
-- at am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-+ at am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephymain_la_CPPFLAGS) $(CPPFLAGS) $(libephymain_la_CFLAGS) $(CFLAGS) -MT libephymain_la-ephy-session.lo -MD -MP -MF $(DEPDIR)/libephymain_la-ephy-session.Tpo -c -o libephymain_la-ephy-session.lo `test -f 'ephy-session.c' || echo '$(srcdir)/'`ephy-session.c
-+ at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libephymain_la-ephy-session.Tpo $(DEPDIR)/libephymain_la-ephy-session.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ephy-session.c' object='libephymain_la-ephy-session.lo' libtool=yes @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- at am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephymain_la_CPPFLAGS) $(CPPFLAGS) $(libephymain_la_CFLAGS) $(CFLAGS) -c -o libephymain_la-ephy-session.lo `test -f 'ephy-session.c' || echo '$(srcdir)/'`ephy-session.c
-+ at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephymain_la_CPPFLAGS) $(CPPFLAGS) $(libephymain_la_CFLAGS) $(CFLAGS) -c -o libephymain_la-ephy-session.lo `test -f 'ephy-session.c' || echo '$(srcdir)/'`ephy-session.c
- 
- libephymain_la-ephy-shell.lo: ephy-shell.c
-- at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephymain_la_CPPFLAGS) $(CPPFLAGS) $(libephymain_la_CFLAGS) $(CFLAGS) -MT libephymain_la-ephy-shell.lo -MD -MP -MF $(DEPDIR)/libephymain_la-ephy-shell.Tpo -c -o libephymain_la-ephy-shell.lo `test -f 'ephy-shell.c' || echo '$(srcdir)/'`ephy-shell.c
-- at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libephymain_la-ephy-shell.Tpo $(DEPDIR)/libephymain_la-ephy-shell.Plo
-- at am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-+ at am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephymain_la_CPPFLAGS) $(CPPFLAGS) $(libephymain_la_CFLAGS) $(CFLAGS) -MT libephymain_la-ephy-shell.lo -MD -MP -MF $(DEPDIR)/libephymain_la-ephy-shell.Tpo -c -o libephymain_la-ephy-shell.lo `test -f 'ephy-shell.c' || echo '$(srcdir)/'`ephy-shell.c
-+ at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libephymain_la-ephy-shell.Tpo $(DEPDIR)/libephymain_la-ephy-shell.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ephy-shell.c' object='libephymain_la-ephy-shell.lo' libtool=yes @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- at am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephymain_la_CPPFLAGS) $(CPPFLAGS) $(libephymain_la_CFLAGS) $(CFLAGS) -c -o libephymain_la-ephy-shell.lo `test -f 'ephy-shell.c' || echo '$(srcdir)/'`ephy-shell.c
-+ at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephymain_la_CPPFLAGS) $(CPPFLAGS) $(libephymain_la_CFLAGS) $(CFLAGS) -c -o libephymain_la-ephy-shell.lo `test -f 'ephy-shell.c' || echo '$(srcdir)/'`ephy-shell.c
- 
- libephymain_la-ephy-statusbar.lo: ephy-statusbar.c
-- at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephymain_la_CPPFLAGS) $(CPPFLAGS) $(libephymain_la_CFLAGS) $(CFLAGS) -MT libephymain_la-ephy-statusbar.lo -MD -MP -MF $(DEPDIR)/libephymain_la-ephy-statusbar.Tpo -c -o libephymain_la-ephy-statusbar.lo `test -f 'ephy-statusbar.c' || echo '$(srcdir)/'`ephy-statusbar.c
-- at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libephymain_la-ephy-statusbar.Tpo $(DEPDIR)/libephymain_la-ephy-statusbar.Plo
-- at am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-+ at am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephymain_la_CPPFLAGS) $(CPPFLAGS) $(libephymain_la_CFLAGS) $(CFLAGS) -MT libephymain_la-ephy-statusbar.lo -MD -MP -MF $(DEPDIR)/libephymain_la-ephy-statusbar.Tpo -c -o libephymain_la-ephy-statusbar.lo `test -f 'ephy-statusbar.c' || echo '$(srcdir)/'`ephy-statusbar.c
-+ at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libephymain_la-ephy-statusbar.Tpo $(DEPDIR)/libephymain_la-ephy-statusbar.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ephy-statusbar.c' object='libephymain_la-ephy-statusbar.lo' libtool=yes @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- at am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephymain_la_CPPFLAGS) $(CPPFLAGS) $(libephymain_la_CFLAGS) $(CFLAGS) -c -o libephymain_la-ephy-statusbar.lo `test -f 'ephy-statusbar.c' || echo '$(srcdir)/'`ephy-statusbar.c
-+ at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephymain_la_CPPFLAGS) $(CPPFLAGS) $(libephymain_la_CFLAGS) $(CFLAGS) -c -o libephymain_la-ephy-statusbar.lo `test -f 'ephy-statusbar.c' || echo '$(srcdir)/'`ephy-statusbar.c
- 
- libephymain_la-ephy-tabs-menu.lo: ephy-tabs-menu.c
-- at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephymain_la_CPPFLAGS) $(CPPFLAGS) $(libephymain_la_CFLAGS) $(CFLAGS) -MT libephymain_la-ephy-tabs-menu.lo -MD -MP -MF $(DEPDIR)/libephymain_la-ephy-tabs-menu.Tpo -c -o libephymain_la-ephy-tabs-menu.lo `test -f 'ephy-tabs-menu.c' || echo '$(srcdir)/'`ephy-tabs-menu.c
-- at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libephymain_la-ephy-tabs-menu.Tpo $(DEPDIR)/libephymain_la-ephy-tabs-menu.Plo
-- at am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-+ at am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephymain_la_CPPFLAGS) $(CPPFLAGS) $(libephymain_la_CFLAGS) $(CFLAGS) -MT libephymain_la-ephy-tabs-menu.lo -MD -MP -MF $(DEPDIR)/libephymain_la-ephy-tabs-menu.Tpo -c -o libephymain_la-ephy-tabs-menu.lo `test -f 'ephy-tabs-menu.c' || echo '$(srcdir)/'`ephy-tabs-menu.c
-+ at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libephymain_la-ephy-tabs-menu.Tpo $(DEPDIR)/libephymain_la-ephy-tabs-menu.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ephy-tabs-menu.c' object='libephymain_la-ephy-tabs-menu.lo' libtool=yes @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- at am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephymain_la_CPPFLAGS) $(CPPFLAGS) $(libephymain_la_CFLAGS) $(CFLAGS) -c -o libephymain_la-ephy-tabs-menu.lo `test -f 'ephy-tabs-menu.c' || echo '$(srcdir)/'`ephy-tabs-menu.c
-+ at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephymain_la_CPPFLAGS) $(CPPFLAGS) $(libephymain_la_CFLAGS) $(CFLAGS) -c -o libephymain_la-ephy-tabs-menu.lo `test -f 'ephy-tabs-menu.c' || echo '$(srcdir)/'`ephy-tabs-menu.c
- 
- libephymain_la-ephy-toolbars-model.lo: ephy-toolbars-model.c
-- at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephymain_la_CPPFLAGS) $(CPPFLAGS) $(libephymain_la_CFLAGS) $(CFLAGS) -MT libephymain_la-ephy-toolbars-model.lo -MD -MP -MF $(DEPDIR)/libephymain_la-ephy-toolbars-model.Tpo -c -o libephymain_la-ephy-toolbars-model.lo `test -f 'ephy-toolbars-model.c' || echo '$(srcdir)/'`ephy-toolbars-model.c
-- at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libephymain_la-ephy-toolbars-model.Tpo $(DEPDIR)/libephymain_la-ephy-toolbars-model.Plo
-- at am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-+ at am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephymain_la_CPPFLAGS) $(CPPFLAGS) $(libephymain_la_CFLAGS) $(CFLAGS) -MT libephymain_la-ephy-toolbars-model.lo -MD -MP -MF $(DEPDIR)/libephymain_la-ephy-toolbars-model.Tpo -c -o libephymain_la-ephy-toolbars-model.lo `test -f 'ephy-toolbars-model.c' || echo '$(srcdir)/'`ephy-toolbars-model.c
-+ at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libephymain_la-ephy-toolbars-model.Tpo $(DEPDIR)/libephymain_la-ephy-toolbars-model.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ephy-toolbars-model.c' object='libephymain_la-ephy-toolbars-model.lo' libtool=yes @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- at am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephymain_la_CPPFLAGS) $(CPPFLAGS) $(libephymain_la_CFLAGS) $(CFLAGS) -c -o libephymain_la-ephy-toolbars-model.lo `test -f 'ephy-toolbars-model.c' || echo '$(srcdir)/'`ephy-toolbars-model.c
-+ at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephymain_la_CPPFLAGS) $(CPPFLAGS) $(libephymain_la_CFLAGS) $(CFLAGS) -c -o libephymain_la-ephy-toolbars-model.lo `test -f 'ephy-toolbars-model.c' || echo '$(srcdir)/'`ephy-toolbars-model.c
- 
- libephymain_la-ephy-toolbar.lo: ephy-toolbar.c
-- at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephymain_la_CPPFLAGS) $(CPPFLAGS) $(libephymain_la_CFLAGS) $(CFLAGS) -MT libephymain_la-ephy-toolbar.lo -MD -MP -MF $(DEPDIR)/libephymain_la-ephy-toolbar.Tpo -c -o libephymain_la-ephy-toolbar.lo `test -f 'ephy-toolbar.c' || echo '$(srcdir)/'`ephy-toolbar.c
-- at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libephymain_la-ephy-toolbar.Tpo $(DEPDIR)/libephymain_la-ephy-toolbar.Plo
-- at am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-+ at am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephymain_la_CPPFLAGS) $(CPPFLAGS) $(libephymain_la_CFLAGS) $(CFLAGS) -MT libephymain_la-ephy-toolbar.lo -MD -MP -MF $(DEPDIR)/libephymain_la-ephy-toolbar.Tpo -c -o libephymain_la-ephy-toolbar.lo `test -f 'ephy-toolbar.c' || echo '$(srcdir)/'`ephy-toolbar.c
-+ at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libephymain_la-ephy-toolbar.Tpo $(DEPDIR)/libephymain_la-ephy-toolbar.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ephy-toolbar.c' object='libephymain_la-ephy-toolbar.lo' libtool=yes @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- at am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephymain_la_CPPFLAGS) $(CPPFLAGS) $(libephymain_la_CFLAGS) $(CFLAGS) -c -o libephymain_la-ephy-toolbar.lo `test -f 'ephy-toolbar.c' || echo '$(srcdir)/'`ephy-toolbar.c
-+ at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephymain_la_CPPFLAGS) $(CPPFLAGS) $(libephymain_la_CFLAGS) $(CFLAGS) -c -o libephymain_la-ephy-toolbar.lo `test -f 'ephy-toolbar.c' || echo '$(srcdir)/'`ephy-toolbar.c
- 
- libephymain_la-ephy-toolbar-editor.lo: ephy-toolbar-editor.c
-- at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephymain_la_CPPFLAGS) $(CPPFLAGS) $(libephymain_la_CFLAGS) $(CFLAGS) -MT libephymain_la-ephy-toolbar-editor.lo -MD -MP -MF $(DEPDIR)/libephymain_la-ephy-toolbar-editor.Tpo -c -o libephymain_la-ephy-toolbar-editor.lo `test -f 'ephy-toolbar-editor.c' || echo '$(srcdir)/'`ephy-toolbar-editor.c
-- at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libephymain_la-ephy-toolbar-editor.Tpo $(DEPDIR)/libephymain_la-ephy-toolbar-editor.Plo
-- at am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-+ at am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephymain_la_CPPFLAGS) $(CPPFLAGS) $(libephymain_la_CFLAGS) $(CFLAGS) -MT libephymain_la-ephy-toolbar-editor.lo -MD -MP -MF $(DEPDIR)/libephymain_la-ephy-toolbar-editor.Tpo -c -o libephymain_la-ephy-toolbar-editor.lo `test -f 'ephy-toolbar-editor.c' || echo '$(srcdir)/'`ephy-toolbar-editor.c
-+ at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libephymain_la-ephy-toolbar-editor.Tpo $(DEPDIR)/libephymain_la-ephy-toolbar-editor.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ephy-toolbar-editor.c' object='libephymain_la-ephy-toolbar-editor.lo' libtool=yes @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- at am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephymain_la_CPPFLAGS) $(CPPFLAGS) $(libephymain_la_CFLAGS) $(CFLAGS) -c -o libephymain_la-ephy-toolbar-editor.lo `test -f 'ephy-toolbar-editor.c' || echo '$(srcdir)/'`ephy-toolbar-editor.c
-+ at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephymain_la_CPPFLAGS) $(CPPFLAGS) $(libephymain_la_CFLAGS) $(CFLAGS) -c -o libephymain_la-ephy-toolbar-editor.lo `test -f 'ephy-toolbar-editor.c' || echo '$(srcdir)/'`ephy-toolbar-editor.c
- 
- libephymain_la-ephy-window.lo: ephy-window.c
-- at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephymain_la_CPPFLAGS) $(CPPFLAGS) $(libephymain_la_CFLAGS) $(CFLAGS) -MT libephymain_la-ephy-window.lo -MD -MP -MF $(DEPDIR)/libephymain_la-ephy-window.Tpo -c -o libephymain_la-ephy-window.lo `test -f 'ephy-window.c' || echo '$(srcdir)/'`ephy-window.c
-- at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libephymain_la-ephy-window.Tpo $(DEPDIR)/libephymain_la-ephy-window.Plo
-- at am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-+ at am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephymain_la_CPPFLAGS) $(CPPFLAGS) $(libephymain_la_CFLAGS) $(CFLAGS) -MT libephymain_la-ephy-window.lo -MD -MP -MF $(DEPDIR)/libephymain_la-ephy-window.Tpo -c -o libephymain_la-ephy-window.lo `test -f 'ephy-window.c' || echo '$(srcdir)/'`ephy-window.c
-+ at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libephymain_la-ephy-window.Tpo $(DEPDIR)/libephymain_la-ephy-window.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ephy-window.c' object='libephymain_la-ephy-window.lo' libtool=yes @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- at am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephymain_la_CPPFLAGS) $(CPPFLAGS) $(libephymain_la_CFLAGS) $(CFLAGS) -c -o libephymain_la-ephy-window.lo `test -f 'ephy-window.c' || echo '$(srcdir)/'`ephy-window.c
-+ at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephymain_la_CPPFLAGS) $(CPPFLAGS) $(libephymain_la_CFLAGS) $(CFLAGS) -c -o libephymain_la-ephy-window.lo `test -f 'ephy-window.c' || echo '$(srcdir)/'`ephy-window.c
- 
- libephymain_la-pdm-dialog.lo: pdm-dialog.c
-- at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephymain_la_CPPFLAGS) $(CPPFLAGS) $(libephymain_la_CFLAGS) $(CFLAGS) -MT libephymain_la-pdm-dialog.lo -MD -MP -MF $(DEPDIR)/libephymain_la-pdm-dialog.Tpo -c -o libephymain_la-pdm-dialog.lo `test -f 'pdm-dialog.c' || echo '$(srcdir)/'`pdm-dialog.c
-- at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libephymain_la-pdm-dialog.Tpo $(DEPDIR)/libephymain_la-pdm-dialog.Plo
-- at am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-+ at am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephymain_la_CPPFLAGS) $(CPPFLAGS) $(libephymain_la_CFLAGS) $(CFLAGS) -MT libephymain_la-pdm-dialog.lo -MD -MP -MF $(DEPDIR)/libephymain_la-pdm-dialog.Tpo -c -o libephymain_la-pdm-dialog.lo `test -f 'pdm-dialog.c' || echo '$(srcdir)/'`pdm-dialog.c
-+ at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libephymain_la-pdm-dialog.Tpo $(DEPDIR)/libephymain_la-pdm-dialog.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='pdm-dialog.c' object='libephymain_la-pdm-dialog.lo' libtool=yes @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- at am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephymain_la_CPPFLAGS) $(CPPFLAGS) $(libephymain_la_CFLAGS) $(CFLAGS) -c -o libephymain_la-pdm-dialog.lo `test -f 'pdm-dialog.c' || echo '$(srcdir)/'`pdm-dialog.c
-+ at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephymain_la_CPPFLAGS) $(CPPFLAGS) $(libephymain_la_CFLAGS) $(CFLAGS) -c -o libephymain_la-pdm-dialog.lo `test -f 'pdm-dialog.c' || echo '$(srcdir)/'`pdm-dialog.c
- 
- libephymain_la-popup-commands.lo: popup-commands.c
-- at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephymain_la_CPPFLAGS) $(CPPFLAGS) $(libephymain_la_CFLAGS) $(CFLAGS) -MT libephymain_la-popup-commands.lo -MD -MP -MF $(DEPDIR)/libephymain_la-popup-commands.Tpo -c -o libephymain_la-popup-commands.lo `test -f 'popup-commands.c' || echo '$(srcdir)/'`popup-commands.c
-- at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libephymain_la-popup-commands.Tpo $(DEPDIR)/libephymain_la-popup-commands.Plo
-- at am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-+ at am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephymain_la_CPPFLAGS) $(CPPFLAGS) $(libephymain_la_CFLAGS) $(CFLAGS) -MT libephymain_la-popup-commands.lo -MD -MP -MF $(DEPDIR)/libephymain_la-popup-commands.Tpo -c -o libephymain_la-popup-commands.lo `test -f 'popup-commands.c' || echo '$(srcdir)/'`popup-commands.c
-+ at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libephymain_la-popup-commands.Tpo $(DEPDIR)/libephymain_la-popup-commands.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='popup-commands.c' object='libephymain_la-popup-commands.lo' libtool=yes @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- at am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephymain_la_CPPFLAGS) $(CPPFLAGS) $(libephymain_la_CFLAGS) $(CFLAGS) -c -o libephymain_la-popup-commands.lo `test -f 'popup-commands.c' || echo '$(srcdir)/'`popup-commands.c
-+ at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephymain_la_CPPFLAGS) $(CPPFLAGS) $(libephymain_la_CFLAGS) $(CFLAGS) -c -o libephymain_la-popup-commands.lo `test -f 'popup-commands.c' || echo '$(srcdir)/'`popup-commands.c
- 
- libephymain_la-prefs-dialog.lo: prefs-dialog.c
-- at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephymain_la_CPPFLAGS) $(CPPFLAGS) $(libephymain_la_CFLAGS) $(CFLAGS) -MT libephymain_la-prefs-dialog.lo -MD -MP -MF $(DEPDIR)/libephymain_la-prefs-dialog.Tpo -c -o libephymain_la-prefs-dialog.lo `test -f 'prefs-dialog.c' || echo '$(srcdir)/'`prefs-dialog.c
-- at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libephymain_la-prefs-dialog.Tpo $(DEPDIR)/libephymain_la-prefs-dialog.Plo
-- at am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-+ at am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephymain_la_CPPFLAGS) $(CPPFLAGS) $(libephymain_la_CFLAGS) $(CFLAGS) -MT libephymain_la-prefs-dialog.lo -MD -MP -MF $(DEPDIR)/libephymain_la-prefs-dialog.Tpo -c -o libephymain_la-prefs-dialog.lo `test -f 'prefs-dialog.c' || echo '$(srcdir)/'`prefs-dialog.c
-+ at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libephymain_la-prefs-dialog.Tpo $(DEPDIR)/libephymain_la-prefs-dialog.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='prefs-dialog.c' object='libephymain_la-prefs-dialog.lo' libtool=yes @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- at am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephymain_la_CPPFLAGS) $(CPPFLAGS) $(libephymain_la_CFLAGS) $(CFLAGS) -c -o libephymain_la-prefs-dialog.lo `test -f 'prefs-dialog.c' || echo '$(srcdir)/'`prefs-dialog.c
-+ at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephymain_la_CPPFLAGS) $(CPPFLAGS) $(libephymain_la_CFLAGS) $(CFLAGS) -c -o libephymain_la-prefs-dialog.lo `test -f 'prefs-dialog.c' || echo '$(srcdir)/'`prefs-dialog.c
- 
- libephymain_la-ppview-toolbar.lo: ppview-toolbar.c
-- at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephymain_la_CPPFLAGS) $(CPPFLAGS) $(libephymain_la_CFLAGS) $(CFLAGS) -MT libephymain_la-ppview-toolbar.lo -MD -MP -MF $(DEPDIR)/libephymain_la-ppview-toolbar.Tpo -c -o libephymain_la-ppview-toolbar.lo `test -f 'ppview-toolbar.c' || echo '$(srcdir)/'`ppview-toolbar.c
-- at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libephymain_la-ppview-toolbar.Tpo $(DEPDIR)/libephymain_la-ppview-toolbar.Plo
-- at am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-+ at am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephymain_la_CPPFLAGS) $(CPPFLAGS) $(libephymain_la_CFLAGS) $(CFLAGS) -MT libephymain_la-ppview-toolbar.lo -MD -MP -MF $(DEPDIR)/libephymain_la-ppview-toolbar.Tpo -c -o libephymain_la-ppview-toolbar.lo `test -f 'ppview-toolbar.c' || echo '$(srcdir)/'`ppview-toolbar.c
-+ at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libephymain_la-ppview-toolbar.Tpo $(DEPDIR)/libephymain_la-ppview-toolbar.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ppview-toolbar.c' object='libephymain_la-ppview-toolbar.lo' libtool=yes @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- at am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephymain_la_CPPFLAGS) $(CPPFLAGS) $(libephymain_la_CFLAGS) $(CFLAGS) -c -o libephymain_la-ppview-toolbar.lo `test -f 'ppview-toolbar.c' || echo '$(srcdir)/'`ppview-toolbar.c
-+ at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephymain_la_CPPFLAGS) $(CPPFLAGS) $(libephymain_la_CFLAGS) $(CFLAGS) -c -o libephymain_la-ppview-toolbar.lo `test -f 'ppview-toolbar.c' || echo '$(srcdir)/'`ppview-toolbar.c
- 
- libephymain_la-window-commands.lo: window-commands.c
-- at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephymain_la_CPPFLAGS) $(CPPFLAGS) $(libephymain_la_CFLAGS) $(CFLAGS) -MT libephymain_la-window-commands.lo -MD -MP -MF $(DEPDIR)/libephymain_la-window-commands.Tpo -c -o libephymain_la-window-commands.lo `test -f 'window-commands.c' || echo '$(srcdir)/'`window-commands.c
-- at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libephymain_la-window-commands.Tpo $(DEPDIR)/libephymain_la-window-commands.Plo
-- at am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-+ at am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephymain_la_CPPFLAGS) $(CPPFLAGS) $(libephymain_la_CFLAGS) $(CFLAGS) -MT libephymain_la-window-commands.lo -MD -MP -MF $(DEPDIR)/libephymain_la-window-commands.Tpo -c -o libephymain_la-window-commands.lo `test -f 'window-commands.c' || echo '$(srcdir)/'`window-commands.c
-+ at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libephymain_la-window-commands.Tpo $(DEPDIR)/libephymain_la-window-commands.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='window-commands.c' object='libephymain_la-window-commands.lo' libtool=yes @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- at am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephymain_la_CPPFLAGS) $(CPPFLAGS) $(libephymain_la_CFLAGS) $(CFLAGS) -c -o libephymain_la-window-commands.lo `test -f 'window-commands.c' || echo '$(srcdir)/'`window-commands.c
-+ at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephymain_la_CPPFLAGS) $(CPPFLAGS) $(libephymain_la_CFLAGS) $(CFLAGS) -c -o libephymain_la-window-commands.lo `test -f 'window-commands.c' || echo '$(srcdir)/'`window-commands.c
- 
- libephymain_la-ephy-net-monitor.lo: ephy-net-monitor.c
-- at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephymain_la_CPPFLAGS) $(CPPFLAGS) $(libephymain_la_CFLAGS) $(CFLAGS) -MT libephymain_la-ephy-net-monitor.lo -MD -MP -MF $(DEPDIR)/libephymain_la-ephy-net-monitor.Tpo -c -o libephymain_la-ephy-net-monitor.lo `test -f 'ephy-net-monitor.c' || echo '$(srcdir)/'`ephy-net-monitor.c
-- at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libephymain_la-ephy-net-monitor.Tpo $(DEPDIR)/libephymain_la-ephy-net-monitor.Plo
-- at am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-+ at am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephymain_la_CPPFLAGS) $(CPPFLAGS) $(libephymain_la_CFLAGS) $(CFLAGS) -MT libephymain_la-ephy-net-monitor.lo -MD -MP -MF $(DEPDIR)/libephymain_la-ephy-net-monitor.Tpo -c -o libephymain_la-ephy-net-monitor.lo `test -f 'ephy-net-monitor.c' || echo '$(srcdir)/'`ephy-net-monitor.c
-+ at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libephymain_la-ephy-net-monitor.Tpo $(DEPDIR)/libephymain_la-ephy-net-monitor.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ephy-net-monitor.c' object='libephymain_la-ephy-net-monitor.lo' libtool=yes @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- at am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephymain_la_CPPFLAGS) $(CPPFLAGS) $(libephymain_la_CFLAGS) $(CFLAGS) -c -o libephymain_la-ephy-net-monitor.lo `test -f 'ephy-net-monitor.c' || echo '$(srcdir)/'`ephy-net-monitor.c
-+ at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephymain_la_CPPFLAGS) $(CPPFLAGS) $(libephymain_la_CFLAGS) $(CFLAGS) -c -o libephymain_la-ephy-net-monitor.lo `test -f 'ephy-net-monitor.c' || echo '$(srcdir)/'`ephy-net-monitor.c
- 
- libephymain_la-ephy-seed-loader.lo: ephy-seed-loader.c
-- at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephymain_la_CPPFLAGS) $(CPPFLAGS) $(libephymain_la_CFLAGS) $(CFLAGS) -MT libephymain_la-ephy-seed-loader.lo -MD -MP -MF $(DEPDIR)/libephymain_la-ephy-seed-loader.Tpo -c -o libephymain_la-ephy-seed-loader.lo `test -f 'ephy-seed-loader.c' || echo '$(srcdir)/'`ephy-seed-loader.c
-- at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libephymain_la-ephy-seed-loader.Tpo $(DEPDIR)/libephymain_la-ephy-seed-loader.Plo
-- at am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-+ at am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephymain_la_CPPFLAGS) $(CPPFLAGS) $(libephymain_la_CFLAGS) $(CFLAGS) -MT libephymain_la-ephy-seed-loader.lo -MD -MP -MF $(DEPDIR)/libephymain_la-ephy-seed-loader.Tpo -c -o libephymain_la-ephy-seed-loader.lo `test -f 'ephy-seed-loader.c' || echo '$(srcdir)/'`ephy-seed-loader.c
-+ at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libephymain_la-ephy-seed-loader.Tpo $(DEPDIR)/libephymain_la-ephy-seed-loader.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ephy-seed-loader.c' object='libephymain_la-ephy-seed-loader.lo' libtool=yes @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- at am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephymain_la_CPPFLAGS) $(CPPFLAGS) $(libephymain_la_CFLAGS) $(CFLAGS) -c -o libephymain_la-ephy-seed-loader.lo `test -f 'ephy-seed-loader.c' || echo '$(srcdir)/'`ephy-seed-loader.c
-+ at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephymain_la_CPPFLAGS) $(CPPFLAGS) $(libephymain_la_CFLAGS) $(CFLAGS) -c -o libephymain_la-ephy-seed-loader.lo `test -f 'ephy-seed-loader.c' || echo '$(srcdir)/'`ephy-seed-loader.c
- 
- libephymain_la-ephy-seed-extension.lo: ephy-seed-extension.c
-- at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephymain_la_CPPFLAGS) $(CPPFLAGS) $(libephymain_la_CFLAGS) $(CFLAGS) -MT libephymain_la-ephy-seed-extension.lo -MD -MP -MF $(DEPDIR)/libephymain_la-ephy-seed-extension.Tpo -c -o libephymain_la-ephy-seed-extension.lo `test -f 'ephy-seed-extension.c' || echo '$(srcdir)/'`ephy-seed-extension.c
-- at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libephymain_la-ephy-seed-extension.Tpo $(DEPDIR)/libephymain_la-ephy-seed-extension.Plo
-- at am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-+ at am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephymain_la_CPPFLAGS) $(CPPFLAGS) $(libephymain_la_CFLAGS) $(CFLAGS) -MT libephymain_la-ephy-seed-extension.lo -MD -MP -MF $(DEPDIR)/libephymain_la-ephy-seed-extension.Tpo -c -o libephymain_la-ephy-seed-extension.lo `test -f 'ephy-seed-extension.c' || echo '$(srcdir)/'`ephy-seed-extension.c
-+ at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libephymain_la-ephy-seed-extension.Tpo $(DEPDIR)/libephymain_la-ephy-seed-extension.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ephy-seed-extension.c' object='libephymain_la-ephy-seed-extension.lo' libtool=yes @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- at am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephymain_la_CPPFLAGS) $(CPPFLAGS) $(libephymain_la_CFLAGS) $(CFLAGS) -c -o libephymain_la-ephy-seed-extension.lo `test -f 'ephy-seed-extension.c' || echo '$(srcdir)/'`ephy-seed-extension.c
-+ at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephymain_la_CPPFLAGS) $(CPPFLAGS) $(libephymain_la_CFLAGS) $(CFLAGS) -c -o libephymain_la-ephy-seed-extension.lo `test -f 'ephy-seed-extension.c' || echo '$(srcdir)/'`ephy-seed-extension.c
- 
- libephymain_la-ephy-type-builtins.lo: ephy-type-builtins.c
-- at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephymain_la_CPPFLAGS) $(CPPFLAGS) $(libephymain_la_CFLAGS) $(CFLAGS) -MT libephymain_la-ephy-type-builtins.lo -MD -MP -MF $(DEPDIR)/libephymain_la-ephy-type-builtins.Tpo -c -o libephymain_la-ephy-type-builtins.lo `test -f 'ephy-type-builtins.c' || echo '$(srcdir)/'`ephy-type-builtins.c
-- at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libephymain_la-ephy-type-builtins.Tpo $(DEPDIR)/libephymain_la-ephy-type-builtins.Plo
-- at am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-+ at am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephymain_la_CPPFLAGS) $(CPPFLAGS) $(libephymain_la_CFLAGS) $(CFLAGS) -MT libephymain_la-ephy-type-builtins.lo -MD -MP -MF $(DEPDIR)/libephymain_la-ephy-type-builtins.Tpo -c -o libephymain_la-ephy-type-builtins.lo `test -f 'ephy-type-builtins.c' || echo '$(srcdir)/'`ephy-type-builtins.c
-+ at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libephymain_la-ephy-type-builtins.Tpo $(DEPDIR)/libephymain_la-ephy-type-builtins.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ephy-type-builtins.c' object='libephymain_la-ephy-type-builtins.lo' libtool=yes @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- at am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephymain_la_CPPFLAGS) $(CPPFLAGS) $(libephymain_la_CFLAGS) $(CFLAGS) -c -o libephymain_la-ephy-type-builtins.lo `test -f 'ephy-type-builtins.c' || echo '$(srcdir)/'`ephy-type-builtins.c
-+ at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephymain_la_CPPFLAGS) $(CPPFLAGS) $(libephymain_la_CFLAGS) $(CFLAGS) -c -o libephymain_la-ephy-type-builtins.lo `test -f 'ephy-type-builtins.c' || echo '$(srcdir)/'`ephy-type-builtins.c
- 
- epiphany-ephy-main.o: ephy-main.c
-- at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(epiphany_CPPFLAGS) $(CPPFLAGS) $(epiphany_CFLAGS) $(CFLAGS) -MT epiphany-ephy-main.o -MD -MP -MF $(DEPDIR)/epiphany-ephy-main.Tpo -c -o epiphany-ephy-main.o `test -f 'ephy-main.c' || echo '$(srcdir)/'`ephy-main.c
-- at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/epiphany-ephy-main.Tpo $(DEPDIR)/epiphany-ephy-main.Po
-- at am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-+ at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(epiphany_CPPFLAGS) $(CPPFLAGS) $(epiphany_CFLAGS) $(CFLAGS) -MT epiphany-ephy-main.o -MD -MP -MF $(DEPDIR)/epiphany-ephy-main.Tpo -c -o epiphany-ephy-main.o `test -f 'ephy-main.c' || echo '$(srcdir)/'`ephy-main.c
-+ at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/epiphany-ephy-main.Tpo $(DEPDIR)/epiphany-ephy-main.Po
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ephy-main.c' object='epiphany-ephy-main.o' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(epiphany_CPPFLAGS) $(CPPFLAGS) $(epiphany_CFLAGS) $(CFLAGS) -c -o epiphany-ephy-main.o `test -f 'ephy-main.c' || echo '$(srcdir)/'`ephy-main.c
- 
- epiphany-ephy-main.obj: ephy-main.c
-- at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(epiphany_CPPFLAGS) $(CPPFLAGS) $(epiphany_CFLAGS) $(CFLAGS) -MT epiphany-ephy-main.obj -MD -MP -MF $(DEPDIR)/epiphany-ephy-main.Tpo -c -o epiphany-ephy-main.obj `if test -f 'ephy-main.c'; then $(CYGPATH_W) 'ephy-main.c'; else $(CYGPATH_W) '$(srcdir)/ephy-main.c'; fi`
-- at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/epiphany-ephy-main.Tpo $(DEPDIR)/epiphany-ephy-main.Po
-- at am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-+ at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(epiphany_CPPFLAGS) $(CPPFLAGS) $(epiphany_CFLAGS) $(CFLAGS) -MT epiphany-ephy-main.obj -MD -MP -MF $(DEPDIR)/epiphany-ephy-main.Tpo -c -o epiphany-ephy-main.obj `if test -f 'ephy-main.c'; then $(CYGPATH_W) 'ephy-main.c'; else $(CYGPATH_W) '$(srcdir)/ephy-main.c'; fi`
-+ at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/epiphany-ephy-main.Tpo $(DEPDIR)/epiphany-ephy-main.Po
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ephy-main.c' object='epiphany-ephy-main.obj' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(epiphany_CPPFLAGS) $(CPPFLAGS) $(epiphany_CFLAGS) $(CFLAGS) -c -o epiphany-ephy-main.obj `if test -f 'ephy-main.c'; then $(CYGPATH_W) 'ephy-main.c'; else $(CYGPATH_W) '$(srcdir)/ephy-main.c'; fi`
-@@ -1104,63 +987,54 @@
- install-girDATA: $(gir_DATA)
- 	@$(NORMAL_INSTALL)
- 	test -z "$(girdir)" || $(MKDIR_P) "$(DESTDIR)$(girdir)"
--	@list='$(gir_DATA)'; test -n "$(girdir)" || list=; \
--	for p in $$list; do \
-+	@list='$(gir_DATA)'; for p in $$list; do \
- 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
--	  echo "$$d$$p"; \
--	done | $(am__base_list) | \
--	while read files; do \
--	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(girdir)'"; \
--	  $(INSTALL_DATA) $$files "$(DESTDIR)$(girdir)" || exit $$?; \
-+	  f=$(am__strip_dir) \
-+	  echo " $(girDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(girdir)/$$f'"; \
-+	  $(girDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(girdir)/$$f"; \
- 	done
- 
- uninstall-girDATA:
- 	@$(NORMAL_UNINSTALL)
--	@list='$(gir_DATA)'; test -n "$(girdir)" || list=; \
--	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
--	test -n "$$files" || exit 0; \
--	echo " ( cd '$(DESTDIR)$(girdir)' && rm -f" $$files ")"; \
--	cd "$(DESTDIR)$(girdir)" && rm -f $$files
-+	@list='$(gir_DATA)'; for p in $$list; do \
-+	  f=$(am__strip_dir) \
-+	  echo " rm -f '$(DESTDIR)$(girdir)/$$f'"; \
-+	  rm -f "$(DESTDIR)$(girdir)/$$f"; \
-+	done
- install-headerDATA: $(header_DATA)
- 	@$(NORMAL_INSTALL)
- 	test -z "$(headerdir)" || $(MKDIR_P) "$(DESTDIR)$(headerdir)"
--	@list='$(header_DATA)'; test -n "$(headerdir)" || list=; \
--	for p in $$list; do \
-+	@list='$(header_DATA)'; for p in $$list; do \
- 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
--	  echo "$$d$$p"; \
--	done | $(am__base_list) | \
--	while read files; do \
--	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(headerdir)'"; \
--	  $(INSTALL_DATA) $$files "$(DESTDIR)$(headerdir)" || exit $$?; \
-+	  f=$(am__strip_dir) \
-+	  echo " $(headerDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(headerdir)/$$f'"; \
-+	  $(headerDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(headerdir)/$$f"; \
- 	done
- 
- uninstall-headerDATA:
- 	@$(NORMAL_UNINSTALL)
--	@list='$(header_DATA)'; test -n "$(headerdir)" || list=; \
--	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
--	test -n "$$files" || exit 0; \
--	echo " ( cd '$(DESTDIR)$(headerdir)' && rm -f" $$files ")"; \
--	cd "$(DESTDIR)$(headerdir)" && rm -f $$files
-+	@list='$(header_DATA)'; for p in $$list; do \
-+	  f=$(am__strip_dir) \
-+	  echo " rm -f '$(DESTDIR)$(headerdir)/$$f'"; \
-+	  rm -f "$(DESTDIR)$(headerdir)/$$f"; \
-+	done
- install-typelibsDATA: $(typelibs_DATA)
- 	@$(NORMAL_INSTALL)
- 	test -z "$(typelibsdir)" || $(MKDIR_P) "$(DESTDIR)$(typelibsdir)"
--	@list='$(typelibs_DATA)'; test -n "$(typelibsdir)" || list=; \
--	for p in $$list; do \
-+	@list='$(typelibs_DATA)'; for p in $$list; do \
- 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
--	  echo "$$d$$p"; \
--	done | $(am__base_list) | \
--	while read files; do \
--	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(typelibsdir)'"; \
--	  $(INSTALL_DATA) $$files "$(DESTDIR)$(typelibsdir)" || exit $$?; \
-+	  f=$(am__strip_dir) \
-+	  echo " $(typelibsDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(typelibsdir)/$$f'"; \
-+	  $(typelibsDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(typelibsdir)/$$f"; \
- 	done
- 
- uninstall-typelibsDATA:
- 	@$(NORMAL_UNINSTALL)
--	@list='$(typelibs_DATA)'; test -n "$(typelibsdir)" || list=; \
--	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
--	test -n "$$files" || exit 0; \
--	echo " ( cd '$(DESTDIR)$(typelibsdir)' && rm -f" $$files ")"; \
--	cd "$(DESTDIR)$(typelibsdir)" && rm -f $$files
-+	@list='$(typelibs_DATA)'; for p in $$list; do \
-+	  f=$(am__strip_dir) \
-+	  echo " rm -f '$(DESTDIR)$(typelibsdir)/$$f'"; \
-+	  rm -f "$(DESTDIR)$(typelibsdir)/$$f"; \
-+	done
- 
- # This directory's subdirectories are mostly independent; you can cd
- # into them and run `make' without going through this Makefile.
-@@ -1186,7 +1060,7 @@
- 	  else \
- 	    local_target="$$target"; \
- 	  fi; \
--	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-+	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
- 	  || eval $$failcom; \
- 	done; \
- 	if test "$$dot_seen" = "no"; then \
-@@ -1220,16 +1094,16 @@
- 	  else \
- 	    local_target="$$target"; \
- 	  fi; \
--	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-+	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
- 	  || eval $$failcom; \
- 	done && test -z "$$fail"
- tags-recursive:
- 	list='$(SUBDIRS)'; for subdir in $$list; do \
--	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
-+	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
- 	done
- ctags-recursive:
- 	list='$(SUBDIRS)'; for subdir in $$list; do \
--	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
-+	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
- 	done
- 
- ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-@@ -1244,7 +1118,7 @@
- 
- TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
- 		$(TAGS_FILES) $(LISP)
--	set x; \
-+	tags=; \
- 	here=`pwd`; \
- 	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
- 	  include_option=--etags-include; \
-@@ -1256,7 +1130,7 @@
- 	list='$(SUBDIRS)'; for subdir in $$list; do \
- 	  if test "$$subdir" = .; then :; else \
- 	    test ! -f $$subdir/TAGS || \
--	      set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
-+	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
- 	  fi; \
- 	done; \
- 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-@@ -1265,34 +1139,29 @@
- 	  done | \
- 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
--	shift; \
--	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
-+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
- 	  test -n "$$unique" || unique=$$empty_fix; \
--	  if test $$# -gt 0; then \
--	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
--	      "$$@" $$unique; \
--	  else \
--	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
--	      $$unique; \
--	  fi; \
-+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-+	    $$tags $$unique; \
- 	fi
- ctags: CTAGS
- CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
- 		$(TAGS_FILES) $(LISP)
-+	tags=; \
- 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
- 	unique=`for i in $$list; do \
- 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- 	  done | \
- 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
--	test -z "$(CTAGS_ARGS)$$unique" \
-+	test -z "$(CTAGS_ARGS)$$tags$$unique" \
- 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
--	     $$unique
-+	     $$tags $$unique
- 
- GTAGS:
- 	here=`$(am__cd) $(top_builddir) && pwd` \
--	  && $(am__cd) $(top_srcdir) \
--	  && gtags -i $(GTAGS_ARGS) "$$here"
-+	  && cd $(top_srcdir) \
-+	  && gtags -i $(GTAGS_ARGS) $$here
- 
- distclean-tags:
- 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-@@ -1313,44 +1182,29 @@
- 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- 	  if test -d $$d/$$file; then \
- 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
--	    if test -d "$(distdir)/$$file"; then \
--	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
--	    fi; \
- 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
--	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
--	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
- 	    fi; \
--	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
- 	  else \
--	    test -f "$(distdir)/$$file" \
--	    || cp -p $$d/$$file "$(distdir)/$$file" \
-+	    test -f $(distdir)/$$file \
-+	    || cp -p $$d/$$file $(distdir)/$$file \
- 	    || exit 1; \
- 	  fi; \
- 	done
--	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
-+	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
- 	  if test "$$subdir" = .; then :; else \
- 	    test -d "$(distdir)/$$subdir" \
- 	    || $(MKDIR_P) "$(distdir)/$$subdir" \
- 	    || exit 1; \
--	  fi; \
--	done
--	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
--	  if test "$$subdir" = .; then :; else \
--	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
--	    $(am__relativize); \
--	    new_distdir=$$reldir; \
--	    dir1=$$subdir; dir2="$(top_distdir)"; \
--	    $(am__relativize); \
--	    new_top_distdir=$$reldir; \
--	    echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
--	    echo "     am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
--	    ($(am__cd) $$subdir && \
-+	    distdir=`$(am__cd) $(distdir) && pwd`; \
-+	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
-+	    (cd $$subdir && \
- 	      $(MAKE) $(AM_MAKEFLAGS) \
--	        top_distdir="$$new_top_distdir" \
--	        distdir="$$new_distdir" \
-+	        top_distdir="$$top_distdir" \
-+	        distdir="$$distdir/$$subdir" \
- 		am__remove_distdir=: \
- 		am__skip_length_check=: \
--		am__skip_mode_fix=: \
- 	        distdir) \
- 	      || exit 1; \
- 	  fi; \
-@@ -1386,7 +1240,6 @@
- 
- distclean-generic:
- 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
--	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
- 	-test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
- 
- maintainer-clean-generic:
-@@ -1411,8 +1264,6 @@
- 
- html: html-recursive
- 
--html-am:
--
- info: info-recursive
- 
- info-am:
-@@ -1422,28 +1273,18 @@
- 
- install-dvi: install-dvi-recursive
- 
--install-dvi-am:
--
- install-exec-am: install-binPROGRAMS
- 
- install-html: install-html-recursive
- 
--install-html-am:
--
- install-info: install-info-recursive
- 
--install-info-am:
--
- install-man:
- 
- install-pdf: install-pdf-recursive
- 
--install-pdf-am:
--
- install-ps: install-ps-recursive
- 
--install-ps-am:
--
- installcheck-am:
- 
- maintainer-clean: maintainer-clean-recursive
-@@ -1467,9 +1308,8 @@
- uninstall-am: uninstall-binPROGRAMS uninstall-girDATA \
- 	uninstall-headerDATA uninstall-typelibsDATA
- 
--.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all check \
--	ctags-recursive install install-am install-strip \
--	tags-recursive
-+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
-+	install-strip
- 
- .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
- 	all all-am check check-am clean clean-binPROGRAMS \
-@@ -1571,7 +1411,6 @@
- 
- @ENABLE_INTROSPECTION_TRUE at Epiphany-$(EPIPHANY_API_VERSION).typelib: Epiphany-$(EPIPHANY_API_VERSION).gir $(G_IR_COMPILER)
- @ENABLE_INTROSPECTION_TRUE@	g-ir-compiler Epiphany-$(EPIPHANY_API_VERSION).gir -o Epiphany-$(EPIPHANY_API_VERSION).typelib
--
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
- .NOEXPORT:




More information about the pkg-gnome-commits mailing list