Mercurial > hg > xemacs-beta

--- a/CHANGES-beta	Mon Aug 13 10:21:19 2007 +0200
+++ b/CHANGES-beta	Mon Aug 13 10:22:03 2007 +0200
@@ -1,4 +1,10 @@
 							-*- indented-text -*-
+to 20.5 beta27 "Kinder"
+-- Locale fix courtesy of Kazuyuki IENAGA
+-- Fix for TZSET problem on Sun via Jens Krinke
+-- Another try at modeline scroll, courtesy of Didier Verna
+-- Miscellaneous bug fixes
+
 to 20.5 beta26 "Kiko"
 -- MS Windows patches courtesy of Kirill Katsnelson
 -- Various patches from Kyle Jones
--- a/ChangeLog	Mon Aug 13 10:21:19 2007 +0200
+++ b/ChangeLog	Mon Aug 13 10:22:03 2007 +0200
@@ -1,5 +1,15 @@
 1998-02-19  SL Baur  <steve@altair.xemacs.org>

+	* XEmacs 20.5-beta27 is released.
+	* XEmacs-20.4-pre4 is released.
+
+	* configure.in (doug_lea_malloc): Requires USE_MINIMAL_TAGBITS.
+	(--with-gung): Implement it.
+
+	* configure.usage (--with-gung): Document.  Turns on
+	USE_MINIMAL_TAGBITS and USE_INDEXED_LRECORD_IMPLEMENTATION.
+	(--with-term): Remove.
+
 	* XEmacs-20.5-beta26 is released.

 1998-02-18  SL Baur  <steve@altair.xemacs.org>
--- a/configure	Mon Aug 13 10:21:19 2007 +0200
+++ b/configure	Mon Aug 13 10:22:03 2007 +0200
@@ -240,6 +240,8 @@
 cflags='UNSPECIFIED'
 dynamic=''
 with_x11=''
+with_gung='no'
+with_minimal_tagbits='no'
 rel_alloc='default'
 with_system_malloc='default'
 native_sound_lib=''
@@ -302,9 +304,9 @@
 	with_gcc	| \
 	with_gnu_make	| \
 	dynamic		| \
+	with_gung	| \
 	with_ncurses	| \
 	with_dnet	| \
-	with_term	| \
 	with_socks	| \
 	with_cde	| \
 	with_offix	| \
@@ -636,7 +638,7 @@

 if test -z "$configuration"; then
   echo $ac_n "checking "host system type"""... $ac_c" 1>&6
-echo "configure:640: checking "host system type"" >&5
+echo "configure:642: checking "host system type"" >&5
     if configuration=`${CONFIG_SHELL-/bin/sh} $srcdir/config.guess | \
     sed 's/^\([^-][^-]*-[^-][^-]*-[^-][^-]*\)-.*$/\1/'` ; then
     echo "$ac_t""$configuration" 1>&6
@@ -650,7 +652,7 @@
 fi

 echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6
-echo "configure:654: checking whether ln -s works" >&5
+echo "configure:656: checking whether ln -s works" >&5

 rm -f conftestdata
 if ln -s X conftestdata 2>/dev/null
@@ -827,7 +829,7 @@


 echo "checking "the configuration name"" 1>&6
-echo "configure:831: checking "the configuration name"" >&5
+echo "configure:833: checking "the configuration name"" >&5
 internal_configuration=`echo $configuration | sed 's/-\(workshop\)//'`
 if canonical=`$srcdir/config.sub "$internal_configuration"` ; then : ; else
   exit $?
@@ -1298,7 +1300,7 @@
 # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1302: checking for $ac_word" >&5
+echo "configure:1304: checking for $ac_word" >&5

 if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -1324,7 +1326,7 @@
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1328: checking for $ac_word" >&5
+echo "configure:1330: checking for $ac_word" >&5

 if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -1369,7 +1371,7 @@
 fi

 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:1373: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+echo "configure:1375: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5

 ac_ext=c
 xe_cppflags='$CPPFLAGS $c_switch_site $c_switch_machine $c_switch_system $c_switch_x_site $X_CFLAGS'
@@ -1381,11 +1383,11 @@
 cross_compiling=no

 cat > conftest.$ac_ext <<EOF
-#line 1385 "configure"
+#line 1387 "configure"
 #include "confdefs.h"
 main(){return(0);}
 EOF
-if { (eval echo configure:1389: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:1391: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   ac_cv_prog_cc_works=yes
   # If we can't run a trivial program, we are probably using a cross compiler.
   if (./conftest; exit) 2>/dev/null; then
@@ -1405,19 +1407,19 @@
   { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
 fi
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:1409: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:1411: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
 cross_compiling=$ac_cv_prog_cc_cross

 echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:1414: checking whether we are using GNU C" >&5
+echo "configure:1416: checking whether we are using GNU C" >&5

 cat > conftest.c <<EOF
 #ifdef __GNUC__
   yes;
 #endif
 EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1421: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1423: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
   ac_cv_prog_gcc=yes
 else
   ac_cv_prog_gcc=no
@@ -1431,7 +1433,7 @@
   ac_save_CFLAGS="$CFLAGS"
   CFLAGS=
   echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:1435: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:1437: checking whether ${CC-cc} accepts -g" >&5

 echo 'void f(){}' > conftest.c
 if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then
@@ -1460,7 +1462,7 @@
   # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1464: checking for $ac_word" >&5
+echo "configure:1466: checking for $ac_word" >&5

 if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -1486,7 +1488,7 @@
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1490: checking for $ac_word" >&5
+echo "configure:1492: checking for $ac_word" >&5

 if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -1531,7 +1533,7 @@
 fi

 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:1535: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+echo "configure:1537: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5

 ac_ext=c
 xe_cppflags='$CPPFLAGS $c_switch_site $c_switch_machine $c_switch_system $c_switch_x_site $X_CFLAGS'
@@ -1543,11 +1545,11 @@
 cross_compiling=no

 cat > conftest.$ac_ext <<EOF
-#line 1547 "configure"
+#line 1549 "configure"
 #include "confdefs.h"
 main(){return(0);}
 EOF
-if { (eval echo configure:1551: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:1553: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   ac_cv_prog_cc_works=yes
   # If we can't run a trivial program, we are probably using a cross compiler.
   if (./conftest; exit) 2>/dev/null; then
@@ -1567,19 +1569,19 @@
   { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
 fi
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:1571: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:1573: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
 cross_compiling=$ac_cv_prog_cc_cross

 echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:1576: checking whether we are using GNU C" >&5
+echo "configure:1578: checking whether we are using GNU C" >&5

 cat > conftest.c <<EOF
 #ifdef __GNUC__
   yes;
 #endif
 EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1583: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1585: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
   ac_cv_prog_gcc=yes
 else
   ac_cv_prog_gcc=no
@@ -1593,7 +1595,7 @@
   ac_save_CFLAGS="$CFLAGS"
   CFLAGS=
   echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:1597: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:1599: checking whether ${CC-cc} accepts -g" >&5

 echo 'void f(){}' > conftest.c
 if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then
@@ -1622,7 +1624,7 @@
   # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1626: checking for $ac_word" >&5
+echo "configure:1628: checking for $ac_word" >&5

 if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -1648,7 +1650,7 @@
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1652: checking for $ac_word" >&5
+echo "configure:1654: checking for $ac_word" >&5

 if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -1693,7 +1695,7 @@
 fi

 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:1697: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+echo "configure:1699: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5

 ac_ext=c
 xe_cppflags='$CPPFLAGS $c_switch_site $c_switch_machine $c_switch_system $c_switch_x_site $X_CFLAGS'
@@ -1705,11 +1707,11 @@
 cross_compiling=no

 cat > conftest.$ac_ext <<EOF
-#line 1709 "configure"
+#line 1711 "configure"
 #include "confdefs.h"
 main(){return(0);}
 EOF
-if { (eval echo configure:1713: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:1715: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   ac_cv_prog_cc_works=yes
   # If we can't run a trivial program, we are probably using a cross compiler.
   if (./conftest; exit) 2>/dev/null; then
@@ -1729,19 +1731,19 @@
   { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
 fi
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:1733: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:1735: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
 cross_compiling=$ac_cv_prog_cc_cross

 echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:1738: checking whether we are using GNU C" >&5
+echo "configure:1740: checking whether we are using GNU C" >&5

 cat > conftest.c <<EOF
 #ifdef __GNUC__
   yes;
 #endif
 EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1745: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1747: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
   ac_cv_prog_gcc=yes
 else
   ac_cv_prog_gcc=no
@@ -1755,7 +1757,7 @@
   ac_save_CFLAGS="$CFLAGS"
   CFLAGS=
   echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:1759: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:1761: checking whether ${CC-cc} accepts -g" >&5

 echo 'void f(){}' > conftest.c
 if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then
@@ -1788,7 +1790,7 @@
 test -n "$NON_GNU_CPP" -a "$GCC" != "yes" -a -z "$CPP" && CPP="$NON_GNU_CPP"

 echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
-echo "configure:1792: checking how to run the C preprocessor" >&5
+echo "configure:1794: checking how to run the C preprocessor" >&5
 # On Suns, sometimes $CPP names a directory.
 if test -n "$CPP" && test -d "$CPP"; then
   CPP=
@@ -1801,13 +1803,13 @@
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp.
   cat > conftest.$ac_ext <<EOF
-#line 1805 "configure"
+#line 1807 "configure"
 #include "confdefs.h"
 #include <assert.h>
 Syntax Error
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1811: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1813: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   :
@@ -1818,13 +1820,13 @@
   rm -rf conftest*
   CPP="${CC-cc} -E -traditional-cpp"
   cat > conftest.$ac_ext <<EOF
-#line 1822 "configure"
+#line 1824 "configure"
 #include "confdefs.h"
 #include <assert.h>
 Syntax Error
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1828: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1830: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   :
@@ -1847,9 +1849,9 @@


 echo $ac_n "checking for AIX""... $ac_c" 1>&6
-echo "configure:1851: checking for AIX" >&5
-cat > conftest.$ac_ext <<EOF
-#line 1853 "configure"
+echo "configure:1853: checking for AIX" >&5
+cat > conftest.$ac_ext <<EOF
+#line 1855 "configure"
 #include "confdefs.h"
 #ifdef _AIX
   yes
@@ -1876,9 +1878,9 @@


 echo $ac_n "checking for GNU libc""... $ac_c" 1>&6
-echo "configure:1880: checking for GNU libc" >&5
-cat > conftest.$ac_ext <<EOF
-#line 1882 "configure"
+echo "configure:1882: checking for GNU libc" >&5
+cat > conftest.$ac_ext <<EOF
+#line 1884 "configure"
 #include "confdefs.h"
 #include <features.h>
 int main() {
@@ -1890,7 +1892,7 @@

 ; return 0; }
 EOF
-if { (eval echo configure:1894: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1896: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   have_glibc=yes
 else
@@ -1911,9 +1913,9 @@


 echo $ac_n "checking whether we are using SunPro C""... $ac_c" 1>&6
-echo "configure:1915: checking whether we are using SunPro C" >&5
-cat > conftest.$ac_ext <<EOF
-#line 1917 "configure"
+echo "configure:1917: checking whether we are using SunPro C" >&5
+cat > conftest.$ac_ext <<EOF
+#line 1919 "configure"
 #include "confdefs.h"

 int main() {
@@ -1924,7 +1926,7 @@

 ; return 0; }
 EOF
-if { (eval echo configure:1928: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1930: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   __sunpro_c=yes
 else
@@ -2200,7 +2202,7 @@
  fi

 echo $ac_n "checking for dynodump""... $ac_c" 1>&6
-echo "configure:2204: checking for dynodump" >&5
+echo "configure:2206: checking for dynodump" >&5
 if test "$unexec" != "unexsol2.o"; then
   echo "$ac_t""no" 1>&6
 else
@@ -2298,19 +2300,19 @@

 if test "$add_runtime_path" = "yes"; then
       echo $ac_n "checking "for runtime libraries flag"""... $ac_c" 1>&6
-echo "configure:2302: checking "for runtime libraries flag"" >&5
+echo "configure:2304: checking "for runtime libraries flag"" >&5
   dash_r=""
   for try_dash_r in "-R" "-R " "-rpath "; do
     xe_check_libs="${try_dash_r}/no/such/file-or-directory"
     cat > conftest.$ac_ext <<EOF
