diff --git a/pub/configure.lineno b/pub/configure.lineno
index 322363699b2d7bb28e692cc64452e33b75c8ce14..577f0a9ea5d6bbfb76333beb6feb7ee289db0537 100755
--- a/pub/configure.lineno
+++ b/pub/configure.lineno
@@ -742,7 +742,9 @@ ac_includes_default="\
 
 ac_header_list=
 ac_func_list=
-ac_subst_vars='LTLIBOBJS
+ac_subst_vars='am__EXEEXT_FALSE
+am__EXEEXT_TRUE
+LTLIBOBJS
 GNUPLOT
 LIBOBJS
 ALLOCA
@@ -1633,7 +1635,7 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:${as_lineno-1636}: $ac_try_echo\""
+eval ac_try_echo="\"\$as_me:${as_lineno-1638}: $ac_try_echo\""
 $as_echo "$ac_try_echo"; } >&5
   (eval "$ac_compile") 2>conftest.err
   ac_status=$?
@@ -1642,7 +1644,7 @@ $as_echo "$ac_try_echo"; } >&5
     cat conftest.er1 >&5
     mv -f conftest.er1 conftest.err
   fi
-  $as_echo "$as_me:${as_lineno-1645}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-1647}: \$? = $ac_status" >&5
   test $ac_status = 0; } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
@@ -1671,7 +1673,7 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:${as_lineno-1674}: $ac_try_echo\""
+eval ac_try_echo="\"\$as_me:${as_lineno-1676}: $ac_try_echo\""
 $as_echo "$ac_try_echo"; } >&5
   (eval "$ac_link") 2>conftest.err
   ac_status=$?
@@ -1680,7 +1682,7 @@ $as_echo "$ac_try_echo"; } >&5
     cat conftest.er1 >&5
     mv -f conftest.er1 conftest.err
   fi
-  $as_echo "$as_me:${as_lineno-1683}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-1685}: \$? = $ac_status" >&5
   test $ac_status = 0; } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
@@ -1712,7 +1714,7 @@ fi
 ac_fn_c_check_header_compile ()
 {
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  { $as_echo "$as_me:${as_lineno-1715}: checking for $2" >&5
+  { $as_echo "$as_me:${as_lineno-1717}: 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
@@ -1722,7 +1724,7 @@ else
 $4
 #include <$2>
 _ACEOF
-if ac_fn_c_try_compile "1725"; then :
+if ac_fn_c_try_compile "1727"; then :
   eval "$3=yes"
 else
   eval "$3=no"
@@ -1730,7 +1732,7 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
 eval ac_res=\$$3
-	       { $as_echo "$as_me:${as_lineno-1733}: result: $ac_res" >&5
+	       { $as_echo "$as_me:${as_lineno-1735}: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
   eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
 
@@ -1747,7 +1749,7 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:${as_lineno-1750}: $ac_try_echo\""
+eval ac_try_echo="\"\$as_me:${as_lineno-1752}: $ac_try_echo\""
 $as_echo "$ac_try_echo"; } >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err
   ac_status=$?
@@ -1756,7 +1758,7 @@ $as_echo "$ac_try_echo"; } >&5
     cat conftest.er1 >&5
     mv -f conftest.er1 conftest.err
   fi
-  $as_echo "$as_me:${as_lineno-1759}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-1761}: \$? = $ac_status" >&5
   test $ac_status = 0; } >/dev/null && {
 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
 	 test ! -s conftest.err
@@ -1785,21 +1787,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:${as_lineno-1788}: $ac_try_echo\""
+eval ac_try_echo="\"\$as_me:${as_lineno-1790}: $ac_try_echo\""
 $as_echo "$ac_try_echo"; } >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-1792}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-1794}: \$? = $ac_status" >&5
   test $ac_status = 0; } && { ac_try='./conftest$ac_exeext'
   { { case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:${as_lineno-1798}: $ac_try_echo\""
+eval ac_try_echo="\"\$as_me:${as_lineno-1800}: $ac_try_echo\""
 $as_echo "$ac_try_echo"; } >&5
   (eval "$ac_try") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-1802}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-1804}: \$? = $ac_status" >&5
   test $ac_status = 0; }; }; then :
   ac_retval=0
 else
@@ -1821,7 +1823,7 @@ fi
 ac_fn_c_check_func ()
 {
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  { $as_echo "$as_me:${as_lineno-1824}: checking for $2" >&5
+  { $as_echo "$as_me:${as_lineno-1826}: 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
@@ -1867,7 +1869,7 @@ return $2 ();
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "1870"; then :
+if ac_fn_c_try_link "1872"; then :
   eval "$3=yes"
 else
   eval "$3=no"
@@ -1876,7 +1878,7 @@ rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
 fi
 eval ac_res=\$$3
-	       { $as_echo "$as_me:${as_lineno-1879}: result: $ac_res" >&5
+	       { $as_echo "$as_me:${as_lineno-1881}: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
   eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
 
@@ -1894,7 +1896,7 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:${as_lineno-1897}: $ac_try_echo\""
+eval ac_try_echo="\"\$as_me:${as_lineno-1899}: $ac_try_echo\""
 $as_echo "$ac_try_echo"; } >&5
   (eval "$ac_compile") 2>conftest.err
   ac_status=$?
@@ -1903,7 +1905,7 @@ $as_echo "$ac_try_echo"; } >&5
     cat conftest.er1 >&5
     mv -f conftest.er1 conftest.err
   fi
-  $as_echo "$as_me:${as_lineno-1906}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-1908}: \$? = $ac_status" >&5
   test $ac_status = 0; } && {
 	 test -z "$ac_cxx_werror_flag" ||
 	 test ! -s conftest.err
@@ -1931,7 +1933,7 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:${as_lineno-1934}: $ac_try_echo\""
+eval ac_try_echo="\"\$as_me:${as_lineno-1936}: $ac_try_echo\""
 $as_echo "$ac_try_echo"; } >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err
   ac_status=$?
@@ -1940,7 +1942,7 @@ $as_echo "$ac_try_echo"; } >&5
     cat conftest.er1 >&5
     mv -f conftest.er1 conftest.err
   fi
-  $as_echo "$as_me:${as_lineno-1943}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-1945}: \$? = $ac_status" >&5
   test $ac_status = 0; } >/dev/null && {
 	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
 	 test ! -s conftest.err
@@ -1969,7 +1971,7 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:${as_lineno-1972}: $ac_try_echo\""
+eval ac_try_echo="\"\$as_me:${as_lineno-1974}: $ac_try_echo\""
 $as_echo "$ac_try_echo"; } >&5
   (eval "$ac_link") 2>conftest.err
   ac_status=$?
@@ -1978,7 +1980,7 @@ $as_echo "$ac_try_echo"; } >&5
     cat conftest.er1 >&5
     mv -f conftest.er1 conftest.err
   fi
