xemacs-beta: configure comparison

comparison configure @ 159:3bb7ccffb0c0 r20-3b6

Import from CVS: tag r20-3b6

author	cvs
date	Mon, 13 Aug 2007 09:41:43 +0200
parents	6b37e6ddd302
children	0132846995bd

comparison

equal deleted inserted replaced

-:558dfa75ffb3
+:3bb7ccffb0c0
 -no-create | --no-create | --no-creat | --no-crea | --no-cre \
 | --no-cr | --no-c) ;;
 -no-recursion | --no-recursion | --no-recursio | --no-recursi \
 | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) ;;
 *)
-quoted_i="`echo $i | sed $quoted_sed_magic`"
+quoted_i="`echo '' $i | sed -e 's:^ ::' -e $quoted_sed_magic`"
 quoted_arguments="$quoted_arguments '$quoted_i'" ;;
 esac
 done
 while test $# != 0; do
 "with_database" )
 	  with_database_berkdb=no
 	  with_database_dbm=no
 	  with_database_gnudbm=no
-	  for x in `echo "$val" | sed 's/,/ /'` ; do
+	  for x in `echo "$val" | sed -e 's/,/ /'` ; do
 	    case "$x" in
 		no ) ;;
 		b | be | ber | berk | berkd | berkdb )  with_database_berkdb=yes ;;
 		d | db | dbm )				with_database_dbm=yes    ;;
 		g | gn | gnu | gnud | gnudb | gnudbm )  with_database_gnudbm=yes ;;
 eval "$opt=\"$val\""
 ;;
 	"error_checking" )
-	  for x in `echo "$val" | sed 's/,/ /'` ; do
+	  for x in `echo "$val" | sed -e 's/,/ /'` ; do
 	    case "$x" in
 	      	      n | no | non | none ) new_default=no ;;
 	      a | al | all )	    new_default=yes ;;
 	      extents )       error_check_extents=yes ;;
 MAKE_SUBDIR="$MAKE_SUBDIR lwlib/energize" &&  if test "$extra_verbose" = "yes"; then echo "    Appending \"lwlib/energize\" to \$MAKE_SUBDIR"; fi
 fi
 test "$extra_verbose" = "yes" && verbose=yes
-case "site_includes" in *:* ) site_includes="`echo $site_includes | sed 's/:/ /g'`";; esac
+case "site_includes" in *:* ) site_includes="`echo '' $site_includes | sed -e 's:^ ::' -e 's/:/ /g'`";; esac
-case "site_libraries" in *:* ) site_libraries="`echo $site_libraries | sed 's/:/ /g'`";; esac
+case "site_libraries" in *:* ) site_libraries="`echo '' $site_libraries | sed -e 's:^ ::' -e 's/:/ /g'`";; esac
-case "site_runtime_libraries" in *:* ) site_runtime_libraries="`echo $site_runtime_libraries | sed 's/:/ /g'`";; esac
+case "site_runtime_libraries" in *:* ) site_runtime_libraries="`echo '' $site_runtime_libraries | sed -e 's:^ ::' -e 's/:/ /g'`";; esac
 test -n "$with_x" && with_x11="$with_x"
 if test "$run_in_place" = "yes"; then
 echo "configure: warning: "The --run-in-place option is ignored because it is unnecessary."" 1>&2
 fi
 if test "$add_runtime_path" = "yes" -a -n "$dash_r"; then
-ld_switch_site="`echo $ld_switch_site     | sed \"s/${dash_r}[^ ]*//\"`"
+ld_switch_site=`echo   '' $ld_switch_site   | sed -e 's:^ ::' -e "s/${dash_r}[^ ]*//"`
-ld_switch_x_site="`echo $ld_switch_x_site | sed \"s/${dash_r}[^ ]*//\"`"
+ld_switch_x_site=`echo '' $ld_switch_x_site | sed -e 's:^ ::' -e "s/${dash_r}[^ ]*//"`
 runpath=""
 if test -n "$LD_RUN_PATH"; then
 runpath="$LD_RUN_PATH"
 elif test "$GCC" = "yes"; then
 echo "int main(int argc, char *argv[]) {return 0;}" > conftest.c
 xe_runpath_link='${CC-cc} -o conftest -v $CFLAGS '"$xe_ldflags"' conftest.$ac_ext 2>&1 1>/dev/null'
 for arg in `eval "$xe_runpath_link" | grep ' -L'`; do
 case "$arg" in P,* | -L* | -R* )
-for dir in `echo "$arg" | sed -e 's/^..//' -e 'y/:/ /'`; do
+for dir in `echo '' "$arg" | sed -e 's:^ ::' -e 's/^..//' -e 'y/:/ /'`; do
 xe_runpath_dir="$dir"
 if test "$xe_runpath_dir" != "/lib"     -a \
 	"$xe_runpath_dir" != "/usr/lib" -a \
 	-n "`ls ${xe_runpath_dir}/*.s[ol] 2>/dev/null`"; then
 done
 rm -f conftest*
 else
 for arg in $ld_switch_site $ld_switch_x_site; do
 case "$arg" in -L*)
-xe_runpath_dir=`echo "$arg" | sed 's/^-L//'`
+xe_runpath_dir=`echo '' "$arg" | sed -e 's:^ ::' -e 's/^-L//'`
 if test "$xe_runpath_dir" != "/lib"     -a \
 	"$xe_runpath_dir" != "/usr/lib" -a \
 	-n "`ls ${xe_runpath_dir}/*.s[ol] 2>/dev/null`"; then
 test -n "$runpath" && runpath="${runpath}:"
 runpath="${runpath}${xe_runpath_dir}"
 #define SIZEOF_LONG $ac_cv_sizeof_long
 EOF
 }
+if test "$ac_cv_sizeof_long" = 0; then
+echo ""
+echo "*** PANIC *** Configure tests are not working - compiler is broken."
+echo "*** PANIC *** Please examine config.log for compilation errors."
+exit 1
+fi
 echo $ac_n "checking for long file names""... $ac_c" 1>&6
-echo "configure:3223: checking for long file names" >&5
+echo "configure:3229: checking for long file names" >&5
 ac_cv_sys_long_file_names=yes
 # Test for long file names in all the places we know might matter:
 #      .		the current directory, where building will happen
 #      $prefix/lib	where we will be installing things
 fi
 echo $ac_n "checking for sqrt in -lm""... $ac_c" 1>&6
-echo "configure:3271: checking for sqrt in -lm" >&5
+echo "configure:3276: checking for sqrt in -lm" >&5
 ac_lib_var=`echo m'_'sqrt | sed 'y%./+-%__p_%'`
 xe_check_libs=" -lm "
 cat > conftest.$ac_ext <<EOF
-#line 3276 "configure"
+#line 3281 "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
 builtin and then its argument prototype would still apply.  */
 char sqrt();
 int main() {
 sqrt()
 ; return 0; }
 EOF
