XEmacs 21.2-b3

diff --git a/CHANGES-beta b/CHANGES-beta
index 9a96988..cc918e6 100644 (file)
--- a/CHANGES-beta
+++ b/CHANGES-beta
@@ -1,4 +1,10 @@
                                                        -*- indented-text -*-
                                                        -*- indented-text -*-

+to 21.2 beta3 "Aglaia"
+-- case sensitiveness improvements from Didier Verna
+-- Bug fixes from 21.0
+-- Word selection on mouse click on quotes from Hrvoje Niksic
+-- WAVE support for NAS from Raymond Toy
+

 to 21.2 beta2 "Aether"
 -- Synched with 21.0-pre14 "Poitou"
 -- isearch improvements from Hrvoje Niksic
 to 21.2 beta2 "Aether"
 -- Synched with 21.0-pre14 "Poitou"
 -- isearch improvements from Hrvoje Niksic

diff --git a/ChangeLog b/ChangeLog
index a92e140..b6f08c3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,25 @@
+1998-10-15  SL Baur  <steve@altair.xemacs.org>
+
+       * XEmacs 21.2-beta3 is released.
+
+1998-10-13  Andy Piper  <andyp@parallax.co.uk>
+
+       * configure.in: enable drag and drop support by default if mswindows is
+       detected.
+
+1998-10-09  Kevin Oberman  <oberman@es.net>
+
+       * config.sub: Fix for Alpha architecture
+
+1998-10-05  Andy Piper  <andyp@parallax.co.uk>
+
+       * configure.in: don't enable shared lib support for cygwin unless
+       explititly told to.
+
+1998-10-02  Andreas Jaeger  <aj@arthur.rhein-neckar.de>
+
+       * etc/xemacs.1: Remove misplace "\".
+

 1998-09-29  SL Baur  <steve@altair.xemacs.org>
 
        * XEmacs 21.2-beta2 is released.
 1998-09-29  SL Baur  <steve@altair.xemacs.org>
 
        * XEmacs 21.2-beta2 is released.

diff --git a/config.sub b/config.sub
index 8fef96a..a4f1b4f 100755 (executable)
--- a/config.sub
+++ b/config.sub
@@ -158,7 +158,7 @@ case $basic_machine in
              | sparc-* | ns32k-* | fx80-* | arm-* | c[123]* \
              | mips-* | pyramid-* | tron-* | a29k-* | romp-* | rs6000-* | power-* \
              | none-* | 580-* | cray2-* | h8300-* | i960-* | xmp-* | ymp-* \
              | sparc-* | ns32k-* | fx80-* | arm-* | c[123]* \
              | mips-* | pyramid-* | tron-* | a29k-* | romp-* | rs6000-* | power-* \
              | none-* | 580-* | cray2-* | h8300-* | i960-* | xmp-* | ymp-* \

-             | hppa1.0-* | hppa1.1-* | alpha-* | we32k-* | cydra-* | ns16k-* \
+             | hppa1.0-* | hppa1.1-* | alpha*-* | we32k-* | cydra-* | ns16k-* \

              | pn-* | np1-* | xps100-* | clipper-* | orion-* | sparclite-* \
              | pdp11-* | sh-* | powerpc-* | powerpcle-* | sparc64-* | mips64-* | mipsel-* \
              | mips64el-* | mips64orion-* | mips64orionel-* | mab-*)
              | pn-* | np1-* | xps100-* | clipper-* | orion-* | sparclite-* \
              | pdp11-* | sh-* | powerpc-* | powerpcle-* | sparc64-* | mips64-* | mipsel-* \
              | mips64el-* | mips64orion-* | mips64orionel-* | mab-*)

diff --git a/configure b/configure
index 9347c6c..89b2270 100755 (executable)
--- a/configure
+++ b/configure
@@ -5834,6 +5834,7 @@ EOF
 
     install_pp="$blddir/lib-src/installexe.sh"
     libs_system="$libs_system -lshell32 -lgdi32 -luser32 -lcomctl32" &&  if test "$extra_verbose" = "yes"; then echo "    Appending \"-lshell32 -lgdi32 -luser32 -lcomctl32\" to \$libs_system"; fi
 
     install_pp="$blddir/lib-src/installexe.sh"
     libs_system="$libs_system -lshell32 -lgdi32 -luser32 -lcomctl32" &&  if test "$extra_verbose" = "yes"; then echo "    Appending \"-lshell32 -lgdi32 -luser32 -lcomctl32\" to \$libs_system"; fi

+    test "$with_dragndrop" != no && dragndrop_proto="$dragndrop_proto msw" &&  if test "$extra_verbose" = "yes"; then echo "    Appending \"msw\" to \$dragndrop_proto"; fi

     if test "$window_system" != x11; then
        window_system=msw
        test "$with_scrollbars" != "no" && with_scrollbars=msw \
     if test "$window_system" != x11; then
        window_system=msw
        test "$with_scrollbars" != "no" && with_scrollbars=msw \

@@ -5867,12 +5868,12 @@ EOF
  fi
     fi
         cat > conftest.$ac_ext <<EOF
  fi
     fi
         cat > conftest.$ac_ext <<EOF

-#line 5871 "configure"
+#line 5872 "configure"

 #include "confdefs.h"
 #include <fcntl.h>
     int main() { return (open("/dev/windows", O_RDONLY, 0) > 0)? 0 : 1; }
 EOF
 #include "confdefs.h"
 #include <fcntl.h>
     int main() { return (open("/dev/windows", O_RDONLY, 0) > 0)? 0 : 1; }
 EOF