-  $as_echo "$as_me:${as_lineno-1981}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-1983}: \$? = $ac_status" >&5
   test $ac_status = 0; } && {
 	 test -z "$ac_cxx_werror_flag" ||
 	 test ! -s conftest.err
@@ -2012,66 +2014,66 @@ ac_fn_c_check_header_mongrel ()
 {
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
   if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
-  { $as_echo "$as_me:${as_lineno-2015}: checking for $2" >&5
+  { $as_echo "$as_me:${as_lineno-2017}: checking for $2" >&5
 $as_echo_n "checking for $2... " >&6; }
 if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
   $as_echo_n "(cached) " >&6
 fi
 eval ac_res=\$$3
-	       { $as_echo "$as_me:${as_lineno-2021}: result: $ac_res" >&5
+	       { $as_echo "$as_me:${as_lineno-2023}: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
 else
   # Is the header compilable?
-{ $as_echo "$as_me:${as_lineno-2025}: checking $2 usability" >&5
+{ $as_echo "$as_me:${as_lineno-2027}: checking $2 usability" >&5
 $as_echo_n "checking $2 usability... " >&6; }
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 $4
 #include <$2>
 _ACEOF
-if ac_fn_c_try_compile "2032"; then :
+if ac_fn_c_try_compile "2034"; then :
   ac_header_compiler=yes
 else
   ac_header_compiler=no
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ $as_echo "$as_me:${as_lineno-2038}: result: $ac_header_compiler" >&5
+{ $as_echo "$as_me:${as_lineno-2040}: result: $ac_header_compiler" >&5
 $as_echo "$ac_header_compiler" >&6; }
 
 # Is the header present?
-{ $as_echo "$as_me:${as_lineno-2042}: checking $2 presence" >&5
+{ $as_echo "$as_me:${as_lineno-2044}: checking $2 presence" >&5
 $as_echo_n "checking $2 presence... " >&6; }
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <$2>
 _ACEOF
-if ac_fn_c_try_cpp "2048"; then :
+if ac_fn_c_try_cpp "2050"; then :
   ac_header_preproc=yes
 else
   ac_header_preproc=no
 fi
 rm -f conftest.err conftest.$ac_ext
-{ $as_echo "$as_me:${as_lineno-2054}: result: $ac_header_preproc" >&5
+{ $as_echo "$as_me:${as_lineno-2056}: result: $ac_header_preproc" >&5
 $as_echo "$ac_header_preproc" >&6; }
 
 # So?  What about this header?
 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in #((
   yes:no: )
-    { $as_echo "$as_me:${as_lineno-2060}: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&5
+    { $as_echo "$as_me:${as_lineno-2062}: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&5
 $as_echo "$as_me: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { $as_echo "$as_me:${as_lineno-2062}: WARNING: $2: proceeding with the compiler's result" >&5
+    { $as_echo "$as_me:${as_lineno-2064}: WARNING: $2: proceeding with the compiler's result" >&5
 $as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
     ;;
   no:yes:* )
-    { $as_echo "$as_me:${as_lineno-2066}: WARNING: $2: present but cannot be compiled" >&5
+    { $as_echo "$as_me:${as_lineno-2068}: WARNING: $2: present but cannot be compiled" >&5
 $as_echo "$as_me: WARNING: $2: present but cannot be compiled" >&2;}
-    { $as_echo "$as_me:${as_lineno-2068}: WARNING: $2:     check for missing prerequisite headers?" >&5
+    { $as_echo "$as_me:${as_lineno-2070}: WARNING: $2:     check for missing prerequisite headers?" >&5
 $as_echo "$as_me: WARNING: $2:     check for missing prerequisite headers?" >&2;}
-    { $as_echo "$as_me:${as_lineno-2070}: WARNING: $2: see the Autoconf documentation" >&5
+    { $as_echo "$as_me:${as_lineno-2072}: WARNING: $2: see the Autoconf documentation" >&5
 $as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;}
-    { $as_echo "$as_me:${as_lineno-2072}: WARNING: $2:     section \"Present But Cannot Be Compiled\"" >&5
+    { $as_echo "$as_me:${as_lineno-2074}: WARNING: $2:     section \"Present But Cannot Be Compiled\"" >&5
 $as_echo "$as_me: WARNING: $2:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { $as_echo "$as_me:${as_lineno-2074}: WARNING: $2: proceeding with the compiler's result" >&5
+    { $as_echo "$as_me:${as_lineno-2076}: WARNING: $2: proceeding with the compiler's result" >&5
 $as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
 ( cat <<\_ASBOX
 ## ------------------------------------- ##
@@ -2081,7 +2083,7 @@ _ASBOX
      ) | sed "s/^/$as_me: WARNING:     /" >&2
     ;;
 esac
-  { $as_echo "$as_me:${as_lineno-2084}: checking for $2" >&5
+  { $as_echo "$as_me:${as_lineno-2086}: 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
@@ -2089,7 +2091,7 @@ else
   eval "$3=\$ac_header_compiler"
 fi
 eval ac_res=\$$3
-	       { $as_echo "$as_me:${as_lineno-2092}: result: $ac_res" >&5
+	       { $as_echo "$as_me:${as_lineno-2094}: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
 fi
   eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
@@ -2103,7 +2105,7 @@ fi
 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-2106}: checking for $2" >&5
+  { $as_echo "$as_me:${as_lineno-2108}: 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
@@ -2121,7 +2123,7 @@ if (sizeof ($2))
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "2124"; then :
+if ac_fn_c_try_compile "2126"; then :
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 $4
@@ -2134,7 +2136,7 @@ if (sizeof (($2)))
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "2137"; then :
+if ac_fn_c_try_compile "2139"; then :
 
 else
   eval "$3=yes"
@@ -2144,7 +2146,7 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
 eval ac_res=\$$3
-	       { $as_echo "$as_me:${as_lineno-2147}: result: $ac_res" >&5
+	       { $as_echo "$as_me:${as_lineno-2149}: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
   eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
 
@@ -2157,7 +2159,7 @@ $as_echo "$ac_res" >&6; }
 ac_fn_c_find_intX_t ()
 {
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  { $as_echo "$as_me:${as_lineno-2160}: checking for int$2_t" >&5
+  { $as_echo "$as_me:${as_lineno-2162}: checking for int$2_t" >&5
 $as_echo_n "checking for int$2_t... " >&6; }
 if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
   $as_echo_n "(cached) " >&6
@@ -2178,7 +2180,7 @@ test_array [0] = 0
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "2181"; then :
+if ac_fn_c_try_compile "2183"; then :
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 $ac_includes_default
@@ -2193,7 +2195,7 @@ test_array [0] = 0
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "2196"; then :
+if ac_fn_c_try_compile "2198"; then :
 
 else
   case $ac_type in #(
@@ -2215,7 +2217,7 @@ fi
      done
 fi
 eval ac_res=\$$3
-	       { $as_echo "$as_me:${as_lineno-2218}: result: $ac_res" >&5
+	       { $as_echo "$as_me:${as_lineno-2220}: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
   eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
 
@@ -2348,7 +2350,7 @@ _ASBOX
     case $ac_val in #(
     *${as_nl}*)
       case $ac_var in #(
-      *_cv_*) { $as_echo "$as_me:${as_lineno-2351}: WARNING: cache variable $ac_var contains a newline" >&5
+      *_cv_*) { $as_echo "$as_me:${as_lineno-2353}: WARNING: cache variable $ac_var contains a newline" >&5
 $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
       esac
       case $ac_var in #(
@@ -2479,7 +2481,7 @@ for ac_site_file in "$ac_site_file1" "$ac_site_file2"
 do
   test "x$ac_site_file" = xNONE && continue
   if test -r "$ac_site_file"; then
-    { $as_echo "$as_me:${as_lineno-2482}: loading site script $ac_site_file" >&5
+    { $as_echo "$as_me:${as_lineno-2484}: loading site script $ac_site_file" >&5
 $as_echo "$as_me: loading site script $ac_site_file" >&6;}
     sed 's/^/| /' "$ac_site_file" >&5
     . "$ac_site_file"
@@ -2490,7 +2492,7 @@ if test -r "$cache_file"; then
   # Some versions of bash will fail to source /dev/null (special
   # files actually), so we avoid doing that.
   if test -f "$cache_file"; then
-    { $as_echo "$as_me:${as_lineno-2493}: loading cache $cache_file" >&5
+    { $as_echo "$as_me:${as_lineno-2495}: loading cache $cache_file" >&5
 $as_echo "$as_me: loading cache $cache_file" >&6;}
     case $cache_file in
       [\\/]* | ?:[\\/]* ) . "$cache_file";;
@@ -2498,7 +2500,7 @@ $as_echo "$as_me: loading cache $cache_file" >&6;}
     esac
   fi
 else
-  { $as_echo "$as_me:${as_lineno-2501}: creating cache $cache_file" >&5
+  { $as_echo "$as_me:${as_lineno-2503}: creating cache $cache_file" >&5
 $as_echo "$as_me: creating cache $cache_file" >&6;}
   >$cache_file
 fi
@@ -2516,11 +2518,11 @@ for ac_var in $ac_precious_vars; do
   eval ac_new_val=\$ac_env_${ac_var}_value
   case $ac_old_set,$ac_new_set in
     set,)
-      { $as_echo "$as_me:${as_lineno-2519}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
+      { $as_echo "$as_me:${as_lineno-2521}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
 $as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
       ac_cache_corrupted=: ;;
     ,set)
-      { $as_echo "$as_me:${as_lineno-2523}: error: \`$ac_var' was not set in the previous run" >&5
+      { $as_echo "$as_me:${as_lineno-2525}: error: \`$ac_var' was not set in the previous run" >&5
 $as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
       ac_cache_corrupted=: ;;
     ,);;
@@ -2530,17 +2532,17 @@ $as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
 	ac_old_val_w=`echo x $ac_old_val`
 	ac_new_val_w=`echo x $ac_new_val`
 	if test "$ac_old_val_w" != "$ac_new_val_w"; then
-	  { $as_echo "$as_me:${as_lineno-2533}: error: \`$ac_var' has changed since the previous run:" >&5
+	  { $as_echo "$as_me:${as_lineno-2535}: error: \`$ac_var' has changed since the previous run:" >&5
 $as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
 	  ac_cache_corrupted=:
 	else
-	  { $as_echo "$as_me:${as_lineno-2537}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5
+	  { $as_echo "$as_me:${as_lineno-2539}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5
 $as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;}
 	  eval $ac_var=\$ac_old_val
 	fi
-	{ $as_echo "$as_me:${as_lineno-2541}:   former value:  \`$ac_old_val'" >&5
+	{ $as_echo "$as_me:${as_lineno-2543}:   former value:  \`$ac_old_val'" >&5
 $as_echo "$as_me:   former value:  \`$ac_old_val'" >&2;}
-	{ $as_echo "$as_me:${as_lineno-2543}:   current value: \`$ac_new_val'" >&5
+	{ $as_echo "$as_me:${as_lineno-2545}:   current value: \`$ac_new_val'" >&5
 $as_echo "$as_me:   current value: \`$ac_new_val'" >&2;}
       fi;;
   esac
@@ -2557,11 +2559,11 @@ $as_echo "$as_me:   current value: \`$ac_new_val'" >&2;}
   fi
 done
 if $ac_cache_corrupted; then
-  { $as_echo "$as_me:${as_lineno-2560}: error: in \`$ac_pwd':" >&5
+  { $as_echo "$as_me:${as_lineno-2562}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-  { $as_echo "$as_me:${as_lineno-2562}: error: changes in the environment can compromise the build" >&5
+  { $as_echo "$as_me:${as_lineno-2564}: error: changes in the environment can compromise the build" >&5
 $as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
-  as_fn_error "run \`make distclean' and/or \`rm $cache_file' and start over" "2564" 5
+  as_fn_error "run \`make distclean' and/or \`rm $cache_file' and start over" "2566" 5
 fi
 ## -------------------- ##
 ## Main body of script. ##
@@ -2585,7 +2587,7 @@ for ac_dir in build-aux "$srcdir"/build-aux; do
   done
 done
 if test -z "$ac_aux_dir"; then
-  as_fn_error "cannot find install-sh, install.sh, or shtool in build-aux \"$srcdir\"/build-aux" "2588" 5
+  as_fn_error "cannot find install-sh, install.sh, or shtool in build-aux \"$srcdir\"/build-aux" "2590" 5
 fi
 
 # These three variables are undocumented and unsupported,
@@ -2601,7 +2603,7 @@ ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
 ac_config_headers="$ac_config_headers config.h"
 
 
-am__api_version='1.10'
+am__api_version='1.11'
 
 # Find a good install program.  We prefer a C program (faster),
 # so one script is as good as another.  But avoid the broken or
@@ -2617,7 +2619,7 @@ am__api_version='1.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.
-{ $as_echo "$as_me:${as_lineno-2620}: checking for a BSD-compatible install" >&5
+{ $as_echo "$as_me:${as_lineno-2622}: checking for a BSD-compatible install" >&5
 $as_echo_n "checking for a BSD-compatible install... " >&6; }
 if test -z "$INSTALL"; then
 if test "${ac_cv_path_install+set}" = set; then :
@@ -2685,7 +2687,7 @@ fi
     INSTALL=$ac_install_sh
   fi
 fi
-{ $as_echo "$as_me:${as_lineno-2688}: result: $INSTALL" >&5
+{ $as_echo "$as_me:${as_lineno-2690}: result: $INSTALL" >&5
 $as_echo "$INSTALL" >&6; }
 
 # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
@@ -2696,21 +2698,34 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
 
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
-{ $as_echo "$as_me:${as_lineno-2699}: checking whether build environment is sane" >&5
+{ $as_echo "$as_me:${as_lineno-2701}: checking whether build environment is sane" >&5
 $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]*)
+    as_fn_error "unsafe absolute working directory name" "2712" 5;;
+esac
+case $srcdir in
+  *[\\\"\#\$\&\'\`$am_lf\ \	]*)
+    as_fn_error "unsafe srcdir value: \`$srcdir'" "2716" 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" \
@@ -2721,7 +2736,7 @@ if (
       # broken ls alias from the environment.  This has actually
       # happened.  Such a system could not be considered "sane".
       as_fn_error "ls -t appears to fail.  Make sure there is not a broken
-alias in your environment" "2724" 5
+alias in your environment" "2739" 5
    fi
 
    test "$2" = conftest.file
@@ -2731,9 +2746,9 @@ then
    :
 else
    as_fn_error "newly created file is older than distributed files!
-Check your system clock" "2734" 5
+Check your system clock" "2749" 5
 fi
-{ $as_echo "$as_me:${as_lineno-2736}: result: yes" >&5
+{ $as_echo "$as_me:${as_lineno-2751}: result: yes" >&5
 $as_echo "yes" >&6; }
 test "$program_prefix" != NONE &&
   program_transform_name="s&^&$program_prefix&;$program_transform_name"
@@ -2748,17 +2763,133 @@ program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"`
 # expand $ac_aux_dir to an absolute path
 am_aux_dir=`cd $ac_aux_dir && pwd`
 
-test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
+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
 # Use eval to expand $SHELL
 if eval "$MISSING --run true"; then
   am_missing_run="$MISSING --run "
 else
   am_missing_run=
-  { $as_echo "$as_me:${as_lineno-2757}: WARNING: \`missing' script is too old or missing" >&5
+  { $as_echo "$as_me:${as_lineno-2779}: WARNING: \`missing' script is too old or missing" >&5
 $as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
 fi
 
-{ $as_echo "$as_me:${as_lineno-2761}: checking for a thread-safe mkdir -p" >&5
+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
+{ $as_echo "$as_me:${as_lineno-2800}: 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-2816}: 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-2827}: result: $STRIP" >&5
+$as_echo "$STRIP" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-2830}: 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-2840}: 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-2856}: 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-2867}: result: $ac_ct_STRIP" >&5
+$as_echo "$ac_ct_STRIP" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-2870}: 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-2879}: 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-2892}: 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 :
@@ -2797,7 +2928,7 @@ fi
     MKDIR_P="$ac_install_sh -d"
   fi
 fi
-{ $as_echo "$as_me:${as_lineno-2800}: result: $MKDIR_P" >&5
+{ $as_echo "$as_me:${as_lineno-2931}: result: $MKDIR_P" >&5
 $as_echo "$MKDIR_P" >&6; }
 
 mkdir_p="$MKDIR_P"
@@ -2810,7 +2941,7 @@ for ac_prog in gawk mawk nawk awk
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-2813}: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-2944}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_AWK+set}" = set; then :
   $as_echo_n "(cached) " >&6
@@ -2826,7 +2957,7 @@ 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_AWK="$ac_prog"
-    $as_echo "$as_me:${as_lineno-2829}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-2960}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -2837,10 +2968,10 @@ fi
 fi
 AWK=$ac_cv_prog_AWK
 if test -n "$AWK"; then
-  { $as_echo "$as_me:${as_lineno-2840}: result: $AWK" >&5
+  { $as_echo "$as_me:${as_lineno-2971}: result: $AWK" >&5
 $as_echo "$AWK" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-2843}: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-2974}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -2848,7 +2979,7 @@ fi
   test -n "$AWK" && break
 done
 
-{ $as_echo "$as_me:${as_lineno-2851}: checking whether ${MAKE-make} sets \$(MAKE)" >&5
+{ $as_echo "$as_me:${as_lineno-2982}: checking whether ${MAKE-make} sets \$(MAKE)" >&5
 $as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
 set x ${MAKE-make}
 ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
@@ -2870,11 +3001,11 @@ esac
 rm -f conftest.make
 fi
 if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
-  { $as_echo "$as_me:${as_lineno-2873}: result: yes" >&5
+  { $as_echo "$as_me:${as_lineno-3004}: result: yes" >&5
 $as_echo "yes" >&6; }
   SET_MAKE=
 else
-  { $as_echo "$as_me:${as_lineno-2877}: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-3008}: result: no" >&5
 $as_echo "no" >&6; }
   SET_MAKE="MAKE=${MAKE-make}"
 fi
@@ -2894,7 +3025,7 @@ if test "`cd $srcdir && pwd`" != "`pwd`"; then
   am__isrc=' -I$(srcdir)'
   # test to see if srcdir already configured
   if test -f $srcdir/config.status; then
-    as_fn_error "source directory already configured; run \"make distclean\" there first" "2897" 5
+    as_fn_error "source directory already configured; run \"make distclean\" there first" "3028" 5
   fi
 fi
 
@@ -2938,108 +3069,6 @@ AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"}
 
 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-2951}: 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-2967}: 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-2978}: result: $STRIP" >&5
-$as_echo "$STRIP" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-2981}: 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-2991}: 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-3007}: 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-3018}: result: $ac_ct_STRIP" >&5
-$as_echo "$ac_ct_STRIP" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-3021}: 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-3030}: 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.
@@ -3059,7 +3088,7 @@ am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'
 
 case `pwd` in
   *\ * | *\	*)
-    { $as_echo "$as_me:${as_lineno-3062}: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5
+    { $as_echo "$as_me:${as_lineno-3091}: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5
 $as_echo "$as_me: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&2;} ;;
 esac
 
@@ -3084,9 +3113,9 @@ ltmain="$ac_aux_dir/ltmain.sh"
 
 # Make sure we can run config.sub.
 $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
-  as_fn_error "cannot run $SHELL $ac_aux_dir/config.sub" "3087" 5
+  as_fn_error "cannot run $SHELL $ac_aux_dir/config.sub" "3116" 5
 
-{ $as_echo "$as_me:${as_lineno-3089}: checking build system type" >&5
+{ $as_echo "$as_me:${as_lineno-3118}: checking build system type" >&5
 $as_echo_n "checking build system type... " >&6; }
 if test "${ac_cv_build+set}" = set; then :
   $as_echo_n "(cached) " >&6
@@ -3095,16 +3124,16 @@ else
 test "x$ac_build_alias" = x &&
   ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
 test "x$ac_build_alias" = x &&
-  as_fn_error "cannot guess build type; you must specify one" "3098" 5
+  as_fn_error "cannot guess build type; you must specify one" "3127" 5
 ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
-  as_fn_error "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "3100" 5
+  as_fn_error "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "3129" 5
 
 fi
-{ $as_echo "$as_me:${as_lineno-3103}: result: $ac_cv_build" >&5
+{ $as_echo "$as_me:${as_lineno-3132}: result: $ac_cv_build" >&5
 $as_echo "$ac_cv_build" >&6; }
 case $ac_cv_build in
 *-*-*) ;;
-*) as_fn_error "invalid value of canonical build" "3107" 5;;
+*) as_fn_error "invalid value of canonical build" "3136" 5;;
 esac
 build=$ac_cv_build
 ac_save_IFS=$IFS; IFS='-'
@@ -3120,7 +3149,7 @@ IFS=$ac_save_IFS
 case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
 
 
-{ $as_echo "$as_me:${as_lineno-3123}: checking host system type" >&5
+{ $as_echo "$as_me:${as_lineno-3152}: checking host system type" >&5
 $as_echo_n "checking host system type... " >&6; }
 if test "${ac_cv_host+set}" = set; then :
   $as_echo_n "(cached) " >&6
@@ -3129,15 +3158,15 @@ else
   ac_cv_host=$ac_cv_build
 else
   ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
-    as_fn_error "$SHELL $ac_aux_dir/config.sub $host_alias failed" "3132" 5
+    as_fn_error "$SHELL $ac_aux_dir/config.sub $host_alias failed" "3161" 5
 fi
 
 fi
-{ $as_echo "$as_me:${as_lineno-3136}: result: $ac_cv_host" >&5
+{ $as_echo "$as_me:${as_lineno-3165}: result: $ac_cv_host" >&5
 $as_echo "$ac_cv_host" >&6; }
 case $ac_cv_host in
 *-*-*) ;;
-*) as_fn_error "invalid value of canonical host" "3140" 5;;
+*) as_fn_error "invalid value of canonical host" "3169" 5;;
 esac
 host=$ac_cv_host
 ac_save_IFS=$IFS; IFS='-'
@@ -3161,39 +3190,39 @@ ac_config_commands="$ac_config_commands depfiles"
 am_make=${MAKE-make}
 cat > confinc << 'END'
 am__doit:
-	@echo done
+	@echo this is the am__doit target
 .PHONY: am__doit
 END
 # If we don't find an include directive, just comment out the code.
-{ $as_echo "$as_me:${as_lineno-3168}: checking for style of include used by $am_make" >&5
+{ $as_echo "$as_me:${as_lineno-3197}: checking for style of include used by $am_make" >&5
 $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
-# 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
+# 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
 # Now try BSD make style include.
 if test "$am__include" = "#"; then
    echo '.include "confinc"' > confmf
-   if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then
-      am__include=.include
-      am__quote="\""
-      _am_result=BSD
-   fi
+   case `$am_make -s -f confmf 2> /dev/null` in #(
+   *the\ am__doit\ target*)
+     am__include=.include
+     am__quote="\""
+     _am_result=BSD
+     ;;
+   esac
 fi
 
 
-{ $as_echo "$as_me:${as_lineno-3196}: result: $_am_result" >&5
+{ $as_echo "$as_me:${as_lineno-3225}: result: $_am_result" >&5
 $as_echo "$_am_result" >&6; }
 rm -f confinc confmf
 
@@ -3223,7 +3252,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
 set dummy ${ac_tool_prefix}gcc; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-3226}: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-3255}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_CC+set}" = set; then :
   $as_echo_n "(cached) " >&6
@@ -3239,7 +3268,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_CC="${ac_tool_prefix}gcc"
-    $as_echo "$as_me:${as_lineno-3242}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-3271}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -3250,10 +3279,10 @@ fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { $as_echo "$as_me:${as_lineno-3253}: result: $CC" >&5
+  { $as_echo "$as_me:${as_lineno-3282}: result: $CC" >&5
 $as_echo "$CC" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-3256}: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-3285}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -3263,7 +3292,7 @@ if test -z "$ac_cv_prog_CC"; then
   ac_ct_CC=$CC
   # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-3266}: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-3295}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
   $as_echo_n "(cached) " >&6
@@ -3279,7 +3308,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_CC="gcc"
-    $as_echo "$as_me:${as_lineno-3282}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-3311}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -3290,10 +3319,10 @@ fi
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  { $as_echo "$as_me:${as_lineno-3293}: result: $ac_ct_CC" >&5
+  { $as_echo "$as_me:${as_lineno-3322}: result: $ac_ct_CC" >&5
 $as_echo "$ac_ct_CC" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-3296}: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-3325}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -3302,7 +3331,7 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ $as_echo "$as_me:${as_lineno-3305}: WARNING: using cross tools not prefixed with host triplet" >&5
+{ $as_echo "$as_me:${as_lineno-3334}: 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
@@ -3316,7 +3345,7 @@ if test -z "$CC"; then
           if test -n "$ac_tool_prefix"; then
     # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
 set dummy ${ac_tool_prefix}cc; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-3319}: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-3348}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_CC+set}" = set; then :
   $as_echo_n "(cached) " >&6
@@ -3332,7 +3361,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_CC="${ac_tool_prefix}cc"
-    $as_echo "$as_me:${as_lineno-3335}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-3364}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -3343,10 +3372,10 @@ fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { $as_echo "$as_me:${as_lineno-3346}: result: $CC" >&5
+  { $as_echo "$as_me:${as_lineno-3375}: result: $CC" >&5
 $as_echo "$CC" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-3349}: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-3378}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -3356,7 +3385,7 @@ fi
 if test -z "$CC"; then
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-3359}: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-3388}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_CC+set}" = set; then :
   $as_echo_n "(cached) " >&6
@@ -3377,7 +3406,7 @@ do
        continue
      fi
     ac_cv_prog_CC="cc"
-    $as_echo "$as_me:${as_lineno-3380}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-3409}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -3400,10 +3429,10 @@ fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { $as_echo "$as_me:${as_lineno-3403}: result: $CC" >&5
+  { $as_echo "$as_me:${as_lineno-3432}: result: $CC" >&5
 $as_echo "$CC" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-3406}: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-3435}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -3415,7 +3444,7 @@ if test -z "$CC"; then
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-3418}: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-3447}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_CC+set}" = set; then :
   $as_echo_n "(cached) " >&6
@@ -3431,7 +3460,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
-    $as_echo "$as_me:${as_lineno-3434}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-3463}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -3442,10 +3471,10 @@ fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { $as_echo "$as_me:${as_lineno-3445}: result: $CC" >&5
+  { $as_echo "$as_me:${as_lineno-3474}: result: $CC" >&5
 $as_echo "$CC" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-3448}: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-3477}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -3459,7 +3488,7 @@ if test -z "$CC"; then
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-3462}: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-3491}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
   $as_echo_n "(cached) " >&6
@@ -3475,7 +3504,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_CC="$ac_prog"
-    $as_echo "$as_me:${as_lineno-3478}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-3507}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -3486,10 +3515,10 @@ fi
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  { $as_echo "$as_me:${as_lineno-3489}: result: $ac_ct_CC" >&5
+  { $as_echo "$as_me:${as_lineno-3518}: result: $ac_ct_CC" >&5
 $as_echo "$ac_ct_CC" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-3492}: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-3521}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -3502,7 +3531,7 @@ done
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ $as_echo "$as_me:${as_lineno-3505}: WARNING: using cross tools not prefixed with host triplet" >&5
+{ $as_echo "$as_me:${as_lineno-3534}: 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
@@ -3513,13 +3542,13 @@ fi
 fi
 
 
-test -z "$CC" && { { $as_echo "$as_me:${as_lineno-3516}: error: in \`$ac_pwd':" >&5
+test -z "$CC" && { { $as_echo "$as_me:${as_lineno-3545}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error "no acceptable C compiler found in \$PATH
-See \`config.log' for more details." "3519" 5; }
+See \`config.log' for more details." "3548" 5; }
 
 # Provide some information about the compiler.
-$as_echo "$as_me:${as_lineno-3522}: checking for C compiler version" >&5
+$as_echo "$as_me:${as_lineno-3551}: checking for C compiler version" >&5
 set X $ac_compile
 ac_compiler=$2
 for ac_option in --version -v -V -qversion; do
@@ -3528,7 +3557,7 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:${as_lineno-3531}: $ac_try_echo\""
+eval ac_try_echo="\"\$as_me:${as_lineno-3560}: $ac_try_echo\""
 $as_echo "$ac_try_echo"; } >&5
   (eval "$ac_compiler $ac_option >&5") 2>conftest.err
   ac_status=$?
@@ -3539,7 +3568,7 @@ $as_echo "$ac_try_echo"; } >&5
     cat conftest.er1 >&5
     rm -f conftest.er1 conftest.err
   fi
-  $as_echo "$as_me:${as_lineno-3542}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-3571}: \$? = $ac_status" >&5
   test $ac_status = 0; }
 done
 
@@ -3561,7 +3590,7 @@ ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out conftest.out"
 # Try to create an executable without -o first, disregard a.out.
 # It will help us diagnose broken compilers, and finding out an intuition
 # of exeext.
-{ $as_echo "$as_me:${as_lineno-3564}: checking for C compiler default output file name" >&5
+{ $as_echo "$as_me:${as_lineno-3593}: checking for C compiler default output file name" >&5
 $as_echo_n "checking for C compiler default output file name... " >&6; }
 ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
 
@@ -3583,11 +3612,11 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:${as_lineno-3586}: $ac_try_echo\""
+eval ac_try_echo="\"\$as_me:${as_lineno-3615}: $ac_try_echo\""
 $as_echo "$ac_try_echo"; } >&5
   (eval "$ac_link_default") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-3590}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-3619}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then :
   # Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
 # So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
@@ -3624,23 +3653,23 @@ test "$ac_cv_exeext" = no && ac_cv_exeext=
 else
   ac_file=''
 fi
-{ $as_echo "$as_me:${as_lineno-3627}: result: $ac_file" >&5
+{ $as_echo "$as_me:${as_lineno-3656}: result: $ac_file" >&5
 $as_echo "$ac_file" >&6; }
 if test -z "$ac_file"; then :
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-{ { $as_echo "$as_me:${as_lineno-3633}: error: in \`$ac_pwd':" >&5
+{ { $as_echo "$as_me:${as_lineno-3662}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 { as_fn_set_status 77
 as_fn_error "C compiler cannot create executables
-See \`config.log' for more details." "3637" 5; }; }
+See \`config.log' for more details." "3666" 5; }; }
 fi
 ac_exeext=$ac_cv_exeext
 
 # Check that the compiler produces executables we can run.  If not, either
 # the compiler is broken, or we cross compile.
-{ $as_echo "$as_me:${as_lineno-3643}: checking whether the C compiler works" >&5
+{ $as_echo "$as_me:${as_lineno-3672}: checking whether the C compiler works" >&5
 $as_echo_n "checking whether the C compiler works... " >&6; }
 # If not cross compiling, check that we can run a simple program.
 if test "$cross_compiling" != yes; then
@@ -3649,49 +3678,49 @@ if test "$cross_compiling" != yes; then
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:${as_lineno-3652}: $ac_try_echo\""
+eval ac_try_echo="\"\$as_me:${as_lineno-3681}: $ac_try_echo\""
 $as_echo "$ac_try_echo"; } >&5
   (eval "$ac_try") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-3656}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-3685}: \$? = $ac_status" >&5
   test $ac_status = 0; }; }; then
     cross_compiling=no
   else
     if test "$cross_compiling" = maybe; then
 	cross_compiling=yes
     else
-	{ { $as_echo "$as_me:${as_lineno-3663}: error: in \`$ac_pwd':" >&5
+	{ { $as_echo "$as_me:${as_lineno-3692}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error "cannot run C compiled programs.
 If you meant to cross compile, use \`--host'.
-See \`config.log' for more details." "3667" 5; }
+See \`config.log' for more details." "3696" 5; }
     fi
   fi
 fi
-{ $as_echo "$as_me:${as_lineno-3671}: result: yes" >&5
+{ $as_echo "$as_me:${as_lineno-3700}: result: yes" >&5
 $as_echo "yes" >&6; }
 
 rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out conftest.out
 ac_clean_files=$ac_clean_files_save
 # Check that the compiler produces executables we can run.  If not, either
 # the compiler is broken, or we cross compile.
-{ $as_echo "$as_me:${as_lineno-3678}: checking whether we are cross compiling" >&5
+{ $as_echo "$as_me:${as_lineno-3707}: checking whether we are cross compiling" >&5
 $as_echo_n "checking whether we are cross compiling... " >&6; }
-{ $as_echo "$as_me:${as_lineno-3680}: result: $cross_compiling" >&5
+{ $as_echo "$as_me:${as_lineno-3709}: result: $cross_compiling" >&5
 $as_echo "$cross_compiling" >&6; }
 
-{ $as_echo "$as_me:${as_lineno-3683}: checking for suffix of executables" >&5
+{ $as_echo "$as_me:${as_lineno-3712}: checking for suffix of executables" >&5
 $as_echo_n "checking for suffix of executables... " >&6; }
 if { { ac_try="$ac_link"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:${as_lineno-3690}: $ac_try_echo\""
+eval ac_try_echo="\"\$as_me:${as_lineno-3719}: $ac_try_echo\""
 $as_echo "$ac_try_echo"; } >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-3694}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-3723}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then :
   # If both `conftest.exe' and `conftest' are `present' (well, observable)
 # catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will
@@ -3707,19 +3736,19 @@ for ac_file in conftest.exe conftest conftest.*; do
   esac
 done
 else
-  { { $as_echo "$as_me:${as_lineno-3710}: error: in \`$ac_pwd':" >&5
+  { { $as_echo "$as_me:${as_lineno-3739}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error "cannot compute suffix of executables: cannot compile and link
-See \`config.log' for more details." "3713" 5; }
+See \`config.log' for more details." "3742" 5; }
 fi
 rm -f conftest$ac_cv_exeext
-{ $as_echo "$as_me:${as_lineno-3716}: result: $ac_cv_exeext" >&5
+{ $as_echo "$as_me:${as_lineno-3745}: result: $ac_cv_exeext" >&5
 $as_echo "$ac_cv_exeext" >&6; }
 
 rm -f conftest.$ac_ext
 EXEEXT=$ac_cv_exeext
 ac_exeext=$EXEEXT
-{ $as_echo "$as_me:${as_lineno-3722}: checking for suffix of object files" >&5
+{ $as_echo "$as_me:${as_lineno-3751}: checking for suffix of object files" >&5
 $as_echo_n "checking for suffix of object files... " >&6; }
 if test "${ac_cv_objext+set}" = set; then :
   $as_echo_n "(cached) " >&6
@@ -3741,11 +3770,11 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:${as_lineno-3744}: $ac_try_echo\""
+eval ac_try_echo="\"\$as_me:${as_lineno-3773}: $ac_try_echo\""
 $as_echo "$ac_try_echo"; } >&5
   (eval "$ac_compile") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-3748}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-3777}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then :
   for ac_file in conftest.o conftest.obj conftest.*; do
   test -f "$ac_file" || continue;
@@ -3759,18 +3788,18 @@ else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-{ { $as_echo "$as_me:${as_lineno-3762}: error: in \`$ac_pwd':" >&5
+{ { $as_echo "$as_me:${as_lineno-3791}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error "cannot compute suffix of object files: cannot compile
-See \`config.log' for more details." "3765" 5; }
+See \`config.log' for more details." "3794" 5; }
 fi
 rm -f conftest.$ac_cv_objext conftest.$ac_ext
 fi
-{ $as_echo "$as_me:${as_lineno-3769}: result: $ac_cv_objext" >&5
+{ $as_echo "$as_me:${as_lineno-3798}: result: $ac_cv_objext" >&5
 $as_echo "$ac_cv_objext" >&6; }
 OBJEXT=$ac_cv_objext
 ac_objext=$OBJEXT
-{ $as_echo "$as_me:${as_lineno-3773}: checking whether we are using the GNU C compiler" >&5
+{ $as_echo "$as_me:${as_lineno-3802}: 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 :
   $as_echo_n "(cached) " >&6
@@ -3789,7 +3818,7 @@ main ()
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "3792"; then :
+if ac_fn_c_try_compile "3821"; then :
   ac_compiler_gnu=yes
 else
   ac_compiler_gnu=no
@@ -3798,7 +3827,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 ac_cv_c_compiler_gnu=$ac_compiler_gnu
 
 fi
-{ $as_echo "$as_me:${as_lineno-3801}: result: $ac_cv_c_compiler_gnu" >&5
+{ $as_echo "$as_me:${as_lineno-3830}: result: $ac_cv_c_compiler_gnu" >&5
 $as_echo "$ac_cv_c_compiler_gnu" >&6; }
 if test $ac_compiler_gnu = yes; then
   GCC=yes
@@ -3807,7 +3836,7 @@ else
 fi
 ac_test_CFLAGS=${CFLAGS+set}
 ac_save_CFLAGS=$CFLAGS
-{ $as_echo "$as_me:${as_lineno-3810}: checking whether $CC accepts -g" >&5
+{ $as_echo "$as_me:${as_lineno-3839}: 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 :
   $as_echo_n "(cached) " >&6
@@ -3827,7 +3856,7 @@ main ()
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "3830"; then :
+if ac_fn_c_try_compile "3859"; then :
   ac_cv_prog_cc_g=yes
 else
   CFLAGS=""
@@ -3842,7 +3871,7 @@ main ()
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "3845"; then :
+if ac_fn_c_try_compile "3874"; then :
 
 else
   ac_c_werror_flag=$ac_save_c_werror_flag
@@ -3858,7 +3887,7 @@ main ()
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "3861"; then :
+if ac_fn_c_try_compile "3890"; then :
   ac_cv_prog_cc_g=yes
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
@@ -3868,7 +3897,7 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
    ac_c_werror_flag=$ac_save_c_werror_flag
 fi
-{ $as_echo "$as_me:${as_lineno-3871}: result: $ac_cv_prog_cc_g" >&5
+{ $as_echo "$as_me:${as_lineno-3900}: 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
@@ -3885,7 +3914,7 @@ else
     CFLAGS=
   fi
 fi
-{ $as_echo "$as_me:${as_lineno-3888}: checking for $CC option to accept ISO C89" >&5
+{ $as_echo "$as_me:${as_lineno-3917}: 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 :
   $as_echo_n "(cached) " >&6
@@ -3949,7 +3978,7 @@ for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
 	-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
 do
   CC="$ac_save_CC $ac_arg"
-  if ac_fn_c_try_compile "3952"; then :
+  if ac_fn_c_try_compile "3981"; then :
   ac_cv_prog_cc_c89=$ac_arg
 fi
 rm -f core conftest.err conftest.$ac_objext
@@ -3962,14 +3991,14 @@ fi
 # AC_CACHE_VAL
 case "x$ac_cv_prog_cc_c89" in
   x)
-    { $as_echo "$as_me:${as_lineno-3965}: result: none needed" >&5
+    { $as_echo "$as_me:${as_lineno-3994}: result: none needed" >&5
 $as_echo "none needed" >&6; } ;;
   xno)
-    { $as_echo "$as_me:${as_lineno-3968}: result: unsupported" >&5
+    { $as_echo "$as_me:${as_lineno-3997}: result: unsupported" >&5
 $as_echo "unsupported" >&6; } ;;
   *)
     CC="$CC $ac_cv_prog_cc_c89"
-    { $as_echo "$as_me:${as_lineno-3972}: result: $ac_cv_prog_cc_c89" >&5
+    { $as_echo "$as_me:${as_lineno-4001}: 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 :
@@ -3984,7 +4013,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 depcc="$CC"   am_compiler_list=
 
-{ $as_echo "$as_me:${as_lineno-3987}: checking dependency style of $depcc" >&5
+{ $as_echo "$as_me:${as_lineno-4016}: 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 :
   $as_echo_n "(cached) " >&6
@@ -4012,6 +4041,11 @@ else
   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
@@ -4029,7 +4063,17 @@ else
     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
@@ -4039,19 +4083,23 @@ else
 	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=sub/conftest.${OBJEXT-o} \
+       source=sub/conftest.c object=$am__obj \
        depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
-       $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
+       $SHELL ./depcomp $depcc -c $am__minus_obj 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 sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
+       grep $am__obj 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
@@ -4075,7 +4123,7 @@ else
 fi
 
 fi
-{ $as_echo "$as_me:${as_lineno-4078}: result: $am_cv_CC_dependencies_compiler_type" >&5
+{ $as_echo "$as_me:${as_lineno-4126}: 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
 
@@ -4090,7 +4138,7 @@ else
 fi
 
 
-{ $as_echo "$as_me:${as_lineno-4093}: checking for a sed that does not truncate output" >&5
+{ $as_echo "$as_me:${as_lineno-4141}: checking for a sed that does not truncate output" >&5
 $as_echo_n "checking for a sed that does not truncate output... " >&6; }
 if test "${ac_cv_path_SED+set}" = set; then :
   $as_echo_n "(cached) " >&6
@@ -4147,14 +4195,14 @@ esac
   done
 IFS=$as_save_IFS
   if test -z "$ac_cv_path_SED"; then
-    as_fn_error "no acceptable sed could be found in \$PATH" "4150" 5
+    as_fn_error "no acceptable sed could be found in \$PATH" "4198" 5
   fi
 else
   ac_cv_path_SED=$SED
 fi
 
 fi
-{ $as_echo "$as_me:${as_lineno-4157}: result: $ac_cv_path_SED" >&5
+{ $as_echo "$as_me:${as_lineno-4205}: result: $ac_cv_path_SED" >&5
 $as_echo "$ac_cv_path_SED" >&6; }
  SED="$ac_cv_path_SED"
   rm -f conftest.sed
@@ -4172,7 +4220,7 @@ Xsed="$SED -e 1s/^X//"
 
 
 
-{ $as_echo "$as_me:${as_lineno-4175}: checking for grep that handles long lines and -e" >&5
+{ $as_echo "$as_me:${as_lineno-4223}: checking for grep that handles long lines and -e" >&5
 $as_echo_n "checking for grep that handles long lines and -e... " >&6; }
 if test "${ac_cv_path_GREP+set}" = set; then :
   $as_echo_n "(cached) " >&6
@@ -4223,19 +4271,19 @@ esac
   done
 IFS=$as_save_IFS
   if test -z "$ac_cv_path_GREP"; then
-    as_fn_error "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "4226" 5
+    as_fn_error "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "4274" 5
   fi
 else
   ac_cv_path_GREP=$GREP
 fi
 
 fi
-{ $as_echo "$as_me:${as_lineno-4233}: result: $ac_cv_path_GREP" >&5
+{ $as_echo "$as_me:${as_lineno-4281}: result: $ac_cv_path_GREP" >&5
 $as_echo "$ac_cv_path_GREP" >&6; }
  GREP="$ac_cv_path_GREP"
 
 
-{ $as_echo "$as_me:${as_lineno-4238}: checking for egrep" >&5
+{ $as_echo "$as_me:${as_lineno-4286}: checking for egrep" >&5
 $as_echo_n "checking for egrep... " >&6; }
 if test "${ac_cv_path_EGREP+set}" = set; then :
   $as_echo_n "(cached) " >&6
@@ -4289,7 +4337,7 @@ esac
   done
 IFS=$as_save_IFS
   if test -z "$ac_cv_path_EGREP"; then
-    as_fn_error "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "4292" 5
+    as_fn_error "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "4340" 5
   fi
 else
   ac_cv_path_EGREP=$EGREP
@@ -4297,12 +4345,12 @@ fi
 
    fi
 fi
-{ $as_echo "$as_me:${as_lineno-4300}: result: $ac_cv_path_EGREP" >&5
+{ $as_echo "$as_me:${as_lineno-4348}: result: $ac_cv_path_EGREP" >&5
 $as_echo "$ac_cv_path_EGREP" >&6; }
  EGREP="$ac_cv_path_EGREP"
 
 
-{ $as_echo "$as_me:${as_lineno-4305}: checking for fgrep" >&5
+{ $as_echo "$as_me:${as_lineno-4353}: checking for fgrep" >&5
 $as_echo_n "checking for fgrep... " >&6; }
 if test "${ac_cv_path_FGREP+set}" = set; then :
   $as_echo_n "(cached) " >&6
@@ -4356,7 +4404,7 @@ esac
   done
 IFS=$as_save_IFS
   if test -z "$ac_cv_path_FGREP"; then
-    as_fn_error "no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "4359" 5
+    as_fn_error "no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "4407" 5
   fi
 else
   ac_cv_path_FGREP=$FGREP
@@ -4364,7 +4412,7 @@ fi
 
    fi
 fi
-{ $as_echo "$as_me:${as_lineno-4367}: result: $ac_cv_path_FGREP" >&5
+{ $as_echo "$as_me:${as_lineno-4415}: result: $ac_cv_path_FGREP" >&5
 $as_echo "$ac_cv_path_FGREP" >&6; }
  FGREP="$ac_cv_path_FGREP"
 
@@ -4399,7 +4447,7 @@ fi
 ac_prog=ld
 if test "$GCC" = yes; then
   # Check if gcc -print-prog-name=ld gives a path.
-  { $as_echo "$as_me:${as_lineno-4402}: checking for ld used by $CC" >&5
+  { $as_echo "$as_me:${as_lineno-4450}: checking for ld used by $CC" >&5
 $as_echo_n "checking for ld used by $CC... " >&6; }
   case $host in
   *-*-mingw*)
@@ -4429,10 +4477,10 @@ $as_echo_n "checking for ld used by $CC... " >&6; }
     ;;
   esac
 elif test "$with_gnu_ld" = yes; then
-  { $as_echo "$as_me:${as_lineno-4432}: checking for GNU ld" >&5
+  { $as_echo "$as_me:${as_lineno-4480}: checking for GNU ld" >&5
 $as_echo_n "checking for GNU ld... " >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-4435}: checking for non-GNU ld" >&5
+  { $as_echo "$as_me:${as_lineno-4483}: checking for non-GNU ld" >&5
 $as_echo_n "checking for non-GNU ld... " >&6; }
 fi
 if test "${lt_cv_path_LD+set}" = set; then :
@@ -4466,14 +4514,14 @@ fi
 
 LD="$lt_cv_path_LD"
 if test -n "$LD"; then
-  { $as_echo "$as_me:${as_lineno-4469}: result: $LD" >&5
+  { $as_echo "$as_me:${as_lineno-4517}: result: $LD" >&5
 $as_echo "$LD" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-4472}: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-4520}: result: no" >&5
 $as_echo "no" >&6; }
 fi
-test -z "$LD" && as_fn_error "no acceptable ld found in \$PATH" "4475" 5
-{ $as_echo "$as_me:${as_lineno-4476}: checking if the linker ($LD) is GNU ld" >&5
+test -z "$LD" && as_fn_error "no acceptable ld found in \$PATH" "4523" 5
+{ $as_echo "$as_me:${as_lineno-4524}: checking if the linker ($LD) is GNU ld" >&5
 $as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
 if test "${lt_cv_prog_gnu_ld+set}" = set; then :
   $as_echo_n "(cached) " >&6
@@ -4488,7 +4536,7 @@ case `$LD -v 2>&1 </dev/null` in
   ;;
 esac
 fi
-{ $as_echo "$as_me:${as_lineno-4491}: result: $lt_cv_prog_gnu_ld" >&5
+{ $as_echo "$as_me:${as_lineno-4539}: result: $lt_cv_prog_gnu_ld" >&5
 $as_echo "$lt_cv_prog_gnu_ld" >&6; }
 with_gnu_ld=$lt_cv_prog_gnu_ld
 
@@ -4500,7 +4548,7 @@ with_gnu_ld=$lt_cv_prog_gnu_ld
 
 
 
-{ $as_echo "$as_me:${as_lineno-4503}: checking for BSD- or MS-compatible name lister (nm)" >&5
+{ $as_echo "$as_me:${as_lineno-4551}: checking for BSD- or MS-compatible name lister (nm)" >&5
 $as_echo_n "checking for BSD- or MS-compatible name lister (nm)... " >&6; }
 if test "${lt_cv_path_NM+set}" = set; then :
   $as_echo_n "(cached) " >&6
@@ -4549,7 +4597,7 @@ else
   : ${lt_cv_path_NM=no}
 fi
 fi
-{ $as_echo "$as_me:${as_lineno-4552}: result: $lt_cv_path_NM" >&5
+{ $as_echo "$as_me:${as_lineno-4600}: result: $lt_cv_path_NM" >&5
 $as_echo "$lt_cv_path_NM" >&6; }
 if test "$lt_cv_path_NM" != "no"; then
   NM="$lt_cv_path_NM"
@@ -4560,7 +4608,7 @@ else
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-4563}: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-4611}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_DUMPBIN+set}" = set; then :
   $as_echo_n "(cached) " >&6
@@ -4576,7 +4624,7 @@ 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_DUMPBIN="$ac_tool_prefix$ac_prog"
-    $as_echo "$as_me:${as_lineno-4579}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-4627}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -4587,10 +4635,10 @@ fi
 fi
 DUMPBIN=$ac_cv_prog_DUMPBIN
 if test -n "$DUMPBIN"; then
-  { $as_echo "$as_me:${as_lineno-4590}: result: $DUMPBIN" >&5
+  { $as_echo "$as_me:${as_lineno-4638}: result: $DUMPBIN" >&5
 $as_echo "$DUMPBIN" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-4593}: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-4641}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -4604,7 +4652,7 @@ if test -z "$DUMPBIN"; then
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-4607}: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-4655}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_ac_ct_DUMPBIN+set}" = set; then :
   $as_echo_n "(cached) " >&6
@@ -4620,7 +4668,7 @@ 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_DUMPBIN="$ac_prog"
-    $as_echo "$as_me:${as_lineno-4623}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-4671}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -4631,10 +4679,10 @@ fi
 fi
 ac_ct_DUMPBIN=$ac_cv_prog_ac_ct_DUMPBIN
 if test -n "$ac_ct_DUMPBIN"; then
-  { $as_echo "$as_me:${as_lineno-4634}: result: $ac_ct_DUMPBIN" >&5
+  { $as_echo "$as_me:${as_lineno-4682}: result: $ac_ct_DUMPBIN" >&5
 $as_echo "$ac_ct_DUMPBIN" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-4637}: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-4685}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -4647,7 +4695,7 @@ done
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ $as_echo "$as_me:${as_lineno-4650}: WARNING: using cross tools not prefixed with host triplet" >&5
+{ $as_echo "$as_me:${as_lineno-4698}: 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
@@ -4667,42 +4715,42 @@ test -z "$NM" && NM=nm
 
 
 
-{ $as_echo "$as_me:${as_lineno-4670}: checking the name lister ($NM) interface" >&5
+{ $as_echo "$as_me:${as_lineno-4718}: checking the name lister ($NM) interface" >&5
 $as_echo_n "checking the name lister ($NM) interface... " >&6; }
 if test "${lt_cv_nm_interface+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   lt_cv_nm_interface="BSD nm"
   echo "int some_variable = 0;" > conftest.$ac_ext
-  (eval echo "\"\$as_me:4677: $ac_compile\"" >&5)
+  (eval echo "\"\$as_me:4725: $ac_compile\"" >&5)
   (eval "$ac_compile" 2>conftest.err)
   cat conftest.err >&5
-  (eval echo "\"\$as_me:4680: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+  (eval echo "\"\$as_me:4728: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
   (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
   cat conftest.err >&5
-  (eval echo "\"\$as_me:4683: output\"" >&5)
+  (eval echo "\"\$as_me:4731: output\"" >&5)
   cat conftest.out >&5
   if $GREP 'External.*some_variable' conftest.out > /dev/null; then
     lt_cv_nm_interface="MS dumpbin"
   fi
   rm -f conftest*
 fi
-{ $as_echo "$as_me:${as_lineno-4690}: result: $lt_cv_nm_interface" >&5
+{ $as_echo "$as_me:${as_lineno-4738}: result: $lt_cv_nm_interface" >&5
 $as_echo "$lt_cv_nm_interface" >&6; }
 
-{ $as_echo "$as_me:${as_lineno-4693}: checking whether ln -s works" >&5
+{ $as_echo "$as_me:${as_lineno-4741}: checking whether ln -s works" >&5
 $as_echo_n "checking whether ln -s works... " >&6; }
 LN_S=$as_ln_s
 if test "$LN_S" = "ln -s"; then
-  { $as_echo "$as_me:${as_lineno-4697}: result: yes" >&5
+  { $as_echo "$as_me:${as_lineno-4745}: result: yes" >&5
 $as_echo "yes" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-4700}: result: no, using $LN_S" >&5
+  { $as_echo "$as_me:${as_lineno-4748}: result: no, using $LN_S" >&5
 $as_echo "no, using $LN_S" >&6; }
 fi
 
 # find the maximum length of command line arguments
-{ $as_echo "$as_me:${as_lineno-4705}: checking the maximum length of command line arguments" >&5
+{ $as_echo "$as_me:${as_lineno-4753}: checking the maximum length of command line arguments" >&5
 $as_echo_n "checking the maximum length of command line arguments... " >&6; }
 if test "${lt_cv_sys_max_cmd_len+set}" = set; then :
   $as_echo_n "(cached) " >&6
@@ -4822,10 +4870,10 @@ else
 fi
 
 if test -n $lt_cv_sys_max_cmd_len ; then
-  { $as_echo "$as_me:${as_lineno-4825}: result: $lt_cv_sys_max_cmd_len" >&5
+  { $as_echo "$as_me:${as_lineno-4873}: result: $lt_cv_sys_max_cmd_len" >&5
 $as_echo "$lt_cv_sys_max_cmd_len" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-4828}: result: none" >&5
+  { $as_echo "$as_me:${as_lineno-4876}: result: none" >&5
 $as_echo "none" >&6; }
 fi
 max_cmd_len=$lt_cv_sys_max_cmd_len
@@ -4839,7 +4887,7 @@ max_cmd_len=$lt_cv_sys_max_cmd_len
 : ${MV="mv -f"}
 : ${RM="rm -f"}
 
-{ $as_echo "$as_me:${as_lineno-4842}: checking whether the shell understands some XSI constructs" >&5
+{ $as_echo "$as_me:${as_lineno-4890}: checking whether the shell understands some XSI constructs" >&5
 $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; }
 # Try some XSI features
 xsi_shell=no
@@ -4849,17 +4897,17 @@ xsi_shell=no
     && eval 'test $(( 1 + 1 )) -eq 2 \
     && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
   && xsi_shell=yes
-{ $as_echo "$as_me:${as_lineno-4852}: result: $xsi_shell" >&5
+{ $as_echo "$as_me:${as_lineno-4900}: result: $xsi_shell" >&5
 $as_echo "$xsi_shell" >&6; }
 
 
-{ $as_echo "$as_me:${as_lineno-4856}: checking whether the shell understands \"+=\"" >&5
+{ $as_echo "$as_me:${as_lineno-4904}: checking whether the shell understands \"+=\"" >&5
 $as_echo_n "checking whether the shell understands \"+=\"... " >&6; }
 lt_shell_append=no
 ( foo=bar; set foo baz; eval "$1+=\$2" && test "$foo" = barbaz ) \
     >/dev/null 2>&1 \
   && lt_shell_append=yes
-{ $as_echo "$as_me:${as_lineno-4862}: result: $lt_shell_append" >&5
+{ $as_echo "$as_me:${as_lineno-4910}: result: $lt_shell_append" >&5
 $as_echo "$lt_shell_append" >&6; }
 
 
@@ -4894,14 +4942,14 @@ esac
 
 
 
-{ $as_echo "$as_me:${as_lineno-4897}: checking for $LD option to reload object files" >&5
+{ $as_echo "$as_me:${as_lineno-4945}: checking for $LD option to reload object files" >&5
 $as_echo_n "checking for $LD option to reload object files... " >&6; }
 if test "${lt_cv_ld_reload_flag+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   lt_cv_ld_reload_flag='-r'
 fi
-{ $as_echo "$as_me:${as_lineno-4904}: result: $lt_cv_ld_reload_flag" >&5
+{ $as_echo "$as_me:${as_lineno-4952}: result: $lt_cv_ld_reload_flag" >&5
 $as_echo "$lt_cv_ld_reload_flag" >&6; }
 reload_flag=$lt_cv_ld_reload_flag
 case $reload_flag in
@@ -4930,7 +4978,7 @@ esac
 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
-{ $as_echo "$as_me:${as_lineno-4933}: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-4981}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_OBJDUMP+set}" = set; then :
   $as_echo_n "(cached) " >&6
@@ -4946,7 +4994,7 @@ 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_OBJDUMP="${ac_tool_prefix}objdump"
-    $as_echo "$as_me:${as_lineno-4949}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-4997}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -4957,10 +5005,10 @@ fi
 fi
 OBJDUMP=$ac_cv_prog_OBJDUMP
 if test -n "$OBJDUMP"; then
-  { $as_echo "$as_me:${as_lineno-4960}: result: $OBJDUMP" >&5
+  { $as_echo "$as_me:${as_lineno-5008}: result: $OBJDUMP" >&5
 $as_echo "$OBJDUMP" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-4963}: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-5011}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -4970,7 +5018,7 @@ if test -z "$ac_cv_prog_OBJDUMP"; then
   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
-{ $as_echo "$as_me:${as_lineno-4973}: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-5021}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_ac_ct_OBJDUMP+set}" = set; then :
   $as_echo_n "(cached) " >&6
@@ -4986,7 +5034,7 @@ 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_OBJDUMP="objdump"
-    $as_echo "$as_me:${as_lineno-4989}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-5037}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -4997,10 +5045,10 @@ fi
 fi
 ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP
 if test -n "$ac_ct_OBJDUMP"; then
-  { $as_echo "$as_me:${as_lineno-5000}: result: $ac_ct_OBJDUMP" >&5
+  { $as_echo "$as_me:${as_lineno-5048}: result: $ac_ct_OBJDUMP" >&5
 $as_echo "$ac_ct_OBJDUMP" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-5003}: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-5051}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -5009,7 +5057,7 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ $as_echo "$as_me:${as_lineno-5012}: WARNING: using cross tools not prefixed with host triplet" >&5
+{ $as_echo "$as_me:${as_lineno-5060}: 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
@@ -5029,7 +5077,7 @@ test -z "$OBJDUMP" && OBJDUMP=objdump
 
 
 
-{ $as_echo "$as_me:${as_lineno-5032}: checking how to recognize dependent libraries" >&5
+{ $as_echo "$as_me:${as_lineno-5080}: checking how to recognize dependent libraries" >&5
 $as_echo_n "checking how to recognize dependent libraries... " >&6; }
 if test "${lt_cv_deplibs_check_method+set}" = set; then :
   $as_echo_n "(cached) " >&6
@@ -5225,7 +5273,7 @@ tpf*)
 esac
 
 fi
-{ $as_echo "$as_me:${as_lineno-5228}: result: $lt_cv_deplibs_check_method" >&5
+{ $as_echo "$as_me:${as_lineno-5276}: result: $lt_cv_deplibs_check_method" >&5
 $as_echo "$lt_cv_deplibs_check_method" >&6; }
 file_magic_cmd=$lt_cv_file_magic_cmd
 deplibs_check_method=$lt_cv_deplibs_check_method
@@ -5245,7 +5293,7 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown
 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
-{ $as_echo "$as_me:${as_lineno-5248}: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-5296}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_AR+set}" = set; then :
   $as_echo_n "(cached) " >&6
@@ -5261,7 +5309,7 @@ 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_AR="${ac_tool_prefix}ar"
-    $as_echo "$as_me:${as_lineno-5264}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-5312}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -5272,10 +5320,10 @@ fi
 fi
 AR=$ac_cv_prog_AR
 if test -n "$AR"; then
-  { $as_echo "$as_me:${as_lineno-5275}: result: $AR" >&5
+  { $as_echo "$as_me:${as_lineno-5323}: result: $AR" >&5
 $as_echo "$AR" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-5278}: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-5326}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -5285,7 +5333,7 @@ if test -z "$ac_cv_prog_AR"; then
   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
-{ $as_echo "$as_me:${as_lineno-5288}: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-5336}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_ac_ct_AR+set}" = set; then :
   $as_echo_n "(cached) " >&6
@@ -5301,7 +5349,7 @@ 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_AR="ar"
-    $as_echo "$as_me:${as_lineno-5304}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-5352}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -5312,10 +5360,10 @@ fi
 fi
 ac_ct_AR=$ac_cv_prog_ac_ct_AR
 if test -n "$ac_ct_AR"; then
-  { $as_echo "$as_me:${as_lineno-5315}: result: $ac_ct_AR" >&5
+  { $as_echo "$as_me:${as_lineno-5363}: result: $ac_ct_AR" >&5
 $as_echo "$ac_ct_AR" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-5318}: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-5366}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -5324,7 +5372,7 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ $as_echo "$as_me:${as_lineno-5327}: WARNING: using cross tools not prefixed with host triplet" >&5
+{ $as_echo "$as_me:${as_lineno-5375}: 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
@@ -5350,7 +5398,7 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru
 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-5353}: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-5401}: 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
@@ -5366,7 +5414,7 @@ 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_STRIP="${ac_tool_prefix}strip"
-    $as_echo "$as_me:${as_lineno-5369}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-5417}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -5377,10 +5425,10 @@ fi
 fi
 STRIP=$ac_cv_prog_STRIP
 if test -n "$STRIP"; then
-  { $as_echo "$as_me:${as_lineno-5380}: result: $STRIP" >&5
+  { $as_echo "$as_me:${as_lineno-5428}: result: $STRIP" >&5
 $as_echo "$STRIP" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-5383}: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-5431}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -5390,7 +5438,7 @@ 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-5393}: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-5441}: 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
@@ -5406,7 +5454,7 @@ 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:${as_lineno-5409}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-5457}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -5417,10 +5465,10 @@ fi
 fi
 ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
 if test -n "$ac_ct_STRIP"; then
-  { $as_echo "$as_me:${as_lineno-5420}: result: $ac_ct_STRIP" >&5
+  { $as_echo "$as_me:${as_lineno-5468}: result: $ac_ct_STRIP" >&5
 $as_echo "$ac_ct_STRIP" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-5423}: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-5471}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -5429,7 +5477,7 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ $as_echo "$as_me:${as_lineno-5432}: WARNING: using cross tools not prefixed with host triplet" >&5
+{ $as_echo "$as_me:${as_lineno-5480}: 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
@@ -5449,7 +5497,7 @@ test -z "$STRIP" && STRIP=:
 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
-{ $as_echo "$as_me:${as_lineno-5452}: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-5500}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_RANLIB+set}" = set; then :
   $as_echo_n "(cached) " >&6
@@ -5465,7 +5513,7 @@ 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_RANLIB="${ac_tool_prefix}ranlib"
-    $as_echo "$as_me:${as_lineno-5468}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-5516}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -5476,10 +5524,10 @@ fi
 fi
 RANLIB=$ac_cv_prog_RANLIB
 if test -n "$RANLIB"; then
-  { $as_echo "$as_me:${as_lineno-5479}: result: $RANLIB" >&5
+  { $as_echo "$as_me:${as_lineno-5527}: result: $RANLIB" >&5
 $as_echo "$RANLIB" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-5482}: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-5530}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -5489,7 +5537,7 @@ if test -z "$ac_cv_prog_RANLIB"; then
   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
-{ $as_echo "$as_me:${as_lineno-5492}: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-5540}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then :
   $as_echo_n "(cached) " >&6
@@ -5505,7 +5553,7 @@ 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_RANLIB="ranlib"
-    $as_echo "$as_me:${as_lineno-5508}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-5556}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -5516,10 +5564,10 @@ fi
 fi
 ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
 if test -n "$ac_ct_RANLIB"; then
-  { $as_echo "$as_me:${as_lineno-5519}: result: $ac_ct_RANLIB" >&5
+  { $as_echo "$as_me:${as_lineno-5567}: result: $ac_ct_RANLIB" >&5
 $as_echo "$ac_ct_RANLIB" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-5522}: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-5570}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -5528,7 +5576,7 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ $as_echo "$as_me:${as_lineno-5531}: WARNING: using cross tools not prefixed with host triplet" >&5
+{ $as_echo "$as_me:${as_lineno-5579}: 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
@@ -5606,7 +5654,7 @@ compiler=$CC
 
 
 # Check for command to grab the raw symbol name followed by C symbol from nm.
-{ $as_echo "$as_me:${as_lineno-5609}: checking command to parse $NM output from $compiler object" >&5
+{ $as_echo "$as_me:${as_lineno-5657}: checking command to parse $NM output from $compiler object" >&5
 $as_echo_n "checking command to parse $NM output from $compiler object... " >&6; }
 if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then :
   $as_echo_n "(cached) " >&6
@@ -5724,17 +5772,17 @@ void nm_test_func(void){}
 int main(){nm_test_var='a';nm_test_func();return(0);}
 _LT_EOF
 
-  if { { eval echo "\"\$as_me\":${as_lineno-5727}: \"$ac_compile\""; } >&5
+  if { { eval echo "\"\$as_me\":${as_lineno-5775}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-5730}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-5778}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
     # Now try to grab the symbols.
     nlist=conftest.nm
-    if { { eval echo "\"\$as_me\":${as_lineno-5734}: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\""; } >&5
+    if { { eval echo "\"\$as_me\":${as_lineno-5782}: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\""; } >&5
   (eval $NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-5737}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-5785}: \$? = $ac_status" >&5
   test $ac_status = 0; } && test -s "$nlist"; then
       # Try sorting and uniquifying the output.
       if sort "$nlist" | uniq > "$nlist"T; then
@@ -5788,10 +5836,10 @@ _LT_EOF
 	  lt_save_CFLAGS="$CFLAGS"
 	  LIBS="conftstm.$ac_objext"
 	  CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
-	  if { { eval echo "\"\$as_me\":${as_lineno-5791}: \"$ac_link\""; } >&5
+	  if { { eval echo "\"\$as_me\":${as_lineno-5839}: \"$ac_link\""; } >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-5794}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-5842}: \$? = $ac_status" >&5
   test $ac_status = 0; } && test -s conftest${ac_exeext}; then
 	    pipe_works=yes
 	  fi
@@ -5826,10 +5874,10 @@ if test -z "$lt_cv_sys_global_symbol_pipe"; then
   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
-  { $as_echo "$as_me:${as_lineno-5829}: result: failed" >&5
+  { $as_echo "$as_me:${as_lineno-5877}: result: failed" >&5
 $as_echo "failed" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-5832}: result: ok" >&5
+  { $as_echo "$as_me:${as_lineno-5880}: result: ok" >&5
 $as_echo "ok" >&6; }
 fi
 
@@ -5868,10 +5916,10 @@ case $host in
 ia64-*-hpux*)
   # Find out which ABI we are using.
   echo 'int i;' > conftest.$ac_ext
-  if { { eval echo "\"\$as_me\":${as_lineno-5871}: \"$ac_compile\""; } >&5
+  if { { eval echo "\"\$as_me\":${as_lineno-5919}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-5874}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-5922}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
     case `/usr/bin/file conftest.$ac_objext` in
       *ELF-32*)
@@ -5886,11 +5934,11 @@ ia64-*-hpux*)
   ;;
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 5889 "configure"' > conftest.$ac_ext
-  if { { eval echo "\"\$as_me\":${as_lineno-5890}: \"$ac_compile\""; } >&5
+  echo '#line 5937 "configure"' > conftest.$ac_ext
+  if { { eval echo "\"\$as_me\":${as_lineno-5938}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-5893}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-5941}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
     if test "$lt_cv_prog_gnu_ld" = yes; then
       case `/usr/bin/file conftest.$ac_objext` in
@@ -5925,10 +5973,10 @@ x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
 s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
   # Find out which ABI we are using.
   echo 'int i;' > conftest.$ac_ext
-  if { { eval echo "\"\$as_me\":${as_lineno-5928}: \"$ac_compile\""; } >&5
+  if { { eval echo "\"\$as_me\":${as_lineno-5976}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-5931}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-5979}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
     case `/usr/bin/file conftest.o` in
       *32-bit*)
@@ -5978,7 +6026,7 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
   # On SCO OpenServer 5, we need -belf to get full-featured binaries.
   SAVE_CFLAGS="$CFLAGS"
   CFLAGS="$CFLAGS -belf"
-  { $as_echo "$as_me:${as_lineno-5981}: checking whether the C compiler needs -belf" >&5
+  { $as_echo "$as_me:${as_lineno-6029}: checking whether the C compiler needs -belf" >&5
 $as_echo_n "checking whether the C compiler needs -belf... " >&6; }
 if test "${lt_cv_cc_needs_belf+set}" = set; then :
   $as_echo_n "(cached) " >&6
@@ -6000,7 +6048,7 @@ main ()
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "6003"; then :
+if ac_fn_c_try_link "6051"; then :
   lt_cv_cc_needs_belf=yes
 else
   lt_cv_cc_needs_belf=no
@@ -6014,7 +6062,7 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 fi
-{ $as_echo "$as_me:${as_lineno-6017}: result: $lt_cv_cc_needs_belf" >&5
+{ $as_echo "$as_me:${as_lineno-6065}: result: $lt_cv_cc_needs_belf" >&5
 $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
@@ -6024,10 +6072,10 @@ $as_echo "$lt_cv_cc_needs_belf" >&6; }
 sparc*-*solaris*)
   # Find out which ABI we are using.
   echo 'int i;' > conftest.$ac_ext
-  if { { eval echo "\"\$as_me\":${as_lineno-6027}: \"$ac_compile\""; } >&5
+  if { { eval echo "\"\$as_me\":${as_lineno-6075}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-6030}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-6078}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
     case `/usr/bin/file conftest.o` in
     *64-bit*)
@@ -6054,7 +6102,7 @@ need_locks="$enable_libtool_lock"
     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
-{ $as_echo "$as_me:${as_lineno-6057}: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-6105}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_DSYMUTIL+set}" = set; then :
   $as_echo_n "(cached) " >&6
@@ -6070,7 +6118,7 @@ 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_DSYMUTIL="${ac_tool_prefix}dsymutil"
-    $as_echo "$as_me:${as_lineno-6073}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-6121}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -6081,10 +6129,10 @@ fi
 fi
 DSYMUTIL=$ac_cv_prog_DSYMUTIL
 if test -n "$DSYMUTIL"; then
-  { $as_echo "$as_me:${as_lineno-6084}: result: $DSYMUTIL" >&5
+  { $as_echo "$as_me:${as_lineno-6132}: result: $DSYMUTIL" >&5
 $as_echo "$DSYMUTIL" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-6087}: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-6135}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -6094,7 +6142,7 @@ if test -z "$ac_cv_prog_DSYMUTIL"; then
   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
-{ $as_echo "$as_me:${as_lineno-6097}: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-6145}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_ac_ct_DSYMUTIL+set}" = set; then :
   $as_echo_n "(cached) " >&6
@@ -6110,7 +6158,7 @@ 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_DSYMUTIL="dsymutil"
-    $as_echo "$as_me:${as_lineno-6113}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-6161}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -6121,10 +6169,10 @@ fi
 fi
 ac_ct_DSYMUTIL=$ac_cv_prog_ac_ct_DSYMUTIL
 if test -n "$ac_ct_DSYMUTIL"; then
-  { $as_echo "$as_me:${as_lineno-6124}: result: $ac_ct_DSYMUTIL" >&5
+  { $as_echo "$as_me:${as_lineno-6172}: result: $ac_ct_DSYMUTIL" >&5
 $as_echo "$ac_ct_DSYMUTIL" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-6127}: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-6175}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -6133,7 +6181,7 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ $as_echo "$as_me:${as_lineno-6136}: WARNING: using cross tools not prefixed with host triplet" >&5
+{ $as_echo "$as_me:${as_lineno-6184}: 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
@@ -6146,7 +6194,7 @@ fi
     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
-{ $as_echo "$as_me:${as_lineno-6149}: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-6197}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_NMEDIT+set}" = set; then :
   $as_echo_n "(cached) " >&6
@@ -6162,7 +6210,7 @@ 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_NMEDIT="${ac_tool_prefix}nmedit"
-    $as_echo "$as_me:${as_lineno-6165}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-6213}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -6173,10 +6221,10 @@ fi
 fi
 NMEDIT=$ac_cv_prog_NMEDIT
 if test -n "$NMEDIT"; then
-  { $as_echo "$as_me:${as_lineno-6176}: result: $NMEDIT" >&5
+  { $as_echo "$as_me:${as_lineno-6224}: result: $NMEDIT" >&5
 $as_echo "$NMEDIT" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-6179}: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-6227}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -6186,7 +6234,7 @@ if test -z "$ac_cv_prog_NMEDIT"; then
   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
-{ $as_echo "$as_me:${as_lineno-6189}: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-6237}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_ac_ct_NMEDIT+set}" = set; then :
   $as_echo_n "(cached) " >&6
@@ -6202,7 +6250,7 @@ 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_NMEDIT="nmedit"
-    $as_echo "$as_me:${as_lineno-6205}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-6253}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -6213,10 +6261,10 @@ fi
 fi
 ac_ct_NMEDIT=$ac_cv_prog_ac_ct_NMEDIT
 if test -n "$ac_ct_NMEDIT"; then
-  { $as_echo "$as_me:${as_lineno-6216}: result: $ac_ct_NMEDIT" >&5
+  { $as_echo "$as_me:${as_lineno-6264}: result: $ac_ct_NMEDIT" >&5
 $as_echo "$ac_ct_NMEDIT" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-6219}: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-6267}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -6225,7 +6273,7 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ $as_echo "$as_me:${as_lineno-6228}: WARNING: using cross tools not prefixed with host triplet" >&5
+{ $as_echo "$as_me:${as_lineno-6276}: 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
@@ -6238,7 +6286,7 @@ fi
     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
-{ $as_echo "$as_me:${as_lineno-6241}: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-6289}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_LIPO+set}" = set; then :
   $as_echo_n "(cached) " >&6
@@ -6254,7 +6302,7 @@ 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_LIPO="${ac_tool_prefix}lipo"
-    $as_echo "$as_me:${as_lineno-6257}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-6305}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -6265,10 +6313,10 @@ fi
 fi
 LIPO=$ac_cv_prog_LIPO
 if test -n "$LIPO"; then
-  { $as_echo "$as_me:${as_lineno-6268}: result: $LIPO" >&5
+  { $as_echo "$as_me:${as_lineno-6316}: result: $LIPO" >&5
 $as_echo "$LIPO" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-6271}: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-6319}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -6278,7 +6326,7 @@ if test -z "$ac_cv_prog_LIPO"; then
   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
-{ $as_echo "$as_me:${as_lineno-6281}: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-6329}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_ac_ct_LIPO+set}" = set; then :
   $as_echo_n "(cached) " >&6
@@ -6294,7 +6342,7 @@ 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_LIPO="lipo"
-    $as_echo "$as_me:${as_lineno-6297}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-6345}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -6305,10 +6353,10 @@ fi
 fi
 ac_ct_LIPO=$ac_cv_prog_ac_ct_LIPO
 if test -n "$ac_ct_LIPO"; then
-  { $as_echo "$as_me:${as_lineno-6308}: result: $ac_ct_LIPO" >&5
+  { $as_echo "$as_me:${as_lineno-6356}: result: $ac_ct_LIPO" >&5
 $as_echo "$ac_ct_LIPO" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-6311}: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-6359}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -6317,7 +6365,7 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ $as_echo "$as_me:${as_lineno-6320}: WARNING: using cross tools not prefixed with host triplet" >&5
+{ $as_echo "$as_me:${as_lineno-6368}: 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
@@ -6330,7 +6378,7 @@ fi
     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
-{ $as_echo "$as_me:${as_lineno-6333}: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-6381}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_OTOOL+set}" = set; then :
   $as_echo_n "(cached) " >&6
@@ -6346,7 +6394,7 @@ 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_OTOOL="${ac_tool_prefix}otool"
-    $as_echo "$as_me:${as_lineno-6349}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-6397}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -6357,10 +6405,10 @@ fi
 fi
 OTOOL=$ac_cv_prog_OTOOL
 if test -n "$OTOOL"; then
-  { $as_echo "$as_me:${as_lineno-6360}: result: $OTOOL" >&5
+  { $as_echo "$as_me:${as_lineno-6408}: result: $OTOOL" >&5
 $as_echo "$OTOOL" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-6363}: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-6411}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -6370,7 +6418,7 @@ if test -z "$ac_cv_prog_OTOOL"; then
   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
-{ $as_echo "$as_me:${as_lineno-6373}: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-6421}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_ac_ct_OTOOL+set}" = set; then :
   $as_echo_n "(cached) " >&6
@@ -6386,7 +6434,7 @@ 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_OTOOL="otool"
-    $as_echo "$as_me:${as_lineno-6389}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-6437}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -6397,10 +6445,10 @@ fi
 fi
 ac_ct_OTOOL=$ac_cv_prog_ac_ct_OTOOL
 if test -n "$ac_ct_OTOOL"; then
-  { $as_echo "$as_me:${as_lineno-6400}: result: $ac_ct_OTOOL" >&5
+  { $as_echo "$as_me:${as_lineno-6448}: result: $ac_ct_OTOOL" >&5
 $as_echo "$ac_ct_OTOOL" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-6403}: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-6451}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -6409,7 +6457,7 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ $as_echo "$as_me:${as_lineno-6412}: WARNING: using cross tools not prefixed with host triplet" >&5
+{ $as_echo "$as_me:${as_lineno-6460}: 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
@@ -6422,7 +6470,7 @@ fi
     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
-{ $as_echo "$as_me:${as_lineno-6425}: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-6473}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_OTOOL64+set}" = set; then :
   $as_echo_n "(cached) " >&6
@@ -6438,7 +6486,7 @@ 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_OTOOL64="${ac_tool_prefix}otool64"
-    $as_echo "$as_me:${as_lineno-6441}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-6489}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -6449,10 +6497,10 @@ fi
 fi
 OTOOL64=$ac_cv_prog_OTOOL64
 if test -n "$OTOOL64"; then
-  { $as_echo "$as_me:${as_lineno-6452}: result: $OTOOL64" >&5
+  { $as_echo "$as_me:${as_lineno-6500}: result: $OTOOL64" >&5
 $as_echo "$OTOOL64" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-6455}: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-6503}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -6462,7 +6510,7 @@ if test -z "$ac_cv_prog_OTOOL64"; then
   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
-{ $as_echo "$as_me:${as_lineno-6465}: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-6513}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_ac_ct_OTOOL64+set}" = set; then :
   $as_echo_n "(cached) " >&6
@@ -6478,7 +6526,7 @@ 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_OTOOL64="otool64"
-    $as_echo "$as_me:${as_lineno-6481}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-6529}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -6489,10 +6537,10 @@ fi
 fi
 ac_ct_OTOOL64=$ac_cv_prog_ac_ct_OTOOL64
 if test -n "$ac_ct_OTOOL64"; then
-  { $as_echo "$as_me:${as_lineno-6492}: result: $ac_ct_OTOOL64" >&5
+  { $as_echo "$as_me:${as_lineno-6540}: result: $ac_ct_OTOOL64" >&5
 $as_echo "$ac_ct_OTOOL64" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-6495}: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-6543}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -6501,7 +6549,7 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ $as_echo "$as_me:${as_lineno-6504}: WARNING: using cross tools not prefixed with host triplet" >&5
+{ $as_echo "$as_me:${as_lineno-6552}: 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
@@ -6537,7 +6585,7 @@ fi
 
 
 
-    { $as_echo "$as_me:${as_lineno-6540}: checking for -single_module linker flag" >&5
+    { $as_echo "$as_me:${as_lineno-6588}: checking for -single_module linker flag" >&5
 $as_echo_n "checking for -single_module linker flag... " >&6; }
 if test "${lt_cv_apple_cc_single_mod+set}" = set; then :
   $as_echo_n "(cached) " >&6
@@ -6564,9 +6612,9 @@ else
 	rm -f conftest.*
       fi
 fi
-{ $as_echo "$as_me:${as_lineno-6567}: result: $lt_cv_apple_cc_single_mod" >&5
+{ $as_echo "$as_me:${as_lineno-6615}: result: $lt_cv_apple_cc_single_mod" >&5
 $as_echo "$lt_cv_apple_cc_single_mod" >&6; }
-    { $as_echo "$as_me:${as_lineno-6569}: checking for -exported_symbols_list linker flag" >&5
+    { $as_echo "$as_me:${as_lineno-6617}: checking for -exported_symbols_list linker flag" >&5
 $as_echo_n "checking for -exported_symbols_list linker flag... " >&6; }
 if test "${lt_cv_ld_exported_symbols_list+set}" = set; then :
   $as_echo_n "(cached) " >&6
@@ -6586,7 +6634,7 @@ main ()
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "6589"; then :
+if ac_fn_c_try_link "6637"; then :
   lt_cv_ld_exported_symbols_list=yes
 else
   lt_cv_ld_exported_symbols_list=no
@@ -6596,7 +6644,7 @@ rm -f core conftest.err conftest.$ac_objext \
 	LDFLAGS="$save_LDFLAGS"
 
 fi
-{ $as_echo "$as_me:${as_lineno-6599}: result: $lt_cv_ld_exported_symbols_list" >&5
+{ $as_echo "$as_me:${as_lineno-6647}: result: $lt_cv_ld_exported_symbols_list" >&5
 $as_echo "$lt_cv_ld_exported_symbols_list" >&6; }
     case $host_os in
     rhapsody* | darwin1.[012])
@@ -6638,7 +6686,7 @@ ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
-{ $as_echo "$as_me:${as_lineno-6641}: checking how to run the C preprocessor" >&5
+{ $as_echo "$as_me:${as_lineno-6689}: checking how to run the C preprocessor" >&5
 $as_echo_n "checking how to run the C preprocessor... " >&6; }
 # On Suns, sometimes $CPP names a directory.
 if test -n "$CPP" && test -d "$CPP"; then
@@ -6669,7 +6717,7 @@ do
 #endif
 		     Syntax error
 _ACEOF
-if ac_fn_c_try_cpp "6672"; then :
+if ac_fn_c_try_cpp "6720"; then :
 
 else
   # Broken: fails on valid input.
@@ -6683,7 +6731,7 @@ rm -f conftest.err conftest.$ac_ext
 /* end confdefs.h.  */
 #include <ac_nonexistent.h>
 _ACEOF
-if ac_fn_c_try_cpp "6686"; then :
+if ac_fn_c_try_cpp "6734"; then :
   # Broken: success on invalid input.
 continue
 else
@@ -6708,7 +6756,7 @@ fi
 else
   ac_cv_prog_CPP=$CPP
 fi
-{ $as_echo "$as_me:${as_lineno-6711}: result: $CPP" >&5
+{ $as_echo "$as_me:${as_lineno-6759}: result: $CPP" >&5
 $as_echo "$CPP" >&6; }
 ac_preproc_ok=false
 for ac_c_preproc_warn_flag in '' yes
@@ -6728,7 +6776,7 @@ do
 #endif
 		     Syntax error
 _ACEOF
-if ac_fn_c_try_cpp "6731"; then :
+if ac_fn_c_try_cpp "6779"; then :
 
 else
   # Broken: fails on valid input.
@@ -6742,7 +6790,7 @@ rm -f conftest.err conftest.$ac_ext
 /* end confdefs.h.  */
 #include <ac_nonexistent.h>
 _ACEOF
-if ac_fn_c_try_cpp "6745"; then :
+if ac_fn_c_try_cpp "6793"; then :
   # Broken: success on invalid input.
 continue
 else
@@ -6758,10 +6806,10 @@ rm -f conftest.err conftest.$ac_ext
 if $ac_preproc_ok; then :
 
 else
-  { { $as_echo "$as_me:${as_lineno-6761}: error: in \`$ac_pwd':" >&5
+  { { $as_echo "$as_me:${as_lineno-6809}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error "C preprocessor \"$CPP\" fails sanity check
-See \`config.log' for more details." "6764" 5; }
+See \`config.log' for more details." "6812" 5; }
 fi
 
 ac_ext=c
@@ -6771,7 +6819,7 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
-{ $as_echo "$as_me:${as_lineno-6774}: checking for ANSI C header files" >&5
+{ $as_echo "$as_me:${as_lineno-6822}: checking for ANSI C header files" >&5
 $as_echo_n "checking for ANSI C header files... " >&6; }
 if test "${ac_cv_header_stdc+set}" = set; then :
   $as_echo_n "(cached) " >&6
@@ -6791,7 +6839,7 @@ main ()
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "6794"; then :
+if ac_fn_c_try_compile "6842"; then :
   ac_cv_header_stdc=yes
 else
   ac_cv_header_stdc=no
@@ -6864,7 +6912,7 @@ main ()
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_run "6867"; then :
+if ac_fn_c_try_run "6915"; then :
 
 else
   ac_cv_header_stdc=no
@@ -6875,7 +6923,7 @@ fi
 
 fi
 fi
-{ $as_echo "$as_me:${as_lineno-6878}: result: $ac_cv_header_stdc" >&5
+{ $as_echo "$as_me:${as_lineno-6926}: result: $ac_cv_header_stdc" >&5
 $as_echo "$ac_cv_header_stdc" >&6; }
 if test $ac_cv_header_stdc = yes; then
 
@@ -6888,7 +6936,7 @@ 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 "6891" "$ac_header" "$as_ac_Header" "$ac_includes_default
+ac_fn_c_check_header_compile "6939" "$ac_header" "$as_ac_Header" "$ac_includes_default
 "
 eval as_val=\$$as_ac_Header
    if test "x$as_val" = x""yes; then :
@@ -6903,7 +6951,7 @@ done
 
 for ac_header in dlfcn.h
 do :
-  ac_fn_c_check_header_compile "6906" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default
+  ac_fn_c_check_header_compile "6954" "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
@@ -7087,7 +7135,7 @@ if test -n "${ZSH_VERSION+set}" ; then
    setopt NO_GLOB_SUBST
 fi
 
-{ $as_echo "$as_me:${as_lineno-7090}: checking for objdir" >&5
+{ $as_echo "$as_me:${as_lineno-7138}: checking for objdir" >&5
 $as_echo_n "checking for objdir... " >&6; }
 if test "${lt_cv_objdir+set}" = set; then :
   $as_echo_n "(cached) " >&6
@@ -7102,7 +7150,7 @@ else
 fi
 rmdir .libs 2>/dev/null
 fi
-{ $as_echo "$as_me:${as_lineno-7105}: result: $lt_cv_objdir" >&5
+{ $as_echo "$as_me:${as_lineno-7153}: result: $lt_cv_objdir" >&5
 $as_echo "$lt_cv_objdir" >&6; }
 objdir=$lt_cv_objdir
 
@@ -7195,7 +7243,7 @@ test -z "$MAGIC_CMD" && MAGIC_CMD=file
 case $deplibs_check_method in
 file_magic*)
   if test "$file_magic_cmd" = '$MAGIC_CMD'; then
-    { $as_echo "$as_me:${as_lineno-7198}: checking for ${ac_tool_prefix}file" >&5
+    { $as_echo "$as_me:${as_lineno-7246}: checking for ${ac_tool_prefix}file" >&5
 $as_echo_n "checking for ${ac_tool_prefix}file... " >&6; }
 if test "${lt_cv_path_MAGIC_CMD+set}" = set; then :
   $as_echo_n "(cached) " >&6
@@ -7248,10 +7296,10 @@ fi
 
 MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
 if test -n "$MAGIC_CMD"; then
-  { $as_echo "$as_me:${as_lineno-7251}: result: $MAGIC_CMD" >&5
+  { $as_echo "$as_me:${as_lineno-7299}: result: $MAGIC_CMD" >&5
 $as_echo "$MAGIC_CMD" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-7254}: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-7302}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -7261,7 +7309,7 @@ fi
 
 if test -z "$lt_cv_path_MAGIC_CMD"; then
   if test -n "$ac_tool_prefix"; then
-    { $as_echo "$as_me:${as_lineno-7264}: checking for file" >&5
+    { $as_echo "$as_me:${as_lineno-7312}: checking for file" >&5
 $as_echo_n "checking for file... " >&6; }
 if test "${lt_cv_path_MAGIC_CMD+set}" = set; then :
   $as_echo_n "(cached) " >&6
@@ -7314,10 +7362,10 @@ fi
 
 MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
 if test -n "$MAGIC_CMD"; then
-  { $as_echo "$as_me:${as_lineno-7317}: result: $MAGIC_CMD" >&5
+  { $as_echo "$as_me:${as_lineno-7365}: result: $MAGIC_CMD" >&5
 $as_echo "$MAGIC_CMD" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-7320}: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-7368}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -7398,7 +7446,7 @@ lt_prog_compiler_no_builtin_flag=
 if test "$GCC" = yes; then
   lt_prog_compiler_no_builtin_flag=' -fno-builtin'
 
-  { $as_echo "$as_me:${as_lineno-7401}: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
+  { $as_echo "$as_me:${as_lineno-7449}: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
 $as_echo_n "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; }
 if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then :
   $as_echo_n "(cached) " >&6
@@ -7416,11 +7464,11 @@ else
    -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:7419: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:7467: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:7423: \$? = $ac_status" >&5
+   echo "$as_me:7471: \$? = $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.
@@ -7433,7 +7481,7 @@ else
    $RM conftest*
 
 fi
-{ $as_echo "$as_me:${as_lineno-7436}: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
+{ $as_echo "$as_me:${as_lineno-7484}: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
 $as_echo "$lt_cv_prog_compiler_rtti_exceptions" >&6; }
 
 if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then
@@ -7453,7 +7501,7 @@ fi
 lt_prog_compiler_pic=
 lt_prog_compiler_static=
 
-{ $as_echo "$as_me:${as_lineno-7456}: checking for $compiler option to produce PIC" >&5
+{ $as_echo "$as_me:${as_lineno-7504}: checking for $compiler option to produce PIC" >&5
 $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
 
   if test "$GCC" = yes; then
@@ -7725,7 +7773,7 @@ case $host_os in
     lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
     ;;
 esac
-{ $as_echo "$as_me:${as_lineno-7728}: result: $lt_prog_compiler_pic" >&5
+{ $as_echo "$as_me:${as_lineno-7776}: result: $lt_prog_compiler_pic" >&5
 $as_echo "$lt_prog_compiler_pic" >&6; }
 
 
@@ -7737,7 +7785,7 @@ $as_echo "$lt_prog_compiler_pic" >&6; }
 # Check to make sure the PIC flag actually works.
 #
 if test -n "$lt_prog_compiler_pic"; then
-  { $as_echo "$as_me:${as_lineno-7740}: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
+  { $as_echo "$as_me:${as_lineno-7788}: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
 $as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic works... " >&6; }
 if test "${lt_cv_prog_compiler_pic_works+set}" = set; then :
   $as_echo_n "(cached) " >&6
@@ -7755,11 +7803,11 @@ else
    -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:7758: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:7806: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:7762: \$? = $ac_status" >&5
+   echo "$as_me:7810: \$? = $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.
@@ -7772,7 +7820,7 @@ else
    $RM conftest*
 
 fi
-{ $as_echo "$as_me:${as_lineno-7775}: result: $lt_cv_prog_compiler_pic_works" >&5
+{ $as_echo "$as_me:${as_lineno-7823}: result: $lt_cv_prog_compiler_pic_works" >&5
 $as_echo "$lt_cv_prog_compiler_pic_works" >&6; }
 
 if test x"$lt_cv_prog_compiler_pic_works" = xyes; then
@@ -7796,7 +7844,7 @@ fi
 # Check to make sure the static flag actually works.
 #
 wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\"
-{ $as_echo "$as_me:${as_lineno-7799}: checking if $compiler static flag $lt_tmp_static_flag works" >&5
+{ $as_echo "$as_me:${as_lineno-7847}: checking if $compiler static flag $lt_tmp_static_flag works" >&5
 $as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; }
 if test "${lt_cv_prog_compiler_static_works+set}" = set; then :
   $as_echo_n "(cached) " >&6
@@ -7824,7 +7872,7 @@ else
    LDFLAGS="$save_LDFLAGS"
 
 fi
-{ $as_echo "$as_me:${as_lineno-7827}: result: $lt_cv_prog_compiler_static_works" >&5
+{ $as_echo "$as_me:${as_lineno-7875}: result: $lt_cv_prog_compiler_static_works" >&5
 $as_echo "$lt_cv_prog_compiler_static_works" >&6; }
 
 if test x"$lt_cv_prog_compiler_static_works" = xyes; then
@@ -7839,7 +7887,7 @@ fi
 
 
 
-  { $as_echo "$as_me:${as_lineno-7842}: checking if $compiler supports -c -o file.$ac_objext" >&5
+  { $as_echo "$as_me:${as_lineno-7890}: checking if $compiler supports -c -o file.$ac_objext" >&5
 $as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
 if test "${lt_cv_prog_compiler_c_o+set}" = set; then :
   $as_echo_n "(cached) " >&6
@@ -7860,11 +7908,11 @@ else
    -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:7863: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:7911: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:7867: \$? = $ac_status" >&5
+   echo "$as_me:7915: \$? = $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
@@ -7886,7 +7934,7 @@ else
    $RM conftest*
 
 fi
-{ $as_echo "$as_me:${as_lineno-7889}: result: $lt_cv_prog_compiler_c_o" >&5
+{ $as_echo "$as_me:${as_lineno-7937}: result: $lt_cv_prog_compiler_c_o" >&5
 $as_echo "$lt_cv_prog_compiler_c_o" >&6; }
 
 
@@ -7894,7 +7942,7 @@ $as_echo "$lt_cv_prog_compiler_c_o" >&6; }
 
 
 
-  { $as_echo "$as_me:${as_lineno-7897}: checking if $compiler supports -c -o file.$ac_objext" >&5
+  { $as_echo "$as_me:${as_lineno-7945}: checking if $compiler supports -c -o file.$ac_objext" >&5
 $as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
 if test "${lt_cv_prog_compiler_c_o+set}" = set; then :
   $as_echo_n "(cached) " >&6
@@ -7915,11 +7963,11 @@ else
    -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:7918: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:7966: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:7922: \$? = $ac_status" >&5
+   echo "$as_me:7970: \$? = $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
@@ -7941,7 +7989,7 @@ else
    $RM conftest*
 
 fi
-{ $as_echo "$as_me:${as_lineno-7944}: result: $lt_cv_prog_compiler_c_o" >&5
+{ $as_echo "$as_me:${as_lineno-7992}: result: $lt_cv_prog_compiler_c_o" >&5
 $as_echo "$lt_cv_prog_compiler_c_o" >&6; }
 
 
@@ -7950,7 +7998,7 @@ $as_echo "$lt_cv_prog_compiler_c_o" >&6; }
 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
-  { $as_echo "$as_me:${as_lineno-7953}: checking if we can lock with hard links" >&5
+  { $as_echo "$as_me:${as_lineno-8001}: checking if we can lock with hard links" >&5
 $as_echo_n "checking if we can lock with hard links... " >&6; }
   hard_links=yes
   $RM conftest*
@@ -7958,10 +8006,10 @@ $as_echo_n "checking if we can lock with hard links... " >&6; }
   touch conftest.a
   ln conftest.a conftest.b 2>&5 || hard_links=no
   ln conftest.a conftest.b 2>/dev/null && hard_links=no
-  { $as_echo "$as_me:${as_lineno-7961}: result: $hard_links" >&5
+  { $as_echo "$as_me:${as_lineno-8009}: result: $hard_links" >&5
 $as_echo "$hard_links" >&6; }
   if test "$hard_links" = no; then
-    { $as_echo "$as_me:${as_lineno-7964}: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
+    { $as_echo "$as_me:${as_lineno-8012}: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
 $as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
     need_locks=warn
   fi
@@ -7974,7 +8022,7 @@ fi
 
 
 
-  { $as_echo "$as_me:${as_lineno-7977}: checking whether the $compiler linker ($LD) supports shared libraries" >&5
+  { $as_echo "$as_me:${as_lineno-8025}: checking whether the $compiler linker ($LD) supports shared libraries" >&5
 $as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
 
   runpath_var=
@@ -8431,7 +8479,7 @@ main ()
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "8434"; then :
+if ac_fn_c_try_link "8482"; then :
 
 lt_aix_libpath_sed='
     /Import File Strings/,/^$/ {
@@ -8471,7 +8519,7 @@ main ()
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "8474"; then :
+if ac_fn_c_try_link "8522"; then :
 
 lt_aix_libpath_sed='
     /Import File Strings/,/^$/ {
@@ -8703,7 +8751,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
 /* end confdefs.h.  */
 int foo(void) {}
 _ACEOF
-if ac_fn_c_try_link "8706"; then :
+if ac_fn_c_try_link "8754"; then :
   archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
 
 fi
@@ -8964,7 +9012,7 @@ rm -f core conftest.err conftest.$ac_objext \
     fi
   fi
 
-{ $as_echo "$as_me:${as_lineno-8967}: result: $ld_shlibs" >&5
+{ $as_echo "$as_me:${as_lineno-9015}: result: $ld_shlibs" >&5
 $as_echo "$ld_shlibs" >&6; }
 test "$ld_shlibs" = no && can_build_shared=no
 
@@ -9001,15 +9049,15 @@ x|xyes)
       # 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.
-      { $as_echo "$as_me:${as_lineno-9004}: checking whether -lc should be explicitly linked in" >&5
+      { $as_echo "$as_me:${as_lineno-9052}: checking whether -lc should be explicitly linked in" >&5
 $as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }
       $RM conftest*
       echo "$lt_simple_compile_test_code" > conftest.$ac_ext
 
-      if { { eval echo "\"\$as_me\":${as_lineno-9009}: \"$ac_compile\""; } >&5
+      if { { eval echo "\"\$as_me\":${as_lineno-9057}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-9012}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-9060}: \$? = $ac_status" >&5
   test $ac_status = 0; } 2>conftest.err; then
         soname=conftest
         lib=conftest
@@ -9024,10 +9072,10 @@ $as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }
         libname=conftest
         lt_save_allow_undefined_flag=$allow_undefined_flag
         allow_undefined_flag=
-        if { { eval echo "\"\$as_me\":${as_lineno-9027}: \"$archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5
+        if { { eval echo "\"\$as_me\":${as_lineno-9075}: \"$archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5
   (eval $archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-9030}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-9078}: \$? = $ac_status" >&5
   test $ac_status = 0; }
         then
 	  archive_cmds_need_lc=no
@@ -9039,7 +9087,7 @@ $as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }
         cat conftest.err 1>&5
       fi
       $RM conftest*
-      { $as_echo "$as_me:${as_lineno-9042}: result: $archive_cmds_need_lc" >&5
+      { $as_echo "$as_me:${as_lineno-9090}: result: $archive_cmds_need_lc" >&5
 $as_echo "$archive_cmds_need_lc" >&6; }
       ;;
     esac
@@ -9203,7 +9251,7 @@ esac
 
 
 
-  { $as_echo "$as_me:${as_lineno-9206}: checking dynamic linker characteristics" >&5
+  { $as_echo "$as_me:${as_lineno-9254}: checking dynamic linker characteristics" >&5
 $as_echo_n "checking dynamic linker characteristics... " >&6; }
 
 if test "$GCC" = yes; then
@@ -9636,7 +9684,7 @@ main ()
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "9639"; then :
+if ac_fn_c_try_link "9687"; then :
   if  ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then :
   shlibpath_overrides_runpath=yes
 fi
@@ -9866,7 +9914,7 @@ uts4*)
   dynamic_linker=no
   ;;
 esac
-{ $as_echo "$as_me:${as_lineno-9869}: result: $dynamic_linker" >&5
+{ $as_echo "$as_me:${as_lineno-9917}: result: $dynamic_linker" >&5
 $as_echo "$dynamic_linker" >&6; }
 test "$dynamic_linker" = no && can_build_shared=no
 
@@ -9968,7 +10016,7 @@ fi
 
 
 
-  { $as_echo "$as_me:${as_lineno-9971}: checking how to hardcode library paths into programs" >&5
+  { $as_echo "$as_me:${as_lineno-10019}: checking how to hardcode library paths into programs" >&5
 $as_echo_n "checking how to hardcode library paths into programs... " >&6; }
 hardcode_action=
 if test -n "$hardcode_libdir_flag_spec" ||
@@ -9993,7 +10041,7 @@ else
   # directories.
   hardcode_action=unsupported
 fi
-{ $as_echo "$as_me:${as_lineno-9996}: result: $hardcode_action" >&5
+{ $as_echo "$as_me:${as_lineno-10044}: result: $hardcode_action" >&5
 $as_echo "$hardcode_action" >&6; }
 
 if test "$hardcode_action" = relink ||
@@ -10038,7 +10086,7 @@ else
 
   darwin*)
   # if libdl is installed we need to link against it
-    { $as_echo "$as_me:${as_lineno-10041}: checking for dlopen in -ldl" >&5
+    { $as_echo "$as_me:${as_lineno-10089}: 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
@@ -10063,7 +10111,7 @@ return dlopen ();
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "10066"; then :
+if ac_fn_c_try_link "10114"; then :
   ac_cv_lib_dl_dlopen=yes
 else
   ac_cv_lib_dl_dlopen=no
@@ -10072,7 +10120,7 @@ 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-10075}: result: $ac_cv_lib_dl_dlopen" >&5
+{ $as_echo "$as_me:${as_lineno-10123}: 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"
@@ -10087,11 +10135,11 @@ fi
     ;;
 
   *)
-    ac_fn_c_check_func "10090" "shl_load" "ac_cv_func_shl_load"
+    ac_fn_c_check_func "10138" "shl_load" "ac_cv_func_shl_load"
 if test "x$ac_cv_func_shl_load" = x""yes; then :
   lt_cv_dlopen="shl_load"
 else
-  { $as_echo "$as_me:${as_lineno-10094}: checking for shl_load in -ldld" >&5
+  { $as_echo "$as_me:${as_lineno-10142}: 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 :
   $as_echo_n "(cached) " >&6
@@ -10116,7 +10164,7 @@ return shl_load ();
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "10119"; then :
+if ac_fn_c_try_link "10167"; then :
   ac_cv_lib_dld_shl_load=yes
 else
   ac_cv_lib_dld_shl_load=no
@@ -10125,16 +10173,16 @@ 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-10128}: result: $ac_cv_lib_dld_shl_load" >&5
+{ $as_echo "$as_me:${as_lineno-10176}: 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
-  ac_fn_c_check_func "10133" "dlopen" "ac_cv_func_dlopen"
+  ac_fn_c_check_func "10181" "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-10137}: checking for dlopen in -ldl" >&5
+  { $as_echo "$as_me:${as_lineno-10185}: 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
@@ -10159,7 +10207,7 @@ return dlopen ();
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "10162"; then :
+if ac_fn_c_try_link "10210"; then :
   ac_cv_lib_dl_dlopen=yes
 else
   ac_cv_lib_dl_dlopen=no
@@ -10168,12 +10216,12 @@ 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-10171}: result: $ac_cv_lib_dl_dlopen" >&5
+{ $as_echo "$as_me:${as_lineno-10219}: 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
-  { $as_echo "$as_me:${as_lineno-10176}: checking for dlopen in -lsvld" >&5
+  { $as_echo "$as_me:${as_lineno-10224}: 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
@@ -10198,7 +10246,7 @@ return dlopen ();
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "10201"; then :
+if ac_fn_c_try_link "10249"; then :
   ac_cv_lib_svld_dlopen=yes
 else
   ac_cv_lib_svld_dlopen=no
@@ -10207,12 +10255,12 @@ 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-10210}: result: $ac_cv_lib_svld_dlopen" >&5
+{ $as_echo "$as_me:${as_lineno-10258}: result: $ac_cv_lib_svld_dlopen" >&5
 $as_echo "$ac_cv_lib_svld_dlopen" >&6; }
 if test "x$ac_cv_lib_svld_dlopen" = x""yes; then :
   lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"
 else
-  { $as_echo "$as_me:${as_lineno-10215}: checking for dld_link in -ldld" >&5
+  { $as_echo "$as_me:${as_lineno-10263}: checking for dld_link in -ldld" >&5
 $as_echo_n "checking for dld_link in -ldld... " >&6; }
 if test "${ac_cv_lib_dld_dld_link+set}" = set; then :
   $as_echo_n "(cached) " >&6
@@ -10237,7 +10285,7 @@ return dld_link ();
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "10240"; then :
+if ac_fn_c_try_link "10288"; then :
   ac_cv_lib_dld_dld_link=yes
 else
   ac_cv_lib_dld_dld_link=no
@@ -10246,7 +10294,7 @@ 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-10249}: result: $ac_cv_lib_dld_dld_link" >&5
+{ $as_echo "$as_me:${as_lineno-10297}: result: $ac_cv_lib_dld_dld_link" >&5
 $as_echo "$ac_cv_lib_dld_dld_link" >&6; }
 if test "x$ac_cv_lib_dld_dld_link" = x""yes; then :
   lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"
@@ -10287,7 +10335,7 @@ fi
     save_LIBS="$LIBS"
     LIBS="$lt_cv_dlopen_libs $LIBS"
 
-    { $as_echo "$as_me:${as_lineno-10290}: checking whether a program can dlopen itself" >&5
+    { $as_echo "$as_me:${as_lineno-10338}: checking whether a program can dlopen itself" >&5
 $as_echo_n "checking whether a program can dlopen itself... " >&6; }
 if test "${lt_cv_dlopen_self+set}" = set; then :
   $as_echo_n "(cached) " >&6
@@ -10298,7 +10346,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 10301 "configure"
+#line 10349 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -10357,10 +10405,10 @@ int main ()
   return status;
 }
 _LT_EOF
-  if { { eval echo "\"\$as_me\":${as_lineno-10360}: \"$ac_link\""; } >&5
+  if { { eval echo "\"\$as_me\":${as_lineno-10408}: \"$ac_link\""; } >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-10363}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-10411}: \$? = $ac_status" >&5
   test $ac_status = 0; } && test -s conftest${ac_exeext} 2>/dev/null; then
     (./conftest; exit; ) >&5 2>/dev/null
     lt_status=$?
@@ -10378,12 +10426,12 @@ rm -fr conftest*
 
 
 fi
-{ $as_echo "$as_me:${as_lineno-10381}: result: $lt_cv_dlopen_self" >&5
+{ $as_echo "$as_me:${as_lineno-10429}: result: $lt_cv_dlopen_self" >&5
 $as_echo "$lt_cv_dlopen_self" >&6; }
 
     if test "x$lt_cv_dlopen_self" = xyes; then
       wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
-      { $as_echo "$as_me:${as_lineno-10386}: checking whether a statically linked program can dlopen itself" >&5
+      { $as_echo "$as_me:${as_lineno-10434}: checking whether a statically linked program can dlopen itself" >&5
 $as_echo_n "checking whether a statically linked program can dlopen itself... " >&6; }
 if test "${lt_cv_dlopen_self_static+set}" = set; then :
   $as_echo_n "(cached) " >&6
@@ -10394,7 +10442,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 10397 "configure"
+#line 10445 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -10453,10 +10501,10 @@ int main ()
   return status;
 }
 _LT_EOF
-  if { { eval echo "\"\$as_me\":${as_lineno-10456}: \"$ac_link\""; } >&5
+  if { { eval echo "\"\$as_me\":${as_lineno-10504}: \"$ac_link\""; } >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-10459}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-10507}: \$? = $ac_status" >&5
   test $ac_status = 0; } && test -s conftest${ac_exeext} 2>/dev/null; then
     (./conftest; exit; ) >&5 2>/dev/null
     lt_status=$?
@@ -10474,7 +10522,7 @@ rm -fr conftest*
 
 
 fi
-{ $as_echo "$as_me:${as_lineno-10477}: result: $lt_cv_dlopen_self_static" >&5
+{ $as_echo "$as_me:${as_lineno-10525}: result: $lt_cv_dlopen_self_static" >&5
 $as_echo "$lt_cv_dlopen_self_static" >&6; }
     fi
 
@@ -10513,12 +10561,12 @@ fi
 
 striplib=
 old_striplib=
-{ $as_echo "$as_me:${as_lineno-10516}: checking whether stripping libraries is possible" >&5
+{ $as_echo "$as_me:${as_lineno-10564}: checking whether stripping libraries is possible" >&5
 $as_echo_n "checking whether stripping libraries is possible... " >&6; }
 if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then
   test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
   test -z "$striplib" && striplib="$STRIP --strip-unneeded"
-  { $as_echo "$as_me:${as_lineno-10521}: result: yes" >&5
+  { $as_echo "$as_me:${as_lineno-10569}: result: yes" >&5
 $as_echo "yes" >&6; }
 else
 # FIXME - insert some real tests, host_os isn't really good enough
@@ -10527,15 +10575,15 @@ else
     if test -n "$STRIP" ; then
       striplib="$STRIP -x"
       old_striplib="$STRIP -S"
-      { $as_echo "$as_me:${as_lineno-10530}: result: yes" >&5
+      { $as_echo "$as_me:${as_lineno-10578}: result: yes" >&5
 $as_echo "yes" >&6; }
     else
-      { $as_echo "$as_me:${as_lineno-10533}: result: no" >&5
+      { $as_echo "$as_me:${as_lineno-10581}: result: no" >&5
 $as_echo "no" >&6; }
     fi
     ;;
   *)
-    { $as_echo "$as_me:${as_lineno-10538}: result: no" >&5
+    { $as_echo "$as_me:${as_lineno-10586}: result: no" >&5
 $as_echo "no" >&6; }
     ;;
   esac
@@ -10553,12 +10601,12 @@ fi
 
 
   # Report which library types will actually be built
-  { $as_echo "$as_me:${as_lineno-10556}: checking if libtool supports shared libraries" >&5
+  { $as_echo "$as_me:${as_lineno-10604}: checking if libtool supports shared libraries" >&5
 $as_echo_n "checking if libtool supports shared libraries... " >&6; }
-  { $as_echo "$as_me:${as_lineno-10558}: result: $can_build_shared" >&5
+  { $as_echo "$as_me:${as_lineno-10606}: result: $can_build_shared" >&5
 $as_echo "$can_build_shared" >&6; }
 
-  { $as_echo "$as_me:${as_lineno-10561}: checking whether to build shared libraries" >&5
+  { $as_echo "$as_me:${as_lineno-10609}: checking whether to build shared libraries" >&5
 $as_echo_n "checking whether to build shared libraries... " >&6; }
   test "$can_build_shared" = "no" && enable_shared=no
 
@@ -10579,14 +10627,14 @@ $as_echo_n "checking whether to build shared libraries... " >&6; }
     fi
     ;;
   esac
-  { $as_echo "$as_me:${as_lineno-10582}: result: $enable_shared" >&5
+  { $as_echo "$as_me:${as_lineno-10630}: result: $enable_shared" >&5
 $as_echo "$enable_shared" >&6; }
 
-  { $as_echo "$as_me:${as_lineno-10585}: checking whether to build static libraries" >&5
+  { $as_echo "$as_me:${as_lineno-10633}: checking whether to build static libraries" >&5
 $as_echo_n "checking whether to build static libraries... " >&6; }
   # Make sure either enable_shared or enable_static is yes.
   test "$enable_shared" = yes || enable_static=yes
-  { $as_echo "$as_me:${as_lineno-10589}: result: $enable_static" >&5
+  { $as_echo "$as_me:${as_lineno-10637}: result: $enable_static" >&5
 $as_echo "$enable_static" >&6; }
 
 
@@ -10635,7 +10683,7 @@ if test -z "$CXX"; then
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-10638}: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-10686}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_CXX+set}" = set; then :
   $as_echo_n "(cached) " >&6
@@ -10651,7 +10699,7 @@ 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_CXX="$ac_tool_prefix$ac_prog"
-    $as_echo "$as_me:${as_lineno-10654}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-10702}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -10662,10 +10710,10 @@ fi
 fi
 CXX=$ac_cv_prog_CXX
 if test -n "$CXX"; then
-  { $as_echo "$as_me:${as_lineno-10665}: result: $CXX" >&5
+  { $as_echo "$as_me:${as_lineno-10713}: result: $CXX" >&5
 $as_echo "$CXX" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-10668}: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-10716}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -10679,7 +10727,7 @@ if test -z "$CXX"; then
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-10682}: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-10730}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then :
   $as_echo_n "(cached) " >&6
@@ -10695,7 +10743,7 @@ 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_CXX="$ac_prog"
-    $as_echo "$as_me:${as_lineno-10698}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-10746}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -10706,10 +10754,10 @@ fi
 fi
 ac_ct_CXX=$ac_cv_prog_ac_ct_CXX
 if test -n "$ac_ct_CXX"; then
-  { $as_echo "$as_me:${as_lineno-10709}: result: $ac_ct_CXX" >&5
+  { $as_echo "$as_me:${as_lineno-10757}: result: $ac_ct_CXX" >&5
 $as_echo "$ac_ct_CXX" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-10712}: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-10760}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -10722,7 +10770,7 @@ done
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ $as_echo "$as_me:${as_lineno-10725}: WARNING: using cross tools not prefixed with host triplet" >&5
+{ $as_echo "$as_me:${as_lineno-10773}: 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
@@ -10733,7 +10781,7 @@ fi
   fi
 fi
 # Provide some information about the compiler.
-$as_echo "$as_me:${as_lineno-10736}: checking for C++ compiler version" >&5
+$as_echo "$as_me:${as_lineno-10784}: checking for C++ compiler version" >&5
 set X $ac_compile
 ac_compiler=$2
 for ac_option in --version -v -V -qversion; do
@@ -10742,7 +10790,7 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:${as_lineno-10745}: $ac_try_echo\""
+eval ac_try_echo="\"\$as_me:${as_lineno-10793}: $ac_try_echo\""
 $as_echo "$ac_try_echo"; } >&5
   (eval "$ac_compiler $ac_option >&5") 2>conftest.err
   ac_status=$?
@@ -10753,11 +10801,11 @@ $as_echo "$ac_try_echo"; } >&5
     cat conftest.er1 >&5
     rm -f conftest.er1 conftest.err
   fi
-  $as_echo "$as_me:${as_lineno-10756}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-10804}: \$? = $ac_status" >&5
   test $ac_status = 0; }
 done
 
-{ $as_echo "$as_me:${as_lineno-10760}: checking whether we are using the GNU C++ compiler" >&5
+{ $as_echo "$as_me:${as_lineno-10808}: 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_cxx_compiler_gnu+set}" = set; then :
   $as_echo_n "(cached) " >&6
@@ -10776,7 +10824,7 @@ main ()
   return 0;
 }
 _ACEOF
-if ac_fn_cxx_try_compile "10779"; then :
+if ac_fn_cxx_try_compile "10827"; then :
   ac_compiler_gnu=yes
 else
   ac_compiler_gnu=no
@@ -10785,7 +10833,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
 
 fi
-{ $as_echo "$as_me:${as_lineno-10788}: result: $ac_cv_cxx_compiler_gnu" >&5
+{ $as_echo "$as_me:${as_lineno-10836}: result: $ac_cv_cxx_compiler_gnu" >&5
 $as_echo "$ac_cv_cxx_compiler_gnu" >&6; }
 if test $ac_compiler_gnu = yes; then
   GXX=yes
@@ -10794,7 +10842,7 @@ else
 fi
 ac_test_CXXFLAGS=${CXXFLAGS+set}
 ac_save_CXXFLAGS=$CXXFLAGS
-{ $as_echo "$as_me:${as_lineno-10797}: checking whether $CXX accepts -g" >&5
+{ $as_echo "$as_me:${as_lineno-10845}: checking whether $CXX accepts -g" >&5
 $as_echo_n "checking whether $CXX accepts -g... " >&6; }
 if test "${ac_cv_prog_cxx_g+set}" = set; then :
   $as_echo_n "(cached) " >&6
@@ -10814,7 +10862,7 @@ main ()
   return 0;
 }
 _ACEOF
-if ac_fn_cxx_try_compile "10817"; then :
+if ac_fn_cxx_try_compile "10865"; then :
   ac_cv_prog_cxx_g=yes
 else
   CXXFLAGS=""
@@ -10829,7 +10877,7 @@ main ()
   return 0;
 }
 _ACEOF
-if ac_fn_cxx_try_compile "10832"; then :
+if ac_fn_cxx_try_compile "10880"; then :
 
 else
   ac_cxx_werror_flag=$ac_save_cxx_werror_flag
@@ -10845,7 +10893,7 @@ main ()
   return 0;
 }
 _ACEOF
-if ac_fn_cxx_try_compile "10848"; then :
+if ac_fn_cxx_try_compile "10896"; then :
   ac_cv_prog_cxx_g=yes
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
@@ -10855,7 +10903,7 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
    ac_cxx_werror_flag=$ac_save_cxx_werror_flag
 fi
-{ $as_echo "$as_me:${as_lineno-10858}: result: $ac_cv_prog_cxx_g" >&5
+{ $as_echo "$as_me:${as_lineno-10906}: result: $ac_cv_prog_cxx_g" >&5
 $as_echo "$ac_cv_prog_cxx_g" >&6; }
 if test "$ac_test_CXXFLAGS" = set; then
   CXXFLAGS=$ac_save_CXXFLAGS
@@ -10880,7 +10928,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 depcc="$CXX"  am_compiler_list=
 
-{ $as_echo "$as_me:${as_lineno-10883}: checking dependency style of $depcc" >&5
+{ $as_echo "$as_me:${as_lineno-10931}: checking dependency style of $depcc" >&5
 $as_echo_n "checking dependency style of $depcc... " >&6; }
 if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then :
   $as_echo_n "(cached) " >&6
@@ -10908,6 +10956,11 @@ else
   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
@@ -10925,7 +10978,17 @@ else
     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
@@ -10935,19 +10998,23 @@ else
 	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=sub/conftest.${OBJEXT-o} \
+       source=sub/conftest.c object=$am__obj \
        depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
-       $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
+       $SHELL ./depcomp $depcc -c $am__minus_obj 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 sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
+       grep $am__obj 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
@@ -10971,7 +11038,7 @@ else
 fi
 
 fi
-{ $as_echo "$as_me:${as_lineno-10974}: result: $am_cv_CXX_dependencies_compiler_type" >&5
+{ $as_echo "$as_me:${as_lineno-11041}: result: $am_cv_CXX_dependencies_compiler_type" >&5
 $as_echo "$am_cv_CXX_dependencies_compiler_type" >&6; }
 CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type
 
@@ -11001,7 +11068,7 @@ if test -z "$CXX"; then
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-11004}: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-11071}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_CXX+set}" = set; then :
   $as_echo_n "(cached) " >&6
@@ -11017,7 +11084,7 @@ 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_CXX="$ac_tool_prefix$ac_prog"
-    $as_echo "$as_me:${as_lineno-11020}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-11087}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -11028,10 +11095,10 @@ fi
 fi
 CXX=$ac_cv_prog_CXX
 if test -n "$CXX"; then
-  { $as_echo "$as_me:${as_lineno-11031}: result: $CXX" >&5
+  { $as_echo "$as_me:${as_lineno-11098}: result: $CXX" >&5
 $as_echo "$CXX" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-11034}: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-11101}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -11045,7 +11112,7 @@ if test -z "$CXX"; then
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-11048}: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-11115}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then :
   $as_echo_n "(cached) " >&6
@@ -11061,7 +11128,7 @@ 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_CXX="$ac_prog"
-    $as_echo "$as_me:${as_lineno-11064}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-11131}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -11072,10 +11139,10 @@ fi
 fi
 ac_ct_CXX=$ac_cv_prog_ac_ct_CXX
 if test -n "$ac_ct_CXX"; then
-  { $as_echo "$as_me:${as_lineno-11075}: result: $ac_ct_CXX" >&5
+  { $as_echo "$as_me:${as_lineno-11142}: result: $ac_ct_CXX" >&5
 $as_echo "$ac_ct_CXX" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-11078}: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-11145}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -11088,7 +11155,7 @@ done
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ $as_echo "$as_me:${as_lineno-11091}: WARNING: using cross tools not prefixed with host triplet" >&5
+{ $as_echo "$as_me:${as_lineno-11158}: 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
@@ -11099,7 +11166,7 @@ fi
   fi
 fi
 # Provide some information about the compiler.
-$as_echo "$as_me:${as_lineno-11102}: checking for C++ compiler version" >&5
+$as_echo "$as_me:${as_lineno-11169}: checking for C++ compiler version" >&5
 set X $ac_compile
 ac_compiler=$2
 for ac_option in --version -v -V -qversion; do
@@ -11108,7 +11175,7 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:${as_lineno-11111}: $ac_try_echo\""
+eval ac_try_echo="\"\$as_me:${as_lineno-11178}: $ac_try_echo\""
 $as_echo "$ac_try_echo"; } >&5
   (eval "$ac_compiler $ac_option >&5") 2>conftest.err
   ac_status=$?
@@ -11119,11 +11186,11 @@ $as_echo "$ac_try_echo"; } >&5
     cat conftest.er1 >&5
     rm -f conftest.er1 conftest.err
   fi
-  $as_echo "$as_me:${as_lineno-11122}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-11189}: \$? = $ac_status" >&5
   test $ac_status = 0; }
 done
 
-{ $as_echo "$as_me:${as_lineno-11126}: checking whether we are using the GNU C++ compiler" >&5
+{ $as_echo "$as_me:${as_lineno-11193}: 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_cxx_compiler_gnu+set}" = set; then :
   $as_echo_n "(cached) " >&6
@@ -11142,7 +11209,7 @@ main ()
   return 0;
 }
 _ACEOF
-if ac_fn_cxx_try_compile "11145"; then :
+if ac_fn_cxx_try_compile "11212"; then :
   ac_compiler_gnu=yes
 else
   ac_compiler_gnu=no
@@ -11151,7 +11218,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
 
 fi
-{ $as_echo "$as_me:${as_lineno-11154}: result: $ac_cv_cxx_compiler_gnu" >&5
+{ $as_echo "$as_me:${as_lineno-11221}: result: $ac_cv_cxx_compiler_gnu" >&5
 $as_echo "$ac_cv_cxx_compiler_gnu" >&6; }
 if test $ac_compiler_gnu = yes; then
   GXX=yes
@@ -11160,7 +11227,7 @@ else
 fi
 ac_test_CXXFLAGS=${CXXFLAGS+set}
 ac_save_CXXFLAGS=$CXXFLAGS
-{ $as_echo "$as_me:${as_lineno-11163}: checking whether $CXX accepts -g" >&5
+{ $as_echo "$as_me:${as_lineno-11230}: checking whether $CXX accepts -g" >&5
 $as_echo_n "checking whether $CXX accepts -g... " >&6; }
 if test "${ac_cv_prog_cxx_g+set}" = set; then :
   $as_echo_n "(cached) " >&6
@@ -11180,7 +11247,7 @@ main ()
   return 0;
 }
 _ACEOF
-if ac_fn_cxx_try_compile "11183"; then :
+if ac_fn_cxx_try_compile "11250"; then :
   ac_cv_prog_cxx_g=yes
 else
   CXXFLAGS=""
@@ -11195,7 +11262,7 @@ main ()
   return 0;
 }
 _ACEOF
-if ac_fn_cxx_try_compile "11198"; then :
+if ac_fn_cxx_try_compile "11265"; then :
 
 else
   ac_cxx_werror_flag=$ac_save_cxx_werror_flag
@@ -11211,7 +11278,7 @@ main ()
   return 0;
 }
 _ACEOF
-if ac_fn_cxx_try_compile "11214"; then :
+if ac_fn_cxx_try_compile "11281"; then :
   ac_cv_prog_cxx_g=yes
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
@@ -11221,7 +11288,7 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
    ac_cxx_werror_flag=$ac_save_cxx_werror_flag
 fi
-{ $as_echo "$as_me:${as_lineno-11224}: result: $ac_cv_prog_cxx_g" >&5
+{ $as_echo "$as_me:${as_lineno-11291}: result: $ac_cv_prog_cxx_g" >&5
 $as_echo "$ac_cv_prog_cxx_g" >&6; }
 if test "$ac_test_CXXFLAGS" = set; then
   CXXFLAGS=$ac_save_CXXFLAGS
@@ -11246,7 +11313,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 depcc="$CXX"  am_compiler_list=
 
-{ $as_echo "$as_me:${as_lineno-11249}: checking dependency style of $depcc" >&5
+{ $as_echo "$as_me:${as_lineno-11316}: checking dependency style of $depcc" >&5
 $as_echo_n "checking dependency style of $depcc... " >&6; }
 if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then :
   $as_echo_n "(cached) " >&6
@@ -11274,6 +11341,11 @@ else
   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
@@ -11291,7 +11363,17 @@ else
     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
@@ -11301,19 +11383,23 @@ else
 	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=sub/conftest.${OBJEXT-o} \
+       source=sub/conftest.c object=$am__obj \
        depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
-       $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
+       $SHELL ./depcomp $depcc -c $am__minus_obj 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 sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
+       grep $am__obj 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
@@ -11337,7 +11423,7 @@ else
 fi
 
 fi
-{ $as_echo "$as_me:${as_lineno-11340}: result: $am_cv_CXX_dependencies_compiler_type" >&5
+{ $as_echo "$as_me:${as_lineno-11426}: result: $am_cv_CXX_dependencies_compiler_type" >&5
 $as_echo "$am_cv_CXX_dependencies_compiler_type" >&6; }
 CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type
 
@@ -11360,7 +11446,7 @@ ac_cpp='$CXXCPP $CPPFLAGS'
 ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-{ $as_echo "$as_me:${as_lineno-11363}: checking how to run the C++ preprocessor" >&5
+{ $as_echo "$as_me:${as_lineno-11449}: checking how to run the C++ preprocessor" >&5
 $as_echo_n "checking how to run the C++ preprocessor... " >&6; }
 if test -z "$CXXCPP"; then
   if test "${ac_cv_prog_CXXCPP+set}" = set; then :
@@ -11387,7 +11473,7 @@ do
 #endif
 		     Syntax error
 _ACEOF
-if ac_fn_cxx_try_cpp "11390"; then :
+if ac_fn_cxx_try_cpp "11476"; then :
 
 else
   # Broken: fails on valid input.
@@ -11401,7 +11487,7 @@ rm -f conftest.err conftest.$ac_ext
 /* end confdefs.h.  */
 #include <ac_nonexistent.h>
 _ACEOF
-if ac_fn_cxx_try_cpp "11404"; then :
+if ac_fn_cxx_try_cpp "11490"; then :
   # Broken: success on invalid input.
 continue
 else
@@ -11426,7 +11512,7 @@ fi
 else
   ac_cv_prog_CXXCPP=$CXXCPP
 fi
-{ $as_echo "$as_me:${as_lineno-11429}: result: $CXXCPP" >&5
+{ $as_echo "$as_me:${as_lineno-11515}: result: $CXXCPP" >&5
 $as_echo "$CXXCPP" >&6; }
 ac_preproc_ok=false
 for ac_cxx_preproc_warn_flag in '' yes
@@ -11446,7 +11532,7 @@ do
 #endif
 		     Syntax error
 _ACEOF
-if ac_fn_cxx_try_cpp "11449"; then :
+if ac_fn_cxx_try_cpp "11535"; then :
 
 else
   # Broken: fails on valid input.
@@ -11460,7 +11546,7 @@ rm -f conftest.err conftest.$ac_ext
 /* end confdefs.h.  */
 #include <ac_nonexistent.h>
 _ACEOF
-if ac_fn_cxx_try_cpp "11463"; then :
+if ac_fn_cxx_try_cpp "11549"; then :
   # Broken: success on invalid input.
 continue
 else
@@ -11476,7 +11562,7 @@ rm -f conftest.err conftest.$ac_ext
 if $ac_preproc_ok; then :
 
 else
-  { { $as_echo "$as_me:${as_lineno-11479}: error: in \`$ac_pwd':" >&5
+  { { $as_echo "$as_me:${as_lineno-11565}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 _lt_caught_CXX_error=yes; }
 fi
@@ -11628,7 +11714,7 @@ fi
 ac_prog=ld
 if test "$GCC" = yes; then
   # Check if gcc -print-prog-name=ld gives a path.
-  { $as_echo "$as_me:${as_lineno-11631}: checking for ld used by $CC" >&5
+  { $as_echo "$as_me:${as_lineno-11717}: checking for ld used by $CC" >&5
 $as_echo_n "checking for ld used by $CC... " >&6; }
   case $host in
   *-*-mingw*)
@@ -11658,10 +11744,10 @@ $as_echo_n "checking for ld used by $CC... " >&6; }
     ;;
   esac
 elif test "$with_gnu_ld" = yes; then
-  { $as_echo "$as_me:${as_lineno-11661}: checking for GNU ld" >&5
+  { $as_echo "$as_me:${as_lineno-11747}: checking for GNU ld" >&5
 $as_echo_n "checking for GNU ld... " >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-11664}: checking for non-GNU ld" >&5
+  { $as_echo "$as_me:${as_lineno-11750}: checking for non-GNU ld" >&5
 $as_echo_n "checking for non-GNU ld... " >&6; }
 fi
 if test "${lt_cv_path_LD+set}" = set; then :
@@ -11695,14 +11781,14 @@ fi
 
 LD="$lt_cv_path_LD"
 if test -n "$LD"; then
-  { $as_echo "$as_me:${as_lineno-11698}: result: $LD" >&5
+  { $as_echo "$as_me:${as_lineno-11784}: result: $LD" >&5
 $as_echo "$LD" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-11701}: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-11787}: result: no" >&5
 $as_echo "no" >&6; }
 fi
-test -z "$LD" && as_fn_error "no acceptable ld found in \$PATH" "11704" 5
-{ $as_echo "$as_me:${as_lineno-11705}: checking if the linker ($LD) is GNU ld" >&5
+test -z "$LD" && as_fn_error "no acceptable ld found in \$PATH" "11790" 5
+{ $as_echo "$as_me:${as_lineno-11791}: checking if the linker ($LD) is GNU ld" >&5
 $as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
 if test "${lt_cv_prog_gnu_ld+set}" = set; then :
   $as_echo_n "(cached) " >&6
@@ -11717,7 +11803,7 @@ case `$LD -v 2>&1 </dev/null` in
   ;;
 esac
 fi
-{ $as_echo "$as_me:${as_lineno-11720}: result: $lt_cv_prog_gnu_ld" >&5
+{ $as_echo "$as_me:${as_lineno-11806}: result: $lt_cv_prog_gnu_ld" >&5
 $as_echo "$lt_cv_prog_gnu_ld" >&6; }
 with_gnu_ld=$lt_cv_prog_gnu_ld
 
@@ -11772,7 +11858,7 @@ with_gnu_ld=$lt_cv_prog_gnu_ld
     fi
 
     # PORTME: fill in a description of your system's C++ link characteristics
-    { $as_echo "$as_me:${as_lineno-11775}: checking whether the $compiler linker ($LD) supports shared libraries" >&5
+    { $as_echo "$as_me:${as_lineno-11861}: checking whether the $compiler linker ($LD) supports shared libraries" >&5
 $as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
     ld_shlibs_CXX=yes
     case $host_os in
@@ -11884,7 +11970,7 @@ main ()
   return 0;
 }
 _ACEOF
-if ac_fn_cxx_try_link "11887"; then :
+if ac_fn_cxx_try_link "11973"; then :
 
 lt_aix_libpath_sed='
     /Import File Strings/,/^$/ {
@@ -11925,7 +12011,7 @@ main ()
   return 0;
 }
 _ACEOF
-if ac_fn_cxx_try_link "11928"; then :
+if ac_fn_cxx_try_link "12014"; then :
 
 lt_aix_libpath_sed='
     /Import File Strings/,/^$/ {
@@ -12685,7 +12771,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
         ;;
     esac
 
-    { $as_echo "$as_me:${as_lineno-12688}: result: $ld_shlibs_CXX" >&5
+    { $as_echo "$as_me:${as_lineno-12774}: result: $ld_shlibs_CXX" >&5
 $as_echo "$ld_shlibs_CXX" >&6; }
     test "$ld_shlibs_CXX" = no && can_build_shared=no
 
@@ -12713,10 +12799,10 @@ private:
 };
 _LT_EOF
 
-if { { eval echo "\"\$as_me\":${as_lineno-12716}: \"$ac_compile\""; } >&5
+if { { eval echo "\"\$as_me\":${as_lineno-12802}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-12719}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-12805}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   # Parse the compiler output and extract the necessary
   # objects, libraries and library flags.
@@ -12898,7 +12984,7 @@ fi
 lt_prog_compiler_pic_CXX=
 lt_prog_compiler_static_CXX=
 
-{ $as_echo "$as_me:${as_lineno-12901}: checking for $compiler option to produce PIC" >&5
+{ $as_echo "$as_me:${as_lineno-12987}: checking for $compiler option to produce PIC" >&5
 $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
 
   # C++ specific cases for pic, static, wl, etc.
@@ -13215,7 +13301,7 @@ case $host_os in
     lt_prog_compiler_pic_CXX="$lt_prog_compiler_pic_CXX -DPIC"
     ;;
 esac
-{ $as_echo "$as_me:${as_lineno-13218}: result: $lt_prog_compiler_pic_CXX" >&5
+{ $as_echo "$as_me:${as_lineno-13304}: result: $lt_prog_compiler_pic_CXX" >&5
 $as_echo "$lt_prog_compiler_pic_CXX" >&6; }
 
 
@@ -13224,7 +13310,7 @@ $as_echo "$lt_prog_compiler_pic_CXX" >&6; }
 # Check to make sure the PIC flag actually works.
 #
 if test -n "$lt_prog_compiler_pic_CXX"; then
-  { $as_echo "$as_me:${as_lineno-13227}: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5
+  { $as_echo "$as_me:${as_lineno-13313}: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5
 $as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... " >&6; }
 if test "${lt_cv_prog_compiler_pic_works_CXX+set}" = set; then :
   $as_echo_n "(cached) " >&6
@@ -13242,11 +13328,11 @@ else
    -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:13245: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:13331: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:13249: \$? = $ac_status" >&5
+   echo "$as_me:13335: \$? = $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.
@@ -13259,7 +13345,7 @@ else
    $RM conftest*
 
 fi
-{ $as_echo "$as_me:${as_lineno-13262}: result: $lt_cv_prog_compiler_pic_works_CXX" >&5
+{ $as_echo "$as_me:${as_lineno-13348}: result: $lt_cv_prog_compiler_pic_works_CXX" >&5
 $as_echo "$lt_cv_prog_compiler_pic_works_CXX" >&6; }
 
 if test x"$lt_cv_prog_compiler_pic_works_CXX" = xyes; then
@@ -13280,7 +13366,7 @@ fi
 # Check to make sure the static flag actually works.
 #
 wl=$lt_prog_compiler_wl_CXX eval lt_tmp_static_flag=\"$lt_prog_compiler_static_CXX\"
-{ $as_echo "$as_me:${as_lineno-13283}: checking if $compiler static flag $lt_tmp_static_flag works" >&5
+{ $as_echo "$as_me:${as_lineno-13369}: checking if $compiler static flag $lt_tmp_static_flag works" >&5
 $as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; }
 if test "${lt_cv_prog_compiler_static_works_CXX+set}" = set; then :
   $as_echo_n "(cached) " >&6
@@ -13308,7 +13394,7 @@ else
    LDFLAGS="$save_LDFLAGS"
 
 fi
-{ $as_echo "$as_me:${as_lineno-13311}: result: $lt_cv_prog_compiler_static_works_CXX" >&5
+{ $as_echo "$as_me:${as_lineno-13397}: result: $lt_cv_prog_compiler_static_works_CXX" >&5
 $as_echo "$lt_cv_prog_compiler_static_works_CXX" >&6; }
 
 if test x"$lt_cv_prog_compiler_static_works_CXX" = xyes; then
@@ -13320,7 +13406,7 @@ fi
 
 
 
-    { $as_echo "$as_me:${as_lineno-13323}: checking if $compiler supports -c -o file.$ac_objext" >&5
+    { $as_echo "$as_me:${as_lineno-13409}: checking if $compiler supports -c -o file.$ac_objext" >&5
 $as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
 if test "${lt_cv_prog_compiler_c_o_CXX+set}" = set; then :
   $as_echo_n "(cached) " >&6
@@ -13341,11 +13427,11 @@ else
    -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:13344: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:13430: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:13348: \$? = $ac_status" >&5
+   echo "$as_me:13434: \$? = $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
@@ -13367,12 +13453,12 @@ else
    $RM conftest*
 
 fi
-{ $as_echo "$as_me:${as_lineno-13370}: result: $lt_cv_prog_compiler_c_o_CXX" >&5
+{ $as_echo "$as_me:${as_lineno-13456}: result: $lt_cv_prog_compiler_c_o_CXX" >&5
 $as_echo "$lt_cv_prog_compiler_c_o_CXX" >&6; }
 
 
 
-    { $as_echo "$as_me:${as_lineno-13375}: checking if $compiler supports -c -o file.$ac_objext" >&5
+    { $as_echo "$as_me:${as_lineno-13461}: checking if $compiler supports -c -o file.$ac_objext" >&5
 $as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
 if test "${lt_cv_prog_compiler_c_o_CXX+set}" = set; then :
   $as_echo_n "(cached) " >&6
@@ -13393,11 +13479,11 @@ else
    -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:13396: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:13482: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:13400: \$? = $ac_status" >&5
+   echo "$as_me:13486: \$? = $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
@@ -13419,7 +13505,7 @@ else
    $RM conftest*
 
 fi
-{ $as_echo "$as_me:${as_lineno-13422}: result: $lt_cv_prog_compiler_c_o_CXX" >&5
+{ $as_echo "$as_me:${as_lineno-13508}: result: $lt_cv_prog_compiler_c_o_CXX" >&5
 $as_echo "$lt_cv_prog_compiler_c_o_CXX" >&6; }
 
 
@@ -13428,7 +13514,7 @@ $as_echo "$lt_cv_prog_compiler_c_o_CXX" >&6; }
 hard_links="nottested"
 if test "$lt_cv_prog_compiler_c_o_CXX" = no && test "$need_locks" != no; then
   # do not overwrite the value of need_locks provided by the user
-  { $as_echo "$as_me:${as_lineno-13431}: checking if we can lock with hard links" >&5
+  { $as_echo "$as_me:${as_lineno-13517}: checking if we can lock with hard links" >&5
 $as_echo_n "checking if we can lock with hard links... " >&6; }
   hard_links=yes
   $RM conftest*
@@ -13436,10 +13522,10 @@ $as_echo_n "checking if we can lock with hard links... " >&6; }
   touch conftest.a
   ln conftest.a conftest.b 2>&5 || hard_links=no
   ln conftest.a conftest.b 2>/dev/null && hard_links=no
-  { $as_echo "$as_me:${as_lineno-13439}: result: $hard_links" >&5
+  { $as_echo "$as_me:${as_lineno-13525}: result: $hard_links" >&5
 $as_echo "$hard_links" >&6; }
   if test "$hard_links" = no; then
-    { $as_echo "$as_me:${as_lineno-13442}: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
+    { $as_echo "$as_me:${as_lineno-13528}: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
 $as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
     need_locks=warn
   fi
@@ -13449,7 +13535,7 @@ fi
 
 
 
-    { $as_echo "$as_me:${as_lineno-13452}: checking whether the $compiler linker ($LD) supports shared libraries" >&5
+    { $as_echo "$as_me:${as_lineno-13538}: checking whether the $compiler linker ($LD) supports shared libraries" >&5
 $as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
 
   export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
@@ -13478,7 +13564,7 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
   esac
   exclude_expsyms_CXX='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
 
-{ $as_echo "$as_me:${as_lineno-13481}: result: $ld_shlibs_CXX" >&5
+{ $as_echo "$as_me:${as_lineno-13567}: result: $ld_shlibs_CXX" >&5
 $as_echo "$ld_shlibs_CXX" >&6; }
 test "$ld_shlibs_CXX" = no && can_build_shared=no
 
@@ -13506,15 +13592,15 @@ x|xyes)
       # 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.
-      { $as_echo "$as_me:${as_lineno-13509}: checking whether -lc should be explicitly linked in" >&5
+      { $as_echo "$as_me:${as_lineno-13595}: checking whether -lc should be explicitly linked in" >&5
 $as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }
       $RM conftest*
       echo "$lt_simple_compile_test_code" > conftest.$ac_ext
 
-      if { { eval echo "\"\$as_me\":${as_lineno-13514}: \"$ac_compile\""; } >&5
+      if { { eval echo "\"\$as_me\":${as_lineno-13600}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-13517}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-13603}: \$? = $ac_status" >&5
   test $ac_status = 0; } 2>conftest.err; then
         soname=conftest
         lib=conftest
@@ -13529,10 +13615,10 @@ $as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }
         libname=conftest
         lt_save_allow_undefined_flag=$allow_undefined_flag_CXX
         allow_undefined_flag_CXX=
-        if { { eval echo "\"\$as_me\":${as_lineno-13532}: \"$archive_cmds_CXX 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5
+        if { { eval echo "\"\$as_me\":${as_lineno-13618}: \"$archive_cmds_CXX 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5
   (eval $archive_cmds_CXX 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-13535}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-13621}: \$? = $ac_status" >&5
   test $ac_status = 0; }
         then
 	  archive_cmds_need_lc_CXX=no
@@ -13544,7 +13630,7 @@ $as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }
         cat conftest.err 1>&5
       fi
       $RM conftest*
-      { $as_echo "$as_me:${as_lineno-13547}: result: $archive_cmds_need_lc_CXX" >&5
+      { $as_echo "$as_me:${as_lineno-13633}: result: $archive_cmds_need_lc_CXX" >&5
 $as_echo "$archive_cmds_need_lc_CXX" >&6; }
       ;;
     esac
@@ -13615,7 +13701,7 @@ esac
 
 
 
-    { $as_echo "$as_me:${as_lineno-13618}: checking dynamic linker characteristics" >&5
+    { $as_echo "$as_me:${as_lineno-13704}: checking dynamic linker characteristics" >&5
 $as_echo_n "checking dynamic linker characteristics... " >&6; }
 
 library_names_spec=
@@ -13996,7 +14082,7 @@ main ()
   return 0;
 }
 _ACEOF
-if ac_fn_cxx_try_link "13999"; then :
+if ac_fn_cxx_try_link "14085"; then :
   if  ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then :
   shlibpath_overrides_runpath=yes
 fi
@@ -14226,7 +14312,7 @@ uts4*)
   dynamic_linker=no
   ;;
 esac
-{ $as_echo "$as_me:${as_lineno-14229}: result: $dynamic_linker" >&5
+{ $as_echo "$as_me:${as_lineno-14315}: result: $dynamic_linker" >&5
 $as_echo "$dynamic_linker" >&6; }
 test "$dynamic_linker" = no && can_build_shared=no
 
@@ -14277,7 +14363,7 @@ fi
 
 
 
-    { $as_echo "$as_me:${as_lineno-14280}: checking how to hardcode library paths into programs" >&5
+    { $as_echo "$as_me:${as_lineno-14366}: checking how to hardcode library paths into programs" >&5
 $as_echo_n "checking how to hardcode library paths into programs... " >&6; }
 hardcode_action_CXX=
 if test -n "$hardcode_libdir_flag_spec_CXX" ||
@@ -14302,7 +14388,7 @@ else
   # directories.
   hardcode_action_CXX=unsupported
 fi
-{ $as_echo "$as_me:${as_lineno-14305}: result: $hardcode_action_CXX" >&5
+{ $as_echo "$as_me:${as_lineno-14391}: result: $hardcode_action_CXX" >&5
 $as_echo "$hardcode_action_CXX" >&6; }
 
 if test "$hardcode_action_CXX" = relink ||
@@ -14345,7 +14431,7 @@ for ac_prog in flex lex
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-14348}: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-14434}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_LEX+set}" = set; then :
   $as_echo_n "(cached) " >&6
@@ -14361,7 +14447,7 @@ 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_LEX="$ac_prog"
-    $as_echo "$as_me:${as_lineno-14364}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-14450}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -14372,10 +14458,10 @@ fi
 fi
 LEX=$ac_cv_prog_LEX
 if test -n "$LEX"; then
-  { $as_echo "$as_me:${as_lineno-14375}: result: $LEX" >&5
+  { $as_echo "$as_me:${as_lineno-14461}: result: $LEX" >&5
 $as_echo "$LEX" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-14378}: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-14464}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -14409,13 +14495,13 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:${as_lineno-14412}: $ac_try_echo\""
+eval ac_try_echo="\"\$as_me:${as_lineno-14498}: $ac_try_echo\""
 $as_echo "$ac_try_echo"; } >&5
   (eval "$LEX conftest.l") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-14416}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-14502}: \$? = $ac_status" >&5
   test $ac_status = 0; }
-{ $as_echo "$as_me:${as_lineno-14418}: checking lex output file root" >&5
+{ $as_echo "$as_me:${as_lineno-14504}: checking lex output file root" >&5
 $as_echo_n "checking lex output file root... " >&6; }
 if test "${ac_cv_prog_lex_root+set}" = set; then :
   $as_echo_n "(cached) " >&6
@@ -14426,15 +14512,15 @@ if test -f lex.yy.c; then
 elif test -f lexyy.c; then
   ac_cv_prog_lex_root=lexyy
 else
-  as_fn_error "cannot find output from $LEX; giving up" "14429" 5
+  as_fn_error "cannot find output from $LEX; giving up" "14515" 5
 fi
 fi
-{ $as_echo "$as_me:${as_lineno-14432}: result: $ac_cv_prog_lex_root" >&5
+{ $as_echo "$as_me:${as_lineno-14518}: result: $ac_cv_prog_lex_root" >&5
 $as_echo "$ac_cv_prog_lex_root" >&6; }
 LEX_OUTPUT_ROOT=$ac_cv_prog_lex_root
 
 if test -z "${LEXLIB+set}"; then
-  { $as_echo "$as_me:${as_lineno-14437}: checking lex library" >&5
+  { $as_echo "$as_me:${as_lineno-14523}: checking lex library" >&5
 $as_echo_n "checking lex library... " >&6; }
 if test "${ac_cv_lib_lex+set}" = set; then :
   $as_echo_n "(cached) " >&6
@@ -14448,7 +14534,7 @@ else
 /* end confdefs.h.  */
 `cat $LEX_OUTPUT_ROOT.c`
 _ACEOF
-if ac_fn_c_try_link "14451"; then :
+if ac_fn_c_try_link "14537"; then :
   ac_cv_lib_lex=$ac_lib
 fi
 rm -f core conftest.err conftest.$ac_objext \
@@ -14458,13 +14544,13 @@ rm -f core conftest.err conftest.$ac_objext \
     LIBS=$ac_save_LIBS
 
 fi
-{ $as_echo "$as_me:${as_lineno-14461}: result: $ac_cv_lib_lex" >&5
+{ $as_echo "$as_me:${as_lineno-14547}: result: $ac_cv_lib_lex" >&5
 $as_echo "$ac_cv_lib_lex" >&6; }
   test "$ac_cv_lib_lex" != 'none needed' && LEXLIB=$ac_cv_lib_lex
 fi
 
 
-{ $as_echo "$as_me:${as_lineno-14467}: checking whether yytext is a pointer" >&5
+{ $as_echo "$as_me:${as_lineno-14553}: checking whether yytext is a pointer" >&5
 $as_echo_n "checking whether yytext is a pointer... " >&6; }
 if test "${ac_cv_prog_lex_yytext_pointer+set}" = set; then :
   $as_echo_n "(cached) " >&6
@@ -14480,7 +14566,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 #define YYTEXT_POINTER 1
 `cat $LEX_OUTPUT_ROOT.c`
 _ACEOF
-if ac_fn_c_try_link "14483"; then :
+if ac_fn_c_try_link "14569"; then :
   ac_cv_prog_lex_yytext_pointer=yes
 fi
 rm -f core conftest.err conftest.$ac_objext \
@@ -14488,7 +14574,7 @@ rm -f core conftest.err conftest.$ac_objext \
 LIBS=$ac_save_LIBS
 
 fi
-{ $as_echo "$as_me:${as_lineno-14491}: result: $ac_cv_prog_lex_yytext_pointer" >&5
+{ $as_echo "$as_me:${as_lineno-14577}: result: $ac_cv_prog_lex_yytext_pointer" >&5
 $as_echo "$ac_cv_prog_lex_yytext_pointer" >&6; }
 if test $ac_cv_prog_lex_yytext_pointer = yes; then
 
@@ -14499,13 +14585,13 @@ rm -f conftest.l $LEX_OUTPUT_ROOT.c
 
 fi   # LEX,LEXLIB = "flex","-lfl" or "lex","-ll"
 if test "$LEX" = :; then
-  as_fn_error "Cannot find lex. Aborting." "14502" 5
+  as_fn_error "Cannot find lex. Aborting." "14588" 5
 fi
 for ac_prog in 'bison -y' byacc
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-14508}: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-14594}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_YACC+set}" = set; then :
   $as_echo_n "(cached) " >&6
@@ -14521,7 +14607,7 @@ 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_YACC="$ac_prog"
-    $as_echo "$as_me:${as_lineno-14524}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-14610}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -14532,10 +14618,10 @@ fi
 fi
 YACC=$ac_cv_prog_YACC
 if test -n "$YACC"; then
-  { $as_echo "$as_me:${as_lineno-14535}: result: $YACC" >&5
+  { $as_echo "$as_me:${as_lineno-14621}: result: $YACC" >&5
 $as_echo "$YACC" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-14538}: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-14624}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -14545,14 +14631,14 @@ done
 test -n "$YACC" || YACC="yacc"
   # YACC = "bison -y" or "byacc" or "yacc"
 if test "$YACC" = "yacc"; then
-  as_fn_error "Cannot find yacc. Aborting." "14548" 5
+  as_fn_error "Cannot find yacc. Aborting." "14634" 5
 fi
 
 ###############################################################################
 ##  Check for libraries, headers, defs needed at build time                  ##
 ###############################################################################
 
-{ $as_echo "$as_me:${as_lineno-14555}: checking for cos in -lm" >&5
+{ $as_echo "$as_me:${as_lineno-14641}: checking for cos in -lm" >&5
 $as_echo_n "checking for cos in -lm... " >&6; }
 if test "${ac_cv_lib_m_cos+set}" = set; then :
   $as_echo_n "(cached) " >&6
@@ -14577,7 +14663,7 @@ return cos ();
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "14580"; then :
+if ac_fn_c_try_link "14666"; then :
   ac_cv_lib_m_cos=yes
 else
   ac_cv_lib_m_cos=no
@@ -14586,7 +14672,7 @@ 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-14589}: result: $ac_cv_lib_m_cos" >&5
+{ $as_echo "$as_me:${as_lineno-14675}: result: $ac_cv_lib_m_cos" >&5
 $as_echo "$ac_cv_lib_m_cos" >&6; }
 if test "x$ac_cv_lib_m_cos" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
@@ -14596,10 +14682,10 @@ _ACEOF
   LIBS="-lm $LIBS"
 
 else
-  as_fn_error "libm not found or corrupted" "14599" 5
+  as_fn_error "libm not found or corrupted" "14685" 5
 fi
 
-{ $as_echo "$as_me:${as_lineno-14602}: checking for cblas_dgemm in -lgslcblas" >&5
+{ $as_echo "$as_me:${as_lineno-14688}: checking for cblas_dgemm in -lgslcblas" >&5
 $as_echo_n "checking for cblas_dgemm in -lgslcblas... " >&6; }
 if test "${ac_cv_lib_gslcblas_cblas_dgemm+set}" = set; then :
   $as_echo_n "(cached) " >&6
@@ -14624,7 +14710,7 @@ return cblas_dgemm ();
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "14627"; then :
+if ac_fn_c_try_link "14713"; then :
   ac_cv_lib_gslcblas_cblas_dgemm=yes
 else
   ac_cv_lib_gslcblas_cblas_dgemm=no
@@ -14633,7 +14719,7 @@ 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-14636}: result: $ac_cv_lib_gslcblas_cblas_dgemm" >&5
+{ $as_echo "$as_me:${as_lineno-14722}: result: $ac_cv_lib_gslcblas_cblas_dgemm" >&5
 $as_echo "$ac_cv_lib_gslcblas_cblas_dgemm" >&6; }
 if test "x$ac_cv_lib_gslcblas_cblas_dgemm" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
@@ -14643,10 +14729,10 @@ _ACEOF
   LIBS="-lgslcblas $LIBS"
 
 else
-  as_fn_error "libgslcblas not found or out of sync" "14646" 5
+  as_fn_error "libgslcblas not found or out of sync" "14732" 5
 fi
 
-{ $as_echo "$as_me:${as_lineno-14649}: checking for gsl_blas_dgemm in -lgsl" >&5
+{ $as_echo "$as_me:${as_lineno-14735}: checking for gsl_blas_dgemm in -lgsl" >&5
 $as_echo_n "checking for gsl_blas_dgemm in -lgsl... " >&6; }
 if test "${ac_cv_lib_gsl_gsl_blas_dgemm+set}" = set; then :
   $as_echo_n "(cached) " >&6
@@ -14671,7 +14757,7 @@ return gsl_blas_dgemm ();
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "14674"; then :
+if ac_fn_c_try_link "14760"; then :
   ac_cv_lib_gsl_gsl_blas_dgemm=yes
 else
   ac_cv_lib_gsl_gsl_blas_dgemm=no
@@ -14680,7 +14766,7 @@ 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-14683}: result: $ac_cv_lib_gsl_gsl_blas_dgemm" >&5
+{ $as_echo "$as_me:${as_lineno-14769}: result: $ac_cv_lib_gsl_gsl_blas_dgemm" >&5
 $as_echo "$ac_cv_lib_gsl_gsl_blas_dgemm" >&6; }
 if test "x$ac_cv_lib_gsl_gsl_blas_dgemm" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
@@ -14690,10 +14776,10 @@ _ACEOF
   LIBS="-lgsl $LIBS"
 
 else
-  as_fn_error "libgsl not found or out of sync" "14693" 5
+  as_fn_error "libgsl not found or out of sync" "14779" 5
 fi
 
-{ $as_echo "$as_me:${as_lineno-14696}: checking for fftw_plan_r2r_1d in -lfftw3" >&5
+{ $as_echo "$as_me:${as_lineno-14782}: checking for fftw_plan_r2r_1d in -lfftw3" >&5
 $as_echo_n "checking for fftw_plan_r2r_1d in -lfftw3... " >&6; }
 if test "${ac_cv_lib_fftw3_fftw_plan_r2r_1d+set}" = set; then :
   $as_echo_n "(cached) " >&6
@@ -14718,7 +14804,7 @@ return fftw_plan_r2r_1d ();
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "14721"; then :
+if ac_fn_c_try_link "14807"; then :
   ac_cv_lib_fftw3_fftw_plan_r2r_1d=yes
 else
   ac_cv_lib_fftw3_fftw_plan_r2r_1d=no
@@ -14727,7 +14813,7 @@ 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-14730}: result: $ac_cv_lib_fftw3_fftw_plan_r2r_1d" >&5
+{ $as_echo "$as_me:${as_lineno-14816}: result: $ac_cv_lib_fftw3_fftw_plan_r2r_1d" >&5
 $as_echo "$ac_cv_lib_fftw3_fftw_plan_r2r_1d" >&6; }
 if test "x$ac_cv_lib_fftw3_fftw_plan_r2r_1d" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
@@ -14737,10 +14823,10 @@ _ACEOF
   LIBS="-lfftw3 $LIBS"
 
 else
-  as_fn_error "libfftw not found or out of sync" "14740" 5
+  as_fn_error "libfftw not found or out of sync" "14826" 5
 fi
 
-{ $as_echo "$as_me:${as_lineno-14743}: checking for readline in -lreadline" >&5
+{ $as_echo "$as_me:${as_lineno-14829}: checking for readline in -lreadline" >&5
 $as_echo_n "checking for readline in -lreadline... " >&6; }
 if test "${ac_cv_lib_readline_readline+set}" = set; then :
   $as_echo_n "(cached) " >&6
@@ -14765,7 +14851,7 @@ return readline ();
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "14768"; then :
+if ac_fn_c_try_link "14854"; then :
   ac_cv_lib_readline_readline=yes
 else
   ac_cv_lib_readline_readline=no
@@ -14774,7 +14860,7 @@ 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-14777}: result: $ac_cv_lib_readline_readline" >&5
+{ $as_echo "$as_me:${as_lineno-14863}: result: $ac_cv_lib_readline_readline" >&5
 $as_echo "$ac_cv_lib_readline_readline" >&6; }
 if test "x$ac_cv_lib_readline_readline" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
@@ -14784,10 +14870,10 @@ _ACEOF
   LIBS="-lreadline $LIBS"
 
 else
-  as_fn_error "libreadline not found or corrupted" "14787" 5
+  as_fn_error "libreadline not found or corrupted" "14873" 5
 fi
 
-{ $as_echo "$as_me:${as_lineno-14790}: checking for using_history in -lhistory" >&5
+{ $as_echo "$as_me:${as_lineno-14876}: checking for using_history in -lhistory" >&5
 $as_echo_n "checking for using_history in -lhistory... " >&6; }
 if test "${ac_cv_lib_history_using_history+set}" = set; then :
   $as_echo_n "(cached) " >&6
@@ -14812,7 +14898,7 @@ return using_history ();
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "14815"; then :
+if ac_fn_c_try_link "14901"; then :
   ac_cv_lib_history_using_history=yes
 else
   ac_cv_lib_history_using_history=no
@@ -14821,7 +14907,7 @@ 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-14824}: result: $ac_cv_lib_history_using_history" >&5
+{ $as_echo "$as_me:${as_lineno-14910}: result: $ac_cv_lib_history_using_history" >&5
 $as_echo "$ac_cv_lib_history_using_history" >&6; }
 if test "x$ac_cv_lib_history_using_history" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
@@ -14831,10 +14917,10 @@ _ACEOF
   LIBS="-lhistory $LIBS"
 
 else
-  as_fn_error "libhistory not found or corrupted" "14834" 5
+  as_fn_error "libhistory not found or corrupted" "14920" 5
 fi
 
-{ $as_echo "$as_me:${as_lineno-14837}: checking for yaml_parser_set_input_file in -lyaml" >&5
+{ $as_echo "$as_me:${as_lineno-14923}: checking for yaml_parser_set_input_file in -lyaml" >&5
 $as_echo_n "checking for yaml_parser_set_input_file in -lyaml... " >&6; }
 if test "${ac_cv_lib_yaml_yaml_parser_set_input_file+set}" = set; then :
   $as_echo_n "(cached) " >&6
@@ -14859,7 +14945,7 @@ return yaml_parser_set_input_file ();
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "14862"; then :
+if ac_fn_c_try_link "14948"; then :
   ac_cv_lib_yaml_yaml_parser_set_input_file=yes
 else
   ac_cv_lib_yaml_yaml_parser_set_input_file=no
@@ -14868,7 +14954,7 @@ 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-14871}: result: $ac_cv_lib_yaml_yaml_parser_set_input_file" >&5
+{ $as_echo "$as_me:${as_lineno-14957}: result: $ac_cv_lib_yaml_yaml_parser_set_input_file" >&5
 $as_echo "$ac_cv_lib_yaml_yaml_parser_set_input_file" >&6; }
 if test "x$ac_cv_lib_yaml_yaml_parser_set_input_file" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
@@ -14878,11 +14964,11 @@ _ACEOF
   LIBS="-lyaml $LIBS"
 
 else
-  as_fn_error "libyaml not found por out of sync" "14881" 5
+  as_fn_error "libyaml not found por out of sync" "14967" 5
 fi
 
 
-{ $as_echo "$as_me:${as_lineno-14885}: checking for lm_minimize in -llmmin" >&5
+{ $as_echo "$as_me:${as_lineno-14971}: checking for lm_minimize in -llmmin" >&5
 $as_echo_n "checking for lm_minimize in -llmmin... " >&6; }
 if test "${ac_cv_lib_lmmin_lm_minimize+set}" = set; then :
   $as_echo_n "(cached) " >&6
@@ -14907,7 +14993,7 @@ return lm_minimize ();
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "14910"; then :
+if ac_fn_c_try_link "14996"; then :
   ac_cv_lib_lmmin_lm_minimize=yes
 else
   ac_cv_lib_lmmin_lm_minimize=no
@@ -14916,7 +15002,7 @@ 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-14919}: result: $ac_cv_lib_lmmin_lm_minimize" >&5
+{ $as_echo "$as_me:${as_lineno-15005}: result: $ac_cv_lib_lmmin_lm_minimize" >&5
 $as_echo "$ac_cv_lib_lmmin_lm_minimize" >&6; }
 if test "x$ac_cv_lib_lmmin_lm_minimize" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
@@ -14926,7 +15012,7 @@ _ACEOF
   LIBS="-llmmin $LIBS"
 
 else
-  as_fn_error "liblmmin not found por out of sync" "14929" 5
+  as_fn_error "liblmmin not found por out of sync" "15015" 5
 fi
 
 
@@ -14938,7 +15024,7 @@ $as_echo "#define _FILE_OFFSET_BITS 64" >>confdefs.h
 
 # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
 # for constant arguments.  Useless!
-{ $as_echo "$as_me:${as_lineno-14941}: checking for working alloca.h" >&5
+{ $as_echo "$as_me:${as_lineno-15027}: checking for working alloca.h" >&5
 $as_echo_n "checking for working alloca.h... " >&6; }
 if test "${ac_cv_working_alloca_h+set}" = set; then :
   $as_echo_n "(cached) " >&6
@@ -14955,7 +15041,7 @@ char *p = (char *) alloca (2 * sizeof (int));
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "14958"; then :
+if ac_fn_c_try_link "15044"; then :
   ac_cv_working_alloca_h=yes
 else
   ac_cv_working_alloca_h=no
@@ -14963,7 +15049,7 @@ fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
 fi
-{ $as_echo "$as_me:${as_lineno-14966}: result: $ac_cv_working_alloca_h" >&5
+{ $as_echo "$as_me:${as_lineno-15052}: result: $ac_cv_working_alloca_h" >&5
 $as_echo "$ac_cv_working_alloca_h" >&6; }
 if test $ac_cv_working_alloca_h = yes; then
 
@@ -14971,7 +15057,7 @@ $as_echo "#define HAVE_ALLOCA_H 1" >>confdefs.h
 
 fi
 
-{ $as_echo "$as_me:${as_lineno-14974}: checking for alloca" >&5
+{ $as_echo "$as_me:${as_lineno-15060}: checking for alloca" >&5
 $as_echo_n "checking for alloca... " >&6; }
 if test "${ac_cv_func_alloca_works+set}" = set; then :
   $as_echo_n "(cached) " >&6
@@ -15008,7 +15094,7 @@ char *p = (char *) alloca (1);
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "15011"; then :
+if ac_fn_c_try_link "15097"; then :
   ac_cv_func_alloca_works=yes
 else
   ac_cv_func_alloca_works=no
@@ -15016,7 +15102,7 @@ fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
 fi
-{ $as_echo "$as_me:${as_lineno-15019}: result: $ac_cv_func_alloca_works" >&5
+{ $as_echo "$as_me:${as_lineno-15105}: result: $ac_cv_func_alloca_works" >&5
 $as_echo "$ac_cv_func_alloca_works" >&6; }
 
 if test $ac_cv_func_alloca_works = yes; then
@@ -15034,7 +15120,7 @@ ALLOCA=\${LIBOBJDIR}alloca.$ac_objext
 $as_echo "#define C_ALLOCA 1" >>confdefs.h
 
 
-{ $as_echo "$as_me:${as_lineno-15037}: checking whether \`alloca.c' needs Cray hooks" >&5
+{ $as_echo "$as_me:${as_lineno-15123}: checking whether \`alloca.c' needs Cray hooks" >&5
 $as_echo_n "checking whether \`alloca.c' needs Cray hooks... " >&6; }
 if test "${ac_cv_os_cray+set}" = set; then :
   $as_echo_n "(cached) " >&6
@@ -15057,12 +15143,12 @@ fi
 rm -f conftest*
 
 fi
-{ $as_echo "$as_me:${as_lineno-15060}: result: $ac_cv_os_cray" >&5
+{ $as_echo "$as_me:${as_lineno-15146}: result: $ac_cv_os_cray" >&5
 $as_echo "$ac_cv_os_cray" >&6; }
 if test $ac_cv_os_cray = yes; then
   for ac_func in _getb67 GETB67 getb67; do
     as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-ac_fn_c_check_func "15065" "$ac_func" "$as_ac_var"
+ac_fn_c_check_func "15151" "$ac_func" "$as_ac_var"
 eval as_val=\$$as_ac_var
    if test "x$as_val" = x""yes; then :
 
@@ -15076,7 +15162,7 @@ fi
   done
 fi
 
-{ $as_echo "$as_me:${as_lineno-15079}: checking stack direction for C alloca" >&5
+{ $as_echo "$as_me:${as_lineno-15165}: checking stack direction for C alloca" >&5
 $as_echo_n "checking stack direction for C alloca... " >&6; }
 if test "${ac_cv_c_stack_direction+set}" = set; then :
   $as_echo_n "(cached) " >&6
@@ -15107,7 +15193,7 @@ main ()
   return find_stack_direction () < 0;
 }
 _ACEOF
-if ac_fn_c_try_run "15110"; then :
+if ac_fn_c_try_run "15196"; then :
   ac_cv_c_stack_direction=1
 else
   ac_cv_c_stack_direction=-1
@@ -15117,7 +15203,7 @@ rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
 fi
 
 fi
-{ $as_echo "$as_me:${as_lineno-15120}: result: $ac_cv_c_stack_direction" >&5
+{ $as_echo "$as_me:${as_lineno-15206}: result: $ac_cv_c_stack_direction" >&5
 $as_echo "$ac_cv_c_stack_direction" >&6; }
 cat >>confdefs.h <<_ACEOF
 #define STACK_DIRECTION $ac_cv_c_stack_direction
@@ -15126,7 +15212,7 @@ _ACEOF
 
 fi
 
-{ $as_echo "$as_me:${as_lineno-15129}: checking for ANSI C header files" >&5
+{ $as_echo "$as_me:${as_lineno-15215}: checking for ANSI C header files" >&5
 $as_echo_n "checking for ANSI C header files... " >&6; }
 if test "${ac_cv_header_stdc+set}" = set; then :
   $as_echo_n "(cached) " >&6
@@ -15146,7 +15232,7 @@ main ()
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "15149"; then :
+if ac_fn_c_try_compile "15235"; then :
   ac_cv_header_stdc=yes
 else
   ac_cv_header_stdc=no
@@ -15219,7 +15305,7 @@ main ()
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_run "15222"; then :
+if ac_fn_c_try_run "15308"; then :
 
 else
   ac_cv_header_stdc=no
@@ -15230,7 +15316,7 @@ fi
 
 fi
 fi
-{ $as_echo "$as_me:${as_lineno-15233}: result: $ac_cv_header_stdc" >&5
+{ $as_echo "$as_me:${as_lineno-15319}: result: $ac_cv_header_stdc" >&5
 $as_echo "$ac_cv_header_stdc" >&6; }
 if test $ac_cv_header_stdc = yes; then
 
@@ -15241,7 +15327,7 @@ fi
 for ac_header in fcntl.h inttypes.h libintl.h malloc.h stddef.h stdlib.h string.h sys/time.h unistd.h
 do :
   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-ac_fn_c_check_header_mongrel "15244" "$ac_header" "$as_ac_Header" "$ac_includes_default"
+ac_fn_c_check_header_mongrel "15330" "$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
@@ -15258,7 +15344,7 @@ done
 #	[AC_MSG_ERROR(boost/shared_ptr.hpp not found)])
 
 # Checks for typedefs, structures, and compiler characteristics
-{ $as_echo "$as_me:${as_lineno-15261}: checking for stdbool.h that conforms to C99" >&5
+{ $as_echo "$as_me:${as_lineno-15347}: checking for stdbool.h that conforms to C99" >&5
 $as_echo_n "checking for stdbool.h that conforms to C99... " >&6; }
 if test "${ac_cv_header_stdbool_h+set}" = set; then :
   $as_echo_n "(cached) " >&6
@@ -15343,16 +15429,16 @@ main ()
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "15346"; then :
+if ac_fn_c_try_compile "15432"; then :
   ac_cv_header_stdbool_h=yes
 else
   ac_cv_header_stdbool_h=no
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ $as_echo "$as_me:${as_lineno-15353}: result: $ac_cv_header_stdbool_h" >&5
+{ $as_echo "$as_me:${as_lineno-15439}: result: $ac_cv_header_stdbool_h" >&5
 $as_echo "$ac_cv_header_stdbool_h" >&6; }
-ac_fn_c_check_type "15355" "_Bool" "ac_cv_type__Bool" "$ac_includes_default"
+ac_fn_c_check_type "15441" "_Bool" "ac_cv_type__Bool" "$ac_includes_default"
 if test "x$ac_cv_type__Bool" = x""yes; then :
 
 cat >>confdefs.h <<_ACEOF
@@ -15368,7 +15454,7 @@ $as_echo "#define HAVE_STDBOOL_H 1" >>confdefs.h
 
 fi
 
-{ $as_echo "$as_me:${as_lineno-15371}: checking for an ANSI C-conforming const" >&5
+{ $as_echo "$as_me:${as_lineno-15457}: checking for an ANSI C-conforming const" >&5
 $as_echo_n "checking for an ANSI C-conforming const... " >&6; }
 if test "${ac_cv_c_const+set}" = set; then :
   $as_echo_n "(cached) " >&6
@@ -15433,14 +15519,14 @@ main ()
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "15436"; then :
+if ac_fn_c_try_compile "15522"; then :
   ac_cv_c_const=yes
 else
   ac_cv_c_const=no
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ $as_echo "$as_me:${as_lineno-15443}: result: $ac_cv_c_const" >&5
+{ $as_echo "$as_me:${as_lineno-15529}: result: $ac_cv_c_const" >&5
 $as_echo "$ac_cv_c_const" >&6; }
 if test $ac_cv_c_const = no; then
 
@@ -15448,7 +15534,7 @@ $as_echo "#define const /**/" >>confdefs.h
 
 fi
 
-{ $as_echo "$as_me:${as_lineno-15451}: checking for inline" >&5
+{ $as_echo "$as_me:${as_lineno-15537}: 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
@@ -15464,7 +15550,7 @@ $ac_kw foo_t foo () {return 0; }
 #endif
 
 _ACEOF
-if ac_fn_c_try_compile "15467"; then :
+if ac_fn_c_try_compile "15553"; then :
   ac_cv_c_inline=$ac_kw
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
@@ -15472,7 +15558,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 done
 
 fi
-{ $as_echo "$as_me:${as_lineno-15475}: result: $ac_cv_c_inline" >&5
+{ $as_echo "$as_me:${as_lineno-15561}: result: $ac_cv_c_inline" >&5
 $as_echo "$ac_cv_c_inline" >&6; }
 
 case $ac_cv_c_inline in
@@ -15490,7 +15576,7 @@ _ACEOF
     ;;
 esac
 
-ac_fn_c_find_intX_t "15493" "16" "ac_cv_c_int16_t"
+ac_fn_c_find_intX_t "15579" "16" "ac_cv_c_int16_t"
 case $ac_cv_c_int16_t in #(
   no|yes) ;; #(
   *)
@@ -15501,7 +15587,7 @@ _ACEOF
 ;;
 esac
 
-ac_fn_c_find_intX_t "15504" "32" "ac_cv_c_int32_t"
+ac_fn_c_find_intX_t "15590" "32" "ac_cv_c_int32_t"
 case $ac_cv_c_int32_t in #(
   no|yes) ;; #(
   *)
@@ -15512,7 +15598,7 @@ _ACEOF
 ;;
 esac
 
-ac_fn_c_find_intX_t "15515" "8" "ac_cv_c_int8_t"
+ac_fn_c_find_intX_t "15601" "8" "ac_cv_c_int8_t"
 case $ac_cv_c_int8_t in #(
   no|yes) ;; #(
   *)
@@ -15523,7 +15609,7 @@ _ACEOF
 ;;
 esac
 
-ac_fn_c_check_type "15526" "size_t" "ac_cv_type_size_t" "$ac_includes_default"
+ac_fn_c_check_type "15612" "size_t" "ac_cv_type_size_t" "$ac_includes_default"
 if test "x$ac_cv_type_size_t" = x""yes; then :
 
 else
@@ -15534,7 +15620,7 @@ _ACEOF
 
 fi
 
-{ $as_echo "$as_me:${as_lineno-15537}: checking whether time.h and sys/time.h may both be included" >&5
+{ $as_echo "$as_me:${as_lineno-15623}: 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
@@ -15554,14 +15640,14 @@ return 0;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "15557"; then :
+if ac_fn_c_try_compile "15643"; then :
   ac_cv_header_time=yes
 else
   ac_cv_header_time=no
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ $as_echo "$as_me:${as_lineno-15564}: result: $ac_cv_header_time" >&5
+{ $as_echo "$as_me:${as_lineno-15650}: result: $ac_cv_header_time" >&5
 $as_echo "$ac_cv_header_time" >&6; }
 if test $ac_cv_header_time = yes; then
 
@@ -15569,7 +15655,7 @@ $as_echo "#define TIME_WITH_SYS_TIME 1" >>confdefs.h
 
 fi
 
-{ $as_echo "$as_me:${as_lineno-15572}: checking whether struct tm is in sys/time.h or time.h" >&5
+{ $as_echo "$as_me:${as_lineno-15658}: checking whether struct tm is in sys/time.h or time.h" >&5
 $as_echo_n "checking whether struct tm is in sys/time.h or time.h... " >&6; }
 if test "${ac_cv_struct_tm+set}" = set; then :
   $as_echo_n "(cached) " >&6
@@ -15589,14 +15675,14 @@ struct tm tm;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "15592"; then :
+if ac_fn_c_try_compile "15678"; then :
   ac_cv_struct_tm=time.h
 else
   ac_cv_struct_tm=sys/time.h
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ $as_echo "$as_me:${as_lineno-15599}: result: $ac_cv_struct_tm" >&5
+{ $as_echo "$as_me:${as_lineno-15685}: result: $ac_cv_struct_tm" >&5
 $as_echo "$ac_cv_struct_tm" >&6; }
 if test $ac_cv_struct_tm = sys/time.h; then
 
@@ -15608,7 +15694,7 @@ fi
 # Checks for library functions
 for ac_header in stdlib.h
 do :
-  ac_fn_c_check_header_mongrel "15611" "stdlib.h" "ac_cv_header_stdlib_h" "$ac_includes_default"
+  ac_fn_c_check_header_mongrel "15697" "stdlib.h" "ac_cv_header_stdlib_h" "$ac_includes_default"
 if test "x$ac_cv_header_stdlib_h" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_STDLIB_H 1
@@ -15618,7 +15704,7 @@ fi
 
 done
 
-{ $as_echo "$as_me:${as_lineno-15621}: checking for GNU libc compatible malloc" >&5
+{ $as_echo "$as_me:${as_lineno-15707}: checking for GNU libc compatible malloc" >&5
 $as_echo_n "checking for GNU libc compatible malloc... " >&6; }
 if test "${ac_cv_func_malloc_0_nonnull+set}" = set; then :
   $as_echo_n "(cached) " >&6
@@ -15642,7 +15728,7 @@ return ! malloc (0);
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_run "15645"; then :
+if ac_fn_c_try_run "15731"; then :
   ac_cv_func_malloc_0_nonnull=yes
 else
   ac_cv_func_malloc_0_nonnull=no
@@ -15652,7 +15738,7 @@ rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
 fi
 
 fi
-{ $as_echo "$as_me:${as_lineno-15655}: result: $ac_cv_func_malloc_0_nonnull" >&5
+{ $as_echo "$as_me:${as_lineno-15741}: result: $ac_cv_func_malloc_0_nonnull" >&5
 $as_echo "$ac_cv_func_malloc_0_nonnull" >&6; }
 if test $ac_cv_func_malloc_0_nonnull = yes; then :
 
@@ -15679,7 +15765,7 @@ 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 "15682" "$ac_header" "$as_ac_Header" "$ac_includes_default
+ac_fn_c_check_header_compile "15768" "$ac_header" "$as_ac_Header" "$ac_includes_default
 "
 eval as_val=\$$as_ac_Header
    if test "x$as_val" = x""yes; then :
@@ -15701,7 +15787,7 @@ done
   for ac_func in $ac_func_list
 do :
   as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-ac_fn_c_check_func "15704" "$ac_func" "$as_ac_var"
+ac_fn_c_check_func "15790" "$ac_func" "$as_ac_var"
 eval as_val=\$$as_ac_var
    if test "x$as_val" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
@@ -15715,7 +15801,7 @@ done
 
 
 
-{ $as_echo "$as_me:${as_lineno-15718}: checking for working mktime" >&5
+{ $as_echo "$as_me:${as_lineno-15804}: checking for working mktime" >&5
 $as_echo_n "checking for working mktime... " >&6; }
 if test "${ac_cv_func_working_mktime+set}" = set; then :
   $as_echo_n "(cached) " >&6
@@ -15920,7 +16006,7 @@ main ()
   return ! (irix_6_4_bug () && spring_forward_gap () && year_2050_test ());
 }
 _ACEOF
-if ac_fn_c_try_run "15923"; then :
+if ac_fn_c_try_run "16009"; then :
   ac_cv_func_working_mktime=yes
 else
   ac_cv_func_working_mktime=no
@@ -15930,7 +16016,7 @@ rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
 fi
 
 fi
-{ $as_echo "$as_me:${as_lineno-15933}: result: $ac_cv_func_working_mktime" >&5
+{ $as_echo "$as_me:${as_lineno-16019}: 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
@@ -15943,7 +16029,7 @@ fi
 
 for ac_header in stdlib.h
 do :
-  ac_fn_c_check_header_mongrel "15946" "stdlib.h" "ac_cv_header_stdlib_h" "$ac_includes_default"
+  ac_fn_c_check_header_mongrel "16032" "stdlib.h" "ac_cv_header_stdlib_h" "$ac_includes_default"
 if test "x$ac_cv_header_stdlib_h" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_STDLIB_H 1
@@ -15953,7 +16039,7 @@ fi
 
 done
 
-{ $as_echo "$as_me:${as_lineno-15956}: checking for GNU libc compatible realloc" >&5
+{ $as_echo "$as_me:${as_lineno-16042}: checking for GNU libc compatible realloc" >&5
 $as_echo_n "checking for GNU libc compatible realloc... " >&6; }
 if test "${ac_cv_func_realloc_0_nonnull+set}" = set; then :
   $as_echo_n "(cached) " >&6
@@ -15977,7 +16063,7 @@ return ! realloc (0, 0);
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_run "15980"; then :
+if ac_fn_c_try_run "16066"; then :
   ac_cv_func_realloc_0_nonnull=yes
 else
   ac_cv_func_realloc_0_nonnull=no
@@ -15987,7 +16073,7 @@ rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
 fi
 
 fi
-{ $as_echo "$as_me:${as_lineno-15990}: result: $ac_cv_func_realloc_0_nonnull" >&5
+{ $as_echo "$as_me:${as_lineno-16076}: result: $ac_cv_func_realloc_0_nonnull" >&5
 $as_echo "$ac_cv_func_realloc_0_nonnull" >&6; }
 if test $ac_cv_func_realloc_0_nonnull = yes; then :
 
@@ -16010,7 +16096,7 @@ fi
 
 for ac_func in strftime
 do :
-  ac_fn_c_check_func "16013" "strftime" "ac_cv_func_strftime"
+  ac_fn_c_check_func "16099" "strftime" "ac_cv_func_strftime"
 if test "x$ac_cv_func_strftime" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_STRFTIME 1
@@ -16018,7 +16104,7 @@ _ACEOF
 
 else
   # strftime is in -lintl on SCO UNIX.
-{ $as_echo "$as_me:${as_lineno-16021}: checking for strftime in -lintl" >&5
+{ $as_echo "$as_me:${as_lineno-16107}: checking for strftime in -lintl" >&5
 $as_echo_n "checking for strftime in -lintl... " >&6; }
 if test "${ac_cv_lib_intl_strftime+set}" = set; then :
   $as_echo_n "(cached) " >&6
@@ -16043,7 +16129,7 @@ return strftime ();
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "16046"; then :
+if ac_fn_c_try_link "16132"; then :
   ac_cv_lib_intl_strftime=yes
 else
   ac_cv_lib_intl_strftime=no
@@ -16052,7 +16138,7 @@ 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-16055}: result: $ac_cv_lib_intl_strftime" >&5
+{ $as_echo "$as_me:${as_lineno-16141}: result: $ac_cv_lib_intl_strftime" >&5
 $as_echo "$ac_cv_lib_intl_strftime" >&6; }
 if test "x$ac_cv_lib_intl_strftime" = x""yes; then :
   $as_echo "#define HAVE_STRFTIME 1" >>confdefs.h
@@ -16066,7 +16152,7 @@ done
 for ac_func in floor gettimeofday memset mkfifo modf pow sqrt strchr strspn
 do :
   as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-ac_fn_c_check_func "16069" "$ac_func" "$as_ac_var"
+ac_fn_c_check_func "16155" "$ac_func" "$as_ac_var"
 eval as_val=\$$as_ac_var
    if test "x$as_val" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
@@ -16085,7 +16171,7 @@ for ac_prog in gnuplot
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-16088}: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-16174}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_GNUPLOT+set}" = set; then :
   $as_echo_n "(cached) " >&6
@@ -16101,7 +16187,7 @@ 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_GNUPLOT="$ac_prog"
-    $as_echo "$as_me:${as_lineno-16104}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-16190}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -16112,10 +16198,10 @@ fi
 fi
 GNUPLOT=$ac_cv_prog_GNUPLOT
 if test -n "$GNUPLOT"; then
-  { $as_echo "$as_me:${as_lineno-16115}: result: $GNUPLOT" >&5
+  { $as_echo "$as_me:${as_lineno-16201}: result: $GNUPLOT" >&5
 $as_echo "$GNUPLOT" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-16118}: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-16204}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -16125,7 +16211,7 @@ done
 test -n "$GNUPLOT" || GNUPLOT=":"
 
 if test "$GNUPLOT" = :; then
-  as_fn_error "Cannot find gnuplot. Aborting." "16128" 5
+  as_fn_error "Cannot find gnuplot. Aborting." "16214" 5
 fi
 
 ###############################################################################
@@ -16168,7 +16254,7 @@ _ACEOF
     case $ac_val in #(
     *${as_nl}*)
       case $ac_var in #(
-      *_cv_*) { $as_echo "$as_me:${as_lineno-16171}: WARNING: cache variable $ac_var contains a newline" >&5
+      *_cv_*) { $as_echo "$as_me:${as_lineno-16257}: WARNING: cache variable $ac_var contains a newline" >&5
 $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
       esac
       case $ac_var in #(
@@ -16206,11 +16292,11 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
 if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
   if test -w "$cache_file"; then
     test "x$cache_file" != "x/dev/null" &&
-      { $as_echo "$as_me:${as_lineno-16209}: updating cache $cache_file" >&5
+      { $as_echo "$as_me:${as_lineno-16295}: updating cache $cache_file" >&5
 $as_echo "$as_me: updating cache $cache_file" >&6;}
     cat confcache >$cache_file
   else
-    { $as_echo "$as_me:${as_lineno-16213}: not updating unwritable cache $cache_file" >&5
+    { $as_echo "$as_me:${as_lineno-16299}: not updating unwritable cache $cache_file" >&5
 $as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
   fi
 fi
@@ -16238,28 +16324,36 @@ 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
+
 if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
   as_fn_error "conditional \"AMDEP\" was never defined.
-Usually this means the macro was only invoked conditionally." "16243" 5
+Usually this means the macro was only invoked conditionally." "16337" 5
 fi
 if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
   as_fn_error "conditional \"am__fastdepCC\" was never defined.
-Usually this means the macro was only invoked conditionally." "16247" 5
+Usually this means the macro was only invoked conditionally." "16341" 5
 fi
 if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then
   as_fn_error "conditional \"am__fastdepCXX\" was never defined.
-Usually this means the macro was only invoked conditionally." "16251" 5
+Usually this means the macro was only invoked conditionally." "16345" 5
 fi
 if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then
   as_fn_error "conditional \"am__fastdepCXX\" was never defined.
-Usually this means the macro was only invoked conditionally." "16255" 5
+Usually this means the macro was only invoked conditionally." "16349" 5
 fi
 
 : ${CONFIG_STATUS=./config.status}
 ac_write_fail=0
 ac_clean_files_save=$ac_clean_files
 ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ $as_echo "$as_me:${as_lineno-16262}: creating $CONFIG_STATUS" >&5
+{ $as_echo "$as_me:${as_lineno-16356}: creating $CONFIG_STATUS" >&5
 $as_echo "$as_me: creating $CONFIG_STATUS" >&6;}
 as_write_fail=0
 cat >$CONFIG_STATUS <<_ASEOF || as_write_fail=1
@@ -16411,7 +16505,7 @@ as_fn_error ()
   as_status=$?; test $as_status -eq 0 && as_status=1
   if test "$3"; then
     as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-    $as_echo "$as_me:${as_lineno-16414}: error: $1" >&$3
+    $as_echo "$as_me:${as_lineno-16508}: error: $1" >&$3
   fi
   $as_echo "$as_me: error: $1" >&2
   as_fn_exit $as_status
@@ -17204,7 +17298,7 @@ do
     "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
     "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
 
-  *) as_fn_error "invalid argument: \`$ac_config_target'" "17207" 5;;
+  *) as_fn_error "invalid argument: \`$ac_config_target'" "17301" 5;;
   esac
 done
 
@@ -17242,7 +17336,7 @@ $debug ||
 {
   tmp=./conf$$-$RANDOM
   (umask 077 && mkdir "$tmp")
-} || as_fn_error "cannot create a temporary directory in ." "17245" 5
+} || as_fn_error "cannot create a temporary directory in ." "17339" 5
 
 # Set up the scripts for CONFIG_FILES section.
 # No need to generate them if there are no CONFIG_FILES.
@@ -17273,18 +17367,18 @@ _ACEOF
   echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
   echo "_ACEOF"
 } >conf$$subs.sh ||
-  as_fn_error "could not make $CONFIG_STATUS" "17276" 5
+  as_fn_error "could not make $CONFIG_STATUS" "17370" 5
 ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'`
 ac_delim='%!_!# '
 for ac_last_try in false false false false false :; do
   . ./conf$$subs.sh ||
-    as_fn_error "could not make $CONFIG_STATUS" "17281" 5
+    as_fn_error "could not make $CONFIG_STATUS" "17375" 5
 
   ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
   if test $ac_delim_n = $ac_delim_num; then
     break
   elif $ac_last_try; then
-    as_fn_error "could not make $CONFIG_STATUS" "17287" 5
+    as_fn_error "could not make $CONFIG_STATUS" "17381" 5
   else
     ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
   fi
@@ -17373,7 +17467,7 @@ if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then
 else
   cat
 fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
-  || as_fn_error "could not setup config files machinery" "17376" 5
+  || as_fn_error "could not setup config files machinery" "17470" 5
 _ACEOF
 
 # VPATH may cause trouble with some makes, so we remove $(srcdir),
@@ -17414,7 +17508,7 @@ for ac_last_try in false false :; do
   if test -z "$ac_t"; then
     break
   elif $ac_last_try; then
-    as_fn_error "could not make $CONFIG_HEADERS" "17417" 5
+    as_fn_error "could not make $CONFIG_HEADERS" "17511" 5
   else
     ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
   fi
@@ -17499,7 +17593,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 _ACAWK
 _ACEOF
 cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-  as_fn_error "could not setup config headers machinery" "17502" 5
+  as_fn_error "could not setup config headers machinery" "17596" 5
 fi # test -n "$CONFIG_HEADERS"
 
 
@@ -17512,7 +17606,7 @@ do
   esac
   case $ac_mode$ac_tag in
   :[FHL]*:*);;
-  :L* | :C*:*) as_fn_error "invalid tag \`$ac_tag'" "17515" 5;;
+  :L* | :C*:*) as_fn_error "invalid tag \`$ac_tag'" "17609" 5;;
   :[FH]-) ac_tag=-:-;;
   :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
   esac
@@ -17540,7 +17634,7 @@ do
 	   [\\/$]*) false;;
 	   *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
 	   esac ||
-	   as_fn_error "cannot find input file: \`$ac_f'" "17543" 5;;
+	   as_fn_error "cannot find input file: \`$ac_f'" "17637" 5;;
       esac
       case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
       as_fn_append ac_file_inputs " '$ac_f'"
@@ -17554,7 +17648,7 @@ do
 	`' by configure.'
     if test x"$ac_file" != x-; then
       configure_input="$ac_file.  $configure_input"
-      { $as_echo "$as_me:${as_lineno-17557}: creating $ac_file" >&5
+      { $as_echo "$as_me:${as_lineno-17651}: creating $ac_file" >&5
 $as_echo "$as_me: creating $ac_file" >&6;}
     fi
     # Neutralize special characters interpreted by sed in replacement strings.
@@ -17567,7 +17661,7 @@ $as_echo "$as_me: creating $ac_file" >&6;}
 
     case $ac_tag in
     *:-:* | *:-) cat >"$tmp/stdin" \
-      || as_fn_error "could not create $ac_file" "17570" 5 ;;
+      || as_fn_error "could not create $ac_file" "17664" 5 ;;
     esac
     ;;
   esac
@@ -17665,7 +17759,7 @@ ac_sed_dataroot='
 case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in
 *datarootdir*) ac_datarootdir_seen=yes;;
 *@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
-  { $as_echo "$as_me:${as_lineno-17668}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
+  { $as_echo "$as_me:${as_lineno-17762}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
 $as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
@@ -17704,12 +17798,12 @@ s&@MKDIR_P@&$ac_MKDIR_P&;t t
 $ac_datarootdir_hack
 "
 eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
-  || as_fn_error "could not create $ac_file" "17707" 5
+  || as_fn_error "could not create $ac_file" "17801" 5
 
 test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
   { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
   { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
-  { $as_echo "$as_me:${as_lineno-17712}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+  { $as_echo "$as_me:${as_lineno-17806}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
 which seems to be undefined.  Please make sure it is defined." >&5
 $as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
 which seems to be undefined.  Please make sure it is defined." >&2;}
@@ -17719,7 +17813,7 @@ which seems to be undefined.  Please make sure it is defined." >&2;}
   -) cat "$tmp/out" && rm -f "$tmp/out";;
   *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
   esac \
-  || as_fn_error "could not create $ac_file" "17722" 5
+  || as_fn_error "could not create $ac_file" "17816" 5
  ;;
   :H)
   #
@@ -17730,19 +17824,19 @@ which seems to be undefined.  Please make sure it is defined." >&2;}
       $as_echo "/* $configure_input  */" \
       && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
     } >"$tmp/config.h" \
-      || as_fn_error "could not create $ac_file" "17733" 5
+      || as_fn_error "could not create $ac_file" "17827" 5
     if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then
-      { $as_echo "$as_me:${as_lineno-17735}: $ac_file is unchanged" >&5
+      { $as_echo "$as_me:${as_lineno-17829}: $ac_file is unchanged" >&5
 $as_echo "$as_me: $ac_file is unchanged" >&6;}
     else
       rm -f "$ac_file"
       mv "$tmp/config.h" "$ac_file" \
-	|| as_fn_error "could not create $ac_file" "17740" 5
+	|| as_fn_error "could not create $ac_file" "17834" 5
     fi
   else
     $as_echo "/* $configure_input  */" \
       && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \
-      || as_fn_error "could not create -" "17745" 5
+      || as_fn_error "could not create -" "17839" 5
   fi
 # Compute "$ac_file"'s index in $config_headers.
 _am_arg="$ac_file"
@@ -17780,34 +17874,35 @@ $as_echo X"$_am_arg" |
 	  s/.*/./; q'`/stamp-h$_am_stamp_count
  ;;
 
-  :C)  { $as_echo "$as_me:${as_lineno-17783}: executing $ac_file commands" >&5
+  :C)  { $as_echo "$as_me:${as_lineno-17877}: executing $ac_file commands" >&5
 $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\(//\)$' \| \
@@ -17830,28 +17925,28 @@ $as_echo X"$mf" |
 	    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\(//\)$' \| \
@@ -17874,11 +17969,12 @@ $as_echo X"$file" |
 	    q
 	  }
 	  s/.*/./; q'`
-    as_dir=$dirpart/$fdir; as_fn_mkdir_p
-    # echo "creating $dirpart/$file"
-    echo '# dummy' > "$dirpart/$file"
+      as_dir=$dirpart/$fdir; as_fn_mkdir_p
+      # echo "creating $dirpart/$file"
+      echo '# dummy' > "$dirpart/$file"
+    done
   done
-done
+}
  ;;
     "libtool":C)
 
@@ -18692,7 +18788,7 @@ _ACEOF
 ac_clean_files=$ac_clean_files_save
 
 test $ac_write_fail = 0 ||
-  as_fn_error "write failure creating $CONFIG_STATUS" "18695" 5
+  as_fn_error "write failure creating $CONFIG_STATUS" "18791" 5
 
 
 # configure is writing to config.log, and then calls config.status.
@@ -18716,7 +18812,7 @@ if test "$no_create" != yes; then
   $ac_cs_success || as_fn_exit $?
 fi
 if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
-  { $as_echo "$as_me:${as_lineno-18719}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
+  { $as_echo "$as_me:${as_lineno-18815}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
 $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
 fi
 
diff --git a/pub/doc/frida2.man.html b/pub/doc/frida2.man.html
index 781a87d8bcbf8bb967a901ffcb3911b2e21dd967..6f3b01f146567bc3afce0d96ac94dffffca3f642 100644
--- a/pub/doc/frida2.man.html
+++ b/pub/doc/frida2.man.html
@@ -1641,13 +1641,14 @@ FRIDA(1) Manual Page
 </div>
 <h2>SYNOPSIS</h2>
 <div class="sectionbody">
-<div class="paragraph"><p><strong>frida2</strong></p></div>
+<div class="paragraph"><p><strong>frida1, ida</strong></p></div>
+<div class="paragraph"><p><strong>frida2, frida</strong></p></div>
 </div>
 <h2 id="_description">DESCRIPTION</h2>
 <div class="sectionbody">
-<div class="paragraph"><p>FRIDA is software for scientific data analysis. Its data model is quite generic (data files consist of x-y-dy tables that are differentiated by z coordinates), so that it can be used for many different kinds of observational data. The original field of application of FRIDA is inelastic neutron scattering which is supported through many specialized routines. However, FRIDA has also been used for the analysis of time series in the telecommunication industry, and it has helped to reveal blatant shortcomings in educational statistics.</p></div>
+<div class="paragraph"><p>FRIDA is software for scientific data analysis, originally written for inelastic neutron scattering. Its data model is quite generic (data files consist of x-y-dy tables that are differentiated by z coordinates), so that it can be used for many different kinds of observational data.</p></div>
 <div class="paragraph"><p>Frida1, written in FORTRAN, was developped in the 1990s. The original name IDA was changed to FRIDA just because there were too many other open-source projects all called IDA.</p></div>
-<div class="paragraph"><p>Frida2 is written C++. It is being actively developed.</p></div>
+<div class="paragraph"><p>Frida2 is written in C++. It is being actively developed.</p></div>
 </div>
 <h2 id="_author">AUTHOR</h2>
 <div class="sectionbody">
@@ -1656,7 +1657,7 @@ FRIDA(1) Manual Page
 <h2 id="_ressources">RESSOURCES</h2>
 <div class="sectionbody">
 <div class="paragraph"><p>Main web site: <a href="http://www.messen-und-deuten.de/frida/">http://www.messen-und-deuten.de/frida/</a></p></div>
-<div class="paragraph"><p>Download location: <a href="http://www.messen-und-deuten.de/frida/src/">http://www.messen-und-deuten.de/frida/src/</a></p></div>
+<div class="paragraph"><p>Download location: <a href="http://www.messen-und-deuten.de/frida/src/">http://www.messen-und-deuten.de/frida/src/</a> (old download location at sourceforge.net no longer maintained - too much advertisment there, too slow, too complicated)</p></div>
 <div class="paragraph"><p>Development snapshot: <a href="http://iffwww.iff.kfa-juelich.de/~wuttke/frida2.git/">http://iffwww.iff.kfa-juelich.de/~wuttke/frida2.git/</a></p></div>
 <div class="paragraph"><p>Documentation wiki: <a href="http://iffwww.iff.kfa-juelich.de/~wuttke/doku/doku.php?id=frida:frida">http://iffwww.iff.kfa-juelich.de/~wuttke/doku/doku.php?id=frida:frida</a></p></div>
 </div>
@@ -1667,7 +1668,7 @@ granted under the terms of the GNU General Public License (GPL).</p></div>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2009-09-20 13:32:37 CEST
+Last updated 2009-09-20 15:13:55 CEST
 </div>
 </div>
 </body>
diff --git a/pub/doc/frida2.man.txt b/pub/doc/frida2.man.txt
index 92a3f5dd9d486e1cbf025ecc46ec717585c1518d..a31b25dcc25f228bd452fc452c90be48d74fc713 100644
--- a/pub/doc/frida2.man.txt
+++ b/pub/doc/frida2.man.txt
@@ -9,16 +9,18 @@ Frida - Fast reliable interactive data analysis
 SYNOPSIS
 --------
 
-*frida2*
+*frida1, ida*
+
+*frida2, frida*
 
 DESCRIPTION
 -----------
 
-FRIDA is software for scientific data analysis. Its data model is quite generic (data files consist of x-y-dy tables that are differentiated by z coordinates), so that it can be used for many different kinds of observational data. The original field of application of FRIDA is inelastic neutron scattering which is supported through many specialized routines. However, FRIDA has also been used for the analysis of time series in the telecommunication industry, and it has helped to reveal blatant shortcomings in educational statistics.
+FRIDA is software for scientific data analysis, originally written for inelastic neutron scattering. Its data model is quite generic (data files consist of x-y-dy tables that are differentiated by z coordinates), so that it can be used for many different kinds of observational data.
 
 Frida1, written in FORTRAN, was developped in the 1990s. The original name IDA was changed to FRIDA just because there were too many other open-source projects all called IDA.
 
-Frida2 is written C++. It is being actively developed.
+Frida2 is written in C++. It is being actively developed.
 
 AUTHOR
 ------
@@ -29,12 +31,17 @@ RESSOURCES
 
 Main web site: http://www.messen-und-deuten.de/frida/
 
-Download location: http://www.messen-und-deuten.de/frida/src/
+Download location: http://www.messen-und-deuten.de/frida/src/ (old download location at sourceforge.net no longer maintained - too much advertisment there, too slow, too complicated)
 
 Development snapshot: http://iffwww.iff.kfa-juelich.de/~wuttke/frida2.git/
 
 Documentation wiki: http://iffwww.iff.kfa-juelich.de/~wuttke/doku/doku.php?id=frida:frida
 
+BUGS
+----
+
+Numerous. See http://iffwww.iff.kfa-juelich.de/~wuttke/flyspray/
+
 COPYING
 -------
 Copyright (C) 2009 Joachim Wuttke. Free use of this software is
diff --git a/pub/doc/frida2.man.xml b/pub/doc/frida2.man.xml
index 0e7959a17d493f80aa8c958bde5f93eed6a9965f..c0a0389cc17f0b313c7dbb7e625f7f7e3545e2a6 100644
--- a/pub/doc/frida2.man.xml
+++ b/pub/doc/frida2.man.xml
@@ -10,13 +10,14 @@
     <refpurpose>Fast reliable interactive data analysis</refpurpose>
 </refnamediv>
 <refsynopsisdiv>
-<simpara><emphasis role="strong">frida2</emphasis></simpara>
+<simpara><emphasis role="strong">frida1, ida</emphasis></simpara>
+<simpara><emphasis role="strong">frida2, frida</emphasis></simpara>
 </refsynopsisdiv>
 <refsect1 id="_description">
 <title>DESCRIPTION</title>
-<simpara>FRIDA is software for scientific data analysis. Its data model is quite generic (data files consist of x-y-dy tables that are differentiated by z coordinates), so that it can be used for many different kinds of observational data. The original field of application of FRIDA is inelastic neutron scattering which is supported through many specialized routines. However, FRIDA has also been used for the analysis of time series in the telecommunication industry, and it has helped to reveal blatant shortcomings in educational statistics.</simpara>
+<simpara>FRIDA is software for scientific data analysis, originally written for inelastic neutron scattering. Its data model is quite generic (data files consist of x-y-dy tables that are differentiated by z coordinates), so that it can be used for many different kinds of observational data.</simpara>
 <simpara>Frida1, written in FORTRAN, was developped in the 1990s. The original name IDA was changed to FRIDA just because there were too many other open-source projects all called IDA.</simpara>
-<simpara>Frida2 is written C++. It is being actively developed.</simpara>
+<simpara>Frida2 is written in C++. It is being actively developed.</simpara>
 </refsect1>
 <refsect1 id="_author">
 <title>AUTHOR</title>
@@ -25,7 +26,7 @@
 <refsect1 id="_ressources">
 <title>RESSOURCES</title>
 <simpara>Main web site: <ulink url="http://www.messen-und-deuten.de/frida/">http://www.messen-und-deuten.de/frida/</ulink></simpara>
-<simpara>Download location: <ulink url="http://www.messen-und-deuten.de/frida/src/">http://www.messen-und-deuten.de/frida/src/</ulink></simpara>
+<simpara>Download location: <ulink url="http://www.messen-und-deuten.de/frida/src/">http://www.messen-und-deuten.de/frida/src/</ulink> (old download location at sourceforge.net no longer maintained - too much advertisment there, too slow, too complicated)</simpara>
 <simpara>Development snapshot: <ulink url="http://iffwww.iff.kfa-juelich.de/~wuttke/frida2.git/">http://iffwww.iff.kfa-juelich.de/~wuttke/frida2.git/</ulink></simpara>
 <simpara>Documentation wiki: <ulink url="http://iffwww.iff.kfa-juelich.de/~wuttke/doku/doku.php?id=frida:frida">http://iffwww.iff.kfa-juelich.de/~wuttke/doku/doku.php?id=frida:frida</ulink></simpara>
 </refsect1>
diff --git a/pub/doc/src/.htaccess b/pub/doc/src/.htaccess
new file mode 100644
index 0000000000000000000000000000000000000000..aab7b73c0a7ee5eb724e9e62d6c08af5b5e7bb25
--- /dev/null
+++ b/pub/doc/src/.htaccess
@@ -0,0 +1,2 @@
+# AllowOverride Options
+Options +Indexes
diff --git a/pub/src/func.cpp b/pub/src/func.cpp
index 620d6183f002f2d6ba679a438428ac01866e349a..609207c116a50449ab7b5b813b20aa3d06b6c841 100644
--- a/pub/src/func.cpp
+++ b/pub/src/func.cpp
@@ -119,8 +119,10 @@ double func_gaussnn (double x, double s) { // Gauss not normalized
 double func_cauchy (double x, double s) {
     return s==0 ? 0 : 2*s/twopi/(x*x+s*s); }
 double func_kwwc( double v, double a){
+    if( a<0.1 || a>2.0 ) return 0;
     return kwwcf( (float)v, (float)a ); }
 double func_kwws( double v, double a){
+    if( a<0.1 || a>2.0 ) return 0;
     return kwwsf( (float)v, (float)a ); }
 
 double func_ran (double v, double a) {