-#line 2307 "configure"
-#include "confdefs.h"
-
-int main() {
-
-; return 0; }
-EOF
-if { (eval echo configure:2314: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+#line 2309 "configure"
+#include "confdefs.h"
+
+int main() {
+
+; return 0; }
+EOF
+if { (eval echo configure:2316: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   dash_r="$try_dash_r"
 else
@@ -2392,10 +2394,10 @@
 GNU_MALLOC=yes
 doug_lea_malloc=yes
 echo $ac_n "checking for malloc_get_state""... $ac_c" 1>&6
-echo "configure:2396: checking for malloc_get_state" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 2399 "configure"
+echo "configure:2398: checking for malloc_get_state" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 2401 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char malloc_get_state(); below.  */
@@ -2418,7 +2420,7 @@

 ; return 0; }
 EOF
-if { (eval echo configure:2422: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:2424: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_malloc_get_state=yes"
 else
@@ -2438,10 +2440,10 @@
 fi

 echo $ac_n "checking for malloc_set_state""... $ac_c" 1>&6
-echo "configure:2442: checking for malloc_set_state" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 2445 "configure"
+echo "configure:2444: checking for malloc_set_state" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 2447 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char malloc_set_state(); below.  */
@@ -2464,7 +2466,7 @@

 ; return 0; }
 EOF
-if { (eval echo configure:2468: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:2470: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_malloc_set_state=yes"
 else
@@ -2484,16 +2486,16 @@
 fi

 echo $ac_n "checking whether __after_morecore_hook exists""... $ac_c" 1>&6
-echo "configure:2488: checking whether __after_morecore_hook exists" >&5
-cat > conftest.$ac_ext <<EOF
-#line 2490 "configure"
+echo "configure:2490: checking whether __after_morecore_hook exists" >&5
+cat > conftest.$ac_ext <<EOF
+#line 2492 "configure"
 #include "confdefs.h"
 extern void (* __after_morecore_hook)();
 int main() {
 __after_morecore_hook = 0
 ; return 0; }
 EOF
-if { (eval echo configure:2497: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:2499: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   echo "$ac_t""yes" 1>&6
 else
@@ -2531,13 +2533,22 @@
 EOF
 }

+  { test "$extra_verbose" = "yes" && cat << \EOF
+    Defining USE_MINIMAL_TAGBITS
+EOF
+cat >> confdefs.h <<\EOF
+#define USE_MINIMAL_TAGBITS 1
+EOF
+}
+
+  with_minimal_tagbits=yes
 fi


 # Extract the first word of "ranlib", so it can be a program name with args.
 set dummy ranlib; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2541: checking for $ac_word" >&5
+echo "configure:2552: checking for $ac_word" >&5

 if test -n "$RANLIB"; then
   ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
@@ -2590,7 +2601,7 @@
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # ./install, which can be erroneously created by make from ./install.sh.
 echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:2594: checking for a BSD compatible install" >&5
+echo "configure:2605: checking for a BSD compatible install" >&5
 if test -z "$INSTALL"; then

   IFS="${IFS= 	}"; ac_save_IFS="$IFS"; IFS="${IFS}:"
@@ -2641,7 +2652,7 @@
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2645: checking for $ac_word" >&5
+echo "configure:2656: checking for $ac_word" >&5

 if test -n "$YACC"; then
   ac_cv_prog_YACC="$YACC" # Let the user override the test.
@@ -2672,15 +2683,15 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:2676: checking for $ac_hdr" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 2679 "configure"
+echo "configure:2687: checking for $ac_hdr" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 2690 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2684: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2695: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -2713,15 +2724,15 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:2717: checking for $ac_hdr" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 2720 "configure"
+echo "configure:2728: checking for $ac_hdr" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 2731 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2725: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2736: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -2754,15 +2765,15 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:2758: checking for $ac_hdr" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 2761 "configure"
+echo "configure:2769: checking for $ac_hdr" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 2772 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2766: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2777: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -2792,10 +2803,10 @@
 done

 echo $ac_n "checking for sys/wait.h that is POSIX.1 compatible""... $ac_c" 1>&6
-echo "configure:2796: checking for sys/wait.h that is POSIX.1 compatible" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 2799 "configure"
+echo "configure:2807: checking for sys/wait.h that is POSIX.1 compatible" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 2810 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/wait.h>
@@ -2811,7 +2822,7 @@
 s = WIFEXITED (s) ? WEXITSTATUS (s) : 1;
 ; return 0; }
 EOF
-if { (eval echo configure:2815: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2826: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_header_sys_wait_h=yes
 else
@@ -2835,10 +2846,10 @@
 fi

 echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
-echo "configure:2839: checking for ANSI C header files" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 2842 "configure"
+echo "configure:2850: checking for ANSI C header files" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 2853 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>
@@ -2846,7 +2857,7 @@
 #include <float.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2850: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2861: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -2863,7 +2874,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 <<EOF
-#line 2867 "configure"
+#line 2878 "configure"
 #include "confdefs.h"
 #include <string.h>
 EOF
@@ -2881,7 +2892,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 <<EOF
-#line 2885 "configure"
+#line 2896 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 EOF
@@ -2899,7 +2910,7 @@
 if test $ac_cv_header_stdc = yes; then
   # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
 cat > conftest.$ac_ext <<EOF
-#line 2903 "configure"
+#line 2914 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 #define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
@@ -2910,7 +2921,7 @@
 exit (0); }

 EOF
-if { (eval echo configure:2914: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5
+if { (eval echo configure:2925: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5
 then
   :
 else
@@ -2935,10 +2946,10 @@
 fi

 echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6
-echo "configure:2939: checking whether time.h and sys/time.h may both be included" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 2942 "configure"
+echo "configure:2950: checking whether time.h and sys/time.h may both be included" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 2953 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/time.h>
@@ -2947,7 +2958,7 @@
 struct tm *tp;
 ; return 0; }
 EOF
-if { (eval echo configure:2951: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2962: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_header_time=yes
 else
@@ -2971,10 +2982,10 @@
 fi

 echo $ac_n "checking for sys_siglist declaration in signal.h or unistd.h""... $ac_c" 1>&6
-echo "configure:2975: checking for sys_siglist declaration in signal.h or unistd.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 2978 "configure"
+echo "configure:2986: checking for sys_siglist declaration in signal.h or unistd.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 2989 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <signal.h>
@@ -2986,7 +2997,7 @@
 char *msg = *(sys_siglist + 1);
 ; return 0; }
 EOF
-if { (eval echo configure:2990: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3001: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_decl_sys_siglist=yes
 else
@@ -3011,9 +3022,9 @@


 echo $ac_n "checking for struct utimbuf""... $ac_c" 1>&6
-echo "configure:3015: checking for struct utimbuf" >&5
-cat > conftest.$ac_ext <<EOF
-#line 3017 "configure"
+echo "configure:3026: checking for struct utimbuf" >&5
+cat > conftest.$ac_ext <<EOF
+#line 3028 "configure"
 #include "confdefs.h"
 #ifdef TIME_WITH_SYS_TIME
 #include <sys/time.h>
@@ -3032,7 +3043,7 @@
 static struct utimbuf x; x.actime = x.modtime;
 ; return 0; }
 EOF
-if { (eval echo configure:3036: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3047: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   echo "$ac_t""yes" 1>&6
    { test "$extra_verbose" = "yes" && cat << \EOF
@@ -3052,10 +3063,10 @@
 rm -f conftest*

 echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6
-echo "configure:3056: checking return type of signal handlers" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 3059 "configure"
+echo "configure:3067: checking return type of signal handlers" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 3070 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <signal.h>
@@ -3072,7 +3083,7 @@
 int i;
 ; return 0; }
 EOF
-if { (eval echo configure:3076: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3087: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_type_signal=void
 else
@@ -3094,10 +3105,10 @@


 echo $ac_n "checking for size_t""... $ac_c" 1>&6
-echo "configure:3098: checking for size_t" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 3101 "configure"
+echo "configure:3109: checking for size_t" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 3112 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -3128,10 +3139,10 @@
 fi

 echo $ac_n "checking for pid_t""... $ac_c" 1>&6
-echo "configure:3132: checking for pid_t" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 3135 "configure"
+echo "configure:3143: checking for pid_t" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 3146 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -3162,10 +3173,10 @@
 fi

 echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6
-echo "configure:3166: checking for uid_t in sys/types.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 3169 "configure"
+echo "configure:3177: checking for uid_t in sys/types.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 3180 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 EOF
@@ -3201,10 +3212,10 @@
 fi

 echo $ac_n "checking for mode_t""... $ac_c" 1>&6
-echo "configure:3205: checking for mode_t" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 3208 "configure"
+echo "configure:3216: checking for mode_t" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 3219 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -3235,10 +3246,10 @@
 fi

 echo $ac_n "checking for off_t""... $ac_c" 1>&6
-echo "configure:3239: checking for off_t" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 3242 "configure"
+echo "configure:3250: checking for off_t" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 3253 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -3270,9 +3281,9 @@


 echo $ac_n "checking for struct timeval""... $ac_c" 1>&6
-echo "configure:3274: checking for struct timeval" >&5
-cat > conftest.$ac_ext <<EOF
-#line 3276 "configure"
+echo "configure:3285: checking for struct timeval" >&5
+cat > conftest.$ac_ext <<EOF
+#line 3287 "configure"
 #include "confdefs.h"
 #ifdef TIME_WITH_SYS_TIME
 #include <sys/time.h>
@@ -3288,7 +3299,7 @@
 static struct timeval x; x.tv_sec = x.tv_usec;
 ; return 0; }
 EOF
-if { (eval echo configure:3292: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3303: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   echo "$ac_t""yes" 1>&6
   HAVE_TIMEVAL=yes
@@ -3310,10 +3321,10 @@
 rm -f conftest*

 echo $ac_n "checking whether struct tm is in sys/time.h or time.h""... $ac_c" 1>&6
-echo "configure:3314: checking whether struct tm is in sys/time.h or time.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 3317 "configure"
+echo "configure:3325: checking whether struct tm is in sys/time.h or time.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 3328 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <time.h>
@@ -3321,7 +3332,7 @@
 struct tm *tp; tp->tm_sec;
 ; return 0; }
 EOF
-if { (eval echo configure:3325: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3336: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_struct_tm=time.h
 else
@@ -3345,10 +3356,10 @@
 fi

 echo $ac_n "checking for tm_zone in struct tm""... $ac_c" 1>&6
-echo "configure:3349: checking for tm_zone in struct tm" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 3352 "configure"
+echo "configure:3360: checking for tm_zone in struct tm" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 3363 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <$ac_cv_struct_tm>
@@ -3356,7 +3367,7 @@
 struct tm tm; tm.tm_zone;
 ; return 0; }
 EOF
-if { (eval echo configure:3360: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3371: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_struct_tm_zone=yes
 else
@@ -3379,10 +3390,10 @@

 else
   echo $ac_n "checking for tzname""... $ac_c" 1>&6
-echo "configure:3383: checking for tzname" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 3386 "configure"
+echo "configure:3394: checking for tzname" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 3397 "configure"
 #include "confdefs.h"
 #include <time.h>
 #ifndef tzname /* For SGI.  */
@@ -3392,7 +3403,7 @@
 atoi(*tzname);
 ; return 0; }
 EOF
-if { (eval echo configure:3396: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:3407: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   ac_cv_var_tzname=yes
 else
@@ -3418,10 +3429,10 @@


 echo $ac_n "checking for working const""... $ac_c" 1>&6
-echo "configure:3422: checking for working const" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 3425 "configure"
+echo "configure:3433: checking for working const" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 3436 "configure"
 #include "confdefs.h"

 int main() {
@@ -3470,7 +3481,7 @@

 ; return 0; }
 EOF
-if { (eval echo configure:3474: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3485: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_c_const=yes
 else
@@ -3495,7 +3506,7 @@


 echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
-echo "configure:3499: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "configure:3510: checking whether ${MAKE-make} sets \${MAKE}" >&5
 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`

 cat > conftestmake <<\EOF
@@ -3520,12 +3531,12 @@


 echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6
-echo "configure:3524: checking whether byte ordering is bigendian" >&5
+echo "configure:3535: checking whether byte ordering is bigendian" >&5

 ac_cv_c_bigendian=unknown
 # See if sys/param.h defines the BYTE_ORDER macro.
 cat > conftest.$ac_ext <<EOF
-#line 3529 "configure"
+#line 3540 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/param.h>
@@ -3536,11 +3547,11 @@
 #endif
 ; return 0; }
 EOF
-if { (eval echo configure:3540: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3551: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   # It does; now see whether it defined to BIG_ENDIAN or not.
 cat > conftest.$ac_ext <<EOF
-#line 3544 "configure"
+#line 3555 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/param.h>
@@ -3551,7 +3562,7 @@
 #endif
 ; return 0; }
 EOF
-if { (eval echo configure:3555: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3566: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_c_bigendian=yes
 else
@@ -3568,7 +3579,7 @@
 rm -f conftest*
 if test $ac_cv_c_bigendian = unknown; then
 cat > conftest.$ac_ext <<EOF
-#line 3572 "configure"
+#line 3583 "configure"
 #include "confdefs.h"
 main () {
   /* Are we little or big endian?  From Harbison&Steele.  */
@@ -3581,7 +3592,7 @@
   exit (u.c[sizeof (long) - 1] == 1);
 }
 EOF
-if { (eval echo configure:3585: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5
+if { (eval echo configure:3596: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5
 then
   ac_cv_c_bigendian=no
 else
@@ -3607,10 +3618,10 @@


 echo $ac_n "checking size of short""... $ac_c" 1>&6
-echo "configure:3611: checking size of short" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 3614 "configure"
+echo "configure:3622: checking size of short" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 3625 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 main()
@@ -3621,7 +3632,7 @@
   exit(0);
 }
 EOF
-if { (eval echo configure:3625: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5
+if { (eval echo configure:3636: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5
 then
   ac_cv_sizeof_short=`cat conftestval`
 else
@@ -3648,10 +3659,10 @@
   exit 1
 fi
 echo $ac_n "checking size of int""... $ac_c" 1>&6
-echo "configure:3652: checking size of int" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 3655 "configure"
+echo "configure:3663: checking size of int" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 3666 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 main()
@@ -3662,7 +3673,7 @@
   exit(0);
 }
 EOF
-if { (eval echo configure:3666: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5
+if { (eval echo configure:3677: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5
 then
   ac_cv_sizeof_int=`cat conftestval`
 else
@@ -3683,10 +3694,10 @@


 echo $ac_n "checking size of long""... $ac_c" 1>&6
-echo "configure:3687: checking size of long" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 3690 "configure"
+echo "configure:3698: checking size of long" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 3701 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 main()
@@ -3697,7 +3708,7 @@
   exit(0);
 }
 EOF
-if { (eval echo configure:3701: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5
+if { (eval echo configure:3712: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5
 then
   ac_cv_sizeof_long=`cat conftestval`
 else
@@ -3718,10 +3729,10 @@


 echo $ac_n "checking size of long long""... $ac_c" 1>&6
-echo "configure:3722: checking size of long long" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 3725 "configure"
+echo "configure:3733: checking size of long long" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 3736 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 main()
@@ -3732,7 +3743,7 @@
   exit(0);
 }
 EOF
-if { (eval echo configure:3736: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5
+if { (eval echo configure:3747: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5
 then
   ac_cv_sizeof_long_long=`cat conftestval`
 else
@@ -3753,10 +3764,10 @@


 echo $ac_n "checking size of void *""... $ac_c" 1>&6
-echo "configure:3757: checking size of void *" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 3760 "configure"
+echo "configure:3768: checking size of void *" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 3771 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 main()
@@ -3767,7 +3778,7 @@
   exit(0);
 }
 EOF
-if { (eval echo configure:3771: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5
+if { (eval echo configure:3782: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5
 then
   ac_cv_sizeof_void_p=`cat conftestval`
 else
@@ -3789,7 +3800,7 @@


 echo $ac_n "checking for long file names""... $ac_c" 1>&6
-echo "configure:3793: checking for long file names" >&5
+echo "configure:3804: checking for long file names" >&5

 ac_cv_sys_long_file_names=yes
 # Test for long file names in all the places we know might matter:
@@ -3836,12 +3847,12 @@


 echo $ac_n "checking for sin in -lm""... $ac_c" 1>&6
-echo "configure:3840: checking for sin in -lm" >&5
+echo "configure:3851: checking for sin in -lm" >&5
 ac_lib_var=`echo m'_'sin | sed 'y%./+-%__p_%'`

 xe_check_libs=" -lm "
 cat > conftest.$ac_ext <<EOF
-#line 3845 "configure"
+#line 3856 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -3852,7 +3863,7 @@
 sin()
 ; return 0; }
 EOF
-if { (eval echo configure:3856: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:3867: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -3894,14 +3905,14 @@


 cat > conftest.$ac_ext <<EOF
-#line 3898 "configure"
+#line 3909 "configure"
 #include "confdefs.h"
 #include <math.h>
 int main() {
 return atanh(1.0) + asinh(1.0) + acosh(1.0);
 ; return 0; }
 EOF
-if { (eval echo configure:3905: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:3916: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   { test "$extra_verbose" = "yes" && cat << \EOF
     Defining HAVE_INVERSE_HYPERBOLIC
@@ -3918,7 +3929,7 @@
 rm -f conftest*

 echo "checking type of mail spool file locking" 1>&6
-echo "configure:3922: checking type of mail spool file locking" >&5
+echo "configure:3933: checking type of mail spool file locking" >&5
 test -z "$mail_locking" -a "$mail_use_flock" = "yes" && mail_locking=flock
 test -z "$mail_locking" -a "$mail_use_lockf" = "yes" && mail_locking=lockf
 if   test "$mail_locking" = "lockf"; then { test "$extra_verbose" = "yes" && cat << \EOF
@@ -3942,12 +3953,12 @@


 echo $ac_n "checking for kstat_open in -lkstat""... $ac_c" 1>&6
-echo "configure:3946: checking for kstat_open in -lkstat" >&5
+echo "configure:3957: checking for kstat_open in -lkstat" >&5
 ac_lib_var=`echo kstat'_'kstat_open | sed 'y%./+-%__p_%'`

 xe_check_libs=" -lkstat "
 cat > conftest.$ac_ext <<EOF
-#line 3951 "configure"
+#line 3962 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -3958,7 +3969,7 @@
 kstat_open()
 ; return 0; }
 EOF
-if { (eval echo configure:3962: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:3973: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -3992,12 +4003,12 @@


 echo $ac_n "checking for kvm_read in -lkvm""... $ac_c" 1>&6
-echo "configure:3996: checking for kvm_read in -lkvm" >&5
+echo "configure:4007: checking for kvm_read in -lkvm" >&5
 ac_lib_var=`echo kvm'_'kvm_read | sed 'y%./+-%__p_%'`

 xe_check_libs=" -lkvm "
 cat > conftest.$ac_ext <<EOF
-#line 4001 "configure"
+#line 4012 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -4008,7 +4019,7 @@
 kvm_read()
 ; return 0; }
 EOF
-if { (eval echo configure:4012: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:4023: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -4042,12 +4053,12 @@


 echo $ac_n "checking for cma_open in -lpthreads""... $ac_c" 1>&6
-echo "configure:4046: checking for cma_open in -lpthreads" >&5
+echo "configure:4057: checking for cma_open in -lpthreads" >&5
 ac_lib_var=`echo pthreads'_'cma_open | sed 'y%./+-%__p_%'`

 xe_check_libs=" -lpthreads "
 cat > conftest.$ac_ext <<EOF
-#line 4051 "configure"
+#line 4062 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -4058,7 +4069,7 @@
 cma_open()
 ; return 0; }
 EOF
-if { (eval echo configure:4062: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:4073: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -4094,7 +4105,7 @@
 fi

 echo $ac_n "checking whether the -xildoff compiler flag is required""... $ac_c" 1>&6
-echo "configure:4098: checking whether the -xildoff compiler flag is required" >&5
+echo "configure:4109: checking whether the -xildoff compiler flag is required" >&5
 if   ${CC-cc} '-###' -xildon  no_such_file.c 2>&1 | grep '^[^ ]*/ild ' > /dev/null ; then
   if ${CC-cc} '-###' -xildoff no_such_file.c 2>&1 | grep '^[^ ]*/ild ' > /dev/null ;
     then echo "$ac_t""no" 1>&6;
@@ -4105,7 +4116,7 @@

 if test "$opsys" = "sol2" && test "$OS_RELEASE" -ge 56; then
   echo $ac_n "checking for \"-z ignore\" linker flag""... $ac_c" 1>&6
-echo "configure:4109: checking for \"-z ignore\" linker flag" >&5
+echo "configure:4120: checking for \"-z ignore\" linker flag" >&5
   case "`ld -h 2>&1`" in
     *-z\ ignore\|record* ) echo "$ac_t""yes" 1>&6
       ld_switch_site="-z ignore $ld_switch_site" &&  if test "$extra_verbose" = "yes"; then echo "    Prepending \"-z ignore\" to \$ld_switch_site"; fi ;;
@@ -4115,7 +4126,7 @@


 echo "checking "for specified window system"" 1>&6
-echo "configure:4119: checking "for specified window system"" >&5
+echo "configure:4130: checking "for specified window system"" >&5

 if test "$with_x11" != "no"; then
     test "$x_includes $x_libraries" != "NONE NONE" && \
@@ -4145,7 +4156,7 @@
 # Uses ac_ vars as temps to allow command line to override cache and checks.
 # --without-x overrides everything else, but does not touch the cache.
 echo $ac_n "checking for X""... $ac_c" 1>&6
-echo "configure:4149: checking for X" >&5
+echo "configure:4160: checking for X" >&5

 # Check whether --with-x or --without-x was given.
 if test "${with_x+set}" = set; then
@@ -4205,12 +4216,12 @@

   # First, try using that file with no special directory specified.
 cat > conftest.$ac_ext <<EOF
-#line 4209 "configure"
+#line 4220 "configure"
 #include "confdefs.h"
 #include <$x_direct_test_include>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:4214: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:4225: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -4279,14 +4290,14 @@
   ac_save_LIBS="$LIBS"
   LIBS="-l$x_direct_test_library $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 4283 "configure"
+#line 4294 "configure"
 #include "confdefs.h"

 int main() {
 ${x_direct_test_function}()
 ; return 0; }
 EOF
-if { (eval echo configure:4290: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:4301: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   LIBS="$ac_save_LIBS"
 # We can link X programs with no special library path.
@@ -4395,17 +4406,17 @@
     case "`(uname -sr) 2>/dev/null`" in
     "SunOS 5"*)
       echo $ac_n "checking whether -R must be followed by a space""... $ac_c" 1>&6
-echo "configure:4399: checking whether -R must be followed by a space" >&5
+echo "configure:4410: checking whether -R must be followed by a space" >&5
       ac_xsave_LIBS="$LIBS"; LIBS="$LIBS -R$x_libraries"
       cat > conftest.$ac_ext <<EOF
-#line 4402 "configure"
-#include "confdefs.h"
-
-int main() {
-
-; return 0; }
-EOF
-if { (eval echo configure:4409: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+#line 4413 "configure"
+#include "confdefs.h"
+
+int main() {
+
+; return 0; }
+EOF
+if { (eval echo configure:4420: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   ac_R_nospace=yes
 else
@@ -4421,14 +4432,14 @@
       else
 	LIBS="$ac_xsave_LIBS -R $x_libraries"
 	cat > conftest.$ac_ext <<EOF
-#line 4425 "configure"
-#include "confdefs.h"
-
-int main() {
-
-; return 0; }
-EOF
-if { (eval echo configure:4432: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+#line 4436 "configure"
+#include "confdefs.h"
+
+int main() {
+
+; return 0; }
+EOF
+if { (eval echo configure:4443: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   ac_R_space=yes
 else
@@ -4464,12 +4475,12 @@
 else

 echo $ac_n "checking for dnet_ntoa in -ldnet""... $ac_c" 1>&6
-echo "configure:4468: checking for dnet_ntoa in -ldnet" >&5
+echo "configure:4479: checking for dnet_ntoa in -ldnet" >&5
 ac_lib_var=`echo dnet'_'dnet_ntoa | sed 'y%./+-%__p_%'`

 xe_check_libs=" -ldnet "
 cat > conftest.$ac_ext <<EOF
-#line 4473 "configure"
+#line 4484 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -4480,7 +4491,7 @@
 dnet_ntoa()
 ; return 0; }
 EOF
-if { (eval echo configure:4484: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:4495: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -4504,12 +4515,12 @@
     if test $ac_cv_lib_dnet_dnet_ntoa = no; then

 echo $ac_n "checking for dnet_ntoa in -ldnet_stub""... $ac_c" 1>&6
-echo "configure:4508: checking for dnet_ntoa in -ldnet_stub" >&5
+echo "configure:4519: checking for dnet_ntoa in -ldnet_stub" >&5
 ac_lib_var=`echo dnet_stub'_'dnet_ntoa | sed 'y%./+-%__p_%'`

 xe_check_libs=" -ldnet_stub "
 cat > conftest.$ac_ext <<EOF
-#line 4513 "configure"
+#line 4524 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -4520,7 +4531,7 @@
 dnet_ntoa()
 ; return 0; }
 EOF
-if { (eval echo configure:4524: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:4535: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -4549,10 +4560,10 @@
     # The nsl library prevents programs from opening the X display
     # on Irix 5.2, according to dickey@clark.net.
     echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6
-echo "configure:4553: checking for gethostbyname" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 4556 "configure"
+echo "configure:4564: checking for gethostbyname" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 4567 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char gethostbyname(); below.  */
@@ -4575,7 +4586,7 @@

 ; return 0; }
 EOF
-if { (eval echo configure:4579: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:4590: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_gethostbyname=yes"
 else
@@ -4596,12 +4607,12 @@
     if test $ac_cv_func_gethostbyname = no; then

 echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6
-echo "configure:4600: checking for gethostbyname in -lnsl" >&5
+echo "configure:4611: checking for gethostbyname in -lnsl" >&5
 ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'`

 xe_check_libs=" -lnsl "
 cat > conftest.$ac_ext <<EOF
-#line 4605 "configure"
+#line 4616 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -4612,7 +4623,7 @@
 gethostbyname()
 ; return 0; }
 EOF
-if { (eval echo configure:4616: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:4627: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -4642,10 +4653,10 @@
     # -lsocket must be given before -lnsl if both are needed.
     # We assume that if connect needs -lnsl, so does gethostbyname.
     echo $ac_n "checking for connect""... $ac_c" 1>&6
-echo "configure:4646: checking for connect" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 4649 "configure"
+echo "configure:4657: checking for connect" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 4660 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char connect(); below.  */
@@ -4668,7 +4679,7 @@

 ; return 0; }
 EOF
-if { (eval echo configure:4672: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:4683: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_connect=yes"
 else
@@ -4691,12 +4702,12 @@
 xe_msg_checking="for connect in -lsocket"
 test -n "$X_EXTRA_LIBS" && xe_msg_checking="$xe_msg_checking using extra libs $X_EXTRA_LIBS"
 echo $ac_n "checking "$xe_msg_checking"""... $ac_c" 1>&6
-echo "configure:4695: checking "$xe_msg_checking"" >&5
+echo "configure:4706: checking "$xe_msg_checking"" >&5
 ac_lib_var=`echo socket'_'connect | sed 'y%./+-%__p_%'`

 xe_check_libs=" -lsocket $X_EXTRA_LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 4700 "configure"
+#line 4711 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -4707,7 +4718,7 @@
 connect()
 ; return 0; }
 EOF
-if { (eval echo configure:4711: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:4722: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -4731,10 +4742,10 @@

     # gomez@mi.uni-erlangen.de says -lposix is necessary on A/UX.
     echo $ac_n "checking for remove""... $ac_c" 1>&6
-echo "configure:4735: checking for remove" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 4738 "configure"
+echo "configure:4746: checking for remove" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 4749 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char remove(); below.  */
@@ -4757,7 +4768,7 @@

 ; return 0; }
 EOF
-if { (eval echo configure:4761: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:4772: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_remove=yes"
 else
@@ -4778,12 +4789,12 @@
     if test $ac_cv_func_remove = no; then

 echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6
-echo "configure:4782: checking for remove in -lposix" >&5
+echo "configure:4793: checking for remove in -lposix" >&5
 ac_lib_var=`echo posix'_'remove | sed 'y%./+-%__p_%'`

 xe_check_libs=" -lposix "
 cat > conftest.$ac_ext <<EOF
-#line 4787 "configure"
+#line 4798 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -4794,7 +4805,7 @@
 remove()
 ; return 0; }
 EOF
-if { (eval echo configure:4798: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:4809: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -4818,10 +4829,10 @@

     # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
     echo $ac_n "checking for shmat""... $ac_c" 1>&6
-echo "configure:4822: checking for shmat" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 4825 "configure"
+echo "configure:4833: checking for shmat" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 4836 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char shmat(); below.  */
@@ -4844,7 +4855,7 @@

 ; return 0; }
 EOF
-if { (eval echo configure:4848: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:4859: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_shmat=yes"
 else
@@ -4865,12 +4876,12 @@
     if test $ac_cv_func_shmat = no; then

 echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6
-echo "configure:4869: checking for shmat in -lipc" >&5
+echo "configure:4880: checking for shmat in -lipc" >&5
 ac_lib_var=`echo ipc'_'shmat | sed 'y%./+-%__p_%'`

 xe_check_libs=" -lipc "
 cat > conftest.$ac_ext <<EOF
-#line 4874 "configure"
+#line 4885 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -4881,7 +4892,7 @@
 shmat()
 ; return 0; }
 EOF
-if { (eval echo configure:4885: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:4896: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -4915,12 +4926,12 @@
   #  --interran@uluru.Stanford.EDU, kb@cs.umb.edu.

 echo $ac_n "checking for IceConnectionNumber in -lICE""... $ac_c" 1>&6
-echo "configure:4919: checking for IceConnectionNumber in -lICE" >&5
+echo "configure:4930: checking for IceConnectionNumber in -lICE" >&5
 ac_lib_var=`echo ICE'_'IceConnectionNumber | sed 'y%./+-%__p_%'`

 xe_check_libs=" -lICE "
 cat > conftest.$ac_ext <<EOF
-#line 4924 "configure"
+#line 4935 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -4931,7 +4942,7 @@
 IceConnectionNumber()
 ; return 0; }
 EOF
-if { (eval echo configure:4935: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:4946: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -4968,22 +4979,22 @@

 if test "$window_system" = "none" && test -z "$with_tty"; then
   echo "checking for MS-Windows" 1>&6
-echo "configure:4972: checking for MS-Windows" >&5
+echo "configure:4983: checking for MS-Windows" >&5

 echo $ac_n "checking for main in -lgdi32""... $ac_c" 1>&6
-echo "configure:4975: checking for main in -lgdi32" >&5
+echo "configure:4986: checking for main in -lgdi32" >&5
 ac_lib_var=`echo gdi32'_'main | sed 'y%./+-%__p_%'`

 xe_check_libs=" -lgdi32 "
 cat > conftest.$ac_ext <<EOF
-#line 4980 "configure"
+#line 4991 "configure"
 #include "confdefs.h"

 int main() {
 main()
 ; return 0; }
 EOF
-if { (eval echo configure:4987: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:4998: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -5129,7 +5140,7 @@
   fi

     echo "checking for X defines extracted by xmkmf" 1>&6
-echo "configure:5133: checking for X defines extracted by xmkmf" >&5
+echo "configure:5144: checking for X defines extracted by xmkmf" >&5
   rm -fr conftestdir
   if mkdir conftestdir; then
     cd conftestdir
@@ -5161,15 +5172,15 @@

     ac_safe=`echo "X11/Intrinsic.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for X11/Intrinsic.h""... $ac_c" 1>&6
-echo "configure:5165: checking for X11/Intrinsic.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 5168 "configure"
+echo "configure:5176: checking for X11/Intrinsic.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 5179 "configure"
 #include "confdefs.h"
 #include <X11/Intrinsic.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:5173: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:5184: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -5193,12 +5204,12 @@


 echo $ac_n "checking for XOpenDisplay in -lX11""... $ac_c" 1>&6
-echo "configure:5197: checking for XOpenDisplay in -lX11" >&5
+echo "configure:5208: checking for XOpenDisplay in -lX11" >&5
 ac_lib_var=`echo X11'_'XOpenDisplay | sed 'y%./+-%__p_%'`

 xe_check_libs=" -lX11 "
 cat > conftest.$ac_ext <<EOF
-#line 5202 "configure"
+#line 5213 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -5209,7 +5220,7 @@
 XOpenDisplay()
 ; return 0; }
 EOF
-if { (eval echo configure:5213: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:5224: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -5234,12 +5245,12 @@
 xe_msg_checking="for XGetFontProperty in -lX11"
 test -n "-b i486-linuxaout" && xe_msg_checking="$xe_msg_checking using extra libs -b i486-linuxaout"
 echo $ac_n "checking "$xe_msg_checking"""... $ac_c" 1>&6
-echo "configure:5238: checking "$xe_msg_checking"" >&5
+echo "configure:5249: checking "$xe_msg_checking"" >&5
 ac_lib_var=`echo X11'_'XGetFontProperty | sed 'y%./+-%__p_%'`

 xe_check_libs=" -lX11 -b i486-linuxaout"
 cat > conftest.$ac_ext <<EOF
-#line 5243 "configure"
+#line 5254 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -5250,7 +5261,7 @@
 XGetFontProperty()
 ; return 0; }
 EOF
-if { (eval echo configure:5254: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:5265: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -5277,12 +5288,12 @@


 echo $ac_n "checking for XShapeSelectInput in -lXext""... $ac_c" 1>&6
-echo "configure:5281: checking for XShapeSelectInput in -lXext" >&5
+echo "configure:5292: checking for XShapeSelectInput in -lXext" >&5
 ac_lib_var=`echo Xext'_'XShapeSelectInput | sed 'y%./+-%__p_%'`

 xe_check_libs=" -lXext "
 cat > conftest.$ac_ext <<EOF
-#line 5286 "configure"
+#line 5297 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -5293,7 +5304,7 @@
 XShapeSelectInput()
 ; return 0; }
 EOF
-if { (eval echo configure:5297: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:5308: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -5316,12 +5327,12 @@


 echo $ac_n "checking for XtOpenDisplay in -lXt""... $ac_c" 1>&6
-echo "configure:5320: checking for XtOpenDisplay in -lXt" >&5
+echo "configure:5331: checking for XtOpenDisplay in -lXt" >&5
 ac_lib_var=`echo Xt'_'XtOpenDisplay | sed 'y%./+-%__p_%'`

 xe_check_libs=" -lXt "
 cat > conftest.$ac_ext <<EOF
-#line 5325 "configure"
+#line 5336 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -5332,7 +5343,7 @@
 XtOpenDisplay()
 ; return 0; }
 EOF
-if { (eval echo configure:5336: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:5347: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -5355,14 +5366,14 @@


   echo $ac_n "checking the version of X11 being used""... $ac_c" 1>&6
-echo "configure:5359: checking the version of X11 being used" >&5
+echo "configure:5370: checking the version of X11 being used" >&5
   cat > conftest.$ac_ext <<EOF
-#line 5361 "configure"
+#line 5372 "configure"
 #include "confdefs.h"
 #include <X11/Intrinsic.h>
     main(int c, char* v[]) { return c>1 ? XlibSpecificationRelease : 0; }
 EOF
-if { (eval echo configure:5366: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5
+if { (eval echo configure:5377: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5
 then
   ./conftest foobar; x11_release=$?
 else
@@ -5386,15 +5397,15 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:5390: checking for $ac_hdr" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 5393 "configure"
+echo "configure:5401: checking for $ac_hdr" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 5404 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:5398: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:5409: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -5425,7 +5436,7 @@


     echo $ac_n "checking for XFree86""... $ac_c" 1>&6
-echo "configure:5429: checking for XFree86" >&5
+echo "configure:5440: checking for XFree86" >&5
   if test -d "/usr/X386/include" -o \
           -f "/etc/XF86Config"    -o \
 	  -f "/etc/X11/XF86Config" -o \
@@ -5445,12 +5456,12 @@

     test -z "$with_xmu" && {
 echo $ac_n "checking for XmuReadBitmapDataFromFile in -lXmu""... $ac_c" 1>&6
-echo "configure:5449: checking for XmuReadBitmapDataFromFile in -lXmu" >&5
+echo "configure:5460: checking for XmuReadBitmapDataFromFile in -lXmu" >&5
 ac_lib_var=`echo Xmu'_'XmuReadBitmapDataFromFile | sed 'y%./+-%__p_%'`

 xe_check_libs=" -lXmu "
 cat > conftest.$ac_ext <<EOF
-#line 5454 "configure"
+#line 5465 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -5461,7 +5472,7 @@
 XmuReadBitmapDataFromFile()
 ; return 0; }
 EOF
-if { (eval echo configure:5465: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:5476: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -5500,19 +5511,19 @@


 echo $ac_n "checking for main in -lXbsd""... $ac_c" 1>&6
-echo "configure:5504: checking for main in -lXbsd" >&5
+echo "configure:5515: checking for main in -lXbsd" >&5
 ac_lib_var=`echo Xbsd'_'main | sed 'y%./+-%__p_%'`

 xe_check_libs=" -lXbsd "
 cat > conftest.$ac_ext <<EOF
-#line 5509 "configure"
+#line 5520 "configure"
 #include "confdefs.h"

 int main() {
 main()
 ; return 0; }
 EOF
-if { (eval echo configure:5516: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:5527: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -5571,7 +5582,7 @@
 esac

 echo "checking for session-management option" 1>&6
-echo "configure:5575: checking for session-management option" >&5;
+echo "configure:5586: checking for session-management option" >&5;
 if test "$with_session" != "no"; then
   { test "$extra_verbose" = "yes" && cat << \EOF
     Defining HAVE_SESSION
@@ -5586,15 +5597,15 @@
 test -z "$with_xauth" && test "$window_system" = "none" && with_xauth=no
 test -z "$with_xauth" && { ac_safe=`echo "X11/Xauth.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for X11/Xauth.h""... $ac_c" 1>&6
-echo "configure:5590: checking for X11/Xauth.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 5593 "configure"
+echo "configure:5601: checking for X11/Xauth.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 5604 "configure"
 #include "confdefs.h"
 #include <X11/Xauth.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:5598: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:5609: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -5617,12 +5628,12 @@
  }
 test -z "$with_xauth" && {
 echo $ac_n "checking for XauGetAuthByAddr in -lXau""... $ac_c" 1>&6
-echo "configure:5621: checking for XauGetAuthByAddr in -lXau" >&5
+echo "configure:5632: checking for XauGetAuthByAddr in -lXau" >&5
 ac_lib_var=`echo Xau'_'XauGetAuthByAddr | sed 'y%./+-%__p_%'`

 xe_check_libs=" -lXau "
 cat > conftest.$ac_ext <<EOF
-#line 5626 "configure"
+#line 5637 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -5633,7 +5644,7 @@
 XauGetAuthByAddr()
 ; return 0; }
 EOF
-if { (eval echo configure:5637: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:5648: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -5697,15 +5708,15 @@
       for dir in "" "Tt/" "desktop/" ; do
     ac_safe=`echo "${dir}tt_c.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for ${dir}tt_c.h""... $ac_c" 1>&6
-echo "configure:5701: checking for ${dir}tt_c.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 5704 "configure"
+echo "configure:5712: checking for ${dir}tt_c.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 5715 "configure"
 #include "confdefs.h"
 #include <${dir}tt_c.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:5709: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:5720: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -5734,12 +5745,12 @@
 xe_msg_checking="for tt_message_create in -ltt"
 test -n "$extra_libs" && xe_msg_checking="$xe_msg_checking using extra libs $extra_libs"
 echo $ac_n "checking "$xe_msg_checking"""... $ac_c" 1>&6
-echo "configure:5738: checking "$xe_msg_checking"" >&5
+echo "configure:5749: checking "$xe_msg_checking"" >&5
 ac_lib_var=`echo tt'_'tt_message_create | sed 'y%./+-%__p_%'`

 xe_check_libs=" -ltt $extra_libs"
 cat > conftest.$ac_ext <<EOF
-#line 5743 "configure"
+#line 5754 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -5750,7 +5761,7 @@
 tt_message_create()
 ; return 0; }
 EOF
-if { (eval echo configure:5754: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:5765: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -5799,15 +5810,15 @@

 test -z "$with_cde" && { ac_safe=`echo "Dt/Dt.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for Dt/Dt.h""... $ac_c" 1>&6
-echo "configure:5803: checking for Dt/Dt.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 5806 "configure"
+echo "configure:5814: checking for Dt/Dt.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 5817 "configure"
 #include "confdefs.h"
 #include <Dt/Dt.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:5811: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:5822: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -5830,12 +5841,12 @@
  }
 test -z "$with_cde" && {
 echo $ac_n "checking for DtDndDragStart in -lDtSvc""... $ac_c" 1>&6
-echo "configure:5834: checking for DtDndDragStart in -lDtSvc" >&5
+echo "configure:5845: checking for DtDndDragStart in -lDtSvc" >&5
 ac_lib_var=`echo DtSvc'_'DtDndDragStart | sed 'y%./+-%__p_%'`

 xe_check_libs=" -lDtSvc "
 cat > conftest.$ac_ext <<EOF
-#line 5839 "configure"
+#line 5850 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -5846,7 +5857,7 @@
 DtDndDragStart()
 ; return 0; }
 EOF
-if { (eval echo configure:5850: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:5861: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -5886,13 +5897,13 @@
 if test "$with_x11" = "yes"; then

   echo "checking for X11 graphics libraries" 1>&6
-echo "configure:5890: checking for X11 graphics libraries" >&5
+echo "configure:5901: checking for X11 graphics libraries" >&5

     echo $ac_n "checking for Xpm - no older than 3.4f""... $ac_c" 1>&6
-echo "configure:5893: checking for Xpm - no older than 3.4f" >&5
+echo "configure:5904: checking for Xpm - no older than 3.4f" >&5
   xe_check_libs=-lXpm
   test -z "$with_xpm" && { cat > conftest.$ac_ext <<EOF
-#line 5896 "configure"
+#line 5907 "configure"
 #include "confdefs.h"
 #include <X11/xpm.h>
   int main(int c, char **v) {
@@ -5902,7 +5913,7 @@
 		  0 ;
   }
 EOF
-if { (eval echo configure:5906: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5
+if { (eval echo configure:5917: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5
 then
   ./conftest foobar; xpm_status=$?;
     if test "$xpm_status" = "0"; then with_xpm=yes; else with_xpm=no; fi;
@@ -5940,15 +5951,15 @@

     test -z "$with_xface" && { ac_safe=`echo "compface.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for compface.h""... $ac_c" 1>&6
-echo "configure:5944: checking for compface.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 5947 "configure"
+echo "configure:5955: checking for compface.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 5958 "configure"
 #include "confdefs.h"
 #include <compface.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:5952: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:5963: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -5971,12 +5982,12 @@
  }
   test -z "$with_xface" && {
 echo $ac_n "checking for UnGenFace in -lcompface""... $ac_c" 1>&6
-echo "configure:5975: checking for UnGenFace in -lcompface" >&5
+echo "configure:5986: checking for UnGenFace in -lcompface" >&5
 ac_lib_var=`echo compface'_'UnGenFace | sed 'y%./+-%__p_%'`

 xe_check_libs=" -lcompface "
 cat > conftest.$ac_ext <<EOF
-#line 5980 "configure"
+#line 5991 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -5987,7 +5998,7 @@
 UnGenFace()
 ; return 0; }
 EOF
-if { (eval echo configure:5991: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:6002: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -6038,15 +6049,15 @@

     test -z "$with_jpeg" && { ac_safe=`echo "jpeglib.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for jpeglib.h""... $ac_c" 1>&6
-echo "configure:6042: checking for jpeglib.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 6045 "configure"
+echo "configure:6053: checking for jpeglib.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 6056 "configure"
 #include "confdefs.h"
 #include <jpeglib.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:6050: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:6061: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -6069,12 +6080,12 @@
  }
   test -z "$with_jpeg" && {
 echo $ac_n "checking for jpeg_destroy_decompress in -ljpeg""... $ac_c" 1>&6
-echo "configure:6073: checking for jpeg_destroy_decompress in -ljpeg" >&5
+echo "configure:6084: checking for jpeg_destroy_decompress in -ljpeg" >&5
 ac_lib_var=`echo jpeg'_'jpeg_destroy_decompress | sed 'y%./+-%__p_%'`

 xe_check_libs=" -ljpeg "
 cat > conftest.$ac_ext <<EOF
-#line 6078 "configure"
+#line 6089 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -6085,7 +6096,7 @@
 jpeg_destroy_decompress()
 ; return 0; }
 EOF
-if { (eval echo configure:6089: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:6100: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -6121,15 +6132,15 @@

     test -z "$with_png" && { ac_safe=`echo "png.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for png.h""... $ac_c" 1>&6
-echo "configure:6125: checking for png.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 6128 "configure"
+echo "configure:6136: checking for png.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 6139 "configure"
 #include "confdefs.h"
 #include <png.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:6133: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:6144: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -6151,10 +6162,10 @@
 fi
  }
   test -z "$with_png" && { echo $ac_n "checking for pow""... $ac_c" 1>&6
-echo "configure:6155: checking for pow" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 6158 "configure"
+echo "configure:6166: checking for pow" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 6169 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char pow(); below.  */
@@ -6177,7 +6188,7 @@

 ; return 0; }
 EOF
-if { (eval echo configure:6181: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:6192: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_pow=yes"
 else
@@ -6202,12 +6213,12 @@
 xe_msg_checking="for png_read_image in -lpng"
 test -n "$extra_libs" && xe_msg_checking="$xe_msg_checking using extra libs $extra_libs"
 echo $ac_n "checking "$xe_msg_checking"""... $ac_c" 1>&6
-echo "configure:6206: checking "$xe_msg_checking"" >&5
+echo "configure:6217: checking "$xe_msg_checking"" >&5
 ac_lib_var=`echo png'_'png_read_image | sed 'y%./+-%__p_%'`

 xe_check_libs=" -lpng $extra_libs"
 cat > conftest.$ac_ext <<EOF
-#line 6211 "configure"
+#line 6222 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -6218,7 +6229,7 @@
 png_read_image()
 ; return 0; }
 EOF
-if { (eval echo configure:6222: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:6233: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -6260,12 +6271,12 @@
 xe_msg_checking="for TIFFReadScanline in -ltiff"
 test -n "$extra_libs" && xe_msg_checking="$xe_msg_checking using extra libs $extra_libs"
 echo $ac_n "checking "$xe_msg_checking"""... $ac_c" 1>&6
-echo "configure:6264: checking "$xe_msg_checking"" >&5
+echo "configure:6275: checking "$xe_msg_checking"" >&5
 ac_lib_var=`echo tiff'_'TIFFReadScanline | sed 'y%./+-%__p_%'`

 xe_check_libs=" -ltiff $extra_libs"
 cat > conftest.$ac_ext <<EOF
-#line 6269 "configure"
+#line 6280 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -6276,7 +6287,7 @@
 TIFFReadScanline()
 ; return 0; }
 EOF
-if { (eval echo configure:6280: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:6291: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -6314,12 +6325,12 @@


 echo $ac_n "checking for XawScrollbarSetThumb in -lXaw""... $ac_c" 1>&6
-echo "configure:6318: checking for XawScrollbarSetThumb in -lXaw" >&5
+echo "configure:6329: checking for XawScrollbarSetThumb in -lXaw" >&5
 ac_lib_var=`echo Xaw'_'XawScrollbarSetThumb | sed 'y%./+-%__p_%'`

 xe_check_libs=" -lXaw "
 cat > conftest.$ac_ext <<EOF
-#line 6323 "configure"
+#line 6334 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -6330,7 +6341,7 @@
 XawScrollbarSetThumb()
 ; return 0; }
 EOF
-if { (eval echo configure:6334: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:6345: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -6354,15 +6365,15 @@

     ac_safe=`echo "Xm/Xm.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for Xm/Xm.h""... $ac_c" 1>&6
-echo "configure:6358: checking for Xm/Xm.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 6361 "configure"
+echo "configure:6369: checking for Xm/Xm.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 6372 "configure"
 #include "confdefs.h"
 #include <Xm/Xm.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:6366: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:6377: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -6379,12 +6390,12 @@
   echo "$ac_t""yes" 1>&6

 echo $ac_n "checking for XmStringFree in -lXm""... $ac_c" 1>&6
-echo "configure:6383: checking for XmStringFree in -lXm" >&5
+echo "configure:6394: checking for XmStringFree in -lXm" >&5
 ac_lib_var=`echo Xm'_'XmStringFree | sed 'y%./+-%__p_%'`

 xe_check_libs=" -lXm "
 cat > conftest.$ac_ext <<EOF
-#line 6388 "configure"
+#line 6399 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -6395,7 +6406,7 @@
 XmStringFree()
 ; return 0; }
 EOF
-if { (eval echo configure:6399: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:6410: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -6646,6 +6657,25 @@
   fi
 fi

+if test "$with_gung" != "no"; then
+	test "$with_minimal_tagbits" = "no" && { test "$extra_verbose" = "yes" && cat << \EOF
+    Defining USE_MINIMAL_TAGBITS
+EOF
+cat >> confdefs.h <<\EOF
+#define USE_MINIMAL_TAGBITS 1
+EOF
+}
+
+	{ test "$extra_verbose" = "yes" && cat << \EOF
+    Defining USE_INDEXED_LRECORD_IMPLEMENTATION
+EOF
+cat >> confdefs.h <<\EOF
+#define USE_INDEXED_LRECORD_IMPLEMENTATION 1
+EOF
+}
+
+fi
+

 test -z "$with_mule" && with_mule=no
 test -z "$with_mule_coding" && with_mule_coding=no
@@ -6667,7 +6697,7 @@

 if test "$with_mule" = "yes" ; then
   echo "checking for Mule-related features" 1>&6
-echo "configure:6671: checking for Mule-related features" >&5
+echo "configure:6701: checking for Mule-related features" >&5
   { test "$extra_verbose" = "yes" && cat << \EOF
     Defining MULE
 EOF
@@ -6692,15 +6722,15 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:6696: checking for $ac_hdr" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 6699 "configure"
+echo "configure:6726: checking for $ac_hdr" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 6729 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:6704: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:6734: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -6731,12 +6761,12 @@


 echo $ac_n "checking for strerror in -lintl""... $ac_c" 1>&6
-echo "configure:6735: checking for strerror in -lintl" >&5
+echo "configure:6765: checking for strerror in -lintl" >&5
 ac_lib_var=`echo intl'_'strerror | sed 'y%./+-%__p_%'`

 xe_check_libs=" -lintl "
 cat > conftest.$ac_ext <<EOF
-#line 6740 "configure"
+#line 6770 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -6747,7 +6777,7 @@
 strerror()
 ; return 0; }
 EOF
-if { (eval echo configure:6751: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:6781: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -6780,19 +6810,19 @@


   echo "checking for Mule input methods" 1>&6
-echo "configure:6784: checking for Mule input methods" >&5
+echo "configure:6814: checking for Mule input methods" >&5
       test -z "$with_xim" -a "$opsys" != "sol2" && with_xim=no
   case "$with_xim" in "" | "yes" )
     echo "checking for XIM" 1>&6
-echo "configure:6788: checking for XIM" >&5
+echo "configure:6818: checking for XIM" >&5

 echo $ac_n "checking for XmImMbLookupString in -lXm""... $ac_c" 1>&6
-echo "configure:6791: checking for XmImMbLookupString in -lXm" >&5
+echo "configure:6821: checking for XmImMbLookupString in -lXm" >&5
 ac_lib_var=`echo Xm'_'XmImMbLookupString | sed 'y%./+-%__p_%'`

 xe_check_libs=" -lXm "
 cat > conftest.$ac_ext <<EOF
-#line 6796 "configure"
+#line 6826 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -6803,7 +6833,7 @@
 XmImMbLookupString()
 ; return 0; }
 EOF
-if { (eval echo configure:6807: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:6837: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -6868,15 +6898,15 @@

     if test "$with_xfs" = "yes" ; then
     echo "checking for XFontSet" 1>&6
-echo "configure:6872: checking for XFontSet" >&5
+echo "configure:6902: checking for XFontSet" >&5

 echo $ac_n "checking for XmbDrawString in -lX11""... $ac_c" 1>&6
-echo "configure:6875: checking for XmbDrawString in -lX11" >&5
+echo "configure:6905: checking for XmbDrawString in -lX11" >&5
 ac_lib_var=`echo X11'_'XmbDrawString | sed 'y%./+-%__p_%'`

 xe_check_libs=" -lX11 "
 cat > conftest.$ac_ext <<EOF
-#line 6880 "configure"
+#line 6910 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -6887,7 +6917,7 @@
 XmbDrawString()
 ; return 0; }
 EOF
-if { (eval echo configure:6891: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:6921: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -6927,15 +6957,15 @@
     test "$with_wnn6" = "yes" && with_wnn=yes # wnn6 implies wnn support
   test -z "$with_wnn" && { ac_safe=`echo "wnn/jllib.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for wnn/jllib.h""... $ac_c" 1>&6
-echo "configure:6931: checking for wnn/jllib.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 6934 "configure"
+echo "configure:6961: checking for wnn/jllib.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 6964 "configure"
 #include "confdefs.h"
 #include <wnn/jllib.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:6939: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:6969: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -6960,10 +6990,10 @@
     for ac_func in crypt
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:6964: checking for $ac_func" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 6967 "configure"
+echo "configure:6994: checking for $ac_func" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 6997 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -6986,7 +7016,7 @@

 ; return 0; }
 EOF
-if { (eval echo configure:6990: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:7020: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -7015,12 +7045,12 @@

     test "$ac_cv_func_crypt" != "yes" && {
 echo $ac_n "checking for crypt in -lcrypt""... $ac_c" 1>&6
-echo "configure:7019: checking for crypt in -lcrypt" >&5
+echo "configure:7049: checking for crypt in -lcrypt" >&5
 ac_lib_var=`echo crypt'_'crypt | sed 'y%./+-%__p_%'`

 xe_check_libs=" -lcrypt "
 cat > conftest.$ac_ext <<EOF
-#line 7024 "configure"
+#line 7054 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -7031,7 +7061,7 @@
 crypt()
 ; return 0; }
 EOF
-if { (eval echo configure:7035: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:7065: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -7065,12 +7095,12 @@
   fi
     test -z "$with_wnn" && {
 echo $ac_n "checking for jl_dic_list_e in -lwnn""... $ac_c" 1>&6
-echo "configure:7069: checking for jl_dic_list_e in -lwnn" >&5
+echo "configure:7099: checking for jl_dic_list_e in -lwnn" >&5
 ac_lib_var=`echo wnn'_'jl_dic_list_e | sed 'y%./+-%__p_%'`

 xe_check_libs=" -lwnn "
 cat > conftest.$ac_ext <<EOF
-#line 7074 "configure"
+#line 7104 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -7081,7 +7111,7 @@
 jl_dic_list_e()
 ; return 0; }
 EOF
-if { (eval echo configure:7085: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:7115: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -7118,12 +7148,12 @@
  fi

 echo $ac_n "checking for jl_fi_dic_list in -lwnn""... $ac_c" 1>&6
-echo "configure:7122: checking for jl_fi_dic_list in -lwnn" >&5
+echo "configure:7152: checking for jl_fi_dic_list in -lwnn" >&5
 ac_lib_var=`echo wnn'_'jl_fi_dic_list | sed 'y%./+-%__p_%'`

 xe_check_libs=" -lwnn "
 cat > conftest.$ac_ext <<EOF
-#line 7127 "configure"
+#line 7157 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -7134,7 +7164,7 @@
 jl_fi_dic_list()
 ; return 0; }
 EOF
-if { (eval echo configure:7138: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:7168: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -7166,15 +7196,15 @@

     test -z "$with_canna" && { ac_safe=`echo "canna/RK.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for canna/RK.h""... $ac_c" 1>&6
-echo "configure:7170: checking for canna/RK.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 7173 "configure"
+echo "configure:7200: checking for canna/RK.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 7203 "configure"
 #include "confdefs.h"
 #include <canna/RK.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:7178: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7208: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -7197,12 +7227,12 @@
  }
   test -z "$with_canna" && {
 echo $ac_n "checking for RkBgnBun in -lRKC""... $ac_c" 1>&6
-echo "configure:7201: checking for RkBgnBun in -lRKC" >&5
+echo "configure:7231: checking for RkBgnBun in -lRKC" >&5
 ac_lib_var=`echo RKC'_'RkBgnBun | sed 'y%./+-%__p_%'`

 xe_check_libs=" -lRKC "
 cat > conftest.$ac_ext <<EOF
-#line 7206 "configure"
+#line 7236 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -7213,7 +7243,7 @@
 RkBgnBun()
 ; return 0; }
 EOF
-if { (eval echo configure:7217: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:7247: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -7236,12 +7266,12 @@
  }
   test -z "$with_canna" && {
 echo $ac_n "checking for jrKanjiControl in -lcanna""... $ac_c" 1>&6
-echo "configure:7240: checking for jrKanjiControl in -lcanna" >&5
+echo "configure:7270: checking for jrKanjiControl in -lcanna" >&5
 ac_lib_var=`echo canna'_'jrKanjiControl | sed 'y%./+-%__p_%'`

 xe_check_libs=" -lcanna "
 cat > conftest.$ac_ext <<EOF
-#line 7245 "configure"
+#line 7275 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -7252,7 +7282,7 @@
 jrKanjiControl()
 ; return 0; }
 EOF
-if { (eval echo configure:7256: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:7286: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -7301,12 +7331,12 @@
   libs_x="-lXm $libs_x" &&  if test "$extra_verbose" = "yes"; then echo "    Prepending \"-lXm\" to \$libs_x"; fi

 echo $ac_n "checking for layout_object_getvalue in -li18n""... $ac_c" 1>&6
-echo "configure:7305: checking for layout_object_getvalue in -li18n" >&5
+echo "configure:7335: checking for layout_object_getvalue in -li18n" >&5
 ac_lib_var=`echo i18n'_'layout_object_getvalue | sed 'y%./+-%__p_%'`

 xe_check_libs=" -li18n "
 cat > conftest.$ac_ext <<EOF
-#line 7310 "configure"
+#line 7340 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -7317,7 +7347,7 @@
 layout_object_getvalue()
 ; return 0; }
 EOF
-if { (eval echo configure:7321: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:7351: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -7390,10 +7420,10 @@
 for ac_func in cbrt closedir dup2 eaccess fmod fpathconf frexp ftime gethostname getpagesize gettimeofday getcwd getwd logb lrand48 matherr mkdir mktime perror poll random rename res_init rint rmdir select setitimer setpgid setlocale setsid sigblock sighold sigprocmask strcasecmp strerror tzset ulimit usleep utimes waitpid
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:7394: checking for $ac_func" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 7397 "configure"
+echo "configure:7424: checking for $ac_func" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 7427 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -7416,7 +7446,7 @@

 ; return 0; }
 EOF
-if { (eval echo configure:7420: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:7450: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -7453,10 +7483,10 @@
     for ac_func in realpath
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:7457: checking for $ac_func" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 7460 "configure"
+echo "configure:7487: checking for $ac_func" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 7490 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -7479,7 +7509,7 @@

 ; return 0; }
 EOF
-if { (eval echo configure:7483: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:7513: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -7512,16 +7542,16 @@
 esac

 echo $ac_n "checking whether netdb declares h_errno""... $ac_c" 1>&6
-echo "configure:7516: checking whether netdb declares h_errno" >&5
-cat > conftest.$ac_ext <<EOF
-#line 7518 "configure"
+echo "configure:7546: checking whether netdb declares h_errno" >&5
+cat > conftest.$ac_ext <<EOF
+#line 7548 "configure"
 #include "confdefs.h"
 #include <netdb.h>
 int main() {
 return h_errno;
 ; return 0; }
 EOF
-if { (eval echo configure:7525: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:7555: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   echo "$ac_t""yes" 1>&6
    { test "$extra_verbose" = "yes" && cat << \EOF
@@ -7541,16 +7571,16 @@
 rm -f conftest*

 echo $ac_n "checking for sigsetjmp""... $ac_c" 1>&6
-echo "configure:7545: checking for sigsetjmp" >&5
-cat > conftest.$ac_ext <<EOF
-#line 7547 "configure"
+echo "configure:7575: checking for sigsetjmp" >&5
+cat > conftest.$ac_ext <<EOF
+#line 7577 "configure"
 #include "confdefs.h"
 #include <setjmp.h>
 int main() {
 sigjmp_buf bar; sigsetjmp (bar, 0);
 ; return 0; }
 EOF
-if { (eval echo configure:7554: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:7584: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   echo "$ac_t""yes" 1>&6
    { test "$extra_verbose" = "yes" && cat << \EOF
@@ -7570,11 +7600,11 @@
 rm -f conftest*

 echo $ac_n "checking whether localtime caches TZ""... $ac_c" 1>&6
-echo "configure:7574: checking whether localtime caches TZ" >&5
+echo "configure:7604: checking whether localtime caches TZ" >&5

 if test "$ac_cv_func_tzset" = "yes"; then
 cat > conftest.$ac_ext <<EOF
-#line 7578 "configure"
+#line 7608 "configure"
 #include "confdefs.h"
 #include <time.h>
 #if STDC_HEADERS
@@ -7609,7 +7639,7 @@
   exit (0);
 }
 EOF
-if { (eval echo configure:7613: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5
+if { (eval echo configure:7643: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5
 then
   emacs_cv_localtime_cache=no
 else
@@ -7638,9 +7668,9 @@

 if test "$HAVE_TIMEVAL" = "yes"; then
 echo $ac_n "checking whether gettimeofday cannot accept two arguments""... $ac_c" 1>&6
-echo "configure:7642: checking whether gettimeofday cannot accept two arguments" >&5
-cat > conftest.$ac_ext <<EOF
-#line 7644 "configure"
+echo "configure:7672: checking whether gettimeofday cannot accept two arguments" >&5
+cat > conftest.$ac_ext <<EOF
+#line 7674 "configure"
 #include "confdefs.h"

 #ifdef TIME_WITH_SYS_TIME
@@ -7662,7 +7692,7 @@

 ; return 0; }
 EOF
-if { (eval echo configure:7666: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:7696: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   echo "$ac_t""no" 1>&6
 else
@@ -7684,19 +7714,19 @@


 echo $ac_n "checking for inline""... $ac_c" 1>&6
-echo "configure:7688: checking for inline" >&5
+echo "configure:7718: checking for inline" >&5

 ac_cv_c_inline=no
 for ac_kw in inline __inline__ __inline; do
   cat > conftest.$ac_ext <<EOF
-#line 7693 "configure"
+#line 7723 "configure"
 #include "confdefs.h"

 int main() {
 } $ac_kw foo() {
 ; return 0; }
 EOF
-if { (eval echo configure:7700: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:7730: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_c_inline=$ac_kw; break
 else
@@ -7746,17 +7776,17 @@
 # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
 # for constant arguments.  Useless!
 echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6
-echo "configure:7750: checking for working alloca.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 7753 "configure"
+echo "configure:7780: checking for working alloca.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 7783 "configure"
 #include "confdefs.h"
 #include <alloca.h>
 int main() {
 char *p = alloca(2 * sizeof(int));
 ; return 0; }
 EOF
-if { (eval echo configure:7760: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:7790: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   ac_cv_header_alloca_h=yes
 else
@@ -7780,10 +7810,10 @@
 fi

 echo $ac_n "checking for alloca""... $ac_c" 1>&6
-echo "configure:7784: checking for alloca" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 7787 "configure"
+echo "configure:7814: checking for alloca" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 7817 "configure"
 #include "confdefs.h"

 #ifdef __GNUC__
@@ -7806,7 +7836,7 @@
 char *p = (char *) alloca(1);
 ; return 0; }
 EOF
-if { (eval echo configure:7810: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:7840: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   ac_cv_func_alloca_works=yes
 else
@@ -7845,10 +7875,10 @@


 echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6
-echo "configure:7849: checking whether alloca needs Cray hooks" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 7852 "configure"
+echo "configure:7879: checking whether alloca needs Cray hooks" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 7882 "configure"
 #include "confdefs.h"
 #if defined(CRAY) && ! defined(CRAY2)
 webecray
@@ -7872,10 +7902,10 @@
 if test $ac_cv_os_cray = yes; then
 for ac_func in _getb67 GETB67 getb67; do
   echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:7876: checking for $ac_func" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 7879 "configure"
+echo "configure:7906: checking for $ac_func" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 7909 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -7898,7 +7928,7 @@

 ; return 0; }
 EOF
-if { (eval echo configure:7902: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:7932: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -7928,10 +7958,10 @@
 fi

 echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6
-echo "configure:7932: checking stack direction for C alloca" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 7935 "configure"
+echo "configure:7962: checking stack direction for C alloca" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 7965 "configure"
 #include "confdefs.h"
 find_stack_direction ()
 {
@@ -7950,7 +7980,7 @@
   exit (find_stack_direction() < 0);
 }
 EOF
-if { (eval echo configure:7954: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5
+if { (eval echo configure:7984: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5
 then
   ac_cv_c_stack_direction=1
 else
@@ -7978,15 +8008,15 @@

 ac_safe=`echo "vfork.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for vfork.h""... $ac_c" 1>&6
-echo "configure:7982: checking for vfork.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 7985 "configure"
+echo "configure:8012: checking for vfork.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 8015 "configure"
 #include "confdefs.h"
 #include <vfork.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:7990: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8020: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -8014,10 +8044,10 @@
 fi

 echo $ac_n "checking for working vfork""... $ac_c" 1>&6
-echo "configure:8018: checking for working vfork" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 8021 "configure"
+echo "configure:8048: checking for working vfork" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 8051 "configure"
 #include "confdefs.h"
 /* Thanks to Paul Eggert for this test.  */
 #include <stdio.h>
@@ -8112,7 +8142,7 @@
   }
 }
 EOF
-if { (eval echo configure:8116: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5
+if { (eval echo configure:8146: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5
 then
   ac_cv_func_vfork_works=yes
 else
@@ -8137,10 +8167,10 @@


 echo $ac_n "checking for working strcoll""... $ac_c" 1>&6
-echo "configure:8141: checking for working strcoll" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 8144 "configure"
+echo "configure:8171: checking for working strcoll" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 8174 "configure"
 #include "confdefs.h"
 #include <string.h>
 main ()
@@ -8150,7 +8180,7 @@
 	strcoll ("123", "456") >= 0);
 }
 EOF
-if { (eval echo configure:8154: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5
+if { (eval echo configure:8184: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5
 then
   ac_cv_func_strcoll_works=yes
 else
@@ -8177,10 +8207,10 @@
 for ac_func in getpgrp
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:8181: checking for $ac_func" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 8184 "configure"
+echo "configure:8211: checking for $ac_func" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 8214 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -8203,7 +8233,7 @@

 ; return 0; }
 EOF
-if { (eval echo configure:8207: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:8237: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -8231,10 +8261,10 @@
 done

 echo $ac_n "checking whether getpgrp takes no argument""... $ac_c" 1>&6
-echo "configure:8235: checking whether getpgrp takes no argument" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 8238 "configure"
+echo "configure:8265: checking whether getpgrp takes no argument" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 8268 "configure"
 #include "confdefs.h"

 /*
@@ -8289,7 +8319,7 @@
 }

 EOF
-if { (eval echo configure:8293: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5
+if { (eval echo configure:8323: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5
 then
   ac_cv_func_getpgrp_void=yes
 else
@@ -8315,10 +8345,10 @@


 echo $ac_n "checking for working mmap""... $ac_c" 1>&6
-echo "configure:8319: checking for working mmap" >&5
+echo "configure:8349: checking for working mmap" >&5
 case "$opsys" in ultrix* ) have_mmap=no ;; *)
 cat > conftest.$ac_ext <<EOF
-#line 8322 "configure"
+#line 8352 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 #include <unistd.h>
@@ -8351,7 +8381,7 @@
   return 1;
 }
 EOF
-if { (eval echo configure:8355: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5
+if { (eval echo configure:8385: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5
 then
   have_mmap=yes
 else
@@ -8385,15 +8415,15 @@

 ac_safe=`echo "termios.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for termios.h""... $ac_c" 1>&6
-echo "configure:8389: checking for termios.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 8392 "configure"
+echo "configure:8419: checking for termios.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 8422 "configure"
 #include "confdefs.h"
 #include <termios.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8397: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8427: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -8436,15 +8466,15 @@
   echo "$ac_t""no" 1>&6
 ac_safe=`echo "termio.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for termio.h""... $ac_c" 1>&6
-echo "configure:8440: checking for termio.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 8443 "configure"
+echo "configure:8470: checking for termio.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 8473 "configure"
 #include "confdefs.h"
 #include <termio.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8448: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8478: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -8476,10 +8506,10 @@


 echo $ac_n "checking for socket""... $ac_c" 1>&6
-echo "configure:8480: checking for socket" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 8483 "configure"
+echo "configure:8510: checking for socket" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 8513 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char socket(); below.  */
@@ -8502,7 +8532,7 @@

 ; return 0; }
 EOF
-if { (eval echo configure:8506: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:8536: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_socket=yes"
 else
@@ -8517,15 +8547,15 @@
   echo "$ac_t""yes" 1>&6
   ac_safe=`echo "netinet/in.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for netinet/in.h""... $ac_c" 1>&6
-echo "configure:8521: checking for netinet/in.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 8524 "configure"
+echo "configure:8551: checking for netinet/in.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 8554 "configure"
 #include "confdefs.h"
 #include <netinet/in.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8529: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8559: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -8542,15 +8572,15 @@
   echo "$ac_t""yes" 1>&6
   ac_safe=`echo "arpa/inet.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for arpa/inet.h""... $ac_c" 1>&6
-echo "configure:8546: checking for arpa/inet.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 8549 "configure"
+echo "configure:8576: checking for arpa/inet.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 8579 "configure"
 #include "confdefs.h"
 #include <arpa/inet.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8554: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8584: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -8575,9 +8605,9 @@
 }

       echo $ac_n "checking "for sun_len member in struct sockaddr_un"""... $ac_c" 1>&6
-echo "configure:8579: checking "for sun_len member in struct sockaddr_un"" >&5
+echo "configure:8609: checking "for sun_len member in struct sockaddr_un"" >&5
       cat > conftest.$ac_ext <<EOF
-#line 8581 "configure"
+#line 8611 "configure"
 #include "confdefs.h"

 #include <sys/types.h>
@@ -8588,7 +8618,7 @@
 static struct sockaddr_un x; x.sun_len = 1;
 ; return 0; }
 EOF
-if { (eval echo configure:8592: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:8622: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   echo "$ac_t""yes" 1>&6; { test "$extra_verbose" = "yes" && cat << \EOF
     Defining HAVE_SOCKADDR_SUN_LEN
@@ -8619,10 +8649,10 @@


 echo $ac_n "checking for msgget""... $ac_c" 1>&6
-echo "configure:8623: checking for msgget" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 8626 "configure"
+echo "configure:8653: checking for msgget" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 8656 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char msgget(); below.  */
@@ -8645,7 +8675,7 @@

 ; return 0; }
 EOF
-if { (eval echo configure:8649: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:8679: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_msgget=yes"
 else
@@ -8660,15 +8690,15 @@
   echo "$ac_t""yes" 1>&6
   ac_safe=`echo "sys/ipc.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for sys/ipc.h""... $ac_c" 1>&6
-echo "configure:8664: checking for sys/ipc.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 8667 "configure"
+echo "configure:8694: checking for sys/ipc.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 8697 "configure"
 #include "confdefs.h"
 #include <sys/ipc.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8672: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8702: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -8685,15 +8715,15 @@
   echo "$ac_t""yes" 1>&6
   ac_safe=`echo "sys/msg.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for sys/msg.h""... $ac_c" 1>&6
-echo "configure:8689: checking for sys/msg.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 8692 "configure"
+echo "configure:8719: checking for sys/msg.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 8722 "configure"
 #include "confdefs.h"
 #include <sys/msg.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8697: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8727: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -8731,15 +8761,15 @@

 ac_safe=`echo "dirent.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for dirent.h""... $ac_c" 1>&6
-echo "configure:8735: checking for dirent.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 8738 "configure"
+echo "configure:8765: checking for dirent.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 8768 "configure"
 #include "confdefs.h"
 #include <dirent.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8743: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8773: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -8766,15 +8796,15 @@
   echo "$ac_t""no" 1>&6
 ac_safe=`echo "sys/dir.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for sys/dir.h""... $ac_c" 1>&6
-echo "configure:8770: checking for sys/dir.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 8773 "configure"
+echo "configure:8800: checking for sys/dir.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 8803 "configure"
 #include "confdefs.h"
 #include <sys/dir.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8778: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8808: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -8807,15 +8837,15 @@

 ac_safe=`echo "nlist.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for nlist.h""... $ac_c" 1>&6
-echo "configure:8811: checking for nlist.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 8814 "configure"
+echo "configure:8841: checking for nlist.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 8844 "configure"
 #include "confdefs.h"
 #include <nlist.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8819: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8849: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -8845,7 +8875,7 @@


 echo "checking "for sound support"" 1>&6
-echo "configure:8849: checking "for sound support"" >&5
+echo "configure:8879: checking "for sound support"" >&5
 case "$with_sound" in
   native | both ) with_native_sound=yes;;
   nas    | no   ) with_native_sound=no;;
@@ -8856,15 +8886,15 @@
     if test -n "$native_sound_lib"; then
     ac_safe=`echo "multimedia/audio_device.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for multimedia/audio_device.h""... $ac_c" 1>&6
-echo "configure:8860: checking for multimedia/audio_device.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 8863 "configure"
+echo "configure:8890: checking for multimedia/audio_device.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 8893 "configure"
 #include "confdefs.h"
 #include <multimedia/audio_device.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8868: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8898: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -8912,12 +8942,12 @@
       if test -z "$native_sound_lib"; then

 echo $ac_n "checking for ALopenport in -laudio""... $ac_c" 1>&6
-echo "configure:8916: checking for ALopenport in -laudio" >&5
+echo "configure:8946: checking for ALopenport in -laudio" >&5
 ac_lib_var=`echo audio'_'ALopenport | sed 'y%./+-%__p_%'`

 xe_check_libs=" -laudio "
 cat > conftest.$ac_ext <<EOF
-#line 8921 "configure"
+#line 8951 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -8928,7 +8958,7 @@
 ALopenport()
 ; return 0; }
 EOF
-if { (eval echo configure:8932: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:8962: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -8959,12 +8989,12 @@
       if test -z "$native_sound_lib"; then

 echo $ac_n "checking for AOpenAudio in -lAlib""... $ac_c" 1>&6
-echo "configure:8963: checking for AOpenAudio in -lAlib" >&5
+echo "configure:8993: checking for AOpenAudio in -lAlib" >&5
 ac_lib_var=`echo Alib'_'AOpenAudio | sed 'y%./+-%__p_%'`

 xe_check_libs=" -lAlib "
 cat > conftest.$ac_ext <<EOF
-#line 8968 "configure"
+#line 8998 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -8975,7 +9005,7 @@
 AOpenAudio()
 ; return 0; }
 EOF
-if { (eval echo configure:8979: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:9009: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -9013,15 +9043,15 @@
     for dir in "machine" "sys" "linux"; do
       ac_safe=`echo "${dir}/soundcard.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for ${dir}/soundcard.h""... $ac_c" 1>&6
-echo "configure:9017: checking for ${dir}/soundcard.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 9020 "configure"
+echo "configure:9047: checking for ${dir}/soundcard.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 9050 "configure"
 #include "confdefs.h"
 #include <${dir}/soundcard.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9025: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9055: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -9091,7 +9121,7 @@
  fi
   libs_x="-laudio $libs_x" &&  if test "$extra_verbose" = "yes"; then echo "    Prepending \"-laudio\" to \$libs_x"; fi
       cat > conftest.$ac_ext <<EOF
-#line 9095 "configure"
+#line 9125 "configure"
 #include "confdefs.h"
 #include <audio/Xtutil.h>
 EOF
@@ -9118,7 +9148,7 @@

 if test "$with_tty" = "yes"  ; then
   echo "checking for TTY-related features" 1>&6
-echo "configure:9122: checking for TTY-related features" >&5
+echo "configure:9152: checking for TTY-related features" >&5
   { test "$extra_verbose" = "yes" && cat << \EOF
     Defining HAVE_TTY
 EOF
@@ -9134,12 +9164,12 @@
     if test -z "$with_ncurses"; then

 echo $ac_n "checking for tgetent in -lncurses""... $ac_c" 1>&6
-echo "configure:9138: checking for tgetent in -lncurses" >&5
+echo "configure:9168: checking for tgetent in -lncurses" >&5
 ac_lib_var=`echo ncurses'_'tgetent | sed 'y%./+-%__p_%'`

 xe_check_libs=" -lncurses "
 cat > conftest.$ac_ext <<EOF
-#line 9143 "configure"
+#line 9173 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -9150,7 +9180,7 @@
 tgetent()
 ; return 0; }
 EOF
-if { (eval echo configure:9154: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:9184: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -9183,15 +9213,15 @@

     ac_safe=`echo "ncurses/curses.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for ncurses/curses.h""... $ac_c" 1>&6
-echo "configure:9187: checking for ncurses/curses.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 9190 "configure"
+echo "configure:9217: checking for ncurses/curses.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 9220 "configure"
 #include "confdefs.h"
 #include <ncurses/curses.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9195: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9225: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -9213,15 +9243,15 @@

     ac_safe=`echo "ncurses/term.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for ncurses/term.h""... $ac_c" 1>&6
-echo "configure:9217: checking for ncurses/term.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 9220 "configure"
+echo "configure:9247: checking for ncurses/term.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 9250 "configure"
 #include "confdefs.h"
 #include <ncurses/term.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9225: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9255: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -9251,15 +9281,15 @@
       c_switch_site="$c_switch_site -I/usr/include/ncurses"
       ac_safe=`echo "ncurses/curses.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for ncurses/curses.h""... $ac_c" 1>&6
-echo "configure:9255: checking for ncurses/curses.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 9258 "configure"
+echo "configure:9285: checking for ncurses/curses.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 9288 "configure"
 #include "confdefs.h"
 #include <ncurses/curses.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9263: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9293: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -9294,12 +9324,12 @@
 	for lib in curses termlib termcap; do

 echo $ac_n "checking for tgetent in -l$lib""... $ac_c" 1>&6
-echo "configure:9298: checking for tgetent in -l$lib" >&5
+echo "configure:9328: checking for tgetent in -l$lib" >&5
 ac_lib_var=`echo $lib'_'tgetent | sed 'y%./+-%__p_%'`

 xe_check_libs=" -l$lib "
 cat > conftest.$ac_ext <<EOF
-#line 9303 "configure"
+#line 9333 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -9310,7 +9340,7 @@
 tgetent()
 ; return 0; }
 EOF
-if { (eval echo configure:9314: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:9344: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -9341,12 +9371,12 @@
       else

 echo $ac_n "checking for tgetent in -lcurses""... $ac_c" 1>&6
-echo "configure:9345: checking for tgetent in -lcurses" >&5
+echo "configure:9375: checking for tgetent in -lcurses" >&5
 ac_lib_var=`echo curses'_'tgetent | sed 'y%./+-%__p_%'`

 xe_check_libs=" -lcurses "
 cat > conftest.$ac_ext <<EOF
-#line 9350 "configure"
+#line 9380 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -9357,7 +9387,7 @@
 tgetent()
 ; return 0; }
 EOF
-if { (eval echo configure:9361: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:9391: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -9375,12 +9405,12 @@
 else
   echo "$ac_t""no" 1>&6
 echo $ac_n "checking for tgetent in -ltermcap""... $ac_c" 1>&6
-echo "configure:9379: checking for tgetent in -ltermcap" >&5
+echo "configure:9409: checking for tgetent in -ltermcap" >&5
 ac_lib_var=`echo termcap'_'tgetent | sed 'y%./+-%__p_%'`

 xe_check_libs=" -ltermcap "
 cat > conftest.$ac_ext <<EOF
-#line 9384 "configure"
+#line 9414 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -9391,7 +9421,7 @@
 tgetent()
 ; return 0; }
 EOF
-if { (eval echo configure:9395: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:9425: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -9439,15 +9469,15 @@

     test -z "$with_gpm" && { ac_safe=`echo "gpm.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for gpm.h""... $ac_c" 1>&6
-echo "configure:9443: checking for gpm.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 9446 "configure"
+echo "configure:9473: checking for gpm.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 9476 "configure"
 #include "confdefs.h"
 #include <gpm.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9451: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9481: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -9470,12 +9500,12 @@
  }
   test -z "$with_gpm" && {
 echo $ac_n "checking for Gpm_Open in -lgpm""... $ac_c" 1>&6
-echo "configure:9474: checking for Gpm_Open in -lgpm" >&5
+echo "configure:9504: checking for Gpm_Open in -lgpm" >&5
 ac_lib_var=`echo gpm'_'Gpm_Open | sed 'y%./+-%__p_%'`

 xe_check_libs=" -lgpm "
 cat > conftest.$ac_ext <<EOF
-#line 9479 "configure"
+#line 9509 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -9486,7 +9516,7 @@
 Gpm_Open()
 ; return 0; }
 EOF
-if { (eval echo configure:9490: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:9520: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -9535,17 +9565,17 @@


 echo "checking for database support" 1>&6
-echo "configure:9539: checking for database support" >&5
+echo "configure:9569: checking for database support" >&5

 if test "$with_database_gnudbm" != "no"; then

 echo $ac_n "checking for dbm_open in -lgdbm""... $ac_c" 1>&6
-echo "configure:9544: checking for dbm_open in -lgdbm" >&5
+echo "configure:9574: checking for dbm_open in -lgdbm" >&5
 ac_lib_var=`echo gdbm'_'dbm_open | sed 'y%./+-%__p_%'`

 xe_check_libs=" -lgdbm "
 cat > conftest.$ac_ext <<EOF
-#line 9549 "configure"
+#line 9579 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -9556,7 +9586,7 @@
 dbm_open()
 ; return 0; }
 EOF
-if { (eval echo configure:9560: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:9590: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -9578,10 +9608,10 @@

   if test "$with_database_gnudbm" != "yes"; then
     echo $ac_n "checking for dbm_open""... $ac_c" 1>&6
-echo "configure:9582: checking for dbm_open" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 9585 "configure"
+echo "configure:9612: checking for dbm_open" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 9615 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char dbm_open(); below.  */
@@ -9604,7 +9634,7 @@

 ; return 0; }
 EOF
-if { (eval echo configure:9608: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:9638: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_dbm_open=yes"
 else
@@ -9640,10 +9670,10 @@

 if test "$with_database_dbm" != "no"; then
   echo $ac_n "checking for dbm_open""... $ac_c" 1>&6
-echo "configure:9644: checking for dbm_open" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 9647 "configure"
+echo "configure:9674: checking for dbm_open" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 9677 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char dbm_open(); below.  */
@@ -9666,7 +9696,7 @@

 ; return 0; }
 EOF
-if { (eval echo configure:9670: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:9700: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_dbm_open=yes"
 else
@@ -9687,12 +9717,12 @@
   if test "$need_libdbm" != "no"; then

 echo $ac_n "checking for dbm_open in -ldbm""... $ac_c" 1>&6
-echo "configure:9691: checking for dbm_open in -ldbm" >&5
+echo "configure:9721: checking for dbm_open in -ldbm" >&5
 ac_lib_var=`echo dbm'_'dbm_open | sed 'y%./+-%__p_%'`

 xe_check_libs=" -ldbm "
 cat > conftest.$ac_ext <<EOF
-#line 9696 "configure"
+#line 9726 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -9703,7 +9733,7 @@
 dbm_open()
 ; return 0; }
 EOF
-if { (eval echo configure:9707: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:9737: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -9740,10 +9770,10 @@

 if test "$with_database_berkdb" != "no"; then
   echo $ac_n "checking for dbopen""... $ac_c" 1>&6
-echo "configure:9744: checking for dbopen" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 9747 "configure"
+echo "configure:9774: checking for dbopen" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 9777 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char dbopen(); below.  */
@@ -9766,7 +9796,7 @@

 ; return 0; }
 EOF
-if { (eval echo configure:9770: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:9800: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_dbopen=yes"
 else
@@ -9787,12 +9817,12 @@
   if test "$need_libdb" != "no"; then

 echo $ac_n "checking for dbopen in -ldb""... $ac_c" 1>&6
-echo "configure:9791: checking for dbopen in -ldb" >&5
+echo "configure:9821: checking for dbopen in -ldb" >&5
 ac_lib_var=`echo db'_'dbopen | sed 'y%./+-%__p_%'`

 xe_check_libs=" -ldb "
 cat > conftest.$ac_ext <<EOF
-#line 9796 "configure"
+#line 9826 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -9803,7 +9833,7 @@
 dbopen()
 ; return 0; }
 EOF
-if { (eval echo configure:9807: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:9837: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -9827,7 +9857,7 @@
   if test "$with_database_berkdb" = "yes"; then
     for path in "db/db.h" "db.h"; do
 cat > conftest.$ac_ext <<EOF
-#line 9831 "configure"
+#line 9861 "configure"
 #include "confdefs.h"
 #ifdef HAVE_INTTYPES_H
 #define __BIT_TYPES_DEFINED__
@@ -9845,7 +9875,7 @@

 ; return 0; }
 EOF
-if { (eval echo configure:9849: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:9879: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   db_h_path="$path"; break
 else
@@ -9897,12 +9927,12 @@
 if test "$with_socks" = "yes"; then

 echo $ac_n "checking for SOCKSinit in -lsocks""... $ac_c" 1>&6
-echo "configure:9901: checking for SOCKSinit in -lsocks" >&5
+echo "configure:9931: checking for SOCKSinit in -lsocks" >&5
 ac_lib_var=`echo socks'_'SOCKSinit | sed 'y%./+-%__p_%'`

 xe_check_libs=" -lsocks "
 cat > conftest.$ac_ext <<EOF
-#line 9906 "configure"
+#line 9936 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -9913,7 +9943,7 @@
 SOCKSinit()
 ; return 0; }
 EOF
-if { (eval echo configure:9917: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:9947: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -10284,14 +10314,6 @@
 EOF
 }

-test "$with_term"          = "yes" && { test "$extra_verbose" = "yes" && cat << \EOF
-    Defining HAVE_TERM
-EOF
-cat >> confdefs.h <<\EOF
-#define HAVE_TERM 1
-EOF
-}
-
 test "$external_widget"    = "yes" && { test "$extra_verbose" = "yes" && cat << \EOF
     Defining EXTERNAL_WIDGET
 EOF
@@ -10407,7 +10429,6 @@
 fi
 test "$with_dnet"  = yes && echo "  Compiling in support for DNET."
 test "$with_socks" = yes && echo "  Compiling in support for SOCKS."
-test "$with_term"  = yes && echo "  Compiling in support for TERM."
 test "$with_xauth" = yes && echo "  Compiling in support for XAUTH."
 if test "$with_xmu" != yes -a "$with_x11" = yes; then
   echo "  No Xmu; substituting equivalent routines."
@@ -10486,6 +10507,9 @@
 echo "  The \`Info-default-directory-list' will be initialized from:"
 echo "  INFOPATH=\"$infopath\""
 test "$use_union_type"     = yes && echo "  Using the union type for Lisp_Objects."
+test "$with_minimal_tagbits" != "no" -o "$with_gung" != "no" && \
+		echo "Using Lisp_Objects with minimal tagbits."
+test "$with_gung" != "no" && echo "Using indexed lrecord implementation."
 test "$debug"              = yes && echo "  Compiling in extra code for debugging."
 test "$memory_usage_stats" = yes && echo "  Compiling in code for checking XEmacs memory usage."
 test "$usage_tracking"     = yes && echo "  Compiling with usage tracking active (Sun internal)."
--- a/configure.in	Mon Aug 13 10:21:19 2007 +0200
+++ b/configure.in	Mon Aug 13 10:22:03 2007 +0200
@@ -350,6 +350,8 @@
 cflags='UNSPECIFIED'
 dynamic=''
 with_x11=''
+with_gung='no'
+with_minimal_tagbits='no'
 rel_alloc='default'
 with_system_malloc='default'
 native_sound_lib=''
@@ -449,9 +451,9 @@
 	with_gcc	| \
 	with_gnu_make	| \
 	dynamic		| \
+	with_gung	| \
 	with_ncurses	| \
 	with_dnet	| \
-	with_term	| \
 	with_socks	| \
 	with_cde	| \
 	with_offix	| \
@@ -1947,6 +1949,8 @@
       (Using Doug Lea's new malloc from the GNU C Library.)"
   fi
   AC_DEFINE(DOUG_LEA_MALLOC)
+  AC_DEFINE(USE_MINIMAL_TAGBITS)
+  with_minimal_tagbits=yes
 fi

 dnl Some other nice autoconf tests.  If you add a test here which
@@ -2578,6 +2582,11 @@
   fi
 fi

+if test "$with_gung" != "no"; then
+	test "$with_minimal_tagbits" = "no" && AC_DEFINE(USE_MINIMAL_TAGBITS)
+	AC_DEFINE(USE_INDEXED_LRECORD_IMPLEMENTATION)
+fi
+
 dnl ----------------------
 dnl Mule-dependent options
 dnl ----------------------
@@ -3343,7 +3352,6 @@
 fi
 test "$with_i18n3"         = "yes" && AC_DEFINE(I18N3)
 test "$GCC"                = "yes" && AC_DEFINE(USE_GCC)
-test "$with_term"          = "yes" && AC_DEFINE(HAVE_TERM)
 test "$external_widget"    = "yes" && AC_DEFINE(EXTERNAL_WIDGET)
 test "$with_gnu_make"      = "yes" && AC_DEFINE(USE_GNU_MAKE)
 test "$no_doc_file"        = "yes" && AC_DEFINE(NO_DOC_FILE)
@@ -3402,7 +3410,6 @@
 fi
 test "$with_dnet"  = yes && echo "  Compiling in support for DNET."
 test "$with_socks" = yes && echo "  Compiling in support for SOCKS."
-test "$with_term"  = yes && echo "  Compiling in support for TERM."
 test "$with_xauth" = yes && echo "  Compiling in support for XAUTH."
 if test "$with_xmu" != yes -a "$with_x11" = yes; then
   echo "  No Xmu; substituting equivalent routines."
@@ -3481,6 +3488,9 @@
 echo "  The \`Info-default-directory-list' will be initialized from:"
 echo "  INFOPATH=\"$infopath\""
 test "$use_union_type"     = yes && echo "  Using the union type for Lisp_Objects."
+test "$with_minimal_tagbits" != "no" -o "$with_gung" != "no" && \
+		echo "Using Lisp_Objects with minimal tagbits."
+test "$with_gung" != "no" && echo "Using indexed lrecord implementation."
 test "$debug"              = yes && echo "  Compiling in extra code for debugging."
 test "$memory_usage_stats" = yes && echo "  Compiling in code for checking XEmacs memory usage."
 test "$usage_tracking"     = yes && echo "  Compiling with usage tracking active (Sun internal)."
--- a/configure.usage	Mon Aug 13 10:21:19 2007 +0200
+++ b/configure.usage	Mon Aug 13 10:22:03 2007 +0200
@@ -43,6 +43,7 @@
 --srcdir=DIR		Look for the XEmacs source files in DIR.
 			See also --with-gnu-make.
 --const-is-losing=no	Allow the use of const in the source code.
+--with-gung		Build with new-style Lisp_Objects.


 Installation options:
@@ -99,12 +100,6 @@
 --with-workshop		Support the Sun WorkShop (formerly Sparcworks)
 			development environment.
 --with-socks		Compile with support for SOCKS (an Internet proxy).
---with-term		Compile with support for TERM (a way to multiplex
-			serial lines and provide vaguely Internet-like
-			functionality over a simple dialup connection,
-			used on Linux and other systems.  NOTE: We can't
-			guarantee that our TERM support coexists well
-			with standard Internet connections).
 --with-database=TYPE (*) Compile with database support.  Valid types are
 			`no' or a comma-separated list of one or more
 			of `dbm', `gnudbm', or `berkdb'.
--- a/lisp/ChangeLog	Mon Aug 13 10:21:19 2007 +0200
+++ b/lisp/ChangeLog	Mon Aug 13 10:22:03 2007 +0200
@@ -1,3 +1,7 @@
+1998-02-19  SL Baur  <steve@altair.xemacs.org>
+
+	* about.el (about-hackers): Update credits.
+
 1997-12-22  Christoph Wedler  <wedler@fmi.uni-passau.de>

 	* prim/register.el (view-register): Show register type file-query.
--- a/lisp/about.el	Mon Aug 13 10:21:19 2007 +0200
+++ b/lisp/about.el	Mon Aug 13 10:22:03 2007 +0200
@@ -1352,6 +1352,7 @@
        (print-short "Mats Lidell" "mats.lidell@contactor.se")
        (print-short "Matt Liggett" "mliggett@seven.ucs.indiana.edu")
        (print-short "Christian Limpach" "Christian.Limpach@nice.ch")
+       (print-short "Maximilien Lincourt" "max@toonboom.com")
        (print-short "Markus Linnala" "maage@b14b.tupsu.ton.tut.fi")
        (print-short "Robert Lipe" "robertl@arnet.com")
        (print-short "Derrell Lipman" "derrell@vis-av.com")
--- a/lisp/modeline.el	Mon Aug 13 10:21:19 2007 +0200
+++ b/lisp/modeline.el	Mon Aug 13 10:22:03 2007 +0200
@@ -74,6 +74,8 @@
 	  (start-event-frame (event-frame event))
 	  (start-event-window (event-window event))
 	  (start-nwindows (count-windows t))
+	  (hscroll-offset
+	   (- (modeline-hscroll (event-window event)) (event-x event)))
 	  (last-timestamp 0)
 	  default-line-height
 	  modeline-height
@@ -141,6 +143,8 @@
 		  drag-modeline-event-lag)
 	       nil)
 	      (t
+	       (set-modeline-hscroll (event-window event)
+				     (+ hscroll-offset (event-x event)))
 	       (setq last-timestamp (event-timestamp event)
 		     y (event-y-pixel event)
 		     edges (window-pixel-edges start-event-window)
--- a/man/ChangeLog	Mon Aug 13 10:21:19 2007 +0200
+++ b/man/ChangeLog	Mon Aug 13 10:22:03 2007 +0200
@@ -1,3 +1,17 @@
+1998-02-19  Hrvoje Niksic  <hniksic@srce.hr>
+
+	* cl.texi (Argument Lists): Keywords are handled specially by
+ 	XEmacs.
+	(Porting Common Lisp): XEmacs backquotes are OK.
+
+1998-02-19  Karl M. Hegbloom  <karlheg@bittersweet.inetarena.com>
+
+	* xemacs/custom.texi (Init Syntax): document #b, #o, and #x reader
+ 	syntax for integers.
+	From Adrian Aichner <aichner@ecf.teradyne.com>
+	* cl.texi (Porting Common Lisp): ' '
+	* lispref/numbers.texi (Numbers): ' '
+
 1998-02-15  Karl M. Hegbloom  <karlheg@bittersweet.inetarena.com>

 	* lispref/searching.texi (Regular Expressions): Document the
--- a/man/cl.texi	Mon Aug 13 10:21:19 2007 +0200
+++ b/man/cl.texi	Mon Aug 13 10:22:03 2007 +0200
@@ -522,12 +522,6 @@
 keep both @code{find-thing} and @code{member*} from complaining
 about each others' keywords in the arguments.

-In Common Lisp, keywords are recognized by the Lisp parser itself
-and treated as special entities.  In Emacs, keywords are just
-symbols whose names begin with colons, which @code{defun*} has
-arranged to set equal to themselves so that they will essentially
-be self-quoting.
-
 As a (significant) performance optimization, this package
 implements the scan for keyword arguments by calling @code{memq}
 to search for keywords in a ``rest'' argument.  Technically
@@ -5592,14 +5586,6 @@
 Lucid Emacs supports @code{#'} notation starting with version 19.8.

 @item
-The ``backquote'' feature uses a different syntax in Emacs Lisp.
-
-@example
-(defmacro foo (v &rest body) `(let ((,v 0)) @@,body))  ; Common Lisp
-(defmacro foo (v &rest body) (` (let (((, v) 0)) (@@, body)))  ; Emacs
-@end example
-
-@item
 Reader macros.  Common Lisp includes a second type of macro that
 works at the level of individual characters.  For example, Common
 Lisp implements the quote notation by a reader macro called @code{'},
@@ -5607,12 +5593,6 @@
 Some Lisp packages use reader macros to create special syntaxes
 for themselves, which the Emacs parser is incapable of reading.

-The lack of reader macros, incidentally, is the reason behind
-Emacs Lisp's unusual backquote syntax.  Since backquotes are
-implemented as a Lisp package and not built-in to the Emacs
-parser, they are forced to use a regular macro named @code{`}
-which is used with the standard function/macro call notation.
-
 @item
 Other syntactic features.  Common Lisp provides a number of
 notations beginning with @code{#} that the Emacs Lisp parser
@@ -5621,6 +5601,10 @@
 the parser to ignore the @code{(foo)} except in Lucid Common
 Lisp.

+The number prefixes `#b', `#o', and `#x', however, are supported
+by the Emacs Lisp parser to represent numbers in binary, octal,
+and hexadecimal notation (or radix), just like in Common Lisp.
+
 @item
 Packages.  In Common Lisp, symbols are divided into @dfn{packages}.
 Symbols that are Lisp built-ins are typically stored in one package;
--- a/man/lispref/numbers.texi	Mon Aug 13 10:21:19 2007 +0200
+++ b/man/lispref/numbers.texi	Mon Aug 13 10:22:03 2007 +0200
@@ -10,12 +10,14 @@

   XEmacs supports two numeric data types: @dfn{integers} and
 @dfn{floating point numbers}.  Integers are whole numbers such as
-@minus{}3, 0, 7, 13, and 511.  Their values are exact.  Floating point
+@minus{}3, 0, #b0111, #xFEED, #o744.  Their values are exact.  The
+number prefixes `#b', `#o', and `#x' are supported to represent numbers
+in binary, octal, and hexadecimal notation (or radix).  Floating point
 numbers are numbers with fractional parts, such as @minus{}4.5, 0.0, or
-2.71828.  They can also be expressed in exponential notation:
-1.5e2 equals 150; in this example, @samp{e2} stands for ten to the
-second power, and is multiplied by 1.5.  Floating point values are not
-exact; they have a fixed, limited amount of precision.
+2.71828.  They can also be expressed in exponential notation: 1.5e2
+equals 150; in this example, @samp{e2} stands for ten to the second
+power, and is multiplied by 1.5.  Floating point values are not exact;
+they have a fixed, limited amount of precision.

 @menu
 * Integer Basics::            Representation and range of integers.
--- a/man/xemacs/custom.texi	Mon Aug 13 10:21:19 2007 +0200
+++ b/man/xemacs/custom.texi	Mon Aug 13 10:22:03 2007 +0200
@@ -1592,6 +1592,9 @@
 If a sequence of digits is followed by a period and another sequence
 of digits, it is interpreted as a floating point number.

+The number prefixes @samp{#b}, @samp{#o}, and @samp{#x} are supported to
+represent numbers in binary, octal, and hexadecimal notation (or radix).
+
 @item Strings
 Lisp string syntax is the same as C string syntax with a few extra
 features.  Use a double-quote character to begin and end a string constant.
--- a/src/ChangeLog	Mon Aug 13 10:21:19 2007 +0200
+++ b/src/ChangeLog	Mon Aug 13 10:22:03 2007 +0200
@@ -1,3 +1,33 @@
+1998-02-19  Andreas Jaeger  <aj@arthur.rhein-neckar.de>
+
+	* emacs.c: declare hooks only if !DOUG_LEA_MALLOC since the
+	declaration conflicts with glibc's own.
+
+1998-02-19  SL Baur  <steve@altair.xemacs.org>
+
+	* config.h.in: Remove HAVE_TERM, add USE_MINIMAL_TAGBITS and
+	USE_INDEXED_LRECORD_IMPLEMENTATION.
+
+	* process.c (Fopen_network_stream_internal): Remove TERM support.
+
+	* sysproc.h: Remove TERM support.
+
+1998-02-20  Kazuyuki IENAGA <ienaga@jsys.co.jp>
+
+	* input-method-xfs.c: add setlocale(LC_CTYPE, "") right after
+	setlocale(LC_NUMERIC, "C").  Because, without this, the LC_CTYPE
+	got a side effect of LC_NUMERIC then set to "C".
+
+1998-02-19  SL Baur  <steve@altair.xemacs.org>
+
+	* emacs.c (main): Enable mmap'ing with XEmacs/Mule.
+
+	* redisplay.c (add_string_to_fstring_db_runes): Fix infloop
+	problem with long modelines and glyphs.
+
+	* unexelf.c: The proper way to check for GNU libc is with __GLIBC__.
+	Suggested by Andreas Jaeger <aj@arthur.rhein-neckar.de>
+
 1998-02-18  SL Baur  <steve@altair.xemacs.org>

 	* Makefile.in.in: Remove all references to prefix-args.
--- a/src/config.h.in	Mon Aug 13 10:21:19 2007 +0200
+++ b/src/config.h.in	Mon Aug 13 10:22:03 2007 +0200
@@ -291,9 +291,6 @@
 /* Compile in support for SOCKS? */
 #undef HAVE_SOCKS

-/* Compile in support for using the `term' program (e.g. under Linux)? */
-#undef HAVE_TERM
-
 /* Compile in support for X pixmaps via the `xpm' library? */
 #undef HAVE_XPM

@@ -465,6 +462,15 @@
    (It's NO_UNION_TYPE instead of USE_UNION_TYPE for historical reasons.) */
 #undef NO_UNION_TYPE

+/* The next two options are turned on by --with-gung=yes */
+/* If defined, use a minimal number of tagbits.  This allows usage of more
+   advanced versions of malloc (like the Doug Lea new GNU malloc) and larger
+   integers. */
+#undef USE_MINIMAL_TAGBITS
+
+/* #### Document me. */
+#undef USE_INDEXED_LRECORD_IMPLEMENTATION
+
 /* The configuration script defines opsysfile to be the name of the
    s/...h file that describes the system type you are using.
    The file is chosen based on the configuration name you give.
--- a/src/editfns.c	Mon Aug 13 10:21:19 2007 +0200
+++ b/src/editfns.c	Mon Aug 13 10:22:03 2007 +0200
@@ -1165,6 +1165,22 @@
     return list2 (Qnil, Qnil);
 }

+#ifdef LOCALTIME_CACHE
+
+/* These two values are known to load tz files in buggy implementations,
+   i.e. Solaris 1 executables running under either Solaris 1 or Solaris 2.
+   Their values shouldn't matter in non-buggy implementations.
+   We don't use string literals for these strings,
+   since if a string in the environment is in readonly
+   storage, it runs afoul of bugs in SVR4 and Solaris 2.3.
+   See Sun bugs 1113095 and 1114114, ``Timezone routines
+   improperly modify environment''.  */
+
+static char set_time_zone_rule_tz1[] = "TZ=GMT+0";
+static char set_time_zone_rule_tz2[] = "TZ=GMT+1";
+
+#endif
+
 /* Set the local time zone rule to TZSTRING.
    This allocates memory into `environ', which it is the caller's
    responsibility to free.  */
@@ -1195,6 +1211,40 @@
   environ = newenv;

 #ifdef LOCALTIME_CACHE
+  {
+    /* In SunOS 4.1.3_U1 and 4.1.4, if TZ has a value like
+       "US/Pacific" that loads a tz file, then changes to a value like
+       "XXX0" that does not load a tz file, and then changes back to
+       its original value, the last change is (incorrectly) ignored.
+       Also, if TZ changes twice in succession to values that do
+       not load a tz file, tzset can dump core (see Sun bug#1225179).
+       The following code works around these bugs.  */
+
+    if (tzstring)
+      {
+	/* Temporarily set TZ to a value that loads a tz file
+	   and that differs from tzstring.  */
+	char *tz = *newenv;
+	*newenv = (strcmp (tzstring, set_time_zone_rule_tz1 + 3) == 0
+		   ? set_time_zone_rule_tz2 : set_time_zone_rule_tz1);
+	tzset ();
+	*newenv = tz;
+      }
+    else
+      {
+	/* The implied tzstring is unknown, so temporarily set TZ to
+	   two different values that each load a tz file.  */
+	*to = set_time_zone_rule_tz1;
+	to[1] = 0;
+	tzset ();
+	*to = set_time_zone_rule_tz2;
+	tzset ();
+	*to = 0;
+      }
+
+    /* Now TZ has the desired value, and tzset can be invoked safely.  */
+  }
+
   tzset ();
 #endif
 }
--- a/src/emacs.c	Mon Aug 13 10:21:19 2007 +0200
+++ b/src/emacs.c	Mon Aug 13 10:22:03 2007 +0200
@@ -67,11 +67,11 @@

 extern void memory_warnings (void *, void (*warnfun) (CONST char *));

-#ifndef SYSTEM_MALLOC
+#if !defined SYSTEM_MALLOC && !defined DOUG_LEA_MALLOC
 extern void *(*__malloc_hook)(size_t);
 extern void *(*__realloc_hook)(void *, size_t);
 extern void (*__free_hook)(void *);
-#endif  /* not SYSTEM_MALLOC */
+#endif  /* not SYSTEM_MALLOC && not DOUG_LEA_MALLOC */

 /* Command line args from shell, as list of strings */
 Lisp_Object Vcommand_line_args;
--- a/src/input-method-xfs.c	Mon Aug 13 10:21:19 2007 +0200
+++ b/src/input-method-xfs.c	Mon Aug 13 10:22:03 2007 +0200
@@ -75,6 +75,7 @@
     }

   setlocale(LC_NUMERIC, "C");
+  setlocale(LC_CTYPE, ""); /* take back CTYPE to previous state */

   if (XSetLocaleModifiers ("") == NULL)
     {
--- a/src/process.c	Mon Aug 13 10:21:19 2007 +0200
+++ b/src/process.c	Mon Aug 13 10:22:03 2007 +0200
@@ -1276,7 +1276,6 @@
   int count = 0;
 #endif

-#ifndef HAVE_TERM
   memset (address, 0, sizeof (*address));

   while (1)
@@ -1450,14 +1449,6 @@

   speed_up_interrupts ();

-#else /* HAVE_TERM */
-  s = connect_server (0);
-  if (s < 0)
-    report_file_error ("error creating socket", Fcons (name, Qnil));
-  send_command (s, C_PORT, 0, "%s:%d", XSTRING_DATA (host), ntohs (port));
-  send_command (s, C_DUMB, 1, 0);
-#endif /* HAVE_TERM */
-
   inch = s;
   outch = dup (s);
   if (outch < 0)
--- a/src/redisplay.c	Mon Aug 13 10:21:19 2007 +0200
+++ b/src/redisplay.c	Mon Aug 13 10:22:03 2007 +0200
@@ -254,7 +254,8 @@
 					  struct display_line *dl,
 					  struct display_block *db,
 					  face_index findex, int min_pixpos,
-					  int max_pixpos, int type);
+					  int max_pixpos, int type,
+					  int modeline);
 static Charcount generate_fstring_runes (struct window *w, pos_data *data,
 					 Charcount pos, Charcount min_pos,
 					 Charcount max_pos, Lisp_Object elt,
@@ -3566,8 +3567,9 @@

   generate_formatted_string_db (b->modeline_format,
 				b->generated_modeline_string, w, dl, db,
-				MODELINE_INDEX, min_pixpos, max_pixpos, type);
-
+				MODELINE_INDEX, min_pixpos, max_pixpos, type,
+				1 /* generate a modeline */);
+
   /* The modeline is at the bottom of the gutters.  We have to wait to
      set this until we've generated teh modeline in order to account
      for any embedded faces. */
@@ -3578,7 +3580,8 @@
 generate_formatted_string_db (Lisp_Object format_str, Lisp_Object result_str,
 			      struct window *w, struct display_line *dl,
 			      struct display_block *db, face_index findex,
-			      int min_pixpos, int max_pixpos, int type)
+			      int min_pixpos, int max_pixpos, int type,
+			      int modeline)
 {
   struct frame *f = XFRAME (w->frame);
   struct device *d = XDEVICE (f->device);
@@ -3604,10 +3607,15 @@
   Dynarr_reset (formatted_string_extent_start_dynarr);
   Dynarr_reset (formatted_string_extent_end_dynarr);

-  /* This recursively builds up the modeline. */
-  generate_fstring_runes (w, &data, 0, 0, -1, format_str, 0,
-			  max_pixpos - min_pixpos, findex, type);
-
+  /* D. Verna Feb. 1998.
+     This recursively builds up the modeline or the title/icon string.
+     In case of a modeline, we use a negative start position to indicate
+     the current modeline horizontal scroll. */
+  generate_fstring_runes
+    (w, &data,
+     (modeline && WINDOW_HAS_MODELINE_P (w)) ? - w->modeline_hscroll : 0,
+     0, -1, format_str, 0, max_pixpos - min_pixpos, findex, type);
+
   if (Dynarr_length (db->runes))
     {
       struct rune *rb =
@@ -3677,45 +3685,68 @@
     }
 }

+/* D. Verna Feb. 1998. Rewrote this function to handle the case of a
+   scrolled modeline */
 static Charcount
 add_string_to_fstring_db_runes (pos_data *data, CONST Bufbyte *str,
 				Charcount pos, Charcount min_pos, Charcount max_pos)
 {
   /* This function has been Mule-ized. */
-  Charcount end;
+  Charcount initial_pos = pos;
   CONST Bufbyte *cur_pos = str;
   struct display_block *db = data->db;
-
+  int add_something;
+
   data->blank_width = space_width (XWINDOW (data->window));
-  while (Dynarr_length (db->runes) < pos)
-    add_blank_rune (data, NULL, 0);
-
-  end = (Dynarr_length (db->runes) +
-	 bytecount_to_charcount (str, strlen ((CONST char *) str)));
-  if (max_pos != -1)
-    end = min (max_pos, end);
-
-  while (pos < end && *cur_pos)
-    {
-      CONST Bufbyte *old_cur_pos = cur_pos;
-      int succeeded;
-
-      data->ch = charptr_emchar (cur_pos);
-      succeeded = (add_emchar_rune (data) != ADD_FAILED);
-      INC_CHARPTR (cur_pos);
-      if (succeeded)
-	{
-	  pos++;
-	  data->modeline_charpos++;
-	  data->bytepos += cur_pos - old_cur_pos;
-	}
-    }
-
-  while (Dynarr_length (db->runes) < min_pos &&
-	 (data->pixpos + data->blank_width <= data->max_pixpos))
-    add_blank_rune (data, NULL, 0);
-
-  return Dynarr_length (db->runes);
+  add_something = ((pos < min_pos)
+		   || ((*cur_pos) && (max_pos == -1))
+		   || ((*cur_pos) && (pos < max_pos)));
+  while (add_something)
+    {
+      if (((initial_pos < 0) && (pos == 1)) || (pos == initial_pos))
+	while (Dynarr_length (db->runes) < pos)
+	  add_blank_rune (data, NULL, 0);
+
+      if (pos < 0) /* just pretend we're adding something */
+	{
+	  if (*cur_pos)
+	    INC_CHARPTR (cur_pos);
+	  pos += 1;
+	}
+      else /* Maybe add something */
+	{
+	  if (*cur_pos)
+	    {
+	      CONST Bufbyte *old_cur_pos = cur_pos;
+	      int succeeded;
+
+	      data->ch = charptr_emchar (cur_pos);
+	      succeeded = (add_emchar_rune (data) != ADD_FAILED);
+	      INC_CHARPTR (cur_pos);
+	      if (succeeded)
+		{
+		  pos += 1;
+		  data->modeline_charpos++;
+		  data->bytepos += cur_pos - old_cur_pos;
+		}
+	    }
+	  else if (data->pixpos + data->blank_width <= data->max_pixpos)
+	    {
+	      add_blank_rune (data, NULL, 0);
+	    }
+	  else /* pretend to add something */
+	    {
+	      if (*cur_pos)
+		INC_CHARPTR (cur_pos);
+	      pos += 1;
+	    }
+	}
+      add_something = ((pos < min_pos)
+		       || ((*cur_pos) && (max_pos == -1))
+		       || ((*cur_pos) && (pos < max_pos)));
+    }
+
+  return pos;
 }

 /* #### Urk!  Should also handle begin-glyphs and end-glyphs in
@@ -3729,14 +3760,20 @@
   struct display_block *db = data->db;
   struct glyph_block gb;

+  /* D. Verna Feb. 1998.
+     If pos < 0, we're building a scrolled modeline.
+     The glyph should be hidden. So just skip it. */
+  if (pos < 0)
+    return (pos + 1);
+
   data->blank_width = space_width (XWINDOW (data->window));
   while (Dynarr_length (db->runes) < pos)
     add_blank_rune (data, NULL, 0);
-
+
   end = Dynarr_length (db->runes) + 1;
   if (max_pos != -1)
     end = min (max_pos, end);
-
+
   gb.glyph = glyph;
   gb.extent = Qnil;
   add_glyph_rune (data, &gb, BEGIN_GLYPHS, 0, 0);
@@ -3785,23 +3822,23 @@
     {
       /* A string.  Add to the display line and check for %-constructs
          within it. */
-
+
       Bufbyte *this = XSTRING_DATA (elt);
-
+
       while ((pos < max_pos || max_pos == -1) && *this)
 	{
 	  Bufbyte *last = this;
-
+
 	  while (*this && *this != '%')
 	    this++;
-
+
 	  if (this != last)
 	    {
 	      /* The string is just a string. */
 	      Charcount size =
 		bytecount_to_charcount (last, this - last) + pos;
 	      Charcount tmp_max = (max_pos == -1 ? size : min (size, max_pos));
-
+
 	      pos = add_string_to_fstring_db_runes (data, last, pos, pos,
 						    tmp_max);
 	    }
@@ -4080,8 +4117,11 @@
   db = get_display_block_from_line (dl, TEXT);
   Dynarr_reset (db->runes);

+  /* D. Verna Feb. 1998.
+     Currently, only update_frame_title can make us come here. This is not
+     to build a modeline */
   generate_formatted_string_db (format_str, result_str, w, dl, db, findex, 0,
-				-1, type);
+				-1, type, 0 /* not a modeline */);

   Dynarr_reset (formatted_string_emchar_dynarr);
   while (elt < Dynarr_length (db->runes))
--- a/src/sysproc.h	Mon Aug 13 10:21:19 2007 +0200
+++ b/src/sysproc.h	Mon Aug 13 10:22:03 2007 +0200
@@ -44,11 +44,6 @@
 # include <sys/socket.h>
 #endif /* HAVE_SOCKETS */

-/* TERM is a poor-man's SLIP, used on Linux.  */
-#ifdef HAVE_TERM
-# include <client.h>
-#endif
-
 /* On some systems, e.g. DGUX, inet_addr returns a 'struct in_addr'. */
 #ifdef HAVE_BROKEN_INET_ADDR
 # define IN_ADDR struct in_addr
--- a/src/unexelf.c	Mon Aug 13 10:21:19 2007 +0200
+++ b/src/unexelf.c	Mon Aug 13 10:22:03 2007 +0200
@@ -420,7 +420,7 @@
 #include <elf.h>
 #include <sys/mman.h>

-#if __GNU_LIBRARY__ - 0 >= 6
+#if __GLIBC__ - 0 >= 6
 # include <link.h>	/* get ElfW etc */
 #endif
--- a/src/window.c	Mon Aug 13 10:21:19 2007 +0200
+++ b/src/window.c	Mon Aug 13 10:22:03 2007 +0200
@@ -1354,6 +1354,18 @@
   return make_int (decode_window (window)->hscroll);
 }

+DEFUN ("modeline-hscroll", Fmodeline_hscroll, 0, 1, 0, /*
+Return the number of columns by which WINDOW's modeline is scrolled from
+left margin. If the window has no modeline, return nil.
+*/
+       (window))
+{
+  struct window *w;
+
+  w = decode_window (window);
+  return (WINDOW_HAS_MODELINE_P (w)) ? make_int (w->modeline_hscroll) : Qnil;
+}
+
 DEFUN ("set-window-hscroll", Fset_window_hscroll, 2, 2, 0, /*
 Set number of columns WINDOW is scrolled from left margin to NCOL.
 NCOL should be zero or positive.
@@ -1373,6 +1385,30 @@
   return ncol;
 }

+DEFUN ("set-modeline-hscroll", Fset_modeline_hscroll, 2, 2, 0, /*
+Set number of columns WINDOW's modeline is scrolled from left margin to NCOL.
+NCOL should be zero or positive. If NCOL is negative, it will be forced to 0.
+If the window has no modeline, do nothing and return nil.
+*/
+       (window, ncol))
+{
+  struct window *w;
+  int ncols;
+
+  w = decode_window (window);
+  if (WINDOW_HAS_MODELINE_P (w))
+    {
+      CHECK_INT (ncol);
+      ncols = XINT (ncol);
+      if (ncols < 0) ncols = 0;
+      if (w->modeline_hscroll != ncols)
+	MARK_MODELINE_CHANGED;
+      w->modeline_hscroll = ncols;
+      return ncol;
+    }
+  return Qnil;
+}
+
 #if 0 /* bogus crock */

 xxDEFUN ("window-redisplay-end-trigger",
@@ -3149,6 +3185,7 @@
       Vminibuf_scroll_window = window;
       w = XWINDOW (window);
       w->hscroll = 0;
+      w->modeline_hscroll = 0;
       set_marker_restricted (w->start[CURRENT_DISP], make_int (1), buf);
       set_marker_restricted (w->pointm[CURRENT_DISP], make_int (1), buf);
       set_marker_restricted (w->sb_point, make_int (1), buf);
@@ -4477,6 +4514,7 @@
   int pixel_width;
   int pixel_height;
   int hscroll;
+  int modeline_hscroll;
   int parent_index;           /* index into saved_windows */
   int prev_index;             /* index into saved_windows */
   Lisp_Object dedicated;
@@ -4618,6 +4656,7 @@
     win1->pixel_width  == win2->pixel_width &&
     win1->pixel_height == win2->pixel_height &&
     win1->hscroll      == win2->hscroll &&
+    win1->modeline_hscroll == win2->modeline_hscroll &&
     win1->parent_index == win2->parent_index &&
     win1->prev_index   == win2->prev_index &&
     EQ (win1->dedicated, win2->dedicated) &&
@@ -4940,6 +4979,7 @@
 	  WINDOW_WIDTH (w) = WINDOW_WIDTH (p);
 	  WINDOW_HEIGHT (w) = WINDOW_HEIGHT (p);
 	  w->hscroll = p->hscroll;
+	  w->modeline_hscroll = p->modeline_hscroll;
 	  w->display_table = p->display_table;
 	  w->modeline_shadow_thickness = p->modeline_shadow_thickness;
 	  w->has_modeline_p = p->has_modeline_p;
@@ -5207,6 +5247,7 @@
       WINDOW_WIDTH (p) = WINDOW_WIDTH (w);
       WINDOW_HEIGHT (p) = WINDOW_HEIGHT (w);
       p->hscroll = w->hscroll;
+      p->modeline_hscroll = w->modeline_hscroll;
       p->display_table = w->display_table;
       p->modeline_shadow_thickness = w->modeline_shadow_thickness;
       p->has_modeline_p = w->has_modeline_p;
@@ -5465,11 +5506,13 @@
   DEFSUBR (Fwindow_pixel_height);
   DEFSUBR (Fwindow_pixel_width);
   DEFSUBR (Fwindow_hscroll);
+  DEFSUBR (Fmodeline_hscroll);
 #if 0 /* bogus crock */
   DEFSUBR (Fwindow_redisplay_end_trigger);
   DEFSUBR (Fset_window_redisplay_end_trigger);
 #endif
   DEFSUBR (Fset_window_hscroll);
+  DEFSUBR (Fset_modeline_hscroll);
   DEFSUBR (Fwindow_pixel_edges);
   DEFSUBR (Fwindow_point);
   DEFSUBR (Fwindow_start);
--- a/src/window.h	Mon Aug 13 10:21:19 2007 +0200
+++ b/src/window.h	Mon Aug 13 10:22:03 2007 +0200
@@ -126,6 +126,8 @@
   Lisp_Object sb_point;
   /* Number of columns display within the window is scrolled to the left. */
   int hscroll;
+  /* Idem for the window's modeline */
+  int modeline_hscroll;
   /* Number saying how recently window was selected */
   Lisp_Object use_time;
   /* text.modified of displayed buffer as of last time display completed */
--- a/version.sh	Mon Aug 13 10:21:19 2007 +0200
+++ b/version.sh	Mon Aug 13 10:22:03 2007 +0200
@@ -1,5 +1,5 @@
 #!/bin/sh
 emacs_major_version=20
 emacs_minor_version=5
-emacs_beta_version=26
-xemacs_codename="Kiko"
+emacs_beta_version=27
+xemacs_codename="Kinder"