-if { (eval echo configure:3287: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:3292: \"$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
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 echo "$ac_t""no" 1>&6
 fi
+echo $ac_n "checking for main in -lPW""... $ac_c" 1>&6
+echo "configure:3326: checking for main in -lPW" >&5
+ac_lib_var=`echo PW'_'main | sed 'y%./+-%__p_%'`
+xe_check_libs=" -lPW "
+cat > conftest.$ac_ext <<EOF
+#line 3331 "configure"
+#include "confdefs.h"
+int main() {
+main()
+; return 0; }
+EOF
+if { (eval echo configure:3338: \"$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
+echo "configure: failed program was:" >&5
+cat conftest.$ac_ext >&5
+rm -rf conftest*
+eval "ac_cv_lib_$ac_lib_var=no"
+fi
+rm -f conftest*
+xe_check_libs=""
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes" ; then
+echo "$ac_t""yes" 1>&6
+ac_tr_lib=HAVE_LIB`echo PW | sed -e 's/[^a-zA-Z0-9_]/_/g' \
+-e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
+{ test "$extra_verbose" = "yes" && cat << EOF
+Defining $ac_tr_lib
+EOF
+cat >> confdefs.h <<EOF
+#define $ac_tr_lib 1
+EOF
+}
+LIBS="-lPW $LIBS" &&  if test "$extra_verbose" = "yes"; then echo "    Prepending \"-lPW\" to \$LIBS"; fi
+else
+echo "$ac_t""no" 1>&6
+fi
 { test "$extra_verbose" = "yes" && cat << \EOF
 Defining LISP_FLOAT_TYPE
 EOF
 cat >> confdefs.h <<\EOF
 #define LISP_FLOAT_TYPE 1
 EOF
 }
 echo "checking type of mail spool file locking" 1>&6
-echo "configure:3329: checking type of mail spool file locking" >&5
+echo "configure:3380: checking type of mail spool file locking" >&5
 test -z "$mail_locking" -a "$mail_use_flock" = "yes" && mail_locking=flock
 test -z "$mail_locking" -a "$mail_use_lockf" = "yes" && mail_locking=lockf
 if   test "$mail_locking" = "lockf"; then { test "$extra_verbose" = "yes" && cat << \EOF
 Defining REAL_MAIL_USE_LOCKF
 EOF
 else mail_locking="dot-locking"
 fi
 echo $ac_n "checking for kstat_open in -lkstat""... $ac_c" 1>&6
-echo "configure:3353: checking for kstat_open in -lkstat" >&5
+echo "configure:3404: checking for kstat_open in -lkstat" >&5
 ac_lib_var=`echo kstat'_'kstat_open | sed 'y%./+-%__p_%'`
 xe_check_libs=" -lkstat "
 cat > conftest.$ac_ext <<EOF
-#line 3358 "configure"
+#line 3409 "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
 builtin and then its argument prototype would still apply.  */
 char kstat_open();
 int main() {
 kstat_open()
 ; return 0; }
 EOF
-if { (eval echo configure:3369: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:3420: \"$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
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 echo $ac_n "checking for kvm_read in -lkvm""... $ac_c" 1>&6
-echo "configure:3403: checking for kvm_read in -lkvm" >&5
+echo "configure:3454: checking for kvm_read in -lkvm" >&5
 ac_lib_var=`echo kvm'_'kvm_read | sed 'y%./+-%__p_%'`
 xe_check_libs=" -lkvm "
 cat > conftest.$ac_ext <<EOF
-#line 3408 "configure"
+#line 3459 "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
 builtin and then its argument prototype would still apply.  */
 char kvm_read();
 int main() {
 kvm_read()
 ; return 0; }
 EOF
-if { (eval echo configure:3419: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:3470: \"$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
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 echo $ac_n "checking for cma_open in -lpthreads""... $ac_c" 1>&6
-echo "configure:3453: checking for cma_open in -lpthreads" >&5
+echo "configure:3504: checking for cma_open in -lpthreads" >&5
 ac_lib_var=`echo pthreads'_'cma_open | sed 'y%./+-%__p_%'`
 xe_check_libs=" -lpthreads "
 cat > conftest.$ac_ext <<EOF
-#line 3458 "configure"
+#line 3509 "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
 builtin and then its argument prototype would still apply.  */
 char cma_open();
 int main() {
 cma_open()
 ; return 0; }
 EOF
-if { (eval echo configure:3469: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:3520: \"$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
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 if test "$ac_cv_lib_pthreads_cma_open" = "yes"; then
 case "$opsys" in decosf*) c_switch_site="$c_switch_site -threads";; esac
 fi
 echo $ac_n "checking whether the -xildoff compiler flag is required""... $ac_c" 1>&6
-echo "configure:3505: checking whether the -xildoff compiler flag is required" >&5
+echo "configure:3556: checking whether the -xildoff compiler flag is required" >&5
 if   ${CC-cc} '-###' -xildon  no_such_file.c 2>&1 | grep '^[^ ]*/ild ' > /dev/null ; then
 if ${CC-cc} '-###' -xildoff no_such_file.c 2>&1 | grep '^[^ ]*/ild ' > /dev/null ;
 then echo "$ac_t""no" 1>&6;
 else echo "$ac_t""yes" 1>&6; ld_switch_site="$ld_switch_site -xildoff" &&  if test "$extra_verbose" = "yes"; then echo "    Appending \"-xildoff\" to \$ld_switch_site"; fi
 fi
 else echo "$ac_t""no" 1>&6
 fi
 echo $ac_n "checking for dynodump""... $ac_c" 1>&6
-echo "configure:3515: checking for dynodump" >&5
+echo "configure:3566: checking for dynodump" >&5
 case "$opsys" in sol2* )
 echo "$ac_t""yes" 1>&6
 { test "$extra_verbose" = "yes" && cat << \EOF
 Defining DYNODUMP
 EOF
 *) echo "$ac_t""no" 1>&6 ;;
 esac
 case "$opsys" in sol2-[6-9]* )
 echo $ac_n "checking for \"-z ignore\" linker flag""... $ac_c" 1>&6
-echo "configure:3538: checking for \"-z ignore\" linker flag" >&5
+echo "configure:3589: checking for \"-z ignore\" linker flag" >&5
 case "`ld -h 2>&1`" in
 *-z\ ignore\|record* ) echo "$ac_t""yes" 1>&6
 ld_switch_site="-z ignore $ld_switch_site" &&  if test "$extra_verbose" = "yes"; then echo "    Prepending \"-z ignore\" to \$ld_switch_site"; fi ;;
 *) echo "$ac_t""no" 1>&6 ;;
 esac ;;
 esac
 echo "checking "for specified window system"" 1>&6
-echo "configure:3548: checking "for specified window system"" >&5
+echo "configure:3599: checking "for specified window system"" >&5
 if test "$x_includes $x_libraries" = "NONE NONE"; then
 if test -n "$OPENWINHOME" \
 -a "$OPENWINHOME" != "/usr/openwin" \
 -a -d "$OPENWINHOME"; then
 # If we find X, set shell vars x_includes and x_libraries to the
 # paths, otherwise set no_x=yes.
 # Uses ac_ vars as temps to allow command line to override cache and checks.
 # --without-x overrides everything else, but does not touch the cache.
 echo $ac_n "checking for X""... $ac_c" 1>&6
-echo "configure:3569: checking for X" >&5
+echo "configure:3620: checking for X" >&5
 # Check whether --with-x or --without-x was given.
 if test "${with_x+set}" = set; then
 withval="$with_x"
 :
 # Guess where to find include files, by looking for this one X11 .h file.
 test -z "$x_direct_test_include" && x_direct_test_include=X11/Intrinsic.h
 # First, try using that file with no special directory specified.
 cat > conftest.$ac_ext <<EOF
-#line 3629 "configure"
+#line 3680 "configure"
 #include "confdefs.h"
 #include <$x_direct_test_include>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3634: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3685: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
 rm -rf conftest*
 # We can compile using X headers with no special include directory.
 ac_x_includes=
 # See if we find them without any special options.
 # Don't add to $LIBS permanently.
 ac_save_LIBS="$LIBS"
 LIBS="-l$x_direct_test_library $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 3703 "configure"
+#line 3754 "configure"
 #include "confdefs.h"
 int main() {
 ${x_direct_test_function}()
 ; return 0; }
 EOF
-if { (eval echo configure:3710: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:3761: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
 rm -rf conftest*
 LIBS="$ac_save_LIBS"
 # We can link X programs with no special library path.
 ac_x_libraries=
 else
 # For Solaris; some versions of Sun CC require a space after -R and
 # others require no space.  Words are not sufficient . . . .
 case "`(uname -sr) 2>/dev/null`" in
 "SunOS 5"*)
 echo $ac_n "checking whether -R must be followed by a space""... $ac_c" 1>&6
-echo "configure:3819: checking whether -R must be followed by a space" >&5
+echo "configure:3870: checking whether -R must be followed by a space" >&5
 ac_xsave_LIBS="$LIBS"; LIBS="$LIBS -R$x_libraries"
 cat > conftest.$ac_ext <<EOF
-#line 3822 "configure"
+#line 3873 "configure"
 #include "confdefs.h"
 int main() {
 ; return 0; }
 EOF
-if { (eval echo configure:3829: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:3880: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
 rm -rf conftest*
 ac_R_nospace=yes
 else
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 	echo "$ac_t""no" 1>&6
 	X_LIBS="$X_LIBS -R$x_libraries"
 else
 	LIBS="$ac_xsave_LIBS -R $x_libraries"
 	cat > conftest.$ac_ext <<EOF
-#line 3845 "configure"
+#line 3896 "configure"
 #include "confdefs.h"
 int main() {
 ; return 0; }
 EOF
-if { (eval echo configure:3852: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:3903: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
 rm -rf conftest*
 ac_R_space=yes
 else
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 if test "$with_dnet" = "no" ; then
 ac_cv_lib_dnet_dnet_ntoa=no
 else
 echo $ac_n "checking for dnet_ntoa in -ldnet""... $ac_c" 1>&6
-echo "configure:3888: checking for dnet_ntoa in -ldnet" >&5
+echo "configure:3939: checking for dnet_ntoa in -ldnet" >&5
 ac_lib_var=`echo dnet'_'dnet_ntoa | sed 'y%./+-%__p_%'`
 xe_check_libs=" -ldnet "
 cat > conftest.$ac_ext <<EOF
-#line 3893 "configure"
+#line 3944 "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
 builtin and then its argument prototype would still apply.  */
 char dnet_ntoa();
 int main() {
 dnet_ntoa()
 ; return 0; }
 EOF
-if { (eval echo configure:3904: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:3955: \"$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
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 fi
 if test $ac_cv_lib_dnet_dnet_ntoa = no; then
 echo $ac_n "checking for dnet_ntoa in -ldnet_stub""... $ac_c" 1>&6
-echo "configure:3928: checking for dnet_ntoa in -ldnet_stub" >&5
+echo "configure:3979: checking for dnet_ntoa in -ldnet_stub" >&5
 ac_lib_var=`echo dnet_stub'_'dnet_ntoa | sed 'y%./+-%__p_%'`
 xe_check_libs=" -ldnet_stub "
 cat > conftest.$ac_ext <<EOF
-#line 3933 "configure"
+#line 3984 "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
 builtin and then its argument prototype would still apply.  */
 char dnet_ntoa();
 int main() {
 dnet_ntoa()
 ; return 0; }
 EOF
-if { (eval echo configure:3944: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:3995: \"$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
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 # chad@anasazi.com says the Pyramis MIS-ES running DC/OSx (SVR4)
 # needs -lnsl.
 # The nsl library prevents programs from opening the X display
 # on Irix 5.2, according to dickey@clark.net.
 echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6
-echo "configure:3973: checking for gethostbyname" >&5
+echo "configure:4024: checking for gethostbyname" >&5
 cat > conftest.$ac_ext <<EOF
-#line 3976 "configure"
+#line 4027 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
 which can conflict with char gethostbyname(); below.  */
 #include <assert.h>
 /* Override any gcc2 internal prototype to avoid an error.  */
 gethostbyname();
 #endif
 ; return 0; }
 EOF
-if { (eval echo configure:3999: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:4050: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
 rm -rf conftest*
 eval "ac_cv_func_gethostbyname=yes"
 else
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 fi
 if test $ac_cv_func_gethostbyname = no; then
 echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6
-echo "configure:4020: checking for gethostbyname in -lnsl" >&5
+echo "configure:4071: checking for gethostbyname in -lnsl" >&5
 ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'`
 xe_check_libs=" -lnsl "
 cat > conftest.$ac_ext <<EOF
-#line 4025 "configure"
+#line 4076 "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
 builtin and then its argument prototype would still apply.  */
 char gethostbyname();
 int main() {
 gethostbyname()
 ; return 0; }
 EOF
-if { (eval echo configure:4036: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:4087: \"$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
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 # on later versions), says simon@lia.di.epfl.ch: it contains
 # gethostby* variants that don't use the nameserver (or something).
 # -lsocket must be given before -lnsl if both are needed.
 # We assume that if connect needs -lnsl, so does gethostbyname.
 echo $ac_n "checking for connect""... $ac_c" 1>&6
-echo "configure:4066: checking for connect" >&5
+echo "configure:4117: checking for connect" >&5
 cat > conftest.$ac_ext <<EOF
-#line 4069 "configure"
+#line 4120 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
 which can conflict with char connect(); below.  */
 #include <assert.h>
 /* Override any gcc2 internal prototype to avoid an error.  */
 connect();
 #endif
 ; return 0; }
 EOF
-if { (eval echo configure:4092: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:4143: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
 rm -rf conftest*
 eval "ac_cv_func_connect=yes"
 else
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 if test $ac_cv_func_connect = no; then
 xe_msg_checking="for connect in -lsocket"
 test -n "$X_EXTRA_LIBS" && xe_msg_checking="$xe_msg_checking using extra libs $X_EXTRA_LIBS"
 echo $ac_n "checking "$xe_msg_checking"""... $ac_c" 1>&6
-echo "configure:4115: checking "$xe_msg_checking"" >&5
+echo "configure:4166: checking "$xe_msg_checking"" >&5
 ac_lib_var=`echo socket'_'connect | sed 'y%./+-%__p_%'`
 xe_check_libs=" -lsocket $X_EXTRA_LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 4120 "configure"
+#line 4171 "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
 builtin and then its argument prototype would still apply.  */
 char connect();
 int main() {
 connect()
 ; return 0; }
 EOF
-if { (eval echo configure:4131: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:4182: \"$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
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 fi
 # gomez@mi.uni-erlangen.de says -lposix is necessary on A/UX.
 echo $ac_n "checking for remove""... $ac_c" 1>&6
-echo "configure:4155: checking for remove" >&5
+echo "configure:4206: checking for remove" >&5
 cat > conftest.$ac_ext <<EOF
-#line 4158 "configure"
+#line 4209 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
 which can conflict with char remove(); below.  */
 #include <assert.h>
 /* Override any gcc2 internal prototype to avoid an error.  */
 remove();
 #endif
 ; return 0; }
 EOF
-if { (eval echo configure:4181: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:4232: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
 rm -rf conftest*
 eval "ac_cv_func_remove=yes"
 else
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 fi
 if test $ac_cv_func_remove = no; then
 echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6
-echo "configure:4202: checking for remove in -lposix" >&5
+echo "configure:4253: checking for remove in -lposix" >&5
 ac_lib_var=`echo posix'_'remove | sed 'y%./+-%__p_%'`
 xe_check_libs=" -lposix "
 cat > conftest.$ac_ext <<EOF
-#line 4207 "configure"
+#line 4258 "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
 builtin and then its argument prototype would still apply.  */
 char remove();
 int main() {
 remove()
 ; return 0; }
 EOF
-if { (eval echo configure:4218: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:4269: \"$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
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 fi
 # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
 echo $ac_n "checking for shmat""... $ac_c" 1>&6
-echo "configure:4242: checking for shmat" >&5
+echo "configure:4293: checking for shmat" >&5
 cat > conftest.$ac_ext <<EOF
-#line 4245 "configure"
+#line 4296 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
 which can conflict with char shmat(); below.  */
 #include <assert.h>
 /* Override any gcc2 internal prototype to avoid an error.  */
 shmat();
 #endif
 ; return 0; }
 EOF
-if { (eval echo configure:4268: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:4319: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
 rm -rf conftest*
 eval "ac_cv_func_shmat=yes"
 else
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 fi
 if test $ac_cv_func_shmat = no; then
 echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6
-echo "configure:4289: checking for shmat in -lipc" >&5
+echo "configure:4340: checking for shmat in -lipc" >&5
 ac_lib_var=`echo ipc'_'shmat | sed 'y%./+-%__p_%'`
 xe_check_libs=" -lipc "
 cat > conftest.$ac_ext <<EOF
-#line 4294 "configure"
+#line 4345 "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
 builtin and then its argument prototype would still apply.  */
 char shmat();
 int main() {
 shmat()
 ; return 0; }
 EOF
-if { (eval echo configure:4305: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:4356: \"$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
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 # These have to be linked with before -lX11, unlike the other
 # libraries we check for below, so use a different variable.
 #  --interran@uluru.Stanford.EDU, kb@cs.umb.edu.
 echo $ac_n "checking for IceConnectionNumber in -lICE""... $ac_c" 1>&6
-echo "configure:4339: checking for IceConnectionNumber in -lICE" >&5
+echo "configure:4390: checking for IceConnectionNumber in -lICE" >&5
 ac_lib_var=`echo ICE'_'IceConnectionNumber | sed 'y%./+-%__p_%'`
 xe_check_libs=" -lICE "
 cat > conftest.$ac_ext <<EOF
-#line 4344 "configure"
+#line 4395 "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
 builtin and then its argument prototype would still apply.  */
 char IceConnectionNumber();
 int main() {
 IceConnectionNumber()
 ; return 0; }
 EOF
-if { (eval echo configure:4355: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:4406: \"$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
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 }
 MAKE_SUBDIR="$MAKE_SUBDIR lwlib" &&  if test "$extra_verbose" = "yes"; then echo "    Appending \"lwlib\" to \$MAKE_SUBDIR"; fi
 for lib_dir in "/usr/dt/lib" "/usr/lib/Motif1.2" "/usr/lib/Motif1.1"; do
-inc_dir="`echo $lib_dir | sed 's/lib/include/'`"
+inc_dir=`echo $lib_dir | sed -e 's/lib/include/'`
 if test -d "$lib_dir" -a -d "$inc_dir"; then
 case "$x_libraries" in *"$lib_dir"* ) ;; *)
 x_libraries="$lib_dir $x_libraries"
 X_LIBS="-L${lib_dir} $X_LIBS" &&  if test "$extra_verbose" = "yes"; then echo "    Prepending \"-L${lib_dir}\" to \$X_LIBS"; fi ;;
 esac
 ld_switch_x_site="$X_LIBS"
 if test "$add_runtime_path" = "yes" -a -n "$dash_r"; then
-ld_switch_site="`echo $ld_switch_site     | sed \"s/${dash_r}[^ ]*//\"`"
+ld_switch_site=`echo   '' $ld_switch_site   | sed -e 's:^ ::' -e "s/${dash_r}[^ ]*//"`
-ld_switch_x_site="`echo $ld_switch_x_site | sed \"s/${dash_r}[^ ]*//\"`"
+ld_switch_x_site=`echo '' $ld_switch_x_site | sed -e 's:^ ::' -e "s/${dash_r}[^ ]*//"`
 runpath=""
 if test -n "$LD_RUN_PATH"; then
 runpath="$LD_RUN_PATH"
 elif test "$GCC" = "yes"; then
 echo "int main(int argc, char *argv[]) {return 0;}" > conftest.c
 xe_runpath_link='${CC-cc} -o conftest -v $CFLAGS '"$xe_ldflags"' conftest.$ac_ext 2>&1 1>/dev/null'
 for arg in `eval "$xe_runpath_link" | grep ' -L'`; do
 case "$arg" in P,* | -L* | -R* )
-for dir in `echo "$arg" | sed -e 's/^..//' -e 'y/:/ /'`; do
+for dir in `echo '' "$arg" | sed -e 's:^ ::' -e 's/^..//' -e 'y/:/ /'`; do
 xe_runpath_dir="$dir"
 if test "$xe_runpath_dir" != "/lib"     -a \
 	"$xe_runpath_dir" != "/usr/lib" -a \
 	-n "`ls ${xe_runpath_dir}/*.s[ol] 2>/dev/null`"; then
 done
 rm -f conftest*
 else
 for arg in $ld_switch_site $ld_switch_x_site; do
 case "$arg" in -L*)
-xe_runpath_dir=`echo "$arg" | sed 's/^-L//'`
+xe_runpath_dir=`echo '' "$arg" | sed -e 's:^ ::' -e 's/^-L//'`
 if test "$xe_runpath_dir" != "/lib"     -a \
 	"$xe_runpath_dir" != "/usr/lib" -a \
 	-n "`ls ${xe_runpath_dir}/*.s[ol] 2>/dev/null`"; then
 test -n "$runpath" && runpath="${runpath}:"
 runpath="${runpath}${xe_runpath_dir}"
 echo
 fi
 ac_safe=`echo "X11/Intrinsic.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for X11/Intrinsic.h""... $ac_c" 1>&6
-echo "configure:4494: checking for X11/Intrinsic.h" >&5
+echo "configure:4545: checking for X11/Intrinsic.h" >&5
 cat > conftest.$ac_ext <<EOF
-#line 4497 "configure"
+#line 4548 "configure"
 #include "confdefs.h"
 #include <X11/Intrinsic.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:4502: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:4553: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
 rm -rf conftest*
 eval "ac_cv_header_$ac_safe=yes"
 else
 fi
 echo $ac_n "checking for XOpenDisplay in -lX11""... $ac_c" 1>&6
-echo "configure:4526: checking for XOpenDisplay in -lX11" >&5
+echo "configure:4577: checking for XOpenDisplay in -lX11" >&5
 ac_lib_var=`echo X11'_'XOpenDisplay | sed 'y%./+-%__p_%'`
 xe_check_libs=" -lX11 "
 cat > conftest.$ac_ext <<EOF
-#line 4531 "configure"
+#line 4582 "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
 builtin and then its argument prototype would still apply.  */
 char XOpenDisplay();
 int main() {
 XOpenDisplay()
 ; return 0; }
 EOF
-if { (eval echo configure:4542: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:4593: \"$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
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 if test "$have_lib_x11" != "yes"; then
 xe_msg_checking="for XGetFontProperty in -lX11"
 test -n "-b i486-linuxaout" && xe_msg_checking="$xe_msg_checking using extra libs -b i486-linuxaout"
 echo $ac_n "checking "$xe_msg_checking"""... $ac_c" 1>&6
-echo "configure:4567: checking "$xe_msg_checking"" >&5
+echo "configure:4618: checking "$xe_msg_checking"" >&5
 ac_lib_var=`echo X11'_'XGetFontProperty | sed 'y%./+-%__p_%'`
 xe_check_libs=" -lX11 -b i486-linuxaout"
 cat > conftest.$ac_ext <<EOF
-#line 4572 "configure"
+#line 4623 "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
 builtin and then its argument prototype would still apply.  */
 char XGetFontProperty();
 int main() {
 XGetFontProperty()
 ; return 0; }
 EOF
-if { (eval echo configure:4583: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:4634: \"$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
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 libs_x="-lX11"
 test "$extra_verbose" = "yes" && echo "    Setting libs_x to \"-lX11\""
 echo $ac_n "checking for XShapeSelectInput in -lXext""... $ac_c" 1>&6
-echo "configure:4610: checking for XShapeSelectInput in -lXext" >&5
+echo "configure:4661: checking for XShapeSelectInput in -lXext" >&5
 ac_lib_var=`echo Xext'_'XShapeSelectInput | sed 'y%./+-%__p_%'`
 xe_check_libs=" -lXext "
 cat > conftest.$ac_ext <<EOF
-#line 4615 "configure"
+#line 4666 "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
 builtin and then its argument prototype would still apply.  */
 char XShapeSelectInput();
 int main() {
 XShapeSelectInput()
 ; return 0; }
 EOF
-if { (eval echo configure:4626: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:4677: \"$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
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 case "$opsys" in    sunos4* ) libs_x="-u _XtToolkitInitialize -lXt $libs_x" &&  if test "$extra_verbose" = "yes"; then echo "    Prepending \"-u _XtToolkitInitialize -lXt\" to \$libs_x"; fi ;;
 * )
 echo $ac_n "checking for XtOpenDisplay in -lXt""... $ac_c" 1>&6
-echo "configure:4650: checking for XtOpenDisplay in -lXt" >&5
+echo "configure:4701: checking for XtOpenDisplay in -lXt" >&5
 ac_lib_var=`echo Xt'_'XtOpenDisplay | sed 'y%./+-%__p_%'`
 xe_check_libs=" -lXt "
 cat > conftest.$ac_ext <<EOF
-#line 4655 "configure"
+#line 4706 "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
 builtin and then its argument prototype would still apply.  */
 char XtOpenDisplay();
 int main() {
 XtOpenDisplay()
 ; return 0; }
 EOF
-if { (eval echo configure:4666: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:4717: \"$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
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 ;;
 esac
 echo $ac_n "checking the version of X11 being used""... $ac_c" 1>&6
-echo "configure:4690: checking the version of X11 being used" >&5
+echo "configure:4741: checking the version of X11 being used" >&5
 cat > conftest.$ac_ext <<EOF
-#line 4692 "configure"
+#line 4743 "configure"
 #include "confdefs.h"
 #include <X11/Intrinsic.h>
 main(int c, char* v[]) { return c>1 ? XlibSpecificationRelease : 0; }
 EOF
-if { (eval echo configure:4697: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5
+if { (eval echo configure:4748: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5
 then
 ./conftest foobar; x11_release=$?
 else
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 for ac_hdr in X11/Xlocale.h
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:4721: checking for $ac_hdr" >&5
+echo "configure:4772: checking for $ac_hdr" >&5
 cat > conftest.$ac_ext <<EOF
-#line 4724 "configure"
+#line 4775 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:4729: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:4780: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
 rm -rf conftest*
 eval "ac_cv_header_$ac_safe=yes"
 else
 fi
 done
 echo $ac_n "checking for XFree86""... $ac_c" 1>&6
-echo "configure:4760: checking for XFree86" >&5
+echo "configure:4811: checking for XFree86" >&5
 if test -d "/usr/X386/include" -o \
 -f "/etc/XF86Config" -o \
 	  -f "/etc/X11/XF86Config" -o \
 	  -f "/usr/X11R6/lib/X11/XF86Config"; then
 echo "$ac_t""yes" 1>&6
 case "$opsys" in     sunos4* ) libs_x="-u _get_applicationShellWidgetClass -lXmu $libs_x" &&  if test "$extra_verbose" = "yes"; then echo "    Prepending \"-u _get_applicationShellWidgetClass -lXmu\" to \$libs_x"; fi ;;
 * ) if test -z "$with_xmu"; then
 echo $ac_n "checking for XmuConvertStandardSelection in -lXmu""... $ac_c" 1>&6
-echo "configure:4782: checking for XmuConvertStandardSelection in -lXmu" >&5
+echo "configure:4833: checking for XmuConvertStandardSelection in -lXmu" >&5
 ac_lib_var=`echo Xmu'_'XmuConvertStandardSelection | sed 'y%./+-%__p_%'`
 xe_check_libs=" -lXmu "
 cat > conftest.$ac_ext <<EOF
-#line 4787 "configure"
+#line 4838 "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
 builtin and then its argument prototype would still apply.  */
 char XmuConvertStandardSelection();
 int main() {
 XmuConvertStandardSelection()
 ; return 0; }
 EOF
-if { (eval echo configure:4798: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:4849: \"$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
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 	fi ;;
 esac
 echo $ac_n "checking for main in -lXbsd""... $ac_c" 1>&6
-echo "configure:4831: checking for main in -lXbsd" >&5
+echo "configure:4882: checking for main in -lXbsd" >&5
 ac_lib_var=`echo Xbsd'_'main | sed 'y%./+-%__p_%'`
 xe_check_libs=" -lXbsd "
 cat > conftest.$ac_ext <<EOF
-#line 4836 "configure"
+#line 4887 "configure"
 #include "confdefs.h"
 int main() {
 main()
 ; return 0; }
 EOF
-if { (eval echo configure:4843: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:4894: \"$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
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 echo $ac_n "checking for XawScrollbarSetThumb in -lXaw""... $ac_c" 1>&6
-echo "configure:4866: checking for XawScrollbarSetThumb in -lXaw" >&5
+echo "configure:4917: checking for XawScrollbarSetThumb in -lXaw" >&5
 ac_lib_var=`echo Xaw'_'XawScrollbarSetThumb | sed 'y%./+-%__p_%'`
 xe_check_libs=" -lXaw "
 cat > conftest.$ac_ext <<EOF
-#line 4871 "configure"
+#line 4922 "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
 builtin and then its argument prototype would still apply.  */
 char XawScrollbarSetThumb();
 int main() {
 XawScrollbarSetThumb()
 ; return 0; }
 EOF
-if { (eval echo configure:4882: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:4933: \"$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
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 else
 echo "$ac_t""no" 1>&6
 have_xaw=no
 fi
+echo $ac_n "checking for NARROWPROTO""... $ac_c" 1>&6
+echo "configure:4956: checking for NARROWPROTO" >&5
+rm -fr conftestdir
+if mkdir conftestdir; then
+cd conftestdir
+cat > Imakefile <<'EOF'
+xetest:
+	@echo 'proto_defines="${PROTO_DEFINES}"'
+EOF
+if (xmkmf) >/dev/null 2>/dev/null && test -f Makefile; then
+# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
+eval `${MAKE-make} xetest 2>/dev/null | grep -v make`
+case "$proto_defines" in *NARROWPROTO* ) narrowproto=yes ;; esac
+fi
+cd ..
+rm -fr conftestdir
+fi
+test -z "$narrowproto" && narrowproto=no
+echo "$ac_t""$narrowproto" 1>&6
+test "$narrowproto" = "yes" && { test "$extra_verbose" = "yes" && cat << \EOF
+Defining NARROWPROTO
+EOF
+cat >> confdefs.h <<\EOF
+#define NARROWPROTO 1
+EOF
+}
 fi
 test -z "$window_system" && window_system="none"
 esac
 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:4939: checking for X11/Xauth.h" >&5
+echo "configure:5018: checking for X11/Xauth.h" >&5
 cat > conftest.$ac_ext <<EOF
-#line 4942 "configure"
+#line 5021 "configure"
 #include "confdefs.h"
 #include <X11/Xauth.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:4947: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:5026: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
 rm -rf conftest*
 eval "ac_cv_header_$ac_safe=yes"
 else
 with_xauth=no
 fi
 }
 test -z "$with_xauth" && {
 echo $ac_n "checking for XauGetAuthByAddr in -lXau""... $ac_c" 1>&6
-echo "configure:4970: checking for XauGetAuthByAddr in -lXau" >&5
+echo "configure:5049: checking for XauGetAuthByAddr in -lXau" >&5
 ac_lib_var=`echo Xau'_'XauGetAuthByAddr | sed 'y%./+-%__p_%'`
 xe_check_libs=" -lXau "
 cat > conftest.$ac_ext <<EOF
-#line 4975 "configure"
+#line 5054 "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
 builtin and then its argument prototype would still apply.  */
 char XauGetAuthByAddr();
 int main() {
 XauGetAuthByAddr()
 ; return 0; }
 EOF
-if { (eval echo configure:4986: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:5065: \"$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
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 cat >> confdefs.h <<\EOF
 #define HAVE_XAUTH 1
 EOF
 }
-libs_x="-lXau $libs_x" &&  if test "$extra_verbose" = "yes"; then echo "    Prepending \"-lXau\" to \$libs_x"; fi
-fi
+T=""
+for W in $X_EXTRA_LIBS -lXau $libs_x $X_PRE_LIBS; do if test -z "$T"; then T="$W"; else T="$T $W"; fi; done
+libs_xauth="$T"
+fi
 test -z "$with_offix" && { ac_safe=`echo "OffiX/DragAndDrop.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for OffiX/DragAndDrop.h""... $ac_c" 1>&6
-echo "configure:5022: checking for OffiX/DragAndDrop.h" >&5
+echo "configure:5106: checking for OffiX/DragAndDrop.h" >&5
 cat > conftest.$ac_ext <<EOF
-#line 5025 "configure"
+#line 5109 "configure"
 #include "confdefs.h"
 #include <OffiX/DragAndDrop.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:5030: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:5114: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
 rm -rf conftest*
 eval "ac_cv_header_$ac_safe=yes"
 else
 with_offix=no
 fi
 }
 test -z "$with_offix" && {
 echo $ac_n "checking for DndInitialize in -lDnd""... $ac_c" 1>&6
-echo "configure:5053: checking for DndInitialize in -lDnd" >&5
+echo "configure:5137: checking for DndInitialize in -lDnd" >&5
 ac_lib_var=`echo Dnd'_'DndInitialize | sed 'y%./+-%__p_%'`
 xe_check_libs=" -lDnd "
 cat > conftest.$ac_ext <<EOF
-#line 5058 "configure"
+#line 5142 "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
 builtin and then its argument prototype would still apply.  */
 char DndInitialize();
 int main() {
 DndInitialize()
 ; return 0; }
 EOF
-if { (eval echo configure:5069: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:5153: \"$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
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 test "$with_cde" = "yes" && with_tooltalk=yes # CDE requires tooltalk
 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
-echo "configure:5108: checking for ${dir}tt_c.h" >&5
+echo "configure:5192: checking for ${dir}tt_c.h" >&5
 cat > conftest.$ac_ext <<EOF
-#line 5111 "configure"
+#line 5195 "configure"
 #include "confdefs.h"
 #include <${dir}tt_c.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:5116: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:5200: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
 rm -rf conftest*
 eval "ac_cv_header_$ac_safe=yes"
 else
 for extra_libs in "" "-lI18N -lce" "-lcxx"; do
 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:5145: checking "$xe_msg_checking"" >&5
+echo "configure:5229: checking "$xe_msg_checking"" >&5
 ac_lib_var=`echo tt'_'tt_message_create | sed 'y%./+-%__p_%'`
 xe_check_libs=" -ltt $extra_libs"
 cat > conftest.$ac_ext <<EOF
-#line 5150 "configure"
+#line 5234 "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
 builtin and then its argument prototype would still apply.  */
 char tt_message_create();
 int main() {
 tt_message_create()
 ; return 0; }
 EOF
-if { (eval echo configure:5161: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:5245: \"$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
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 fi
 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
-echo "configure:5210: checking for Dt/Dt.h" >&5
+echo "configure:5294: checking for Dt/Dt.h" >&5
 cat > conftest.$ac_ext <<EOF
-#line 5213 "configure"
+#line 5297 "configure"
 #include "confdefs.h"
 #include <Dt/Dt.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:5218: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:5302: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
 rm -rf conftest*
 eval "ac_cv_header_$ac_safe=yes"
 else
 with_cde=no
 fi
 }
 test -z "$with_cde" && {
 echo $ac_n "checking for DtDndDragStart in -lDtSvc""... $ac_c" 1>&6
-echo "configure:5241: checking for DtDndDragStart in -lDtSvc" >&5
+echo "configure:5325: checking for DtDndDragStart in -lDtSvc" >&5
 ac_lib_var=`echo DtSvc'_'DtDndDragStart | sed 'y%./+-%__p_%'`
 xe_check_libs=" -lDtSvc "
 cat > conftest.$ac_ext <<EOF
-#line 5246 "configure"
+#line 5330 "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
 builtin and then its argument prototype would still apply.  */
 char DtDndDragStart();
 int main() {
 DtDndDragStart()
 ; return 0; }
 EOF
-if { (eval echo configure:5257: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:5341: \"$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
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 EOF
 }
 echo $ac_n "checking for main in -lenergize""... $ac_c" 1>&6
-echo "configure:5304: checking for main in -lenergize" >&5
+echo "configure:5388: checking for main in -lenergize" >&5
 ac_lib_var=`echo energize'_'main | sed 'y%./+-%__p_%'`
 xe_check_libs=" -lenergize "
 cat > conftest.$ac_ext <<EOF
-#line 5309 "configure"
+#line 5393 "configure"
 #include "confdefs.h"
 int main() {
 main()
 ; return 0; }
 EOF
-if { (eval echo configure:5316: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:5400: \"$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
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 if test -z "$energize_version"; then
 echo $ac_n "checking for main in -lconn""... $ac_c" 1>&6
-echo "configure:5348: checking for main in -lconn" >&5
+echo "configure:5432: checking for main in -lconn" >&5
 ac_lib_var=`echo conn'_'main | sed 'y%./+-%__p_%'`
 xe_check_libs=" -lconn "
 cat > conftest.$ac_ext <<EOF
-#line 5353 "configure"
+#line 5437 "configure"
 #include "confdefs.h"
 int main() {
 main()
 ; return 0; }
 EOF
-if { (eval echo configure:5360: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:5444: \"$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
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 fi
 ac_safe=`echo "editorconn.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for editorconn.h""... $ac_c" 1>&6
-echo "configure:5393: checking for editorconn.h" >&5
+echo "configure:5477: checking for editorconn.h" >&5
 cat > conftest.$ac_ext <<EOF
-#line 5396 "configure"
+#line 5480 "configure"
 #include "confdefs.h"
 #include <editorconn.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:5401: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:5485: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
 rm -rf conftest*
 eval "ac_cv_header_$ac_safe=yes"
 else
 fi
 echo "checking for graphics libraries" 1>&6
-echo "configure:5443: checking for graphics libraries" >&5
+echo "configure:5527: checking for graphics libraries" >&5
 test -z "$with_gif" && with_gif=yes;
 if test "$with_gif" = "yes"; then
 { test "$extra_verbose" = "yes" && cat << \EOF
 Defining HAVE_GIF
 EOF
 extra_objs="$extra_objs dgif_lib.o gif_err.o gifalloc.o" &&  if test "$extra_verbose" = "yes"; then
 echo "    xemacs will be linked with \"dgif_lib.o gif_err.o gifalloc.o\""
 fi
 fi
-test -z "$with_xpm" && { ac_safe=`echo "X11/xpm.h" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for Xpm""... $ac_c" 1>&6
-echo $ac_n "checking for X11/xpm.h""... $ac_c" 1>&6
+echo "configure:5544: checking for Xpm" >&5
-echo "configure:5461: checking for X11/xpm.h" >&5
+xe_check_libs=-lXpm
+test -z "$with_xpm" && { cat > conftest.$ac_ext <<EOF
-cat > conftest.$ac_ext <<EOF
+#line 5547 "configure"
-#line 5464 "configure"
 #include "confdefs.h"
 #include <X11/xpm.h>
+int main(int argc, char *argv[]) {
+return (XpmIncludeVersion != XpmLibraryVersion()) ||
+XpmIncludeVersion < 30406;
+}
+EOF
+if { (eval echo configure:5555: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5
+then
+with_xpm=yes
+else
+echo "configure: failed program was:" >&5
+cat conftest.$ac_ext >&5
+rm -fr conftest*
+with_xpm=no
+fi
+rm -fr conftest*
+}
+xe_check_libs=
+echo "$ac_t""$with_xpm" 1>&6
+if test "$with_xpm" = "yes"; then
+{ test "$extra_verbose" = "yes" && cat << \EOF
+Defining HAVE_XPM
+EOF
+cat >> confdefs.h <<\EOF
+#define HAVE_XPM 1
+EOF
+}
+libs_x="-lXpm $libs_x" &&  if test "$extra_verbose" = "yes"; then echo "    Prepending \"-lXpm\" to \$libs_x"; fi
+fi
+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:5582: checking for compface.h" >&5
+cat > conftest.$ac_ext <<EOF
+#line 5585 "configure"
+#include "confdefs.h"
+#include <compface.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:5469: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:5590: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
 rm -rf conftest*
 eval "ac_cv_header_$ac_safe=yes"
 else
 if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
 echo "$ac_t""yes" 1>&6
 :
 else
 echo "$ac_t""no" 1>&6
-with_xpm=no
-fi
-}
-test -z "$with_xpm" && {
-echo $ac_n "checking for XpmFree in -lXpm""... $ac_c" 1>&6
-echo "configure:5492: checking for XpmFree in -lXpm" >&5
-ac_lib_var=`echo Xpm'_'XpmFree | sed 'y%./+-%__p_%'`
-xe_check_libs=" -lXpm "
-cat > conftest.$ac_ext <<EOF
-#line 5497 "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
-builtin and then its argument prototype would still apply.  */
-char XpmFree();
-int main() {
-XpmFree()
-; return 0; }
-EOF
-if { (eval echo configure:5508: \"$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
-echo "configure: failed program was:" >&5
-cat conftest.$ac_ext >&5
-rm -rf conftest*
-eval "ac_cv_lib_$ac_lib_var=no"
-fi
-rm -f conftest*
-xe_check_libs=""
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes" ; then
-echo "$ac_t""yes" 1>&6
-:
-else
-echo "$ac_t""no" 1>&6
-with_xpm=no
-fi
-}
-test -z "$with_xpm" && with_xpm=yes
-if test "$with_xpm" = "yes"; then
-{ test "$extra_verbose" = "yes" && cat << \EOF
-Defining HAVE_XPM
-EOF
-cat >> confdefs.h <<\EOF
-#define HAVE_XPM 1
-EOF
-}
-libs_x="-lXpm $libs_x" &&  if test "$extra_verbose" = "yes"; then echo "    Prepending \"-lXpm\" to \$libs_x"; fi
-fi
-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:5544: checking for compface.h" >&5
-cat > conftest.$ac_ext <<EOF
-#line 5547 "configure"
-#include "confdefs.h"
-#include <compface.h>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:5552: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out`
-if test -z "$ac_err"; then
-rm -rf conftest*
-eval "ac_cv_header_$ac_safe=yes"
-else
-echo "$ac_err" >&5
-echo "configure: failed program was:" >&5
-cat conftest.$ac_ext >&5
-rm -rf conftest*
-eval "ac_cv_header_$ac_safe=no"
-fi
-rm -f conftest*
-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
-echo "$ac_t""yes" 1>&6
-:
-else
-echo "$ac_t""no" 1>&6
 with_xface=no
 fi
 }
 test -z "$with_xface" && {
 echo $ac_n "checking for UnGenFace in -lcompface""... $ac_c" 1>&6
-echo "configure:5575: checking for UnGenFace in -lcompface" >&5
+echo "configure:5613: checking for UnGenFace in -lcompface" >&5
 ac_lib_var=`echo compface'_'UnGenFace | sed 'y%./+-%__p_%'`
 xe_check_libs=" -lcompface "
 cat > conftest.$ac_ext <<EOF
-#line 5580 "configure"
+#line 5618 "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
 builtin and then its argument prototype would still apply.  */
 char UnGenFace();
 int main() {
 UnGenFace()
 ; return 0; }
 EOF
-if { (eval echo configure:5591: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:5629: \"$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
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 libs_x="-lcompface $libs_x" &&  if test "$extra_verbose" = "yes"; then echo "    Prepending \"-lcompface\" to \$libs_x"; fi
 fi
 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:5627: checking for jpeglib.h" >&5
+echo "configure:5665: checking for jpeglib.h" >&5
 cat > conftest.$ac_ext <<EOF
-#line 5630 "configure"
+#line 5668 "configure"
 #include "confdefs.h"
 #include <jpeglib.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:5635: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:5673: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
 rm -rf conftest*
 eval "ac_cv_header_$ac_safe=yes"
 else
 with_jpeg=no
 fi
 }
 test -z "$with_jpeg" && {
 echo $ac_n "checking for jpeg_destroy_decompress in -ljpeg""... $ac_c" 1>&6
-echo "configure:5658: checking for jpeg_destroy_decompress in -ljpeg" >&5
+echo "configure:5696: checking for jpeg_destroy_decompress in -ljpeg" >&5
 ac_lib_var=`echo jpeg'_'jpeg_destroy_decompress | sed 'y%./+-%__p_%'`
 xe_check_libs=" -ljpeg "
 cat > conftest.$ac_ext <<EOF
-#line 5663 "configure"
+#line 5701 "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
 builtin and then its argument prototype would still apply.  */
 char jpeg_destroy_decompress();
 int main() {
 jpeg_destroy_decompress()
 ; return 0; }
 EOF
-if { (eval echo configure:5674: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:5712: \"$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
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 libs_x="-ljpeg $libs_x" &&  if test "$extra_verbose" = "yes"; then echo "    Prepending \"-ljpeg\" to \$libs_x"; fi
 fi
 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:5710: checking for png.h" >&5
+echo "configure:5748: checking for png.h" >&5
 cat > conftest.$ac_ext <<EOF
-#line 5713 "configure"
+#line 5751 "configure"
 #include "confdefs.h"
 #include <png.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:5718: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:5756: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
 rm -rf conftest*
 eval "ac_cv_header_$ac_safe=yes"
 else
 echo "$ac_t""no" 1>&6
 with_png=no
 fi
 }
 test -z "$with_png" && { echo $ac_n "checking for pow""... $ac_c" 1>&6
-echo "configure:5740: checking for pow" >&5
+echo "configure:5778: checking for pow" >&5
 cat > conftest.$ac_ext <<EOF
-#line 5743 "configure"
+#line 5781 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
 which can conflict with char pow(); below.  */
 #include <assert.h>
 /* Override any gcc2 internal prototype to avoid an error.  */
 pow();
 #endif
 ; return 0; }
 EOF
-if { (eval echo configure:5766: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:5804: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
 rm -rf conftest*
 eval "ac_cv_func_pow=yes"
 else
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 for extra_libs in "" "-lz" "-lgz"; do
 xe_msg_checking="for png_read_image in -lpng"
 test -n "$extra_libs" && xe_msg_checking="$xe_msg_checking using extra libs $extra_libs"
 echo $ac_n "checking "$xe_msg_checking"""... $ac_c" 1>&6
-echo "configure:5791: checking "$xe_msg_checking"" >&5
+echo "configure:5829: checking "$xe_msg_checking"" >&5
 ac_lib_var=`echo png'_'png_read_image | sed 'y%./+-%__p_%'`
 xe_check_libs=" -lpng $extra_libs"
 cat > conftest.$ac_ext <<EOF
-#line 5796 "configure"
+#line 5834 "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
 builtin and then its argument prototype would still apply.  */
 char png_read_image();
 int main() {
 png_read_image()
 ; return 0; }
 EOF
-if { (eval echo configure:5807: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:5845: \"$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
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 libs_x="-ltiff $libs_x" &&  if test "$extra_verbose" = "yes"; then echo "    Prepending \"-ltiff\" to \$libs_x"; fi
 fi
 ac_safe=`echo "Xm/Xm.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for Xm/Xm.h""... $ac_c" 1>&6
-echo "configure:5857: checking for Xm/Xm.h" >&5
+echo "configure:5895: checking for Xm/Xm.h" >&5
 cat > conftest.$ac_ext <<EOF
-#line 5860 "configure"
+#line 5898 "configure"
 #include "confdefs.h"
 #include <Xm/Xm.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:5865: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:5903: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
 rm -rf conftest*
 eval "ac_cv_header_$ac_safe=yes"
 else
 rm -f conftest*
 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 "configure:5882: checking for XmStringFree in -lXm" >&5
+echo "configure:5920: checking for XmStringFree in -lXm" >&5
 ac_lib_var=`echo Xm'_'XmStringFree | sed 'y%./+-%__p_%'`
 xe_check_libs=" -lXm "
 cat > conftest.$ac_ext <<EOF
-#line 5887 "configure"
+#line 5925 "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
 builtin and then its argument prototype would still apply.  */
 char XmStringFree();
 int main() {
 XmStringFree()
 ; return 0; }
 EOF
-if { (eval echo configure:5898: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:5936: \"$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
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 test -z "$with_mule" && with_mule=no
 if test "$with_mule" = "yes" ; then
 echo "checking for Mule-related features" 1>&6
-echo "configure:6146: checking for Mule-related features" >&5
+echo "configure:6184: checking for Mule-related features" >&5
 { test "$extra_verbose" = "yes" && cat << \EOF
 Defining MULE
 EOF
 cat >> confdefs.h <<\EOF
 #define MULE 1
 for ac_hdr in libintl.h
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:6163: checking for $ac_hdr" >&5
+echo "configure:6201: checking for $ac_hdr" >&5
 cat > conftest.$ac_ext <<EOF
-#line 6166 "configure"
+#line 6204 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:6171: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:6209: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
 rm -rf conftest*
 eval "ac_cv_header_$ac_safe=yes"
 else
 fi
 done
 echo $ac_n "checking for strerror in -lintl""... $ac_c" 1>&6
-echo "configure:6202: checking for strerror in -lintl" >&5
+echo "configure:6240: checking for strerror in -lintl" >&5
 ac_lib_var=`echo intl'_'strerror | sed 'y%./+-%__p_%'`
 xe_check_libs=" -lintl "
 cat > conftest.$ac_ext <<EOF
-#line 6207 "configure"
+#line 6245 "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
 builtin and then its argument prototype would still apply.  */
 char strerror();
 int main() {
 strerror()
 ; return 0; }
 EOF
-if { (eval echo configure:6218: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:6256: \"$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
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 fi
 echo "checking for Mule input methods" 1>&6
-echo "configure:6251: checking for Mule input methods" >&5
+echo "configure:6289: checking for Mule input methods" >&5
 test -z "$with_xim" && case "$opsys" in sol2* ) ;; *) with_xim=no ;; esac
 case "$with_xim" in "" | "yes" )
 echo "checking for XIM" 1>&6
-echo "configure:6255: checking for XIM" >&5
+echo "configure:6293: checking for XIM" >&5
 echo $ac_n "checking for XmImMbLookupString in -lXm""... $ac_c" 1>&6
-echo "configure:6258: checking for XmImMbLookupString in -lXm" >&5
+echo "configure:6296: checking for XmImMbLookupString in -lXm" >&5
 ac_lib_var=`echo Xm'_'XmImMbLookupString | sed 'y%./+-%__p_%'`
 xe_check_libs=" -lXm "
 cat > conftest.$ac_ext <<EOF
-#line 6263 "configure"
+#line 6301 "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
 builtin and then its argument prototype would still apply.  */
 char XmImMbLookupString();
 int main() {
 XmImMbLookupString()
 ; return 0; }
 EOF
-if { (eval echo configure:6274: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:6312: \"$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
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 fi
 fi
 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:6336: checking for wnn/jllib.h" >&5
+echo "configure:6374: checking for wnn/jllib.h" >&5
 cat > conftest.$ac_ext <<EOF
-#line 6339 "configure"
+#line 6377 "configure"
 #include "confdefs.h"
 #include <wnn/jllib.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:6344: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:6382: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
 rm -rf conftest*
 eval "ac_cv_header_$ac_safe=yes"
 else
 echo "$ac_t""no" 1>&6
 with_wnn=no
 fi
 }
 test -z "$with_wnn" && {
-xe_msg_checking="for jl_dic_list_e in -lwnn"
+echo $ac_n "checking for jl_dic_list_e in -lwnn""... $ac_c" 1>&6
-test -n "with_wnn=no" && xe_msg_checking="$xe_msg_checking using extra libs with_wnn=no"
+echo "configure:6405: checking for jl_dic_list_e in -lwnn" >&5
-echo $ac_n "checking "$xe_msg_checking"""... $ac_c" 1>&6
-echo "configure:6369: checking "$xe_msg_checking"" >&5
 ac_lib_var=`echo wnn'_'jl_dic_list_e | sed 'y%./+-%__p_%'`
-xe_check_libs=" -lwnn with_wnn=no"
+xe_check_libs=" -lwnn "
 cat > conftest.$ac_ext <<EOF
-#line 6374 "configure"
+#line 6410 "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
 builtin and then its argument prototype would still apply.  */
 char jl_dic_list_e();
 int main() {
 jl_dic_list_e()
 ; return 0; }
 EOF
-if { (eval echo configure:6385: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:6421: \"$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
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 rm -f conftest*
 xe_check_libs=""
 if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes" ; then
 echo "$ac_t""yes" 1>&6
-ac_tr_lib=HAVE_LIB`echo wnn | sed -e 's/[^a-zA-Z0-9_]/_/g' \
+:
--e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
+else
-{ test "$extra_verbose" = "yes" && cat << EOF
+echo "$ac_t""no" 1>&6
-Defining $ac_tr_lib
+with_wnn=no
-EOF
-cat >> confdefs.h <<EOF
-#define $ac_tr_lib 1
-EOF
-}
-LIBS="-lwnn $LIBS" &&  if test "$extra_verbose" = "yes"; then echo "    Prepending \"-lwnn\" to \$LIBS"; fi
-else
-echo "$ac_t""no" 1>&6
-:
 fi
 }
 test -z "$with_wnn" && with_wnn=yes
 if test "$with_wnn" = "yes"; then
 extra_objs="$extra_objs mule-wnnfns.o" &&  if test "$extra_verbose" = "yes"; then
 echo "    xemacs will be linked with \"mule-wnnfns.o\""
 fi
 echo $ac_n "checking for jl_fi_dic_list in -lwnn""... $ac_c" 1>&6
-echo "configure:6433: checking for jl_fi_dic_list in -lwnn" >&5
+echo "configure:6458: checking for jl_fi_dic_list in -lwnn" >&5
 ac_lib_var=`echo wnn'_'jl_fi_dic_list | sed 'y%./+-%__p_%'`
 xe_check_libs=" -lwnn "
 cat > conftest.$ac_ext <<EOF
-#line 6438 "configure"
+#line 6463 "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
 builtin and then its argument prototype would still apply.  */
 char jl_fi_dic_list();
 int main() {
 jl_fi_dic_list()
 ; return 0; }
 EOF
-if { (eval echo configure:6449: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:6474: \"$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
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 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
-echo "configure:6481: checking for canna/RK.h" >&5
+echo "configure:6506: checking for canna/RK.h" >&5
 cat > conftest.$ac_ext <<EOF
-#line 6484 "configure"
+#line 6509 "configure"
 #include "confdefs.h"
 #include <canna/RK.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:6489: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:6514: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
 rm -rf conftest*
 eval "ac_cv_header_$ac_safe=yes"
 else
 with_canna=no
 fi
 }
 test -z "$with_canna" && {
 echo $ac_n "checking for RkBgnBun in -lRKC""... $ac_c" 1>&6
-echo "configure:6512: checking for RkBgnBun in -lRKC" >&5
+echo "configure:6537: checking for RkBgnBun in -lRKC" >&5
 ac_lib_var=`echo RKC'_'RkBgnBun | sed 'y%./+-%__p_%'`
 xe_check_libs=" -lRKC "
 cat > conftest.$ac_ext <<EOF
-#line 6517 "configure"
+#line 6542 "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
 builtin and then its argument prototype would still apply.  */
 char RkBgnBun();
 int main() {
 RkBgnBun()
 ; return 0; }
 EOF
-if { (eval echo configure:6528: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:6553: \"$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
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 fi
 }
 test -z "$with_canna" && {
 echo $ac_n "checking for jrKanjiControl in -lcanna""... $ac_c" 1>&6
-echo "configure:6551: checking for jrKanjiControl in -lcanna" >&5
+echo "configure:6576: checking for jrKanjiControl in -lcanna" >&5
 ac_lib_var=`echo canna'_'jrKanjiControl | sed 'y%./+-%__p_%'`
 xe_check_libs=" -lcanna "
 cat > conftest.$ac_ext <<EOF
-#line 6556 "configure"
+#line 6581 "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
 builtin and then its argument prototype would still apply.  */
 char jrKanjiControl();
 int main() {
 jrKanjiControl()
 ; return 0; }
 EOF
-if { (eval echo configure:6567: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:6592: \"$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
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 if test "$need_motif" = "yes" ; then
 libs_x="-lXm $libs_x" &&  if test "$extra_verbose" = "yes"; then echo "    Prepending \"-lXm\" to \$libs_x"; fi
 if test "$add_runtime_path" = "yes" -a -n "$dash_r"; then
-ld_switch_site="`echo $ld_switch_site     | sed \"s/${dash_r}[^ ]*//\"`"
+ld_switch_site=`echo   '' $ld_switch_site   | sed -e 's:^ ::' -e "s/${dash_r}[^ ]*//"`
-ld_switch_x_site="`echo $ld_switch_x_site | sed \"s/${dash_r}[^ ]*//\"`"
+ld_switch_x_site=`echo '' $ld_switch_x_site | sed -e 's:^ ::' -e "s/${dash_r}[^ ]*//"`
 runpath=""
 if test -n "$LD_RUN_PATH"; then
 runpath="$LD_RUN_PATH"
 elif test "$GCC" = "yes"; then
 echo "int main(int argc, char *argv[]) {return 0;}" > conftest.c
 xe_runpath_link='${CC-cc} -o conftest -v $CFLAGS '"$xe_ldflags"' conftest.$ac_ext 2>&1 1>/dev/null'
 for arg in `eval "$xe_runpath_link" | grep ' -L'`; do
 case "$arg" in P,* | -L* | -R* )
-for dir in `echo "$arg" | sed -e 's/^..//' -e 'y/:/ /'`; do
+for dir in `echo '' "$arg" | sed -e 's:^ ::' -e 's/^..//' -e 'y/:/ /'`; do
 xe_runpath_dir="$dir"
 if test "$xe_runpath_dir" != "/lib"     -a \
 	"$xe_runpath_dir" != "/usr/lib" -a \
 	-n "`ls ${xe_runpath_dir}/*.s[ol] 2>/dev/null`"; then
 done
 rm -f conftest*
 else
 for arg in $ld_switch_site $ld_switch_x_site; do
 case "$arg" in -L*)
-xe_runpath_dir=`echo "$arg" | sed 's/^-L//'`
+xe_runpath_dir=`echo '' "$arg" | sed -e 's:^ ::' -e 's/^-L//'`
 if test "$xe_runpath_dir" != "/lib"     -a \
 	"$xe_runpath_dir" != "/usr/lib" -a \
 	-n "`ls ${xe_runpath_dir}/*.s[ol] 2>/dev/null`"; then
 test -n "$runpath" && runpath="${runpath}:"
 runpath="${runpath}${xe_runpath_dir}"
 fi
 for ac_func in acosh asinh atanh cbrt closedir dup2 eaccess fmod fpathconf frexp ftime gethostname getpagesize gettimeofday getcwd getwd logb lrand48 matherr mkdir mktime perror poll random rename res_init rint rmdir select setitimer setpgid setlocale setsid sigblock sighold sigprocmask strcasecmp strerror tzset utimes waitpid
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:6668: checking for $ac_func" >&5
+echo "configure:6693: checking for $ac_func" >&5
 cat > conftest.$ac_ext <<EOF
-#line 6671 "configure"
+#line 6696 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
 which can conflict with char $ac_func(); below.  */
 #include <assert.h>
 /* Override any gcc2 internal prototype to avoid an error.  */
 $ac_func();
 #endif
 ; return 0; }
 EOF
-if { (eval echo configure:6694: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:6719: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
 rm -rf conftest*
 eval "ac_cv_func_$ac_func=yes"
 else
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 fi ;;
 * )
 for ac_func in realpath
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:6731: checking for $ac_func" >&5
+echo "configure:6756: checking for $ac_func" >&5
 cat > conftest.$ac_ext <<EOF
-#line 6734 "configure"
+#line 6759 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
 which can conflict with char $ac_func(); below.  */
 #include <assert.h>
 /* Override any gcc2 internal prototype to avoid an error.  */
 $ac_func();
 #endif
 ; return 0; }
 EOF
-if { (eval echo configure:6757: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:6782: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
 rm -rf conftest*
 eval "ac_cv_func_$ac_func=yes"
 else
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 echo "    xemacs will be linked with \"realpath.o\""
 fi ;;
 esac
 echo $ac_n "checking whether netdb declares h_errno""... $ac_c" 1>&6
-echo "configure:6790: checking whether netdb declares h_errno" >&5
+echo "configure:6815: checking whether netdb declares h_errno" >&5
 cat > conftest.$ac_ext <<EOF
-#line 6792 "configure"
+#line 6817 "configure"
 #include "confdefs.h"
 #include <netdb.h>
 int main() {
 return h_errno;
 ; return 0; }
 EOF
-if { (eval echo configure:6799: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:6824: \"$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_H_ERRNO
 EOF
 echo "$ac_t""no" 1>&6
 fi
 rm -f conftest*
 echo $ac_n "checking for sigsetjmp""... $ac_c" 1>&6
-echo "configure:6819: checking for sigsetjmp" >&5
+echo "configure:6844: checking for sigsetjmp" >&5
 cat > conftest.$ac_ext <<EOF
-#line 6821 "configure"
+#line 6846 "configure"
 #include "confdefs.h"
 #include <setjmp.h>
 int main() {
 sigjmp_buf bar; sigsetjmp (bar, 0);
 ; return 0; }
 EOF
-if { (eval echo configure:6828: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:6853: \"$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
 Defining HAVE_SIGSETJMP
 EOF
 echo "$ac_t""no" 1>&6
 fi
 rm -f conftest*
 echo $ac_n "checking whether localtime caches TZ""... $ac_c" 1>&6
-echo "configure:6848: checking whether localtime caches TZ" >&5
+echo "configure:6873: checking whether localtime caches TZ" >&5
 if test "$ac_cv_func_tzset" = "yes"; then
 cat > conftest.$ac_ext <<EOF
-#line 6852 "configure"
+#line 6877 "configure"
 #include "confdefs.h"
 #include <time.h>
 #if STDC_HEADERS
 # include <stdlib.h>
 #endif
 if (localtime (&now)->tm_hour != hour_unset)
 exit (1);
 exit (0);
 }
 EOF
-if { (eval echo configure:6887: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5
+if { (eval echo configure:6912: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5
 then
 emacs_cv_localtime_cache=no
 else
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 fi
 if test "$HAVE_TIMEVAL" = "yes"; then
 echo $ac_n "checking whether gettimeofday cannot accept two arguments""... $ac_c" 1>&6
-echo "configure:6916: checking whether gettimeofday cannot accept two arguments" >&5
+echo "configure:6941: checking whether gettimeofday cannot accept two arguments" >&5
 cat > conftest.$ac_ext <<EOF
-#line 6918 "configure"
+#line 6943 "configure"
 #include "confdefs.h"
 #ifdef TIME_WITH_SYS_TIME
 #include <sys/time.h>
 #include <time.h>
 struct timezone dummy;
 gettimeofday (&time, &dummy);
 ; return 0; }
 EOF
-if { (eval echo configure:6940: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:6965: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
 rm -rf conftest*
 echo "$ac_t""no" 1>&6
 else
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 rm -f conftest*
 fi
 echo $ac_n "checking for inline""... $ac_c" 1>&6
-echo "configure:6962: checking for inline" >&5
+echo "configure:6987: checking for inline" >&5
 ac_cv_c_inline=no
 for ac_kw in inline __inline__ __inline; do
 cat > conftest.$ac_ext <<EOF
-#line 6967 "configure"
+#line 6992 "configure"
 #include "confdefs.h"
 int main() {
 } $ac_kw foo() {
 ; return 0; }
 EOF
-if { (eval echo configure:6974: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:6999: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
 rm -rf conftest*
 ac_cv_c_inline=$ac_kw; break
 else
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 # 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:7024: checking for working alloca.h" >&5
+echo "configure:7049: checking for working alloca.h" >&5
 cat > conftest.$ac_ext <<EOF
-#line 7027 "configure"
+#line 7052 "configure"
 #include "confdefs.h"
 #include <alloca.h>
 int main() {
 char *p = alloca(2 * sizeof(int));
 ; return 0; }
 EOF
-if { (eval echo configure:7034: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:7059: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
 rm -rf conftest*
 ac_cv_header_alloca_h=yes
 else
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 }
 fi
 echo $ac_n "checking for alloca""... $ac_c" 1>&6
-echo "configure:7058: checking for alloca" >&5
+echo "configure:7083: checking for alloca" >&5
 cat > conftest.$ac_ext <<EOF
-#line 7061 "configure"
+#line 7086 "configure"
 #include "confdefs.h"
 #ifdef __GNUC__
 # define alloca __builtin_alloca
 #else
 int main() {
 char *p = (char *) alloca(1);
 ; return 0; }
 EOF
-if { (eval echo configure:7084: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:7109: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
 rm -rf conftest*
 ac_cv_func_alloca_works=yes
 else
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 EOF
 }
 echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6
-echo "configure:7123: checking whether alloca needs Cray hooks" >&5
+echo "configure:7148: checking whether alloca needs Cray hooks" >&5
 cat > conftest.$ac_ext <<EOF
-#line 7126 "configure"
+#line 7151 "configure"
 #include "confdefs.h"
 #if defined(CRAY) && ! defined(CRAY2)
 webecray
 #else
 wenotbecray
 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
-echo "configure:7150: checking for $ac_func" >&5
+echo "configure:7175: checking for $ac_func" >&5
 cat > conftest.$ac_ext <<EOF
-#line 7153 "configure"
+#line 7178 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
 which can conflict with char $ac_func(); below.  */
 #include <assert.h>
 /* Override any gcc2 internal prototype to avoid an error.  */
 $ac_func();
 #endif
 ; return 0; }
 EOF
-if { (eval echo configure:7176: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:7201: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
 rm -rf conftest*
 eval "ac_cv_func_$ac_func=yes"
 else
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 done
 fi
 echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6
-echo "configure:7206: checking stack direction for C alloca" >&5
+echo "configure:7231: checking stack direction for C alloca" >&5
 cat > conftest.$ac_ext <<EOF
-#line 7209 "configure"
+#line 7234 "configure"
 #include "confdefs.h"
 find_stack_direction ()
 {
 static char *addr = 0;
 auto char dummy;
 main ()
 {
 exit (find_stack_direction() < 0);
 }
 EOF
-if { (eval echo configure:7228: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5
+if { (eval echo configure:7253: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5
 then
 ac_cv_c_stack_direction=1
 else
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 test -n "$ALLOCA" && extra_objs="$extra_objs $ALLOCA" &&  if test "$extra_verbose" = "yes"; then
 echo "    xemacs will be linked with \"$ALLOCA\""
 fi
 echo $ac_n "checking for pid_t""... $ac_c" 1>&6
-echo "configure:7255: checking for pid_t" >&5
+echo "configure:7280: checking for pid_t" >&5
 cat > conftest.$ac_ext <<EOF
-#line 7258 "configure"
+#line 7283 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
 #include <stdlib.h>
 #include <stddef.h>
 fi
 ac_safe=`echo "vfork.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for vfork.h""... $ac_c" 1>&6
-echo "configure:7290: checking for vfork.h" >&5
+echo "configure:7315: checking for vfork.h" >&5
 cat > conftest.$ac_ext <<EOF
-#line 7293 "configure"
+#line 7318 "configure"
 #include "confdefs.h"
 #include <vfork.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:7298: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7323: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
 rm -rf conftest*
 eval "ac_cv_header_$ac_safe=yes"
 else
 else
 echo "$ac_t""no" 1>&6
 fi
 echo $ac_n "checking for working vfork""... $ac_c" 1>&6
-echo "configure:7326: checking for working vfork" >&5
+echo "configure:7351: checking for working vfork" >&5
 cat > conftest.$ac_ext <<EOF
-#line 7329 "configure"
+#line 7354 "configure"
 #include "confdefs.h"
 /* Thanks to Paul Eggert for this test.  */
 #include <stdio.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 	 || fstat(fileno(stdout), &st) != 0
 	 );
 }
 }
 EOF
-if { (eval echo configure:7424: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5
+if { (eval echo configure:7449: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5
 then
 ac_cv_func_vfork_works=yes
 else
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 fi
 echo $ac_n "checking for working strcoll""... $ac_c" 1>&6
-echo "configure:7449: checking for working strcoll" >&5
+echo "configure:7474: checking for working strcoll" >&5
 cat > conftest.$ac_ext <<EOF
-#line 7452 "configure"
+#line 7477 "configure"
 #include "confdefs.h"
 #include <string.h>
 main ()
 {
 exit (strcoll ("abc", "def") >= 0 ||
 	strcoll ("ABC", "DEF") >= 0 ||
 	strcoll ("123", "456") >= 0);
 }
 EOF
-if { (eval echo configure:7462: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5
+if { (eval echo configure:7487: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5
 then
 ac_cv_func_strcoll_works=yes
 else
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 fi
 echo $ac_n "checking for working mmap""... $ac_c" 1>&6
-echo "configure:7487: checking for working mmap" >&5
+echo "configure:7512: checking for working mmap" >&5
 case "$opsys" in ultrix* ) have_mmap=no ;; *)
 cat > conftest.$ac_ext <<EOF
-#line 7490 "configure"
+#line 7515 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 #include <unistd.h>
 #include <fcntl.h>
 #include <sys/mman.h>
 return 0;
 perror ("conftest: mmap failed");
 return 1;
 }
 EOF
-if { (eval echo configure:7523: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5
+if { (eval echo configure:7548: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5
 then
 have_mmap=yes
 else
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 EOF
 }
 echo $ac_n "checking for socket""... $ac_c" 1>&6
-echo "configure:7556: checking for socket" >&5
+echo "configure:7581: checking for socket" >&5
 cat > conftest.$ac_ext <<EOF
-#line 7559 "configure"
+#line 7584 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
 which can conflict with char socket(); below.  */
 #include <assert.h>
 /* Override any gcc2 internal prototype to avoid an error.  */
 socket();
 #endif
 ; return 0; }
 EOF
-if { (eval echo configure:7582: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:7607: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
 rm -rf conftest*
 eval "ac_cv_func_socket=yes"
 else
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 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 "configure:7597: checking for netinet/in.h" >&5
+echo "configure:7622: checking for netinet/in.h" >&5
 cat > conftest.$ac_ext <<EOF
-#line 7600 "configure"
+#line 7625 "configure"
 #include "confdefs.h"
 #include <netinet/in.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:7605: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7630: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
 rm -rf conftest*
 eval "ac_cv_header_$ac_safe=yes"
 else
 rm -f conftest*
 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 "configure:7622: checking for arpa/inet.h" >&5
+echo "configure:7647: checking for arpa/inet.h" >&5
 cat > conftest.$ac_ext <<EOF
-#line 7625 "configure"
+#line 7650 "configure"
 #include "confdefs.h"
 #include <arpa/inet.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:7630: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7655: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
 rm -rf conftest*
 eval "ac_cv_header_$ac_safe=yes"
 else
 #define HAVE_SOCKETS 1
 EOF
 }
 echo $ac_n "checking "for sun_len member in struct sockaddr_un"""... $ac_c" 1>&6
-echo "configure:7655: checking "for sun_len member in struct sockaddr_un"" >&5
+echo "configure:7680: checking "for sun_len member in struct sockaddr_un"" >&5
 cat > conftest.$ac_ext <<EOF
-#line 7657 "configure"
+#line 7682 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <sys/un.h>
 int main() {
 static struct sockaddr_un x; x.sun_len = 1;
 ; return 0; }
 EOF
-if { (eval echo configure:7668: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:7693: \"$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
 EOF
 cat >> confdefs.h <<\EOF
 echo "$ac_t""no" 1>&6
 fi
 echo $ac_n "checking for msgget""... $ac_c" 1>&6
-echo "configure:7699: checking for msgget" >&5
+echo "configure:7724: checking for msgget" >&5
 cat > conftest.$ac_ext <<EOF
-#line 7702 "configure"
+#line 7727 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
 which can conflict with char msgget(); below.  */
 #include <assert.h>
 /* Override any gcc2 internal prototype to avoid an error.  */
 msgget();
 #endif
 ; return 0; }
 EOF
-if { (eval echo configure:7725: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:7750: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
 rm -rf conftest*
 eval "ac_cv_func_msgget=yes"
 else
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 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 "configure:7740: checking for sys/ipc.h" >&5
+echo "configure:7765: checking for sys/ipc.h" >&5
 cat > conftest.$ac_ext <<EOF
-#line 7743 "configure"
+#line 7768 "configure"
 #include "confdefs.h"
 #include <sys/ipc.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:7748: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7773: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
 rm -rf conftest*
 eval "ac_cv_header_$ac_safe=yes"
 else
 rm -f conftest*
 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 "configure:7765: checking for sys/msg.h" >&5
+echo "configure:7790: checking for sys/msg.h" >&5
 cat > conftest.$ac_ext <<EOF
-#line 7768 "configure"
+#line 7793 "configure"
 #include "confdefs.h"
 #include <sys/msg.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:7773: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7798: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
 rm -rf conftest*
 eval "ac_cv_header_$ac_safe=yes"
 else
 fi
 ac_safe=`echo "dirent.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for dirent.h""... $ac_c" 1>&6
-echo "configure:7811: checking for dirent.h" >&5
+echo "configure:7836: checking for dirent.h" >&5
 cat > conftest.$ac_ext <<EOF
-#line 7814 "configure"
+#line 7839 "configure"
 #include "confdefs.h"
 #include <dirent.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:7819: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7844: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
 rm -rf conftest*
 eval "ac_cv_header_$ac_safe=yes"
 else
 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 "configure:7846: checking for sys/dir.h" >&5
+echo "configure:7871: checking for sys/dir.h" >&5
 cat > conftest.$ac_ext <<EOF
-#line 7849 "configure"
+#line 7874 "configure"
 #include "confdefs.h"
 #include <sys/dir.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:7854: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7879: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
 rm -rf conftest*
 eval "ac_cv_header_$ac_safe=yes"
 else
 fi
 ac_safe=`echo "nlist.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for nlist.h""... $ac_c" 1>&6
-echo "configure:7887: checking for nlist.h" >&5
+echo "configure:7912: checking for nlist.h" >&5
 cat > conftest.$ac_ext <<EOF
-#line 7890 "configure"
+#line 7915 "configure"
 #include "confdefs.h"
 #include <nlist.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:7895: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7920: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
 rm -rf conftest*
 eval "ac_cv_header_$ac_safe=yes"
 else
 version=`sed -ne 's/^(defconst emacs-version "\(.*\)".*/\1/p' "$file"`
 if test  -z "$version"; then
 echo "$progname: can't find current emacs version in \"$file\"." >&2
 exit 1
 fi
-beta=`sed -ne 's/^.*XEmacs Lucid (beta\([0-9][0-9]*\)).*$/\1/p' "$file"`
+beta=`sed -ne 's/^.*beta.*(beta\([0-9][0-9]*\)).*$/\1/p' "$file"`
 test -n "$beta" && version="${version}-b${beta}"
 { test "$extra_verbose" = "yes" && cat << EOF
 Defining EMACS_VERSION = "$version"
 EOF
 cat >> confdefs.h <<EOF
 #define EMACS_VERSION "$version"
 EOF
 }
-main_1_id="`echo main_1_xemacs_${version}_${canonical} | sed 'y/.-/__/'`"
+main_1_id=`echo main_1_xemacs_${version}_${canonical} | sed 'y/.-/__/'`
 { test "$extra_verbose" = "yes" && cat << EOF
 Defining main_1 = $main_1_id
 EOF
 cat >> confdefs.h <<EOF
 #define main_1 $main_1_id
 echo "checking "for sound support"" 1>&6
-echo "configure:7963: checking "for sound support"" >&5
+echo "configure:7988: checking "for sound support"" >&5
 case "$with_sound" in
 native | both ) with_native_sound=yes;;
 nas    | no   ) with_native_sound=no;;
 esac
 test -z "$with_native_sound" -a -n "$native_sound_lib" && with_native_sound=yes
 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
-echo "configure:7974: checking for multimedia/audio_device.h" >&5
+echo "configure:7999: checking for multimedia/audio_device.h" >&5
 cat > conftest.$ac_ext <<EOF
-#line 7977 "configure"
+#line 8002 "configure"
 #include "confdefs.h"
 #include <multimedia/audio_device.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:7982: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8007: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
 rm -rf conftest*
 eval "ac_cv_header_$ac_safe=yes"
 else
 case "$canonical" in
 *-sgi-* )
 if test -z "$native_sound_lib"; then
 echo $ac_n "checking for ALopenport in -laudio""... $ac_c" 1>&6
-echo "configure:8030: checking for ALopenport in -laudio" >&5
+echo "configure:8055: checking for ALopenport in -laudio" >&5
 ac_lib_var=`echo audio'_'ALopenport | sed 'y%./+-%__p_%'`
 xe_check_libs=" -laudio "
 cat > conftest.$ac_ext <<EOF
-#line 8035 "configure"
+#line 8060 "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
 builtin and then its argument prototype would still apply.  */
 char ALopenport();
 int main() {
 ALopenport()
 ; return 0; }
 EOF
-if { (eval echo configure:8046: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:8071: \"$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
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 fi ;;
 hppa*-hp-hpux* )
 if test -z "$native_sound_lib"; then
 echo $ac_n "checking for AOpenAudio in -lAlib""... $ac_c" 1>&6
-echo "configure:8077: checking for AOpenAudio in -lAlib" >&5
+echo "configure:8102: checking for AOpenAudio in -lAlib" >&5
 ac_lib_var=`echo Alib'_'AOpenAudio | sed 'y%./+-%__p_%'`
 xe_check_libs=" -lAlib "
 cat > conftest.$ac_ext <<EOF
-#line 8082 "configure"
+#line 8107 "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
 builtin and then its argument prototype would still apply.  */
 char AOpenAudio();
 int main() {
 AOpenAudio()
 ; return 0; }
 EOF
-if { (eval echo configure:8093: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:8118: \"$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
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 if test -z "$sound_found"; then
 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:8131: checking for ${dir}/soundcard.h" >&5
+echo "configure:8156: checking for ${dir}/soundcard.h" >&5
 cat > conftest.$ac_ext <<EOF
-#line 8134 "configure"
+#line 8159 "configure"
 #include "confdefs.h"
 #include <${dir}/soundcard.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8139: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8164: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
 rm -rf conftest*
 eval "ac_cv_header_$ac_safe=yes"
 else
 extra_objs="$extra_objs nas.o" &&  if test "$extra_verbose" = "yes"; then
 echo "    xemacs will be linked with \"nas.o\""
 fi
 LIBS="-laudio $LIBS" &&  if test "$extra_verbose" = "yes"; then echo "    Prepending \"-laudio\" to \$LIBS"; fi
 cat > conftest.$ac_ext <<EOF
-#line 8209 "configure"
+#line 8234 "configure"
 #include "confdefs.h"
 #include <audio/Xtutil.h>
 EOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
 egrep "AuXtErrorJump" >/dev/null 2>&1; then
 test -z "$with_tty" && with_tty=yes
 if test "$with_tty" = "yes"  ; then
 echo "checking for TTY-related features" 1>&6
-echo "configure:8236: checking for TTY-related features" >&5
+echo "configure:8261: checking for TTY-related features" >&5
 { test "$extra_verbose" = "yes" && cat << \EOF
 Defining HAVE_TTY
 EOF
 cat >> confdefs.h <<\EOF
 #define HAVE_TTY 1
 echo "    xemacs will be linked with \"console-tty.o device-tty.o event-tty.o frame-tty.o objects-tty.o redisplay-tty.o cm.o\""
 fi
 ac_safe=`echo "termios.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for termios.h""... $ac_c" 1>&6
-echo "configure:8251: checking for termios.h" >&5
+echo "configure:8276: checking for termios.h" >&5
 cat > conftest.$ac_ext <<EOF
-#line 8254 "configure"
+#line 8279 "configure"
 #include "confdefs.h"
 #include <termios.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8259: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8284: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
 rm -rf conftest*
 eval "ac_cv_header_$ac_safe=yes"
 else
 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 "configure:8286: checking for termio.h" >&5
+echo "configure:8311: checking for termio.h" >&5
 cat > conftest.$ac_ext <<EOF
-#line 8289 "configure"
+#line 8314 "configure"
 #include "confdefs.h"
 #include <termio.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8294: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8319: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
 rm -rf conftest*
 eval "ac_cv_header_$ac_safe=yes"
 else
 if test -z "$with_ncurses"; then
 echo $ac_n "checking for tgetent in -lncurses""... $ac_c" 1>&6
-echo "configure:8327: checking for tgetent in -lncurses" >&5
+echo "configure:8352: checking for tgetent in -lncurses" >&5
 ac_lib_var=`echo ncurses'_'tgetent | sed 'y%./+-%__p_%'`
 xe_check_libs=" -lncurses "
 cat > conftest.$ac_ext <<EOF
-#line 8332 "configure"
+#line 8357 "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
 builtin and then its argument prototype would still apply.  */
 char tgetent();
 int main() {
 tgetent()
 ; return 0; }
 EOF
-if { (eval echo configure:8343: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:8368: \"$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
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 EOF
 }
 ac_safe=`echo "ncurses/curses.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for ncurses/curses.h""... $ac_c" 1>&6
-echo "configure:8376: checking for ncurses/curses.h" >&5
+echo "configure:8401: checking for ncurses/curses.h" >&5
 cat > conftest.$ac_ext <<EOF
-#line 8379 "configure"
+#line 8404 "configure"
 #include "confdefs.h"
 #include <ncurses/curses.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8384: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8409: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
 rm -rf conftest*
 eval "ac_cv_header_$ac_safe=yes"
 else
 echo "$ac_t""no" 1>&6
 fi
 ac_safe=`echo "ncurses/term.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for ncurses/term.h""... $ac_c" 1>&6
-echo "configure:8406: checking for ncurses/term.h" >&5
+echo "configure:8431: checking for ncurses/term.h" >&5
 cat > conftest.$ac_ext <<EOF
-#line 8409 "configure"
+#line 8434 "configure"
 #include "confdefs.h"
 #include <ncurses/term.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8414: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8439: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
 rm -rf conftest*
 eval "ac_cv_header_$ac_safe=yes"
 else
 if test "$ac_cv_header_ncurses_curses_h" != "yes" ; then
 save_c_switch_site="$c_switch_site"
 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:8444: checking for ncurses/curses.h" >&5
+echo "configure:8469: checking for ncurses/curses.h" >&5
 cat > conftest.$ac_ext <<EOF
-#line 8447 "configure"
+#line 8472 "configure"
 #include "confdefs.h"
 #include <ncurses/curses.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8452: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8477: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
 rm -rf conftest*
 eval "ac_cv_header_$ac_safe=yes"
 else
 	LIBS="$libs_termcap $LIBS" &&  if test "$extra_verbose" = "yes"; then echo "    Prepending \"$libs_termcap\" to \$LIBS"; fi
 else
 	for lib in curses termlib termcap; do
 echo $ac_n "checking for tgetent in -l$lib""... $ac_c" 1>&6
-echo "configure:8487: checking for tgetent in -l$lib" >&5
+echo "configure:8512: checking for tgetent in -l$lib" >&5
 ac_lib_var=`echo $lib'_'tgetent | sed 'y%./+-%__p_%'`
 xe_check_libs=" -l$lib "
 cat > conftest.$ac_ext <<EOF
-#line 8492 "configure"
+#line 8517 "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
 builtin and then its argument prototype would still apply.  */
 char tgetent();
 int main() {
 tgetent()
 ; return 0; }
 EOF
-if { (eval echo configure:8503: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:8528: \"$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
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 if test -n "$libs_termcap"; then
 	LIBS="$libs_termcap $LIBS" &&  if test "$extra_verbose" = "yes"; then echo "    Prepending \"$libs_termcap\" to \$LIBS"; fi
 else
 echo $ac_n "checking for tgetent in -lcurses""... $ac_c" 1>&6
-echo "configure:8534: checking for tgetent in -lcurses" >&5
+echo "configure:8559: checking for tgetent in -lcurses" >&5
 ac_lib_var=`echo curses'_'tgetent | sed 'y%./+-%__p_%'`
 xe_check_libs=" -lcurses "
 cat > conftest.$ac_ext <<EOF
-#line 8539 "configure"
+#line 8564 "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
 builtin and then its argument prototype would still apply.  */
 char tgetent();
 int main() {
 tgetent()
 ; return 0; }
 EOF
-if { (eval echo configure:8550: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:8575: \"$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
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 echo "$ac_t""yes" 1>&6
 LIBS="-lcurses $LIBS" &&  if test "$extra_verbose" = "yes"; then echo "    Prepending \"-lcurses\" to \$LIBS"; fi
 else
 echo "$ac_t""no" 1>&6
 echo $ac_n "checking for tgetent in -ltermcap""... $ac_c" 1>&6
-echo "configure:8568: checking for tgetent in -ltermcap" >&5
+echo "configure:8593: checking for tgetent in -ltermcap" >&5
 ac_lib_var=`echo termcap'_'tgetent | sed 'y%./+-%__p_%'`
 xe_check_libs=" -ltermcap "
 cat > conftest.$ac_ext <<EOF
-#line 8573 "configure"
+#line 8598 "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
 builtin and then its argument prototype would still apply.  */
 char tgetent();
 int main() {
 tgetent()
 ; return 0; }
 EOF
-if { (eval echo configure:8584: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:8609: \"$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
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 }
 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:8632: checking for gpm.h" >&5
+echo "configure:8657: checking for gpm.h" >&5
 cat > conftest.$ac_ext <<EOF
-#line 8635 "configure"
+#line 8660 "configure"
 #include "confdefs.h"
 #include <gpm.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8640: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8665: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
 rm -rf conftest*
 eval "ac_cv_header_$ac_safe=yes"
 else
 with_gpm=no
 fi
 }
 test -z "$with_gpm" && {
 echo $ac_n "checking for Gpm_Open in -lgpm""... $ac_c" 1>&6
-echo "configure:8663: checking for Gpm_Open in -lgpm" >&5
+echo "configure:8688: checking for Gpm_Open in -lgpm" >&5
 ac_lib_var=`echo gpm'_'Gpm_Open | sed 'y%./+-%__p_%'`
 xe_check_libs=" -lgpm "
 cat > conftest.$ac_ext <<EOF
-#line 8668 "configure"
+#line 8693 "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
 builtin and then its argument prototype would still apply.  */
 char Gpm_Open();
 int main() {
 Gpm_Open()
 ; return 0; }
 EOF
-if { (eval echo configure:8679: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:8704: \"$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
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 eval "with_${feature}=no"
 done
 fi
 echo "checking for database support" 1>&6
-echo "configure:8724: checking for database support" >&5
+echo "configure:8749: checking for database support" >&5
 if test "$with_database_gnudbm" != "no"; then
 echo $ac_n "checking for dbm_open in -lgdbm""... $ac_c" 1>&6
-echo "configure:8729: checking for dbm_open in -lgdbm" >&5
+echo "configure:8754: checking for dbm_open in -lgdbm" >&5
 ac_lib_var=`echo gdbm'_'dbm_open | sed 'y%./+-%__p_%'`
 xe_check_libs=" -lgdbm "
 cat > conftest.$ac_ext <<EOF
-#line 8734 "configure"
+#line 8759 "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
 builtin and then its argument prototype would still apply.  */
 char dbm_open();
 int main() {
 dbm_open()
 ; return 0; }
 EOF
-if { (eval echo configure:8745: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:8770: \"$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
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 fi
 if test "$with_database_gnudbm" != "yes"; then
 echo $ac_n "checking for dbm_open""... $ac_c" 1>&6
-echo "configure:8767: checking for dbm_open" >&5
+echo "configure:8792: checking for dbm_open" >&5
 cat > conftest.$ac_ext <<EOF
-#line 8770 "configure"
+#line 8795 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
 which can conflict with char dbm_open(); below.  */
 #include <assert.h>
 /* Override any gcc2 internal prototype to avoid an error.  */
 dbm_open();
 #endif
 ; return 0; }
 EOF
-if { (eval echo configure:8793: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:8818: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
 rm -rf conftest*
 eval "ac_cv_func_dbm_open=yes"
 else
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 fi
 fi
 if test "$with_database_dbm" != "no"; then
 echo $ac_n "checking for dbm_open""... $ac_c" 1>&6
-echo "configure:8829: checking for dbm_open" >&5
+echo "configure:8854: checking for dbm_open" >&5
 cat > conftest.$ac_ext <<EOF
-#line 8832 "configure"
+#line 8857 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
 which can conflict with char dbm_open(); below.  */
 #include <assert.h>
 /* Override any gcc2 internal prototype to avoid an error.  */
 dbm_open();
 #endif
 ; return 0; }
 EOF
-if { (eval echo configure:8855: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:8880: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
 rm -rf conftest*
 eval "ac_cv_func_dbm_open=yes"
 else
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 fi
 if test "$need_libdbm" != "no"; then
 echo $ac_n "checking for dbm_open in -ldbm""... $ac_c" 1>&6
-echo "configure:8876: checking for dbm_open in -ldbm" >&5
+echo "configure:8901: checking for dbm_open in -ldbm" >&5
 ac_lib_var=`echo dbm'_'dbm_open | sed 'y%./+-%__p_%'`
 xe_check_libs=" -ldbm "
 cat > conftest.$ac_ext <<EOF
-#line 8881 "configure"
+#line 8906 "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
 builtin and then its argument prototype would still apply.  */
 char dbm_open();
 int main() {
 dbm_open()
 ; return 0; }
 EOF
-if { (eval echo configure:8892: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:8917: \"$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
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 fi
 fi
 if test "$with_database_berkdb" != "no"; then
 echo $ac_n "checking for dbopen""... $ac_c" 1>&6
-echo "configure:8929: checking for dbopen" >&5
+echo "configure:8954: checking for dbopen" >&5
 cat > conftest.$ac_ext <<EOF
-#line 8932 "configure"
+#line 8957 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
 which can conflict with char dbopen(); below.  */
 #include <assert.h>
 /* Override any gcc2 internal prototype to avoid an error.  */
 dbopen();
 #endif
 ; return 0; }
 EOF
-if { (eval echo configure:8955: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:8980: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
 rm -rf conftest*
 eval "ac_cv_func_dbopen=yes"
 else
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 fi
 if test "$need_libdb" != "no"; then
 echo $ac_n "checking for dbopen in -ldb""... $ac_c" 1>&6
-echo "configure:8976: checking for dbopen in -ldb" >&5
+echo "configure:9001: checking for dbopen in -ldb" >&5
 ac_lib_var=`echo db'_'dbopen | sed 'y%./+-%__p_%'`
 xe_check_libs=" -ldb "
 cat > conftest.$ac_ext <<EOF
-#line 8981 "configure"
+#line 9006 "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
 builtin and then its argument prototype would still apply.  */
 char dbopen();
 int main() {
 dbopen()
 ; return 0; }
 EOF
-if { (eval echo configure:8992: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:9017: \"$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
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 fi
 if test "$with_database_berkdb" = "yes"; then
 for path in "db/db.h" "db.h"; do
 cat > conftest.$ac_ext <<EOF
-#line 9016 "configure"
+#line 9041 "configure"
 #include "confdefs.h"
 #ifdef HAVE_INTTYPES_H
 #define __BIT_TYPES_DEFINED__
 #include <inttypes.h>
 typedef uint8_t  u_int8_t;
 int main() {
 ; return 0; }
 EOF
-if { (eval echo configure:9034: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:9059: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
 rm -rf conftest*
 db_h_path="$path"; break
 else
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 fi
 if test "$with_socks" = "yes"; then
 echo $ac_n "checking for SOCKSinit in -lsocks""... $ac_c" 1>&6
-echo "configure:9086: checking for SOCKSinit in -lsocks" >&5
+echo "configure:9111: checking for SOCKSinit in -lsocks" >&5
 ac_lib_var=`echo socks'_'SOCKSinit | sed 'y%./+-%__p_%'`
 xe_check_libs=" -lsocks "
 cat > conftest.$ac_ext <<EOF
-#line 9091 "configure"
+#line 9116 "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
 builtin and then its argument prototype would still apply.  */
 char SOCKSinit();
 int main() {
 SOCKSinit()
 ; return 0; }
 EOF
-if { (eval echo configure:9102: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:9127: \"$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
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 # Remove any trailing slashes in these variables.
 test -n "$prefix" &&
-prefix=`echo "$prefix" | sed 's,\([^/]\)/*$,\1,'`
+prefix=`echo '' "$prefix" | sed -e 's:^ ::' -e 's,\([^/]\)/*$,\1,'`
 test -n "$exec_prefix" &&
-exec_prefix=`echo "$exec_prefix" | sed 's,\([^/]\)/*$,\1,'`
+exec_prefix=`echo '' "$exec_prefix" | sed -e 's:^ ::' -e 's,\([^/]\)/*$,\1,'`
 trap '' 1 2 15
 trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15
 s%@SET_MAKE@%$SET_MAKE%g
 s%@X_CFLAGS@%$X_CFLAGS%g
 s%@X_PRE_LIBS@%$X_PRE_LIBS%g
 s%@X_LIBS@%$X_LIBS%g
 s%@X_EXTRA_LIBS@%$X_EXTRA_LIBS%g
+s%@libs_xauth@%$libs_xauth%g
 s%@lwlib_objs@%$lwlib_objs%g
 s%@ALLOCA@%$ALLOCA%g
 s%@SRC_SUBDIR_DEPS@%$SRC_SUBDIR_DEPS%g
 s%@MAKE_SUBDIR@%$MAKE_SUBDIR%g
 s%@SUBDIR_MAKEFILES@%$SUBDIR_MAKEFILES%g

Mercurial > hg > xemacs-beta

comparison configure @ 159:3bb7ccffb0c0 r20-3b6