-if { (eval echo configure:5876: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:5877: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5

 then
   { test "$extra_verbose" = "yes" && cat << \EOF
     Defining HAVE_MSG_SELECT
 then
   { test "$extra_verbose" = "yes" && cat << \EOF
     Defining HAVE_MSG_SELECT

@@ -5951,7 +5952,7 @@ case "$x_libraries" in *X11R4* )
 esac
 
 echo "checking for session-management option" 1>&6
 esac
 
 echo "checking for session-management option" 1>&6

-echo "configure:5955: checking for session-management option" >&5;
+echo "configure:5956: checking for session-management option" >&5;

 if test "$with_session" != "no"; then
   { test "$extra_verbose" = "yes" && cat << \EOF
     Defining HAVE_SESSION
 if test "$with_session" != "no"; then
   { test "$extra_verbose" = "yes" && cat << \EOF
     Defining HAVE_SESSION

@@ -5966,15 +5967,15 @@ fi
 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
 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:5970: checking for X11/Xauth.h" >&5
+echo "configure:5971: checking for X11/Xauth.h" >&5

 
 cat > conftest.$ac_ext <<EOF
 
 cat > conftest.$ac_ext <<EOF

-#line 5973 "configure"
+#line 5974 "configure"

 #include "confdefs.h"
 #include <X11/Xauth.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
 #include "confdefs.h"
 #include <X11/Xauth.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"

-{ (eval echo configure:5978: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:5979: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }

 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*

@@ -5997,12 +5998,12 @@ fi
  }
 test -z "$with_xauth" && { 
 echo $ac_n "checking for XauGetAuthByAddr in -lXau""... $ac_c" 1>&6
  }
 test -z "$with_xauth" && { 
 echo $ac_n "checking for XauGetAuthByAddr in -lXau""... $ac_c" 1>&6

-echo "configure:6001: checking for XauGetAuthByAddr in -lXau" >&5
+echo "configure:6002: checking for XauGetAuthByAddr in -lXau" >&5

 ac_lib_var=`echo Xau'_'XauGetAuthByAddr | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lXau "
 cat > conftest.$ac_ext <<EOF
 ac_lib_var=`echo Xau'_'XauGetAuthByAddr | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lXau "
 cat > conftest.$ac_ext <<EOF

-#line 6006 "configure"
+#line 6007 "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
 #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

@@ -6013,7 +6014,7 @@ int main() {
 XauGetAuthByAddr()
 ; return 0; }
 EOF
 XauGetAuthByAddr()
 ; return 0; }
 EOF

-if { (eval echo configure:6017: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:6018: \"$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
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else

@@ -6058,15 +6059,15 @@ if test "$with_tooltalk" != "no" ; then
       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
       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:6062: checking for ${dir}tt_c.h" >&5
+echo "configure:6063: checking for ${dir}tt_c.h" >&5

 
 cat > conftest.$ac_ext <<EOF
 
 cat > conftest.$ac_ext <<EOF

-#line 6065 "configure"
+#line 6066 "configure"

 #include "confdefs.h"
 #include <${dir}tt_c.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
 #include "confdefs.h"
 #include <${dir}tt_c.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"

-{ (eval echo configure:6070: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:6071: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }

 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*

@@ -6102,12 +6103,12 @@ if test "$with_tooltalk" != "no" ; then
 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
 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:6106: checking "$xe_msg_checking"" >&5
+echo "configure:6107: 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
 ac_lib_var=`echo tt'_'tt_message_create | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -ltt $extra_libs"
 cat > conftest.$ac_ext <<EOF

-#line 6111 "configure"
+#line 6112 "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
 #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

@@ -6118,7 +6119,7 @@ int main() {
 tt_message_create()
 ; return 0; }
 EOF
 tt_message_create()
 ; return 0; }
 EOF

-if { (eval echo configure:6122: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:6123: \"$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
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else

@@ -6175,15 +6176,15 @@ fi
 
 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
 
 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:6179: checking for Dt/Dt.h" >&5
+echo "configure:6180: checking for Dt/Dt.h" >&5

 
 cat > conftest.$ac_ext <<EOF
 
 cat > conftest.$ac_ext <<EOF

-#line 6182 "configure"
+#line 6183 "configure"

 #include "confdefs.h"
 #include <Dt/Dt.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
 #include "confdefs.h"
 #include <Dt/Dt.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"

-{ (eval echo configure:6187: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:6188: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }

 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*

@@ -6206,12 +6207,12 @@ fi
  }
 test -z "$with_cde" && { 
 echo $ac_n "checking for DtDndDragStart in -lDtSvc""... $ac_c" 1>&6
  }
 test -z "$with_cde" && { 
 echo $ac_n "checking for DtDndDragStart in -lDtSvc""... $ac_c" 1>&6

-echo "configure:6210: checking for DtDndDragStart in -lDtSvc" >&5
+echo "configure:6211: checking for DtDndDragStart in -lDtSvc" >&5

 ac_lib_var=`echo DtSvc'_'DtDndDragStart | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lDtSvc "
 cat > conftest.$ac_ext <<EOF
 ac_lib_var=`echo DtSvc'_'DtDndDragStart | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lDtSvc "
 cat > conftest.$ac_ext <<EOF

-#line 6215 "configure"
+#line 6216 "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
 #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

@@ -6222,7 +6223,7 @@ int main() {
 DtDndDragStart()
 ; return 0; }
 EOF
 DtDndDragStart()
 ; return 0; }
 EOF

-if { (eval echo configure:6226: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:6227: \"$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
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else

@@ -6291,7 +6292,7 @@ EOF
 fi
 
 echo $ac_n "checking if drag and drop API is needed""... $ac_c" 1>&6
 fi
 
 echo $ac_n "checking if drag and drop API is needed""... $ac_c" 1>&6

-echo "configure:6295: checking if drag and drop API is needed" >&5
+echo "configure:6296: checking if drag and drop API is needed" >&5

 if test "$with_dragndrop" != "no" ; then
   if test -n "$dragndrop_proto" ; then
     with_dragndrop=yes
 if test "$with_dragndrop" != "no" ; then
   if test -n "$dragndrop_proto" ; then
     with_dragndrop=yes

@@ -6312,18 +6313,18 @@ EOF
 fi
 
 echo "checking for LDAP" 1>&6
 fi
 
 echo "checking for LDAP" 1>&6

-echo "configure:6316: checking for LDAP" >&5
+echo "configure:6317: checking for LDAP" >&5

 test -z "$with_ldap" && { ac_safe=`echo "ldap.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for ldap.h""... $ac_c" 1>&6
 test -z "$with_ldap" && { ac_safe=`echo "ldap.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for ldap.h""... $ac_c" 1>&6

-echo "configure:6319: checking for ldap.h" >&5
+echo "configure:6320: checking for ldap.h" >&5

 
 cat > conftest.$ac_ext <<EOF
 
 cat > conftest.$ac_ext <<EOF

-#line 6322 "configure"
+#line 6323 "configure"

 #include "confdefs.h"
 #include <ldap.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
 #include "confdefs.h"
 #include <ldap.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"

-{ (eval echo configure:6327: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:6328: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }

 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*

@@ -6346,15 +6347,15 @@ fi
  }
 test -z "$with_ldap" && { ac_safe=`echo "lber.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for lber.h""... $ac_c" 1>&6
  }
 test -z "$with_ldap" && { ac_safe=`echo "lber.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for lber.h""... $ac_c" 1>&6

-echo "configure:6350: checking for lber.h" >&5
+echo "configure:6351: checking for lber.h" >&5

 
 cat > conftest.$ac_ext <<EOF
 
 cat > conftest.$ac_ext <<EOF

-#line 6353 "configure"
+#line 6354 "configure"

 #include "confdefs.h"
 #include <lber.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
 #include "confdefs.h"
 #include <lber.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"

-{ (eval echo configure:6358: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:6359: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }

 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*

@@ -6380,12 +6381,12 @@ if test "$with_ldap" != "no"; then
 xe_msg_checking="for ldap_open in -lldap"
 test -n "-llber" && xe_msg_checking="$xe_msg_checking using extra libs -llber"
 echo $ac_n "checking "$xe_msg_checking"""... $ac_c" 1>&6
 xe_msg_checking="for ldap_open in -lldap"
 test -n "-llber" && xe_msg_checking="$xe_msg_checking using extra libs -llber"
 echo $ac_n "checking "$xe_msg_checking"""... $ac_c" 1>&6

-echo "configure:6384: checking "$xe_msg_checking"" >&5
+echo "configure:6385: checking "$xe_msg_checking"" >&5

 ac_lib_var=`echo ldap'_'ldap_open | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lldap -llber"
 cat > conftest.$ac_ext <<EOF
 ac_lib_var=`echo ldap'_'ldap_open | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lldap -llber"
 cat > conftest.$ac_ext <<EOF

-#line 6389 "configure"
+#line 6390 "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
 #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

@@ -6396,7 +6397,7 @@ int main() {
 ldap_open()
 ; return 0; }
 EOF
 ldap_open()
 ; return 0; }
 EOF

-if { (eval echo configure:6400: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:6401: \"$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
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else

@@ -6419,12 +6420,12 @@ fi
  }
   test "$with_umich_ldap" = "no" && { 
 echo $ac_n "checking for ldap_set_option in -lldap10""... $ac_c" 1>&6
  }
   test "$with_umich_ldap" = "no" && { 
 echo $ac_n "checking for ldap_set_option in -lldap10""... $ac_c" 1>&6

-echo "configure:6423: checking for ldap_set_option in -lldap10" >&5
+echo "configure:6424: checking for ldap_set_option in -lldap10" >&5

 ac_lib_var=`echo ldap10'_'ldap_set_option | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lldap10 "
 cat > conftest.$ac_ext <<EOF
 ac_lib_var=`echo ldap10'_'ldap_set_option | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lldap10 "
 cat > conftest.$ac_ext <<EOF

-#line 6428 "configure"
+#line 6429 "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
 #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

@@ -6435,7 +6436,7 @@ int main() {
 ldap_set_option()
 ; return 0; }
 EOF
 ldap_set_option()
 ; return 0; }
 EOF

-if { (eval echo configure:6439: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:6440: \"$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
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else

@@ -6499,15 +6500,15 @@ fi
 
 if test "$window_system" != "none"; then
   echo "checking for graphics libraries" 1>&6
 
 if test "$window_system" != "none"; then
   echo "checking for graphics libraries" 1>&6

-echo "configure:6503: checking for graphics libraries" >&5
+echo "configure:6504: checking for graphics libraries" >&5

 
     xpm_problem=""
   if test -z "$with_xpm"; then
     echo $ac_n "checking for Xpm - no older than 3.4f""... $ac_c" 1>&6
 
     xpm_problem=""
   if test -z "$with_xpm"; then
     echo $ac_n "checking for Xpm - no older than 3.4f""... $ac_c" 1>&6

-echo "configure:6508: checking for Xpm - no older than 3.4f" >&5
+echo "configure:6509: checking for Xpm - no older than 3.4f" >&5

     xe_check_libs=-lXpm
     cat > conftest.$ac_ext <<EOF
     xe_check_libs=-lXpm
     cat > conftest.$ac_ext <<EOF

-#line 6511 "configure"
+#line 6512 "configure"

 #include "confdefs.h"
 #include <X11/xpm.h>
     int main(int c, char **v) {
 #include "confdefs.h"
 #include <X11/xpm.h>
     int main(int c, char **v) {

@@ -6515,7 +6516,7 @@ echo "configure:6508: checking for Xpm - no older than 3.4f" >&5
       XpmIncludeVersion != XpmLibraryVersion() ? 1 :
       XpmIncludeVersion < 30406 ? 2 : 0 ;}
 EOF
       XpmIncludeVersion != XpmLibraryVersion() ? 1 :
       XpmIncludeVersion < 30406 ? 2 : 0 ;}
 EOF

-if { (eval echo configure:6519: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:6520: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5

 then
   ./conftest dummy_arg; xpm_status=$?;
       if test "$xpm_status" = "0"; then
 then
   ./conftest dummy_arg; xpm_status=$?;
       if test "$xpm_status" = "0"; then

@@ -6557,17 +6558,17 @@ EOF
 
     libs_x="-lXpm $libs_x" &&  if test "$extra_verbose" = "yes"; then echo "    Prepending \"-lXpm\" to \$libs_x"; fi
     echo $ac_n "checking for \"FOR_MSW\" xpm""... $ac_c" 1>&6
 
     libs_x="-lXpm $libs_x" &&  if test "$extra_verbose" = "yes"; then echo "    Prepending \"-lXpm\" to \$libs_x"; fi
     echo $ac_n "checking for \"FOR_MSW\" xpm""... $ac_c" 1>&6

-echo "configure:6561: checking for \"FOR_MSW\" xpm" >&5
+echo "configure:6562: checking for \"FOR_MSW\" xpm" >&5

     xe_check_libs=-lXpm
     cat > conftest.$ac_ext <<EOF
     xe_check_libs=-lXpm
     cat > conftest.$ac_ext <<EOF

-#line 6564 "configure"
+#line 6565 "configure"

 #include "confdefs.h"
 
 int main() {
 XpmCreatePixmapFromData()
 ; return 0; }
 EOF
 #include "confdefs.h"
 
 int main() {
 XpmCreatePixmapFromData()
 ; return 0; }
 EOF

-if { (eval echo configure:6571: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:6572: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then

   rm -rf conftest*
   xpm_for_msw=no
 else
   rm -rf conftest*
   xpm_for_msw=no
 else

@@ -6609,12 +6610,12 @@ EOF
       if test "$with_png $with_tiff" != "no no"; then
     
 echo $ac_n "checking for inflate in -lc""... $ac_c" 1>&6
       if test "$with_png $with_tiff" != "no no"; then
     
 echo $ac_n "checking for inflate in -lc""... $ac_c" 1>&6

-echo "configure:6613: checking for inflate in -lc" >&5
+echo "configure:6614: checking for inflate in -lc" >&5

 ac_lib_var=`echo c'_'inflate | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lc "
 cat > conftest.$ac_ext <<EOF
 ac_lib_var=`echo c'_'inflate | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lc "
 cat > conftest.$ac_ext <<EOF

-#line 6618 "configure"
+#line 6619 "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
 #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

@@ -6625,7 +6626,7 @@ int main() {
 inflate()
 ; return 0; }
 EOF
 inflate()
 ; return 0; }
 EOF

-if { (eval echo configure:6629: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:6630: \"$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
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else

@@ -6644,12 +6645,12 @@ else
   echo "$ac_t""no" 1>&6
 
 echo $ac_n "checking for inflate in -lz""... $ac_c" 1>&6
   echo "$ac_t""no" 1>&6
 
 echo $ac_n "checking for inflate in -lz""... $ac_c" 1>&6

-echo "configure:6648: checking for inflate in -lz" >&5
+echo "configure:6649: checking for inflate in -lz" >&5

 ac_lib_var=`echo z'_'inflate | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lz "
 cat > conftest.$ac_ext <<EOF
 ac_lib_var=`echo z'_'inflate | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lz "
 cat > conftest.$ac_ext <<EOF

-#line 6653 "configure"
+#line 6654 "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
 #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

@@ -6660,7 +6661,7 @@ int main() {
 inflate()
 ; return 0; }
 EOF
 inflate()
 ; return 0; }
 EOF

-if { (eval echo configure:6664: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:6665: \"$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
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else

@@ -6679,12 +6680,12 @@ else
   echo "$ac_t""no" 1>&6
 
 echo $ac_n "checking for inflate in -lgz""... $ac_c" 1>&6
   echo "$ac_t""no" 1>&6
 
 echo $ac_n "checking for inflate in -lgz""... $ac_c" 1>&6

-echo "configure:6683: checking for inflate in -lgz" >&5
+echo "configure:6684: checking for inflate in -lgz" >&5

 ac_lib_var=`echo gz'_'inflate | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lgz "
 cat > conftest.$ac_ext <<EOF
 ac_lib_var=`echo gz'_'inflate | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lgz "
 cat > conftest.$ac_ext <<EOF

-#line 6688 "configure"
+#line 6689 "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
 #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

@@ -6695,7 +6696,7 @@ int main() {
 inflate()
 ; return 0; }
 EOF
 inflate()
 ; return 0; }
 EOF

-if { (eval echo configure:6699: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:6700: \"$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
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else

@@ -6725,15 +6726,15 @@ fi
 
     test -z "$with_jpeg" && { ac_safe=`echo "jpeglib.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for jpeglib.h""... $ac_c" 1>&6
 
     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:6729: checking for jpeglib.h" >&5
+echo "configure:6730: checking for jpeglib.h" >&5

 
 cat > conftest.$ac_ext <<EOF
 
 cat > conftest.$ac_ext <<EOF

-#line 6732 "configure"
+#line 6733 "configure"

 #include "confdefs.h"
 #include <jpeglib.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
 #include "confdefs.h"
 #include <jpeglib.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"

-{ (eval echo configure:6737: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:6738: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }

 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*

@@ -6756,12 +6757,12 @@ fi
  }
   test -z "$with_jpeg" && { 
 echo $ac_n "checking for jpeg_destroy_decompress in -ljpeg""... $ac_c" 1>&6
  }
   test -z "$with_jpeg" && { 
 echo $ac_n "checking for jpeg_destroy_decompress in -ljpeg""... $ac_c" 1>&6

-echo "configure:6760: checking for jpeg_destroy_decompress in -ljpeg" >&5
+echo "configure:6761: 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
 ac_lib_var=`echo jpeg'_'jpeg_destroy_decompress | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -ljpeg "
 cat > conftest.$ac_ext <<EOF

-#line 6765 "configure"
+#line 6766 "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
 #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

@@ -6772,7 +6773,7 @@ int main() {
 jpeg_destroy_decompress()
 ; return 0; }
 EOF
 jpeg_destroy_decompress()
 ; return 0; }
 EOF

-if { (eval echo configure:6776: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:6777: \"$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
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else

@@ -6808,10 +6809,10 @@ EOF
 
     png_problem=""
   test -z "$with_png" && { echo $ac_n "checking for pow""... $ac_c" 1>&6
 
     png_problem=""
   test -z "$with_png" && { echo $ac_n "checking for pow""... $ac_c" 1>&6

-echo "configure:6812: checking for pow" >&5
+echo "configure:6813: checking for pow" >&5

 
 cat > conftest.$ac_ext <<EOF
 
 cat > conftest.$ac_ext <<EOF

-#line 6815 "configure"
+#line 6816 "configure"

 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char pow(); below.  */
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char pow(); below.  */

@@ -6834,7 +6835,7 @@ pow();
 
 ; return 0; }
 EOF
 
 ; return 0; }
 EOF

-if { (eval echo configure:6838: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:6839: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then

   rm -rf conftest*
   eval "ac_cv_func_pow=yes"
 else
   rm -rf conftest*
   eval "ac_cv_func_pow=yes"
 else

@@ -6855,15 +6856,15 @@ fi
  }
   test -z "$with_png" && { ac_safe=`echo "png.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for png.h""... $ac_c" 1>&6
  }
   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:6859: checking for png.h" >&5
+echo "configure:6860: checking for png.h" >&5

 
 cat > conftest.$ac_ext <<EOF
 
 cat > conftest.$ac_ext <<EOF

-#line 6862 "configure"
+#line 6863 "configure"

 #include "confdefs.h"
 #include <png.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
 #include "confdefs.h"
 #include <png.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"

-{ (eval echo configure:6867: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:6868: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }

 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*

@@ -6886,12 +6887,12 @@ fi
  }
   test -z "$with_png" && { 
 echo $ac_n "checking for png_read_image in -lpng""... $ac_c" 1>&6
  }
   test -z "$with_png" && { 
 echo $ac_n "checking for png_read_image in -lpng""... $ac_c" 1>&6

-echo "configure:6890: checking for png_read_image in -lpng" >&5
+echo "configure:6891: checking for png_read_image in -lpng" >&5

 ac_lib_var=`echo png'_'png_read_image | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lpng "
 cat > conftest.$ac_ext <<EOF
 ac_lib_var=`echo png'_'png_read_image | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lpng "
 cat > conftest.$ac_ext <<EOF

-#line 6895 "configure"
+#line 6896 "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
 #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

@@ -6902,7 +6903,7 @@ int main() {
 png_read_image()
 ; return 0; }
 EOF
 png_read_image()
 ; return 0; }
 EOF

-if { (eval echo configure:6906: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:6907: \"$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
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else

@@ -6925,10 +6926,10 @@ fi
  }
   if test -z "$with_png"; then
     echo $ac_n "checking for workable png version information""... $ac_c" 1>&6
  }
   if test -z "$with_png"; then
     echo $ac_n "checking for workable png version information""... $ac_c" 1>&6

-echo "configure:6929: checking for workable png version information" >&5
+echo "configure:6930: checking for workable png version information" >&5

     xe_check_libs="-lpng -lz"
     cat > conftest.$ac_ext <<EOF
     xe_check_libs="-lpng -lz"
     cat > conftest.$ac_ext <<EOF

-#line 6932 "configure"
+#line 6933 "configure"

 #include "confdefs.h"
 #include <png.h>
     int main(int c, char **v) {
 #include "confdefs.h"
 #include <png.h>
     int main(int c, char **v) {

@@ -6936,7 +6937,7 @@ echo "configure:6929: checking for workable png version information" >&5
     if (strcmp(png_libpng_ver, PNG_LIBPNG_VER_STRING) != 0) return 1;
     return (PNG_LIBPNG_VER < 10002) ? 2 : 0 ;}
 EOF
     if (strcmp(png_libpng_ver, PNG_LIBPNG_VER_STRING) != 0) return 1;
     return (PNG_LIBPNG_VER < 10002) ? 2 : 0 ;}
 EOF

-if { (eval echo configure:6940: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:6941: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5

 then
   ./conftest dummy_arg; png_status=$?;
       if test "$png_status" = "0"; then
 then
   ./conftest dummy_arg; png_status=$?;
       if test "$png_status" = "0"; then

@@ -6979,15 +6980,15 @@ EOF
 
     test -z "$with_tiff" && { ac_safe=`echo "tiffio.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for tiffio.h""... $ac_c" 1>&6
 
     test -z "$with_tiff" && { ac_safe=`echo "tiffio.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for tiffio.h""... $ac_c" 1>&6

-echo "configure:6983: checking for tiffio.h" >&5
+echo "configure:6984: checking for tiffio.h" >&5

 
 cat > conftest.$ac_ext <<EOF
 
 cat > conftest.$ac_ext <<EOF

-#line 6986 "configure"
+#line 6987 "configure"

 #include "confdefs.h"
 #include <tiffio.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
 #include "confdefs.h"
 #include <tiffio.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"

-{ (eval echo configure:6991: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:6992: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }

 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*

@@ -7010,12 +7011,12 @@ fi
  }
   test -z "$with_tiff" && { 
 echo $ac_n "checking for TIFFClientOpen in -ltiff""... $ac_c" 1>&6
  }
   test -z "$with_tiff" && { 
 echo $ac_n "checking for TIFFClientOpen in -ltiff""... $ac_c" 1>&6

-echo "configure:7014: checking for TIFFClientOpen in -ltiff" >&5
+echo "configure:7015: checking for TIFFClientOpen in -ltiff" >&5

 ac_lib_var=`echo tiff'_'TIFFClientOpen | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -ltiff "
 cat > conftest.$ac_ext <<EOF
 ac_lib_var=`echo tiff'_'TIFFClientOpen | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -ltiff "
 cat > conftest.$ac_ext <<EOF

-#line 7019 "configure"
+#line 7020 "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
 #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

@@ -7026,7 +7027,7 @@ int main() {
 TIFFClientOpen()
 ; return 0; }
 EOF
 TIFFClientOpen()
 ; return 0; }
 EOF

-if { (eval echo configure:7030: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:7031: \"$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
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else

@@ -7065,19 +7066,19 @@ fi
 if test "$with_x11" = "yes"; then
 
   echo "checking for X11 graphics libraries" 1>&6
 if test "$with_x11" = "yes"; then
 
   echo "checking for X11 graphics libraries" 1>&6

-echo "configure:7069: checking for X11 graphics libraries" >&5
+echo "configure:7070: checking for X11 graphics libraries" >&5

 
     test -z "$with_xface" && { ac_safe=`echo "compface.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for compface.h""... $ac_c" 1>&6
 
     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:7073: checking for compface.h" >&5
+echo "configure:7074: checking for compface.h" >&5

 
 cat > conftest.$ac_ext <<EOF
 
 cat > conftest.$ac_ext <<EOF

-#line 7076 "configure"
+#line 7077 "configure"

 #include "confdefs.h"
 #include <compface.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
 #include "confdefs.h"
 #include <compface.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"

-{ (eval echo configure:7081: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7082: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }

 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*

@@ -7100,12 +7101,12 @@ fi
  }
   test -z "$with_xface" && { 
 echo $ac_n "checking for UnGenFace in -lcompface""... $ac_c" 1>&6
  }
   test -z "$with_xface" && { 
 echo $ac_n "checking for UnGenFace in -lcompface""... $ac_c" 1>&6

-echo "configure:7104: checking for UnGenFace in -lcompface" >&5
+echo "configure:7105: checking for UnGenFace in -lcompface" >&5

 ac_lib_var=`echo compface'_'UnGenFace | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lcompface "
 cat > conftest.$ac_ext <<EOF
 ac_lib_var=`echo compface'_'UnGenFace | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lcompface "
 cat > conftest.$ac_ext <<EOF

-#line 7109 "configure"
+#line 7110 "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
 #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

@@ -7116,7 +7117,7 @@ int main() {
 UnGenFace()
 ; return 0; }
 EOF
 UnGenFace()
 ; return 0; }
 EOF

-if { (eval echo configure:7120: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:7121: \"$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
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else

@@ -7152,12 +7153,12 @@ EOF
 
     
 echo $ac_n "checking for XawScrollbarSetThumb in -lXaw""... $ac_c" 1>&6
 
     
 echo $ac_n "checking for XawScrollbarSetThumb in -lXaw""... $ac_c" 1>&6

-echo "configure:7156: checking for XawScrollbarSetThumb in -lXaw" >&5
+echo "configure:7157: checking for XawScrollbarSetThumb in -lXaw" >&5

 ac_lib_var=`echo Xaw'_'XawScrollbarSetThumb | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lXaw "
 cat > conftest.$ac_ext <<EOF
 ac_lib_var=`echo Xaw'_'XawScrollbarSetThumb | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lXaw "
 cat > conftest.$ac_ext <<EOF

-#line 7161 "configure"
+#line 7162 "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
 #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

@@ -7168,7 +7169,7 @@ int main() {
 XawScrollbarSetThumb()
 ; return 0; }
 EOF
 XawScrollbarSetThumb()
 ; return 0; }
 EOF

-if { (eval echo configure:7172: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:7173: \"$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
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else

@@ -7192,15 +7193,15 @@ fi
                     
     ac_safe=`echo "Xm/Xm.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for Xm/Xm.h""... $ac_c" 1>&6
                     
     ac_safe=`echo "Xm/Xm.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for Xm/Xm.h""... $ac_c" 1>&6

-echo "configure:7196: checking for Xm/Xm.h" >&5
+echo "configure:7197: checking for Xm/Xm.h" >&5

 
 cat > conftest.$ac_ext <<EOF
 
 cat > conftest.$ac_ext <<EOF

-#line 7199 "configure"
+#line 7200 "configure"

 #include "confdefs.h"
 #include <Xm/Xm.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
 #include "confdefs.h"
 #include <Xm/Xm.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"

-{ (eval echo configure:7204: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7205: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }

 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*

@@ -7217,12 +7218,12 @@ if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
   echo "$ac_t""yes" 1>&6
   
 echo $ac_n "checking for XmStringFree in -lXm""... $ac_c" 1>&6
   echo "$ac_t""yes" 1>&6
   
 echo $ac_n "checking for XmStringFree in -lXm""... $ac_c" 1>&6

-echo "configure:7221: checking for XmStringFree in -lXm" >&5
+echo "configure:7222: checking for XmStringFree in -lXm" >&5

 ac_lib_var=`echo Xm'_'XmStringFree | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lXm "
 cat > conftest.$ac_ext <<EOF
 ac_lib_var=`echo Xm'_'XmStringFree | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lXm "
 cat > conftest.$ac_ext <<EOF

-#line 7226 "configure"
+#line 7227 "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
 #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

@@ -7233,7 +7234,7 @@ int main() {
 XmStringFree()
 ; return 0; }
 EOF
 XmStringFree()
 ; return 0; }
 EOF

-if { (eval echo configure:7237: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:7238: \"$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
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else

@@ -7262,9 +7263,9 @@ fi
 
   if test "$have_motif" = "yes"; then
         echo $ac_n "checking for Lesstif""... $ac_c" 1>&6
 
   if test "$have_motif" = "yes"; then
         echo $ac_n "checking for Lesstif""... $ac_c" 1>&6

-echo "configure:7266: checking for Lesstif" >&5
+echo "configure:7267: checking for Lesstif" >&5

     cat > conftest.$ac_ext <<EOF
     cat > conftest.$ac_ext <<EOF

-#line 7268 "configure"
+#line 7269 "configure"

 #include "confdefs.h"
 #include <Xm/Xm.h>
 #ifdef LESSTIF_VERSION
 #include "confdefs.h"
 #include <Xm/Xm.h>
 #ifdef LESSTIF_VERSION

@@ -7548,7 +7549,7 @@ fi
 
 if test "$with_mule" = "yes" ; then
   echo "checking for Mule-related features" 1>&6
 
 if test "$with_mule" = "yes" ; then
   echo "checking for Mule-related features" 1>&6

-echo "configure:7552: checking for Mule-related features" >&5
+echo "configure:7553: checking for Mule-related features" >&5

   { test "$extra_verbose" = "yes" && cat << \EOF
     Defining MULE
 EOF
   { test "$extra_verbose" = "yes" && cat << \EOF
     Defining MULE
 EOF

@@ -7573,15 +7574,15 @@ EOF
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6

-echo "configure:7577: checking for $ac_hdr" >&5
+echo "configure:7578: checking for $ac_hdr" >&5

 
 cat > conftest.$ac_ext <<EOF
 
 cat > conftest.$ac_ext <<EOF

-#line 7580 "configure"
+#line 7581 "configure"

 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"

-{ (eval echo configure:7585: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7586: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }

 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*

@@ -7612,12 +7613,12 @@ done
 
   
 echo $ac_n "checking for strerror in -lintl""... $ac_c" 1>&6
 
   
 echo $ac_n "checking for strerror in -lintl""... $ac_c" 1>&6

-echo "configure:7616: checking for strerror in -lintl" >&5
+echo "configure:7617: checking for strerror in -lintl" >&5

 ac_lib_var=`echo intl'_'strerror | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lintl "
 cat > conftest.$ac_ext <<EOF
 ac_lib_var=`echo intl'_'strerror | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lintl "
 cat > conftest.$ac_ext <<EOF

-#line 7621 "configure"
+#line 7622 "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
 #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

@@ -7628,7 +7629,7 @@ int main() {
 strerror()
 ; return 0; }
 EOF
 strerror()
 ; return 0; }
 EOF

-if { (eval echo configure:7632: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:7633: \"$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
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else

@@ -7661,19 +7662,19 @@ fi
 
 
   echo "checking for Mule input methods" 1>&6
 
 
   echo "checking for Mule input methods" 1>&6

-echo "configure:7665: checking for Mule input methods" >&5
+echo "configure:7666: checking for Mule input methods" >&5

         case "$with_xim" in "" | "yes" )
     echo "checking for XIM" 1>&6
         case "$with_xim" in "" | "yes" )
     echo "checking for XIM" 1>&6

-echo "configure:7668: checking for XIM" >&5
+echo "configure:7669: checking for XIM" >&5

         if test "$have_lesstif" = "yes"; then with_xim=xlib
     else 
 echo $ac_n "checking for XmImMbLookupString in -lXm""... $ac_c" 1>&6
         if test "$have_lesstif" = "yes"; then with_xim=xlib
     else 
 echo $ac_n "checking for XmImMbLookupString in -lXm""... $ac_c" 1>&6

-echo "configure:7672: checking for XmImMbLookupString in -lXm" >&5
+echo "configure:7673: checking for XmImMbLookupString in -lXm" >&5

 ac_lib_var=`echo Xm'_'XmImMbLookupString | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lXm "
 cat > conftest.$ac_ext <<EOF
 ac_lib_var=`echo Xm'_'XmImMbLookupString | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lXm "
 cat > conftest.$ac_ext <<EOF

-#line 7677 "configure"
+#line 7678 "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
 #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

@@ -7684,7 +7685,7 @@ int main() {
 XmImMbLookupString()
 ; return 0; }
 EOF
 XmImMbLookupString()
 ; return 0; }
 EOF

-if { (eval echo configure:7688: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:7689: \"$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
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else

@@ -7750,15 +7751,15 @@ EOF
 
     if test "$with_xfs" = "yes" ; then
     echo "checking for XFontSet" 1>&6
 
     if test "$with_xfs" = "yes" ; then
     echo "checking for XFontSet" 1>&6

-echo "configure:7754: checking for XFontSet" >&5
+echo "configure:7755: checking for XFontSet" >&5

     
 echo $ac_n "checking for XmbDrawString in -lX11""... $ac_c" 1>&6
     
 echo $ac_n "checking for XmbDrawString in -lX11""... $ac_c" 1>&6

-echo "configure:7757: checking for XmbDrawString in -lX11" >&5
+echo "configure:7758: checking for XmbDrawString in -lX11" >&5

 ac_lib_var=`echo X11'_'XmbDrawString | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lX11 "
 cat > conftest.$ac_ext <<EOF
 ac_lib_var=`echo X11'_'XmbDrawString | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lX11 "
 cat > conftest.$ac_ext <<EOF

-#line 7762 "configure"
+#line 7763 "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
 #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

@@ -7769,7 +7770,7 @@ int main() {
 XmbDrawString()
 ; return 0; }
 EOF
 XmbDrawString()
 ; return 0; }
 EOF

-if { (eval echo configure:7773: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:7774: \"$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
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else

@@ -7809,15 +7810,15 @@ EOF
     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
     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:7813: checking for wnn/jllib.h" >&5
+echo "configure:7814: checking for wnn/jllib.h" >&5

 
 cat > conftest.$ac_ext <<EOF
 
 cat > conftest.$ac_ext <<EOF

-#line 7816 "configure"
+#line 7817 "configure"

 #include "confdefs.h"
 #include <wnn/jllib.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
 #include "confdefs.h"
 #include <wnn/jllib.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"

-{ (eval echo configure:7821: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7822: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }

 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*

@@ -7842,10 +7843,10 @@ fi
     for ac_func in crypt
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
     for ac_func in crypt
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6

-echo "configure:7846: checking for $ac_func" >&5
+echo "configure:7847: checking for $ac_func" >&5

 
 cat > conftest.$ac_ext <<EOF
 
 cat > conftest.$ac_ext <<EOF

-#line 7849 "configure"
+#line 7850 "configure"

 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */

@@ -7868,7 +7869,7 @@ $ac_func();
 
 ; return 0; }
 EOF
 
 ; return 0; }
 EOF

-if { (eval echo configure:7872: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:7873: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then

   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else

@@ -7897,12 +7898,12 @@ done
 
     test "$ac_cv_func_crypt" != "yes" && { 
 echo $ac_n "checking for crypt in -lcrypt""... $ac_c" 1>&6
 
     test "$ac_cv_func_crypt" != "yes" && { 
 echo $ac_n "checking for crypt in -lcrypt""... $ac_c" 1>&6

-echo "configure:7901: checking for crypt in -lcrypt" >&5
+echo "configure:7902: checking for crypt in -lcrypt" >&5

 ac_lib_var=`echo crypt'_'crypt | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lcrypt "
 cat > conftest.$ac_ext <<EOF
 ac_lib_var=`echo crypt'_'crypt | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lcrypt "
 cat > conftest.$ac_ext <<EOF

-#line 7906 "configure"
+#line 7907 "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
 #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

@@ -7913,7 +7914,7 @@ int main() {
 crypt()
 ; return 0; }
 EOF
 crypt()
 ; return 0; }
 EOF

-if { (eval echo configure:7917: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:7918: \"$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
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else

@@ -7947,12 +7948,12 @@ fi
   fi
     test -z "$with_wnn" && { 
 echo $ac_n "checking for jl_dic_list_e in -lwnn""... $ac_c" 1>&6
   fi
     test -z "$with_wnn" && { 
 echo $ac_n "checking for jl_dic_list_e in -lwnn""... $ac_c" 1>&6

-echo "configure:7951: checking for jl_dic_list_e in -lwnn" >&5
+echo "configure:7952: 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
 ac_lib_var=`echo wnn'_'jl_dic_list_e | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lwnn "
 cat > conftest.$ac_ext <<EOF

-#line 7956 "configure"
+#line 7957 "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
 #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

@@ -7963,7 +7964,7 @@ int main() {
 jl_dic_list_e()
 ; return 0; }
 EOF
 jl_dic_list_e()
 ; return 0; }
 EOF

-if { (eval echo configure:7967: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:7968: \"$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
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else

@@ -8001,12 +8002,12 @@ EOF
     if test "$with_wnn6" != "no"; then
       
 echo $ac_n "checking for jl_fi_dic_list in -lwnn""... $ac_c" 1>&6
     if test "$with_wnn6" != "no"; then
       
 echo $ac_n "checking for jl_fi_dic_list in -lwnn""... $ac_c" 1>&6

-echo "configure:8005: checking for jl_fi_dic_list in -lwnn" >&5
+echo "configure:8006: 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
 ac_lib_var=`echo wnn'_'jl_fi_dic_list | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lwnn "
 cat > conftest.$ac_ext <<EOF

-#line 8010 "configure"
+#line 8011 "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
 #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

@@ -8017,7 +8018,7 @@ int main() {
 jl_fi_dic_list()
 ; return 0; }
 EOF
 jl_fi_dic_list()
 ; return 0; }
 EOF

-if { (eval echo configure:8021: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:8022: \"$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
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else

@@ -8052,15 +8053,15 @@ EOF
   if test "$with_canna" != "no"; then
     ac_safe=`echo "canna/jrkanji.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for canna/jrkanji.h""... $ac_c" 1>&6
   if test "$with_canna" != "no"; then
     ac_safe=`echo "canna/jrkanji.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for canna/jrkanji.h""... $ac_c" 1>&6

-echo "configure:8056: checking for canna/jrkanji.h" >&5
+echo "configure:8057: checking for canna/jrkanji.h" >&5

 
 cat > conftest.$ac_ext <<EOF
 
 cat > conftest.$ac_ext <<EOF

-#line 8059 "configure"
+#line 8060 "configure"

 #include "confdefs.h"
 #include <canna/jrkanji.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
 #include "confdefs.h"
 #include <canna/jrkanji.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"

-{ (eval echo configure:8064: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8065: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }

 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*

@@ -8087,15 +8088,15 @@ fi
     c_switch_site="$c_switch_site -I/usr/local/canna/include"
     ac_safe=`echo "canna/jrkanji.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for canna/jrkanji.h""... $ac_c" 1>&6
     c_switch_site="$c_switch_site -I/usr/local/canna/include"
     ac_safe=`echo "canna/jrkanji.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for canna/jrkanji.h""... $ac_c" 1>&6

-echo "configure:8091: checking for canna/jrkanji.h" >&5
+echo "configure:8092: checking for canna/jrkanji.h" >&5

 
 cat > conftest.$ac_ext <<EOF
 
 cat > conftest.$ac_ext <<EOF

-#line 8094 "configure"
+#line 8095 "configure"

 #include "confdefs.h"
 #include <canna/jrkanji.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
 #include "confdefs.h"
 #include <canna/jrkanji.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"

-{ (eval echo configure:8099: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8100: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }

 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*

@@ -8123,15 +8124,15 @@ fi
 
   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
 
   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:8127: checking for canna/RK.h" >&5
+echo "configure:8128: checking for canna/RK.h" >&5

 
 cat > conftest.$ac_ext <<EOF
 
 cat > conftest.$ac_ext <<EOF

-#line 8130 "configure"
+#line 8131 "configure"

 #include "confdefs.h"
 #include <canna/RK.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
 #include "confdefs.h"
 #include <canna/RK.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"

-{ (eval echo configure:8135: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8136: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }

 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*

@@ -8154,12 +8155,12 @@ fi
  }
   test -z "$with_canna" && { 
 echo $ac_n "checking for RkBgnBun in -lRKC""... $ac_c" 1>&6
  }
   test -z "$with_canna" && { 
 echo $ac_n "checking for RkBgnBun in -lRKC""... $ac_c" 1>&6

-echo "configure:8158: checking for RkBgnBun in -lRKC" >&5
+echo "configure:8159: checking for RkBgnBun in -lRKC" >&5

 ac_lib_var=`echo RKC'_'RkBgnBun | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lRKC "
 cat > conftest.$ac_ext <<EOF
 ac_lib_var=`echo RKC'_'RkBgnBun | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lRKC "
 cat > conftest.$ac_ext <<EOF

-#line 8163 "configure"
+#line 8164 "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
 #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

@@ -8170,7 +8171,7 @@ int main() {
 RkBgnBun()
 ; return 0; }
 EOF
 RkBgnBun()
 ; return 0; }
 EOF

-if { (eval echo configure:8174: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:8175: \"$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
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else

@@ -8193,12 +8194,12 @@ fi
  }
   test -z "$with_canna" && { 
 echo $ac_n "checking for jrKanjiControl in -lcanna""... $ac_c" 1>&6
  }
   test -z "$with_canna" && { 
 echo $ac_n "checking for jrKanjiControl in -lcanna""... $ac_c" 1>&6

-echo "configure:8197: checking for jrKanjiControl in -lcanna" >&5
+echo "configure:8198: checking for jrKanjiControl in -lcanna" >&5

 ac_lib_var=`echo canna'_'jrKanjiControl | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lcanna "
 cat > conftest.$ac_ext <<EOF
 ac_lib_var=`echo canna'_'jrKanjiControl | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lcanna "
 cat > conftest.$ac_ext <<EOF

-#line 8202 "configure"
+#line 8203 "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
 #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

@@ -8209,7 +8210,7 @@ int main() {
 jrKanjiControl()
 ; return 0; }
 EOF
 jrKanjiControl()
 ; return 0; }
 EOF

-if { (eval echo configure:8213: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:8214: \"$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
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else

@@ -8258,12 +8259,12 @@ if test "$need_motif" = "yes" ; then
   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
   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:8262: checking for layout_object_getvalue in -li18n" >&5
+echo "configure:8263: 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
 ac_lib_var=`echo i18n'_'layout_object_getvalue | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -li18n "
 cat > conftest.$ac_ext <<EOF

-#line 8267 "configure"
+#line 8268 "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
 #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

@@ -8274,7 +8275,7 @@ int main() {
 layout_object_getvalue()
 ; return 0; }
 EOF
 layout_object_getvalue()
 ; return 0; }
 EOF

-if { (eval echo configure:8278: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:8279: \"$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
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else

@@ -8360,10 +8361,10 @@ fi
 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 snprintf strcasecmp strerror tzset ulimit usleep utimes waitpid vsnprintf
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
 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 snprintf strcasecmp strerror tzset ulimit usleep utimes waitpid vsnprintf
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6

-echo "configure:8364: checking for $ac_func" >&5
+echo "configure:8365: checking for $ac_func" >&5

 
 cat > conftest.$ac_ext <<EOF
 
 cat > conftest.$ac_ext <<EOF

-#line 8367 "configure"
+#line 8368 "configure"

 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */

@@ -8386,7 +8387,7 @@ $ac_func();
 
 ; return 0; }
 EOF
 
 ; return 0; }
 EOF

-if { (eval echo configure:8390: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:8391: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then

   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else

@@ -8423,10 +8424,10 @@ case "$opsys" in
     for ac_func in realpath
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
     for ac_func in realpath
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6

-echo "configure:8427: checking for $ac_func" >&5
+echo "configure:8428: checking for $ac_func" >&5

 
 cat > conftest.$ac_ext <<EOF
 
 cat > conftest.$ac_ext <<EOF

-#line 8430 "configure"
+#line 8431 "configure"

 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */

@@ -8449,7 +8450,7 @@ $ac_func();
 
 ; return 0; }
 EOF
 
 ; return 0; }
 EOF

-if { (eval echo configure:8453: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:8454: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then

   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else

@@ -8482,16 +8483,16 @@ done
 esac
 
 echo $ac_n "checking whether netdb declares h_errno""... $ac_c" 1>&6
 esac
 
 echo $ac_n "checking whether netdb declares h_errno""... $ac_c" 1>&6

-echo "configure:8486: checking whether netdb declares h_errno" >&5
+echo "configure:8487: checking whether netdb declares h_errno" >&5

 cat > conftest.$ac_ext <<EOF
 cat > conftest.$ac_ext <<EOF

-#line 8488 "configure"
+#line 8489 "configure"

 #include "confdefs.h"
 #include <netdb.h>
 int main() {
 return h_errno;
 ; return 0; }
 EOF
 #include "confdefs.h"
 #include <netdb.h>
 int main() {
 return h_errno;
 ; return 0; }
 EOF

-if { (eval echo configure:8495: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:8496: \"$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
   rm -rf conftest*
   echo "$ac_t""yes" 1>&6
    { test "$extra_verbose" = "yes" && cat << \EOF

@@ -8511,16 +8512,16 @@ fi
 rm -f conftest*
 
 echo $ac_n "checking for sigsetjmp""... $ac_c" 1>&6
 rm -f conftest*
 
 echo $ac_n "checking for sigsetjmp""... $ac_c" 1>&6

-echo "configure:8515: checking for sigsetjmp" >&5
+echo "configure:8516: checking for sigsetjmp" >&5

 cat > conftest.$ac_ext <<EOF
 cat > conftest.$ac_ext <<EOF

-#line 8517 "configure"
+#line 8518 "configure"

 #include "confdefs.h"
 #include <setjmp.h>
 int main() {
 sigjmp_buf bar; sigsetjmp (bar, 0);
 ; return 0; }
 EOF
 #include "confdefs.h"
 #include <setjmp.h>
 int main() {
 sigjmp_buf bar; sigsetjmp (bar, 0);
 ; return 0; }
 EOF

-if { (eval echo configure:8524: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:8525: \"$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
   rm -rf conftest*
   echo "$ac_t""yes" 1>&6
    { test "$extra_verbose" = "yes" && cat << \EOF

@@ -8540,11 +8541,11 @@ fi
 rm -f conftest*
 
 echo $ac_n "checking whether localtime caches TZ""... $ac_c" 1>&6
 rm -f conftest*
 
 echo $ac_n "checking whether localtime caches TZ""... $ac_c" 1>&6

-echo "configure:8544: checking whether localtime caches TZ" >&5
+echo "configure:8545: checking whether localtime caches TZ" >&5

 
 if test "$ac_cv_func_tzset" = "yes"; then
 cat > conftest.$ac_ext <<EOF
 
 if test "$ac_cv_func_tzset" = "yes"; then
 cat > conftest.$ac_ext <<EOF

-#line 8548 "configure"
+#line 8549 "configure"

 #include "confdefs.h"
 #include <time.h>
 #if STDC_HEADERS
 #include "confdefs.h"
 #include <time.h>
 #if STDC_HEADERS

@@ -8579,7 +8580,7 @@ main()
   exit (0);
 }
 EOF
   exit (0);
 }
 EOF

-if { (eval echo configure:8583: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:8584: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5

 then
   emacs_cv_localtime_cache=no
 else
 then
   emacs_cv_localtime_cache=no
 else

@@ -8609,9 +8610,9 @@ fi
 
 if test "$HAVE_TIMEVAL" = "yes"; then
 echo $ac_n "checking whether gettimeofday accepts one or two arguments""... $ac_c" 1>&6
 
 if test "$HAVE_TIMEVAL" = "yes"; then
 echo $ac_n "checking whether gettimeofday accepts one or two arguments""... $ac_c" 1>&6

-echo "configure:8613: checking whether gettimeofday accepts one or two arguments" >&5
+echo "configure:8614: checking whether gettimeofday accepts one or two arguments" >&5

 cat > conftest.$ac_ext <<EOF
 cat > conftest.$ac_ext <<EOF

-#line 8615 "configure"
+#line 8616 "configure"

 #include "confdefs.h"
 
 #ifdef TIME_WITH_SYS_TIME
 #include "confdefs.h"
 
 #ifdef TIME_WITH_SYS_TIME

@@ -8633,7 +8634,7 @@ int main() {
 
 ; return 0; }
 EOF
 
 ; return 0; }
 EOF

-if { (eval echo configure:8637: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:8638: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then

   rm -rf conftest*
   echo "$ac_t""two" 1>&6
 else
   rm -rf conftest*
   echo "$ac_t""two" 1>&6
 else

@@ -8655,19 +8656,19 @@ fi
 
 
 echo $ac_n "checking for inline""... $ac_c" 1>&6
 
 
 echo $ac_n "checking for inline""... $ac_c" 1>&6

-echo "configure:8659: checking for inline" >&5
+echo "configure:8660: checking for inline" >&5

 
 ac_cv_c_inline=no
 for ac_kw in inline __inline__ __inline; do
   cat > conftest.$ac_ext <<EOF
 
 ac_cv_c_inline=no
 for ac_kw in inline __inline__ __inline; do
   cat > conftest.$ac_ext <<EOF

-#line 8664 "configure"
+#line 8665 "configure"

 #include "confdefs.h"
 
 int main() {
 } $ac_kw foo() {
 ; return 0; }
 EOF
 #include "confdefs.h"
 
 int main() {
 } $ac_kw foo() {
 ; return 0; }
 EOF

-if { (eval echo configure:8671: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:8672: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then

   rm -rf conftest*
   ac_cv_c_inline=$ac_kw; break
 else
   rm -rf conftest*
   ac_cv_c_inline=$ac_kw; break
 else

@@ -8717,17 +8718,17 @@ fi
 # 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
 # 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:8721: checking for working alloca.h" >&5
+echo "configure:8722: checking for working alloca.h" >&5

 
 cat > conftest.$ac_ext <<EOF
 
 cat > conftest.$ac_ext <<EOF

-#line 8724 "configure"
+#line 8725 "configure"

 #include "confdefs.h"
 #include <alloca.h>
 int main() {
 char *p = alloca(2 * sizeof(int));
 ; return 0; }
 EOF
 #include "confdefs.h"
 #include <alloca.h>
 int main() {
 char *p = alloca(2 * sizeof(int));
 ; return 0; }
 EOF

-if { (eval echo configure:8731: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:8732: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then

   rm -rf conftest*
   ac_cv_header_alloca_h=yes
 else
   rm -rf conftest*
   ac_cv_header_alloca_h=yes
 else

@@ -8751,10 +8752,10 @@ EOF
 fi
 
 echo $ac_n "checking for alloca""... $ac_c" 1>&6
 fi
 
 echo $ac_n "checking for alloca""... $ac_c" 1>&6

-echo "configure:8755: checking for alloca" >&5
+echo "configure:8756: checking for alloca" >&5

 
 cat > conftest.$ac_ext <<EOF
 
 cat > conftest.$ac_ext <<EOF

-#line 8758 "configure"
+#line 8759 "configure"

 #include "confdefs.h"
 
 #ifdef __GNUC__
 #include "confdefs.h"
 
 #ifdef __GNUC__

@@ -8777,7 +8778,7 @@ int main() {
 char *p = (char *) alloca(1);
 ; return 0; }
 EOF
 char *p = (char *) alloca(1);
 ; return 0; }
 EOF

-if { (eval echo configure:8781: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:8782: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then

   rm -rf conftest*
   ac_cv_func_alloca_works=yes
 else
   rm -rf conftest*
   ac_cv_func_alloca_works=yes
 else

@@ -8816,10 +8817,10 @@ EOF
 
 
 echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6
 
 
 echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6

-echo "configure:8820: checking whether alloca needs Cray hooks" >&5
+echo "configure:8821: checking whether alloca needs Cray hooks" >&5

 
 cat > conftest.$ac_ext <<EOF
 
 cat > conftest.$ac_ext <<EOF

-#line 8823 "configure"
+#line 8824 "configure"

 #include "confdefs.h"
 #if defined(CRAY) && ! defined(CRAY2)
 webecray
 #include "confdefs.h"
 #if defined(CRAY) && ! defined(CRAY2)
 webecray

@@ -8843,10 +8844,10 @@ echo "$ac_t""$ac_cv_os_cray" 1>&6
 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
 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:8847: checking for $ac_func" >&5
+echo "configure:8848: checking for $ac_func" >&5

 
 cat > conftest.$ac_ext <<EOF
 
 cat > conftest.$ac_ext <<EOF

-#line 8850 "configure"
+#line 8851 "configure"

 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */

@@ -8869,7 +8870,7 @@ $ac_func();
 
 ; return 0; }
 EOF
 
 ; return 0; }
 EOF

-if { (eval echo configure:8873: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:8874: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then

   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else

@@ -8899,10 +8900,10 @@ done
 fi
 
 echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6
 fi
 
 echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6

-echo "configure:8903: checking stack direction for C alloca" >&5
+echo "configure:8904: checking stack direction for C alloca" >&5

 
 cat > conftest.$ac_ext <<EOF
 
 cat > conftest.$ac_ext <<EOF

-#line 8906 "configure"
+#line 8907 "configure"

 #include "confdefs.h"
 find_stack_direction ()
 {
 #include "confdefs.h"
 find_stack_direction ()
 {

@@ -8921,7 +8922,7 @@ main ()
   exit (find_stack_direction() < 0);
 }
 EOF
   exit (find_stack_direction() < 0);
 }
 EOF

-if { (eval echo configure:8925: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:8926: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5

 then
   ac_cv_c_stack_direction=1
 else
 then
   ac_cv_c_stack_direction=1
 else

@@ -8950,15 +8951,15 @@ test -n "$ALLOCA" && extra_objs="$extra_objs $ALLOCA" &&  if test "$extra_verbos
 
 ac_safe=`echo "vfork.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for vfork.h""... $ac_c" 1>&6
 
 ac_safe=`echo "vfork.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for vfork.h""... $ac_c" 1>&6

-echo "configure:8954: checking for vfork.h" >&5
+echo "configure:8955: checking for vfork.h" >&5

 
 cat > conftest.$ac_ext <<EOF
 
 cat > conftest.$ac_ext <<EOF

-#line 8957 "configure"
+#line 8958 "configure"

 #include "confdefs.h"
 #include <vfork.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
 #include "confdefs.h"
 #include <vfork.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"

-{ (eval echo configure:8962: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8963: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }

 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*

@@ -8986,10 +8987,10 @@ else
 fi
 
 echo $ac_n "checking for working vfork""... $ac_c" 1>&6
 fi
 
 echo $ac_n "checking for working vfork""... $ac_c" 1>&6

-echo "configure:8990: checking for working vfork" >&5
+echo "configure:8991: checking for working vfork" >&5

 
 cat > conftest.$ac_ext <<EOF
 
 cat > conftest.$ac_ext <<EOF

-#line 8993 "configure"
+#line 8994 "configure"

 #include "confdefs.h"
 /* Thanks to Paul Eggert for this test.  */
 #include <stdio.h>
 #include "confdefs.h"
 /* Thanks to Paul Eggert for this test.  */
 #include <stdio.h>

@@ -9084,7 +9085,7 @@ main() {
   }
 }
 EOF
   }
 }
 EOF

-if { (eval echo configure:9088: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:9089: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5

 then
   ac_cv_func_vfork_works=yes
 else
 then
   ac_cv_func_vfork_works=yes
 else

@@ -9110,10 +9111,10 @@ fi
 
 
 echo $ac_n "checking for working strcoll""... $ac_c" 1>&6
 
 
 echo $ac_n "checking for working strcoll""... $ac_c" 1>&6

-echo "configure:9114: checking for working strcoll" >&5
+echo "configure:9115: checking for working strcoll" >&5

 
 cat > conftest.$ac_ext <<EOF
 
 cat > conftest.$ac_ext <<EOF

-#line 9117 "configure"
+#line 9118 "configure"

 #include "confdefs.h"
 #include <string.h>
 main ()
 #include "confdefs.h"
 #include <string.h>
 main ()

@@ -9123,7 +9124,7 @@ main ()
        strcoll ("123", "456") >= 0);
 }
 EOF
        strcoll ("123", "456") >= 0);
 }
 EOF

-if { (eval echo configure:9127: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:9128: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5

 then
   ac_cv_func_strcoll_works=yes
 else
 then
   ac_cv_func_strcoll_works=yes
 else

@@ -9151,10 +9152,10 @@ fi
 for ac_func in getpgrp
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
 for ac_func in getpgrp
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6

-echo "configure:9155: checking for $ac_func" >&5
+echo "configure:9156: checking for $ac_func" >&5

 
 cat > conftest.$ac_ext <<EOF
 
 cat > conftest.$ac_ext <<EOF

-#line 9158 "configure"
+#line 9159 "configure"

 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */

@@ -9177,7 +9178,7 @@ $ac_func();
 
 ; return 0; }
 EOF
 
 ; return 0; }
 EOF

-if { (eval echo configure:9181: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:9182: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then

   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else

@@ -9205,10 +9206,10 @@ fi
 done
 
 echo $ac_n "checking whether getpgrp takes no argument""... $ac_c" 1>&6
 done
 
 echo $ac_n "checking whether getpgrp takes no argument""... $ac_c" 1>&6

-echo "configure:9209: checking whether getpgrp takes no argument" >&5
+echo "configure:9210: checking whether getpgrp takes no argument" >&5

 
 cat > conftest.$ac_ext <<EOF
 
 cat > conftest.$ac_ext <<EOF

-#line 9212 "configure"
+#line 9213 "configure"

 #include "confdefs.h"
 
 /*
 #include "confdefs.h"
 
 /*

@@ -9263,7 +9264,7 @@ main()
 }
 
 EOF
 }
 
 EOF

-if { (eval echo configure:9267: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:9268: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5

 then
   ac_cv_func_getpgrp_void=yes
 else
 then
   ac_cv_func_getpgrp_void=yes
 else

@@ -9290,10 +9291,10 @@ fi
 
 
 echo $ac_n "checking for working mmap""... $ac_c" 1>&6
 
 
 echo $ac_n "checking for working mmap""... $ac_c" 1>&6

-echo "configure:9294: checking for working mmap" >&5
+echo "configure:9295: checking for working mmap" >&5

 case "$opsys" in ultrix* ) have_mmap=no ;; *)
 cat > conftest.$ac_ext <<EOF
 case "$opsys" in ultrix* ) have_mmap=no ;; *)
 cat > conftest.$ac_ext <<EOF

-#line 9297 "configure"
+#line 9298 "configure"

 #include "confdefs.h"
 #include <stdio.h>
 #include <unistd.h>
 #include "confdefs.h"
 #include <stdio.h>
 #include <unistd.h>

@@ -9326,7 +9327,7 @@ int main (int argc, char *argv[])
   return 1;
 }
 EOF
   return 1;
 }
 EOF

-if { (eval echo configure:9330: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:9331: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5

 then
   have_mmap=yes
 else
 then
   have_mmap=yes
 else

@@ -9351,15 +9352,15 @@ for ac_hdr in unistd.h
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6

-echo "configure:9355: checking for $ac_hdr" >&5
+echo "configure:9356: checking for $ac_hdr" >&5

 
 cat > conftest.$ac_ext <<EOF
 
 cat > conftest.$ac_ext <<EOF

-#line 9358 "configure"
+#line 9359 "configure"

 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"

-{ (eval echo configure:9363: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9364: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }

 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*

@@ -9391,10 +9392,10 @@ done
 for ac_func in getpagesize
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
 for ac_func in getpagesize
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6

-echo "configure:9395: checking for $ac_func" >&5
+echo "configure:9396: checking for $ac_func" >&5

 
 cat > conftest.$ac_ext <<EOF
 
 cat > conftest.$ac_ext <<EOF

-#line 9398 "configure"
+#line 9399 "configure"

 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */

@@ -9417,7 +9418,7 @@ $ac_func();
 
 ; return 0; }
 EOF
 
 ; return 0; }
 EOF

-if { (eval echo configure:9421: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:9422: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then

   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else

@@ -9445,10 +9446,10 @@ fi
 done
 
 echo $ac_n "checking for working mmap""... $ac_c" 1>&6
 done
 
 echo $ac_n "checking for working mmap""... $ac_c" 1>&6

-echo "configure:9449: checking for working mmap" >&5
+echo "configure:9450: checking for working mmap" >&5

 
 cat > conftest.$ac_ext <<EOF
 
 cat > conftest.$ac_ext <<EOF

-#line 9452 "configure"
+#line 9453 "configure"

 #include "confdefs.h"
 
 /* Thanks to Mike Haertel and Jim Avera for this test.
 #include "confdefs.h"
 
 /* Thanks to Mike Haertel and Jim Avera for this test.

@@ -9588,7 +9589,7 @@ main()
 }
 
 EOF
 }
 
 EOF

-if { (eval echo configure:9592: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:9593: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5

 then
   ac_cv_func_mmap_fixed_mapped=yes
 else
 then
   ac_cv_func_mmap_fixed_mapped=yes
 else

@@ -9626,15 +9627,15 @@ EOF
 
 ac_safe=`echo "termios.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for termios.h""... $ac_c" 1>&6
 
 ac_safe=`echo "termios.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for termios.h""... $ac_c" 1>&6

-echo "configure:9630: checking for termios.h" >&5
+echo "configure:9631: checking for termios.h" >&5

 
 cat > conftest.$ac_ext <<EOF
 
 cat > conftest.$ac_ext <<EOF

-#line 9633 "configure"
+#line 9634 "configure"

 #include "confdefs.h"
 #include <termios.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
 #include "confdefs.h"
 #include <termios.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"

-{ (eval echo configure:9638: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9639: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }

 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*

@@ -9677,15 +9678,15 @@ else
   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 "$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:9681: checking for termio.h" >&5
+echo "configure:9682: checking for termio.h" >&5

 
 cat > conftest.$ac_ext <<EOF
 
 cat > conftest.$ac_ext <<EOF

-#line 9684 "configure"
+#line 9685 "configure"

 #include "confdefs.h"
 #include <termio.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
 #include "confdefs.h"
 #include <termio.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"

-{ (eval echo configure:9689: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9690: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }

 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*

@@ -9717,10 +9718,10 @@ fi
 
 
 echo $ac_n "checking for socket""... $ac_c" 1>&6
 
 
 echo $ac_n "checking for socket""... $ac_c" 1>&6

-echo "configure:9721: checking for socket" >&5
+echo "configure:9722: checking for socket" >&5

 
 cat > conftest.$ac_ext <<EOF
 
 cat > conftest.$ac_ext <<EOF

-#line 9724 "configure"
+#line 9725 "configure"

 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char socket(); below.  */
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char socket(); below.  */

@@ -9743,7 +9744,7 @@ socket();
 
 ; return 0; }
 EOF
 
 ; return 0; }
 EOF

-if { (eval echo configure:9747: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:9748: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then

   rm -rf conftest*
   eval "ac_cv_func_socket=yes"
 else
   rm -rf conftest*
   eval "ac_cv_func_socket=yes"
 else

@@ -9758,15 +9759,15 @@ if eval "test \"`echo '$ac_cv_func_'socket`\" = yes"; then
   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 "$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:9762: checking for netinet/in.h" >&5
+echo "configure:9763: checking for netinet/in.h" >&5

 
 cat > conftest.$ac_ext <<EOF
 
 cat > conftest.$ac_ext <<EOF

-#line 9765 "configure"
+#line 9766 "configure"

 #include "confdefs.h"
 #include <netinet/in.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
 #include "confdefs.h"
 #include <netinet/in.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"

-{ (eval echo configure:9770: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9771: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }

 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*

@@ -9783,15 +9784,15 @@ if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
   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 "$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:9787: checking for arpa/inet.h" >&5
+echo "configure:9788: checking for arpa/inet.h" >&5

 
 cat > conftest.$ac_ext <<EOF
 
 cat > conftest.$ac_ext <<EOF

-#line 9790 "configure"
+#line 9791 "configure"

 #include "confdefs.h"
 #include <arpa/inet.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
 #include "confdefs.h"
 #include <arpa/inet.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"

-{ (eval echo configure:9795: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9796: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }

 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*

@@ -9816,9 +9817,9 @@ EOF
 }
 
       echo $ac_n "checking "for sun_len member in struct sockaddr_un"""... $ac_c" 1>&6
 }
 
       echo $ac_n "checking "for sun_len member in struct sockaddr_un"""... $ac_c" 1>&6

-echo "configure:9820: checking "for sun_len member in struct sockaddr_un"" >&5
+echo "configure:9821: checking "for sun_len member in struct sockaddr_un"" >&5

       cat > conftest.$ac_ext <<EOF
       cat > conftest.$ac_ext <<EOF

-#line 9822 "configure"
+#line 9823 "configure"

 #include "confdefs.h"
 
 #include <sys/types.h>
 #include "confdefs.h"
 
 #include <sys/types.h>

@@ -9829,7 +9830,7 @@ int main() {
 static struct sockaddr_un x; x.sun_len = 1;
 ; return 0; }
 EOF
 static struct sockaddr_un x; x.sun_len = 1;
 ; return 0; }
 EOF

-if { (eval echo configure:9833: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:9834: \"$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
   rm -rf conftest*
   echo "$ac_t""yes" 1>&6; { test "$extra_verbose" = "yes" && cat << \EOF
     Defining HAVE_SOCKADDR_SUN_LEN

@@ -9847,9 +9848,9 @@ else
 fi
 rm -f conftest*
       echo $ac_n "checking "for ip_mreq struct in netinet/in.h"""... $ac_c" 1>&6
 fi
 rm -f conftest*
       echo $ac_n "checking "for ip_mreq struct in netinet/in.h"""... $ac_c" 1>&6

-echo "configure:9851: checking "for ip_mreq struct in netinet/in.h"" >&5
+echo "configure:9852: checking "for ip_mreq struct in netinet/in.h"" >&5

       cat > conftest.$ac_ext <<EOF
       cat > conftest.$ac_ext <<EOF

-#line 9853 "configure"
+#line 9854 "configure"

 #include "confdefs.h"
 
 #include <sys/types.h>
 #include "confdefs.h"
 
 #include <sys/types.h>

@@ -9859,7 +9860,7 @@ int main() {
 static struct ip_mreq x;
 ; return 0; }
 EOF
 static struct ip_mreq x;
 ; return 0; }
 EOF

-if { (eval echo configure:9863: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:9864: \"$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_MULTICAST
   rm -rf conftest*
   echo "$ac_t""yes" 1>&6; { test "$extra_verbose" = "yes" && cat << \EOF
     Defining HAVE_MULTICAST

@@ -9890,10 +9891,10 @@ fi
 
 
 echo $ac_n "checking for msgget""... $ac_c" 1>&6
 
 
 echo $ac_n "checking for msgget""... $ac_c" 1>&6

-echo "configure:9894: checking for msgget" >&5
+echo "configure:9895: checking for msgget" >&5

 
 cat > conftest.$ac_ext <<EOF
 
 cat > conftest.$ac_ext <<EOF

-#line 9897 "configure"
+#line 9898 "configure"

 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char msgget(); below.  */
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char msgget(); below.  */

@@ -9916,7 +9917,7 @@ msgget();
 
 ; return 0; }
 EOF
 
 ; return 0; }
 EOF

-if { (eval echo configure:9920: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:9921: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then

   rm -rf conftest*
   eval "ac_cv_func_msgget=yes"
 else
   rm -rf conftest*
   eval "ac_cv_func_msgget=yes"
 else

@@ -9931,15 +9932,15 @@ if eval "test \"`echo '$ac_cv_func_'msgget`\" = yes"; then
   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 "$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:9935: checking for sys/ipc.h" >&5
+echo "configure:9936: checking for sys/ipc.h" >&5

 
 cat > conftest.$ac_ext <<EOF
 
 cat > conftest.$ac_ext <<EOF

-#line 9938 "configure"
+#line 9939 "configure"

 #include "confdefs.h"
 #include <sys/ipc.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
 #include "confdefs.h"
 #include <sys/ipc.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"

-{ (eval echo configure:9943: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9944: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }

 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*

@@ -9956,15 +9957,15 @@ if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
   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 "$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:9960: checking for sys/msg.h" >&5
+echo "configure:9961: checking for sys/msg.h" >&5

 
 cat > conftest.$ac_ext <<EOF
 
 cat > conftest.$ac_ext <<EOF

-#line 9963 "configure"
+#line 9964 "configure"

 #include "confdefs.h"
 #include <sys/msg.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
 #include "confdefs.h"
 #include <sys/msg.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"

-{ (eval echo configure:9968: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9969: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }

 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*

@@ -10002,15 +10003,15 @@ fi
 
 ac_safe=`echo "dirent.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for dirent.h""... $ac_c" 1>&6
 
 ac_safe=`echo "dirent.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for dirent.h""... $ac_c" 1>&6

-echo "configure:10006: checking for dirent.h" >&5
+echo "configure:10007: checking for dirent.h" >&5

 
 cat > conftest.$ac_ext <<EOF
 
 cat > conftest.$ac_ext <<EOF

-#line 10009 "configure"
+#line 10010 "configure"

 #include "confdefs.h"
 #include <dirent.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
 #include "confdefs.h"
 #include <dirent.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"

-{ (eval echo configure:10014: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10015: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }

 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*

@@ -10037,15 +10038,15 @@ else
   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 "$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:10041: checking for sys/dir.h" >&5
+echo "configure:10042: checking for sys/dir.h" >&5

 
 cat > conftest.$ac_ext <<EOF
 
 cat > conftest.$ac_ext <<EOF

-#line 10044 "configure"
+#line 10045 "configure"

 #include "confdefs.h"
 #include <sys/dir.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
 #include "confdefs.h"
 #include <sys/dir.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"

-{ (eval echo configure:10049: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10050: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }

 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*

@@ -10078,15 +10079,15 @@ fi
 
 ac_safe=`echo "nlist.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for nlist.h""... $ac_c" 1>&6
 
 ac_safe=`echo "nlist.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for nlist.h""... $ac_c" 1>&6

-echo "configure:10082: checking for nlist.h" >&5
+echo "configure:10083: checking for nlist.h" >&5

 
 cat > conftest.$ac_ext <<EOF
 
 cat > conftest.$ac_ext <<EOF

-#line 10085 "configure"
+#line 10086 "configure"

 #include "confdefs.h"
 #include <nlist.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
 #include "confdefs.h"
 #include <nlist.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"

-{ (eval echo configure:10090: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10091: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }

 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*

@@ -10116,7 +10117,7 @@ fi
 
 
 echo "checking "for sound support"" 1>&6
 
 
 echo "checking "for sound support"" 1>&6

-echo "configure:10120: checking "for sound support"" >&5
+echo "configure:10121: checking "for sound support"" >&5

 case "$with_sound" in
   native | both ) with_native_sound=yes;;
   nas    | no   ) with_native_sound=no;;
 case "$with_sound" in
   native | both ) with_native_sound=yes;;
   nas    | no   ) with_native_sound=no;;

@@ -10127,15 +10128,15 @@ if test "$with_native_sound" != "no"; then
     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
     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:10131: checking for multimedia/audio_device.h" >&5
+echo "configure:10132: checking for multimedia/audio_device.h" >&5

 
 cat > conftest.$ac_ext <<EOF
 
 cat > conftest.$ac_ext <<EOF

-#line 10134 "configure"
+#line 10135 "configure"

 #include "confdefs.h"
 #include <multimedia/audio_device.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
 #include "confdefs.h"
 #include <multimedia/audio_device.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"

-{ (eval echo configure:10139: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10140: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }

 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*

@@ -10183,12 +10184,12 @@ fi
       if test -z "$native_sound_lib"; then
         
 echo $ac_n "checking for ALopenport in -laudio""... $ac_c" 1>&6
       if test -z "$native_sound_lib"; then
         
 echo $ac_n "checking for ALopenport in -laudio""... $ac_c" 1>&6

-echo "configure:10187: checking for ALopenport in -laudio" >&5
+echo "configure:10188: checking for ALopenport in -laudio" >&5

 ac_lib_var=`echo audio'_'ALopenport | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -laudio "
 cat > conftest.$ac_ext <<EOF
 ac_lib_var=`echo audio'_'ALopenport | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -laudio "
 cat > conftest.$ac_ext <<EOF

-#line 10192 "configure"
+#line 10193 "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
 #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

@@ -10199,7 +10200,7 @@ int main() {
 ALopenport()
 ; return 0; }
 EOF
 ALopenport()
 ; return 0; }
 EOF

-if { (eval echo configure:10203: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:10204: \"$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
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else

@@ -10230,12 +10231,12 @@ fi
       if test -z "$native_sound_lib"; then
        
 echo $ac_n "checking for AOpenAudio in -lAlib""... $ac_c" 1>&6
       if test -z "$native_sound_lib"; then
        
 echo $ac_n "checking for AOpenAudio in -lAlib""... $ac_c" 1>&6

-echo "configure:10234: checking for AOpenAudio in -lAlib" >&5
+echo "configure:10235: checking for AOpenAudio in -lAlib" >&5

 ac_lib_var=`echo Alib'_'AOpenAudio | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lAlib "
 cat > conftest.$ac_ext <<EOF
 ac_lib_var=`echo Alib'_'AOpenAudio | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lAlib "
 cat > conftest.$ac_ext <<EOF

-#line 10239 "configure"
+#line 10240 "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
 #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

@@ -10246,7 +10247,7 @@ int main() {
 AOpenAudio()
 ; return 0; }
 EOF
 AOpenAudio()
 ; return 0; }
 EOF

-if { (eval echo configure:10250: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:10251: \"$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
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else

@@ -10284,15 +10285,15 @@ fi
     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
     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:10288: checking for ${dir}/soundcard.h" >&5
+echo "configure:10289: checking for ${dir}/soundcard.h" >&5

 
 cat > conftest.$ac_ext <<EOF
 
 cat > conftest.$ac_ext <<EOF

-#line 10291 "configure"
+#line 10292 "configure"

 #include "confdefs.h"
 #include <${dir}/soundcard.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
 #include "confdefs.h"
 #include <${dir}/soundcard.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"

-{ (eval echo configure:10296: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10297: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }

 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*

@@ -10362,7 +10363,7 @@ EOF
  fi
   libs_x="-laudio $libs_x" &&  if test "$extra_verbose" = "yes"; then echo "    Prepending \"-laudio\" to \$libs_x"; fi
       cat > conftest.$ac_ext <<EOF
  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 10366 "configure"
+#line 10367 "configure"

 #include "confdefs.h"
 #include <audio/Xtutil.h>
 EOF
 #include "confdefs.h"
 #include <audio/Xtutil.h>
 EOF

@@ -10389,7 +10390,7 @@ test -z "$with_tty" && with_tty=yes
 
 if test "$with_tty" = "yes"  ; then
   echo "checking for TTY-related features" 1>&6
 
 if test "$with_tty" = "yes"  ; then
   echo "checking for TTY-related features" 1>&6

-echo "configure:10393: checking for TTY-related features" >&5
+echo "configure:10394: checking for TTY-related features" >&5

   { test "$extra_verbose" = "yes" && cat << \EOF
     Defining HAVE_TTY
 EOF
   { test "$extra_verbose" = "yes" && cat << \EOF
     Defining HAVE_TTY
 EOF

@@ -10405,12 +10406,12 @@ EOF
     if test -z "$with_ncurses"; then
     
 echo $ac_n "checking for tgetent in -lncurses""... $ac_c" 1>&6
     if test -z "$with_ncurses"; then
     
 echo $ac_n "checking for tgetent in -lncurses""... $ac_c" 1>&6

-echo "configure:10409: checking for tgetent in -lncurses" >&5
+echo "configure:10410: checking for tgetent in -lncurses" >&5

 ac_lib_var=`echo ncurses'_'tgetent | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lncurses "
 cat > conftest.$ac_ext <<EOF
 ac_lib_var=`echo ncurses'_'tgetent | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lncurses "
 cat > conftest.$ac_ext <<EOF

-#line 10414 "configure"
+#line 10415 "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
 #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

@@ -10421,7 +10422,7 @@ int main() {
 tgetent()
 ; return 0; }
 EOF
 tgetent()
 ; return 0; }
 EOF

-if { (eval echo configure:10425: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:10426: \"$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
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else

@@ -10454,15 +10455,15 @@ EOF
 
     ac_safe=`echo "ncurses/curses.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for ncurses/curses.h""... $ac_c" 1>&6
 
     ac_safe=`echo "ncurses/curses.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for ncurses/curses.h""... $ac_c" 1>&6

-echo "configure:10458: checking for ncurses/curses.h" >&5
+echo "configure:10459: checking for ncurses/curses.h" >&5

 
 cat > conftest.$ac_ext <<EOF
 
 cat > conftest.$ac_ext <<EOF

-#line 10461 "configure"
+#line 10462 "configure"

 #include "confdefs.h"
 #include <ncurses/curses.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
 #include "confdefs.h"
 #include <ncurses/curses.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"

-{ (eval echo configure:10466: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10467: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }

 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*

@@ -10484,15 +10485,15 @@ fi
 
     ac_safe=`echo "ncurses/term.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for ncurses/term.h""... $ac_c" 1>&6
 
     ac_safe=`echo "ncurses/term.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for ncurses/term.h""... $ac_c" 1>&6

-echo "configure:10488: checking for ncurses/term.h" >&5
+echo "configure:10489: checking for ncurses/term.h" >&5

 
 cat > conftest.$ac_ext <<EOF
 
 cat > conftest.$ac_ext <<EOF

-#line 10491 "configure"
+#line 10492 "configure"

 #include "confdefs.h"
 #include <ncurses/term.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
 #include "confdefs.h"
 #include <ncurses/term.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"

-{ (eval echo configure:10496: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10497: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }

 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*

@@ -10522,15 +10523,15 @@ fi
       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
       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:10526: checking for ncurses/curses.h" >&5
+echo "configure:10527: checking for ncurses/curses.h" >&5

 
 cat > conftest.$ac_ext <<EOF
 
 cat > conftest.$ac_ext <<EOF

-#line 10529 "configure"
+#line 10530 "configure"

 #include "confdefs.h"
 #include <ncurses/curses.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
 #include "confdefs.h"
 #include <ncurses/curses.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"

-{ (eval echo configure:10534: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10535: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }

 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*

@@ -10565,12 +10566,12 @@ fi
        for lib in curses termlib termcap; do
          
 echo $ac_n "checking for tgetent in -l$lib""... $ac_c" 1>&6
        for lib in curses termlib termcap; do
          
 echo $ac_n "checking for tgetent in -l$lib""... $ac_c" 1>&6

-echo "configure:10569: checking for tgetent in -l$lib" >&5
+echo "configure:10570: 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
 ac_lib_var=`echo $lib'_'tgetent | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -l$lib "
 cat > conftest.$ac_ext <<EOF

-#line 10574 "configure"
+#line 10575 "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
 #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

@@ -10581,7 +10582,7 @@ int main() {
 tgetent()
 ; return 0; }
 EOF
 tgetent()
 ; return 0; }
 EOF

-if { (eval echo configure:10585: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:10586: \"$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
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else

@@ -10612,12 +10613,12 @@ fi
       else
        
 echo $ac_n "checking for tgetent in -lcurses""... $ac_c" 1>&6
       else
        
 echo $ac_n "checking for tgetent in -lcurses""... $ac_c" 1>&6

-echo "configure:10616: checking for tgetent in -lcurses" >&5
+echo "configure:10617: checking for tgetent in -lcurses" >&5

 ac_lib_var=`echo curses'_'tgetent | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lcurses "
 cat > conftest.$ac_ext <<EOF
 ac_lib_var=`echo curses'_'tgetent | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lcurses "
 cat > conftest.$ac_ext <<EOF

-#line 10621 "configure"
+#line 10622 "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
 #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

@@ -10628,7 +10629,7 @@ int main() {
 tgetent()
 ; return 0; }
 EOF
 tgetent()
 ; return 0; }
 EOF

-if { (eval echo configure:10632: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:10633: \"$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
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else

@@ -10646,12 +10647,12 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes" ; then
 else
   echo "$ac_t""no" 1>&6
 echo $ac_n "checking for tgetent in -ltermcap""... $ac_c" 1>&6
 else
   echo "$ac_t""no" 1>&6
 echo $ac_n "checking for tgetent in -ltermcap""... $ac_c" 1>&6

-echo "configure:10650: checking for tgetent in -ltermcap" >&5
+echo "configure:10651: checking for tgetent in -ltermcap" >&5

 ac_lib_var=`echo termcap'_'tgetent | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -ltermcap "
 cat > conftest.$ac_ext <<EOF
 ac_lib_var=`echo termcap'_'tgetent | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -ltermcap "
 cat > conftest.$ac_ext <<EOF

-#line 10655 "configure"
+#line 10656 "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
 #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

@@ -10662,7 +10663,7 @@ int main() {
 tgetent()
 ; return 0; }
 EOF
 tgetent()
 ; return 0; }
 EOF

-if { (eval echo configure:10666: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:10667: \"$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
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else

@@ -10710,15 +10711,15 @@ EOF
 
     test -z "$with_gpm" && { ac_safe=`echo "gpm.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for gpm.h""... $ac_c" 1>&6
 
     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:10714: checking for gpm.h" >&5
+echo "configure:10715: checking for gpm.h" >&5

 
 cat > conftest.$ac_ext <<EOF
 
 cat > conftest.$ac_ext <<EOF

-#line 10717 "configure"
+#line 10718 "configure"

 #include "confdefs.h"
 #include <gpm.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
 #include "confdefs.h"
 #include <gpm.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"

-{ (eval echo configure:10722: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10723: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }

 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*

@@ -10741,12 +10742,12 @@ fi
  }
   test -z "$with_gpm" && { 
 echo $ac_n "checking for Gpm_Open in -lgpm""... $ac_c" 1>&6
  }
   test -z "$with_gpm" && { 
 echo $ac_n "checking for Gpm_Open in -lgpm""... $ac_c" 1>&6

-echo "configure:10745: checking for Gpm_Open in -lgpm" >&5
+echo "configure:10746: 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
 ac_lib_var=`echo gpm'_'Gpm_Open | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lgpm "
 cat > conftest.$ac_ext <<EOF

-#line 10750 "configure"
+#line 10751 "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
 #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

@@ -10757,7 +10758,7 @@ int main() {
 Gpm_Open()
 ; return 0; }
 EOF
 Gpm_Open()
 ; return 0; }
 EOF

-if { (eval echo configure:10761: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:10762: \"$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
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else

@@ -10806,22 +10807,22 @@ test "$with_x11" = "yes" -o "$with_tty" = "yes" && extra_objs="$extra_objs event
 
 
 echo "checking for database support" 1>&6
 
 
 echo "checking for database support" 1>&6

-echo "configure:10810: checking for database support" >&5
+echo "configure:10811: checking for database support" >&5

 
 if test "$with_database_gnudbm" != "no"; then
   for ac_hdr in ndbm.h
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
 
 if test "$with_database_gnudbm" != "no"; then
   for ac_hdr in ndbm.h
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6

-echo "configure:10817: checking for $ac_hdr" >&5
+echo "configure:10818: checking for $ac_hdr" >&5

 
 cat > conftest.$ac_ext <<EOF
 
 cat > conftest.$ac_ext <<EOF

-#line 10820 "configure"
+#line 10821 "configure"

 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"

-{ (eval echo configure:10825: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10826: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }

 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*

@@ -10853,12 +10854,12 @@ done
   if test "$have_ndbm_h" = "yes"; then
     
 echo $ac_n "checking for dbm_open in -lgdbm""... $ac_c" 1>&6
   if test "$have_ndbm_h" = "yes"; then
     
 echo $ac_n "checking for dbm_open in -lgdbm""... $ac_c" 1>&6

-echo "configure:10857: checking for dbm_open in -lgdbm" >&5
+echo "configure:10858: 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
 ac_lib_var=`echo gdbm'_'dbm_open | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lgdbm "
 cat > conftest.$ac_ext <<EOF

-#line 10862 "configure"
+#line 10863 "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
 #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

@@ -10869,7 +10870,7 @@ int main() {
 dbm_open()
 ; return 0; }
 EOF
 dbm_open()
 ; return 0; }
 EOF

-if { (eval echo configure:10873: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:10874: \"$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
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else

@@ -10892,10 +10893,10 @@ fi
   fi
   if test "$with_database_gnudbm" != "yes"; then
     echo $ac_n "checking for dbm_open""... $ac_c" 1>&6
   fi
   if test "$with_database_gnudbm" != "yes"; then
     echo $ac_n "checking for dbm_open""... $ac_c" 1>&6

-echo "configure:10896: checking for dbm_open" >&5
+echo "configure:10897: checking for dbm_open" >&5

 
 cat > conftest.$ac_ext <<EOF
 
 cat > conftest.$ac_ext <<EOF

-#line 10899 "configure"
+#line 10900 "configure"

 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char dbm_open(); below.  */
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char dbm_open(); below.  */

@@ -10918,7 +10919,7 @@ dbm_open();
 
 ; return 0; }
 EOF
 
 ; return 0; }
 EOF

-if { (eval echo configure:10922: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:10923: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then

   rm -rf conftest*
   eval "ac_cv_func_dbm_open=yes"
 else
   rm -rf conftest*
   eval "ac_cv_func_dbm_open=yes"
 else

@@ -10954,10 +10955,10 @@ fi
 
 if test "$with_database_dbm" != "no"; then
   echo $ac_n "checking for dbm_open""... $ac_c" 1>&6
 
 if test "$with_database_dbm" != "no"; then
   echo $ac_n "checking for dbm_open""... $ac_c" 1>&6

-echo "configure:10958: checking for dbm_open" >&5
+echo "configure:10959: checking for dbm_open" >&5

 
 cat > conftest.$ac_ext <<EOF
 
 cat > conftest.$ac_ext <<EOF

-#line 10961 "configure"
+#line 10962 "configure"

 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char dbm_open(); below.  */
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char dbm_open(); below.  */

@@ -10980,7 +10981,7 @@ dbm_open();
 
 ; return 0; }
 EOF
 
 ; return 0; }
 EOF

-if { (eval echo configure:10984: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:10985: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then

   rm -rf conftest*
   eval "ac_cv_func_dbm_open=yes"
 else
   rm -rf conftest*
   eval "ac_cv_func_dbm_open=yes"
 else

@@ -11001,12 +11002,12 @@ fi
   if test "$need_libdbm" != "no"; then
     
 echo $ac_n "checking for dbm_open in -ldbm""... $ac_c" 1>&6
   if test "$need_libdbm" != "no"; then
     
 echo $ac_n "checking for dbm_open in -ldbm""... $ac_c" 1>&6

-echo "configure:11005: checking for dbm_open in -ldbm" >&5
+echo "configure:11006: 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
 ac_lib_var=`echo dbm'_'dbm_open | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -ldbm "
 cat > conftest.$ac_ext <<EOF

-#line 11010 "configure"
+#line 11011 "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
 #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

@@ -11017,7 +11018,7 @@ int main() {
 dbm_open()
 ; return 0; }
 EOF
 dbm_open()
 ; return 0; }
 EOF

-if { (eval echo configure:11021: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:11022: \"$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
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else

@@ -11054,10 +11055,10 @@ fi
 
 if test "$with_database_berkdb" != "no"; then
   echo $ac_n "checking for Berkeley db.h""... $ac_c" 1>&6
 
 if test "$with_database_berkdb" != "no"; then
   echo $ac_n "checking for Berkeley db.h""... $ac_c" 1>&6

-echo "configure:11058: checking for Berkeley db.h" >&5
+echo "configure:11059: checking for Berkeley db.h" >&5

   for path in "db/db.h" "db.h"; do
     cat > conftest.$ac_ext <<EOF
   for path in "db/db.h" "db.h"; do
     cat > conftest.$ac_ext <<EOF

-#line 11061 "configure"
+#line 11062 "configure"

 #include "confdefs.h"
 #ifdef HAVE_INTTYPES_H
 #define __BIT_TYPES_DEFINED__
 #include "confdefs.h"
 #ifdef HAVE_INTTYPES_H
 #define __BIT_TYPES_DEFINED__

@@ -11075,7 +11076,7 @@ int main() {
 
 ; return 0; }
 EOF
 
 ; return 0; }
 EOF

-if { (eval echo configure:11079: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:11080: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then

   rm -rf conftest*
   db_h_path="$path"; break
 else
   rm -rf conftest*
   db_h_path="$path"; break
 else

@@ -11091,9 +11092,9 @@ rm -f conftest*
 
   if test "$with_database_berkdb" != "no"; then
     echo $ac_n "checking for Berkeley DB version""... $ac_c" 1>&6
 
   if test "$with_database_berkdb" != "no"; then
     echo $ac_n "checking for Berkeley DB version""... $ac_c" 1>&6

-echo "configure:11095: checking for Berkeley DB version" >&5
+echo "configure:11096: checking for Berkeley DB version" >&5

     cat > conftest.$ac_ext <<EOF
     cat > conftest.$ac_ext <<EOF

-#line 11097 "configure"
+#line 11098 "configure"

 #include "confdefs.h"
 #include <$db_h_path>
 #if DB_VERSION_MAJOR > 1
 #include "confdefs.h"
 #include <$db_h_path>
 #if DB_VERSION_MAJOR > 1

@@ -11112,10 +11113,10 @@ fi
 rm -f conftest*
 
     echo $ac_n "checking for $dbfunc""... $ac_c" 1>&6
 rm -f conftest*
 
     echo $ac_n "checking for $dbfunc""... $ac_c" 1>&6

-echo "configure:11116: checking for $dbfunc" >&5
+echo "configure:11117: checking for $dbfunc" >&5

 
 cat > conftest.$ac_ext <<EOF
 
 cat > conftest.$ac_ext <<EOF

-#line 11119 "configure"
+#line 11120 "configure"

 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $dbfunc(); below.  */
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $dbfunc(); below.  */

@@ -11138,7 +11139,7 @@ $dbfunc();
 
 ; return 0; }
 EOF
 
 ; return 0; }
 EOF

-if { (eval echo configure:11142: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:11143: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then

   rm -rf conftest*
   eval "ac_cv_func_$dbfunc=yes"
 else
   rm -rf conftest*
   eval "ac_cv_func_$dbfunc=yes"
 else

@@ -11157,12 +11158,12 @@ else
 
     
 echo $ac_n "checking for $dbfunc in -ldb""... $ac_c" 1>&6
 
     
 echo $ac_n "checking for $dbfunc in -ldb""... $ac_c" 1>&6

-echo "configure:11161: checking for $dbfunc in -ldb" >&5
+echo "configure:11162: checking for $dbfunc in -ldb" >&5

 ac_lib_var=`echo db'_'$dbfunc | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -ldb "
 cat > conftest.$ac_ext <<EOF
 ac_lib_var=`echo db'_'$dbfunc | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -ldb "
 cat > conftest.$ac_ext <<EOF

-#line 11166 "configure"
+#line 11167 "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
 #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

@@ -11173,7 +11174,7 @@ int main() {
 $dbfunc()
 ; return 0; }
 EOF
 $dbfunc()
 ; return 0; }
 EOF

-if { (eval echo configure:11177: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:11178: \"$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
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else

@@ -11237,12 +11238,12 @@ fi
 if test "$with_socks" = "yes"; then
   
 echo $ac_n "checking for SOCKSinit in -lsocks""... $ac_c" 1>&6
 if test "$with_socks" = "yes"; then
   
 echo $ac_n "checking for SOCKSinit in -lsocks""... $ac_c" 1>&6

-echo "configure:11241: checking for SOCKSinit in -lsocks" >&5
+echo "configure:11242: checking for SOCKSinit in -lsocks" >&5

 ac_lib_var=`echo socks'_'SOCKSinit | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lsocks "
 cat > conftest.$ac_ext <<EOF
 ac_lib_var=`echo socks'_'SOCKSinit | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lsocks "
 cat > conftest.$ac_ext <<EOF

-#line 11246 "configure"
+#line 11247 "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
 #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

@@ -11253,7 +11254,7 @@ int main() {
 SOCKSinit()
 ; return 0; }
 EOF
 SOCKSinit()
 ; return 0; }
 EOF

-if { (eval echo configure:11257: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:11258: \"$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
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else

@@ -11306,19 +11307,21 @@ EOF
   LIBS="-Bstatic -lut -Bdynamic $LIBS" &&  if test "$extra_verbose" = "yes"; then echo "    Prepending \"-Bstatic -lut -Bdynamic\" to \$LIBS"; fi
 fi
 
   LIBS="-Bstatic -lut -Bdynamic $LIBS" &&  if test "$extra_verbose" = "yes"; then echo "    Prepending \"-Bstatic -lut -Bdynamic\" to \$LIBS"; fi
 fi
 

+test -z "$with_shlib" && test "$opsys $machine" = "cygwin32 intel386" && with_shlib=no
+

 for ac_hdr in dlfcn.h
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
 for ac_hdr in dlfcn.h
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6

-echo "configure:11314: checking for $ac_hdr" >&5
+echo "configure:11317: checking for $ac_hdr" >&5

 
 cat > conftest.$ac_ext <<EOF
 
 cat > conftest.$ac_ext <<EOF

-#line 11317 "configure"
+#line 11320 "configure"

 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"

-{ (eval echo configure:11322: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:11325: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }

 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*

@@ -11349,12 +11352,12 @@ done
 
 test -z "$with_shlib" && test ! -z "$have_dlfcn" && { 
 echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
 
 test -z "$with_shlib" && test ! -z "$have_dlfcn" && { 
 echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6

-echo "configure:11353: checking for dlopen in -ldl" >&5
+echo "configure:11356: checking for dlopen in -ldl" >&5

 ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -ldl "
 cat > conftest.$ac_ext <<EOF
 ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -ldl "
 cat > conftest.$ac_ext <<EOF

-#line 11358 "configure"
+#line 11361 "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
 #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

@@ -11365,7 +11368,7 @@ int main() {
 dlopen()
 ; return 0; }
 EOF
 dlopen()
 ; return 0; }
 EOF

-if { (eval echo configure:11369: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:11372: \"$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
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else

@@ -11394,12 +11397,12 @@ fi
  }
 test -z "$with_shlib" && test ! -z "$have_dlfcn" && { 
 echo $ac_n "checking for _dlopen in -lc""... $ac_c" 1>&6
  }
 test -z "$with_shlib" && test ! -z "$have_dlfcn" && { 
 echo $ac_n "checking for _dlopen in -lc""... $ac_c" 1>&6

-echo "configure:11398: checking for _dlopen in -lc" >&5
+echo "configure:11401: checking for _dlopen in -lc" >&5

 ac_lib_var=`echo c'_'_dlopen | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lc "
 cat > conftest.$ac_ext <<EOF
 ac_lib_var=`echo c'_'_dlopen | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lc "
 cat > conftest.$ac_ext <<EOF

-#line 11403 "configure"
+#line 11406 "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
 #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

@@ -11410,7 +11413,7 @@ int main() {
 _dlopen()
 ; return 0; }
 EOF
 _dlopen()
 ; return 0; }
 EOF

-if { (eval echo configure:11414: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:11417: \"$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
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else

@@ -11439,12 +11442,12 @@ fi
  }
 test -z "$with_shlib" && test ! -z "$have_dlfcn" && { 
 echo $ac_n "checking for dlopen in -lc""... $ac_c" 1>&6
  }
 test -z "$with_shlib" && test ! -z "$have_dlfcn" && { 
 echo $ac_n "checking for dlopen in -lc""... $ac_c" 1>&6

-echo "configure:11443: checking for dlopen in -lc" >&5
+echo "configure:11446: checking for dlopen in -lc" >&5

 ac_lib_var=`echo c'_'dlopen | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lc "
 cat > conftest.$ac_ext <<EOF
 ac_lib_var=`echo c'_'dlopen | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lc "
 cat > conftest.$ac_ext <<EOF

-#line 11448 "configure"
+#line 11451 "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
 #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

@@ -11455,7 +11458,7 @@ int main() {
 dlopen()
 ; return 0; }
 EOF
 dlopen()
 ; return 0; }
 EOF

-if { (eval echo configure:11459: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:11462: \"$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
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else

@@ -11484,12 +11487,12 @@ fi
  }
 test -z "$with_shlib" && { 
 echo $ac_n "checking for shl_load in -ldld""... $ac_c" 1>&6
  }
 test -z "$with_shlib" && { 
 echo $ac_n "checking for shl_load in -ldld""... $ac_c" 1>&6

-echo "configure:11488: checking for shl_load in -ldld" >&5
+echo "configure:11491: checking for shl_load in -ldld" >&5

 ac_lib_var=`echo dld'_'shl_load | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -ldld "
 cat > conftest.$ac_ext <<EOF
 ac_lib_var=`echo dld'_'shl_load | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -ldld "
 cat > conftest.$ac_ext <<EOF

-#line 11493 "configure"
+#line 11496 "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
 #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

@@ -11500,7 +11503,7 @@ int main() {
 shl_load()
 ; return 0; }
 EOF
 shl_load()
 ; return 0; }
 EOF

-if { (eval echo configure:11504: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:11507: \"$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
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else

@@ -11529,12 +11532,12 @@ fi
  }
 test -z "$with_shlib" && { 
 echo $ac_n "checking for dld_init in -ldld""... $ac_c" 1>&6
  }
 test -z "$with_shlib" && { 
 echo $ac_n "checking for dld_init in -ldld""... $ac_c" 1>&6

-echo "configure:11533: checking for dld_init in -ldld" >&5
+echo "configure:11536: checking for dld_init in -ldld" >&5

 ac_lib_var=`echo dld'_'dld_init | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -ldld "
 cat > conftest.$ac_ext <<EOF
 ac_lib_var=`echo dld'_'dld_init | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -ldld "
 cat > conftest.$ac_ext <<EOF

-#line 11538 "configure"
+#line 11541 "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
 #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

@@ -11545,7 +11548,7 @@ int main() {
 dld_init()
 ; return 0; }
 EOF
 dld_init()
 ; return 0; }
 EOF

-if { (eval echo configure:11549: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:11552: \"$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
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else

@@ -11595,7 +11598,7 @@ dll_cflags="-r"
 dll_oflags="-o "
 
 echo $ac_n "checking how to build a shared library""... $ac_c" 1>&6
 dll_oflags="-o "
 
 echo $ac_n "checking how to build a shared library""... $ac_c" 1>&6

-echo "configure:11599: checking how to build a shared library" >&5
+echo "configure:11602: checking how to build a shared library" >&5

 case `uname -rs` in
        UNIX_SV*|UNIX_System_V*)
                dll_lflags="-G"
 case `uname -rs` in
        UNIX_SV*|UNIX_System_V*)
                dll_lflags="-G"

@@ -11686,10 +11689,10 @@ case `uname -rs` in
   for ac_func in dlerror
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
   for ac_func in dlerror
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6

-echo "configure:11690: checking for $ac_func" >&5
+echo "configure:11693: checking for $ac_func" >&5

 
 cat > conftest.$ac_ext <<EOF
 
 cat > conftest.$ac_ext <<EOF

-#line 11693 "configure"
+#line 11696 "configure"

 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */

@@ -11712,7 +11715,7 @@ $ac_func();
 
 ; return 0; }
 EOF
 
 ; return 0; }
 EOF

-if { (eval echo configure:11716: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:11719: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then

   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else

@@ -11748,11 +11751,11 @@ done
 fi
 
 cat > conftest.$ac_ext <<EOF
 fi
 
 cat > conftest.$ac_ext <<EOF

-#line 11752 "configure"
+#line 11755 "configure"

 #include "confdefs.h"
 int main(int c,char *v[]){return 0;}
 EOF
 #include "confdefs.h"
 int main(int c,char *v[]){return 0;}
 EOF

-if { (eval echo configure:11756: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:11759: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5

 then
   :
 else
 then
   :
 else

diff --git a/configure.in b/configure.in
index fc963ae..e746fc8 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -2442,6 +2442,7 @@ if test "$with_msw" != "no"; then
     AC_DEFINE(HAVE_MS_WINDOWS)
     install_pp="$blddir/lib-src/installexe.sh"
     XE_APPEND(-lshell32 -lgdi32 -luser32 -lcomctl32, libs_system)
     AC_DEFINE(HAVE_MS_WINDOWS)
     install_pp="$blddir/lib-src/installexe.sh"
     XE_APPEND(-lshell32 -lgdi32 -luser32 -lcomctl32, libs_system)

+    test "$with_dragndrop" != no && XE_APPEND(msw, dragndrop_proto)

     if test "$window_system" != x11; then
        window_system=msw
        test "$with_scrollbars" != "no" && with_scrollbars=msw \
     if test "$window_system" != x11; then
        window_system=msw
        test "$with_scrollbars" != "no" && with_scrollbars=msw \

@@ -3557,6 +3558,9 @@ if test "$usage_tracking" = "yes"; then
   XE_PREPEND(-Bstatic -lut -Bdynamic, LIBS)
 fi
 
   XE_PREPEND(-Bstatic -lut -Bdynamic, LIBS)
 fi
 

+dnl cygwin can't cope with dlfcn at the moment
+test -z "$with_shlib" && test "$opsys $machine" = "cygwin32 intel386" && with_shlib=no
+

 dnl autodetect dll support
 AC_CHECK_HEADERS(dlfcn.h, have_dlfcn=yes)
 test -z "$with_shlib" && test ! -z "$have_dlfcn" && { AC_CHECK_LIB(dl,  dlopen,   [ AC_DEFINE(HAVE_DLOPEN) DLL_LIB=dl;  with_shlib=yes]) }
 dnl autodetect dll support
 AC_CHECK_HEADERS(dlfcn.h, have_dlfcn=yes)
 test -z "$with_shlib" && test ! -z "$have_dlfcn" && { AC_CHECK_LIB(dl,  dlopen,   [ AC_DEFINE(HAVE_DLOPEN) DLL_LIB=dl;  with_shlib=yes]) }

diff --git a/etc/xemacs.1 b/etc/xemacs.1
index c07a7af..d812351 100644 (file)
--- a/etc/xemacs.1
+++ b/etc/xemacs.1
@@ -126,7 +126,7 @@ and
 .B \-eval
 options to specify files to execute and functions to call.
 .TP
 .B \-eval
 options to specify files to execute and functions to call.
 .TP

-.B \-nw\
+.B \-nw

 Inhibit the use of any window-system-specific display code: use the
 current TTY.
 .TP
 Inhibit the use of any window-system-specific display code: use the
 current TTY.
 .TP

diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index 4cfe60b..927c3e1 100644 (file)
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,3 +1,35 @@
+1998-10-15  SL Baur  <steve@altair.xemacs.org>
+
+       * XEmacs 21.2-beta3 is released.
+
+1998-10-12  SL Baur  <steve@altair.xemacs.org>
+
+       * lib-src/gnudepend.pl: Use /usr/bin/perl.
+       * Makefile.in.in (INSTALLABLE_SCRIPTS): Remove send-pr, install-sid.
+       (GEN_SCRIPTS): Ditto.
+       Delete TM_SCRIPTS.
+
+1998-10-11  SL Baur  <steve@altair.xemacs.org>
+
+       * tm-au:
+       * tm-file:
+       * tm-html:
+       * tm-image:
+       * tm-mpeg:
+       * tm-plain:
+       * tm-ps:
+       * tmdecode: packaged.
+
+1998-10-10  SL Baur  <steve@altair.xemacs.org>
+
+       * install-sid:
+       * send-pr:  Packaged
+
+1998-10-01  Jan Vroonhof  <vroonhof@math.ethz.ch>
+
+       * gnuclient.c (filename_expand): Don't forget to copy the
+       filename under UNIX.
+

 1998-09-29  SL Baur  <steve@altair.xemacs.org>
 
        * XEmacs 21.2-beta2 is released.
 1998-09-29  SL Baur  <steve@altair.xemacs.org>
 
        * XEmacs 21.2-beta2 is released.

diff --git a/lib-src/Makefile.in.in b/lib-src/Makefile.in.in
index d7e6831..d3df934 100644 (file)
--- a/lib-src/Makefile.in.in
+++ b/lib-src/Makefile.in.in
@@ -70,7 +70,7 @@ INSTALL_DATA = @INSTALL_DATA@
 ## Things that a user might actually run,
 ## which should be installed in bindir.
 INSTALLABLES_BASE = etags ctags b2m gnuclient ootags
 ## Things that a user might actually run,
 ## which should be installed in bindir.
 INSTALLABLES_BASE = etags ctags b2m gnuclient ootags

-INSTALLABLE_SCRIPTS = rcs-checkin pstogif install-sid send-pr gnudoit gnuattach
+INSTALLABLE_SCRIPTS = rcs-checkin pstogif gnudoit gnuattach

 #ifdef HAVE_MS_WINDOWS
 INSTALLABLES = $(INSTALLABLES_BASE) runemacs
 #else
 #ifdef HAVE_MS_WINDOWS
 INSTALLABLES = $(INSTALLABLES_BASE) runemacs
 #else

@@ -87,10 +87,9 @@ UTILITIES= make-path wakeup profile make-docfile digest-doc \
 
 ## Like UTILITIES, but they are not system-dependent, and should not be
 ## deleted by the distclean target.
 
 ## Like UTILITIES, but they are not system-dependent, and should not be
 ## deleted by the distclean target.

-GEN_SCRIPTS = rcs2log vcdiff gzip-el.sh install-sid send-pr
-TM_SCRIPTS = tm-au tm-file tm-html tm-image tm-mpeg tm-plain tm-ps tmdecode
+GEN_SCRIPTS = rcs2log vcdiff gzip-el.sh

 PKG_SCRIPTS = add-big-package.sh
 PKG_SCRIPTS = add-big-package.sh

-SCRIPTS = $(GEN_SCRIPTS) $(TM_SCRIPTS) $(PKG_SCRIPTS)
+SCRIPTS = $(GEN_SCRIPTS) $(PKG_SCRIPTS)

 
 EXECUTABLES= ${UTILITIES} ${INSTALLABLES} ${SCRIPTS} ${INSTALLABLE_SCRIPTS}
 
 
 EXECUTABLES= ${UTILITIES} ${INSTALLABLES} ${SCRIPTS} ${INSTALLABLE_SCRIPTS}
 

diff --git a/lib-src/gnuclient.c b/lib-src/gnuclient.c
index e8797c1..db30ee3 100644 (file)
--- a/lib-src/gnuclient.c
+++ b/lib-src/gnuclient.c
@@ -217,6 +217,8 @@ filename_expand (char *fullpath, char *filename)
        ;                                       /* yep */
       else
        strcat (fullpath, "/");         /* nope, append trailing slash */
        ;                                       /* yep */
       else
        strcat (fullpath, "/");         /* nope, append trailing slash */

+      /* Don't forget to add the filename! */
+      strcat (fullpath,filename);

     }
 } /* filename_expand */
 
     }
 } /* filename_expand */
 

diff --git a/lib-src/gnudepend.pl b/lib-src/gnudepend.pl
index 7b85080..2400068 100755 (executable)
--- a/lib-src/gnudepend.pl
+++ b/lib-src/gnudepend.pl
@@ -1,4 +1,4 @@
-#!/usr/local/bin/perl
+#!/usr/bin/perl

 
 while (<>)
 {
 
 while (<>)
 {

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 6cca999..6c2d639 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,164 @@
+1998-10-15  SL Baur  <steve@altair.xemacs.org>
+
+       * XEmacs 21.2-beta3 is released.
+
+1998-10-15  Greg Klanderman  <greg@alphatech.com>
+
+       * package-get.el (package-get-update-base): use
+       insert-file-contents-internal, not insert-file-contents-literally.
+
+1998-10-14  Jan Vroonhof  <vroonhof@math.ethz.ch>
+
+       * auto-save.el: expand-file 'auto-save-*-dir' at runtime not at
+       dump time. 
+
+1998-10-15  Greg Klanderman  <greg@alphatech.com>
+
+       * package-get.el (package-get-update-base-entry): new function.
+       (package-get-update-base): renamed; was `package-get-load-base'.
+       cleanup, and use package-get-update-base-from-buffer.
+       (package-get-update-base-from-buffer): new function.
+       (package-get-update-base-entries): new; helper for above.
+       Do not eval lisp grabbed over ftp; parse it from new format.
+
+1998-10-15  Greg Klanderman  <greg@alphatech.com>
+
+       * files.el (set-auto-mode): Don't play games loading package-get
+       database; package-get-package-provider will handle it all.
+
+1998-10-14  Greg Klanderman  <greg@alphatech.com>
+
+       * package-get.el (package-get-base-filename): new variable.
+       (package-get-require-base): new function.
+       (package-get-pgp-signed-begin-line): new variable.
+       (package-get-pgp-signature-begin-line): ditto.
+       (package-get-pgp-signature-end-line):  ditto.
+       (package-get-load-base): new function.
+       (package-get-interactive-package-query):
+       (package-get-update-all):
+       (package-get-dependencies):
+       (package-get-package-provider):
+       (package-get-custom): use package-get-require-base.
+       [package-get-custom loading]: disable for now.
+
+       * package-ui.el (pui-list-packages): use (package-get-require-base)
+
+1998-10-14  Jan Vroonhof  <vroonhof@math.ethz.ch>
+
+       * package-ui.el: Correct obvious thinko in choosing extent face.
+
+1998-10-12  Jan Vroonhof  <vroonhof@math.ethz.ch>
+
+       * menubar-items.el (default-menubar): pui-list-package has nothing 
+       to with Customize. Move all the package stuff to a new Item in Options.
+
+       * package-ui.el (pui-menu): Add menu and Popup menu.
+
+       * package-get.el (package-get): Use new
+       package-admin-get-install-dir.
+
+       * package-admin.el (package-admin-get-install-dir): New syntax.
+       Conserve package location and put mule packages where mule-base is.
+
+       * package-get.el : Customized
+
+       * package-ui.el (pui): Customized
+       (pui-package-install-dest-dir): New variable.
+       (pui-install-selected-packages): Use it
+
+1998-10-12  SL Baur  <steve@altair.xemacs.org>
+
+       * package-get.el (package-get-interactive-package-query): Move
+       dependency on package-get-base to run-time.
+       (package-get-update-all): Ditto.
+       (package-get-dependencies): Ditto.
+       (package-get-package-provider): Ditto.
+       (package-get-custom): Ditto.
+
+1998-10-11  Glynn Clements  <glynn@sensei.co.uk>
+
+       * events.el: Remove 'ascii-character property from 'backspace
+       and 'delete symbols
+
+1998-10-11  SL Baur  <steve@altair.xemacs.org>
+
+       * package-get-base.el: removed.
+
+1998-09-23  Didier Verna  <verna@inf.enst.fr>
+
+       * simple.el (search-caps-disable-folding): moved from isearch-mode.el
+       (no-upper-case-p): new function.
+       (with-search-caps-disable-folding): new macro.
+       (with-interactive-search-caps-disable-folding): new macro.
+       (zap-to-char): In interactive mode, do a case-sensitive search if
+       the character is uppercase.
+       (zap-up-to-char): ditto.
+
+       * replace.el (perform-replace): use the function no-upper-case-p.
+
+       * isearch-mode.el (isearch-fix-case): ditto.
+       make obsolete `with-caps-disable-folding' and
+       `isearch-no-upper-case-p'.
+
+       * etags.el (find-tag-internal): use `with-search-caps-disable-folding'.
+       (tags-search): ditto.
+       (tags-query-replace): ditto.
+
+       * info.el (Info-search): ditto.
+
+1998-10-07  Jan Vroonhof  <vroonhof@math.ethz.ch>
+
+       * x-font-menu.el (font-menu-set-font): Respect font-menu-frame-local
+
+1998-10-07  Greg Klanderman  <greg@alphatech.com>
+
+       * package-admin.el (package-admin-rmtree): rewritten.  need to
+       check for "." and ".." before symlink check.  expand files and
+       directories with respect to DIRECTORY, not default-directory.
+
+1998-10-04  Greg Klanderman  <greg@alphatech.com>
+
+       * package-get.el (package-get-all): add INSTALL-DIR argument.
+
+1998-10-06  Greg Klanderman  <greg@alphatech.com>
+
+       * package-ui.el (pui-add-required-packages): new function, select
+       dependent packages.
+       (pui-display-keymap): bind it.
+       (pui-help-string): document it.
+       (pui-install-selected-packages): package-get-all -> package-get.
+
+       * package-get.el (package-get-dependencies): new function.
+
+1998-10-04  Hrvoje Niksic  <hniksic@srce.hr>
+
+       * isearch-mode.el (isearch-done): Use regexp-search-ring-max for
+       regexps.
+
+1998-10-05  Hrvoje Niksic  <hniksic@srce.hr>
+
+       * mouse.el (default-mouse-track-point-at-opening-quote-p): New
+       function.
+       (default-mouse-track-normalize-point): Use it.
+
+1998-09-30  Jan Vroonhof  <vroonhof@math.ethz.ch>
+
+       * package-admin.el (package-admin-delete-binary-package):
+               General cleanup. Remove unnessary use of progn and
+       save-excursion. 
+       (package-admin-delete-binary-package): Do NOT mess with file
+       modes. That is evil. 
+       (package-admin-delete-binary-package): Wrap all deleting in
+       condition-case. The data in MANIFEST is untrustworthy.
+       (package-admin-delete-binary-package): Let the OS worry about non
+       empty directories.
+
+1998-10-09  SL Baur  <steve@altair.xemacs.org>
+
+       * lisp-mnt.el (lm-commentary): Fix InfoDock-style comment
+       processing.
+       (lm-report-bug): Fix mail address to send bug reports to.
+

 1998-09-29  SL Baur  <steve@altair.xemacs.org>
 
        * XEmacs 21.2-beta2 is released.
 1998-09-29  SL Baur  <steve@altair.xemacs.org>
 
        * XEmacs 21.2-beta2 is released.

diff --git a/lisp/auto-autoloads.el b/lisp/auto-autoloads.el
index 59692fc..c5965ae 100644 (file)
--- a/lisp/auto-autoloads.el
+++ b/lisp/auto-autoloads.el
@@ -1204,7 +1204,26 @@ Install a pre-bytecompiled XEmacs package into package hierarchy." t nil)
 
 ;;;***
 \f
 
 ;;;***
 \f

-;;;### (autoloads (package-get-custom package-get-package-provider package-get package-get-all package-get-update-all) "package-get" "lisp/package-get.el")
+;;;### (autoloads (package-get-custom package-get-package-provider package-get package-get-dependencies package-get-all package-get-update-all package-get-delete-package package-get-update-base-from-buffer package-get-update-base package-get-update-base-entry package-get-require-base) "package-get" "lisp/package-get.el")
+
+(autoload 'package-get-require-base "package-get" "\
+Require that a package-get database has been loaded." nil nil)
+
+(autoload 'package-get-update-base-entry "package-get" "\
+Update an entry in `package-get-base'." nil nil)
+
+(autoload 'package-get-update-base "package-get" "\
+Update the package-get database file with entries from DB-FILE." t nil)
+
+(autoload 'package-get-update-base-from-buffer "package-get" "\
+Update the package-get database with entries from BUFFER.
+BUFFER defaults to the current buffer.  This command can be
+used interactively, for example from a mail or news buffer." t nil)
+
+(autoload 'package-get-delete-package "package-get" "\
+Delete an installation of PACKAGE below directory PKG-TOPDIR.
+PACKAGE is a symbol, not a string.
+This is just an interactive wrapper for `package-admin-delete-binary-package'." t nil)

 
 (autoload 'package-get-update-all "package-get" "\
 Fetch and install the latest versions of all currently installed packages." t nil)
 
 (autoload 'package-get-update-all "package-get" "\
 Fetch and install the latest versions of all currently installed packages." t nil)

@@ -1214,10 +1233,18 @@ Fetch PACKAGE with VERSION and all other required packages.
 Uses `package-get-base' to determine just what is required and what
 package provides that functionality.  If VERSION is nil, retrieves
 latest version.  Optional argument FETCHED-PACKAGES is used to keep
 Uses `package-get-base' to determine just what is required and what
 package provides that functionality.  If VERSION is nil, retrieves
 latest version.  Optional argument FETCHED-PACKAGES is used to keep

-track of packages already fetched.
+track of packages already fetched.  Optional argument INSTALL-DIR,
+if non-nil, specifies the package directory where fetched packages
+should be installed.

 
 Returns nil upon error." t nil)
 
 
 Returns nil upon error." t nil)
 

+(autoload 'package-get-dependencies "package-get" "\
+Compute dependencies for PACKAGES.
+Uses `package-get-base' to determine just what is required and what
+package provides that functionality.  Returns the list of packages
+required by PACKAGES." nil nil)
+

 (autoload 'package-get "package-get" "\
 Fetch PACKAGE from remote site.
 Optional arguments VERSION indicates which version to retrieve, nil
 (autoload 'package-get "package-get" "\
 Fetch PACKAGE from remote site.
 Optional arguments VERSION indicates which version to retrieve, nil

diff --git a/lisp/auto-save.el b/lisp/auto-save.el
index e7df3e6..bbda85d 100644 (file)
--- a/lisp/auto-save.el
+++ b/lisp/auto-save.el
@@ -186,7 +186,8 @@ Special value 'always deletes those files silently."
 \f
 ;;; Preparations to be done at load time
 
 \f
 ;;; Preparations to be done at load time
 

-(defvar auto-save-directory-fallback (expand-file-name "~/.autosave/")
+;; Do not call expand-file-name! This is evaluated at dump time now!
+(defvar auto-save-directory-fallback "~/.autosave/"

   ;; not user-variable-p, see above
   "Directory used for local autosaving of remote files if
 both `auto-save-directory' and `efs-auto-save-remotely' are nil.
   ;; not user-variable-p, see above
   "Directory used for local autosaving of remote files if
 both `auto-save-directory' and `efs-auto-save-remotely' are nil.

@@ -199,25 +200,24 @@ created by you, never nil.")
                                auto-save-directory-fallback))
   "If non-nil, directory used for hashed autosave filenames.")
 
                                auto-save-directory-fallback))
   "If non-nil, directory used for hashed autosave filenames.")
 

-(defun auto-save-check-directory (var)
-  (let ((dir (symbol-value var)))
-    (if (null dir)
-       nil
-      ;; Expand and store back into the variable
-      (set var (setq dir (expand-file-name dir)))
+(defun auto-save-checked-directory (dir)
+  "Make sure the directory DIR exists and return it expanded if non-nil."
+    (when dir
+      (setq dir (expand-file-name dir))

       ;; Make sure directory exists
       ;; Make sure directory exists

-      (if (file-directory-p dir)
-         nil
+      (unless (file-directory-p dir)

        ;; Else we create and chmod 0700 the directory
        (setq dir (directory-file-name dir)) ; some systems need this
        (make-directory dir)
        ;; Else we create and chmod 0700 the directory
        (setq dir (directory-file-name dir)) ; some systems need this
        (make-directory dir)

-       (set-file-modes dir #o700)))))
+       (set-file-modes dir #o700))
+      dir))

 
 

-(mapc #'auto-save-check-directory
-     '(auto-save-directory auto-save-directory-fallback))
+;; This make no sense at dump time
+;; (mapc #'auto-save-check-directory
+;     '(auto-save-directory auto-save-directory-fallback))

 
 

-(and auto-save-hash-p
-     (auto-save-check-directory 'auto-save-hash-directory))
+;(and auto-save-hash-p
+;     (auto-save-check-directory 'auto-save-hash-directory))

 
 \f
 ;;; Computing an autosave name for a file and vice versa
 
 \f
 ;;; Computing an autosave name for a file and vice versa

@@ -335,8 +335,12 @@ Hashed files are not understood, see `auto-save-hash-p'."
               (string-match "^#%" basename))
           nil)
          ;; now we know it looks like #...# thus substring is safe to use
               (string-match "^#%" basename))
           nil)
          ;; now we know it looks like #...# thus substring is safe to use

-         ((or (equal savedir auto-save-directory) ; 2nd arg may be nil
-              (equal savedir auto-save-directory-fallback))
+         ((or (equal savedir
+                     (and auto-save-directory
+                          (expand-file-name auto-save-directory)))
+                                       ; 2nd arg may be nil
+              (equal savedir
+                     (expand-file-name auto-save-directory-fallback)))

           ;; it is of the `-fixed-directory' type
           (auto-save-slashify-name (substring basename 1 -1)))
          (t
           ;; it is of the `-fixed-directory' type
           (auto-save-slashify-name (substring basename 1 -1)))
          (t

@@ -358,10 +362,11 @@ Hashed files are not understood, see `auto-save-hash-p'."
             auto-save-hash-directory
             (> (length base-name) 14))
        (expand-file-name (auto-save-cyclic-hash-14 filename)
             auto-save-hash-directory
             (> (length base-name) 14))
        (expand-file-name (auto-save-cyclic-hash-14 filename)

-                         auto-save-hash-directory)
+                         (auto-save-checked-directory auto-save-hash-directory))

       (expand-file-name base-name
       (expand-file-name base-name

-                       (or auto-save-directory
-                           auto-save-directory-fallback)))))
+                       (auto-save-checked-directory
+                          (or auto-save-directory
+                              auto-save-directory-fallback))))))

 
 (defun auto-save-name-in-same-directory (filename &optional prefix)
   ;; Enclose the non-directory part of FILENAME in `#' to make an auto
 
 (defun auto-save-name-in-same-directory (filename &optional prefix)
   ;; Enclose the non-directory part of FILENAME in `#' to make an auto

@@ -374,7 +379,8 @@ Hashed files are not understood, see `auto-save-hash-p'."
   (let ((directory (file-name-directory filename)))
     (or (null directory)
        (file-writable-p directory)
   (let ((directory (file-name-directory filename)))
     (or (null directory)
        (file-writable-p directory)

-       (setq directory auto-save-directory-fallback))
+       (setq directory (auto-save-checked-directory
+                        auto-save-directory-fallback)))

     (concat directory                  ; (concat nil) is ""
            (or prefix "#")
            (file-name-nondirectory filename)
     (concat directory                  ; (concat nil) is ""
            (or prefix "#")
            (file-name-nondirectory filename)

@@ -497,7 +503,8 @@ Hashed files (see `auto-save-hash-p') are not understood, use
        file                            ; its original file
        (total 0)                       ; # of files offered to recover
        (count 0))                      ; # of files actually recovered
        file                            ; its original file
        (total 0)                       ; # of files offered to recover
        (count 0))                      ; # of files actually recovered

-    (or (equal auto-save-directory auto-save-directory-fallback)
+    (or (equal (expand-file-name auto-save-directory)
+              (expand-file-name auto-save-directory-fallback))

        (setq savefiles
              (nconc savefiles
                     (directory-files auto-save-directory-fallback
        (setq savefiles
              (nconc savefiles
                     (directory-files auto-save-directory-fallback

diff --git a/lisp/custom-load.el b/lisp/custom-load.el
index 6e38ac8..a8af512 100644 (file)
--- a/lisp/custom-load.el
+++ b/lisp/custom-load.el
@@ -10,12 +10,14 @@
 (custom-add-loads 'drag-n-drop '("dragdrop"))
 (custom-add-loads 'mouse '("mouse" "mwheel"))
 (custom-add-loads 'etags '("etags"))
 (custom-add-loads 'drag-n-drop '("dragdrop"))
 (custom-add-loads 'mouse '("mouse" "mwheel"))
 (custom-add-loads 'etags '("etags"))

+(custom-add-loads 'package-tools '("package-get" "package-ui"))

 (custom-add-loads 'widgets '("wid-browse" "wid-edit"))
 (custom-add-loads 'menu '("menubar-items"))
 (custom-add-loads 'minibuffer '("simple" "minibuf"))
 (custom-add-loads 'log-message '("simple"))
 (custom-add-loads 'environment '("frame" "keydefs" "minibuf" "modeline" "window-xemacs" "menubar" "x-init" "toolbar-items" "cus-edit" "gnuserv" "sound"))
 (custom-add-loads 'sound '("sound"))
 (custom-add-loads 'widgets '("wid-browse" "wid-edit"))
 (custom-add-loads 'menu '("menubar-items"))
 (custom-add-loads 'minibuffer '("simple" "minibuf"))
 (custom-add-loads 'log-message '("simple"))
 (custom-add-loads 'environment '("frame" "keydefs" "minibuf" "modeline" "window-xemacs" "menubar" "x-init" "toolbar-items" "cus-edit" "gnuserv" "sound"))
 (custom-add-loads 'sound '("sound"))

+(custom-add-loads 'pui '("package-ui"))

 (custom-add-loads 'terminals '("gnuserv"))
 (custom-add-loads 'auto-save '("files" "auto-save"))
 (custom-add-loads 'mail '("simple"))
 (custom-add-loads 'terminals '("gnuserv"))
 (custom-add-loads 'auto-save '("files" "auto-save"))
 (custom-add-loads 'mail '("simple"))

@@ -46,6 +48,7 @@
 (custom-add-loads 'toolbar '("toolbar-items"))
 (custom-add-loads 'dired '("files"))
 (custom-add-loads 'dnd-debug '("dragdrop"))
 (custom-add-loads 'toolbar '("toolbar-items"))
 (custom-add-loads 'dired '("files"))
 (custom-add-loads 'dnd-debug '("dragdrop"))

+(custom-add-loads 'package-get '("package-get"))

 (custom-add-loads 'killing '("simple"))
 (custom-add-loads 'widget-button '("wid-edit"))
 (custom-add-loads 'paren-blinking '("simple"))
 (custom-add-loads 'killing '("simple"))
 (custom-add-loads 'widget-button '("wid-edit"))
 (custom-add-loads 'paren-blinking '("simple"))

diff --git a/lisp/etags.el b/lisp/etags.el
index 14f69d2..5edc1d4 100644 (file)
--- a/lisp/etags.el
+++ b/lisp/etags.el
@@ -662,7 +662,7 @@ If it returns non-nil, this file needs processing by evalling
                    syn-tab exact-syntax-table)
            (setq tag-target tagname
                  syn-tab normal-syntax-table))
                    syn-tab exact-syntax-table)
            (setq tag-target tagname
                  syn-tab normal-syntax-table))

-         (with-caps-disable-folding tag-target
+         (with-search-caps-disable-folding tag-target t

            (while tag-tables
              (set-buffer (get-tag-table-buffer (car tag-tables)))
              (bury-buffer (current-buffer))
            (while tag-tables
              (set-buffer (get-tag-table-buffer (car tag-tables)))
              (bury-buffer (current-buffer))

@@ -963,11 +963,11 @@ To continue searching for next match, use command \\[tags-loop-continue].
 See documentation of variable `tag-table-alist'."
   (interactive "sTags search (regexp): ")
   (if (and (equal regexp "")
 See documentation of variable `tag-table-alist'."
   (interactive "sTags search (regexp): ")
   (if (and (equal regexp "")

-           (eq (car tags-loop-scan) 'with-caps-disable-folding)
+           (eq (car tags-loop-scan) 'with-search-caps-disable-folding)

            (null tags-loop-operate))
       ;; Continue last tags-search as if by `M-,'.
       (tags-loop-continue nil)
            (null tags-loop-operate))
       ;; Continue last tags-search as if by `M-,'.
       (tags-loop-continue nil)

-    (setq tags-loop-scan `(with-caps-disable-folding ,regexp
+    (setq tags-loop-scan `(with-search-caps-disable-folding ,regexp t

                             (re-search-forward ,regexp nil t))
           tags-loop-operate nil)
     (tags-loop-continue (or file-list-form t))))
                             (re-search-forward ,regexp nil t))
           tags-loop-operate nil)
     (tags-loop-continue (or file-list-form t))))

@@ -982,7 +982,7 @@ with the command \\[tags-loop-continue].
 See documentation of variable `tag-table-alist'."
   (interactive
    "sTags query replace (regexp): \nsTags query replace %s by: \nP")
 See documentation of variable `tag-table-alist'."
   (interactive
    "sTags query replace (regexp): \nsTags query replace %s by: \nP")

-  (setq tags-loop-scan `(with-caps-disable-folding ,from
+  (setq tags-loop-scan `(with-search-caps-disable-folding ,from t

                           (if (re-search-forward ,from nil t)
                               ;; When we find a match, move back
                               ;; to the beginning of it so perform-replace
                           (if (re-search-forward ,from nil t)
                               ;; When we find a match, move back
                               ;; to the beginning of it so perform-replace

diff --git a/lisp/events.el b/lisp/events.el
index c587e75..2c1706f 100644 (file)
--- a/lisp/events.el
+++ b/lisp/events.el
@@ -120,8 +120,6 @@ See `keyboard-translate-table' for more information."
   (while pairs
     (puthash (pop pairs) (pop pairs) keyboard-translate-table)))
 
   (while pairs
     (puthash (pop pairs) (pop pairs) keyboard-translate-table)))
 

-(put 'backspace 'ascii-character ?\b)
-(put 'delete    'ascii-character ?\177)

 (put 'tab       'ascii-character ?\t)
 (put 'linefeed  'ascii-character ?\n)
 (put 'clear     'ascii-character 12)
 (put 'tab       'ascii-character ?\t)
 (put 'linefeed  'ascii-character ?\n)
 (put 'clear     'ascii-character 12)

diff --git a/lisp/files.el b/lisp/files.el
index 2c288c3..ff3f585 100644 (file)
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -1342,17 +1342,12 @@ and we don't even do that unless it would come from the file name."
                          (setq alist (cdr alist)))))))
               (if mode
                  (if (not (fboundp mode))
                          (setq alist (cdr alist)))))))
               (if mode
                  (if (not (fboundp mode))

-                     (progn
-                       (if (or (not (boundp 'package-get-base))
-                               (not package-get-base))
-                           (load "package-get-base"))
-                       (require 'package-get)
-                       (let ((name (package-get-package-provider mode)))
-                         (if name
-                             (message "Mode %s is not installed.  Download package %s" mode name)
-                           (message "Mode %s either doesn't exist or is not a known package" mode))
-                         (sit-for 2)
-                         (error "%s" mode)))
+                      (let ((name (package-get-package-provider mode)))
+                        (if name
+                            (message "Mode %s is not installed.  Download package %s" mode name)
+                          (message "Mode %s either doesn't exist or is not a known package" mode))
+                        (sit-for 2)
+                        (error "%s" mode))

                    (unless (and just-from-file-name
                                 (or
                                  ;; Don't reinvoke major mode.
                    (unless (and just-from-file-name
                                 (or
                                  ;; Don't reinvoke major mode.

diff --git a/lisp/info.el b/lisp/info.el
index eb62c6f..fdbd74c 100644 (file)
--- a/lisp/info.el
+++ b/lisp/info.el
@@ -308,6 +308,10 @@
 ;; contain none or when it has become older than info files in the same
 ;; directory.
 
 ;; contain none or when it has become older than info files in the same
 ;; directory.
 

+;; Modified 1998-09-23 by Didier Verna <verna@inf.enst.fr>
+;;
+;; Use the new macro `with-search-caps-disable-folding'
+

 ;; Code:
 
 (defgroup info nil
 ;; Code:
 
 (defgroup info nil

@@ -1571,7 +1575,7 @@ annotation for any node of any file.  (See `a' and `x' commands.)"
   (if (equal regexp "")
       (setq regexp Info-last-search)
     (setq Info-last-search regexp))
   (if (equal regexp "")
       (setq regexp Info-last-search)
     (setq Info-last-search regexp))

-  (with-caps-disable-folding regexp
+  (with-search-caps-disable-folding regexp t

     (let ((found ())
           (onode Info-current-node)
           (ofile Info-current-file)
     (let ((found ())
           (onode Info-current-node)
           (ofile Info-current-file)

diff --git a/lisp/isearch-mode.el b/lisp/isearch-mode.el
index c1f7ef5..961a0b7 100644 (file)
--- a/lisp/isearch-mode.el
+++ b/lisp/isearch-mode.el
@@ -148,12 +148,6 @@ that the search has reached."
   :type 'integer
   :group 'isearch)
 
   :type 'integer
   :group 'isearch)
 

-(defcustom search-caps-disable-folding t
-  "*If non-nil, upper case chars disable case fold searching.
-This does not apply to \"yanked\" strings."
-  :type 'boolean
-  :group 'isearch)
-

 (defcustom search-nonincremental-instead t
   "*If non-nil, do a nonincremental search instead if exiting immediately."
   :type 'boolean
 (defcustom search-nonincremental-instead t
   "*If non-nil, do a nonincremental search instead if exiting immediately."
   :type 'boolean

@@ -587,7 +581,7 @@ is treated as a regexp.  See \\[isearch-forward] for more info."
                      (cons isearch-string regexp-search-ring)
                      regexp-search-ring-yank-pointer regexp-search-ring)
                (if (> (length regexp-search-ring) regexp-search-ring-max)
                      (cons isearch-string regexp-search-ring)
                      regexp-search-ring-yank-pointer regexp-search-ring)
                (if (> (length regexp-search-ring) regexp-search-ring-max)

-                   (setcdr (nthcdr (1- search-ring-max) regexp-search-ring)
+                   (setcdr (nthcdr (1- regexp-search-ring-max) regexp-search-ring)

                            nil))))
        (if (not (setq search-ring-yank-pointer
                       ;; really need equal test instead of eq.
                            nil))))
        (if (not (setq search-ring-yank-pointer
                       ;; really need equal test instead of eq.

@@ -938,7 +932,8 @@ backwards."
 
 (defun isearch-fix-case ()
   (if (and isearch-case-fold-search search-caps-disable-folding)
 
 (defun isearch-fix-case ()
   (if (and isearch-case-fold-search search-caps-disable-folding)

-      (setq isearch-case-fold-search (isearch-no-upper-case-p isearch-string)))
+      (setq isearch-case-fold-search 
+           (no-upper-case-p isearch-string isearch-regexp)))

   (setq isearch-mode (if case-fold-search
                          (if isearch-case-fold-search
                              " Isearch"  ;As God Intended Mode
   (setq isearch-mode (if case-fold-search
                          (if isearch-case-fold-search
                              " Isearch"  ;As God Intended Mode

@@ -1598,11 +1593,10 @@ currently matches the search-string.")
 ;    ;; Go ahead and search.
 ;    (if search-caps-disable-folding
 ;      (setq isearch-case-fold-search 
 ;    ;; Go ahead and search.
 ;    (if search-caps-disable-folding
 ;      (setq isearch-case-fold-search 

-;            (isearch-no-upper-case-p isearch-string)))
+;            (no-upper-case-p isearch-string isearch-regexp)))

 ;    (let ((case-fold-search isearch-case-fold-search))
 ;      (funcall function isearch-string))))
 
 ;    (let ((case-fold-search isearch-case-fold-search))
 ;      (funcall function isearch-string))))
 

-

 (defun isearch-no-upper-case-p (string)
   "Return t if there are no upper case chars in string.
 But upper case chars preceded by \\ do not count since they
 (defun isearch-no-upper-case-p (string)
   "Return t if there are no upper case chars in string.
 But upper case chars preceded by \\ do not count since they

@@ -1610,6 +1604,7 @@ have special meaning in a regexp."
   ;; this incorrectly returns t for "\\\\A"
   (let ((case-fold-search nil))
     (not (string-match "\\(^\\|[^\\]\\)[A-Z]" string))))
   ;; this incorrectly returns t for "\\\\A"
   (let ((case-fold-search nil))
     (not (string-match "\\(^\\|[^\\]\\)[A-Z]" string))))

+(make-obsolete 'isearch-no-upper-case-p 'no-upper-case-p)

 
 ;; Used by etags.el and info.el
 (defmacro with-caps-disable-folding (string &rest body) "\
 
 ;; Used by etags.el and info.el
 (defmacro with-caps-disable-folding (string &rest body) "\

@@ -1620,6 +1615,7 @@ uppercase letters and `search-caps-disable-folding' is t."
               (isearch-no-upper-case-p ,string)
             case-fold-search)))
      ,@body))
               (isearch-no-upper-case-p ,string)
             case-fold-search)))
      ,@body))

+(make-obsolete 'with-caps-disable-folding 'with-search-caps-disable-folding)

 (put 'with-caps-disable-folding 'lisp-indent-function 1)
 (put 'with-caps-disable-folding 'edebug-form-spec '(form body))
 
 (put 'with-caps-disable-folding 'lisp-indent-function 1)
 (put 'with-caps-disable-folding 'edebug-form-spec '(form body))
 

diff --git a/lisp/lisp-mnt.el b/lisp/lisp-mnt.el
index 0eda679..f03f23e 100644 (file)
--- a/lisp/lisp-mnt.el
+++ b/lisp/lisp-mnt.el
@@ -407,7 +407,7 @@ with tag `Commentary' and ends with tag `Change Log' or `History'."
        (let ((commentary       (lm-commentary-mark))
              (change-log       (lm-history-mark))
              (code             (lm-code-mark))
        (let ((commentary       (lm-commentary-mark))
              (change-log       (lm-history-mark))
              (code             (lm-code-mark))

-             )
+             end)

          (cond
           ((and commentary change-log)
            (buffer-substring commentary change-log))
          (cond
           ((and commentary change-log)
            (buffer-substring commentary change-log))

@@ -415,9 +415,9 @@ with tag `Commentary' and ends with tag `Change Log' or `History'."
            (buffer-substring commentary code))
           (t
            ;; XEmacs change (Infodock headers? -sb)
            (buffer-substring commentary code))
           (t
            ;; XEmacs change (Infodock headers? -sb)

-           (setq commentary (lm-section-mark "DESCRIPTION" t)
-                 code (lm-section-mark "DESCRIP-END"))
-           (and commentary end (buffer-substring commentary code)))))
+           (setq commentary (lm-section-mark "DESCRIPTION" t))
+           (setq end (lm-section-mark "DESCRIP-END"))
+           (and commentary end (buffer-substring commentary end)))))

       (if file
          (kill-buffer (current-buffer)))
       )))
       (if file
          (kill-buffer (current-buffer)))
       )))

@@ -560,7 +560,9 @@ Prompts for bug subject.  Leaves you in a mail buffer."
     (mail nil
          (if addr
              (concat (car addr) " <" (cdr addr) ">")
     (mail nil
          (if addr
              (concat (car addr) " <" (cdr addr) ">")

-           bug-gnu-emacs)
+           (or (and (boundp 'report-emacs-bug-beta-address)
+                    report-emacs-bug-beta-address)
+               "<xemacs-beta@xemacs.org>"))

          topic)
     (goto-char (point-max))
     (insert "\nIn "
          topic)
     (goto-char (point-max))
     (insert "\nIn "

diff --git a/lisp/menubar-items.el b/lisp/menubar-items.el
index a281501..0eb7865 100644 (file)
--- a/lisp/menubar-items.el
+++ b/lisp/menubar-items.el
@@ -231,9 +231,18 @@
        ["Saved..." customize-saved]
        ["Set..." customize-customized]
        ["Apropos..." customize-apropos]
        ["Saved..." customize-saved]
        ["Set..." customize-customized]
        ["Apropos..." customize-apropos]

-       ["Browse..." customize-browse]
-       ["List Packages" pui-list-packages]
-       ["Update Packages" package-get-custom])
+       ["Browse..." customize-browse])
+      
+      ("Manage Packages"
+       ["List & Install" pui-list-packages]
+       ("Using Custom"
+       ("Select" :filter (lambda (&rest junk)
+                         (cdr (custom-menu-create 'packages))))
+       ["Update" package-get-custom])
+       ["Help" (Info-goto-node "(xemacs)Packages")])
+
+      "---"
+      

       ("Editing Options"
        ["Overstrike"
        (progn
       ("Editing Options"
        ["Overstrike"
        (progn

diff --git a/lisp/mouse.el b/lisp/mouse.el
index ced0442..a401d3b 100644 (file)
--- a/lisp/mouse.el
+++ b/lisp/mouse.el
@@ -780,7 +780,7 @@ at the initial click position."
 ;; Decide what will be the SYMBOLP argument to
 ;; default-mouse-track-{beginning,end}-of-word, according to the
 ;; syntax of the current character and value of mouse-highlight-text.
 ;; Decide what will be the SYMBOLP argument to
 ;; default-mouse-track-{beginning,end}-of-word, according to the
 ;; syntax of the current character and value of mouse-highlight-text.

-(defsubst default-mouse-symbolp (syntax)
+(defsubst default-mouse-track-symbolp (syntax)

   (cond ((eq mouse-highlight-text 'context)
         (eq syntax ?_))
        ((eq mouse-highlight-text 'symbol)
   (cond ((eq mouse-highlight-text 'context)
         (eq syntax ?_))
        ((eq mouse-highlight-text 'symbol)

@@ -788,22 +788,33 @@ at the initial click position."
        (t
         nil)))
 
        (t
         nil)))
 

+;; Return t if point is at an opening quote character.  This is
+;; determined by testing whether the syntax of the following character
+;; is `string', which will always be true for opening quotes and
+;; always false for closing quotes.
+(defun default-mouse-track-point-at-opening-quote-p ()
+  (save-excursion
+    (forward-char 1)
+    (eq (buffer-syntactic-context) 'string)))
+

 (defun default-mouse-track-normalize-point (type forwardp)
   (cond ((eq type 'word)
         ;; trap the beginning and end of buffer errors
         (ignore-errors
           (setq type (char-syntax (char-after (point))))
           (if forwardp
 (defun default-mouse-track-normalize-point (type forwardp)
   (cond ((eq type 'word)
         ;; trap the beginning and end of buffer errors
         (ignore-errors
           (setq type (char-syntax (char-after (point))))
           (if forwardp

-              (if (= type ?\()
+              (if (or (= type ?\()
+                      (and (= type ?\")
+                           (default-mouse-track-point-at-opening-quote-p)))

                   (goto-char (scan-sexps (point) 1))
                   (goto-char (scan-sexps (point) 1))

-                (if (= type  ?\))
-                    (forward-char 1)
-                  (default-mouse-track-end-of-word
-                    (default-mouse-symbolp type))))
-            (if (= type ?\))
+                (default-mouse-track-end-of-word
+                  (default-mouse-track-symbolp type)))
+            (if (or (= type ?\))
+                    (and (= type ?\")
+                         (not (default-mouse-track-point-at-opening-quote-p))))

                 (goto-char (scan-sexps (1+ (point)) -1))
               (default-mouse-track-beginning-of-word
                 (goto-char (scan-sexps (1+ (point)) -1))
               (default-mouse-track-beginning-of-word

-                (default-mouse-symbolp type))))))
+                (default-mouse-track-symbolp type))))))

        ((eq type 'line)
         (if forwardp (end-of-line) (beginning-of-line)))
        ((eq type 'buffer)
        ((eq type 'line)
         (if forwardp (end-of-line) (beginning-of-line)))
        ((eq type 'buffer)

diff --git a/lisp/package-admin.el b/lisp/package-admin.el
index 7099173..e205846 100644 (file)
--- a/lisp/package-admin.el
+++ b/lisp/package-admin.el
@@ -146,14 +146,34 @@ to buffer BUF."
 ;              ;; rest of command line follows
 ;              package-admin-xemacs file pkg-dir))
 
 ;              ;; rest of command line follows
 ;              package-admin-xemacs file pkg-dir))
 

-(defun package-admin-get-install-dir (pkg-dir)
-  (when (null pkg-dir)
-    (when (or (not (listp late-packages))
-             (not late-packages))
-      (error "No package path"))
-    (setq pkg-dir (car (last late-packages))))
-  pkg-dir
-  )
+(defun package-admin-get-install-dir (package pkg-dir &optional mule-related)
+  "If PKG-DIR is non-nil return that,
+else return the current location of the package if it is already installed
+or return a location appropriate for the package otherwise."
+  (if pkg-dir
+      pkg-dir
+    (let ((package-feature (intern-soft (concat
+                                        (symbol-name package) "-autoloads")))
+         autoload-dir)
+      (when (and (not (eq package 'unknown))
+                (featurep package-feature)
+                (setq autoload-dir (feature-file package-feature))
+                (setq autoload-dir (file-name-directory autoload-dir))
+                (member autoload-dir late-package-load-path))
+       ;; Find the corresonding entry in late-package
+       (setq pkg-dir
+             (car-safe (member-if (lambda (h)
+                          (string-match (concat "^" (regexp-quote h))
+                                        autoload-dir))
+                        late-packages))))
+      (if pkg-dir
+         pkg-dir
+       ;; Ok we need to guess
+       (if mule-related
+           (package-admin-get-install-dir 'mule-base nil nil)
+         (car (last late-packages)))))))
+         
+

 
 (defun package-admin-get-manifest-file (pkg-topdir package)
   "Return the name of the MANIFEST file for package PACKAGE.
 
 (defun package-admin-get-manifest-file (pkg-topdir package)
   "Return the name of the MANIFEST file for package PACKAGE.

@@ -299,7 +319,7 @@ is the top-level directory under which the package was installed."
        (status 1)
        start err-list
        )
        (status 1)
        start err-list
        )

-    (setq pkg-dir (package-admin-get-install-dir pkg-dir))
+    (setq pkg-dir (package-admin-get-install-dir 'unknown pkg-dir))

     ;; Insure that the current directory doesn't change
     (save-excursion
       (set-buffer buf)
     ;; Insure that the current directory doesn't change
     (save-excursion
       (set-buffer buf)

@@ -334,37 +354,29 @@ is the top-level directory under which the package was installed."
 (defun package-admin-rmtree (directory)
   "Delete a directory and all of its contents, recursively.
 This is a feeble attempt at making a portable rmdir."
 (defun package-admin-rmtree (directory)
   "Delete a directory and all of its contents, recursively.
 This is a feeble attempt at making a portable rmdir."

-  (let ( (orig-default-directory default-directory) files dirs dir)
-    (unwind-protect
-       (progn
-         (setq directory (file-name-as-directory directory))
-         (setq files (directory-files directory nil nil nil t))
-         (setq dirs (directory-files directory nil nil nil 'dirs))
-         (while dirs
-           (setq dir (car dirs))
-           (if (file-symlink-p dir)    ;; just in case, handle symlinks
-               (delete-file dir)
-             (if (not (or (string-equal dir ".") (string-equal dir "..")))
-                 (package-admin-rmtree (expand-file-name dir directory))))
-           (setq dirs (cdr dirs))
-           )
-         (setq default-directory directory)
-         (condition-case err
-             (progn
-               (while files
-                 (delete-file (car files))
-                 (setq files (cdr files))
-                 )
-               (delete-directory directory)
-               )
-           (file-error
-            (message "%s: %s: \"%s\"" (nth 1 err) (nth 2 err) (nth 3 err)))
-           )
-         )
-      (progn
-       (setq default-directory orig-default-directory)
-       ))
-    ))
+  (setq directory (file-name-as-directory directory))
+  (let ((files (directory-files directory nil nil nil t))
+        (dirs (directory-files directory nil nil nil 'dirs)))
+    (while dirs
+      (if (not (member (car dirs) '("." "..")))
+          (let ((dir (expand-file-name (car dirs) directory)))
+            (condition-case err
+                (if (file-symlink-p dir) ;; just in case, handle symlinks
+                    (delete-file dir)
+                  (package-admin-rmtree dir))
+              (file-error
+               (message "%s: %s: \"%s\"" (nth 1 err) (nth 2 err) (nth 3 err)))))
+        (setq dirs (cdr dirs))))
+    (while files
+      (condition-case err
+          (delete-file (expand-file-name (car files) directory))
+        (file-error
+         (message "%s: %s: \"%s\"" (nth 1 err) (nth 2 err) (nth 3 err))))
+      (setq files (cdr files)))
+    (condition-case err
+        (delete-directory directory)
+      (file-error
+       (message "%s: %s: \"%s\"" (nth 1 err) (nth 2 err) (nth 3 err))))))

 
 (defun package-admin-get-lispdir  (pkg-topdir package)
   (let (package-lispdir)
 
 (defun package-admin-get-lispdir  (pkg-topdir package)
   (let (package-lispdir)

@@ -379,8 +391,7 @@ This is a feeble attempt at making a portable rmdir."
   "Delete a binary installation of PACKAGE below directory PKG-TOPDIR.
 PACKAGE is a symbol, not a string."
   (let ( (tmpbuf " *pkg-manifest*") manifest-file package-lispdir dirs file)
   "Delete a binary installation of PACKAGE below directory PKG-TOPDIR.
 PACKAGE is a symbol, not a string."
   (let ( (tmpbuf " *pkg-manifest*") manifest-file package-lispdir dirs file)

-    (if (not pkg-topdir)
-       (setq pkg-topdir (package-admin-get-install-dir nil)))
+    (setq pkg-topdir (package-admin-get-install-dir package pkg-topdir))

     (setq manifest-file (package-admin-get-manifest-file pkg-topdir package))
     (if (file-exists-p manifest-file)
        (progn
     (setq manifest-file (package-admin-get-manifest-file pkg-topdir package))
     (if (file-exists-p manifest-file)
        (progn

@@ -388,89 +399,99 @@ PACKAGE is a symbol, not a string."
          (message "Removing old files for package \"%s\" ..." package)
          (sit-for 0)
          (setq tmpbuf (get-buffer-create tmpbuf))
          (message "Removing old files for package \"%s\" ..." package)
          (sit-for 0)
          (setq tmpbuf (get-buffer-create tmpbuf))

-         (save-excursion
-           (set-buffer tmpbuf)
-           (buffer-disable-undo tmpbuf)
-           (erase-buffer tmpbuf)
+         (with-current-buffer tmpbuf
+           (buffer-disable-undo)
+           (erase-buffer)

            (insert-file-contents manifest-file)
            (goto-char (point-min))
            (insert-file-contents manifest-file)
            (goto-char (point-min))

+

            ;; For each entry in the MANIFEST ...
            (while (< (point) (point-max))
              (beginning-of-line)
              (setq file (expand-file-name (buffer-substring
                                            (point)
            ;; For each entry in the MANIFEST ...
            (while (< (point) (point-max))
              (beginning-of-line)
              (setq file (expand-file-name (buffer-substring
                                            (point)

-                                           (save-excursion (end-of-line)
-                                                           (point)))
+                                           (point-at-eol))

                                           pkg-topdir))
              (if (file-directory-p file)
                  ;; Keep a record of each directory
                  (setq dirs (cons file dirs))
                                           pkg-topdir))
              (if (file-directory-p file)
                  ;; Keep a record of each directory
                  (setq dirs (cons file dirs))

-               (progn

                  ;; Delete each file.
                  ;; Make sure that the file is writable.
                  ;; (This is important under MS Windows.)
                  ;; Delete each file.
                  ;; Make sure that the file is writable.
                  ;; (This is important under MS Windows.)

-                 (set-file-modes file 438) ;; 438 -> #o666
-                 (delete-file file)
-                 ))
-             (forward-line 1)
-             )
+                 ;; I do not know why it important under MS Windows but
+                 ;;    1. It bombs out out when the file does not exist. This can be condition-cased
+                 ;;    2. If I removed the write permissions, I do not want XEmacs to just ignore them.
+                 ;;       If it wants to, XEmacs may ask, but that is about all
+                 ;; (set-file-modes file 438) ;; 438 -> #o666
+                 ;; Note, user might have removed the file!
+               (condition-case ()
+                   (delete-file file)
+                 (error nil)))         ;; We may want to turn the error into a Warning?   
+             (forward-line 1))
+             

            ;; Delete empty directories.
            (if dirs
                (let ( (orig-default-directory default-directory)
                       directory files file )
                  ;; Make sure we preserve the existing `default-directory'.
            ;; Delete empty directories.
            (if dirs
                (let ( (orig-default-directory default-directory)
                       directory files file )
                  ;; Make sure we preserve the existing `default-directory'.

+                 ;; JV, why does this change the default directory? Does it indeed?

                  (unwind-protect
                      (progn
                        ;; Warning: destructive sort!
                        (setq dirs (nreverse (sort dirs 'string<)))
                  (unwind-protect
                      (progn
                        ;; Warning: destructive sort!
                        (setq dirs (nreverse (sort dirs 'string<)))

-                       ;; For each directory ...
-                       (while dirs
-                         (setq directory (file-name-as-directory (car dirs)))
-                         (setq files (directory-files directory))
-                         ;; Delete the directory if it's empty.
-                         (if (catch 'done
-                               (while files
-                                 (setq file (car files))
-                                 (if (and (not (string= file "."))
-                                          (not (string= file "..")))
-                                     (throw 'done nil))
-                                 (setq files (cdr files))
-                                 )
-                               t)
-                             (delete-directory directory))
-                         (setq dirs (cdr dirs))
-                         )
-                       )
+;                      ;; For each directory ...
+;                      (while dirs
+;                        (setq directory (file-name-as-directory (car dirs)))
+;                        (setq files (directory-files directory))
+;                        ;; Delete the directory if it's empty.
+;                        (if (catch 'done
+;                              (while files
+;                                (setq file (car files))
+;                                (if (and (not (string= file "."))
+;                                         (not (string= file "..")))
+;                                    (throw 'done nil))
+;                                (setq files (cdr files))
+;                                )
+;                              t)
+;                            (
+;                            (delete-directory directory))
+;                        (setq dirs (cdr dirs))
+;                        )
+                       ;; JV, On all OS's that I know of delete-directory fails on
+                       ;; on non-empty dirs anyway
+                       (mapc
+                          (lambda (dir)
+                            (condition-case ()
+                                (delete-directory dir)))
+                          dirs))                       

                    (setq default-directory orig-default-directory)
                    )))
            )
          (kill-buffer tmpbuf)
          ;; Delete the MANIFEST file
                    (setq default-directory orig-default-directory)
                    )))
            )
          (kill-buffer tmpbuf)
          ;; Delete the MANIFEST file

-         (set-file-modes manifest-file 438) ;; 438 -> #o666
-         (delete-file manifest-file)
-         (message "Removing old files for package \"%s\" ... done" package)
-         )
-      (progn
+         ;; (set-file-modes manifest-file 438) ;; 438 -> #o666
+         ;; Note. Packages can have MANIFEST in MANIFEST.
+         (condition-case ()
+             (delete-file manifest-file)
+           (error nil)) ;; Do warning?
+         (message "Removing old files for package \"%s\" ... done" package))

        ;; The manifest file doesn't exist.  Fallback to just deleting the
        ;; package-specific lisp directory, if it exists.
        ;;
        ;; Delete old lisp directory, if any
        ;; Gads, this is ugly.  However, we're not supposed to use `concat'
        ;; in the name of portability.
        ;; The manifest file doesn't exist.  Fallback to just deleting the
        ;; package-specific lisp directory, if it exists.
        ;;
        ;; Delete old lisp directory, if any
        ;; Gads, this is ugly.  However, we're not supposed to use `concat'
        ;; in the name of portability.

-       (if (setq package-lispdir (package-admin-get-lispdir pkg-topdir
+       (when (setq package-lispdir (package-admin-get-lispdir pkg-topdir

                                                             package))
                                                             package))

-           (progn

              (message "Removing old lisp directory \"%s\" ..."
                       package-lispdir)
              (sit-for 0)
              (package-admin-rmtree package-lispdir)
              (message "Removing old lisp directory \"%s\" ... done"
                       package-lispdir)
              (message "Removing old lisp directory \"%s\" ..."
                       package-lispdir)
              (sit-for 0)
              (package-admin-rmtree package-lispdir)
              (message "Removing old lisp directory \"%s\" ... done"
                       package-lispdir)

-             ))
-       ))
+             ))        

     ;; Delete the package from the database of installed packages.
     ;; Delete the package from the database of installed packages.

-    (package-delete-name package)
-    ))
+    (package-delete-name package)))

 
 (provide 'package-admin)
 
 
 (provide 'package-admin)
 

diff --git a/lisp/package-get.el b/lisp/package-get.el
index 4675572..023fe91 100644 (file)
--- a/lisp/package-get.el
+++ b/lisp/package-get.el
@@ -97,8 +97,17 @@
 ;;; Code:
 
 (require 'package-admin)
 ;;; Code:
 
 (require 'package-admin)

-(require 'package-get-base)
+;; (require 'package-get-base)

 
 

+(defgroup package-tools nil
+  "Tools to manipulate packages."
+  :group 'emacs)
+
+(defgroup package-get nil
+  "Automatic Package Fetcher and Installer."
+  :prefix "package-get"
+  :group 'package-tools)
+  

 (defvar package-get-base nil
   "List of packages that are installed at this site.
 For each element in the alist,  car is the package name and the cdr is
 (defvar package-get-base nil
   "List of packages that are installed at this site.
 For each element in the alist,  car is the package name and the cdr is

@@ -145,25 +154,157 @@ recent to least recent -- in other words, the version names don't have to
 be lexically ordered.  It is debatable if it makes sense to have more than
 one version of a package available.")
 
 be lexically ordered.  It is debatable if it makes sense to have more than
 one version of a package available.")
 

-(defvar package-get-dir (temp-directory)
-  "*Where to store temporary files for staging.")
+(defcustom package-get-dir (temp-directory)
+  "*Where to store temporary files for staging."
+  :tag "Temporary directory"
+  :type 'directory
+  :group 'package-get)

 
 

-(defvar package-get-remote
+;; JV Any Custom expert know to get "Host" and "Dir" for the remote option
+(defcustom package-get-remote

   '(("ftp.xemacs.org" "/pub/xemacs/packages"))
   "*List of remote sites to contact for downloading packages.
 List format is '(site-name directory-on-site).  Each site is tried in
 order until the package is found.  As a special case, `site-name' can be
   '(("ftp.xemacs.org" "/pub/xemacs/packages"))
   "*List of remote sites to contact for downloading packages.
 List format is '(site-name directory-on-site).  Each site is tried in
 order until the package is found.  As a special case, `site-name' can be

-`nil', in which case `directory-on-site' is treated as a local directory.")
+`nil', in which case `directory-on-site' is treated as a local directory."
+  :tag "Package repository"
+  :type '(repeat (choice (list :tag "Local" (const :tag "Local" nil) directory )
+                        (list :tag "Remote" string string) ))
+  :group 'package-get)

 
 

-(defvar package-get-remove-copy nil
+(defcustom package-get-remove-copy nil

   "*After copying and installing a package, if this is T, then remove the
   "*After copying and installing a package, if this is T, then remove the

-copy.  Otherwise, keep it around.")
+copy.  Otherwise, keep it around."
+  :type 'boolean
+  :group 'package-get)
+
+(defcustom package-get-base-filename
+  "/ftp.xemacs.org:/pub/xemacs/packages/package-index.LATEST"
+  "*Name of the default package database file, usually on ftp.xemacs.org."
+  :type 'file
+  :group 'package-get)
+
+;;;###autoload
+(defun package-get-require-base ()
+  "Require that a package-get database has been loaded."
+  (when (or (not (boundp 'package-get-base))
+            (not package-get-base))
+    (package-get-update-base))
+  (when (or (not (boundp 'package-get-base))
+            (not package-get-base))
+    (error "Package-get database not loaded")))
+
+(defconst package-get-pgp-signed-begin-line "^-----BEGIN PGP SIGNED MESSAGE-----"
+  "Text for start of PGP signed messages.")
+(defconst package-get-pgp-signature-begin-line "^-----BEGIN PGP SIGNATURE-----"
+  "Text for beginning of PGP signature.")
+(defconst package-get-pgp-signature-end-line "^-----END PGP SIGNATURE-----"
+  "Text for end of PGP signature.")
+
+;;;###autoload
+(defun package-get-update-base-entry (entry)
+  "Update an entry in `package-get-base'."
+  (let ((existing (assoc (car entry) package-get-base)))
+    (if existing
+        (setcdr existing (cdr entry))
+      (setq package-get-base (cons entry package-get-base)))))
+
+;;;###autoload
+(defun package-get-update-base (&optional db-file)
+  "Update the package-get database file with entries from DB-FILE."
+  (interactive (list
+                (read-file-name "Load package-get database: "
+                                (file-name-directory package-get-base-filename)
+                                package-get-base-filename
+                                t
+                                (file-name-nondirectory package-get-base-filename))))
+  (setq db-file (expand-file-name (or db-file package-get-base-filename)))
+  (if (not (file-exists-p db-file))
+      (error "Package-get database file `%s' does not exist" db-file))
+  (if (not (file-readable-p db-file))
+      (error "Package-get database file `%s' not readable" db-file))
+  (let ((buf (get-buffer-create "*package database*")))
+    (unwind-protect
+        (save-excursion
+          (set-buffer buf)
+          (erase-buffer buf)
+          (insert-file-contents-internal db-file)
+          (package-get-update-base-from-buffer buf))
+      (kill-buffer buf))))
+
+;;;###autoload
+(defun package-get-update-base-from-buffer (&optional buf)
+  "Update the package-get database with entries from BUFFER.
+BUFFER defaults to the current buffer.  This command can be
+used interactively, for example from a mail or news buffer."
+  (interactive)
+  (setq buf (or buf (current-buffer)))
+  (let (content-beg content-end beg end)
+    (save-excursion
+      (set-buffer buf)
+      (goto-char (point-min))
+      (setq content-beg (point))
+      (setq content-end (save-excursion (goto-char (point-max)) (point)))
+      (when (re-search-forward package-get-pgp-signed-begin-line nil t)
+        (setq beg (match-beginning 0))
+        (setq content-beg (match-end 0)))
+      (when (re-search-forward package-get-pgp-signature-begin-line nil t)
+        (setq content-end (match-beginning 0)))
+      (when (re-search-forward package-get-pgp-signature-end-line nil t)
+        (setq end (point)))
+      (if (not (and content-beg content-end beg end))
+          (or (yes-or-no-p "Package-get entries not PGP signed, continue? ")
+              (error "Package-get database not updated")))
+      (if (and content-beg content-end beg end)
+          (if (not (condition-case nil
+                       (or (fboundp 'mc-pgp-verify-region)
+                           (load-library "mc-pgp")
+                           (fboundp 'mc-pgp-verify-region))
+                     (error nil)))
+              (or (yes-or-no-p
+                   "No mailcrypt; can't verify package-get DB signature, continue? ")
+                  (error "Package-get database not updated"))))
+      (if (and beg end
+               (fboundp 'mc-pgp-verify-region)
+               (or (not
+                    (condition-case err
+                        (mc-pgp-verify-region beg end)
+                      (file-error
+                       (and (string-match "No such file" (nth 2 err))
+                            (yes-or-no-p
+                             "Can't find PGP, continue without package-get DB verification? ")))
+                      (t nil)))))
+          (error "Package-get PGP signature failed to verify"))
+      (package-get-update-base-entries content-beg content-end)
+      (message "Updated package-get database"))))
+
+(defun package-get-update-base-entries (beg end)
+  "Update the package-get database with the entries found between
+BEG and END in the current buffer."
+  (save-excursion
+    (goto-char beg)
+    (if (not (re-search-forward "^(package-get-update-base-entry" nil t))
+        (error "Buffer does not contain package-get database entries"))
+    (beginning-of-line)
+    (let ((count 0))
+      (while (and (< (point) end)
+                  (re-search-forward "^(package-get-update-base-entry" nil t))
+        (beginning-of-line)
+        (let ((entry (read (current-buffer))))
+          (if (or (not (consp entry))
+                  (not (eq (car entry) 'package-get-update-base-entry)))
+              (error "Invalid package-get database entry found"))
+          (package-get-update-base-entry
+           (car (cdr (car (cdr entry)))))
+          (setq count (1+ count))))
+      (message "Got %d package-get database entries" count))))

 
 (defun package-get-interactive-package-query (get-version package-symbol)
   "Perform interactive querying for package and optional version.
 Query for a version if GET-VERSION is non-nil.  Return package name as
 a symbol instead of a string if PACKAGE-SYMBOL is non-nil.
 The return value is suitable for direct passing to `interactive'."
 
 (defun package-get-interactive-package-query (get-version package-symbol)
   "Perform interactive querying for package and optional version.
 Query for a version if GET-VERSION is non-nil.  Return package name as
 a symbol instead of a string if PACKAGE-SYMBOL is non-nil.
 The return value is suitable for direct passing to `interactive'."

+  (package-get-require-base)

   (let ( (table (mapcar '(lambda (item)
                           (let ( (name (symbol-name (car item))) )
                             (cons name name)
   (let ( (table (mapcar '(lambda (item)
                           (let ( (name (symbol-name (car item))) )
                             (cons name name)

@@ -206,6 +347,7 @@ This is just an interactive wrapper for `package-admin-delete-binary-package'."
 (defun package-get-update-all ()
   "Fetch and install the latest versions of all currently installed packages."
   (interactive)
 (defun package-get-update-all ()
   "Fetch and install the latest versions of all currently installed packages."
   (interactive)

+  (package-get-require-base)

   ;; Load a fresh copy
   (catch 'exit
     (mapcar (lambda (pkg)
   ;; Load a fresh copy
   (catch 'exit
     (mapcar (lambda (pkg)

@@ -215,12 +357,14 @@ This is just an interactive wrapper for `package-admin-delete-binary-package'."
            packages-package-list)))
 
 ;;;###autoload
            packages-package-list)))
 
 ;;;###autoload

-(defun package-get-all (package version &optional fetched-packages)
+(defun package-get-all (package version &optional fetched-packages install-dir)

   "Fetch PACKAGE with VERSION and all other required packages.
 Uses `package-get-base' to determine just what is required and what
 package provides that functionality.  If VERSION is nil, retrieves
 latest version.  Optional argument FETCHED-PACKAGES is used to keep
   "Fetch PACKAGE with VERSION and all other required packages.
 Uses `package-get-base' to determine just what is required and what
 package provides that functionality.  If VERSION is nil, retrieves
 latest version.  Optional argument FETCHED-PACKAGES is used to keep

-track of packages already fetched.
+track of packages already fetched.  Optional argument INSTALL-DIR,
+if non-nil, specifies the package directory where fetched packages
+should be installed.

 
 Returns nil upon error."
   (interactive (package-get-interactive-package-query t nil))
 
 Returns nil upon error."
   (interactive (package-get-interactive-package-query t nil))

@@ -233,7 +377,7 @@ Returns nil upon error."
     (catch 'exit
       (setq version (package-get-info-prop this-package 'version))
       (unless (package-get-installedp package version)
     (catch 'exit
       (setq version (package-get-info-prop this-package 'version))
       (unless (package-get-installedp package version)

-       (if (not (package-get package version))
+       (if (not (package-get package version nil install-dir))

            (progn
              (setq fetched-packages nil)
              (throw 'exit nil))))
            (progn
              (setq fetched-packages nil)
              (throw 'exit nil))))

@@ -256,7 +400,8 @@ Returns nil upon error."
                         (car this-requires)))
              (if (not (setq fetched-packages
                             (package-get-all reqd-name reqd-version
                         (car this-requires)))
              (if (not (setq fetched-packages
                             (package-get-all reqd-name reqd-version

-                                             fetched-packages)))
+                                             fetched-packages
+                                              install-dir)))

                  (throw 'exit nil)))
          )
        (setq this-requires (cdr this-requires)))
                  (throw 'exit nil)))
          )
        (setq this-requires (cdr this-requires)))

@@ -264,6 +409,42 @@ Returns nil upon error."
     fetched-packages
     ))
 
     fetched-packages
     ))
 

+;;;###autoload
+(defun package-get-dependencies (packages)
+  "Compute dependencies for PACKAGES.
+Uses `package-get-base' to determine just what is required and what
+package provides that functionality.  Returns the list of packages
+required by PACKAGES."
+  (package-get-require-base)
+  (let ((orig-packages packages)
+        dependencies provided)
+    (while packages
+      (let* ((package (car packages))
+             (the-package (package-get-info-find-package
+                           package-get-base package))
+             (this-package (package-get-info-version
+                            the-package nil))
+             (this-requires (package-get-info-prop this-package 'requires))
+             (new-depends   (set-difference
+                             (mapcar
+                              #'(lambda (reqd)
+                                  (let* ((reqd-package (package-get-package-provider reqd))
+                                         (reqd-version (cadr reqd-package))
+                                         (reqd-name    (car reqd-package)))
+                                    (if (null reqd-name)
+                                        (error "Unable to find a provider for %s" reqd))
+                                    reqd-name))
+                              this-requires)
+                             dependencies))
+             (this-provides (package-get-info-prop this-package 'provides)))
+        (setq dependencies
+              (union dependencies new-depends))
+        (setq provided
+              (union provided (union (list package) this-provides)))
+        (setq packages
+              (union new-depends (cdr packages)))))
+    (set-difference dependencies orig-packages)))
+

 (defun package-get-load-package-file (lispdir file)
   (let (pathname)
     (setq pathname (expand-file-name file lispdir))
 (defun package-get-load-package-file (lispdir file)
   (let (pathname)
     (setq pathname (expand-file-name file lispdir))

@@ -332,6 +513,7 @@ successfully installed but errors occurred during initialization, or
          (package-get-info-version
           (package-get-info-find-package package-get-base
                                          package) version))
          (package-get-info-version
           (package-get-info-find-package package-get-base
                                          package) version))

+        (this-requires (package-get-info-prop this-package 'requires))

         (found nil)
         (search-dirs package-get-remote)
         (base-filename (package-get-info-prop this-package 'filename))
         (found nil)
         (search-dirs package-get-remote)
         (base-filename (package-get-info-prop this-package 'filename))

@@ -343,8 +525,9 @@ successfully installed but errors occurred during initialization, or
     (if (null base-filename)
        (error "No filename associated with package %s, version %s"
               package version))
     (if (null base-filename)
        (error "No filename associated with package %s, version %s"
               package version))

-    (if (null install-dir)
-       (setq install-dir (package-admin-get-install-dir nil)))
+    (setq install-dir
+         (package-admin-get-install-dir package install-dir
+               (or (eq package 'mule-base) (memq 'mule-base this-requires))))

 
     ;; Contrive a list of possible package filenames.
     ;; Ugly.  Is there a better way to do this?
 
     ;; Contrive a list of possible package filenames.
     ;; Ugly.  Is there a better way to do this?

@@ -581,6 +764,7 @@ some built in variables.  For now, use packages-package-list."
   consp, then it must match a corresponding (provide (SYM VERSION)) from 
   the package."
   (interactive "SSymbol: ")
   consp, then it must match a corresponding (provide (SYM VERSION)) from 
   the package."
   (interactive "SSymbol: ")

+  (package-get-require-base)

   (let ((packages package-get-base)
        (done nil)
        (found nil))
   (let ((packages package-get-base)
        (done nil)
        (found nil))

@@ -612,6 +796,7 @@ some built in variables.  For now, use packages-package-list."
 (defun package-get-custom ()
   "Fetch and install the latest versions of all customized packages."
   (interactive)
 (defun package-get-custom ()
   "Fetch and install the latest versions of all customized packages."
   (interactive)

+  (package-get-require-base)

   ;; Load a fresh copy
   (load "package-get-custom.el")
   (mapcar (lambda (pkg)
   ;; Load a fresh copy
   (load "package-get-custom.el")
   (mapcar (lambda (pkg)

@@ -690,6 +875,8 @@ Entries in the customization file are retrieved from package-get-base.el."
 (provide 'package-get)
 
 ;; potentially update the custom dependencies every time we load this
 (provide 'package-get)
 
 ;; potentially update the custom dependencies every time we load this

+(when nil ;; #### disable for now... -gk
+(unless noninteractive

 (let ((custom-file (package-get-file-installed-p "package-get-custom.el"))
       (package-file (package-get-file-installed-p "package-get-base.el")))
   ;; update custom file if it doesn't exist
 (let ((custom-file (package-get-file-installed-p "package-get-custom.el"))
       (package-file (package-get-file-installed-p "package-get-base.el")))
   ;; update custom file if it doesn't exist

@@ -703,6 +890,7 @@ Entries in the customization file are retrieved from package-get-base.el."
        (set-buffer (package-get-create-custom))
        (save-buffer)
        (message "generating package customizations...done")))
        (set-buffer (package-get-create-custom))
        (save-buffer)
        (message "generating package customizations...done")))

-  (load "package-get-custom.el"))
+  (load "package-get-custom.el")))
+)

 
 ;;; package-get.el ends here
 
 ;;; package-get.el ends here

diff --git a/lisp/package-ui.el b/lisp/package-ui.el
index cfcd053..f13ed9b 100644 (file)
--- a/lisp/package-ui.el
+++ b/lisp/package-ui.el
@@ -30,23 +30,52 @@
 ;; User-changeable variables:
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
 ;; User-changeable variables:
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 

-(defvar pui-up-to-date-package-face nil
-  "The face to use for packages that are up-to-date.")
+(defgroup pui nil
+  "Conventient interface to the package system."
+  :group 'package-tools
+  :tag "Package User interface"
+  :prefix "pui-")
+
+(defcustom pui-package-install-dest-dir nil
+  "*If non-nil (Automatic) path to package tree to install packages in.
+Otherwise, use old path for installed packages and make a guess for
+new ones."
+  :group 'pui
+  :tag "Install Location"
+  :type '(choice (const :tag "Automatic" nil)
+                (directory)))
+                
+(defcustom pui-list-verbose t
+  "*If non-nil, display verbose info in the package list buffer."
+  :group 'pui
+  :tag "Verbose Listing"
+  :type 'boolean)
+
+(defcustom pui-up-to-date-package-face nil
+  "*The face to use for packages that are up-to-date."
+  :group 'pui
+  :type 'face)
+
+(defcustom pui-selected-package-face 'bold
+  "*The face to use for selected packages.
+Set this to `nil' to use the `default' face."
+  :group 'pui
+  :type 'face)
+
+(defcustom pui-outdated-package-face 'red
+  "*The face to use for outdated packages.
+Set this to `nil' to use the `default' face."
+  :group 'pui
+  :type 'face)
+
+(defcustom pui-uninstalled-package-face 'italic
+  "*The face to use for uninstalled packages.
+Set this to `nil' to use the `default' face."
+   :group 'pui
+   :type 'face)
+   

 
 

-(defvar pui-selected-package-face (get-face 'bold)
-  "The face to use for selected packages.
-Set this to `nil' to use the `default' face.")

 
 

-(defvar pui-outdated-package-face (get-face 'red)
-  "The face to use for outdated packages.
-Set this to `nil' to use the `default' face.")
-
-(defvar pui-uninstalled-package-face (get-face 'italic)
-  "The face to use for uninstalled packages.
-Set this to `nil' to use the `default' face.")
-
-(defvar pui-list-verbose t
-  "If non-nil, display verbose info in the package list buffer.")

 
 (defvar pui-info-buffer "*Packages*"
   "Buffer to use for displaying package information.")
 
 (defvar pui-info-buffer "*Packages*"
   "Buffer to use for displaying package information.")

@@ -71,6 +100,7 @@ Set this to `nil' to use the `default' face.")
     (define-key m [return] 'pui-toggle-package-key)
     (define-key m "x" 'pui-install-selected-packages)
     (define-key m "I" 'pui-install-selected-packages)
     (define-key m [return] 'pui-toggle-package-key)
     (define-key m "x" 'pui-install-selected-packages)
     (define-key m "I" 'pui-install-selected-packages)

+    (define-key m "r" 'pui-add-required-packages)

     (define-key m "n" 'next-line)
     (define-key m "+" 'next-line)
     (define-key m "p" 'previous-line)
     (define-key m "n" 'next-line)
     (define-key m "+" 'next-line)
     (define-key m "p" 'previous-line)

@@ -82,7 +112,8 @@ Set this to `nil' to use the `default' face.")
   (let ((m (make-sparse-keymap)))
     (set-keymap-name m 'pui-package-keymap)
     (define-key m 'button2 'pui-toggle-package-event)
   (let ((m (make-sparse-keymap)))
     (set-keymap-name m 'pui-package-keymap)
     (define-key m 'button2 'pui-toggle-package-event)

-    (define-key m 'button3 'pui-toggle-package-event)
+;; We use a popup menu    
+;;    (define-key m 'button3 'pui-toggle-package-event)

     m)
   "Keymap to use over package names/descriptions.")
 
     m)
   "Keymap to use over package names/descriptions.")
 

@@ -209,8 +240,8 @@ and whether or not it is up-to-date."
       (progn
        (setq disp (pui-package-symbol-char pkg-sym version))
        (setq sym-char (car disp))
       (progn
        (setq disp (pui-package-symbol-char pkg-sym version))
        (setq sym-char (car disp))

-       (if (cdr disp)
-           (set-extent-face extent (car (cdr disp)))
+       (if (car (cdr disp))
+           (set-extent-face extent (get-face (car (cdr disp))))

          (set-extent-face extent (get-face 'default)))
        ))
     (save-excursion
          (set-extent-face extent (get-face 'default)))
        ))
     (save-excursion

@@ -301,7 +332,8 @@ and whether or not it is up-to-date."
                (message "Installing selected packages ...") (sit-for 0)
                (if (catch 'done
                      (mapcar (lambda (pkg)
                (message "Installing selected packages ...") (sit-for 0)
                (if (catch 'done
                      (mapcar (lambda (pkg)

-                               (if (not (package-get-all pkg nil))
+                               (if (not (package-get pkg
+                                       pui-package-install-dest-dir))

                                    (throw 'done nil)))
                              pui-selected-packages)
                      t)
                                    (throw 'done nil)))
                              pui-selected-packages)
                      t)

@@ -316,6 +348,42 @@ and whether or not it is up-to-date."
       (error "No packages have been selected!"))
     ))
 
       (error "No packages have been selected!"))
     ))
 

+(defun pui-add-required-packages ()
+  "Select packages required by those already selected for installation."
+  (interactive)
+  (let ((tmpbuf "*Required-Packages*") do-select)
+    (if pui-selected-packages
+       (let ((dependencies (package-get-dependencies pui-selected-packages)))
+         ;; Don't change window config when asking the user if he really
+         ;; wants to add the packages.  We do this to avoid messing up
+         ;; the window configuration if errors occur (we don't want to
+         ;; display random buffers in addition to the error buffer, if
+         ;; errors occur, which would normally be caused by display-buffer).
+         (save-window-excursion
+           (with-output-to-temp-buffer tmpbuf
+             (display-completion-list (sort
+                                       (mapcar #'(lambda (pkg)
+                                                    (symbol-name pkg))
+                                               dependencies)
+                                       'string<)
+                                      :activate-callback nil
+                                      :help-string "Required packages:\n"
+                                      :completion-string t))
+           (setq tmpbuf (get-buffer-create tmpbuf))
+           (display-buffer tmpbuf)
+           (setq do-select (y-or-n-p "Select these packages? "))
+           (kill-buffer tmpbuf))
+         (if do-select
+              (progn
+                (setq pui-selected-packages
+                      (union pui-selected-packages dependencies))
+                (map-extents #'(lambda (extent maparg)
+                                 (pui-update-package-display extent))
+                             nil nil nil nil nil 'pui)
+                (message "added dependencies"))
+             (clear-message)))
+      (error "No packages have been selected!"))))
+

 (defun pui-help-echo (extent &optional force-update)
   "Display additional package info in the modeline.
 EXTENT determines the package to display (the package information is
 (defun pui-help-echo (extent &optional force-update)
   "Display additional package info in the modeline.
 EXTENT determines the package to display (the package information is

@@ -371,6 +439,7 @@ This is not a defconst because of the call to substitute-command-keys."
 Useful keys:
 
   `\\[pui-toggle-package-key]' to select/unselect the current package for installation.
 Useful keys:
 
   `\\[pui-toggle-package-key]' to select/unselect the current package for installation.

+  `\\[pui-add-required-packages]' to add any packages required by those selected.

   `\\[pui-install-selected-packages]' to install selected packages.
   `\\[pui-display-info]' to display additional information about the package in the modeline.
   `\\[pui-list-packages]' to refresh the package list.
   `\\[pui-install-selected-packages]' to install selected packages.
   `\\[pui-display-info]' to display additional information about the package in the modeline.
   `\\[pui-list-packages]' to refresh the package list.

@@ -379,6 +448,21 @@ Useful keys:
 ")
     ))
 
 ")
     ))
 

+(defvar pui-menu
+  '("Packages"
+    ["Select" pui-toggle-package-key t]
+    ["Info" pui-display-info t]
+    "---"
+    ["Add Required" pui-add-required-packages t]
+    ["Install Selected" pui-install-selected-packages t]
+    "---"
+    ["Verbose" pui-toggle-verbosity-redisplay
+     :active t :style toggle :selected pui-list-verbose]
+    ["Refresh" pui-list-packages t]
+    ["Help" pui-help t]
+    ["Quit" pui-quit t]))
+
+

 ;;;###autoload
 (defun pui-list-packages ()
   "List all packages and package information.
 ;;;###autoload
 (defun pui-list-packages ()
   "List all packages and package information.

@@ -387,6 +471,7 @@ buffer, the user can see which packages are installed, which are not, and
 which are out-of-date (a newer version is available).  The user can then
 select packages for installation via the keyboard or mouse."
   (interactive)
 which are out-of-date (a newer version is available).  The user can then
 select packages for installation via the keyboard or mouse."
   (interactive)

+  (package-get-require-base)

   (let ( (outbuf (get-buffer-create pui-info-buffer))
         (sep-string "===============================================================================\n")
         start )
   (let ( (outbuf (get-buffer-create pui-info-buffer))
         (sep-string "===============================================================================\n")
         start )

@@ -452,8 +537,8 @@ select packages for installation via the keyboard or mouse."
                             (point)))
                   )
                 (setq extent (make-extent b e))
                             (point)))
                   )
                 (setq extent (make-extent b e))

-                (if (cdr disp)
-                    (set-extent-face extent (car (cdr disp)))
+                (if (car (cdr disp))
+                    (set-extent-face extent (get-face (car (cdr disp))))

                   (set-extent-face extent (get-face 'default)))
                 (set-extent-property extent 'highlight t)
                 (set-extent-property extent 'pui t)
                   (set-extent-face extent (get-face 'default)))
                 (set-extent-property extent 'highlight t)
                 (set-extent-property extent 'pui t)

@@ -474,10 +559,15 @@ select packages for installation via the keyboard or mouse."
     (delete-other-windows)
     (goto-char start)
     (setq pui-selected-packages nil)   ; Reset list
     (delete-other-windows)
     (goto-char start)
     (setq pui-selected-packages nil)   ; Reset list

+    (when (featurep 'menubar)
+      (set-buffer-menubar current-menubar)
+      (add-submenu '() pui-menu)
+      (setq mode-popup-menu pui-menu))

     (clear-message)
 ;    (message (substitute-command-keys "Press `\\[pui-help]' for help."))
     ))
 
     (clear-message)
 ;    (message (substitute-command-keys "Press `\\[pui-help]' for help."))
     ))
 

+

 (provide 'package-ui)
 
 ;;; package-ui.el ends here
 (provide 'package-ui)
 
 ;;; package-ui.el ends here

diff --git a/lisp/replace.el b/lisp/replace.el
index b24d197..dd84f83 100644 (file)
--- a/lisp/replace.el
+++ b/lisp/replace.el
@@ -628,7 +628,7 @@ which will run faster and probably do exactly what you want."
         ;; XEmacs addition
         (qr-case-fold-search
          (if (and case-fold-search search-caps-disable-folding)
         ;; XEmacs addition
         (qr-case-fold-search
          (if (and case-fold-search search-caps-disable-folding)

-             (isearch-no-upper-case-p search-string)
+             (no-upper-case-p search-string regexp-flag)

            case-fold-search))
         (message
          (if query-flag
            case-fold-search))
         (message
          (if query-flag

diff --git a/lisp/simple.el b/lisp/simple.el
index be9f8d2..70fe279 100644 (file)
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -94,6 +94,52 @@
   :group 'minibuffer)
 
 
   :group 'minibuffer)
 
 

+(defcustom search-caps-disable-folding t
+  "*If non-nil, upper case chars disable case fold searching.
+This does not apply to \"yanked\" strings."
+  :type 'boolean
+  :group 'editing-basics)
+
+;; This is stolen (and slightly modified) from FSF emacs's
+;; `isearch-no-upper-case-p'.
+(defun no-upper-case-p (string &optional regexp-flag)
+  "Return t if there are no upper case chars in STRING.
+If REGEXP-FLAG is non-nil, disregard letters preceded by `\\' (but not `\\\\')
+since they have special meaning in a regexp."
+  (let ((case-fold-search nil))
+    (not (string-match (if regexp-flag 
+                          "\\(^\\|\\\\\\\\\\|[^\\]\\)[A-Z]"
+                        "[A-Z]")
+                      string))
+    ))
+
+(defmacro with-search-caps-disable-folding (string regexp-flag &rest body) "\
+Eval BODY with `case-fold-search' let to nil if `search-caps-disable-folding' 
+is non-nil, and if STRING (either a string or a regular expression according
+to REGEXP-FLAG) contains uppercase letters."
+  `(let ((case-fold-search
+          (if (and case-fold-search search-caps-disable-folding)
+              (no-upper-case-p ,string ,regexp-flag)
+            case-fold-search)))
+     ,@body))
+(put 'with-search-caps-disable-folding 'lisp-indent-function 2)
+(put 'with-search-caps-disable-folding 'edebug-form-spec 
+     '(sexp sexp &rest form))
+
+(defmacro with-interactive-search-caps-disable-folding (string regexp-flag 
+                                                              &rest body)
+  "Same as `with-search-caps-disable-folding', but only in the case of a
+function called interactively."
+  `(let ((case-fold-search
+         (if (and (interactive-p) 
+                  case-fold-search search-caps-disable-folding)
+              (no-upper-case-p ,string ,regexp-flag)
+            case-fold-search)))
+     ,@body))
+(put 'with-interactive-search-caps-disable-folding 'lisp-indent-function 2)
+(put 'with-interactive-search-caps-disable-folding 'edebug-form-spec 
+     '(sexp sexp &rest form))
+

 (defun newline (&optional arg)
   "Insert a newline, and move to left margin of the new line if it's blank.
 The newline is marked with the text-property `hard'.
 (defun newline (&optional arg)
   "Insert a newline, and move to left margin of the new line if it's blank.
 The newline is marked with the text-property `hard'.

@@ -456,19 +502,20 @@ backwards."
   "Kill up to and including ARG'th occurrence of CHAR.
 Goes backward if ARG is negative; error if CHAR not found."
   (interactive "*p\ncZap to char: ")
   "Kill up to and including ARG'th occurrence of CHAR.
 Goes backward if ARG is negative; error if CHAR not found."
   (interactive "*p\ncZap to char: ")

-  (kill-region (point) (progn
+  (kill-region (point) (with-interactive-search-caps-disable-folding
+                          (char-to-string char) nil

                         (search-forward (char-to-string char) nil nil arg)
                         (search-forward (char-to-string char) nil nil arg)

-;                       (goto-char (if (> arg 0) (1- (point)) (1+ (point))))

                         (point))))
 
 (defun zap-up-to-char (arg char)
   "Kill up to ARG'th occurrence of CHAR.
 Goes backward if ARG is negative; error if CHAR not found."
   (interactive "*p\ncZap up to char: ")
                         (point))))
 
 (defun zap-up-to-char (arg char)
   "Kill up to ARG'th occurrence of CHAR.
 Goes backward if ARG is negative; error if CHAR not found."
   (interactive "*p\ncZap up to char: ")

-  (kill-region (point) (progn
-                       (search-forward (char-to-string char) nil nil arg)
-                       (goto-char (if (> arg 0) (1- (point)) (1+ (point))))
-                       (point))))
+  (kill-region (point) (with-interactive-search-caps-disable-folding
+                          (char-to-string char) nil
+                        (search-forward (char-to-string char) nil nil arg)
+                        (goto-char (if (> arg 0) (1- (point)) (1+ (point))))
+                        (point))))

 
 (defun beginning-of-buffer (&optional arg)
   "Move point to the beginning of the buffer; leave mark at previous position.
 
 (defun beginning-of-buffer (&optional arg)
   "Move point to the beginning of the buffer; leave mark at previous position.

diff --git a/lisp/x-font-menu.el b/lisp/x-font-menu.el
index 3e902e1..9a1db5c 100644 (file)
--- a/lisp/x-font-menu.el
+++ b/lisp/x-font-menu.el
@@ -472,12 +472,12 @@ or if you change your font path, you can call this to re-initialize the menus."
       (signal 'error '("couldn't parse font name for default face")))
     (when weight
       (signal 'error '("Setting weight currently not supported")))
       (signal 'error '("couldn't parse font name for default face")))
     (when weight
       (signal 'error '("Setting weight currently not supported")))

-;    (setq new-default-face-font
-;        (font-menu-load-font (or family from-family)
-;                             (or weight from-weight)
-;                             (or size   from-size)
-;                             from-slant
-;                             font-menu-preferred-resolution))
+    (setq new-default-face-font
+         (font-menu-load-font (or family from-family)
+                              (or weight from-weight)
+                              (or size   from-size)
+                              from-slant
+                              font-menu-preferred-resolution))

     (dolist (face (delq 'default (face-list)))
       (when (face-font-instance face)
        (message "Changing font of `%s'..." face)
     (dolist (face (delq 'default (face-list)))
       (when (face-font-instance face)
        (message "Changing font of `%s'..." face)

@@ -490,17 +490,20 @@ or if you change your font path, you can call this to re-initialize the menus."
           (sit-for 1)))))
     ;; Set the default face's font after hacking the other faces, so that
     ;; the frame size doesn't change until we are all done.
           (sit-for 1)))))
     ;; Set the default face's font after hacking the other faces, so that
     ;; the frame size doesn't change until we are all done.

-    
-    (when (and family (not (equal family from-family)))
-      (setq new-props (append (list :family family) new-props)))
-    (when (and size (not (equal size from-size)))
-      (setq new-props (append (list :size (concat (int-to-string
-                                         (/ size 10)) "pt")) new-props)))
-    (custom-set-face-update-spec 'default '((type x)) new-props)
-    ;;; WMP - we need to honor font-menu-this-frame-only-p here!      
-;    (set-face-font 'default new-default-face-font
-;                 (and font-menu-this-frame-only-p (selected-frame)))
-    (message "Font %s" (face-font-name 'default))))
+
+    ;; If we need to be frame local we do the changes ourselves.
+    (if font-menu-this-frame-only-p
+    ;;; WMP - we need to honor font-menu-this-frame-only-p here!
+       (set-face-font 'default new-default-face-font
+                      (and font-menu-this-frame-only-p (selected-frame)))
+      ;; OK Let Customize do it.
+      (when (and family (not (equal family from-family)))
+       (setq new-props (append (list :family family) new-props)))
+      (when (and size (not (equal size from-size)))
+       (setq new-props (append
+          (list :size (concat (int-to-string (/ size 10)) "pt")) new-props)))
+      (custom-set-face-update-spec 'default '((type x)) new-props)
+      (message "Font %s" (face-font-name 'default)))))

 
 
 (defun font-menu-change-face (face
 
 
 (defun font-menu-change-face (face

diff --git a/man/ChangeLog b/man/ChangeLog
index a3814fa..d329245 100644 (file)
--- a/man/ChangeLog
+++ b/man/ChangeLog
@@ -1,3 +1,11 @@
+1998-10-15  SL Baur  <steve@altair.xemacs.org>
+
+       * XEmacs 21.2-beta3 is released.
+
+1998-10-09  SL Baur  <steve@altair.xemacs.org>
+
+       * Makefile (MAKEINFO): Undo no-split change.
+

 1998-09-29  SL Baur  <steve@altair.xemacs.org>
 
        * XEmacs 21.2-beta2 is released.
 1998-09-29  SL Baur  <steve@altair.xemacs.org>
 
        * XEmacs 21.2-beta2 is released.

diff --git a/man/xemacs/packages.texi b/man/xemacs/packages.texi
index 3066210..4fb953e 100644 (file)
--- a/man/xemacs/packages.texi
+++ b/man/xemacs/packages.texi
@@ -103,7 +103,7 @@ are installed, using the visual package browser and installer.  You can
 access it via the menus:
 
 @example
 access it via the menus:
 
 @example

-       Options->Customize->List Packages
+       Options->Manage Packages->List & Install

 @end example
 
 Or, you can get to it via the keyboard:
 @end example
 
 Or, you can get to it via the keyboard:

@@ -147,13 +147,18 @@ saved; this information will be lost when you quit XEmacs.
 If you're going to install over the network, you only have to insure
 that EFS @ref{(EFS)} works, and that it can get outside a firewall, if
 you happen to be behind one.  You shouldn't have to do anything else;
 If you're going to install over the network, you only have to insure
 that EFS @ref{(EFS)} works, and that it can get outside a firewall, if
 you happen to be behind one.  You shouldn't have to do anything else;

-XEmacs already knows where to go.
+XEmacs already knows where to go. However you can add your own mirrors
+to this list. See @code{package-get-remote}.

 
 The easiest way to install a package is to use the visual package
 browser and installer, using the menu pick:
 
 @example
 
 The easiest way to install a package is to use the visual package
 browser and installer, using the menu pick:
 
 @example

-       Options->Customize->List Packages
+       Options->Manage Packages->List & Install
+@end example
+or
+@example
+       Options->Manage Packages->Using Custom->Select-> ...

 @end example
 
 You can also access it using the keyboard:
 @end example
 
 You can also access it using the keyboard:

@@ -182,10 +187,12 @@ If there is no character in the first column, the package has been
 installed and is up-to-date.
 
 From here, you can select or unselect packages for installation using
 installed and is up-to-date.
 
 From here, you can select or unselect packages for installation using

-the @key{RET} key, or using the @kbd{Mouse-2} or @kbd{Mouse-3} buttons.
-Once you've finished selecting the packages, you can press the @kbd{x}
-key to actually install the packages.  Note that you will have to
-restart XEmacs for XEmacs to recognize any new packages.
+the @key{RET} key, the @kbd{Mouse-2} button or selecting "Select" from
+the (Popup) Menu.
+Once you've finished selecting the packages, you can
+press the @kbd{x} key (or use the menu) to actually install the
+packages. Note that you will have to restart XEmacs for XEmacs to
+recognize any new packages.

 
 Key summary:
 
 
 Key summary:
 

@@ -194,7 +201,6 @@ Key summary:
 Display simple help.
 @item @key{RET}
 @itemx @key{Mouse-2}
 Display simple help.
 @item @key{RET}
 @itemx @key{Mouse-2}

-@itemx @key{Mouse-3}

 Toggle between selecting and unselecting a package for installation.
 @item x
 Install selected packages.
 Toggle between selecting and unselecting a package for installation.
 @item x
 Install selected packages.

@@ -221,11 +227,15 @@ customize menus, under:
 @example
        Options->Customize->Emacs->Packages-> ...
 @end example
 @example
        Options->Customize->Emacs->Packages-> ...
 @end example

+or
+@example
+       Options->Manage Packages->Using Custom->Select-> ...
+@end example

 
 Set their state to on, and then do:
 
 @example
 
 Set their state to on, and then do:
 
 @example

-       Options->Customize->Update Packages
+       Options->Manage Packages->Using Custom->Update Packages

 @end example
 
 This will automatically retrieve the packages you have selected from the
 @end example
 
 This will automatically retrieve the packages you have selected from the

diff --git a/nt/ChangeLog b/nt/ChangeLog
index 6374d51..29e932c 100644 (file)
--- a/nt/ChangeLog
+++ b/nt/ChangeLog
@@ -1,3 +1,7 @@
+1998-10-15  SL Baur  <steve@altair.xemacs.org>
+
+       * XEmacs 21.2-beta3 is released.
+

 1998-09-29  SL Baur  <steve@altair.xemacs.org>
 
        * XEmacs 21.2-beta2 is released.
 1998-09-29  SL Baur  <steve@altair.xemacs.org>
 
        * XEmacs 21.2-beta2 is released.

diff --git a/src/ChangeLog b/src/ChangeLog
index 35afafe..aa84b92 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,76 @@
+1998-10-15  SL Baur  <steve@altair.xemacs.org>
+
+       * XEmacs 21.2-beta3 is released.
+
+1998-10-13  Raymond Toy  <toy@rtp.ericsson.se>
+
+       * runemacs.c (WinMain): If the basename is "rungnuclient.exe", run
+       gnuclient.  Otherwise, we run xemacs as we always did.  This gets
+       rid of the annoying DOS window when running gnuclient.
+
+1998-10-13  Andy Piper  <andyp@parallax.co.uk>
+
+       * dragdrop.c (vars_of_dragdrop): rename HAVE_MSWINDOWS ->
+       HAVE_MS_WINDOWS typo.
+
+1998-10-13  SL Baur  <steve@altair.xemacs.org>
+
+       * process-unix.c (unix_send_process): Set closed flag on writable
+       pipe after SIGPIPE is received and before we call deactivate_process.
+
+1998-10-03  Gunnar Evermann  <ge204@eng.cam.ac.uk>
+
+       * window.c (Fset_window_start): respect narrowing when
+       checking wheter start is at the beginning of a line.
+       (Fset_window_buffer): Ditto
+       Fixes repeatable crash in VM.
+
+1998-10-09  SL Baur  <steve@altair.xemacs.org>
+
+       * window.c (specifier_vars_of_window): Set default vertical
+       divider width to 1 on ttys.
+
+1998-10-08  Martin Buchholz  <martin@xemacs.org>
+
+       * alloc.c:
+       * unexec.c:
+       * malloc.c:
+       Add <stddef.h> to get ptrdiff_t declaration
+
+1998-10-07  Jonathan Harris  <jhar@tardis.ed.ac.uk>
+
+       * scrollbar-msw.c: Use the same vertical scrollbar drag hack as 
+         is used for Motif or Lucid scrollbars under X.
+
+1998-10-08  Pierre Wendling  <pw@ebc.vbe.dec.com>
+
+       * m/alpha.h (UNEXEC): quoted to avoid bad expansion when running
+       `configure'
+
+1998-10-06  Takeshi Hagiwara  <hagiwara@ie.niigata-u.ac.jp>
+
+       * frame-x.c (x_delete_frame): Fix an argument of XtDestroyWidget.
+
+1998-10-05  Andy Piper  <andyp@parallax.co.uk>
+
+       * s/cygwin32.h: more cygwin b20 reorganisation.
+
+1998-10-03  Gunnar Evermann  <ge204@eng.cam.ac.uk>
+
+       * window.c (Fset_window_start): Document me.
+       (Fset_window_buffer): Document me.
+       Fixes some sort of repeatable crash.
+
+1998-10-01  Raymond Toy  <toy@rtp.ericsson.se>
+
+       * nas.c: Added necessary support functions to be able to handle
+       WAVE files in memory, just like the support for SND files in
+       memory.
+
+1998-09-30  SL Baur  <steve@altair.xemacs.org>
+
+       * callproc.c (child_setup): Fix spelling typo.
+

 1998-09-29  SL Baur  <steve@altair.xemacs.org>
 
        * XEmacs 21.2-beta2 is released.
 1998-09-29  SL Baur  <steve@altair.xemacs.org>
 
        * XEmacs 21.2-beta2 is released.

diff --git a/src/alloc.c b/src/alloc.c
index 8765c62..e98a472 100644 (file)
--- a/src/alloc.c
+++ b/src/alloc.c
@@ -56,6 +56,8 @@ Boston, MA 02111-1307, USA.  */
 #include "sysfile.h"
 #include "window.h"
 
 #include "sysfile.h"
 #include "window.h"
 

+#include <stddef.h>
+

 #ifdef DOUG_LEA_MALLOC
 #include <malloc.h>
 #endif
 #ifdef DOUG_LEA_MALLOC
 #include <malloc.h>
 #endif

diff --git a/src/callproc.c b/src/callproc.c
index 7ebeb8d..b0a14dc 100644 (file)
--- a/src/callproc.c
+++ b/src/callproc.c
@@ -744,7 +744,7 @@ child_setup (int in, int out, int err, char **new_argv,
   environ = env;
   execvp (new_argv[0], new_argv);
 
   environ = env;
   execvp (new_argv[0], new_argv);
 

-  stdout_out ("Cant't exec program %s\n", new_argv[0]);
+  stdout_out ("Can't exec program %s\n", new_argv[0]);

   _exit (1);
 #endif /* not WINDOWSNT */
 }
   _exit (1);
 #endif /* not WINDOWSNT */
 }

diff --git a/src/dragdrop.c b/src/dragdrop.c
index ff7db6e..713355d 100644 (file)
--- a/src/dragdrop.c
+++ b/src/dragdrop.c
@@ -130,7 +130,7 @@ Each element is the feature symbol of the protocol.
   
   Vdragdrop_protocols = Qnil;
 
   
   Vdragdrop_protocols = Qnil;
 

-#ifdef HAVE_MSWINDOWS
+#ifdef HAVE_MS_WINDOWS

   Vdragdrop_protocols = Fcons ( Qmswindows , Vdragdrop_protocols );
 #endif
 #ifdef HAVE_CDE
   Vdragdrop_protocols = Fcons ( Qmswindows , Vdragdrop_protocols );
 #endif
 #ifdef HAVE_CDE

diff --git a/src/frame-x.c b/src/frame-x.c
index 3c538f0..76acd22 100644 (file)
--- a/src/frame-x.c
+++ b/src/frame-x.c
@@ -2631,6 +2631,7 @@ static void
 x_delete_frame (struct frame *f)
 {
   Widget w = FRAME_X_SHELL_WIDGET (f);
 x_delete_frame (struct frame *f)
 {
   Widget w = FRAME_X_SHELL_WIDGET (f);

+  Display *dpy = XtDisplay (w);

 
 #ifndef HAVE_SESSION
   if (FRAME_X_TOP_LEVEL_FRAME_P (f))
 
 #ifndef HAVE_SESSION
   if (FRAME_X_TOP_LEVEL_FRAME_P (f))

@@ -2638,20 +2639,17 @@ x_delete_frame (struct frame *f)
 #endif /* HAVE_SESSION */
 
 #ifdef EXTERNAL_WIDGET
 #endif /* HAVE_SESSION */
 
 #ifdef EXTERNAL_WIDGET

-  {
-    Display *dpy = XtDisplay (w);
-    expect_x_error (dpy);
-    /* for obscure reasons having (I think) to do with the internal
-       window-to-widget hierarchy maintained by Xt, we have to call
-       XtUnrealizeWidget() here.  Xt can really suck. */
-    if (f->being_deleted)
-      XtUnrealizeWidget (w);
-    XtDestroyWidget (w);
-    x_error_occurred_p (dpy);
-  }
+  expect_x_error (dpy);
+  /* for obscure reasons having (I think) to do with the internal
+     window-to-widget hierarchy maintained by Xt, we have to call
+     XtUnrealizeWidget() here.  Xt can really suck. */
+  if (f->being_deleted)
+    XtUnrealizeWidget (w);
+  XtDestroyWidget (w);
+  x_error_occurred_p (dpy);

 #else
   XtDestroyWidget (w);
 #else
   XtDestroyWidget (w);

-  XFlush (XtDisplay(w));   /* make sure the windows are really gone! */
+  XFlush (dpy);   /* make sure the windows are really gone! */

 #endif /* EXTERNAL_WIDGET */
 
   if (FRAME_X_GEOM_FREE_ME_PLEASE (f))
 #endif /* EXTERNAL_WIDGET */
 
   if (FRAME_X_GEOM_FREE_ME_PLEASE (f))

diff --git a/src/m/alpha.h b/src/m/alpha.h
index 2bc6764..8bc4a98 100644 (file)
--- a/src/m/alpha.h
+++ b/src/m/alpha.h
@@ -32,5 +32,5 @@ Boston, MA 02111-1307, USA.  */
 # define TEXT_START    0x120000000
 # define DATA_START    0x140000000
   /* The program to be used for unexec. */
 # define TEXT_START    0x120000000
 # define DATA_START    0x140000000
   /* The program to be used for unexec. */

-# define UNEXEC unexalpha.o
+# define UNEXEC "unexalpha.o"

 #endif
 #endif

diff --git a/src/malloc.c b/src/malloc.c
index bb9092d..1582286 100644 (file)
--- a/src/malloc.c
+++ b/src/malloc.c
@@ -166,6 +166,8 @@ what you give them.   Help stamp out software-hoarding!  */
 
 #endif /* not emacs */
 
 
 #endif /* not emacs */
 

+#include <stddef.h>
+

 /* Define getpagesize () if the system does not.  */
 #include "getpagesize.h"
 
 /* Define getpagesize () if the system does not.  */
 #include "getpagesize.h"
 

diff --git a/src/nas.c b/src/nas.c
index d62b30b..0c7f428 100644 (file)
--- a/src/nas.c
+++ b/src/nas.c
@@ -49,6 +49,7 @@
  *                     correct error facilities.
  *      4/11/94, rjc    Added wait_for_sounds to be called when user wants to
  *                     be sure all play has finished.
  *                     correct error facilities.
  *      4/11/94, rjc    Added wait_for_sounds to be called when user wants to
  *                     be sure all play has finished.

+ *      1998-10-01 rlt  Added support for WAVE files.

  */
 
 #ifdef emacs
  */
 
 #ifdef emacs

@@ -74,6 +75,7 @@
 #include <audio/audiolib.h>
 #include <audio/soundlib.h>
 #include <audio/snd.h>
 #include <audio/audiolib.h>
 #include <audio/soundlib.h>
 #include <audio/snd.h>

+#include <audio/wave.h>

 #include <audio/fileutil.h>
 
 #ifdef emacs
 #include <audio/fileutil.h>
 
 #ifdef emacs

@@ -486,9 +488,13 @@ play_sound_data (unsigned char *data,
       /* hack, hack */
       offset = ((SndInfo *) (s->formatInfo))->h.dataOffset;
     }
       /* hack, hack */
       offset = ((SndInfo *) (s->formatInfo))->h.dataOffset;
     }

+  else if (SoundFileFormat (s) == SoundFileFormatWave)
+    {
+      offset = ((WaveInfo *) (s->formatInfo))->dataOffset;
+    }

   else
     {
   else
     {

-      warn ("only understand snd files at the moment");
+      warn ("only understand snd and wave files at the moment");

       SoundCloseFile (s);
 #ifdef ROBUST_PLAY
       signal (SIGPIPE, old_sigpipe);
       SoundCloseFile (s);
 #ifdef ROBUST_PLAY
       signal (SIGPIPE, old_sigpipe);

@@ -576,6 +582,7 @@ CatchIoErrorAndJump (AuServer *old_aud)
   longjmp (AuXtErrorJump, 1);
  
 #endif /* XTEVENTS */
   longjmp (AuXtErrorJump, 1);
  
 #endif /* XTEVENTS */

+  return 0;

 }
 
 SIGTYPE
 }
 
 SIGTYPE

@@ -711,6 +718,260 @@ SndOpenDataForReading (CONST char *data,
   return si;
 }
 
   return si;
 }
 

+/* Stuff taken from wave.c from NAS.  Just like snd files, NAS can't
+   read wave data from memory, so these functions do that for us. */
+
+#define Err()          { return NULL; }
+#define readFourcc(_f) dread(_f, sizeof(RIFF_FOURCC), 1)
+#define cmpID(_x, _y)                                                        \
+    strncmp((char *) (_x), (char *) (_y), sizeof(RIFF_FOURCC))
+#define PAD2(_x)       (((_x) + 1) & ~1)
+
+/* These functions here are for faking file I/O from buffer. */
+
+/* The "file" position */
+static int file_posn;
+/* The length of the "file" */
+static int file_len;
+/* The actual "file" data. */
+CONST static char* file_data;
+
+/* Like fopen, but for a buffer in memory */
+static void
+dopen(CONST char* data, int length)
+{
+   file_data = data;
+   file_len = length;
+   file_posn = 0;
+}
+
+/* Like fread, but for a buffer in memory */
+static int
+dread(char* buf, int size, int nitems)
+{
+  int nread;
+
+  nread = size * nitems;
+  
+  if (file_posn + nread <= file_len)
+    {
+      memcpy(buf, file_data + file_posn, size * nitems);
+      file_posn += nread;
+      return nitems;
+    }
+  else
+    {
+      return EOF;
+    }
+}
+
+/* Like fgetc, but for a buffer in memory */
+static int
+dgetc()
+{
+  int ch;
+  
+  if (file_posn < file_len)
+    return file_data[file_posn++];
+  else
+    return -1;
+}
+
+/* Like fseek, but for a buffer in memory */
+static int
+dseek(long offset, int from)
+{
+  if (from == 0)
+    file_posn = offset;
+  else if (from == 1)
+    file_posn += offset;
+  else if (from == 2)
+    file_posn = file_len + offset;
+
+  return 0;
+}
+
+/* Like ftell, but for a buffer in memory */
+static int
+dtell()
+{
+  return file_posn;
+}
+
+/* Data buffer analogs for FileReadS and FileReadL in NAS. */
+
+static unsigned short
+DataReadS(int swapit)
+{
+    unsigned short us;
+
+    dread(&us, 2, 1);
+    if (swapit)
+       us = FileSwapS(us);
+    return us;
+}
+
+static AuUint32
+DataReadL(int swapit)
+{
+    AuUint32 ul;
+
+    dread(&ul, 4, 1);
+    if (swapit)
+       ul = FileSwapL(ul);
+    return ul;
+}
+
+static int
+readChunk(RiffChunk *c)
+{
+    int             status;
+    char            n;
+
+    if ((status = dread(c, sizeof(RiffChunk), 1)))
+       if (BIG_ENDIAN)
+           swapl(&c->ckSize, n);
+
+    return status;
+}
+
+/* A very straight-forward translation of WaveOpenFileForReading to
+   read the wave data from a buffer in memory. */
+
+static WaveInfo *
+WaveOpenDataForReading(CONST char *data,
+                      int length)
+{
+    RiffChunk       ck;
+    RIFF_FOURCC     fourcc;
+    AuInt32            fileSize;
+    WaveInfo       *wi;
+
+    
+    if (!(wi = (WaveInfo *) malloc(sizeof(WaveInfo))))
+       return NULL;
+
+    wi->comment = NULL;
+    wi->dataOffset = wi->format = wi->writing = 0;
+
+    dopen(data, length);
+    
+    if (!readChunk(&ck) ||
+       cmpID(&ck.ckID, RIFF_RiffID) ||
+       !readFourcc(&fourcc) ||
+       cmpID(&fourcc, RIFF_WaveID))
+       Err();
+
+    fileSize = PAD2(ck.ckSize) - sizeof(RIFF_FOURCC);
+
+    while (fileSize >= sizeof(RiffChunk))
+    {
+       if (!readChunk(&ck))
+           Err();
+
+       fileSize -= sizeof(RiffChunk) + PAD2(ck.ckSize);
+
+       /* LIST chunk */
+       if (!cmpID(&ck.ckID, RIFF_ListID))
+       {
+           if (!readFourcc(&fourcc))
+               Err();
+
+           /* INFO chunk */
+           if (!cmpID(&fourcc, RIFF_ListInfoID))
+           {
+               ck.ckSize -= sizeof(RIFF_FOURCC);
+
+               while (ck.ckSize)
+               {
+                   RiffChunk       c;
+
+                   if (!readChunk(&c))
+                       Err();
+
+                   /* ICMT chunk */
+                   if (!cmpID(&c.ckID, RIFF_InfoIcmtID))
+                   {
+                       if (!(wi->comment = (char *) malloc(c.ckSize)) ||
+                           !dread(wi->comment, c.ckSize, 1))
+                           Err();
+
+                       if (c.ckSize & 1)
+                           dgetc();    /* eat the pad byte */
+                   }
+                   else
+                       /* skip unknown chunk */
+                       dseek(PAD2(c.ckSize), 1);
+
+                   ck.ckSize -= sizeof(RiffChunk) + PAD2(c.ckSize);
+               }
+           }
+           else
+               /* skip unknown chunk */
+               dseek(PAD2(ck.ckSize) - sizeof(RIFF_FOURCC), 1);
+       }
+       /* wave format chunk */
+       else if (!cmpID(&ck.ckID, RIFF_WaveFmtID) && !wi->format)
+       {
+           AuInt32            dummy;
+
+           wi->format = DataReadS(BIG_ENDIAN);
+           wi->channels = DataReadS(BIG_ENDIAN);
+           wi->sampleRate = DataReadL(BIG_ENDIAN);
+
+           /* we don't care about the next two fields */
+           dummy = DataReadL(BIG_ENDIAN);
+           dummy = DataReadS(BIG_ENDIAN);
+
+           if (wi->format != RIFF_WAVE_FORMAT_PCM)
+               Err();
+
+           wi->bitsPerSample = DataReadS(BIG_ENDIAN);
+
+           /* skip any other format specific fields */
+           dseek(PAD2(ck.ckSize - 16), 1);
+       }
+       /* wave data chunk */
+       else if (!cmpID(&ck.ckID, RIFF_WaveDataID) && !wi->dataOffset)
+       {
+           long endOfFile;
+
+           wi->dataOffset = dtell();
+           wi->dataSize = ck.ckSize;
+           dseek(0, 2);
+           endOfFile = dtell();
+
+           /* seek past the data */
+           if (dseek(wi->dataOffset + PAD2(ck.ckSize), 0) ||
+               dtell() > endOfFile)
+           {
+               /* the seek failed, assume the size is bogus */
+               dseek(0, 2);
+               wi->dataSize = dtell() - wi->dataOffset;
+           }
+
+           wi->dataOffset -= sizeof(long);
+       }
+       else
+           /* skip unknown chunk */
+           dseek(PAD2(ck.ckSize), 1);
+    }
+
+    if (!wi->dataOffset)
+       Err();
+
+    wi->numSamples = wi->dataSize / wi->channels / (wi->bitsPerSample >> 3);
+
+    if (!wi->comment)
+       wi->comment = NameFromData (data + wi->dataOffset,
+                                   length - wi->dataOffset);
+
+    wi->fp = NULL;
+    
+    return wi;
+}
+
+

 static Sound
 SoundOpenDataForReading (unsigned char *data,
                         int length)
 static Sound
 SoundOpenDataForReading (unsigned char *data,
                         int length)

@@ -721,18 +982,23 @@ SoundOpenDataForReading (unsigned char *data,
   if (!(s = (Sound) malloc (sizeof (SoundRec))))
     return NULL;
 
   if (!(s = (Sound) malloc (sizeof (SoundRec))))
     return NULL;
 

-  if ((s->formatInfo = SndOpenDataForReading (data, length))==NULL)
+  if ((s->formatInfo = SndOpenDataForReading (data, length)) != NULL)

     {
     {

-      free (s);
-      return NULL;
+      if (!(SoundFileInfo[SoundFileFormatSnd].toSound) (s))
+       {
+         SndCloseFile (s->formatInfo);
+         free (s);
+         return NULL;
+       }

     }
     }

-    
-
-  if (!(SoundFileInfo[SoundFileFormatSnd].toSound) (s))
+  else if ((s->formatInfo = WaveOpenDataForReading (data, length)) != NULL)

     {
     {

-      SndCloseFile (s->formatInfo);
-      free (s);
-      return NULL;
+      if (!(SoundFileInfo[SoundFileFormatWave].toSound) (s))
+       {
+         WaveCloseFile (s->formatInfo);
+         free (s);
+         return NULL;
+       }

     }
 
   return s;
     }
 
   return s;

diff --git a/src/process-unix.c b/src/process-unix.c
index 85ad49b..6be1c1a 100644 (file)
--- a/src/process-unix.c
+++ b/src/process-unix.c
@@ -1198,6 +1198,10 @@ unix_send_process (Lisp_Object proc, struct lstream* lstream)
   else
     { /* We got here from a longjmp() from the SIGPIPE handler */
       signal (SIGPIPE, old_sigpipe);
   else
     { /* We got here from a longjmp() from the SIGPIPE handler */
       signal (SIGPIPE, old_sigpipe);

+      /* Close the file lstream so we don't attempt to write to it further */
+      /* #### There is controversy over whether this might cause fd leakage */
+      /*      my tests say no. -slb */
+      XLSTREAM (p->pipe_outstream)->flags &= ~LSTREAM_FL_IS_OPEN;

       p->status_symbol = Qexit;
       p->exit_code = 256; /* #### SIGPIPE ??? */
       p->core_dumped = 0;
       p->status_symbol = Qexit;
       p->exit_code = 256; /* #### SIGPIPE ??? */
       p->core_dumped = 0;

diff --git a/src/s/cygwin32.h b/src/s/cygwin32.h
index b277934..39490f3 100644 (file)
--- a/src/s/cygwin32.h
+++ b/src/s/cygwin32.h
@@ -115,6 +115,21 @@ extern long random();
 #define SND_FILENAME           0x2000L
 #define VK_APPS                        0x5D
 #define SIF_TRACKPOS   0x0010
 #define SND_FILENAME           0x2000L
 #define VK_APPS                        0x5D
 #define SIF_TRACKPOS   0x0010

+#define ICC_BAR_CLASSES 4
+#define FW_BLACK       FW_HEAVY
+#define FW_ULTRABOLD   FW_EXTRABOLD
+#define FW_DEMIBOLD    FW_SEMIBOLD
+#define FW_ULTRALIGHT  FW_EXTRALIGHT
+#define APPCMD_FILTERINITS     0x20L
+#define CBF_FAIL_SELFCONNECTIONS 0x1000
+#define CBF_SKIP_ALLNOTIFICATIONS      0x3C0000
+#define CBF_FAIL_ADVISES       0x4000
+#define CBF_FAIL_POKES         0x10000
+#define CBF_FAIL_REQUESTS      0x20000
+#define SZDDESYS_TOPIC         "System"
+#define JOHAB_CHARSET          130
+#define MAC_CHARSET            77
+

 #endif
 #endif
 
 #endif
 #endif
 

@@ -130,20 +145,6 @@ extern long random();
 #define C_SWITCH_SYSTEM -Wno-sign-compare -fno-caller-saves
 #define LIBS_SYSTEM -lwinmm
 
 #define C_SWITCH_SYSTEM -Wno-sign-compare -fno-caller-saves
 #define LIBS_SYSTEM -lwinmm
 

-#define ICC_BAR_CLASSES 4
-#define FW_BLACK       FW_HEAVY
-#define FW_ULTRABOLD   FW_EXTRABOLD
-#define FW_DEMIBOLD    FW_SEMIBOLD
-#define FW_ULTRALIGHT  FW_EXTRALIGHT
-#define APPCMD_FILTERINITS     0x20L
-#define CBF_FAIL_SELFCONNECTIONS 0x1000
-#define CBF_SKIP_ALLNOTIFICATIONS      0x3C0000
-#define CBF_FAIL_ADVISES       0x4000
-#define CBF_FAIL_POKES         0x10000
-#define CBF_FAIL_REQUESTS      0x20000
-#define SZDDESYS_TOPIC         "System"
-#define JOHAB_CHARSET          130
-#define MAC_CHARSET            77

 
 #define TEXT_START -1
 #define TEXT_END -1
 
 #define TEXT_START -1
 #define TEXT_END -1

diff --git a/src/scrollbar-msw.c b/src/scrollbar-msw.c
index d04acb1..0e0526b 100644 (file)
--- a/src/scrollbar-msw.c
+++ b/src/scrollbar-msw.c
@@ -34,11 +34,13 @@ Boston, MA 02111-1307, USA.  */
 #include "specifier.h"
 #include "window.h"
 
 #include "specifier.h"
 #include "window.h"
 

-/* This has really different semantics in Windows than in Motif.
-   There's no corresponding method; we just do not change slider
-   size while dragging. It makes the scrollbar look smother and
-   prevents some weird behavior when scrolled near the bottom */
-static int inhibit_slider_size_change = 0;
+/* We use a similar sort of vertical scrollbar drag hack for mswindows
+ * scrollbars as is used for Motif or Lucid scrollbars under X.
+ * We do character-based instead of line-based scrolling, which can mean that
+ * without the hack it is impossible to drag to the end of a buffer. */
+#define VERTICAL_SCROLLBAR_DRAG_HACK
+
+static int vertical_drag_in_progress = 0;

 
 static void
 mswindows_create_scrollbar_instance (struct frame *f, int vertical,
 
 static void
 mswindows_create_scrollbar_instance (struct frame *f, int vertical,

@@ -59,6 +61,7 @@ mswindows_create_scrollbar_instance (struct frame *f, int vertical,
                 CW_USEDEFAULT, CW_USEDEFAULT,
                 FRAME_MSWINDOWS_HANDLE (f),
                 NULL, NULL, NULL);
                 CW_USEDEFAULT, CW_USEDEFAULT,
                 FRAME_MSWINDOWS_HANDLE (f),
                 NULL, NULL, NULL);

+  SCROLLBAR_MSW_INFO (sb).cbSize = sizeof(SCROLLINFO);

   SCROLLBAR_MSW_INFO (sb).fMask = SIF_ALL;
   GetScrollInfo(SCROLLBAR_MSW_HANDLE (sb), SB_CTL,
                &SCROLLBAR_MSW_INFO (sb));
   SCROLLBAR_MSW_INFO (sb).fMask = SIF_ALL;
   GetScrollInfo(SCROLLBAR_MSW_HANDLE (sb), SB_CTL,
                &SCROLLBAR_MSW_INFO (sb));

@@ -110,10 +113,8 @@ mswindows_update_scrollbar_instance_values (struct window *w,
                                            int new_scrollbar_x,
                                            int new_scrollbar_y)
 {
                                            int new_scrollbar_x,
                                            int new_scrollbar_y)
 {

-  struct frame *f;

   int pos_changed = 0;
   int pos_changed = 0;

-
-  f = XFRAME (w->frame);
+  int vert = GetWindowLong (SCROLLBAR_MSW_HANDLE (sb), GWL_STYLE) & SBS_VERT;

 
 #if 0
   stderr_out ("[%d, %d], page = %d, pos = %d, inhibit = %d\n", new_minimum, new_maximum,
 
 #if 0
   stderr_out ("[%d, %d], page = %d, pos = %d, inhibit = %d\n", new_minimum, new_maximum,

@@ -122,17 +123,23 @@ mswindows_update_scrollbar_instance_values (struct window *w,
 
   /* These might be optimized, but since at least one will change at each
      call, it's probably not worth it. */
 
   /* These might be optimized, but since at least one will change at each
      call, it's probably not worth it. */

-  SCROLLBAR_MSW_INFO (sb).cbSize = sizeof(SCROLLINFO);

   SCROLLBAR_MSW_INFO (sb).nMin = new_minimum;
   SCROLLBAR_MSW_INFO (sb).nMax = new_maximum;
   SCROLLBAR_MSW_INFO (sb).nMin = new_minimum;
   SCROLLBAR_MSW_INFO (sb).nMax = new_maximum;

-  SCROLLBAR_MSW_INFO (sb).nPage = new_slider_size + 1; /* for DISABLENOSCROLL */
+  SCROLLBAR_MSW_INFO (sb).nPage = new_slider_size + 1; /* +1 for DISABLENOSCROLL */

   SCROLLBAR_MSW_INFO (sb).nPos = new_slider_position;
   SCROLLBAR_MSW_INFO (sb).nPos = new_slider_position;

-  SCROLLBAR_MSW_INFO (sb).fMask = (inhibit_slider_size_change 
+#ifndef VERTICAL_SCROLLBAR_DRAG_HACK
+  SCROLLBAR_MSW_INFO (sb).fMask = ((vert && vertical_drag_in_progress)

                                   ? SIF_RANGE | SIF_POS
                                   : SIF_ALL | SIF_DISABLENOSCROLL);
                                   ? SIF_RANGE | SIF_POS
                                   : SIF_ALL | SIF_DISABLENOSCROLL);

-  
-  SetScrollInfo(SCROLLBAR_MSW_HANDLE (sb), SB_CTL, &SCROLLBAR_MSW_INFO (sb),
-               !pos_changed);
+#else
+  SCROLLBAR_MSW_INFO (sb).fMask = SIF_ALL | SIF_DISABLENOSCROLL;
+
+  /* Ignore XEmacs' requests to update the thumb position and size; they don't
+   * bear any relation to reality because we're reporting made-up positions */
+  if (!(vert && vertical_drag_in_progress))
+#endif
+    SetScrollInfo (SCROLLBAR_MSW_HANDLE (sb), SB_CTL, &SCROLLBAR_MSW_INFO (sb),
+                  TRUE);

 
   UPDATE_POS_FIELD (scrollbar_x);
   UPDATE_POS_FIELD (scrollbar_y);
 
   UPDATE_POS_FIELD (scrollbar_x);
   UPDATE_POS_FIELD (scrollbar_y);

@@ -171,14 +178,13 @@ mswindows_handle_scrollbar_event (HWND hwnd, int code, int pos)
   struct scrollbar_instance *sb;
   SCROLLINFO scrollinfo;
   int vert = GetWindowLong (hwnd, GWL_STYLE) & SBS_VERT;
   struct scrollbar_instance *sb;
   SCROLLINFO scrollinfo;
   int vert = GetWindowLong (hwnd, GWL_STYLE) & SBS_VERT;

+  int value;

 
   sb = (struct scrollbar_instance *)GetWindowLong (hwnd, GWL_USERDATA);
   win = real_window (sb->mirror, 1);
   frame = XWINDOW (win)->frame;
   f = XFRAME (frame);
 
 
   sb = (struct scrollbar_instance *)GetWindowLong (hwnd, GWL_USERDATA);
   win = real_window (sb->mirror, 1);
   frame = XWINDOW (win)->frame;
   f = XFRAME (frame);
 

-  inhibit_slider_size_change = code == SB_THUMBTRACK;
-

   /* SB_LINEDOWN == SB_CHARLEFT etc. This is the way they will
      always be - any Windows is binary compatible backward with 
      old programs */
   /* SB_LINEDOWN == SB_CHARLEFT etc. This is the way they will
      always be - any Windows is binary compatible backward with 
      old programs */

@@ -221,12 +227,40 @@ mswindows_handle_scrollbar_event (HWND hwnd, int code, int pos)
     case SB_THUMBTRACK:
     case SB_THUMBPOSITION:
       scrollinfo.cbSize = sizeof(SCROLLINFO);
     case SB_THUMBTRACK:
     case SB_THUMBPOSITION:
       scrollinfo.cbSize = sizeof(SCROLLINFO);

-      scrollinfo.fMask = SIF_TRACKPOS;
+      scrollinfo.fMask = SIF_ALL;

       GetScrollInfo (hwnd, SB_CTL, &scrollinfo);
       GetScrollInfo (hwnd, SB_CTL, &scrollinfo);

+      vertical_drag_in_progress = vert;
+#ifdef VERTICAL_SCROLLBAR_DRAG_HACK
+      if (vert && (scrollinfo.nTrackPos > scrollinfo.nPos))
+        /* new buffer position =
+        *  buffer position at start of drag +
+        *   ((text remaining in buffer at start of drag) *
+        *    (amount that the thumb has been moved) /
+        *    (space that remained past end of the thumb at start of drag)) */
+       value = (int)
+         (scrollinfo.nPos
+          + (((double)
+             (scrollinfo.nMax - scrollinfo.nPos)
+              * (scrollinfo.nTrackPos - scrollinfo.nPos))
+             / (scrollinfo.nMax - scrollinfo.nPage - scrollinfo.nPos)))
+         - 2;  /* ensure that the last line doesn't disappear off screen */
+      else
+#endif
+        value = scrollinfo.nTrackPos;

       mswindows_enqueue_misc_user_event
        (frame,
         vert ? Qscrollbar_vertical_drag : Qscrollbar_horizontal_drag,
       mswindows_enqueue_misc_user_event
        (frame,
         vert ? Qscrollbar_vertical_drag : Qscrollbar_horizontal_drag,

-        Fcons (win, make_int (scrollinfo.nTrackPos)));
+        Fcons (win, make_int (value)));
+      break;
+
+    case SB_ENDSCROLL:
+#ifdef VERTICAL_SCROLLBAR_DRAG_HACK
+      if (vertical_drag_in_progress)
+       /* User has just dropped the thumb - finally update it */
+       SetScrollInfo (SCROLLBAR_MSW_HANDLE (sb), SB_CTL,
+                      &SCROLLBAR_MSW_INFO (sb), TRUE);
+#endif
+      vertical_drag_in_progress = 0;

       break;
     }
 }
       break;
     }
 }

diff --git a/src/unexec.c b/src/unexec.c
index 907b5cf..14ed085 100644 (file)
--- a/src/unexec.c
+++ b/src/unexec.c
@@ -190,6 +190,7 @@ pointer looks like an int) but not on all machines.
 #  define __STDC_EXTENDED__ 1
 # endif
 
 #  define __STDC_EXTENDED__ 1
 # endif
 

+# include <stddef.h>

 # include <stdlib.h>
 # include <unistd.h>
 # include <string.h>
 # include <stdlib.h>
 # include <unistd.h>
 # include <string.h>

diff --git a/src/window.c b/src/window.c
index 63a9aca..26193ca 100644 (file)
--- a/src/window.c
+++ b/src/window.c
@@ -1635,7 +1635,8 @@ from overriding motion of point in order to display at this exact start.
   /* this is not right, but much easier than doing what is right. */
   /* w->start_at_line_beg = 0; */
   /* WTF is the above supposed to mean?  GE */
   /* this is not right, but much easier than doing what is right. */
   /* w->start_at_line_beg = 0; */
   /* WTF is the above supposed to mean?  GE */

-  w->start_at_line_beg = beginning_of_line_p (XBUFFER (w->buffer), XINT (pos));
+  w->start_at_line_beg = beginning_of_line_p (XBUFFER (w->buffer),
+                                             marker_position (w->start[CURRENT_DISP]));

   if (NILP (noforce))
     w->force_start = 1;
   w->redo_modeline = 1;
   if (NILP (noforce))
     w->force_start = 1;
   w->redo_modeline = 1;

@@ -3167,7 +3168,7 @@ BUFFER can be a buffer or buffer name.
   Fset_marker (w->sb_point, w->start[CURRENT_DISP], buffer);
   /* set start_at_line_beg correctly. GE */
   w->start_at_line_beg = beginning_of_line_p (XBUFFER (buffer),
   Fset_marker (w->sb_point, w->start[CURRENT_DISP], buffer);
   /* set start_at_line_beg correctly. GE */
   w->start_at_line_beg = beginning_of_line_p (XBUFFER (buffer),

-                                             XBUFFER (buffer)->last_window_start);  
+                                             marker_position (w->start[CURRENT_DISP]));  

   w->force_start = 0;           /* Lucid fix */
   SET_LAST_MODIFIED (w, 1);
   SET_LAST_FACECHANGE (w);
   w->force_start = 0;           /* Lucid fix */
   SET_LAST_MODIFIED (w, 1);
   SET_LAST_FACECHANGE (w);

@@ -5670,7 +5671,7 @@ This is a specifier; use `set-specifier' to change it.
   {
     Lisp_Object fb = Qnil;
 #ifdef HAVE_TTY
   {
     Lisp_Object fb = Qnil;
 #ifdef HAVE_TTY

-    fb = Fcons (Fcons (list1 (Qtty), Qzero), fb);
+    fb = Fcons (Fcons (list1 (Qtty), make_int (1)), fb);

 #endif
 #ifdef HAVE_X_WINDOWS
     fb = Fcons (Fcons (list1 (Qx), make_int (3)), fb);
 #endif
 #ifdef HAVE_X_WINDOWS
     fb = Fcons (Fcons (list1 (Qx), make_int (3)), fb);

diff --git a/version.sh b/version.sh
index 427ce47..86e51b4 100644 (file)
--- a/version.sh
+++ b/version.sh
@@ -1,8 +1,8 @@
 #!/bin/sh
 emacs_major_version=21
 emacs_minor_version=2
 #!/bin/sh
 emacs_major_version=21
 emacs_minor_version=2

-emacs_beta_version=2
-xemacs_codename="Aether"
+emacs_beta_version=3
+xemacs_codename="Aglaia"

 infodock_major_version=4
 infodock_minor_version=0
 infodock_build_version=1
 infodock_major_version=4
 infodock_minor_version=0
 infodock_build_version=1