Add same patches from icewm for apm applet

3 files changed, 6247 insertions, 1 deletions

diff --git a/wm/icewm-gnome/distinfo b/wm/icewm-gnome/distinfo
index c9a07c3ce7e..26c93c06718 100644
--- a/wm/icewm-gnome/distinfo
+++ b/wm/icewm-gnome/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.3 2002/02/26 09:41:43 martti Exp $
+$NetBSD: distinfo,v 1.4 2002/03/10 10:13:56 jmc Exp $
 
 SHA1 (icewm-1.0.9-2.tar.bz2) = f42d64996cde40f790247eb5428fb56dc2bfdb2f
 Size (icewm-1.0.9-2.tar.bz2) = 484612 bytes
@@ -6,3 +6,5 @@ SHA1 (patch-aa) = 8dc74038552f8c9783622229981a9a83b3464512
 SHA1 (patch-ab) = 725521ed1192a70764ee409e98e4512f25dcc883
 SHA1 (patch-ac) = 5275f5e9b5dae569d8d01a1209c00f40490edcbc
 SHA1 (patch-ae) = edc66c096499df9a8b76d43376b3e40c408c99d3
+SHA1 (patch-af) = 61a5060c95f9110b536c3312c1afc8d722af5226
+SHA1 (patch-ag) = 2e1b10f53d85ecfd55cd7fe86073145a5c72dc15
diff --git a/wm/icewm-gnome/patches/patch-aa b/wm/icewm-gnome/patches/patch-aa
new file mode 100644
index 00000000000..1a056f9edce
--- /dev/null
+++ b/wm/icewm-gnome/patches/patch-aa
@@ -0,0 +1,26 @@
+$NetBSD: patch-aa,v 1.1 2002/03/10 10:13:56 jmc Exp $
+
+--- configure.in.orig	Tue Oct  9 14:54:02 2001
++++ configure.in	Fri Mar  8 23:07:20 2002
+@@ -409,6 +409,13 @@
+     AC_DEFINE(NO_CONFIGURE, 1, [Define to disable preferences support.])
+   fi
+ 
++AC_ARG_ENABLE(apm,
++  [  --disable-apm           Don't enable the APM status applet])
++  if test "$enable_apm" != "no"; then
++    AC_DEFINE(CONFIG_APPLET_APM,        1,      [APM status applet])
++  fi
++
++
+ AC_ARG_ENABLE(keyconf,
+   [  --disable-keyconf       Disable configurable keybindings])
+   if test "$enable_keyconf" = "no"; then
+@@ -440,7 +447,6 @@
+     AC_DEFINE(CONFIG_APPLET_CPU_STATUS,	1,	[CPU status applet])
+     AC_DEFINE(CONFIG_APPLET_NET_STATUS,	1,	[Network status applet])
+     AC_DEFINE(CONFIG_APPLET_CLOCK,	1,	[LCD clock applet])
+-    AC_DEFINE(CONFIG_APPLET_APM,	1,	[APM status applet])
+     AC_DEFINE(CONFIG_ADDRESSBAR,	1,	[Address bar])
+     AC_DEFINE(CONFIG_WINLIST,		1,	[OS/2 like window list])
+     AC_DEFINE(CONFIG_WINMENU,		1,	[Window menu])
diff --git a/wm/icewm-gnome/patches/patch-ab b/wm/icewm-gnome/patches/patch-ab
new file mode 100644
index 00000000000..9421a4a2b39
--- /dev/null
+++ b/wm/icewm-gnome/patches/patch-ab
@@ -0,0 +1,6218 @@
+$NetBSD: patch-ab,v 1.1 2002/03/10 10:13:56 jmc Exp $
+
+--- configure.orig	Fri Mar  8 23:06:22 2002
++++ configure	Fri Mar  8 23:07:26 2002
+@@ -701,6 +701,7 @@
+   --enable-movesize-fx    Move/Resize FX (experimental bloat)
+   --disable-x86-asm       Don't use optimized x86 assembly code
+   --disable-prefs         Disable configurable preferences
++  --disable-apm           Don't enable the APM status applet
+   --disable-keyconf       Disable configurable keybindings
+   --disable-menuconf      Disable configurable menus
+   --disable-winoptions    Disable configurable window options
+@@ -926,7 +927,7 @@
+ fi
+ for ac_site_file in $CONFIG_SITE; do
+   if test -r "$ac_site_file"; then
+-    { echo "$as_me:929: loading site script $ac_site_file" >&5
++    { echo "$as_me:930: loading site script $ac_site_file" >&5
+ echo "$as_me: loading site script $ac_site_file" >&6;}
+     cat "$ac_site_file" >&5
+     . "$ac_site_file"
+@@ -937,7 +938,7 @@
+   # Some versions of bash will fail to source /dev/null (special
+   # files actually), so we avoid doing that.
+   if test -f "$cache_file"; then
+-    { echo "$as_me:940: loading cache $cache_file" >&5
++    { echo "$as_me:941: loading cache $cache_file" >&5
+ echo "$as_me: loading cache $cache_file" >&6;}
+     case $cache_file in
+       [\\/]* | ?:[\\/]* ) . $cache_file;;
+@@ -945,7 +946,7 @@
+     esac
+   fi
+ else
+-  { echo "$as_me:948: creating cache $cache_file" >&5
++  { echo "$as_me:949: creating cache $cache_file" >&5
+ echo "$as_me: creating cache $cache_file" >&6;}
+   >$cache_file
+ fi
+@@ -961,21 +962,21 @@
+   eval ac_new_val="\$ac_env_${ac_var}_value"
+   case $ac_old_set,$ac_new_set in
+     set,)
+-      { echo "$as_me:964: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
++      { echo "$as_me:965: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
+ echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
+       ac_cache_corrupted=: ;;
+     ,set)
+-      { echo "$as_me:968: error: \`$ac_var' was not set in the previous run" >&5
++      { echo "$as_me:969: error: \`$ac_var' was not set in the previous run" >&5
+ echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
+       ac_cache_corrupted=: ;;
+     ,);;
+     *)
+       if test "x$ac_old_val" != "x$ac_new_val"; then
+-        { echo "$as_me:974: error: \`$ac_var' has changed since the previous run:" >&5
++        { echo "$as_me:975: error: \`$ac_var' has changed since the previous run:" >&5
+ echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
+-        { echo "$as_me:976:   former value:  $ac_old_val" >&5
++        { echo "$as_me:977:   former value:  $ac_old_val" >&5
+ echo "$as_me:   former value:  $ac_old_val" >&2;}
+-        { echo "$as_me:978:   current value: $ac_new_val" >&5
++        { echo "$as_me:979:   current value: $ac_new_val" >&5
+ echo "$as_me:   current value: $ac_new_val" >&2;}
+         ac_cache_corrupted=:
+       fi;;
+@@ -994,9 +995,9 @@
+   fi
+ done
+ if $ac_cache_corrupted; then
+-  { echo "$as_me:997: error: changes in the environment can compromise the build" >&5
++  { echo "$as_me:998: error: changes in the environment can compromise the build" >&5
+ echo "$as_me: error: changes in the environment can compromise the build" >&2;}
+-  { { echo "$as_me:999: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
++  { { echo "$as_me:1000: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
+ echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -1016,10 +1017,10 @@
+ echo "#! $SHELL" >conftest.sh
+ echo  "exit 0"   >>conftest.sh
+ chmod +x conftest.sh
+-if { (echo "$as_me:1019: PATH=\".;.\"; conftest.sh") >&5
++if { (echo "$as_me:1020: PATH=\".;.\"; conftest.sh") >&5
+   (PATH=".;."; conftest.sh) 2>&5
+   ac_status=$?
+-  echo "$as_me:1022: \$? = $ac_status" >&5
++  echo "$as_me:1023: \$? = $ac_status" >&5
+   (exit $ac_status); }; then
+   ac_path_separator=';'
+ else
+@@ -1047,7 +1048,7 @@
+   fi
+ done
+ if test -z "$ac_aux_dir"; then
+-  { { echo "$as_me:1050: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5
++  { { echo "$as_me:1051: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5
+ echo "$as_me: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -1057,11 +1058,11 @@
+ 
+ # Make sure we can run config.sub.
+ $ac_config_sub sun4 >/dev/null 2>&1 ||
+-  { { echo "$as_me:1060: error: cannot run $ac_config_sub" >&5
++  { { echo "$as_me:1061: error: cannot run $ac_config_sub" >&5
+ echo "$as_me: error: cannot run $ac_config_sub" >&2;}
+    { (exit 1); exit 1; }; }
+ 
+-echo "$as_me:1064: checking build system type" >&5
++echo "$as_me:1065: checking build system type" >&5
+ echo $ECHO_N "checking build system type... $ECHO_C" >&6
+ if test "${ac_cv_build+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -1070,23 +1071,23 @@
+ test -z "$ac_cv_build_alias" &&
+   ac_cv_build_alias=`$ac_config_guess`
+ test -z "$ac_cv_build_alias" &&
+-  { { echo "$as_me:1073: error: cannot guess build type; you must specify one" >&5
++  { { echo "$as_me:1074: error: cannot guess build type; you must specify one" >&5
+ echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
+    { (exit 1); exit 1; }; }
+ ac_cv_build=`$ac_config_sub $ac_cv_build_alias` ||
+-  { { echo "$as_me:1077: error: $ac_config_sub $ac_cv_build_alias failed." >&5
++  { { echo "$as_me:1078: error: $ac_config_sub $ac_cv_build_alias failed." >&5
+ echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed." >&2;}
+    { (exit 1); exit 1; }; }
+ 
+ fi
+-echo "$as_me:1082: result: $ac_cv_build" >&5
++echo "$as_me:1083: result: $ac_cv_build" >&5
+ echo "${ECHO_T}$ac_cv_build" >&6
+ build=$ac_cv_build
+ build_cpu=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+ build_vendor=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
+ build_os=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
+ 
+-echo "$as_me:1089: checking host system type" >&5
++echo "$as_me:1090: checking host system type" >&5
+ echo $ECHO_N "checking host system type... $ECHO_C" >&6
+ if test "${ac_cv_host+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -1095,19 +1096,19 @@
+ test -z "$ac_cv_host_alias" &&
+   ac_cv_host_alias=$ac_cv_build_alias
+ ac_cv_host=`$ac_config_sub $ac_cv_host_alias` ||
+-  { { echo "$as_me:1098: error: $ac_config_sub $ac_cv_host_alias failed" >&5
++  { { echo "$as_me:1099: error: $ac_config_sub $ac_cv_host_alias failed" >&5
+ echo "$as_me: error: $ac_config_sub $ac_cv_host_alias failed" >&2;}
+    { (exit 1); exit 1; }; }
+ 
+ fi
+-echo "$as_me:1103: result: $ac_cv_host" >&5
++echo "$as_me:1104: result: $ac_cv_host" >&5
+ echo "${ECHO_T}$ac_cv_host" >&6
+ host=$ac_cv_host
+ host_cpu=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+ host_vendor=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
+ host_os=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
+ 
+-echo "$as_me:1110: checking target system type" >&5
++echo "$as_me:1111: checking target system type" >&5
+ echo $ECHO_N "checking target system type... $ECHO_C" >&6
+ if test "${ac_cv_target+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -1116,12 +1117,12 @@
+ test "x$ac_cv_target_alias" = "x" &&
+   ac_cv_target_alias=$ac_cv_host_alias
+ ac_cv_target=`$ac_config_sub $ac_cv_target_alias` ||
+-  { { echo "$as_me:1119: error: $ac_config_sub $ac_cv_target_alias failed" >&5
++  { { echo "$as_me:1120: error: $ac_config_sub $ac_cv_target_alias failed" >&5
+ echo "$as_me: error: $ac_config_sub $ac_cv_target_alias failed" >&2;}
+    { (exit 1); exit 1; }; }
+ 
+ fi
+-echo "$as_me:1124: result: $ac_cv_target" >&5
++echo "$as_me:1125: result: $ac_cv_target" >&5
+ echo "${ECHO_T}$ac_cv_target" >&6
+ target=$ac_cv_target
+ target_cpu=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+@@ -1143,7 +1144,7 @@
+ 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
+-echo "$as_me:1146: checking for $ac_word" >&5
++echo "$as_me:1147: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_CC+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -1158,7 +1159,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_CC="${ac_tool_prefix}gcc"
+-echo "$as_me:1161: found $ac_dir/$ac_word" >&5
++echo "$as_me:1162: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -1166,10 +1167,10 @@
+ fi
+ CC=$ac_cv_prog_CC
+ if test -n "$CC"; then
+-  echo "$as_me:1169: result: $CC" >&5
++  echo "$as_me:1170: result: $CC" >&5
+ echo "${ECHO_T}$CC" >&6
+ else
+-  echo "$as_me:1172: result: no" >&5
++  echo "$as_me:1173: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -1178,7 +1179,7 @@
+   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
+-echo "$as_me:1181: checking for $ac_word" >&5
++echo "$as_me:1182: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -1193,7 +1194,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_ac_ct_CC="gcc"
+-echo "$as_me:1196: found $ac_dir/$ac_word" >&5
++echo "$as_me:1197: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -1201,10 +1202,10 @@
+ fi
+ ac_ct_CC=$ac_cv_prog_ac_ct_CC
+ if test -n "$ac_ct_CC"; then
+-  echo "$as_me:1204: result: $ac_ct_CC" >&5
++  echo "$as_me:1205: result: $ac_ct_CC" >&5
+ echo "${ECHO_T}$ac_ct_CC" >&6
+ else
+-  echo "$as_me:1207: result: no" >&5
++  echo "$as_me:1208: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -1217,7 +1218,7 @@
+   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
+-echo "$as_me:1220: checking for $ac_word" >&5
++echo "$as_me:1221: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_CC+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -1232,7 +1233,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_CC="${ac_tool_prefix}cc"
+-echo "$as_me:1235: found $ac_dir/$ac_word" >&5
++echo "$as_me:1236: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -1240,10 +1241,10 @@
+ fi
+ CC=$ac_cv_prog_CC
+ if test -n "$CC"; then
+-  echo "$as_me:1243: result: $CC" >&5
++  echo "$as_me:1244: result: $CC" >&5
+ echo "${ECHO_T}$CC" >&6
+ else
+-  echo "$as_me:1246: result: no" >&5
++  echo "$as_me:1247: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -1252,7 +1253,7 @@
+   ac_ct_CC=$CC
+   # Extract the first word of "cc", so it can be a program name with args.
+ set dummy cc; ac_word=$2
+-echo "$as_me:1255: checking for $ac_word" >&5
++echo "$as_me:1256: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -1267,7 +1268,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_ac_ct_CC="cc"
+-echo "$as_me:1270: found $ac_dir/$ac_word" >&5
++echo "$as_me:1271: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -1275,10 +1276,10 @@
+ fi
+ ac_ct_CC=$ac_cv_prog_ac_ct_CC
+ if test -n "$ac_ct_CC"; then
+-  echo "$as_me:1278: result: $ac_ct_CC" >&5
++  echo "$as_me:1279: result: $ac_ct_CC" >&5
+ echo "${ECHO_T}$ac_ct_CC" >&6
+ else
+-  echo "$as_me:1281: result: no" >&5
++  echo "$as_me:1282: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -1291,7 +1292,7 @@
+ 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
+-echo "$as_me:1294: checking for $ac_word" >&5
++echo "$as_me:1295: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_CC+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -1311,7 +1312,7 @@
+   continue
+ fi
+ ac_cv_prog_CC="cc"
+-echo "$as_me:1314: found $ac_dir/$ac_word" >&5
++echo "$as_me:1315: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -1333,10 +1334,10 @@
+ fi
+ CC=$ac_cv_prog_CC
+ if test -n "$CC"; then
+-  echo "$as_me:1336: result: $CC" >&5
++  echo "$as_me:1337: result: $CC" >&5
+ echo "${ECHO_T}$CC" >&6
+ else
+-  echo "$as_me:1339: result: no" >&5
++  echo "$as_me:1340: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -1347,7 +1348,7 @@
+   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
+-echo "$as_me:1350: checking for $ac_word" >&5
++echo "$as_me:1351: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_CC+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -1362,7 +1363,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
+-echo "$as_me:1365: found $ac_dir/$ac_word" >&5
++echo "$as_me:1366: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -1370,10 +1371,10 @@
+ fi
+ CC=$ac_cv_prog_CC
+ if test -n "$CC"; then
+-  echo "$as_me:1373: result: $CC" >&5
++  echo "$as_me:1374: result: $CC" >&5
+ echo "${ECHO_T}$CC" >&6
+ else
+-  echo "$as_me:1376: result: no" >&5
++  echo "$as_me:1377: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -1386,7 +1387,7 @@
+ do
+   # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+-echo "$as_me:1389: checking for $ac_word" >&5
++echo "$as_me:1390: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -1401,7 +1402,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_ac_ct_CC="$ac_prog"
+-echo "$as_me:1404: found $ac_dir/$ac_word" >&5
++echo "$as_me:1405: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -1409,10 +1410,10 @@
+ fi
+ ac_ct_CC=$ac_cv_prog_ac_ct_CC
+ if test -n "$ac_ct_CC"; then
+-  echo "$as_me:1412: result: $ac_ct_CC" >&5
++  echo "$as_me:1413: result: $ac_ct_CC" >&5
+ echo "${ECHO_T}$ac_ct_CC" >&6
+ else
+-  echo "$as_me:1415: result: no" >&5
++  echo "$as_me:1416: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -1424,32 +1425,32 @@
+ 
+ fi
+ 
+-test -z "$CC" && { { echo "$as_me:1427: error: no acceptable cc found in \$PATH" >&5
++test -z "$CC" && { { echo "$as_me:1428: error: no acceptable cc found in \$PATH" >&5
+ echo "$as_me: error: no acceptable cc found in \$PATH" >&2;}
+    { (exit 1); exit 1; }; }
+ 
+ # Provide some information about the compiler.
+-echo "$as_me:1432:" \
++echo "$as_me:1433:" \
+      "checking for C compiler version" >&5
+ ac_compiler=`set X $ac_compile; echo $2`
+-{ (eval echo "$as_me:1435: \"$ac_compiler --version </dev/null >&5\"") >&5
++{ (eval echo "$as_me:1436: \"$ac_compiler --version </dev/null >&5\"") >&5
+   (eval $ac_compiler --version </dev/null >&5) 2>&5
+   ac_status=$?
+-  echo "$as_me:1438: \$? = $ac_status" >&5
++  echo "$as_me:1439: \$? = $ac_status" >&5
+   (exit $ac_status); }
+-{ (eval echo "$as_me:1440: \"$ac_compiler -v </dev/null >&5\"") >&5
++{ (eval echo "$as_me:1441: \"$ac_compiler -v </dev/null >&5\"") >&5
+   (eval $ac_compiler -v </dev/null >&5) 2>&5
+   ac_status=$?
+-  echo "$as_me:1443: \$? = $ac_status" >&5
++  echo "$as_me:1444: \$? = $ac_status" >&5
+   (exit $ac_status); }
+-{ (eval echo "$as_me:1445: \"$ac_compiler -V </dev/null >&5\"") >&5
++{ (eval echo "$as_me:1446: \"$ac_compiler -V </dev/null >&5\"") >&5
+   (eval $ac_compiler -V </dev/null >&5) 2>&5
+   ac_status=$?
+-  echo "$as_me:1448: \$? = $ac_status" >&5
++  echo "$as_me:1449: \$? = $ac_status" >&5
+   (exit $ac_status); }
+ 
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 1452 "configure"
++#line 1453 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -1465,13 +1466,13 @@
+ # 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.
+-echo "$as_me:1468: checking for C compiler default output" >&5
++echo "$as_me:1469: checking for C compiler default output" >&5
+ echo $ECHO_N "checking for C compiler default output... $ECHO_C" >&6
+ ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
+-if { (eval echo "$as_me:1471: \"$ac_link_default\"") >&5
++if { (eval echo "$as_me:1472: \"$ac_link_default\"") >&5
+   (eval $ac_link_default) 2>&5
+   ac_status=$?
+-  echo "$as_me:1474: \$? = $ac_status" >&5
++  echo "$as_me:1475: \$? = $ac_status" >&5
+   (exit $ac_status); }; then
+   # Find the output, starting from the most likely.  This scheme is
+ # not robust to junk in `.', hence go to wildcards (a.*) only as a last
+@@ -1494,34 +1495,34 @@
+ else
+   echo "$as_me: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+-{ { echo "$as_me:1497: error: C compiler cannot create executables" >&5
++{ { echo "$as_me:1498: error: C compiler cannot create executables" >&5
+ echo "$as_me: error: C compiler cannot create executables" >&2;}
+    { (exit 77); exit 77; }; }
+ fi
+ 
+ ac_exeext=$ac_cv_exeext
+-echo "$as_me:1503: result: $ac_file" >&5
++echo "$as_me:1504: result: $ac_file" >&5
+ echo "${ECHO_T}$ac_file" >&6
+ 
+ # Check the compiler produces executables we can run.  If not, either
+ # the compiler is broken, or we cross compile.
+-echo "$as_me:1508: checking whether the C compiler works" >&5
++echo "$as_me:1509: checking whether the C compiler works" >&5
+ echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6
+ # FIXME: These cross compiler hacks should be removed for Autoconf 3.0
+ # If not cross compiling, check that we can run a simple program.
+ if test "$cross_compiling" != yes; then
+   if { ac_try='./$ac_file'
+-  { (eval echo "$as_me:1514: \"$ac_try\"") >&5
++  { (eval echo "$as_me:1515: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:1517: \$? = $ac_status" >&5
++  echo "$as_me:1518: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+     cross_compiling=no
+   else
+     if test "$cross_compiling" = maybe; then
+ 	cross_compiling=yes
+     else
+-	{ { echo "$as_me:1524: error: cannot run C compiled programs.
++	{ { echo "$as_me:1525: error: cannot run C compiled programs.
+ If you meant to cross compile, use \`--host'." >&5
+ echo "$as_me: error: cannot run C compiled programs.
+ If you meant to cross compile, use \`--host'." >&2;}
+@@ -1529,24 +1530,24 @@
+     fi
+   fi
+ fi
+-echo "$as_me:1532: result: yes" >&5
++echo "$as_me:1533: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ 
+ rm -f a.out a.exe conftest$ac_cv_exeext
+ ac_clean_files=$ac_clean_files_save
+ # Check the compiler produces executables we can run.  If not, either
+ # the compiler is broken, or we cross compile.
+-echo "$as_me:1539: checking whether we are cross compiling" >&5
++echo "$as_me:1540: checking whether we are cross compiling" >&5
+ echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6
+-echo "$as_me:1541: result: $cross_compiling" >&5
++echo "$as_me:1542: result: $cross_compiling" >&5
+ echo "${ECHO_T}$cross_compiling" >&6
+ 
+-echo "$as_me:1544: checking for executable suffix" >&5
++echo "$as_me:1545: checking for executable suffix" >&5
+ echo $ECHO_N "checking for executable suffix... $ECHO_C" >&6
+-if { (eval echo "$as_me:1546: \"$ac_link\"") >&5
++if { (eval echo "$as_me:1547: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:1549: \$? = $ac_status" >&5
++  echo "$as_me:1550: \$? = $ac_status" >&5
+   (exit $ac_status); }; then
+   # If both `conftest.exe' and `conftest' are `present' (well, observable)
+ # catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will
+@@ -1562,25 +1563,25 @@
+   esac
+ done
+ else
+-  { { echo "$as_me:1565: error: cannot compute EXEEXT: cannot compile and link" >&5
++  { { echo "$as_me:1566: error: cannot compute EXEEXT: cannot compile and link" >&5
+ echo "$as_me: error: cannot compute EXEEXT: cannot compile and link" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+ 
+ rm -f conftest$ac_cv_exeext
+-echo "$as_me:1571: result: $ac_cv_exeext" >&5
++echo "$as_me:1572: result: $ac_cv_exeext" >&5
+ echo "${ECHO_T}$ac_cv_exeext" >&6
+ 
+ rm -f conftest.$ac_ext
+ EXEEXT=$ac_cv_exeext
+ ac_exeext=$EXEEXT
+-echo "$as_me:1577: checking for object suffix" >&5
++echo "$as_me:1578: checking for object suffix" >&5
+ echo $ECHO_N "checking for object suffix... $ECHO_C" >&6
+ if test "${ac_cv_objext+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 1583 "configure"
++#line 1584 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -1592,10 +1593,10 @@
+ }
+ _ACEOF
+ rm -f conftest.o conftest.obj
+-if { (eval echo "$as_me:1595: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:1596: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:1598: \$? = $ac_status" >&5
++  echo "$as_me:1599: \$? = $ac_status" >&5
+   (exit $ac_status); }; then
+   for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do
+   case $ac_file in
+@@ -1607,24 +1608,24 @@
+ else
+   echo "$as_me: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+-{ { echo "$as_me:1610: error: cannot compute OBJEXT: cannot compile" >&5
++{ { echo "$as_me:1611: error: cannot compute OBJEXT: cannot compile" >&5
+ echo "$as_me: error: cannot compute OBJEXT: cannot compile" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+ 
+ rm -f conftest.$ac_cv_objext conftest.$ac_ext
+ fi
+-echo "$as_me:1617: result: $ac_cv_objext" >&5
++echo "$as_me:1618: result: $ac_cv_objext" >&5
+ echo "${ECHO_T}$ac_cv_objext" >&6
+ OBJEXT=$ac_cv_objext
+ ac_objext=$OBJEXT
+-echo "$as_me:1621: checking whether we are using the GNU C compiler" >&5
++echo "$as_me:1622: checking whether we are using the GNU C compiler" >&5
+ echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6
+ if test "${ac_cv_c_compiler_gnu+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 1627 "configure"
++#line 1628 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -1639,16 +1640,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:1642: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:1643: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:1645: \$? = $ac_status" >&5
++  echo "$as_me:1646: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:1648: \"$ac_try\"") >&5
++  { (eval echo "$as_me:1649: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:1651: \$? = $ac_status" >&5
++  echo "$as_me:1652: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_compiler_gnu=yes
+ else
+@@ -1660,19 +1661,19 @@
+ ac_cv_c_compiler_gnu=$ac_compiler_gnu
+ 
+ fi
+-echo "$as_me:1663: result: $ac_cv_c_compiler_gnu" >&5
++echo "$as_me:1664: result: $ac_cv_c_compiler_gnu" >&5
+ echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6
+ GCC=`test $ac_compiler_gnu = yes && echo yes`
+ ac_test_CFLAGS=${CFLAGS+set}
+ ac_save_CFLAGS=$CFLAGS
+ CFLAGS="-g"
+-echo "$as_me:1669: checking whether $CC accepts -g" >&5
++echo "$as_me:1670: checking whether $CC accepts -g" >&5
+ echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6
+ if test "${ac_cv_prog_cc_g+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 1675 "configure"
++#line 1676 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -1684,16 +1685,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:1687: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:1688: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:1690: \$? = $ac_status" >&5
++  echo "$as_me:1691: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:1693: \"$ac_try\"") >&5
++  { (eval echo "$as_me:1694: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:1696: \$? = $ac_status" >&5
++  echo "$as_me:1697: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_prog_cc_g=yes
+ else
+@@ -1703,7 +1704,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:1706: result: $ac_cv_prog_cc_g" >&5
++echo "$as_me:1707: result: $ac_cv_prog_cc_g" >&5
+ echo "${ECHO_T}$ac_cv_prog_cc_g" >&6
+ if test "$ac_test_CFLAGS" = set; then
+   CFLAGS=$ac_save_CFLAGS
+@@ -1730,16 +1731,16 @@
+ #endif
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:1733: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:1734: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:1736: \$? = $ac_status" >&5
++  echo "$as_me:1737: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:1739: \"$ac_try\"") >&5
++  { (eval echo "$as_me:1740: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:1742: \$? = $ac_status" >&5
++  echo "$as_me:1743: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   for ac_declaration in \
+    ''\
+@@ -1751,7 +1752,7 @@
+    'void exit (int);'
+ do
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 1754 "configure"
++#line 1755 "configure"
+ #include "confdefs.h"
+ #include <stdlib.h>
+ $ac_declaration
+@@ -1764,16 +1765,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:1767: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:1768: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:1770: \$? = $ac_status" >&5
++  echo "$as_me:1771: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:1773: \"$ac_try\"") >&5
++  { (eval echo "$as_me:1774: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:1776: \$? = $ac_status" >&5
++  echo "$as_me:1777: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   :
+ else
+@@ -1783,7 +1784,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 1786 "configure"
++#line 1787 "configure"
+ #include "confdefs.h"
+ $ac_declaration
+ int
+@@ -1795,16 +1796,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:1798: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:1799: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:1801: \$? = $ac_status" >&5
++  echo "$as_me:1802: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:1804: \"$ac_try\"") >&5
++  { (eval echo "$as_me:1805: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:1807: \$? = $ac_status" >&5
++  echo "$as_me:1808: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   break
+ else
+@@ -1831,7 +1832,7 @@
+ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ 
+-echo "$as_me:1834: checking whether the C compiler ($CC) understands C++" >&5
++echo "$as_me:1835: checking whether the C compiler ($CC) understands C++" >&5
+ echo $ECHO_N "checking whether the C compiler ($CC) understands C++... $ECHO_C" >&6
+ cat > conftest.C <<EOF
+ #ifdef __cplusplus
+@@ -1841,17 +1842,17 @@
+ #endif
+ EOF
+ if { ac_try='rm conftest; $CC -o conftest conftest.C; test -f ./conftest'
+-  { (eval echo "$as_me:1844: \"$ac_try\"") >&5
++  { (eval echo "$as_me:1845: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:1847: \$? = $ac_status" >&5
++  echo "$as_me:1848: \$? = $ac_status" >&5
+   (exit $ac_status); }; } >/dev/null 2>&1; then
+   ice_prog_gxx=yes
+   CXX=$CC
+ else
+   ice_prog_gxx=no
+ fi
+-echo "$as_me:1854: result: $ice_prog_gxx" >&5
++echo "$as_me:1855: result: $ice_prog_gxx" >&5
+ echo "${ECHO_T}$ice_prog_gxx" >&6
+ 
+ ac_ext=cc
+@@ -1870,7 +1871,7 @@
+   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
+-echo "$as_me:1873: checking for $ac_word" >&5
++echo "$as_me:1874: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_CXX+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -1885,7 +1886,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
+-echo "$as_me:1888: found $ac_dir/$ac_word" >&5
++echo "$as_me:1889: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -1893,10 +1894,10 @@
+ fi
+ CXX=$ac_cv_prog_CXX
+ if test -n "$CXX"; then
+-  echo "$as_me:1896: result: $CXX" >&5
++  echo "$as_me:1897: result: $CXX" >&5
+ echo "${ECHO_T}$CXX" >&6
+ else
+-  echo "$as_me:1899: result: no" >&5
++  echo "$as_me:1900: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -1909,7 +1910,7 @@
+ do
+   # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+-echo "$as_me:1912: checking for $ac_word" >&5
++echo "$as_me:1913: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -1924,7 +1925,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_ac_ct_CXX="$ac_prog"
+-echo "$as_me:1927: found $ac_dir/$ac_word" >&5
++echo "$as_me:1928: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -1932,10 +1933,10 @@
+ fi
+ ac_ct_CXX=$ac_cv_prog_ac_ct_CXX
+ if test -n "$ac_ct_CXX"; then
+-  echo "$as_me:1935: result: $ac_ct_CXX" >&5
++  echo "$as_me:1936: result: $ac_ct_CXX" >&5
+ echo "${ECHO_T}$ac_ct_CXX" >&6
+ else
+-  echo "$as_me:1938: result: no" >&5
++  echo "$as_me:1939: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -1947,32 +1948,32 @@
+ fi
+ 
+ # Provide some information about the compiler.
+-echo "$as_me:1950:" \
++echo "$as_me:1951:" \
+      "checking for C++ compiler version" >&5
+ ac_compiler=`set X $ac_compile; echo $2`
+-{ (eval echo "$as_me:1953: \"$ac_compiler --version </dev/null >&5\"") >&5
++{ (eval echo "$as_me:1954: \"$ac_compiler --version </dev/null >&5\"") >&5
+   (eval $ac_compiler --version </dev/null >&5) 2>&5
+   ac_status=$?
+-  echo "$as_me:1956: \$? = $ac_status" >&5
++  echo "$as_me:1957: \$? = $ac_status" >&5
+   (exit $ac_status); }
+-{ (eval echo "$as_me:1958: \"$ac_compiler -v </dev/null >&5\"") >&5
++{ (eval echo "$as_me:1959: \"$ac_compiler -v </dev/null >&5\"") >&5
+   (eval $ac_compiler -v </dev/null >&5) 2>&5
+   ac_status=$?
+-  echo "$as_me:1961: \$? = $ac_status" >&5
++  echo "$as_me:1962: \$? = $ac_status" >&5
+   (exit $ac_status); }
+-{ (eval echo "$as_me:1963: \"$ac_compiler -V </dev/null >&5\"") >&5
++{ (eval echo "$as_me:1964: \"$ac_compiler -V </dev/null >&5\"") >&5
+   (eval $ac_compiler -V </dev/null >&5) 2>&5
+   ac_status=$?
+-  echo "$as_me:1966: \$? = $ac_status" >&5
++  echo "$as_me:1967: \$? = $ac_status" >&5
+   (exit $ac_status); }
+ 
+-echo "$as_me:1969: checking whether we are using the GNU C++ compiler" >&5
++echo "$as_me:1970: checking whether we are using the GNU C++ compiler" >&5
+ echo $ECHO_N "checking whether we are using the GNU C++ compiler... $ECHO_C" >&6
+ if test "${ac_cv_cxx_compiler_gnu+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 1975 "configure"
++#line 1976 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -1987,16 +1988,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:1990: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:1991: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:1993: \$? = $ac_status" >&5
++  echo "$as_me:1994: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:1996: \"$ac_try\"") >&5
++  { (eval echo "$as_me:1997: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:1999: \$? = $ac_status" >&5
++  echo "$as_me:2000: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_compiler_gnu=yes
+ else
+@@ -2008,19 +2009,19 @@
+ ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
+ 
+ fi
+-echo "$as_me:2011: result: $ac_cv_cxx_compiler_gnu" >&5
++echo "$as_me:2012: result: $ac_cv_cxx_compiler_gnu" >&5
+ echo "${ECHO_T}$ac_cv_cxx_compiler_gnu" >&6
+ GXX=`test $ac_compiler_gnu = yes && echo yes`
+ ac_test_CXXFLAGS=${CXXFLAGS+set}
+ ac_save_CXXFLAGS=$CXXFLAGS
+ CXXFLAGS="-g"
+-echo "$as_me:2017: checking whether $CXX accepts -g" >&5
++echo "$as_me:2018: checking whether $CXX accepts -g" >&5
+ echo $ECHO_N "checking whether $CXX accepts -g... $ECHO_C" >&6
+ if test "${ac_cv_prog_cxx_g+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 2023 "configure"
++#line 2024 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -2032,16 +2033,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:2035: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:2036: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:2038: \$? = $ac_status" >&5
++  echo "$as_me:2039: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:2041: \"$ac_try\"") >&5
++  { (eval echo "$as_me:2042: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:2044: \$? = $ac_status" >&5
++  echo "$as_me:2045: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_prog_cxx_g=yes
+ else
+@@ -2051,7 +2052,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:2054: result: $ac_cv_prog_cxx_g" >&5
++echo "$as_me:2055: result: $ac_cv_prog_cxx_g" >&5
+ echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6
+ if test "$ac_test_CXXFLAGS" = set; then
+   CXXFLAGS=$ac_save_CXXFLAGS
+@@ -2078,7 +2079,7 @@
+    'void exit (int);'
+ do
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 2081 "configure"
++#line 2082 "configure"
+ #include "confdefs.h"
+ #include <stdlib.h>
+ $ac_declaration
+@@ -2091,16 +2092,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:2094: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:2095: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:2097: \$? = $ac_status" >&5
++  echo "$as_me:2098: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:2100: \"$ac_try\"") >&5
++  { (eval echo "$as_me:2101: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:2103: \$? = $ac_status" >&5
++  echo "$as_me:2104: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   :
+ else
+@@ -2110,7 +2111,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 2113 "configure"
++#line 2114 "configure"
+ #include "confdefs.h"
+ $ac_declaration
+ int
+@@ -2122,16 +2123,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:2125: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:2126: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:2128: \$? = $ac_status" >&5
++  echo "$as_me:2129: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:2131: \"$ac_try\"") >&5
++  { (eval echo "$as_me:2132: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:2134: \$? = $ac_status" >&5
++  echo "$as_me:2135: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   break
+ else
+@@ -2162,7 +2163,7 @@
+ 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
+-echo "$as_me:2165: checking for $ac_word" >&5
++echo "$as_me:2166: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_CC+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -2177,7 +2178,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_CC="${ac_tool_prefix}gcc"
+-echo "$as_me:2180: found $ac_dir/$ac_word" >&5
++echo "$as_me:2181: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -2185,10 +2186,10 @@
+ fi
+ CC=$ac_cv_prog_CC
+ if test -n "$CC"; then
+-  echo "$as_me:2188: result: $CC" >&5
++  echo "$as_me:2189: result: $CC" >&5
+ echo "${ECHO_T}$CC" >&6
+ else
+-  echo "$as_me:2191: result: no" >&5
++  echo "$as_me:2192: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -2197,7 +2198,7 @@
+   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
+-echo "$as_me:2200: checking for $ac_word" >&5
++echo "$as_me:2201: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -2212,7 +2213,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_ac_ct_CC="gcc"
+-echo "$as_me:2215: found $ac_dir/$ac_word" >&5
++echo "$as_me:2216: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -2220,10 +2221,10 @@
+ fi
+ ac_ct_CC=$ac_cv_prog_ac_ct_CC
+ if test -n "$ac_ct_CC"; then
+-  echo "$as_me:2223: result: $ac_ct_CC" >&5
++  echo "$as_me:2224: result: $ac_ct_CC" >&5
+ echo "${ECHO_T}$ac_ct_CC" >&6
+ else
+-  echo "$as_me:2226: result: no" >&5
++  echo "$as_me:2227: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -2236,7 +2237,7 @@
+   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
+-echo "$as_me:2239: checking for $ac_word" >&5
++echo "$as_me:2240: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_CC+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -2251,7 +2252,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_CC="${ac_tool_prefix}cc"
+-echo "$as_me:2254: found $ac_dir/$ac_word" >&5
++echo "$as_me:2255: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -2259,10 +2260,10 @@
+ fi
+ CC=$ac_cv_prog_CC
+ if test -n "$CC"; then
+-  echo "$as_me:2262: result: $CC" >&5
++  echo "$as_me:2263: result: $CC" >&5
+ echo "${ECHO_T}$CC" >&6
+ else
+-  echo "$as_me:2265: result: no" >&5
++  echo "$as_me:2266: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -2271,7 +2272,7 @@
+   ac_ct_CC=$CC
+   # Extract the first word of "cc", so it can be a program name with args.
+ set dummy cc; ac_word=$2
+-echo "$as_me:2274: checking for $ac_word" >&5
++echo "$as_me:2275: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -2286,7 +2287,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_ac_ct_CC="cc"
+-echo "$as_me:2289: found $ac_dir/$ac_word" >&5
++echo "$as_me:2290: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -2294,10 +2295,10 @@
+ fi
+ ac_ct_CC=$ac_cv_prog_ac_ct_CC
+ if test -n "$ac_ct_CC"; then
+-  echo "$as_me:2297: result: $ac_ct_CC" >&5
++  echo "$as_me:2298: result: $ac_ct_CC" >&5
+ echo "${ECHO_T}$ac_ct_CC" >&6
+ else
+-  echo "$as_me:2300: result: no" >&5
++  echo "$as_me:2301: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -2310,7 +2311,7 @@
+ 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
+-echo "$as_me:2313: checking for $ac_word" >&5
++echo "$as_me:2314: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_CC+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -2330,7 +2331,7 @@
+   continue
+ fi
+ ac_cv_prog_CC="cc"
+-echo "$as_me:2333: found $ac_dir/$ac_word" >&5
++echo "$as_me:2334: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -2352,10 +2353,10 @@
+ fi
+ CC=$ac_cv_prog_CC
+ if test -n "$CC"; then
+-  echo "$as_me:2355: result: $CC" >&5
++  echo "$as_me:2356: result: $CC" >&5
+ echo "${ECHO_T}$CC" >&6
+ else
+-  echo "$as_me:2358: result: no" >&5
++  echo "$as_me:2359: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -2366,7 +2367,7 @@
+   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
+-echo "$as_me:2369: checking for $ac_word" >&5
++echo "$as_me:2370: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_CC+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -2381,7 +2382,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
+-echo "$as_me:2384: found $ac_dir/$ac_word" >&5
++echo "$as_me:2385: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -2389,10 +2390,10 @@
+ fi
+ CC=$ac_cv_prog_CC
+ if test -n "$CC"; then
+-  echo "$as_me:2392: result: $CC" >&5
++  echo "$as_me:2393: result: $CC" >&5
+ echo "${ECHO_T}$CC" >&6
+ else
+-  echo "$as_me:2395: result: no" >&5
++  echo "$as_me:2396: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -2405,7 +2406,7 @@
+ do
+   # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+-echo "$as_me:2408: checking for $ac_word" >&5
++echo "$as_me:2409: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -2420,7 +2421,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_ac_ct_CC="$ac_prog"
+-echo "$as_me:2423: found $ac_dir/$ac_word" >&5
++echo "$as_me:2424: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -2428,10 +2429,10 @@
+ fi
+ ac_ct_CC=$ac_cv_prog_ac_ct_CC
+ if test -n "$ac_ct_CC"; then
+-  echo "$as_me:2431: result: $ac_ct_CC" >&5
++  echo "$as_me:2432: result: $ac_ct_CC" >&5
+ echo "${ECHO_T}$ac_ct_CC" >&6
+ else
+-  echo "$as_me:2434: result: no" >&5
++  echo "$as_me:2435: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -2443,37 +2444,37 @@
+ 
+ fi
+ 
+-test -z "$CC" && { { echo "$as_me:2446: error: no acceptable cc found in \$PATH" >&5
++test -z "$CC" && { { echo "$as_me:2447: error: no acceptable cc found in \$PATH" >&5
+ echo "$as_me: error: no acceptable cc found in \$PATH" >&2;}
+    { (exit 1); exit 1; }; }
+ 
+ # Provide some information about the compiler.
+-echo "$as_me:2451:" \
++echo "$as_me:2452:" \
+      "checking for C compiler version" >&5
+ ac_compiler=`set X $ac_compile; echo $2`
+-{ (eval echo "$as_me:2454: \"$ac_compiler --version </dev/null >&5\"") >&5
++{ (eval echo "$as_me:2455: \"$ac_compiler --version </dev/null >&5\"") >&5
+   (eval $ac_compiler --version </dev/null >&5) 2>&5
+   ac_status=$?
+-  echo "$as_me:2457: \$? = $ac_status" >&5
++  echo "$as_me:2458: \$? = $ac_status" >&5
+   (exit $ac_status); }
+-{ (eval echo "$as_me:2459: \"$ac_compiler -v </dev/null >&5\"") >&5
++{ (eval echo "$as_me:2460: \"$ac_compiler -v </dev/null >&5\"") >&5
+   (eval $ac_compiler -v </dev/null >&5) 2>&5
+   ac_status=$?
+-  echo "$as_me:2462: \$? = $ac_status" >&5
++  echo "$as_me:2463: \$? = $ac_status" >&5
+   (exit $ac_status); }
+-{ (eval echo "$as_me:2464: \"$ac_compiler -V </dev/null >&5\"") >&5
++{ (eval echo "$as_me:2465: \"$ac_compiler -V </dev/null >&5\"") >&5
+   (eval $ac_compiler -V </dev/null >&5) 2>&5
+   ac_status=$?
+-  echo "$as_me:2467: \$? = $ac_status" >&5
++  echo "$as_me:2468: \$? = $ac_status" >&5
+   (exit $ac_status); }
+ 
+-echo "$as_me:2470: checking whether we are using the GNU C compiler" >&5
++echo "$as_me:2471: checking whether we are using the GNU C compiler" >&5
+ echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6
+ if test "${ac_cv_c_compiler_gnu+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 2476 "configure"
++#line 2477 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -2488,16 +2489,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:2491: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:2492: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:2494: \$? = $ac_status" >&5
++  echo "$as_me:2495: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:2497: \"$ac_try\"") >&5
++  { (eval echo "$as_me:2498: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:2500: \$? = $ac_status" >&5
++  echo "$as_me:2501: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_compiler_gnu=yes
+ else
+@@ -2509,19 +2510,19 @@
+ ac_cv_c_compiler_gnu=$ac_compiler_gnu
+ 
+ fi
+-echo "$as_me:2512: result: $ac_cv_c_compiler_gnu" >&5
++echo "$as_me:2513: result: $ac_cv_c_compiler_gnu" >&5
+ echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6
+ GCC=`test $ac_compiler_gnu = yes && echo yes`
+ ac_test_CFLAGS=${CFLAGS+set}
+ ac_save_CFLAGS=$CFLAGS
+ CFLAGS="-g"
+-echo "$as_me:2518: checking whether $CC accepts -g" >&5
++echo "$as_me:2519: checking whether $CC accepts -g" >&5
+ echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6
+ if test "${ac_cv_prog_cc_g+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 2524 "configure"
++#line 2525 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -2533,16 +2534,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:2536: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:2537: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:2539: \$? = $ac_status" >&5
++  echo "$as_me:2540: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:2542: \"$ac_try\"") >&5
++  { (eval echo "$as_me:2543: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:2545: \$? = $ac_status" >&5
++  echo "$as_me:2546: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_prog_cc_g=yes
+ else
+@@ -2552,7 +2553,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:2555: result: $ac_cv_prog_cc_g" >&5
++echo "$as_me:2556: result: $ac_cv_prog_cc_g" >&5
+ echo "${ECHO_T}$ac_cv_prog_cc_g" >&6
+ if test "$ac_test_CFLAGS" = set; then
+   CFLAGS=$ac_save_CFLAGS
+@@ -2579,16 +2580,16 @@
+ #endif
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:2582: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:2583: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:2585: \$? = $ac_status" >&5
++  echo "$as_me:2586: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:2588: \"$ac_try\"") >&5
++  { (eval echo "$as_me:2589: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:2591: \$? = $ac_status" >&5
++  echo "$as_me:2592: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   for ac_declaration in \
+    ''\
+@@ -2600,7 +2601,7 @@
+    'void exit (int);'
+ do
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 2603 "configure"
++#line 2604 "configure"
+ #include "confdefs.h"
+ #include <stdlib.h>
+ $ac_declaration
+@@ -2613,16 +2614,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:2616: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:2617: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:2619: \$? = $ac_status" >&5
++  echo "$as_me:2620: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:2622: \"$ac_try\"") >&5
++  { (eval echo "$as_me:2623: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:2625: \$? = $ac_status" >&5
++  echo "$as_me:2626: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   :
+ else
+@@ -2632,7 +2633,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 2635 "configure"
++#line 2636 "configure"
+ #include "confdefs.h"
+ $ac_declaration
+ int
+@@ -2644,16 +2645,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:2647: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:2648: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:2650: \$? = $ac_status" >&5
++  echo "$as_me:2651: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:2653: \"$ac_try\"") >&5
++  { (eval echo "$as_me:2654: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:2656: \$? = $ac_status" >&5
++  echo "$as_me:2657: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   break
+ else
+@@ -2686,10 +2687,10 @@
+ 
+ ice_save_CXXFLAGS=$CXXFLAGS
+ CXXFLAGS="-fno-rtti $CXXFLAGS"
+-echo "$as_me:2689: checking whether the C++ compiler ($CXX) accepts no_rtti" >&5
++echo "$as_me:2690: checking whether the C++ compiler ($CXX) accepts no_rtti" >&5
+ echo $ECHO_N "checking whether the C++ compiler ($CXX) accepts no_rtti... $ECHO_C" >&6
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 2692 "configure"
++#line 2693 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -2701,16 +2702,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:2704: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:2705: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:2707: \$? = $ac_status" >&5
++  echo "$as_me:2708: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:2710: \"$ac_try\"") >&5
++  { (eval echo "$as_me:2711: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:2713: \$? = $ac_status" >&5
++  echo "$as_me:2714: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ice_tmp_result=yes
+ else
+@@ -2719,16 +2720,16 @@
+ ice_tmp_result=no; CXXFLAGS=$ice_save_CXXFLAGS
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+-echo "$as_me:2722: result: $ice_tmp_result" >&5
++echo "$as_me:2723: result: $ice_tmp_result" >&5
+ echo "${ECHO_T}$ice_tmp_result" >&6
+ no_rtti_ok=$ice_tmp_result
+ 
+ ice_save_CXXFLAGS=$CXXFLAGS
+ CXXFLAGS="-fno-exceptions $CXXFLAGS"
+-echo "$as_me:2728: checking whether the C++ compiler ($CXX) accepts no_exceptions" >&5
++echo "$as_me:2729: checking whether the C++ compiler ($CXX) accepts no_exceptions" >&5
+ echo $ECHO_N "checking whether the C++ compiler ($CXX) accepts no_exceptions... $ECHO_C" >&6
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 2731 "configure"
++#line 2732 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -2740,16 +2741,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:2743: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:2744: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:2746: \$? = $ac_status" >&5
++  echo "$as_me:2747: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:2749: \"$ac_try\"") >&5
++  { (eval echo "$as_me:2750: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:2752: \$? = $ac_status" >&5
++  echo "$as_me:2753: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ice_tmp_result=yes
+ else
+@@ -2758,7 +2759,7 @@
+ ice_tmp_result=no; CXXFLAGS=$ice_save_CXXFLAGS
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+-echo "$as_me:2761: result: $ice_tmp_result" >&5
++echo "$as_me:2762: result: $ice_tmp_result" >&5
+ echo "${ECHO_T}$ice_tmp_result" >&6
+ no_exceptions_ok=$ice_tmp_result
+ 
+@@ -2766,10 +2767,10 @@
+ 
+ ice_save_CXXFLAGS=$CXXFLAGS
+ CXXFLAGS="-fno-handle-exceptions $CXXFLAGS"
+-echo "$as_me:2769: checking whether the C++ compiler ($CXX) accepts no_exceptions" >&5
++echo "$as_me:2770: checking whether the C++ compiler ($CXX) accepts no_exceptions" >&5
+ echo $ECHO_N "checking whether the C++ compiler ($CXX) accepts no_exceptions... $ECHO_C" >&6
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 2772 "configure"
++#line 2773 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -2781,16 +2782,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:2784: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:2785: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:2787: \$? = $ac_status" >&5
++  echo "$as_me:2788: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:2790: \"$ac_try\"") >&5
++  { (eval echo "$as_me:2791: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:2793: \$? = $ac_status" >&5
++  echo "$as_me:2794: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ice_tmp_result=yes
+ else
+@@ -2799,7 +2800,7 @@
+ ice_tmp_result=no; CXXFLAGS=$ice_save_CXXFLAGS
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+-echo "$as_me:2802: result: $ice_tmp_result" >&5
++echo "$as_me:2803: result: $ice_tmp_result" >&5
+ echo "${ECHO_T}$ice_tmp_result" >&6
+ no_exceptions_ok=$ice_tmp_result
+ 
+@@ -2810,10 +2811,10 @@
+ 
+ ice_save_CXXFLAGS=$CXXFLAGS
+ CXXFLAGS="-Wall -Wpointer-arith -Wconversion -Wwrite-strings -Wmissing-prototypes -Wmissing-declarations -Winline -Woverloaded-virtual -W $CXXFLAGS"
+-echo "$as_me:2813: checking whether the C++ compiler ($CXX) accepts warn_xxx" >&5
++echo "$as_me:2814: checking whether the C++ compiler ($CXX) accepts warn_xxx" >&5
+ echo $ECHO_N "checking whether the C++ compiler ($CXX) accepts warn_xxx... $ECHO_C" >&6
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 2816 "configure"
++#line 2817 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -2825,16 +2826,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:2828: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:2829: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:2831: \$? = $ac_status" >&5
++  echo "$as_me:2832: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:2834: \"$ac_try\"") >&5
++  { (eval echo "$as_me:2835: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:2837: \$? = $ac_status" >&5
++  echo "$as_me:2838: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ice_tmp_result=yes
+ else
+@@ -2843,16 +2844,16 @@
+ ice_tmp_result=no; CXXFLAGS=$ice_save_CXXFLAGS
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+-echo "$as_me:2846: result: $ice_tmp_result" >&5
++echo "$as_me:2847: result: $ice_tmp_result" >&5
+ echo "${ECHO_T}$ice_tmp_result" >&6
+ warn_xxx_ok=$ice_tmp_result
+ 
+ ice_save_CXXFLAGS=$CXXFLAGS
+ CXXFLAGS="-fpermissive $CXXFLAGS"
+-echo "$as_me:2852: checking whether the C++ compiler ($CXX) accepts permissive" >&5
++echo "$as_me:2853: checking whether the C++ compiler ($CXX) accepts permissive" >&5
+ echo $ECHO_N "checking whether the C++ compiler ($CXX) accepts permissive... $ECHO_C" >&6
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 2855 "configure"
++#line 2856 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -2864,16 +2865,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:2867: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:2868: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:2870: \$? = $ac_status" >&5
++  echo "$as_me:2871: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:2873: \"$ac_try\"") >&5
++  { (eval echo "$as_me:2874: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:2876: \$? = $ac_status" >&5
++  echo "$as_me:2877: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ice_tmp_result=yes
+ else
+@@ -2882,7 +2883,7 @@
+ ice_tmp_result=no; CXXFLAGS=$ice_save_CXXFLAGS
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+-echo "$as_me:2885: result: $ice_tmp_result" >&5
++echo "$as_me:2886: result: $ice_tmp_result" >&5
+ echo "${ECHO_T}$ice_tmp_result" >&6
+ permissive_ok=$ice_tmp_result
+ 
+@@ -2892,10 +2893,10 @@
+   CXX_LINK=$CXX
+ fi
+ 
+-echo "$as_me:2895: checking if we need our own C++ allocation operators" >&5
++echo "$as_me:2896: checking if we need our own C++ allocation operators" >&5
+ echo $ECHO_N "checking if we need our own C++ allocation operators... $ECHO_C" >&6
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 2898 "configure"
++#line 2899 "configure"
+ #include "confdefs.h"
+  void icewm_alloc() {
+   char * cp = new char; delete cp;
+@@ -2909,23 +2910,23 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:2912: \"$ac_link\"") >&5
++if { (eval echo "$as_me:2913: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:2915: \$? = $ac_status" >&5
++  echo "$as_me:2916: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:2918: \"$ac_try\"") >&5
++  { (eval echo "$as_me:2919: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:2921: \$? = $ac_status" >&5
++  echo "$as_me:2922: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+-   echo "$as_me:2923: result: no" >&5
++   echo "$as_me:2924: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ else
+   echo "$as_me: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+- echo "$as_me:2928: result: yes" >&5
++ echo "$as_me:2929: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ 
+ cat >>confdefs.h <<\EOF
+@@ -2952,7 +2953,7 @@
+ # AFS /usr/afsws/bin/install, which mishandles nonexistent args
+ # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
+ # ./install, which can be erroneously created by make from ./install.sh.
+-echo "$as_me:2955: checking for a BSD compatible install" >&5
++echo "$as_me:2956: checking for a BSD compatible install" >&5
+ echo $ECHO_N "checking for a BSD compatible install... $ECHO_C" >&6
+ if test -z "$INSTALL"; then
+ if test "${ac_cv_path_install+set}" = set; then
+@@ -3001,7 +3002,7 @@
+     INSTALL=$ac_install_sh
+   fi
+ fi
+-echo "$as_me:3004: result: $INSTALL" >&5
++echo "$as_me:3005: result: $INSTALL" >&5
+ echo "${ECHO_T}$INSTALL" >&6
+ 
+ # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
+@@ -3015,13 +3016,13 @@
+ ac_header_dirent=no
+ for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do
+   as_ac_Header=`echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh`
+-echo "$as_me:3018: checking for $ac_hdr that defines DIR" >&5
++echo "$as_me:3019: checking for $ac_hdr that defines DIR" >&5
+ echo $ECHO_N "checking for $ac_hdr that defines DIR... $ECHO_C" >&6
+ if eval "test \"\${$as_ac_Header+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 3024 "configure"
++#line 3025 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #include <$ac_hdr>
+@@ -3036,16 +3037,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:3039: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:3040: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:3042: \$? = $ac_status" >&5
++  echo "$as_me:3043: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:3045: \"$ac_try\"") >&5
++  { (eval echo "$as_me:3046: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:3048: \$? = $ac_status" >&5
++  echo "$as_me:3049: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   eval "$as_ac_Header=yes"
+ else
+@@ -3055,7 +3056,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:3058: result: `eval echo '${'$as_ac_Header'}'`" >&5
++echo "$as_me:3059: result: `eval echo '${'$as_ac_Header'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+ if test `eval echo '${'$as_ac_Header'}'` = yes; then
+   cat >>confdefs.h <<EOF
+@@ -3068,7 +3069,7 @@
+ done
+ # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
+ if test $ac_header_dirent = dirent.h; then
+-  echo "$as_me:3071: checking for opendir in -ldir" >&5
++  echo "$as_me:3072: checking for opendir in -ldir" >&5
+ echo $ECHO_N "checking for opendir in -ldir... $ECHO_C" >&6
+ if test "${ac_cv_lib_dir_opendir+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -3076,7 +3077,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldir  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 3079 "configure"
++#line 3080 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -3095,16 +3096,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:3098: \"$ac_link\"") >&5
++if { (eval echo "$as_me:3099: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:3101: \$? = $ac_status" >&5
++  echo "$as_me:3102: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:3104: \"$ac_try\"") >&5
++  { (eval echo "$as_me:3105: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:3107: \$? = $ac_status" >&5
++  echo "$as_me:3108: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_dir_opendir=yes
+ else
+@@ -3115,14 +3116,14 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:3118: result: $ac_cv_lib_dir_opendir" >&5
++echo "$as_me:3119: result: $ac_cv_lib_dir_opendir" >&5
+ echo "${ECHO_T}$ac_cv_lib_dir_opendir" >&6
+ if test $ac_cv_lib_dir_opendir = yes; then
+   LIBS="$LIBS -ldir"
+ fi
+ 
+ else
+-  echo "$as_me:3125: checking for opendir in -lx" >&5
++  echo "$as_me:3126: checking for opendir in -lx" >&5
+ echo $ECHO_N "checking for opendir in -lx... $ECHO_C" >&6
+ if test "${ac_cv_lib_x_opendir+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -3130,7 +3131,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lx  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 3133 "configure"
++#line 3134 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -3149,16 +3150,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:3152: \"$ac_link\"") >&5
++if { (eval echo "$as_me:3153: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:3155: \$? = $ac_status" >&5
++  echo "$as_me:3156: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:3158: \"$ac_try\"") >&5
++  { (eval echo "$as_me:3159: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:3161: \$? = $ac_status" >&5
++  echo "$as_me:3162: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_x_opendir=yes
+ else
+@@ -3169,7 +3170,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:3172: result: $ac_cv_lib_x_opendir" >&5
++echo "$as_me:3173: result: $ac_cv_lib_x_opendir" >&5
+ echo "${ECHO_T}$ac_cv_lib_x_opendir" >&6
+ if test $ac_cv_lib_x_opendir = yes; then
+   LIBS="$LIBS -lx"
+@@ -3177,13 +3178,13 @@
+ 
+ fi
+ 
+-echo "$as_me:3180: checking for sys/wait.h that is POSIX.1 compatible" >&5
++echo "$as_me:3181: checking for sys/wait.h that is POSIX.1 compatible" >&5
+ echo $ECHO_N "checking for sys/wait.h that is POSIX.1 compatible... $ECHO_C" >&6
+ if test "${ac_cv_header_sys_wait_h+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 3186 "configure"
++#line 3187 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #include <sys/wait.h>
+@@ -3205,16 +3206,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:3208: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:3209: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:3211: \$? = $ac_status" >&5
++  echo "$as_me:3212: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:3214: \"$ac_try\"") >&5
++  { (eval echo "$as_me:3215: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:3217: \$? = $ac_status" >&5
++  echo "$as_me:3218: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_header_sys_wait_h=yes
+ else
+@@ -3224,7 +3225,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:3227: result: $ac_cv_header_sys_wait_h" >&5
++echo "$as_me:3228: result: $ac_cv_header_sys_wait_h" >&5
+ echo "${ECHO_T}$ac_cv_header_sys_wait_h" >&6
+ if test $ac_cv_header_sys_wait_h = yes; then
+ 
+@@ -3239,7 +3240,7 @@
+ 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
+-echo "$as_me:3242: checking how to run the C++ preprocessor" >&5
++echo "$as_me:3243: checking how to run the C++ preprocessor" >&5
+ echo $ECHO_N "checking how to run the C++ preprocessor... $ECHO_C" >&6
+ if test -z "$CXXCPP"; then
+   if test "${ac_cv_prog_CXXCPP+set}" = set; then
+@@ -3256,18 +3257,18 @@
+   # On the NeXT, cc -E runs the code through the compiler's parser,
+   # not just through cpp. "Syntax error" is here to catch this case.
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 3259 "configure"
++#line 3260 "configure"
+ #include "confdefs.h"
+ #include <assert.h>
+                      Syntax error
+ _ACEOF
+-if { (eval echo "$as_me:3264: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:3265: \"$ac_cpp conftest.$ac_ext\"") >&5
+   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+   ac_status=$?
+   egrep -v '^ *\+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  echo "$as_me:3270: \$? = $ac_status" >&5
++  echo "$as_me:3271: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_cxx_preproc_warn_flag
+@@ -3290,17 +3291,17 @@
+   # OK, works on sane cases.  Now check whether non-existent headers
+   # can be detected and how.
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 3293 "configure"
++#line 3294 "configure"
+ #include "confdefs.h"
+ #include <ac_nonexistent.h>
+ _ACEOF
+-if { (eval echo "$as_me:3297: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:3298: \"$ac_cpp conftest.$ac_ext\"") >&5
+   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+   ac_status=$?
+   egrep -v '^ *\+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  echo "$as_me:3303: \$? = $ac_status" >&5
++  echo "$as_me:3304: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_cxx_preproc_warn_flag
+@@ -3337,7 +3338,7 @@
+ else
+   ac_cv_prog_CXXCPP=$CXXCPP
+ fi
+-echo "$as_me:3340: result: $CXXCPP" >&5
++echo "$as_me:3341: result: $CXXCPP" >&5
+ echo "${ECHO_T}$CXXCPP" >&6
+ ac_preproc_ok=false
+ for ac_cxx_preproc_warn_flag in '' yes
+@@ -3347,18 +3348,18 @@
+   # On the NeXT, cc -E runs the code through the compiler's parser,
+   # not just through cpp. "Syntax error" is here to catch this case.
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 3350 "configure"
++#line 3351 "configure"
+ #include "confdefs.h"
+ #include <assert.h>
+                      Syntax error
+ _ACEOF
+-if { (eval echo "$as_me:3355: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:3356: \"$ac_cpp conftest.$ac_ext\"") >&5
+   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+   ac_status=$?
+   egrep -v '^ *\+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  echo "$as_me:3361: \$? = $ac_status" >&5
++  echo "$as_me:3362: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_cxx_preproc_warn_flag
+@@ -3381,17 +3382,17 @@
+   # OK, works on sane cases.  Now check whether non-existent headers
+   # can be detected and how.
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 3384 "configure"
++#line 3385 "configure"
+ #include "confdefs.h"
+ #include <ac_nonexistent.h>
+ _ACEOF
+-if { (eval echo "$as_me:3388: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:3389: \"$ac_cpp conftest.$ac_ext\"") >&5
+   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+   ac_status=$?
+   egrep -v '^ *\+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  echo "$as_me:3394: \$? = $ac_status" >&5
++  echo "$as_me:3395: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_cxx_preproc_warn_flag
+@@ -3419,7 +3420,7 @@
+ if $ac_preproc_ok; then
+   :
+ else
+-  { { echo "$as_me:3422: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5
++  { { echo "$as_me:3423: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5
+ echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -3433,23 +3434,23 @@
+ for ac_header in fcntl.h limits.h strings.h sys/ioctl.h sys/time.h unistd.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:3436: checking for $ac_header" >&5
++echo "$as_me:3437: checking for $ac_header" >&5
+ echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+ if eval "test \"\${$as_ac_Header+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 3442 "configure"
++#line 3443 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:3446: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:3447: \"$ac_cpp conftest.$ac_ext\"") >&5
+   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+   ac_status=$?
+   egrep -v '^ *\+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  echo "$as_me:3452: \$? = $ac_status" >&5
++  echo "$as_me:3453: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_cxx_preproc_warn_flag
+@@ -3468,7 +3469,7 @@
+ fi
+ rm -f conftest.err conftest.$ac_ext
+ fi
+-echo "$as_me:3471: result: `eval echo '${'$as_ac_Header'}'`" >&5
++echo "$as_me:3472: result: `eval echo '${'$as_ac_Header'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+ if test `eval echo '${'$as_ac_Header'}'` = yes; then
+   cat >>confdefs.h <<EOF
+@@ -3481,23 +3482,23 @@
+ for ac_header in linux/threads.h linux/tasks.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:3484: checking for $ac_header" >&5
++echo "$as_me:3485: checking for $ac_header" >&5
+ echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+ if eval "test \"\${$as_ac_Header+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 3490 "configure"
++#line 3491 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:3494: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:3495: \"$ac_cpp conftest.$ac_ext\"") >&5
+   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+   ac_status=$?
+   egrep -v '^ *\+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  echo "$as_me:3500: \$? = $ac_status" >&5
++  echo "$as_me:3501: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_cxx_preproc_warn_flag
+@@ -3516,7 +3517,7 @@
+ fi
+ rm -f conftest.err conftest.$ac_ext
+ fi
+-echo "$as_me:3519: result: `eval echo '${'$as_ac_Header'}'`" >&5
++echo "$as_me:3520: result: `eval echo '${'$as_ac_Header'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+ if test `eval echo '${'$as_ac_Header'}'` = yes; then
+   cat >>confdefs.h <<EOF
+@@ -3529,23 +3530,23 @@
+ for ac_header in kstat.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:3532: checking for $ac_header" >&5
++echo "$as_me:3533: checking for $ac_header" >&5
+ echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+ if eval "test \"\${$as_ac_Header+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 3538 "configure"
++#line 3539 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:3542: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:3543: \"$ac_cpp conftest.$ac_ext\"") >&5
+   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+   ac_status=$?
+   egrep -v '^ *\+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  echo "$as_me:3548: \$? = $ac_status" >&5
++  echo "$as_me:3549: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_cxx_preproc_warn_flag
+@@ -3564,7 +3565,7 @@
+ fi
+ rm -f conftest.err conftest.$ac_ext
+ fi
+-echo "$as_me:3567: result: `eval echo '${'$as_ac_Header'}'`" >&5
++echo "$as_me:3568: result: `eval echo '${'$as_ac_Header'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+ if test `eval echo '${'$as_ac_Header'}'` = yes; then
+   cat >>confdefs.h <<EOF
+@@ -3572,10 +3573,10 @@
+ EOF
+   CORE_LIBS="${CORE_LIBS} -lkstat"
+ 
+-    echo "$as_me:3575: checking if have old kstat" >&5
++    echo "$as_me:3576: checking if have old kstat" >&5
+ echo $ECHO_N "checking if have old kstat... $ECHO_C" >&6
+     cat >conftest.$ac_ext <<_ACEOF
+-#line 3578 "configure"
++#line 3579 "configure"
+ #include "confdefs.h"
+ #include <kstat.h>
+ int
+@@ -3587,23 +3588,23 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:3590: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:3591: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:3593: \$? = $ac_status" >&5
++  echo "$as_me:3594: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:3596: \"$ac_try\"") >&5
++  { (eval echo "$as_me:3597: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:3599: \$? = $ac_status" >&5
++  echo "$as_me:3600: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+-   echo "$as_me:3601: result: no" >&5
++   echo "$as_me:3602: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ else
+   echo "$as_me: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+- echo "$as_me:3606: result: yes" >&5
++ echo "$as_me:3607: result: yes" >&5
+ echo "${ECHO_T}yes" >&6; cat >>confdefs.h <<\EOF
+ #define HAVE_OLD_KSTAT 1
+ EOF
+@@ -3613,13 +3614,13 @@
+ fi
+ done
+ 
+-echo "$as_me:3616: checking for ANSI C header files" >&5
++echo "$as_me:3617: checking for ANSI C header files" >&5
+ echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
+ if test "${ac_cv_header_stdc+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 3622 "configure"
++#line 3623 "configure"
+ #include "confdefs.h"
+ #include <stdlib.h>
+ #include <stdarg.h>
+@@ -3627,13 +3628,13 @@
+ #include <float.h>
+ 
+ _ACEOF
+-if { (eval echo "$as_me:3630: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:3631: \"$ac_cpp conftest.$ac_ext\"") >&5
+   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+   ac_status=$?
+   egrep -v '^ *\+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  echo "$as_me:3636: \$? = $ac_status" >&5
++  echo "$as_me:3637: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_cxx_preproc_warn_flag
+@@ -3655,7 +3656,7 @@
+ if test $ac_cv_header_stdc = yes; then
+   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 3658 "configure"
++#line 3659 "configure"
+ #include "confdefs.h"
+ #include <string.h>
+ 
+@@ -3673,7 +3674,7 @@
+ if test $ac_cv_header_stdc = yes; then
+   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 3676 "configure"
++#line 3677 "configure"
+ #include "confdefs.h"
+ #include <stdlib.h>
+ 
+@@ -3694,7 +3695,7 @@
+   :
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 3697 "configure"
++#line 3698 "configure"
+ #include "confdefs.h"
+ #include <ctype.h>
+ #if ((' ' & 0x0FF) == 0x020)
+@@ -3720,15 +3721,15 @@
+ }
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:3723: \"$ac_link\"") >&5
++if { (eval echo "$as_me:3724: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:3726: \$? = $ac_status" >&5
++  echo "$as_me:3727: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:3728: \"$ac_try\"") >&5
++  { (eval echo "$as_me:3729: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:3731: \$? = $ac_status" >&5
++  echo "$as_me:3732: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   :
+ else
+@@ -3741,7 +3742,7 @@
+ fi
+ fi
+ fi
+-echo "$as_me:3744: result: $ac_cv_header_stdc" >&5
++echo "$as_me:3745: result: $ac_cv_header_stdc" >&5
+ echo "${ECHO_T}$ac_cv_header_stdc" >&6
+ if test $ac_cv_header_stdc = yes; then
+ 
+@@ -3757,28 +3758,28 @@
+                   inttypes.h stdint.h unistd.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:3760: checking for $ac_header" >&5
++echo "$as_me:3761: checking for $ac_header" >&5
+ echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+ if eval "test \"\${$as_ac_Header+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 3766 "configure"
++#line 3767 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ #include <$ac_header>
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:3772: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:3773: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:3775: \$? = $ac_status" >&5
++  echo "$as_me:3776: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:3778: \"$ac_try\"") >&5
++  { (eval echo "$as_me:3779: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:3781: \$? = $ac_status" >&5
++  echo "$as_me:3782: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   eval "$as_ac_Header=yes"
+ else
+@@ -3788,7 +3789,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:3791: result: `eval echo '${'$as_ac_Header'}'`" >&5
++echo "$as_me:3792: result: `eval echo '${'$as_ac_Header'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+ if test `eval echo '${'$as_ac_Header'}'` = yes; then
+   cat >>confdefs.h <<EOF
+@@ -3798,13 +3799,13 @@
+ fi
+ done
+ 
+-echo "$as_me:3801: checking for size_t" >&5
++echo "$as_me:3802: checking for size_t" >&5
+ echo $ECHO_N "checking for size_t... $ECHO_C" >&6
+ if test "${ac_cv_type_size_t+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 3807 "configure"
++#line 3808 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -3819,16 +3820,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:3822: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:3823: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:3825: \$? = $ac_status" >&5
++  echo "$as_me:3826: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:3828: \"$ac_try\"") >&5
++  { (eval echo "$as_me:3829: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:3831: \$? = $ac_status" >&5
++  echo "$as_me:3832: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_type_size_t=yes
+ else
+@@ -3838,7 +3839,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:3841: result: $ac_cv_type_size_t" >&5
++echo "$as_me:3842: result: $ac_cv_type_size_t" >&5
+ echo "${ECHO_T}$ac_cv_type_size_t" >&6
+ if test $ac_cv_type_size_t = yes; then
+   :
+@@ -3850,13 +3851,13 @@
+ 
+ fi
+ 
+-echo "$as_me:3853: checking whether time.h and sys/time.h may both be included" >&5
++echo "$as_me:3854: checking whether time.h and sys/time.h may both be included" >&5
+ echo $ECHO_N "checking whether time.h and sys/time.h may both be included... $ECHO_C" >&6
+ if test "${ac_cv_header_time+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 3859 "configure"
++#line 3860 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #include <sys/time.h>
+@@ -3872,16 +3873,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:3875: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:3876: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:3878: \$? = $ac_status" >&5
++  echo "$as_me:3879: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:3881: \"$ac_try\"") >&5
++  { (eval echo "$as_me:3882: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:3884: \$? = $ac_status" >&5
++  echo "$as_me:3885: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_header_time=yes
+ else
+@@ -3891,7 +3892,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:3894: result: $ac_cv_header_time" >&5
++echo "$as_me:3895: result: $ac_cv_header_time" >&5
+ echo "${ECHO_T}$ac_cv_header_time" >&6
+ if test $ac_cv_header_time = yes; then
+ 
+@@ -3901,13 +3902,13 @@
+ 
+ fi
+ 
+-echo "$as_me:3904: checking whether struct tm is in sys/time.h or time.h" >&5
++echo "$as_me:3905: checking whether struct tm is in sys/time.h or time.h" >&5
+ echo $ECHO_N "checking whether struct tm is in sys/time.h or time.h... $ECHO_C" >&6
+ if test "${ac_cv_struct_tm+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 3910 "configure"
++#line 3911 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #include <time.h>
+@@ -3921,16 +3922,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:3924: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:3925: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:3927: \$? = $ac_status" >&5
++  echo "$as_me:3928: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:3930: \"$ac_try\"") >&5
++  { (eval echo "$as_me:3931: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:3933: \$? = $ac_status" >&5
++  echo "$as_me:3934: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_struct_tm=time.h
+ else
+@@ -3940,7 +3941,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:3943: result: $ac_cv_struct_tm" >&5
++echo "$as_me:3944: result: $ac_cv_struct_tm" >&5
+ echo "${ECHO_T}$ac_cv_struct_tm" >&6
+ if test $ac_cv_struct_tm = sys/time.h; then
+ 
+@@ -3950,13 +3951,13 @@
+ 
+ fi
+ 
+-echo "$as_me:3953: checking for char" >&5
++echo "$as_me:3954: checking for char" >&5
+ echo $ECHO_N "checking for char... $ECHO_C" >&6
+ if test "${ac_cv_type_char+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 3959 "configure"
++#line 3960 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -3971,16 +3972,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:3974: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:3975: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:3977: \$? = $ac_status" >&5
++  echo "$as_me:3978: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:3980: \"$ac_try\"") >&5
++  { (eval echo "$as_me:3981: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:3983: \$? = $ac_status" >&5
++  echo "$as_me:3984: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_type_char=yes
+ else
+@@ -3990,10 +3991,10 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:3993: result: $ac_cv_type_char" >&5
++echo "$as_me:3994: result: $ac_cv_type_char" >&5
+ echo "${ECHO_T}$ac_cv_type_char" >&6
+ 
+-echo "$as_me:3996: checking size of char" >&5
++echo "$as_me:3997: checking size of char" >&5
+ echo $ECHO_N "checking size of char... $ECHO_C" >&6
+ if test "${ac_cv_sizeof_char+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -4002,7 +4003,7 @@
+   if test "$cross_compiling" = yes; then
+   # Depending upon the size, compute the lo and hi bounds.
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 4005 "configure"
++#line 4006 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -4014,21 +4015,21 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:4017: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:4018: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:4020: \$? = $ac_status" >&5
++  echo "$as_me:4021: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:4023: \"$ac_try\"") >&5
++  { (eval echo "$as_me:4024: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:4026: \$? = $ac_status" >&5
++  echo "$as_me:4027: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_lo=0 ac_mid=0
+   while :; do
+     cat >conftest.$ac_ext <<_ACEOF
+-#line 4031 "configure"
++#line 4032 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -4040,16 +4041,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:4043: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:4044: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:4046: \$? = $ac_status" >&5
++  echo "$as_me:4047: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:4049: \"$ac_try\"") >&5
++  { (eval echo "$as_me:4050: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:4052: \$? = $ac_status" >&5
++  echo "$as_me:4053: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_hi=$ac_mid; break
+ else
+@@ -4065,7 +4066,7 @@
+ ac_hi=-1 ac_mid=-1
+   while :; do
+     cat >conftest.$ac_ext <<_ACEOF
+-#line 4068 "configure"
++#line 4069 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -4077,16 +4078,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:4080: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:4081: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:4083: \$? = $ac_status" >&5
++  echo "$as_me:4084: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:4086: \"$ac_try\"") >&5
++  { (eval echo "$as_me:4087: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:4089: \$? = $ac_status" >&5
++  echo "$as_me:4090: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_lo=$ac_mid; break
+ else
+@@ -4102,7 +4103,7 @@
+ while test "x$ac_lo" != "x$ac_hi"; do
+   ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 4105 "configure"
++#line 4106 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -4114,16 +4115,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:4117: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:4118: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:4120: \$? = $ac_status" >&5
++  echo "$as_me:4121: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:4123: \"$ac_try\"") >&5
++  { (eval echo "$as_me:4124: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:4126: \$? = $ac_status" >&5
++  echo "$as_me:4127: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_hi=$ac_mid
+ else
+@@ -4136,12 +4137,12 @@
+ ac_cv_sizeof_char=$ac_lo
+ else
+   if test "$cross_compiling" = yes; then
+-  { { echo "$as_me:4139: error: cannot run test program while cross compiling" >&5
++  { { echo "$as_me:4140: error: cannot run test program while cross compiling" >&5
+ echo "$as_me: error: cannot run test program while cross compiling" >&2;}
+    { (exit 1); exit 1; }; }
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 4144 "configure"
++#line 4145 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -4157,15 +4158,15 @@
+ }
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:4160: \"$ac_link\"") >&5
++if { (eval echo "$as_me:4161: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:4163: \$? = $ac_status" >&5
++  echo "$as_me:4164: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:4165: \"$ac_try\"") >&5
++  { (eval echo "$as_me:4166: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:4168: \$? = $ac_status" >&5
++  echo "$as_me:4169: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_sizeof_char=`cat conftest.val`
+ else
+@@ -4181,19 +4182,19 @@
+   ac_cv_sizeof_char=0
+ fi
+ fi
+-echo "$as_me:4184: result: $ac_cv_sizeof_char" >&5
++echo "$as_me:4185: result: $ac_cv_sizeof_char" >&5
+ echo "${ECHO_T}$ac_cv_sizeof_char" >&6
+ cat >>confdefs.h <<EOF
+ #define SIZEOF_CHAR $ac_cv_sizeof_char
+ EOF
+ 
+-echo "$as_me:4190: checking for short" >&5
++echo "$as_me:4191: checking for short" >&5
+ echo $ECHO_N "checking for short... $ECHO_C" >&6
+ if test "${ac_cv_type_short+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 4196 "configure"
++#line 4197 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -4208,16 +4209,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:4211: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:4212: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:4214: \$? = $ac_status" >&5
++  echo "$as_me:4215: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:4217: \"$ac_try\"") >&5
++  { (eval echo "$as_me:4218: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:4220: \$? = $ac_status" >&5
++  echo "$as_me:4221: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_type_short=yes
+ else
+@@ -4227,10 +4228,10 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:4230: result: $ac_cv_type_short" >&5
++echo "$as_me:4231: result: $ac_cv_type_short" >&5
+ echo "${ECHO_T}$ac_cv_type_short" >&6
+ 
+-echo "$as_me:4233: checking size of short" >&5
++echo "$as_me:4234: checking size of short" >&5
+ echo $ECHO_N "checking size of short... $ECHO_C" >&6
+ if test "${ac_cv_sizeof_short+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -4239,7 +4240,7 @@
+   if test "$cross_compiling" = yes; then
+   # Depending upon the size, compute the lo and hi bounds.
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 4242 "configure"
++#line 4243 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -4251,21 +4252,21 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:4254: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:4255: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:4257: \$? = $ac_status" >&5
++  echo "$as_me:4258: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:4260: \"$ac_try\"") >&5
++  { (eval echo "$as_me:4261: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:4263: \$? = $ac_status" >&5
++  echo "$as_me:4264: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_lo=0 ac_mid=0
+   while :; do
+     cat >conftest.$ac_ext <<_ACEOF
+-#line 4268 "configure"
++#line 4269 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -4277,16 +4278,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:4280: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:4281: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:4283: \$? = $ac_status" >&5
++  echo "$as_me:4284: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:4286: \"$ac_try\"") >&5
++  { (eval echo "$as_me:4287: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:4289: \$? = $ac_status" >&5
++  echo "$as_me:4290: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_hi=$ac_mid; break
+ else
+@@ -4302,7 +4303,7 @@
+ ac_hi=-1 ac_mid=-1
+   while :; do
+     cat >conftest.$ac_ext <<_ACEOF
+-#line 4305 "configure"
++#line 4306 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -4314,16 +4315,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:4317: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:4318: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:4320: \$? = $ac_status" >&5
++  echo "$as_me:4321: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:4323: \"$ac_try\"") >&5
++  { (eval echo "$as_me:4324: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:4326: \$? = $ac_status" >&5
++  echo "$as_me:4327: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_lo=$ac_mid; break
+ else
+@@ -4339,7 +4340,7 @@
+ while test "x$ac_lo" != "x$ac_hi"; do
+   ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 4342 "configure"
++#line 4343 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -4351,16 +4352,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:4354: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:4355: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:4357: \$? = $ac_status" >&5
++  echo "$as_me:4358: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:4360: \"$ac_try\"") >&5
++  { (eval echo "$as_me:4361: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:4363: \$? = $ac_status" >&5
++  echo "$as_me:4364: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_hi=$ac_mid
+ else
+@@ -4373,12 +4374,12 @@
+ ac_cv_sizeof_short=$ac_lo
+ else
+   if test "$cross_compiling" = yes; then
+-  { { echo "$as_me:4376: error: cannot run test program while cross compiling" >&5
++  { { echo "$as_me:4377: error: cannot run test program while cross compiling" >&5
+ echo "$as_me: error: cannot run test program while cross compiling" >&2;}
+    { (exit 1); exit 1; }; }
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 4381 "configure"
++#line 4382 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -4394,15 +4395,15 @@
+ }
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:4397: \"$ac_link\"") >&5
++if { (eval echo "$as_me:4398: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:4400: \$? = $ac_status" >&5
++  echo "$as_me:4401: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:4402: \"$ac_try\"") >&5
++  { (eval echo "$as_me:4403: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:4405: \$? = $ac_status" >&5
++  echo "$as_me:4406: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_sizeof_short=`cat conftest.val`
+ else
+@@ -4418,19 +4419,19 @@
+   ac_cv_sizeof_short=0
+ fi
+ fi
+-echo "$as_me:4421: result: $ac_cv_sizeof_short" >&5
++echo "$as_me:4422: result: $ac_cv_sizeof_short" >&5
+ echo "${ECHO_T}$ac_cv_sizeof_short" >&6
+ cat >>confdefs.h <<EOF
+ #define SIZEOF_SHORT $ac_cv_sizeof_short
+ EOF
+ 
+-echo "$as_me:4427: checking for int" >&5
++echo "$as_me:4428: checking for int" >&5
+ echo $ECHO_N "checking for int... $ECHO_C" >&6
+ if test "${ac_cv_type_int+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 4433 "configure"
++#line 4434 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -4445,16 +4446,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:4448: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:4449: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:4451: \$? = $ac_status" >&5
++  echo "$as_me:4452: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:4454: \"$ac_try\"") >&5
++  { (eval echo "$as_me:4455: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:4457: \$? = $ac_status" >&5
++  echo "$as_me:4458: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_type_int=yes
+ else
+@@ -4464,10 +4465,10 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:4467: result: $ac_cv_type_int" >&5
++echo "$as_me:4468: result: $ac_cv_type_int" >&5
+ echo "${ECHO_T}$ac_cv_type_int" >&6
+ 
+-echo "$as_me:4470: checking size of int" >&5
++echo "$as_me:4471: checking size of int" >&5
+ echo $ECHO_N "checking size of int... $ECHO_C" >&6
+ if test "${ac_cv_sizeof_int+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -4476,7 +4477,7 @@
+   if test "$cross_compiling" = yes; then
+   # Depending upon the size, compute the lo and hi bounds.
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 4479 "configure"
++#line 4480 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -4488,21 +4489,21 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:4491: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:4492: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:4494: \$? = $ac_status" >&5
++  echo "$as_me:4495: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:4497: \"$ac_try\"") >&5
++  { (eval echo "$as_me:4498: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:4500: \$? = $ac_status" >&5
++  echo "$as_me:4501: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_lo=0 ac_mid=0
+   while :; do
+     cat >conftest.$ac_ext <<_ACEOF
+-#line 4505 "configure"
++#line 4506 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -4514,16 +4515,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:4517: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:4518: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:4520: \$? = $ac_status" >&5
++  echo "$as_me:4521: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:4523: \"$ac_try\"") >&5
++  { (eval echo "$as_me:4524: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:4526: \$? = $ac_status" >&5
++  echo "$as_me:4527: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_hi=$ac_mid; break
+ else
+@@ -4539,7 +4540,7 @@
+ ac_hi=-1 ac_mid=-1
+   while :; do
+     cat >conftest.$ac_ext <<_ACEOF
+-#line 4542 "configure"
++#line 4543 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -4551,16 +4552,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:4554: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:4555: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:4557: \$? = $ac_status" >&5
++  echo "$as_me:4558: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:4560: \"$ac_try\"") >&5
++  { (eval echo "$as_me:4561: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:4563: \$? = $ac_status" >&5
++  echo "$as_me:4564: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_lo=$ac_mid; break
+ else
+@@ -4576,7 +4577,7 @@
+ while test "x$ac_lo" != "x$ac_hi"; do
+   ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 4579 "configure"
++#line 4580 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -4588,16 +4589,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:4591: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:4592: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:4594: \$? = $ac_status" >&5
++  echo "$as_me:4595: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:4597: \"$ac_try\"") >&5
++  { (eval echo "$as_me:4598: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:4600: \$? = $ac_status" >&5
++  echo "$as_me:4601: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_hi=$ac_mid
+ else
+@@ -4610,12 +4611,12 @@
+ ac_cv_sizeof_int=$ac_lo
+ else
+   if test "$cross_compiling" = yes; then
+-  { { echo "$as_me:4613: error: cannot run test program while cross compiling" >&5
++  { { echo "$as_me:4614: error: cannot run test program while cross compiling" >&5
+ echo "$as_me: error: cannot run test program while cross compiling" >&2;}
+    { (exit 1); exit 1; }; }
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 4618 "configure"
++#line 4619 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -4631,15 +4632,15 @@
+ }
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:4634: \"$ac_link\"") >&5
++if { (eval echo "$as_me:4635: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:4637: \$? = $ac_status" >&5
++  echo "$as_me:4638: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:4639: \"$ac_try\"") >&5
++  { (eval echo "$as_me:4640: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:4642: \$? = $ac_status" >&5
++  echo "$as_me:4643: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_sizeof_int=`cat conftest.val`
+ else
+@@ -4655,19 +4656,19 @@
+   ac_cv_sizeof_int=0
+ fi
+ fi
+-echo "$as_me:4658: result: $ac_cv_sizeof_int" >&5
++echo "$as_me:4659: result: $ac_cv_sizeof_int" >&5
+ echo "${ECHO_T}$ac_cv_sizeof_int" >&6
+ cat >>confdefs.h <<EOF
+ #define SIZEOF_INT $ac_cv_sizeof_int
+ EOF
+ 
+-echo "$as_me:4664: checking for long" >&5
++echo "$as_me:4665: checking for long" >&5
+ echo $ECHO_N "checking for long... $ECHO_C" >&6
+ if test "${ac_cv_type_long+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 4670 "configure"
++#line 4671 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -4682,16 +4683,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:4685: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:4686: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:4688: \$? = $ac_status" >&5
++  echo "$as_me:4689: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:4691: \"$ac_try\"") >&5
++  { (eval echo "$as_me:4692: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:4694: \$? = $ac_status" >&5
++  echo "$as_me:4695: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_type_long=yes
+ else
+@@ -4701,10 +4702,10 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:4704: result: $ac_cv_type_long" >&5
++echo "$as_me:4705: result: $ac_cv_type_long" >&5
+ echo "${ECHO_T}$ac_cv_type_long" >&6
+ 
+-echo "$as_me:4707: checking size of long" >&5
++echo "$as_me:4708: checking size of long" >&5
+ echo $ECHO_N "checking size of long... $ECHO_C" >&6
+ if test "${ac_cv_sizeof_long+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -4713,7 +4714,7 @@
+   if test "$cross_compiling" = yes; then
+   # Depending upon the size, compute the lo and hi bounds.
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 4716 "configure"
++#line 4717 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -4725,21 +4726,21 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:4728: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:4729: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:4731: \$? = $ac_status" >&5
++  echo "$as_me:4732: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:4734: \"$ac_try\"") >&5
++  { (eval echo "$as_me:4735: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:4737: \$? = $ac_status" >&5
++  echo "$as_me:4738: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_lo=0 ac_mid=0
+   while :; do
+     cat >conftest.$ac_ext <<_ACEOF
+-#line 4742 "configure"
++#line 4743 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -4751,16 +4752,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:4754: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:4755: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:4757: \$? = $ac_status" >&5
++  echo "$as_me:4758: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:4760: \"$ac_try\"") >&5
++  { (eval echo "$as_me:4761: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:4763: \$? = $ac_status" >&5
++  echo "$as_me:4764: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_hi=$ac_mid; break
+ else
+@@ -4776,7 +4777,7 @@
+ ac_hi=-1 ac_mid=-1
+   while :; do
+     cat >conftest.$ac_ext <<_ACEOF
+-#line 4779 "configure"
++#line 4780 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -4788,16 +4789,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:4791: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:4792: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:4794: \$? = $ac_status" >&5
++  echo "$as_me:4795: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:4797: \"$ac_try\"") >&5
++  { (eval echo "$as_me:4798: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:4800: \$? = $ac_status" >&5
++  echo "$as_me:4801: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_lo=$ac_mid; break
+ else
+@@ -4813,7 +4814,7 @@
+ while test "x$ac_lo" != "x$ac_hi"; do
+   ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 4816 "configure"
++#line 4817 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -4825,16 +4826,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:4828: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:4829: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:4831: \$? = $ac_status" >&5
++  echo "$as_me:4832: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:4834: \"$ac_try\"") >&5
++  { (eval echo "$as_me:4835: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:4837: \$? = $ac_status" >&5
++  echo "$as_me:4838: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_hi=$ac_mid
+ else
+@@ -4847,12 +4848,12 @@
+ ac_cv_sizeof_long=$ac_lo
+ else
+   if test "$cross_compiling" = yes; then
+-  { { echo "$as_me:4850: error: cannot run test program while cross compiling" >&5
++  { { echo "$as_me:4851: error: cannot run test program while cross compiling" >&5
+ echo "$as_me: error: cannot run test program while cross compiling" >&2;}
+    { (exit 1); exit 1; }; }
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 4855 "configure"
++#line 4856 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -4868,15 +4869,15 @@
+ }
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:4871: \"$ac_link\"") >&5
++if { (eval echo "$as_me:4872: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:4874: \$? = $ac_status" >&5
++  echo "$as_me:4875: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:4876: \"$ac_try\"") >&5
++  { (eval echo "$as_me:4877: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:4879: \$? = $ac_status" >&5
++  echo "$as_me:4880: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_sizeof_long=`cat conftest.val`
+ else
+@@ -4892,19 +4893,19 @@
+   ac_cv_sizeof_long=0
+ fi
+ fi
+-echo "$as_me:4895: result: $ac_cv_sizeof_long" >&5
++echo "$as_me:4896: result: $ac_cv_sizeof_long" >&5
+ echo "${ECHO_T}$ac_cv_sizeof_long" >&6
+ cat >>confdefs.h <<EOF
+ #define SIZEOF_LONG $ac_cv_sizeof_long
+ EOF
+ 
+-echo "$as_me:4901: checking return type of signal handlers" >&5
++echo "$as_me:4902: checking return type of signal handlers" >&5
+ echo $ECHO_N "checking return type of signal handlers... $ECHO_C" >&6
+ if test "${ac_cv_type_signal+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 4907 "configure"
++#line 4908 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #include <signal.h>
+@@ -4926,16 +4927,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:4929: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:4930: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:4932: \$? = $ac_status" >&5
++  echo "$as_me:4933: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:4935: \"$ac_try\"") >&5
++  { (eval echo "$as_me:4936: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:4938: \$? = $ac_status" >&5
++  echo "$as_me:4939: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_type_signal=void
+ else
+@@ -4945,7 +4946,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:4948: result: $ac_cv_type_signal" >&5
++echo "$as_me:4949: result: $ac_cv_type_signal" >&5
+ echo "${ECHO_T}$ac_cv_type_signal" >&6
+ 
+ cat >>confdefs.h <<EOF
+@@ -4955,13 +4956,13 @@
+ for ac_func in strftime
+ do
+ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-echo "$as_me:4958: checking for $ac_func" >&5
++echo "$as_me:4959: checking for $ac_func" >&5
+ echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+ if eval "test \"\${$as_ac_var+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 4964 "configure"
++#line 4965 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func (); below.  */
+@@ -4992,16 +4993,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:4995: \"$ac_link\"") >&5
++if { (eval echo "$as_me:4996: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:4998: \$? = $ac_status" >&5
++  echo "$as_me:4999: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:5001: \"$ac_try\"") >&5
++  { (eval echo "$as_me:5002: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:5004: \$? = $ac_status" >&5
++  echo "$as_me:5005: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   eval "$as_ac_var=yes"
+ else
+@@ -5011,7 +5012,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:5014: result: `eval echo '${'$as_ac_var'}'`" >&5
++echo "$as_me:5015: result: `eval echo '${'$as_ac_var'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+ if test `eval echo '${'$as_ac_var'}'` = yes; then
+   cat >>confdefs.h <<EOF
+@@ -5020,7 +5021,7 @@
+ 
+ else
+   # strftime is in -lintl on SCO UNIX.
+-echo "$as_me:5023: checking for strftime in -lintl" >&5
++echo "$as_me:5024: checking for strftime in -lintl" >&5
+ echo $ECHO_N "checking for strftime in -lintl... $ECHO_C" >&6
+ if test "${ac_cv_lib_intl_strftime+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -5028,7 +5029,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lintl  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 5031 "configure"
++#line 5032 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -5047,16 +5048,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:5050: \"$ac_link\"") >&5
++if { (eval echo "$as_me:5051: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:5053: \$? = $ac_status" >&5
++  echo "$as_me:5054: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:5056: \"$ac_try\"") >&5
++  { (eval echo "$as_me:5057: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:5059: \$? = $ac_status" >&5
++  echo "$as_me:5060: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_intl_strftime=yes
+ else
+@@ -5067,7 +5068,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:5070: result: $ac_cv_lib_intl_strftime" >&5
++echo "$as_me:5071: result: $ac_cv_lib_intl_strftime" >&5
+ echo "${ECHO_T}$ac_cv_lib_intl_strftime" >&6
+ if test $ac_cv_lib_intl_strftime = yes; then
+   cat >>confdefs.h <<\EOF
+@@ -5083,13 +5084,13 @@
+ for ac_func in vprintf
+ do
+ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-echo "$as_me:5086: checking for $ac_func" >&5
++echo "$as_me:5087: checking for $ac_func" >&5
+ echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+ if eval "test \"\${$as_ac_var+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 5092 "configure"
++#line 5093 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func (); below.  */
+@@ -5120,16 +5121,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:5123: \"$ac_link\"") >&5
++if { (eval echo "$as_me:5124: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:5126: \$? = $ac_status" >&5
++  echo "$as_me:5127: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:5129: \"$ac_try\"") >&5
++  { (eval echo "$as_me:5130: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:5132: \$? = $ac_status" >&5
++  echo "$as_me:5133: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   eval "$as_ac_var=yes"
+ else
+@@ -5139,20 +5140,20 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:5142: result: `eval echo '${'$as_ac_var'}'`" >&5
++echo "$as_me:5143: result: `eval echo '${'$as_ac_var'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+ if test `eval echo '${'$as_ac_var'}'` = yes; then
+   cat >>confdefs.h <<EOF
+ #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+ EOF
+ 
+-echo "$as_me:5149: checking for _doprnt" >&5
++echo "$as_me:5150: checking for _doprnt" >&5
+ echo $ECHO_N "checking for _doprnt... $ECHO_C" >&6
+ if test "${ac_cv_func__doprnt+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 5155 "configure"
++#line 5156 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char _doprnt (); below.  */
+@@ -5183,16 +5184,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:5186: \"$ac_link\"") >&5
++if { (eval echo "$as_me:5187: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:5189: \$? = $ac_status" >&5
++  echo "$as_me:5190: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:5192: \"$ac_try\"") >&5
++  { (eval echo "$as_me:5193: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:5195: \$? = $ac_status" >&5
++  echo "$as_me:5196: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_func__doprnt=yes
+ else
+@@ -5202,7 +5203,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:5205: result: $ac_cv_func__doprnt" >&5
++echo "$as_me:5206: result: $ac_cv_func__doprnt" >&5
+ echo "${ECHO_T}$ac_cv_func__doprnt" >&6
+ if test $ac_cv_func__doprnt = yes; then
+ 
+@@ -5218,13 +5219,13 @@
+ for ac_func in gettimeofday putenv select socket strtol strtoul basename
+ do
+ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-echo "$as_me:5221: checking for $ac_func" >&5
++echo "$as_me:5222: checking for $ac_func" >&5
+ echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+ if eval "test \"\${$as_ac_var+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 5227 "configure"
++#line 5228 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func (); below.  */
+@@ -5255,16 +5256,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:5258: \"$ac_link\"") >&5
++if { (eval echo "$as_me:5259: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:5261: \$? = $ac_status" >&5
++  echo "$as_me:5262: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:5264: \"$ac_try\"") >&5
++  { (eval echo "$as_me:5265: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:5267: \$? = $ac_status" >&5
++  echo "$as_me:5268: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   eval "$as_ac_var=yes"
+ else
+@@ -5274,7 +5275,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:5277: result: `eval echo '${'$as_ac_var'}'`" >&5
++echo "$as_me:5278: result: `eval echo '${'$as_ac_var'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+ if test `eval echo '${'$as_ac_var'}'` = yes; then
+   cat >>confdefs.h <<EOF
+@@ -5287,23 +5288,23 @@
+ for ac_header in sys/select.h sys/socket.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:5290: checking for $ac_header" >&5
++echo "$as_me:5291: checking for $ac_header" >&5
+ echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+ if eval "test \"\${$as_ac_Header+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 5296 "configure"
++#line 5297 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:5300: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:5301: \"$ac_cpp conftest.$ac_ext\"") >&5
+   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+   ac_status=$?
+   egrep -v '^ *\+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  echo "$as_me:5306: \$? = $ac_status" >&5
++  echo "$as_me:5307: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_cxx_preproc_warn_flag
+@@ -5322,7 +5323,7 @@
+ fi
+ rm -f conftest.err conftest.$ac_ext
+ fi
+-echo "$as_me:5325: result: `eval echo '${'$as_ac_Header'}'`" >&5
++echo "$as_me:5326: result: `eval echo '${'$as_ac_Header'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+ if test `eval echo '${'$as_ac_Header'}'` = yes; then
+   cat >>confdefs.h <<EOF
+@@ -5332,7 +5333,7 @@
+ fi
+ done
+ 
+-echo "$as_me:5335: checking types of arguments for select" >&5
++echo "$as_me:5336: checking types of arguments for select" >&5
+ echo $ECHO_N "checking types of arguments for select... $ECHO_C" >&6
+ if test "${ac_cv_func_select_args+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -5341,7 +5342,7 @@
+  for ac_arg1 in 'int' 'size_t' 'unsigned long' 'unsigned'; do
+   for ac_arg5 in 'struct timeval *' 'const struct timeval *'; do
+    cat >conftest.$ac_ext <<_ACEOF
+-#line 5344 "configure"
++#line 5345 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ #if HAVE_SYS_SELECT_H
+@@ -5362,16 +5363,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:5365: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:5366: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:5368: \$? = $ac_status" >&5
++  echo "$as_me:5369: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:5371: \"$ac_try\"") >&5
++  { (eval echo "$as_me:5372: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:5374: \$? = $ac_status" >&5
++  echo "$as_me:5375: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_func_select_args="$ac_arg1,$ac_arg234,$ac_arg5"; break 3
+ else
+@@ -5386,7 +5387,7 @@
+ : ${ac_cv_func_select_args='int,int *,struct timeval *'}
+ 
+ fi
+-echo "$as_me:5389: result: $ac_cv_func_select_args" >&5
++echo "$as_me:5390: result: $ac_cv_func_select_args" >&5
+ echo "${ECHO_T}$ac_cv_func_select_args" >&6
+ ac_save_IFS=$IFS; IFS=','
+ set dummy `echo "$ac_cv_func_select_args" | sed 's/\*/\*/g'`
+@@ -5410,7 +5411,7 @@
+ TARGETS='base docs'
+ APPLICATIONS='genpref icewm icesh icewmhint icewmbg'
+ 
+-echo "$as_me:5413: checking for X" >&5
++echo "$as_me:5414: checking for X" >&5
+ echo $ECHO_N "checking for X... $ECHO_C" >&6
+ 
+ # Check whether --with-x or --without-x was given.
+@@ -5507,17 +5508,17 @@
+   # Guess where to find include files, by looking for Intrinsic.h.
+   # First, try using that file with no special directory specified.
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 5510 "configure"
++#line 5511 "configure"
+ #include "confdefs.h"
+ #include <X11/Intrinsic.h>
+ _ACEOF
+-if { (eval echo "$as_me:5514: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:5515: \"$ac_cpp conftest.$ac_ext\"") >&5
+   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+   ac_status=$?
+   egrep -v '^ *\+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  echo "$as_me:5520: \$? = $ac_status" >&5
++  echo "$as_me:5521: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_cxx_preproc_warn_flag
+@@ -5550,7 +5551,7 @@
+   ac_save_LIBS=$LIBS
+   LIBS="-lXt $LIBS"
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 5553 "configure"
++#line 5554 "configure"
+ #include "confdefs.h"
+ #include <X11/Intrinsic.h>
+ int
+@@ -5562,16 +5563,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:5565: \"$ac_link\"") >&5
++if { (eval echo "$as_me:5566: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:5568: \$? = $ac_status" >&5
++  echo "$as_me:5569: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:5571: \"$ac_try\"") >&5
++  { (eval echo "$as_me:5572: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:5574: \$? = $ac_status" >&5
++  echo "$as_me:5575: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   LIBS=$ac_save_LIBS
+ # We can link X programs with no special library path.
+@@ -5609,7 +5610,7 @@
+ fi # $with_x != no
+ 
+ if test "$have_x" != yes; then
+-  echo "$as_me:5612: result: $have_x" >&5
++  echo "$as_me:5613: result: $have_x" >&5
+ echo "${ECHO_T}$have_x" >&6
+   no_x=yes
+ else
+@@ -5619,7 +5620,7 @@
+   # Update the cache value to reflect the command line values.
+   ac_cv_have_x="have_x=yes \
+ 		ac_x_includes=$x_includes ac_x_libraries=$x_libraries"
+-  echo "$as_me:5622: result: libraries $x_libraries, headers $x_includes" >&5
++  echo "$as_me:5623: result: libraries $x_libraries, headers $x_includes" >&5
+ echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6
+ fi
+ 
+@@ -5643,11 +5644,11 @@
+     # others require no space.  Words are not sufficient . . . .
+     case `(uname -sr) 2>/dev/null` in
+     "SunOS 5"*)
+-      echo "$as_me:5646: checking whether -R must be followed by a space" >&5
++      echo "$as_me:5647: checking whether -R must be followed by a space" >&5
+ echo $ECHO_N "checking whether -R must be followed by a space... $ECHO_C" >&6
+       ac_xsave_LIBS=$LIBS; LIBS="$LIBS -R$x_libraries"
+       cat >conftest.$ac_ext <<_ACEOF
+-#line 5650 "configure"
++#line 5651 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -5659,16 +5660,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:5662: \"$ac_link\"") >&5
++if { (eval echo "$as_me:5663: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:5665: \$? = $ac_status" >&5
++  echo "$as_me:5666: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:5668: \"$ac_try\"") >&5
++  { (eval echo "$as_me:5669: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:5671: \$? = $ac_status" >&5
++  echo "$as_me:5672: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_R_nospace=yes
+ else
+@@ -5678,13 +5679,13 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+       if test $ac_R_nospace = yes; then
+-	echo "$as_me:5681: result: no" >&5
++	echo "$as_me:5682: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 	X_LIBS="$X_LIBS -R$x_libraries"
+       else
+ 	LIBS="$ac_xsave_LIBS -R $x_libraries"
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 5687 "configure"
++#line 5688 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -5696,16 +5697,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:5699: \"$ac_link\"") >&5
++if { (eval echo "$as_me:5700: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:5702: \$? = $ac_status" >&5
++  echo "$as_me:5703: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:5705: \"$ac_try\"") >&5
++  { (eval echo "$as_me:5706: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:5708: \$? = $ac_status" >&5
++  echo "$as_me:5709: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_R_space=yes
+ else
+@@ -5715,11 +5716,11 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ 	if test $ac_R_space = yes; then
+-	  echo "$as_me:5718: result: yes" >&5
++	  echo "$as_me:5719: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ 	  X_LIBS="$X_LIBS -R $x_libraries"
+ 	else
+-	  echo "$as_me:5722: result: neither works" >&5
++	  echo "$as_me:5723: result: neither works" >&5
+ echo "${ECHO_T}neither works" >&6
+ 	fi
+       fi
+@@ -5739,7 +5740,7 @@
+     # the Alpha needs dnet_stub (dnet does not exist).
+     ac_xsave_LIBS="$LIBS"; LIBS="$LIBS $X_LIBS -lX11"
+     cat >conftest.$ac_ext <<_ACEOF
+-#line 5742 "configure"
++#line 5743 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -5758,22 +5759,22 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:5761: \"$ac_link\"") >&5
++if { (eval echo "$as_me:5762: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:5764: \$? = $ac_status" >&5
++  echo "$as_me:5765: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:5767: \"$ac_try\"") >&5
++  { (eval echo "$as_me:5768: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:5770: \$? = $ac_status" >&5
++  echo "$as_me:5771: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   :
+ else
+   echo "$as_me: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+-echo "$as_me:5776: checking for dnet_ntoa in -ldnet" >&5
++echo "$as_me:5777: checking for dnet_ntoa in -ldnet" >&5
+ echo $ECHO_N "checking for dnet_ntoa in -ldnet... $ECHO_C" >&6
+ if test "${ac_cv_lib_dnet_dnet_ntoa+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -5781,7 +5782,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldnet  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 5784 "configure"
++#line 5785 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -5800,16 +5801,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:5803: \"$ac_link\"") >&5
++if { (eval echo "$as_me:5804: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:5806: \$? = $ac_status" >&5
++  echo "$as_me:5807: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:5809: \"$ac_try\"") >&5
++  { (eval echo "$as_me:5810: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:5812: \$? = $ac_status" >&5
++  echo "$as_me:5813: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_dnet_dnet_ntoa=yes
+ else
+@@ -5820,14 +5821,14 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:5823: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
++echo "$as_me:5824: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
+ echo "${ECHO_T}$ac_cv_lib_dnet_dnet_ntoa" >&6
+ if test $ac_cv_lib_dnet_dnet_ntoa = yes; then
+   X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet"
+ fi
+ 
+     if test $ac_cv_lib_dnet_dnet_ntoa = no; then
+-      echo "$as_me:5830: checking for dnet_ntoa in -ldnet_stub" >&5
++      echo "$as_me:5831: checking for dnet_ntoa in -ldnet_stub" >&5
+ echo $ECHO_N "checking for dnet_ntoa in -ldnet_stub... $ECHO_C" >&6
+ if test "${ac_cv_lib_dnet_stub_dnet_ntoa+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -5835,7 +5836,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldnet_stub  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 5838 "configure"
++#line 5839 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -5854,16 +5855,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:5857: \"$ac_link\"") >&5
++if { (eval echo "$as_me:5858: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:5860: \$? = $ac_status" >&5
++  echo "$as_me:5861: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:5863: \"$ac_try\"") >&5
++  { (eval echo "$as_me:5864: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:5866: \$? = $ac_status" >&5
++  echo "$as_me:5867: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_dnet_stub_dnet_ntoa=yes
+ else
+@@ -5874,7 +5875,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:5877: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
++echo "$as_me:5878: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
+ echo "${ECHO_T}$ac_cv_lib_dnet_stub_dnet_ntoa" >&6
+ if test $ac_cv_lib_dnet_stub_dnet_ntoa = yes; then
+   X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub"
+@@ -5893,13 +5894,13 @@
+     # on Irix 5.2, according to T.E. Dickey.
+     # The functions gethostbyname, getservbyname, and inet_addr are
+     # in -lbsd on LynxOS 3.0.1/i386, according to Lars Hecking.
+-    echo "$as_me:5896: checking for gethostbyname" >&5
++    echo "$as_me:5897: checking for gethostbyname" >&5
+ echo $ECHO_N "checking for gethostbyname... $ECHO_C" >&6
+ if test "${ac_cv_func_gethostbyname+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 5902 "configure"
++#line 5903 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char gethostbyname (); below.  */
+@@ -5930,16 +5931,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:5933: \"$ac_link\"") >&5
++if { (eval echo "$as_me:5934: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:5936: \$? = $ac_status" >&5
++  echo "$as_me:5937: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:5939: \"$ac_try\"") >&5
++  { (eval echo "$as_me:5940: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:5942: \$? = $ac_status" >&5
++  echo "$as_me:5943: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_func_gethostbyname=yes
+ else
+@@ -5949,11 +5950,11 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:5952: result: $ac_cv_func_gethostbyname" >&5
++echo "$as_me:5953: result: $ac_cv_func_gethostbyname" >&5
+ echo "${ECHO_T}$ac_cv_func_gethostbyname" >&6
+ 
+     if test $ac_cv_func_gethostbyname = no; then
+-      echo "$as_me:5956: checking for gethostbyname in -lnsl" >&5
++      echo "$as_me:5957: checking for gethostbyname in -lnsl" >&5
+ echo $ECHO_N "checking for gethostbyname in -lnsl... $ECHO_C" >&6
+ if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -5961,7 +5962,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lnsl  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 5964 "configure"
++#line 5965 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -5980,16 +5981,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:5983: \"$ac_link\"") >&5
++if { (eval echo "$as_me:5984: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:5986: \$? = $ac_status" >&5
++  echo "$as_me:5987: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:5989: \"$ac_try\"") >&5
++  { (eval echo "$as_me:5990: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:5992: \$? = $ac_status" >&5
++  echo "$as_me:5993: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_nsl_gethostbyname=yes
+ else
+@@ -6000,14 +6001,14 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:6003: result: $ac_cv_lib_nsl_gethostbyname" >&5
++echo "$as_me:6004: result: $ac_cv_lib_nsl_gethostbyname" >&5
+ echo "${ECHO_T}$ac_cv_lib_nsl_gethostbyname" >&6
+ if test $ac_cv_lib_nsl_gethostbyname = yes; then
+   X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl"
+ fi
+ 
+       if test $ac_cv_lib_nsl_gethostbyname = no; then
+-        echo "$as_me:6010: checking for gethostbyname in -lbsd" >&5
++        echo "$as_me:6011: checking for gethostbyname in -lbsd" >&5
+ echo $ECHO_N "checking for gethostbyname in -lbsd... $ECHO_C" >&6
+ if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -6015,7 +6016,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lbsd  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 6018 "configure"
++#line 6019 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -6034,16 +6035,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:6037: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6038: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:6040: \$? = $ac_status" >&5
++  echo "$as_me:6041: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:6043: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6044: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6046: \$? = $ac_status" >&5
++  echo "$as_me:6047: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_bsd_gethostbyname=yes
+ else
+@@ -6054,7 +6055,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:6057: result: $ac_cv_lib_bsd_gethostbyname" >&5
++echo "$as_me:6058: result: $ac_cv_lib_bsd_gethostbyname" >&5
+ echo "${ECHO_T}$ac_cv_lib_bsd_gethostbyname" >&6
+ if test $ac_cv_lib_bsd_gethostbyname = yes; then
+   X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd"
+@@ -6070,13 +6071,13 @@
+     # variants that don't use the nameserver (or something).  -lsocket
+     # must be given before -lnsl if both are needed.  We assume that
+     # if connect needs -lnsl, so does gethostbyname.
+-    echo "$as_me:6073: checking for connect" >&5
++    echo "$as_me:6074: checking for connect" >&5
+ echo $ECHO_N "checking for connect... $ECHO_C" >&6
+ if test "${ac_cv_func_connect+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 6079 "configure"
++#line 6080 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char connect (); below.  */
+@@ -6107,16 +6108,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:6110: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6111: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:6113: \$? = $ac_status" >&5
++  echo "$as_me:6114: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:6116: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6117: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6119: \$? = $ac_status" >&5
++  echo "$as_me:6120: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_func_connect=yes
+ else
+@@ -6126,11 +6127,11 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:6129: result: $ac_cv_func_connect" >&5
++echo "$as_me:6130: result: $ac_cv_func_connect" >&5
+ echo "${ECHO_T}$ac_cv_func_connect" >&6
+ 
+     if test $ac_cv_func_connect = no; then
+-      echo "$as_me:6133: checking for connect in -lsocket" >&5
++      echo "$as_me:6134: checking for connect in -lsocket" >&5
+ echo $ECHO_N "checking for connect in -lsocket... $ECHO_C" >&6
+ if test "${ac_cv_lib_socket_connect+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -6138,7 +6139,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 6141 "configure"
++#line 6142 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -6157,16 +6158,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:6160: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6161: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:6163: \$? = $ac_status" >&5
++  echo "$as_me:6164: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:6166: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6167: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6169: \$? = $ac_status" >&5
++  echo "$as_me:6170: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_socket_connect=yes
+ else
+@@ -6177,7 +6178,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:6180: result: $ac_cv_lib_socket_connect" >&5
++echo "$as_me:6181: result: $ac_cv_lib_socket_connect" >&5
+ echo "${ECHO_T}$ac_cv_lib_socket_connect" >&6
+ if test $ac_cv_lib_socket_connect = yes; then
+   X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS"
+@@ -6186,13 +6187,13 @@
+     fi
+ 
+     # Guillermo Gomez says -lposix is necessary on A/UX.
+-    echo "$as_me:6189: checking for remove" >&5
++    echo "$as_me:6190: checking for remove" >&5
+ echo $ECHO_N "checking for remove... $ECHO_C" >&6
+ if test "${ac_cv_func_remove+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 6195 "configure"
++#line 6196 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char remove (); below.  */
+@@ -6223,16 +6224,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:6226: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6227: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:6229: \$? = $ac_status" >&5
++  echo "$as_me:6230: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:6232: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6233: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6235: \$? = $ac_status" >&5
++  echo "$as_me:6236: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_func_remove=yes
+ else
+@@ -6242,11 +6243,11 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:6245: result: $ac_cv_func_remove" >&5
++echo "$as_me:6246: result: $ac_cv_func_remove" >&5
+ echo "${ECHO_T}$ac_cv_func_remove" >&6
+ 
+     if test $ac_cv_func_remove = no; then
+-      echo "$as_me:6249: checking for remove in -lposix" >&5
++      echo "$as_me:6250: checking for remove in -lposix" >&5
+ echo $ECHO_N "checking for remove in -lposix... $ECHO_C" >&6
+ if test "${ac_cv_lib_posix_remove+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -6254,7 +6255,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lposix  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 6257 "configure"
++#line 6258 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -6273,16 +6274,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:6276: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6277: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:6279: \$? = $ac_status" >&5
++  echo "$as_me:6280: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:6282: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6283: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6285: \$? = $ac_status" >&5
++  echo "$as_me:6286: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_posix_remove=yes
+ else
+@@ -6293,7 +6294,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:6296: result: $ac_cv_lib_posix_remove" >&5
++echo "$as_me:6297: result: $ac_cv_lib_posix_remove" >&5
+ echo "${ECHO_T}$ac_cv_lib_posix_remove" >&6
+ if test $ac_cv_lib_posix_remove = yes; then
+   X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix"
+@@ -6302,13 +6303,13 @@
+     fi
+ 
+     # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
+-    echo "$as_me:6305: checking for shmat" >&5
++    echo "$as_me:6306: checking for shmat" >&5
+ echo $ECHO_N "checking for shmat... $ECHO_C" >&6
+ if test "${ac_cv_func_shmat+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 6311 "configure"
++#line 6312 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char shmat (); below.  */
+@@ -6339,16 +6340,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:6342: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6343: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:6345: \$? = $ac_status" >&5
++  echo "$as_me:6346: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:6348: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6349: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6351: \$? = $ac_status" >&5
++  echo "$as_me:6352: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_func_shmat=yes
+ else
+@@ -6358,11 +6359,11 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:6361: result: $ac_cv_func_shmat" >&5
++echo "$as_me:6362: result: $ac_cv_func_shmat" >&5
+ echo "${ECHO_T}$ac_cv_func_shmat" >&6
+ 
+     if test $ac_cv_func_shmat = no; then
+-      echo "$as_me:6365: checking for shmat in -lipc" >&5
++      echo "$as_me:6366: checking for shmat in -lipc" >&5
+ echo $ECHO_N "checking for shmat in -lipc... $ECHO_C" >&6
+ if test "${ac_cv_lib_ipc_shmat+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -6370,7 +6371,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lipc  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 6373 "configure"
++#line 6374 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -6389,16 +6390,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:6392: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6393: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:6395: \$? = $ac_status" >&5
++  echo "$as_me:6396: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:6398: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6399: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6401: \$? = $ac_status" >&5
++  echo "$as_me:6402: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_ipc_shmat=yes
+ else
+@@ -6409,7 +6410,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:6412: result: $ac_cv_lib_ipc_shmat" >&5
++echo "$as_me:6413: result: $ac_cv_lib_ipc_shmat" >&5
+ echo "${ECHO_T}$ac_cv_lib_ipc_shmat" >&6
+ if test $ac_cv_lib_ipc_shmat = yes; then
+   X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc"
+@@ -6427,7 +6428,7 @@
+   # These have to be linked with before -lX11, unlike the other
+   # libraries we check for below, so use a different variable.
+   # John Interrante, Karl Berry
+-  echo "$as_me:6430: checking for IceConnectionNumber in -lICE" >&5
++  echo "$as_me:6431: checking for IceConnectionNumber in -lICE" >&5
+ echo $ECHO_N "checking for IceConnectionNumber in -lICE... $ECHO_C" >&6
+ if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -6435,7 +6436,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lICE $X_EXTRA_LIBS $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 6438 "configure"
++#line 6439 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -6454,16 +6455,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:6457: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6458: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:6460: \$? = $ac_status" >&5
++  echo "$as_me:6461: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:6463: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6464: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6466: \$? = $ac_status" >&5
++  echo "$as_me:6467: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_ICE_IceConnectionNumber=yes
+ else
+@@ -6474,7 +6475,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:6477: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
++echo "$as_me:6478: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
+ echo "${ECHO_T}$ac_cv_lib_ICE_IceConnectionNumber" >&6
+ if test $ac_cv_lib_ICE_IceConnectionNumber = yes; then
+   X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE"
+@@ -6485,7 +6486,7 @@
+ fi
+ 
+ if test x"$no_x" != x; then
+-  { { echo "$as_me:6488: error: X Window System not found" >&5
++  { { echo "$as_me:6489: error: X Window System not found" >&5
+ echo "$as_me: error: X Window System not found" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -6514,23 +6515,23 @@
+ for ac_header in langinfo.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:6517: checking for $ac_header" >&5
++echo "$as_me:6518: checking for $ac_header" >&5
+ echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+ if eval "test \"\${$as_ac_Header+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 6523 "configure"
++#line 6524 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:6527: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:6528: \"$ac_cpp conftest.$ac_ext\"") >&5
+   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+   ac_status=$?
+   egrep -v '^ *\+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  echo "$as_me:6533: \$? = $ac_status" >&5
++  echo "$as_me:6534: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_cxx_preproc_warn_flag
+@@ -6549,7 +6550,7 @@
+ fi
+ rm -f conftest.err conftest.$ac_ext
+ fi
+-echo "$as_me:6552: result: `eval echo '${'$as_ac_Header'}'`" >&5
++echo "$as_me:6553: result: `eval echo '${'$as_ac_Header'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+ if test `eval echo '${'$as_ac_Header'}'` = yes; then
+   cat >>confdefs.h <<EOF
+@@ -6557,7 +6558,7 @@
+ EOF
+ 
+ else
+-   { { echo "$as_me:6560: error: I18N support has been requested but langinfo.h wasn´t found.
++   { { echo "$as_me:6561: error: I18N support has been requested but langinfo.h wasn´t found.
+ *** Check your installation." >&5
+ echo "$as_me: error: I18N support has been requested but langinfo.h wasn´t found.
+ *** Check your installation." >&2;}
+@@ -6565,13 +6566,13 @@
+ fi
+ done
+ 
+-      echo "$as_me:6568: checking for nl_langinfo" >&5
++      echo "$as_me:6569: checking for nl_langinfo" >&5
+ echo $ECHO_N "checking for nl_langinfo... $ECHO_C" >&6
+ if test "${ac_cv_func_nl_langinfo+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 6574 "configure"
++#line 6575 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char nl_langinfo (); below.  */
+@@ -6602,16 +6603,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:6605: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6606: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:6608: \$? = $ac_status" >&5
++  echo "$as_me:6609: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:6611: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6612: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6614: \$? = $ac_status" >&5
++  echo "$as_me:6615: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_func_nl_langinfo=yes
+ else
+@@ -6621,12 +6622,12 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:6624: result: $ac_cv_func_nl_langinfo" >&5
++echo "$as_me:6625: result: $ac_cv_func_nl_langinfo" >&5
+ echo "${ECHO_T}$ac_cv_func_nl_langinfo" >&6
+ if test $ac_cv_func_nl_langinfo = yes; then
+   :
+ else
+-   { { echo "$as_me:6629: error: I18N support has been requested but nl_langinfo wasn´t found.
++   { { echo "$as_me:6630: error: I18N support has been requested but nl_langinfo wasn´t found.
+ *** Check your installation." >&5
+ echo "$as_me: error: I18N support has been requested but nl_langinfo wasn´t found.
+ *** Check your installation." >&2;}
+@@ -6635,10 +6636,10 @@
+ 
+       ice_nl_codesets=""
+ 
+-  echo "$as_me:6638: checking whether nl_langinfo supports _NL_MESSAGES_CODESET" >&5
++  echo "$as_me:6639: checking whether nl_langinfo supports _NL_MESSAGES_CODESET" >&5
+ echo $ECHO_N "checking whether nl_langinfo supports _NL_MESSAGES_CODESET... $ECHO_C" >&6
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 6641 "configure"
++#line 6642 "configure"
+ #include "confdefs.h"
+ 
+     #include <langinfo.h>
+@@ -6652,33 +6653,33 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:6655: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:6656: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:6658: \$? = $ac_status" >&5
++  echo "$as_me:6659: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:6661: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6662: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6664: \$? = $ac_status" >&5
++  echo "$as_me:6665: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+-   echo "$as_me:6666: result: yes" >&5
++   echo "$as_me:6667: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+        ice_nl_codesets="${ice_nl_codesets} _NL_MESSAGES_CODESET,"
+ else
+   echo "$as_me: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+- echo "$as_me:6672: result: no" >&5
++ echo "$as_me:6673: result: no" >&5
+ echo "${ECHO_T}no" >&6
+       have__NL_MESSAGES_CODESET=no
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ 
+-  echo "$as_me:6678: checking whether nl_langinfo supports _NL_CTYPE_CODESET_NAME" >&5
++  echo "$as_me:6679: checking whether nl_langinfo supports _NL_CTYPE_CODESET_NAME" >&5
+ echo $ECHO_N "checking whether nl_langinfo supports _NL_CTYPE_CODESET_NAME... $ECHO_C" >&6
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 6681 "configure"
++#line 6682 "configure"
+ #include "confdefs.h"
+ 
+     #include <langinfo.h>
+@@ -6692,33 +6693,33 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:6695: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:6696: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:6698: \$? = $ac_status" >&5
++  echo "$as_me:6699: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:6701: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6702: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6704: \$? = $ac_status" >&5
++  echo "$as_me:6705: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+-   echo "$as_me:6706: result: yes" >&5
++   echo "$as_me:6707: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+        ice_nl_codesets="${ice_nl_codesets} _NL_CTYPE_CODESET_NAME,"
+ else
+   echo "$as_me: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+- echo "$as_me:6712: result: no" >&5
++ echo "$as_me:6713: result: no" >&5
+ echo "${ECHO_T}no" >&6
+       have__NL_CTYPE_CODESET_NAME=no
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ 
+-  echo "$as_me:6718: checking whether nl_langinfo supports CODESET" >&5
++  echo "$as_me:6719: checking whether nl_langinfo supports CODESET" >&5
+ echo $ECHO_N "checking whether nl_langinfo supports CODESET... $ECHO_C" >&6
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 6721 "configure"
++#line 6722 "configure"
+ #include "confdefs.h"
+ 
+     #include <langinfo.h>
+@@ -6732,31 +6733,31 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:6735: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:6736: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:6738: \$? = $ac_status" >&5
++  echo "$as_me:6739: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:6741: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6742: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6744: \$? = $ac_status" >&5
++  echo "$as_me:6745: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+-   echo "$as_me:6746: result: yes" >&5
++   echo "$as_me:6747: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+        ice_nl_codesets="${ice_nl_codesets} CODESET,"
+ else
+   echo "$as_me: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+- echo "$as_me:6752: result: no" >&5
++ echo "$as_me:6753: result: no" >&5
+ echo "${ECHO_T}no" >&6
+       have_CODESET=no
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ 
+       if test "${ice_nl_codesets}" = ""; then
+-        { { echo "$as_me:6759: error: I18N support has been requested but nl_langinfo doesn't
++        { { echo "$as_me:6760: error: I18N support has been requested but nl_langinfo doesn't
+ *** return any information about the locale's codeset. Check your manuals.
+ *** Ask your vendor. Contact icewm-devel@lists.sourceforge.net when you know
+ *** the name of the locale-dependent parameter for your platform." >&5
+@@ -6777,23 +6778,23 @@
+ for ac_header in iconv.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:6780: checking for $ac_header" >&5
++echo "$as_me:6781: checking for $ac_header" >&5
+ echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+ if eval "test \"\${$as_ac_Header+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 6786 "configure"
++#line 6787 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:6790: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:6791: \"$ac_cpp conftest.$ac_ext\"") >&5
+   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+   ac_status=$?
+   egrep -v '^ *\+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  echo "$as_me:6796: \$? = $ac_status" >&5
++  echo "$as_me:6797: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_cxx_preproc_warn_flag
+@@ -6812,7 +6813,7 @@
+ fi
+ rm -f conftest.err conftest.$ac_ext
+ fi
+-echo "$as_me:6815: result: `eval echo '${'$as_ac_Header'}'`" >&5
++echo "$as_me:6816: result: `eval echo '${'$as_ac_Header'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+ if test `eval echo '${'$as_ac_Header'}'` = yes; then
+   cat >>confdefs.h <<EOF
+@@ -6820,7 +6821,7 @@
+ EOF
+ 
+ else
+-   { { echo "$as_me:6823: error: I18N support has been requested but iconv.h wasn´t found.
++   { { echo "$as_me:6824: error: I18N support has been requested but iconv.h wasn´t found.
+ *** Check your installation. Upgrade your C library or install GNU libiconv
+ *** available at ftp://ftp.gnu.org/pub/gnu/libiconv/." >&5
+ echo "$as_me: error: I18N support has been requested but iconv.h wasn´t found.
+@@ -6830,13 +6831,13 @@
+ fi
+ done
+ 
+-      echo "$as_me:6833: checking whether _libiconv_version is declared" >&5
++      echo "$as_me:6834: checking whether _libiconv_version is declared" >&5
+ echo $ECHO_N "checking whether _libiconv_version is declared... $ECHO_C" >&6
+ if test "${ac_cv_have_decl__libiconv_version+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 6839 "configure"
++#line 6840 "configure"
+ #include "confdefs.h"
+ #include <iconv.h>
+ 
+@@ -6852,16 +6853,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:6855: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:6856: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:6858: \$? = $ac_status" >&5
++  echo "$as_me:6859: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:6861: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6862: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6864: \$? = $ac_status" >&5
++  echo "$as_me:6865: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_have_decl__libiconv_version=yes
+ else
+@@ -6871,12 +6872,12 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:6874: result: $ac_cv_have_decl__libiconv_version" >&5
++echo "$as_me:6875: result: $ac_cv_have_decl__libiconv_version" >&5
+ echo "${ECHO_T}$ac_cv_have_decl__libiconv_version" >&6
+ if test $ac_cv_have_decl__libiconv_version = yes; then
+-   echo "$as_me:6877: result: assuming iconv.h belongs to GNU libiconv" >&5
++   echo "$as_me:6878: result: assuming iconv.h belongs to GNU libiconv" >&5
+ echo "${ECHO_T}assuming iconv.h belongs to GNU libiconv" >&6
+-        echo "$as_me:6879: checking for iconv in -liconv" >&5
++        echo "$as_me:6880: checking for iconv in -liconv" >&5
+ echo $ECHO_N "checking for iconv in -liconv... $ECHO_C" >&6
+ if test "${ac_cv_lib_iconv_iconv+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -6884,7 +6885,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-liconv  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 6887 "configure"
++#line 6888 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -6903,16 +6904,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:6906: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6907: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:6909: \$? = $ac_status" >&5
++  echo "$as_me:6910: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:6912: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6913: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6915: \$? = $ac_status" >&5
++  echo "$as_me:6916: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_iconv_iconv=yes
+ else
+@@ -6923,10 +6924,10 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:6926: result: $ac_cv_lib_iconv_iconv" >&5
++echo "$as_me:6927: result: $ac_cv_lib_iconv_iconv" >&5
+ echo "${ECHO_T}$ac_cv_lib_iconv_iconv" >&6
+ if test $ac_cv_lib_iconv_iconv = yes; then
+-  echo "$as_me:6929: checking for iconv_open in -liconv" >&5
++  echo "$as_me:6930: checking for iconv_open in -liconv" >&5
+ echo $ECHO_N "checking for iconv_open in -liconv... $ECHO_C" >&6
+ if test "${ac_cv_lib_iconv_iconv_open+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -6934,7 +6935,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-liconv  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 6937 "configure"
++#line 6938 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -6953,16 +6954,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:6956: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6957: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:6959: \$? = $ac_status" >&5
++  echo "$as_me:6960: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:6962: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6963: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6965: \$? = $ac_status" >&5
++  echo "$as_me:6966: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_iconv_iconv_open=yes
+ else
+@@ -6973,10 +6974,10 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:6976: result: $ac_cv_lib_iconv_iconv_open" >&5
++echo "$as_me:6977: result: $ac_cv_lib_iconv_iconv_open" >&5
+ echo "${ECHO_T}$ac_cv_lib_iconv_iconv_open" >&6
+ if test $ac_cv_lib_iconv_iconv_open = yes; then
+-  echo "$as_me:6979: checking for iconv_close in -liconv" >&5
++  echo "$as_me:6980: checking for iconv_close in -liconv" >&5
+ echo $ECHO_N "checking for iconv_close in -liconv... $ECHO_C" >&6
+ if test "${ac_cv_lib_iconv_iconv_close+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -6984,7 +6985,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-liconv  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 6987 "configure"
++#line 6988 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -7003,16 +7004,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:7006: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7007: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:7009: \$? = $ac_status" >&5
++  echo "$as_me:7010: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:7012: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7013: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7015: \$? = $ac_status" >&5
++  echo "$as_me:7016: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_iconv_iconv_close=yes
+ else
+@@ -7023,7 +7024,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:7026: result: $ac_cv_lib_iconv_iconv_close" >&5
++echo "$as_me:7027: result: $ac_cv_lib_iconv_iconv_close" >&5
+ echo "${ECHO_T}$ac_cv_lib_iconv_iconv_close" >&6
+ if test $ac_cv_lib_iconv_iconv_close = yes; then
+   CXXFLAGS="${CXXFLAGS} -liconv"
+@@ -7034,7 +7035,7 @@
+ EOF
+ 
+ else
+-  { { echo "$as_me:7037: error: iconv.h appears to be part of libiconv but linking failed.
++  { { echo "$as_me:7038: error: iconv.h appears to be part of libiconv but linking failed.
+ *** Check your installation. Upgrade your C library (glibc 2.2) or install
+ *** GNU libiconv available at ftp://ftp.gnu.org/pub/gnu/libiconv/." >&5
+ echo "$as_me: error: iconv.h appears to be part of libiconv but linking failed.
+@@ -7048,19 +7049,19 @@
+ fi
+ 
+ else
+-   echo "$as_me:7051: result: assuming iconv.h belongs to the C library" >&5
++   echo "$as_me:7052: result: assuming iconv.h belongs to the C library" >&5
+ echo "${ECHO_T}assuming iconv.h belongs to the C library" >&6
+ 
+ for ac_func in iconv iconv_open iconv_close
+ do
+ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-echo "$as_me:7057: checking for $ac_func" >&5
++echo "$as_me:7058: checking for $ac_func" >&5
+ echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+ if eval "test \"\${$as_ac_var+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 7063 "configure"
++#line 7064 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func (); below.  */
+@@ -7091,16 +7092,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:7094: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7095: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:7097: \$? = $ac_status" >&5
++  echo "$as_me:7098: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:7100: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7101: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7103: \$? = $ac_status" >&5
++  echo "$as_me:7104: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   eval "$as_ac_var=yes"
+ else
+@@ -7110,7 +7111,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:7113: result: `eval echo '${'$as_ac_var'}'`" >&5
++echo "$as_me:7114: result: `eval echo '${'$as_ac_var'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+ if test `eval echo '${'$as_ac_var'}'` = yes; then
+   cat >>confdefs.h <<EOF
+@@ -7118,7 +7119,7 @@
+ EOF
+ 
+ else
+-  { { echo "$as_me:7121: error: iconv.h appears to be part of libc but linking failed.
++  { { echo "$as_me:7122: error: iconv.h appears to be part of libc but linking failed.
+ *** Check your installation. Upgrade your C library (glibc 2.2) or install
+ *** GNU libiconv available at ftp://ftp.gnu.org/pub/gnu/libiconv/." >&5
+ echo "$as_me: error: iconv.h appears to be part of libc but linking failed.
+@@ -7143,14 +7144,14 @@
+ 
+       ice_sufficent_iconv=no
+ 
+-  echo "$as_me:7146: checking whether iconv converts from ISO-8859-1 to $with_unicode_set" >&5
++  echo "$as_me:7147: checking whether iconv converts from ISO-8859-1 to $with_unicode_set" >&5
+ echo $ECHO_N "checking whether iconv converts from ISO-8859-1 to $with_unicode_set... $ECHO_C" >&6
+   if test "$cross_compiling" = yes; then
+-    echo "$as_me:7149: result: no (cross)" >&5
++    echo "$as_me:7150: result: no (cross)" >&5
+ echo "${ECHO_T}no (cross)" >&6;
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 7153 "configure"
++#line 7154 "configure"
+ #include "confdefs.h"
+ 
+     #include <iconv.h>
+@@ -7162,25 +7163,25 @@
+     }
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:7165: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7166: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:7168: \$? = $ac_status" >&5
++  echo "$as_me:7169: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:7170: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7171: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7173: \$? = $ac_status" >&5
++  echo "$as_me:7174: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+-   echo "$as_me:7175: result: yes" >&5
+-echo "${ECHO_T}yes" >&6; echo "$as_me:7176: checking whether iconv converts from ISO-8859-2 to $with_unicode_set" >&5
++   echo "$as_me:7176: result: yes" >&5
++echo "${ECHO_T}yes" >&6; echo "$as_me:7177: checking whether iconv converts from ISO-8859-2 to $with_unicode_set" >&5
+ echo $ECHO_N "checking whether iconv converts from ISO-8859-2 to $with_unicode_set... $ECHO_C" >&6
+   if test "$cross_compiling" = yes; then
+-    echo "$as_me:7179: result: no (cross)" >&5
++    echo "$as_me:7180: result: no (cross)" >&5
+ echo "${ECHO_T}no (cross)" >&6;
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 7183 "configure"
++#line 7184 "configure"
+ #include "confdefs.h"
+ 
+     #include <iconv.h>
+@@ -7192,25 +7193,25 @@
+     }
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:7195: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7196: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:7198: \$? = $ac_status" >&5
++  echo "$as_me:7199: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:7200: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7201: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7203: \$? = $ac_status" >&5
++  echo "$as_me:7204: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+-   echo "$as_me:7205: result: yes" >&5
+-echo "${ECHO_T}yes" >&6; echo "$as_me:7206: checking whether iconv converts from KOI8-R to $with_unicode_set" >&5
++   echo "$as_me:7206: result: yes" >&5
++echo "${ECHO_T}yes" >&6; echo "$as_me:7207: checking whether iconv converts from KOI8-R to $with_unicode_set" >&5
+ echo $ECHO_N "checking whether iconv converts from KOI8-R to $with_unicode_set... $ECHO_C" >&6
+   if test "$cross_compiling" = yes; then
+-    echo "$as_me:7209: result: no (cross)" >&5
++    echo "$as_me:7210: result: no (cross)" >&5
+ echo "${ECHO_T}no (cross)" >&6;
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 7213 "configure"
++#line 7214 "configure"
+ #include "confdefs.h"
+ 
+     #include <iconv.h>
+@@ -7222,25 +7223,25 @@
+     }
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:7225: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7226: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:7228: \$? = $ac_status" >&5
++  echo "$as_me:7229: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:7230: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7231: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7233: \$? = $ac_status" >&5
++  echo "$as_me:7234: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+-   echo "$as_me:7235: result: yes" >&5
+-echo "${ECHO_T}yes" >&6; echo "$as_me:7236: checking whether iconv converts from EUC-JP to $with_unicode_set" >&5
++   echo "$as_me:7236: result: yes" >&5
++echo "${ECHO_T}yes" >&6; echo "$as_me:7237: checking whether iconv converts from EUC-JP to $with_unicode_set" >&5
+ echo $ECHO_N "checking whether iconv converts from EUC-JP to $with_unicode_set... $ECHO_C" >&6
+   if test "$cross_compiling" = yes; then
+-    echo "$as_me:7239: result: no (cross)" >&5
++    echo "$as_me:7240: result: no (cross)" >&5
+ echo "${ECHO_T}no (cross)" >&6;
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 7243 "configure"
++#line 7244 "configure"
+ #include "confdefs.h"
+ 
+     #include <iconv.h>
+@@ -7252,25 +7253,25 @@
+     }
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:7255: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7256: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:7258: \$? = $ac_status" >&5
++  echo "$as_me:7259: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:7260: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7261: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7263: \$? = $ac_status" >&5
++  echo "$as_me:7264: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+-   echo "$as_me:7265: result: yes" >&5
+-echo "${ECHO_T}yes" >&6; echo "$as_me:7266: checking whether iconv converts from BIG5 to $with_unicode_set" >&5
++   echo "$as_me:7266: result: yes" >&5
++echo "${ECHO_T}yes" >&6; echo "$as_me:7267: checking whether iconv converts from BIG5 to $with_unicode_set" >&5
+ echo $ECHO_N "checking whether iconv converts from BIG5 to $with_unicode_set... $ECHO_C" >&6
+   if test "$cross_compiling" = yes; then
+-    echo "$as_me:7269: result: no (cross)" >&5
++    echo "$as_me:7270: result: no (cross)" >&5
+ echo "${ECHO_T}no (cross)" >&6;
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 7273 "configure"
++#line 7274 "configure"
+ #include "confdefs.h"
+ 
+     #include <iconv.h>
+@@ -7282,23 +7283,23 @@
+     }
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:7285: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7286: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:7288: \$? = $ac_status" >&5
++  echo "$as_me:7289: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:7290: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7291: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7293: \$? = $ac_status" >&5
++  echo "$as_me:7294: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+-   echo "$as_me:7295: result: yes" >&5
++   echo "$as_me:7296: result: yes" >&5
+ echo "${ECHO_T}yes" >&6; ice_sufficent_iconv=yes
+ else
+   echo "$as_me: program exited with status $ac_status" >&5
+ echo "$as_me: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+- echo "$as_me:7301: result: no" >&5
++ echo "$as_me:7302: result: no" >&5
+ echo "${ECHO_T}no" >&6;
+ fi
+ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+@@ -7307,7 +7308,7 @@
+   echo "$as_me: program exited with status $ac_status" >&5
+ echo "$as_me: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+- echo "$as_me:7310: result: no" >&5
++ echo "$as_me:7311: result: no" >&5
+ echo "${ECHO_T}no" >&6;
+ fi
+ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+@@ -7316,7 +7317,7 @@
+   echo "$as_me: program exited with status $ac_status" >&5
+ echo "$as_me: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+- echo "$as_me:7319: result: no" >&5
++ echo "$as_me:7320: result: no" >&5
+ echo "${ECHO_T}no" >&6;
+ fi
+ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+@@ -7325,7 +7326,7 @@
+   echo "$as_me: program exited with status $ac_status" >&5
+ echo "$as_me: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+- echo "$as_me:7328: result: no" >&5
++ echo "$as_me:7329: result: no" >&5
+ echo "${ECHO_T}no" >&6;
+ fi
+ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+@@ -7334,7 +7335,7 @@
+   echo "$as_me: program exited with status $ac_status" >&5
+ echo "$as_me: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+- echo "$as_me:7337: result: no" >&5
++ echo "$as_me:7338: result: no" >&5
+ echo "${ECHO_T}no" >&6;
+ fi
+ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+@@ -7344,7 +7345,7 @@
+ 
+       if test "$ice_sufficent_iconv" != "yes"
+       then
+-        { { echo "$as_me:7347: error: Your implementation of iconv isn't able to perform
++        { { echo "$as_me:7348: error: Your implementation of iconv isn't able to perform
+ *** the codeset conversions required. Upgrade to glibc 2.2 or install
+ *** GNU libiconv available at ftp://ftp.gnu.org/pub/gnu/libiconv/." >&5
+ echo "$as_me: error: Your implementation of iconv isn't able to perform
+@@ -7368,13 +7369,13 @@
+ fi;
+ 
+ if test "$enable_nls" != "no"; then
+-  echo "$as_me:7371: checking for gettext" >&5
++  echo "$as_me:7372: checking for gettext" >&5
+ echo $ECHO_N "checking for gettext... $ECHO_C" >&6
+ if test "${ac_cv_func_gettext+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 7377 "configure"
++#line 7378 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char gettext (); below.  */
+@@ -7405,16 +7406,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:7408: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7409: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:7411: \$? = $ac_status" >&5
++  echo "$as_me:7412: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:7414: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7415: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7417: \$? = $ac_status" >&5
++  echo "$as_me:7418: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_func_gettext=yes
+ else
+@@ -7424,13 +7425,13 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:7427: result: $ac_cv_func_gettext" >&5
++echo "$as_me:7428: result: $ac_cv_func_gettext" >&5
+ echo "${ECHO_T}$ac_cv_func_gettext" >&6
+ if test $ac_cv_func_gettext = yes; then
+   :
+ else
+ 
+-echo "$as_me:7433: checking for gettext in -lintl" >&5
++echo "$as_me:7434: checking for gettext in -lintl" >&5
+ echo $ECHO_N "checking for gettext in -lintl... $ECHO_C" >&6
+ if test "${ac_cv_lib_intl_gettext+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -7438,7 +7439,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lintl  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 7441 "configure"
++#line 7442 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -7457,16 +7458,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:7460: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7461: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:7463: \$? = $ac_status" >&5
++  echo "$as_me:7464: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:7466: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7467: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7469: \$? = $ac_status" >&5
++  echo "$as_me:7470: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_intl_gettext=yes
+ else
+@@ -7477,7 +7478,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:7480: result: $ac_cv_lib_intl_gettext" >&5
++echo "$as_me:7481: result: $ac_cv_lib_intl_gettext" >&5
+ echo "${ECHO_T}$ac_cv_lib_intl_gettext" >&6
+ if test $ac_cv_lib_intl_gettext = yes; then
+   cat >>confdefs.h <<EOF
+@@ -7487,7 +7488,7 @@
+   LIBS="-lintl $LIBS"
+ 
+ else
+-   { { echo "$as_me:7490: error: NLS support has been requested but libintl wasn´t found.
++   { { echo "$as_me:7491: error: NLS support has been requested but libintl wasn´t found.
+ *** Install your vendor´s version or GNU gettext available at
+ *** ftp://ftp.gnu.org/pub/gnu/gettext/." >&5
+ echo "$as_me: error: NLS support has been requested but libintl wasn´t found.
+@@ -7557,23 +7558,23 @@
+ for ac_header in Y2/Y.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:7560: checking for $ac_header" >&5
++echo "$as_me:7561: checking for $ac_header" >&5
+ echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+ if eval "test \"\${$as_ac_Header+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 7566 "configure"
++#line 7567 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:7570: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:7571: \"$ac_cpp conftest.$ac_ext\"") >&5
+   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+   ac_status=$?
+   egrep -v '^ *\+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  echo "$as_me:7576: \$? = $ac_status" >&5
++  echo "$as_me:7577: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_cxx_preproc_warn_flag
+@@ -7592,13 +7593,13 @@
+ fi
+ rm -f conftest.err conftest.$ac_ext
+ fi
+-echo "$as_me:7595: result: `eval echo '${'$as_ac_Header'}'`" >&5
++echo "$as_me:7596: result: `eval echo '${'$as_ac_Header'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+ if test `eval echo '${'$as_ac_Header'}'` = yes; then
+   cat >>confdefs.h <<EOF
+ #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ EOF
+- echo "$as_me:7601: checking for YOpenConnection in -lY2" >&5
++ echo "$as_me:7602: checking for YOpenConnection in -lY2" >&5
+ echo $ECHO_N "checking for YOpenConnection in -lY2... $ECHO_C" >&6
+ if test "${ac_cv_lib_Y2_YOpenConnection+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -7606,7 +7607,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lY2  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 7609 "configure"
++#line 7610 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -7625,16 +7626,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:7628: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7629: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:7631: \$? = $ac_status" >&5
++  echo "$as_me:7632: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:7634: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7635: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7637: \$? = $ac_status" >&5
++  echo "$as_me:7638: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_Y2_YOpenConnection=yes
+ else
+@@ -7645,7 +7646,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:7648: result: $ac_cv_lib_Y2_YOpenConnection" >&5
++echo "$as_me:7649: result: $ac_cv_lib_Y2_YOpenConnection" >&5
+ echo "${ECHO_T}$ac_cv_lib_Y2_YOpenConnection" >&6
+ if test $ac_cv_lib_Y2_YOpenConnection = yes; then
+ 
+@@ -7670,7 +7671,7 @@
+ else
+     # Extract the first word of "esd-config", so it can be a program name with args.
+ set dummy esd-config; ac_word=$2
+-echo "$as_me:7673: checking for $ac_word" >&5
++echo "$as_me:7674: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_path_ESD_CONFIG+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -7687,7 +7688,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   if $as_executable_p "$ac_dir/$ac_word"; then
+    ac_cv_path_ESD_CONFIG="$ac_dir/$ac_word"
+-   echo "$as_me:7690: found $ac_dir/$ac_word" >&5
++   echo "$as_me:7691: found $ac_dir/$ac_word" >&5
+    break
+ fi
+ done
+@@ -7698,10 +7699,10 @@
+ ESD_CONFIG=$ac_cv_path_ESD_CONFIG
+ 
+ if test -n "$ESD_CONFIG"; then
+-  echo "$as_me:7701: result: $ESD_CONFIG" >&5
++  echo "$as_me:7702: result: $ESD_CONFIG" >&5
+ echo "${ECHO_T}$ESD_CONFIG" >&6
+ else
+-  echo "$as_me:7704: result: no" >&5
++  echo "$as_me:7705: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -7720,23 +7721,23 @@
+ for ac_header in esd.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:7723: checking for $ac_header" >&5
++echo "$as_me:7724: checking for $ac_header" >&5
+ echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+ if eval "test \"\${$as_ac_Header+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 7729 "configure"
++#line 7730 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:7733: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:7734: \"$ac_cpp conftest.$ac_ext\"") >&5
+   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+   ac_status=$?
+   egrep -v '^ *\+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  echo "$as_me:7739: \$? = $ac_status" >&5
++  echo "$as_me:7740: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_cxx_preproc_warn_flag
+@@ -7755,7 +7756,7 @@
+ fi
+ rm -f conftest.err conftest.$ac_ext
+ fi
+-echo "$as_me:7758: result: `eval echo '${'$as_ac_Header'}'`" >&5
++echo "$as_me:7759: result: `eval echo '${'$as_ac_Header'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+ if test `eval echo '${'$as_ac_Header'}'` = yes; then
+   cat >>confdefs.h <<EOF
+@@ -7763,7 +7764,7 @@
+ EOF
+ 
+ else
+-   { { echo "$as_me:7766: error: Invalid compiler flags returned by ${ESD_CONFIG}.
++   { { echo "$as_me:7767: error: Invalid compiler flags returned by ${ESD_CONFIG}.
+ *** Check your installation." >&5
+ echo "$as_me: error: Invalid compiler flags returned by ${ESD_CONFIG}.
+ *** Check your installation." >&2;}
+@@ -7771,7 +7772,7 @@
+ fi
+ done
+ 
+-echo "$as_me:7774: checking for esd_open_sound in -lesd" >&5
++echo "$as_me:7775: checking for esd_open_sound in -lesd" >&5
+ echo $ECHO_N "checking for esd_open_sound in -lesd... $ECHO_C" >&6
+ if test "${ac_cv_lib_esd_esd_open_sound+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -7779,7 +7780,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lesd  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 7782 "configure"
++#line 7783 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -7798,16 +7799,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:7801: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7802: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:7804: \$? = $ac_status" >&5
++  echo "$as_me:7805: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:7807: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7808: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7810: \$? = $ac_status" >&5
++  echo "$as_me:7811: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_esd_esd_open_sound=yes
+ else
+@@ -7818,7 +7819,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:7821: result: $ac_cv_lib_esd_esd_open_sound" >&5
++echo "$as_me:7822: result: $ac_cv_lib_esd_esd_open_sound" >&5
+ echo "${ECHO_T}$ac_cv_lib_esd_esd_open_sound" >&6
+ if test $ac_cv_lib_esd_esd_open_sound = yes; then
+   cat >>confdefs.h <<EOF
+@@ -7828,7 +7829,7 @@
+   LIBS="-lesd $LIBS"
+ 
+ else
+-   { { echo "$as_me:7831: error: Invalid linker flags returned by ${ESD_CONFIG}.
++   { { echo "$as_me:7832: error: Invalid linker flags returned by ${ESD_CONFIG}.
+ *** Check your installation." >&5
+ echo "$as_me: error: Invalid linker flags returned by ${ESD_CONFIG}.
+ *** Check your installation." >&2;}
+@@ -7848,7 +7849,7 @@
+ 	      CONFIG_ESD=yes
+ 	    fi;;
+ 	  *)
+-	    { echo "$as_me:7851: WARNING: Invalid audio interface: ${iface}" >&5
++	    { echo "$as_me:7852: WARNING: Invalid audio interface: ${iface}" >&5
+ echo "$as_me: WARNING: Invalid audio interface: ${iface}" >&2;}
+ 	esac
+       done
+@@ -7859,7 +7860,7 @@
+       done
+ 
+       if test "${audio_support}" = ""; then
+-	{ { echo "$as_me:7862: error: You have to specify at least one valid audio interface." >&5
++	{ { echo "$as_me:7863: error: You have to specify at least one valid audio interface." >&5
+ echo "$as_me: error: You have to specify at least one valid audio interface." >&2;}
+    { (exit 1); exit 1; }; }
+       else
+@@ -7874,7 +7875,7 @@
+ no_x_libs=$LIBS
+ LIBS=$CORE_LIBS
+ 
+-echo "$as_me:7877: checking for XInternAtoms in -lX11" >&5
++echo "$as_me:7878: checking for XInternAtoms in -lX11" >&5
+ echo $ECHO_N "checking for XInternAtoms in -lX11... $ECHO_C" >&6
+ if test "${ac_cv_lib_X11_XInternAtoms+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -7882,7 +7883,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lX11  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 7885 "configure"
++#line 7886 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -7901,16 +7902,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:7904: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7905: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:7907: \$? = $ac_status" >&5
++  echo "$as_me:7908: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:7910: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7911: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7913: \$? = $ac_status" >&5
++  echo "$as_me:7914: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_X11_XInternAtoms=yes
+ else
+@@ -7921,7 +7922,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:7924: result: $ac_cv_lib_X11_XInternAtoms" >&5
++echo "$as_me:7925: result: $ac_cv_lib_X11_XInternAtoms" >&5
+ echo "${ECHO_T}$ac_cv_lib_X11_XInternAtoms" >&6
+ if test $ac_cv_lib_X11_XInternAtoms = yes; then
+ 
+@@ -7937,7 +7938,7 @@
+ 
+ fi;
+   if test "$enable_sm" != "no"; then
+-    echo "$as_me:7940: checking for IceConnectionNumber in -lICE" >&5
++    echo "$as_me:7941: checking for IceConnectionNumber in -lICE" >&5
+ echo $ECHO_N "checking for IceConnectionNumber in -lICE... $ECHO_C" >&6
+ if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -7945,7 +7946,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lICE  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 7948 "configure"
++#line 7949 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -7964,16 +7965,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:7967: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7968: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:7970: \$? = $ac_status" >&5
++  echo "$as_me:7971: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:7973: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7974: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7976: \$? = $ac_status" >&5
++  echo "$as_me:7977: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_ICE_IceConnectionNumber=yes
+ else
+@@ -7984,7 +7985,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:7987: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
++echo "$as_me:7988: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
+ echo "${ECHO_T}$ac_cv_lib_ICE_IceConnectionNumber" >&6
+ if test $ac_cv_lib_ICE_IceConnectionNumber = yes; then
+ 
+@@ -7993,7 +7994,7 @@
+ EOF
+ 
+ else
+-   { echo "$as_me:7996: WARNING: Unable to use X shared memory extension" >&5
++   { echo "$as_me:7997: WARNING: Unable to use X shared memory extension" >&5
+ echo "$as_me: WARNING: Unable to use X shared memory extension" >&2;}
+ fi
+ 
+@@ -8006,7 +8007,7 @@
+ 
+ fi;
+   if test "$enable_shape" != "no"; then
+-    echo "$as_me:8009: checking for XShapeCombineRectangles in -lXext" >&5
++    echo "$as_me:8010: checking for XShapeCombineRectangles in -lXext" >&5
+ echo $ECHO_N "checking for XShapeCombineRectangles in -lXext... $ECHO_C" >&6
+ if test "${ac_cv_lib_Xext_XShapeCombineRectangles+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -8014,7 +8015,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lXext  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 8017 "configure"
++#line 8018 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -8033,16 +8034,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:8036: \"$ac_link\"") >&5
++if { (eval echo "$as_me:8037: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:8039: \$? = $ac_status" >&5
++  echo "$as_me:8040: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:8042: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8043: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8045: \$? = $ac_status" >&5
++  echo "$as_me:8046: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_Xext_XShapeCombineRectangles=yes
+ else
+@@ -8053,7 +8054,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:8056: result: $ac_cv_lib_Xext_XShapeCombineRectangles" >&5
++echo "$as_me:8057: result: $ac_cv_lib_Xext_XShapeCombineRectangles" >&5
+ echo "${ECHO_T}$ac_cv_lib_Xext_XShapeCombineRectangles" >&6
+ if test $ac_cv_lib_Xext_XShapeCombineRectangles = yes; then
+    CORE_LIBS="${CORE_LIBS} -lXext"
+@@ -8064,7 +8065,7 @@
+ 
+ 	ac_have_shape=yes
+ else
+-   { echo "$as_me:8067: WARNING: Unable to use X shape extension" >&5
++   { echo "$as_me:8068: WARNING: Unable to use X shape extension" >&5
+ echo "$as_me: WARNING: Unable to use X shape extension" >&2;}
+ fi
+ 
+@@ -8129,23 +8130,23 @@
+ for ac_header in X11/Xft/Xft.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:8132: checking for $ac_header" >&5
++echo "$as_me:8133: checking for $ac_header" >&5
+ echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+ if eval "test \"\${$as_ac_Header+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 8138 "configure"
++#line 8139 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:8142: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:8143: \"$ac_cpp conftest.$ac_ext\"") >&5
+   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+   ac_status=$?
+   egrep -v '^ *\+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  echo "$as_me:8148: \$? = $ac_status" >&5
++  echo "$as_me:8149: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_cxx_preproc_warn_flag
+@@ -8164,13 +8165,13 @@
+ fi
+ rm -f conftest.err conftest.$ac_ext
+ fi
+-echo "$as_me:8167: result: `eval echo '${'$as_ac_Header'}'`" >&5
++echo "$as_me:8168: result: `eval echo '${'$as_ac_Header'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+ if test `eval echo '${'$as_ac_Header'}'` = yes; then
+   cat >>confdefs.h <<EOF
+ #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ EOF
+-  echo "$as_me:8173: checking for XftDrawCreate in -lXft" >&5
++  echo "$as_me:8174: checking for XftDrawCreate in -lXft" >&5
+ echo $ECHO_N "checking for XftDrawCreate in -lXft... $ECHO_C" >&6
+ if test "${ac_cv_lib_Xft_XftDrawCreate+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -8178,7 +8179,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lXft  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 8181 "configure"
++#line 8182 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -8197,16 +8198,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:8200: \"$ac_link\"") >&5
++if { (eval echo "$as_me:8201: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:8203: \$? = $ac_status" >&5
++  echo "$as_me:8204: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:8206: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8207: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8209: \$? = $ac_status" >&5
++  echo "$as_me:8210: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_Xft_XftDrawCreate=yes
+ else
+@@ -8217,7 +8218,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:8220: result: $ac_cv_lib_Xft_XftDrawCreate" >&5
++echo "$as_me:8221: result: $ac_cv_lib_Xft_XftDrawCreate" >&5
+ echo "${ECHO_T}$ac_cv_lib_Xft_XftDrawCreate" >&6
+ if test $ac_cv_lib_Xft_XftDrawCreate = yes; then
+ 
+@@ -8229,7 +8230,7 @@
+         features="${features} xfreetype"
+ else
+    if test "$enable_xfreetype" != "implied"; then
+-          { { echo "$as_me:8232: error: Xft support has been requested but libraries were not found.
++          { { echo "$as_me:8233: error: Xft support has been requested but libraries were not found.
+ *** Configure your X server to support XFreeType.
+ *** Information about how to do this can be found in RELNOTES for XFree86." >&5
+ echo "$as_me: error: Xft support has been requested but libraries were not found.
+@@ -8241,7 +8242,7 @@
+ 
+ else
+    if test "$enable_xfreetype" != "implied"; then
+-        { { echo "$as_me:8244: error: Xft support has been requested but headers were not found.
++        { { echo "$as_me:8245: error: Xft support has been requested but headers were not found.
+ *** Configure your X server to support XFreeType.
+ *** Information about how to do this can be found in RELNOTES for XFree86." >&5
+ echo "$as_me: error: Xft support has been requested but headers were not found.
+@@ -8305,6 +8306,19 @@
+ 
+   fi
+ 
++# Check whether --enable-apm or --disable-apm was given.
++if test "${enable_apm+set}" = set; then
++  enableval="$enable_apm"
++
++fi;
++  if test "$enable_apm" != "no"; then
++
++cat >>confdefs.h <<\EOF
++#define CONFIG_APPLET_APM 1
++EOF
++
++  fi
++
+ # Check whether --enable-keyconf or --disable-keyconf was given.
+ if test "${enable_keyconf+set}" = set; then
+   enableval="$enable_keyconf"
+@@ -8382,10 +8396,6 @@
+ EOF
+ 
+ cat >>confdefs.h <<\EOF
+-#define CONFIG_APPLET_APM 1
+-EOF
+-
+-cat >>confdefs.h <<\EOF
+ #define CONFIG_ADDRESSBAR 1
+ EOF
+ 
+@@ -8425,7 +8435,7 @@
+  if test "${with_gnome_menus_sign}" = "yes"; then
+       # Extract the first word of "gnome-config", so it can be a program name with args.
+ set dummy gnome-config; ac_word=$2
+-echo "$as_me:8428: checking for $ac_word" >&5
++echo "$as_me:8438: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_path_GNOME_CONFIG+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -8442,7 +8452,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   if $as_executable_p "$ac_dir/$ac_word"; then
+    ac_cv_path_GNOME_CONFIG="$ac_dir/$ac_word"
+-   echo "$as_me:8445: found $ac_dir/$ac_word" >&5
++   echo "$as_me:8455: found $ac_dir/$ac_word" >&5
+    break
+ fi
+ done
+@@ -8453,10 +8463,10 @@
+ GNOME_CONFIG=$ac_cv_path_GNOME_CONFIG
+ 
+ if test -n "$GNOME_CONFIG"; then
+-  echo "$as_me:8456: result: $GNOME_CONFIG" >&5
++  echo "$as_me:8466: result: $GNOME_CONFIG" >&5
+ echo "${ECHO_T}$GNOME_CONFIG" >&6
+ else
+-  echo "$as_me:8459: result: no" >&5
++  echo "$as_me:8469: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -8469,7 +8479,7 @@
+ EOF
+ 
+       else
+-	{ { echo "$as_me:8472: error: gnome-config can not be found.
++	{ { echo "$as_me:8482: error: gnome-config can not be found.
+ *** Install the GNOME´s development packages or use the argument of the
+ *** --with-gnome-menus switch to pass gnome-config´s location." >&5
+ echo "$as_me: error: gnome-config can not be found.
+@@ -8537,7 +8547,7 @@
+ 
+ if test "${with_imlib_sign}" != "yes"; then
+   if test "${with_xpm_sign}" = "no"; then
+-    { { echo "$as_me:8540: error: You have to enable libXpm or Imlib" >&5
++    { { echo "$as_me:8550: error: You have to enable libXpm or Imlib" >&5
+ echo "$as_me: error: You have to enable libXpm or Imlib" >&2;}
+    { (exit 1); exit 1; }; }
+   else
+@@ -8545,7 +8555,7 @@
+       xpm_cflags="-I${with_xpm_arg}/include"
+       xpm_lflags="-L${with_xpm_arg}/lib"
+     fi
+-    echo "$as_me:8548: checking for XpmReadFileToPixmap in -lXpm" >&5
++    echo "$as_me:8558: checking for XpmReadFileToPixmap in -lXpm" >&5
+ echo $ECHO_N "checking for XpmReadFileToPixmap in -lXpm... $ECHO_C" >&6
+ if test "${ac_cv_lib_Xpm_XpmReadFileToPixmap+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -8553,7 +8563,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lXpm  $xpm_lflags  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 8556 "configure"
++#line 8566 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -8572,16 +8582,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:8575: \"$ac_link\"") >&5
++if { (eval echo "$as_me:8585: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:8578: \$? = $ac_status" >&5
++  echo "$as_me:8588: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:8581: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8591: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8584: \$? = $ac_status" >&5
++  echo "$as_me:8594: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_Xpm_XpmReadFileToPixmap=yes
+ else
+@@ -8592,7 +8602,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:8595: result: $ac_cv_lib_Xpm_XpmReadFileToPixmap" >&5
++echo "$as_me:8605: result: $ac_cv_lib_Xpm_XpmReadFileToPixmap" >&5
+ echo "${ECHO_T}$ac_cv_lib_Xpm_XpmReadFileToPixmap" >&6
+ if test $ac_cv_lib_Xpm_XpmReadFileToPixmap = yes; then
+    IMAGE_CFLAGS="${xpm_cflags}"
+@@ -8605,7 +8615,7 @@
+ 	no_imlib=yes
+ else
+    if test "${with_xpm_sign}" = ""; then
+-	  { { echo "$as_me:8608: error: libXpm can not be found" >&5
++	  { { echo "$as_me:8618: error: libXpm can not be found" >&5
+ echo "$as_me: error: libXpm can not be found" >&2;}
+    { (exit 1); exit 1; }; }
+         fi
+@@ -8615,7 +8625,7 @@
+   fi
+ else
+   if test "${with_xpm_sign}" = "yes"; then
+-    { { echo "$as_me:8618: error: libXpm and Imlib can not be used in the same time" >&5
++    { { echo "$as_me:8628: error: libXpm and Imlib can not be used in the same time" >&5
+ echo "$as_me: error: libXpm and Imlib can not be used in the same time" >&2;}
+    { (exit 1); exit 1; }; }
+   fi
+@@ -8623,14 +8633,14 @@
+ 
+ if test "${no_imlib}" != "yes"; then
+   if test "${with_imlib_sign}" = "no"; then
+-    { { echo "$as_me:8626: error: libXpm can not be found, you have to enable Imlib" >&5
++    { { echo "$as_me:8636: error: libXpm can not be found, you have to enable Imlib" >&5
+ echo "$as_me: error: libXpm can not be found, you have to enable Imlib" >&2;}
+    { (exit 1); exit 1; }; }
+   fi
+ 
+   # Extract the first word of "imlib-config", so it can be a program name with args.
+ set dummy imlib-config; ac_word=$2
+-echo "$as_me:8633: checking for $ac_word" >&5
++echo "$as_me:8643: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_path_IMLIB_CONFIG+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -8647,7 +8657,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   if $as_executable_p "$ac_dir/$ac_word"; then
+    ac_cv_path_IMLIB_CONFIG="$ac_dir/$ac_word"
+-   echo "$as_me:8650: found $ac_dir/$ac_word" >&5
++   echo "$as_me:8660: found $ac_dir/$ac_word" >&5
+    break
+ fi
+ done
+@@ -8658,15 +8668,15 @@
+ IMLIB_CONFIG=$ac_cv_path_IMLIB_CONFIG
+ 
+ if test -n "$IMLIB_CONFIG"; then
+-  echo "$as_me:8661: result: $IMLIB_CONFIG" >&5
++  echo "$as_me:8671: result: $IMLIB_CONFIG" >&5
+ echo "${ECHO_T}$IMLIB_CONFIG" >&6
+ else
+-  echo "$as_me:8664: result: no" >&5
++  echo "$as_me:8674: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+   if test "${IMLIB_CONFIG}" = ""; then
+-    { { echo "$as_me:8669: error: imlib-config can not be found" >&5
++    { { echo "$as_me:8679: error: imlib-config can not be found" >&5
+ echo "$as_me: error: imlib-config can not be found" >&2;}
+    { (exit 1); exit 1; }; }
+   fi
+@@ -8688,7 +8698,7 @@
+ else
+    # Extract the first word of "mkfontdir", so it can be a program name with args.
+ set dummy mkfontdir; ac_word=$2
+-echo "$as_me:8691: checking for $ac_word" >&5
++echo "$as_me:8701: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_path_MKFONTDIR+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -8705,7 +8715,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   if $as_executable_p "$ac_dir/$ac_word"; then
+    ac_cv_path_MKFONTDIR="$ac_dir/$ac_word"
+-   echo "$as_me:8708: found $ac_dir/$ac_word" >&5
++   echo "$as_me:8718: found $ac_dir/$ac_word" >&5
+    break
+ fi
+ done
+@@ -8716,10 +8726,10 @@
+ MKFONTDIR=$ac_cv_path_MKFONTDIR
+ 
+ if test -n "$MKFONTDIR"; then
+-  echo "$as_me:8719: result: $MKFONTDIR" >&5
++  echo "$as_me:8729: result: $MKFONTDIR" >&5
+ echo "${ECHO_T}$MKFONTDIR" >&6
+ else
+-  echo "$as_me:8722: result: no" >&5
++  echo "$as_me:8732: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -8731,7 +8741,7 @@
+ if test "${with_kdedatadir+set}" = set; then
+   withval="$with_kdedatadir"
+    if test x"$with_kdedatadir" = x -o "$with_kdedatadir" = "yes"; then
+-      { { echo "$as_me:8734: error: Invalid usage of --with-kdedatadir argument" >&5
++      { { echo "$as_me:8744: error: Invalid usage of --with-kdedatadir argument" >&5
+ echo "$as_me: error: Invalid usage of --with-kdedatadir argument" >&2;}
+    { (exit 1); exit 1; }; }
+     else
+@@ -8749,7 +8759,7 @@
+ if test "${with_libdir+set}" = set; then
+   withval="$with_libdir"
+    if test x"$with_libdir" = x -o "$with_libdir" = "yes"; then
+-      { { echo "$as_me:8752: error: Invalid usage of --with-libdir argument" >&5
++      { { echo "$as_me:8762: error: Invalid usage of --with-libdir argument" >&5
+ echo "$as_me: error: Invalid usage of --with-libdir argument" >&2;}
+    { (exit 1); exit 1; }; }
+     else
+@@ -8763,7 +8773,7 @@
+ if test "${with_cfgdir+set}" = set; then
+   withval="$with_cfgdir"
+    if test x"$with_cfgdir" = x -o "$with_cfgdir" = "yes"; then
+-      { { echo "$as_me:8766: error: Invalid usage of --with-cfgdir argument" >&5
++      { { echo "$as_me:8776: error: Invalid usage of --with-cfgdir argument" >&5
+ echo "$as_me: error: Invalid usage of --with-cfgdir argument" >&2;}
+    { (exit 1); exit 1; }; }
+     else
+@@ -8777,7 +8787,7 @@
+ if test "${with_docdir+set}" = set; then
+   withval="$with_docdir"
+    if test x"$with_docdir" = x -o "$with_docdir" = "yes"; then
+-      { { echo "$as_me:8780: error: Invalid usage of --with-docdir argument" >&5
++      { { echo "$as_me:8790: error: Invalid usage of --with-docdir argument" >&5
+ echo "$as_me: error: Invalid usage of --with-docdir argument" >&2;}
+    { (exit 1); exit 1; }; }
+     else
+@@ -8871,7 +8881,7 @@
+ : ${CONFIG_STATUS=./config.status}
+ ac_clean_files_save=$ac_clean_files
+ ac_clean_files="$ac_clean_files $CONFIG_STATUS"
+-{ echo "$as_me:8874: creating $CONFIG_STATUS" >&5
++{ echo "$as_me:8884: creating $CONFIG_STATUS" >&5
+ echo "$as_me: creating $CONFIG_STATUS" >&6;}
+ cat >$CONFIG_STATUS <<_ACEOF
+ #! $SHELL
+@@ -9044,7 +9054,7 @@
+     echo "$ac_cs_version"; exit 0 ;;
+   --he | --h)
+     # Conflict between --help and --header
+-    { { echo "$as_me:9047: error: ambiguous option: $1
++    { { echo "$as_me:9057: error: ambiguous option: $1
+ Try \`$0 --help' for more information." >&5
+ echo "$as_me: error: ambiguous option: $1
+ Try \`$0 --help' for more information." >&2;}
+@@ -9063,7 +9073,7 @@
+     ac_need_defaults=false;;
+ 
+   # This is an error.
+-  -*) { { echo "$as_me:9066: error: unrecognized option: $1
++  -*) { { echo "$as_me:9076: error: unrecognized option: $1
+ Try \`$0 --help' for more information." >&5
+ echo "$as_me: error: unrecognized option: $1
+ Try \`$0 --help' for more information." >&2;}
+@@ -9106,7 +9116,7 @@
+   "lib/toolbar" ) CONFIG_FILES="$CONFIG_FILES lib/toolbar" ;;
+   "lib/winoptions" ) CONFIG_FILES="$CONFIG_FILES lib/winoptions" ;;
+   "src/config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS src/config.h" ;;
+-  *) { { echo "$as_me:9109: error: invalid argument: $ac_config_target" >&5
++  *) { { echo "$as_me:9119: error: invalid argument: $ac_config_target" >&5
+ echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
+    { (exit 1); exit 1; }; };;
+   esac
+@@ -9353,7 +9363,7 @@
+   esac
+ 
+   if test x"$ac_file" != x-; then
+-    { echo "$as_me:9356: creating $ac_file" >&5
++    { echo "$as_me:9366: creating $ac_file" >&5
+ echo "$as_me: creating $ac_file" >&6;}
+     rm -f "$ac_file"
+   fi
+@@ -9371,7 +9381,7 @@
+       -) echo $tmp/stdin ;;
+       [\\/$]*)
+          # Absolute (can't be DOS-style, as IFS=:)
+-         test -f "$f" || { { echo "$as_me:9374: error: cannot find input file: $f" >&5
++         test -f "$f" || { { echo "$as_me:9384: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+    { (exit 1); exit 1; }; }
+          echo $f;;
+@@ -9384,7 +9394,7 @@
+            echo $srcdir/$f
+          else
+            # /dev/null tree
+-           { { echo "$as_me:9387: error: cannot find input file: $f" >&5
++           { { echo "$as_me:9397: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+    { (exit 1); exit 1; }; }
+          fi;;
+@@ -9445,7 +9455,7 @@
+   * )   ac_file_in=$ac_file.in ;;
+   esac
+ 
+-  test x"$ac_file" != x- && { echo "$as_me:9448: creating $ac_file" >&5
++  test x"$ac_file" != x- && { echo "$as_me:9458: creating $ac_file" >&5
+ echo "$as_me: creating $ac_file" >&6;}
+ 
+   # First look for the input files in the build tree, otherwise in the
+@@ -9456,7 +9466,7 @@
+       -) echo $tmp/stdin ;;
+       [\\/$]*)
+          # Absolute (can't be DOS-style, as IFS=:)
+-         test -f "$f" || { { echo "$as_me:9459: error: cannot find input file: $f" >&5
++         test -f "$f" || { { echo "$as_me:9469: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+    { (exit 1); exit 1; }; }
+          echo $f;;
+@@ -9469,7 +9479,7 @@
+            echo $srcdir/$f
+          else
+            # /dev/null tree
+-           { { echo "$as_me:9472: error: cannot find input file: $f" >&5
++           { { echo "$as_me:9482: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+    { (exit 1); exit 1; }; }
+          fi;;
+@@ -9586,7 +9596,7 @@
+   rm -f $tmp/in
+   if test x"$ac_file" != x-; then
+     if cmp -s $ac_file $tmp/config.h 2>/dev/null; then
+-      { echo "$as_me:9589: $ac_file is unchanged" >&5
++      { echo "$as_me:9599: $ac_file is unchanged" >&5
+ echo "$as_me: $ac_file is unchanged" >&6;}
+     else
+       ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+@@ -9653,7 +9663,7 @@
+   $ac_cs_success || { (exit 1); exit 1; }
+ fi
+ 
+-echo "$as_me:9656: result: " >&5
++echo "$as_me:9666: result: " >&5
+ echo "${ECHO_T}" >&6
+ (
+   ice_value=`(
+@@ -9667,7 +9677,7 @@
+     ice_value=`eval echo \""$ice_value"\"`
+   done
+ 
+-  echo "$as_me:9670: result: Build targets: $ice_value" >&5
++  echo "$as_me:9680: result: Build targets: $ice_value" >&5
+ echo "${ECHO_T}Build targets: $ice_value" >&6
+ )
+ (
+@@ -9682,7 +9692,7 @@
+     ice_value=`eval echo \""$ice_value"\"`
+   done
+ 
+-  echo "$as_me:9685: result: Applications: $ice_value" >&5
++  echo "$as_me:9695: result: Applications: $ice_value" >&5
+ echo "${ECHO_T}Applications: $ice_value" >&6
+ )
+ (
+@@ -9697,7 +9707,7 @@
+     ice_value=`eval echo \""$ice_value"\"`
+   done
+ 
+-  echo "$as_me:9700: result: Image library: $ice_value" >&5
++  echo "$as_me:9710: result: Image library: $ice_value" >&5
+ echo "${ECHO_T}Image library: $ice_value" >&6
+ )
+ (
+@@ -9712,7 +9722,7 @@
+     ice_value=`eval echo \""$ice_value"\"`
+   done
+ 
+-  echo "$as_me:9715: result: Audio support: $ice_value" >&5
++  echo "$as_me:9725: result: Audio support: $ice_value" >&5
+ echo "${ECHO_T}Audio support: $ice_value" >&6
+ )
+ (
+@@ -9727,7 +9737,7 @@
+     ice_value=`eval echo \""$ice_value"\"`
+   done
+ 
+-  echo "$as_me:9730: result: Features: $ice_value" >&5
++  echo "$as_me:9740: result: Features: $ice_value" >&5
+ echo "${ECHO_T}Features: $ice_value" >&6
+ )
+ (
+@@ -9742,7 +9752,7 @@
+     ice_value=`eval echo \""$ice_value"\"`
+   done
+ 
+-  echo "$as_me:9745: result: Paths: PREFIX: $ice_value" >&5
++  echo "$as_me:9755: result: Paths: PREFIX: $ice_value" >&5
+ echo "${ECHO_T}Paths: PREFIX: $ice_value" >&6
+ )
+ (
+@@ -9757,7 +9767,7 @@
+     ice_value=`eval echo \""$ice_value"\"`
+   done
+ 
+-  echo "$as_me:9760: result:        BINDIR: $ice_value" >&5
++  echo "$as_me:9770: result:        BINDIR: $ice_value" >&5
+ echo "${ECHO_T}       BINDIR: $ice_value" >&6
+ )
+ (
+@@ -9772,7 +9782,7 @@
+     ice_value=`eval echo \""$ice_value"\"`
+   done
+ 
+-  echo "$as_me:9775: result:        LOCDIR: $ice_value" >&5
++  echo "$as_me:9785: result:        LOCDIR: $ice_value" >&5
+ echo "${ECHO_T}       LOCDIR: $ice_value" >&6
+ )
+ (
+@@ -9787,7 +9797,7 @@
+     ice_value=`eval echo \""$ice_value"\"`
+   done
+ 
+-  echo "$as_me:9790: result:        LIBDIR: $ice_value" >&5
++  echo "$as_me:9800: result:        LIBDIR: $ice_value" >&5
+ echo "${ECHO_T}       LIBDIR: $ice_value" >&6
+ )
+ (
+@@ -9802,7 +9812,7 @@
+     ice_value=`eval echo \""$ice_value"\"`
+   done
+ 
+-  echo "$as_me:9805: result:        CFGDIR: $ice_value" >&5
++  echo "$as_me:9815: result:        CFGDIR: $ice_value" >&5
+ echo "${ECHO_T}       CFGDIR: $ice_value" >&6
+ )
+ (
+@@ -9817,7 +9827,7 @@
+     ice_value=`eval echo \""$ice_value"\"`
+   done
+ 
+-  echo "$as_me:9820: result:        KDEDIR: $ice_value" >&5
++  echo "$as_me:9830: result:        KDEDIR: $ice_value" >&5
+ echo "${ECHO_T}       KDEDIR: $ice_value" >&6
+ )
+ (
+@@ -9832,6 +9842,6 @@
+     ice_value=`eval echo \""$ice_value"\"`
+   done
+ 
+-  echo "$as_me:9835: result:        DOCDIR: $ice_value" >&5
++  echo "$as_me:9845: result:        DOCDIR: $ice_value" >&5
+ echo "${ECHO_T}       DOCDIR: $ice_value" >&6
+ )