xemacs-beta: configure comparison

comparison configure @ 165:5a88923fcbfe r20-3b9

Import from CVS: tag r20-3b9

author	cvs
date	Mon, 13 Aug 2007 09:44:42 +0200
parents	0132846995bd
children	85ec50267440

comparison

equal deleted inserted replaced

-:4e0740e5aab2
+:5a88923fcbfe
 #endif /* not THIS_IS_CONFIGURE */
 #endif /* 0 */
 ' > $tempcname
 CPP=`eval "echo $CPP"`
 eval `$CPP -Isrc $tempcname \
-	| sed -n -e "s/[ \t]*=[ \t\"]*/='/" -e "s/[ \t\"]*\$/'/" -e "s/^configure___//p"`
+	| sed -n -e "s/[ 	]*=[ 	\"]*/='/" -e "s/[ 	\"]*\$/'/" -e "s/^configure___//p"`
 rm $tempcname
 test "$extra_verbose" = "yes" && \
 for var in libs_machine libs_system libs_termcap libs_standard   objects_machine objects_system c_switch_machine c_switch_system   c_switch_x_system ld_switch_machine ld_switch_system   ld_switch_x_system unexec ld_switch_call_shared ld_switch_shared   ld lib_gcc ld_text_start_addr start_files ordinary_link   have_terminfo mail_use_flock mail_use_lockf; do eval "echo \"$var = '\$$var'\""; done && echo ""
 test -n "$unexec"          && extra_objs="$extra_objs $unexec" &&  if test "$extra_verbose" = "yes"; then
 echo "    xemacs will be linked with \"$unexec\""
 fi
 echo $ac_n "checking for dynodump""... $ac_c" 1>&6
-echo "configure:2192: checking for dynodump" >&5
+echo "configure:2191: checking for dynodump" >&5
 if test "$unexec" != "unexsol2.o"; then
 echo "$ac_t""no" 1>&6
 else
 echo "$ac_t""yes" 1>&6
 { test "$extra_verbose" = "yes" && cat << \EOF
 for dir in "/usr/ccs/lib"; do
 test -d "$dir" && ld_switch_site="$ld_switch_site -L${dir}" &&  if test "$extra_verbose" = "yes"; then echo "    Appending \"-L${dir}\" to \$ld_switch_site"; fi
 done
 if test -n "$site_runtime_libraries" ; then
-LD_RUN_PATH="`echo $site_runtime_libraries | sed 's/ 	*/:/'`"
+LD_RUN_PATH="`echo $site_runtime_libraries | sed -e 's/  */:/g'`"
 export LD_RUN_PATH
 fi
 if   test "$dynamic" = "no"; then add_runtime_path=no
 esac
 fi
 if test "$add_runtime_path" = "yes"; then
 echo $ac_n "checking "for runtime libraries flag"""... $ac_c" 1>&6
-echo "configure:2263: checking "for runtime libraries flag"" >&5
+echo "configure:2262: checking "for runtime libraries flag"" >&5
 dash_r=""
 for try_dash_r in "-R" "-R " "-rpath "; do
 xe_check_libs="${try_dash_r}/no/such/file-or-directory"
 cat > conftest.$ac_ext <<EOF
-#line 2268 "configure"
+#line 2267 "configure"
 #include "confdefs.h"
 int main() {
 ; return 0; }
 EOF
-if { (eval echo configure:2275: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:2274: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
 rm -rf conftest*
 dash_r="$try_dash_r"
 else
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 if test "$add_runtime_path" = "yes" -a -n "$dash_r"; then
-ld_switch_site=`echo   '' $ld_switch_site   | sed -e 's:^ ::' -e "s/$dash_r[^ ]*//"`
+ld_switch_site=`echo   '' $ld_switch_site   | sed -e 's:^ ::' -e "s/$dash_r[^ ]*//g"`
-ld_switch_x_site=`echo '' $ld_switch_x_site | sed -e 's:^ ::' -e "s/$dash_r[^ ]*//"`
+ld_switch_x_site=`echo '' $ld_switch_x_site | sed -e 's:^ ::' -e "s/$dash_r[^ ]*//g"`
 runpath="" runpath_dirs=""
 if test -n "$LD_RUN_PATH"; then
 runpath="$LD_RUN_PATH"
 elif test "$GCC" = "yes"; then
 # Extract the first word of "ranlib", so it can be a program name with args.
 set dummy ranlib; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2369: checking for $ac_word" >&5
+echo "configure:2368: checking for $ac_word" >&5
 if test -n "$RANLIB"; then
 ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
 else
 IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
 # AIX /bin/install
 # AFS /usr/afsws/bin/install, which mishandles nonexistent args
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # ./install, which can be erroneously created by make from ./install.sh.
 echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:2422: checking for a BSD compatible install" >&5
+echo "configure:2421: checking for a BSD compatible install" >&5
 if test -z "$INSTALL"; then
 IFS="${IFS= 	}"; ac_save_IFS="$IFS"; IFS="${IFS}:"
 for ac_dir in $PATH; do
 # Account for people who put trailing slashes in PATH elements.
 for ac_prog in 'bison -y' byacc
 do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2473: checking for $ac_word" >&5
+echo "configure:2472: checking for $ac_word" >&5
 if test -n "$YACC"; then
 ac_cv_prog_YACC="$YACC" # Let the user override the test.
 else
 IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
 for ac_hdr in mach/mach.h sys/stropts.h sys/timeb.h sys/time.h unistd.h
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:2504: checking for $ac_hdr" >&5
+echo "configure:2503: checking for $ac_hdr" >&5
 cat > conftest.$ac_ext <<EOF
-#line 2507 "configure"
+#line 2506 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2512: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2511: \"$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 ac_hdr in utime.h locale.h libgen.h fcntl.h
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:2545: checking for $ac_hdr" >&5
+echo "configure:2544: checking for $ac_hdr" >&5
 cat > conftest.$ac_ext <<EOF
-#line 2548 "configure"
+#line 2547 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2553: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2552: \"$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 ac_hdr in linux/version.h kstat.h sys/pstat.h inttypes.h limits.h
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:2586: checking for $ac_hdr" >&5
+echo "configure:2585: checking for $ac_hdr" >&5
 cat > conftest.$ac_ext <<EOF
-#line 2589 "configure"
+#line 2588 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2594: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2593: \"$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
 done
 echo $ac_n "checking for sys/wait.h that is POSIX.1 compatible""... $ac_c" 1>&6
-echo "configure:2624: checking for sys/wait.h that is POSIX.1 compatible" >&5
+echo "configure:2623: checking for sys/wait.h that is POSIX.1 compatible" >&5
 cat > conftest.$ac_ext <<EOF
-#line 2627 "configure"
+#line 2626 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/wait.h>
 #ifndef WEXITSTATUS
 #define WEXITSTATUS(stat_val) ((unsigned)(stat_val) >> 8)
 int s;
 wait (&s);
 s = WIFEXITED (s) ? WEXITSTATUS (s) : 1;
 ; return 0; }
 EOF
-if { (eval echo configure:2643: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2642: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
 rm -rf conftest*
 ac_cv_header_sys_wait_h=yes
 else
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 }
 fi
 echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
-echo "configure:2667: checking for ANSI C header files" >&5
+echo "configure:2666: checking for ANSI C header files" >&5
 cat > conftest.$ac_ext <<EOF
-#line 2670 "configure"
+#line 2669 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>
 #include <string.h>
 #include <float.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2678: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2677: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
 rm -rf conftest*
 ac_cv_header_stdc=yes
 else
 rm -f conftest*
 if test $ac_cv_header_stdc = yes; then
 # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
 cat > conftest.$ac_ext <<EOF
-#line 2695 "configure"
+#line 2694 "configure"
 #include "confdefs.h"
 #include <string.h>
 EOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
 egrep "memchr" >/dev/null 2>&1; then
 fi
 if test $ac_cv_header_stdc = yes; then
 # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
 cat > conftest.$ac_ext <<EOF
-#line 2713 "configure"
+#line 2712 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 EOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
 egrep "free" >/dev/null 2>&1; then
 fi
 if test $ac_cv_header_stdc = yes; then
 # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
 cat > conftest.$ac_ext <<EOF
-#line 2731 "configure"
+#line 2730 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 #define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
 #define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
 #define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
 int main () { int i; for (i = 0; i < 256; i++)
 if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2);
 exit (0); }
 EOF
-if { (eval echo configure:2742: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5
+if { (eval echo configure:2741: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5
 then
 :
 else
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 }
 fi
 echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6
-echo "configure:2767: checking whether time.h and sys/time.h may both be included" >&5
+echo "configure:2766: checking whether time.h and sys/time.h may both be included" >&5
 cat > conftest.$ac_ext <<EOF
-#line 2770 "configure"
+#line 2769 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/time.h>
 #include <time.h>
 int main() {
 struct tm *tp;
 ; return 0; }
 EOF
-if { (eval echo configure:2779: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2778: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
 rm -rf conftest*
 ac_cv_header_time=yes
 else
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 }
 fi
 echo $ac_n "checking for sys_siglist declaration in signal.h or unistd.h""... $ac_c" 1>&6
-echo "configure:2803: checking for sys_siglist declaration in signal.h or unistd.h" >&5
+echo "configure:2802: checking for sys_siglist declaration in signal.h or unistd.h" >&5
 cat > conftest.$ac_ext <<EOF
-#line 2806 "configure"
+#line 2805 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <signal.h>
 /* NetBSD declares sys_siglist in unistd.h.  */
 #ifdef HAVE_UNISTD_H
 #endif
 int main() {
 char *msg = *(sys_siglist + 1);
 ; return 0; }
 EOF
-if { (eval echo configure:2818: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2817: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
 rm -rf conftest*
 ac_cv_decl_sys_siglist=yes
 else
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 fi
 echo $ac_n "checking for struct utimbuf""... $ac_c" 1>&6
-echo "configure:2843: checking for struct utimbuf" >&5
+echo "configure:2842: checking for struct utimbuf" >&5
 cat > conftest.$ac_ext <<EOF
-#line 2845 "configure"
+#line 2844 "configure"
 #include "confdefs.h"
 #ifdef TIME_WITH_SYS_TIME
 #include <sys/time.h>
 #include <time.h>
 #else
 #endif
 int main() {
 static struct utimbuf x; x.actime = x.modtime;
 ; return 0; }
 EOF
-if { (eval echo configure:2864: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2863: \"$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_STRUCT_UTIMBUF
 EOF
 echo "$ac_t""no" 1>&6
 fi
 rm -f conftest*
 echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6
-echo "configure:2884: checking return type of signal handlers" >&5
+echo "configure:2883: checking return type of signal handlers" >&5
 cat > conftest.$ac_ext <<EOF
-#line 2887 "configure"
+#line 2886 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <signal.h>
 #ifdef signal
 #undef signal
 int main() {
 int i;
 ; return 0; }
 EOF
-if { (eval echo configure:2904: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2903: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
 rm -rf conftest*
 ac_cv_type_signal=void
 else
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 EOF
 }
 echo $ac_n "checking for size_t""... $ac_c" 1>&6
-echo "configure:2926: checking for size_t" >&5
+echo "configure:2925: checking for size_t" >&5
 cat > conftest.$ac_ext <<EOF
-#line 2929 "configure"
+#line 2928 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
 #include <stdlib.h>
 #include <stddef.h>
 }
 fi
 echo $ac_n "checking for pid_t""... $ac_c" 1>&6
-echo "configure:2960: checking for pid_t" >&5
+echo "configure:2959: checking for pid_t" >&5
 cat > conftest.$ac_ext <<EOF
-#line 2963 "configure"
+#line 2962 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
 #include <stdlib.h>
 #include <stddef.h>
 }
 fi
 echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6
-echo "configure:2994: checking for uid_t in sys/types.h" >&5
+echo "configure:2993: checking for uid_t in sys/types.h" >&5
 cat > conftest.$ac_ext <<EOF
-#line 2997 "configure"
+#line 2996 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 EOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
 egrep "uid_t" >/dev/null 2>&1; then
 }
 fi
 echo $ac_n "checking for mode_t""... $ac_c" 1>&6
-echo "configure:3033: checking for mode_t" >&5
+echo "configure:3032: checking for mode_t" >&5
 cat > conftest.$ac_ext <<EOF
-#line 3036 "configure"
+#line 3035 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
 #include <stdlib.h>
 #include <stddef.h>
 }
 fi
 echo $ac_n "checking for off_t""... $ac_c" 1>&6
-echo "configure:3067: checking for off_t" >&5
+echo "configure:3066: checking for off_t" >&5
 cat > conftest.$ac_ext <<EOF
-#line 3070 "configure"
+#line 3069 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
 #include <stdlib.h>
 #include <stddef.h>
 fi
 echo $ac_n "checking for struct timeval""... $ac_c" 1>&6
-echo "configure:3102: checking for struct timeval" >&5
+echo "configure:3101: checking for struct timeval" >&5
 cat > conftest.$ac_ext <<EOF
-#line 3104 "configure"
+#line 3103 "configure"
 #include "confdefs.h"
 #ifdef TIME_WITH_SYS_TIME
 #include <sys/time.h>
 #include <time.h>
 #else
 #endif
 int main() {
 static struct timeval x; x.tv_sec = x.tv_usec;
 ; return 0; }
 EOF
-if { (eval echo configure:3120: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3119: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
 rm -rf conftest*
 echo "$ac_t""yes" 1>&6
 HAVE_TIMEVAL=yes
 { test "$extra_verbose" = "yes" && cat << \EOF
 Defining HAVE_TIMEVAL
 HAVE_TIMEVAL=no
 fi
 rm -f conftest*
 echo $ac_n "checking whether struct tm is in sys/time.h or time.h""... $ac_c" 1>&6
-echo "configure:3142: checking whether struct tm is in sys/time.h or time.h" >&5
+echo "configure:3141: checking whether struct tm is in sys/time.h or time.h" >&5
 cat > conftest.$ac_ext <<EOF
-#line 3145 "configure"
+#line 3144 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <time.h>
 int main() {
 struct tm *tp; tp->tm_sec;
 ; return 0; }
 EOF
-if { (eval echo configure:3153: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3152: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
 rm -rf conftest*
 ac_cv_struct_tm=time.h
 else
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 }
 fi
 echo $ac_n "checking for tm_zone in struct tm""... $ac_c" 1>&6
-echo "configure:3177: checking for tm_zone in struct tm" >&5
+echo "configure:3176: checking for tm_zone in struct tm" >&5
 cat > conftest.$ac_ext <<EOF
-#line 3180 "configure"
+#line 3179 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <$ac_cv_struct_tm>
 int main() {
 struct tm tm; tm.tm_zone;
 ; return 0; }
 EOF
-if { (eval echo configure:3188: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3187: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
 rm -rf conftest*
 ac_cv_struct_tm_zone=yes
 else
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 EOF
 }
 else
 echo $ac_n "checking for tzname""... $ac_c" 1>&6
-echo "configure:3211: checking for tzname" >&5
+echo "configure:3210: checking for tzname" >&5
 cat > conftest.$ac_ext <<EOF
-#line 3214 "configure"
+#line 3213 "configure"
 #include "confdefs.h"
 #include <time.h>
 #ifndef tzname /* For SGI.  */
 extern char *tzname[]; /* RS6000 and others reject char **tzname.  */
 #endif
 int main() {
 atoi(*tzname);
 ; return 0; }
 EOF
-if { (eval echo configure:3224: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:3223: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
 rm -rf conftest*
 ac_cv_var_tzname=yes
 else
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 fi
 fi
 echo $ac_n "checking for working const""... $ac_c" 1>&6
-echo "configure:3250: checking for working const" >&5
+echo "configure:3249: checking for working const" >&5
 cat > conftest.$ac_ext <<EOF
-#line 3253 "configure"
+#line 3252 "configure"
 #include "confdefs.h"
 int main() {
 /* Ultrix mips cc rejects this.  */
 const int foo = 10;
 }
 ; return 0; }
 EOF
-if { (eval echo configure:3302: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3301: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
 rm -rf conftest*
 ac_cv_c_const=yes
 else
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 fi
 echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
-echo "configure:3327: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "configure:3326: checking whether ${MAKE-make} sets \${MAKE}" >&5
 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
 cat > conftestmake <<\EOF
 all:
 	@echo 'ac_maketemp="${MAKE}"'
 SET_MAKE="MAKE=${MAKE-make}"
 fi
 echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6
-echo "configure:3352: checking whether byte ordering is bigendian" >&5
+echo "configure:3351: checking whether byte ordering is bigendian" >&5
 ac_cv_c_bigendian=unknown
 # See if sys/param.h defines the BYTE_ORDER macro.
 cat > conftest.$ac_ext <<EOF
-#line 3357 "configure"
+#line 3356 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/param.h>
 int main() {
 #if !BYTE_ORDER || !BIG_ENDIAN || !LITTLE_ENDIAN
 bogus endian macros
 #endif
 ; return 0; }
 EOF
-if { (eval echo configure:3368: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3367: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
 rm -rf conftest*
 # It does; now see whether it defined to BIG_ENDIAN or not.
 cat > conftest.$ac_ext <<EOF
-#line 3372 "configure"
+#line 3371 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/param.h>
 int main() {
 #if BYTE_ORDER != BIG_ENDIAN
 not big endian
 #endif
 ; return 0; }
 EOF
-if { (eval echo configure:3383: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3382: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
 rm -rf conftest*
 ac_cv_c_bigendian=yes
 else
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 cat conftest.$ac_ext >&5
 fi
 rm -f conftest*
 if test $ac_cv_c_bigendian = unknown; then
 cat > conftest.$ac_ext <<EOF
-#line 3400 "configure"
+#line 3399 "configure"
 #include "confdefs.h"
 main () {
 /* Are we little or big endian?  From Harbison&Steele.  */
 union
 {
 } u;
 u.l = 1;
 exit (u.c[sizeof (long) - 1] == 1);
 }
 EOF
-if { (eval echo configure:3413: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5
+if { (eval echo configure:3412: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5
 then
 ac_cv_c_bigendian=no
 else
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 fi
 echo $ac_n "checking size of short""... $ac_c" 1>&6
-echo "configure:3439: checking size of short" >&5
+echo "configure:3438: checking size of short" >&5
 cat > conftest.$ac_ext <<EOF
-#line 3442 "configure"
+#line 3441 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 main()
 {
 FILE *f=fopen("conftestval", "w");
 if (!f) exit(1);
 fprintf(f, "%d\n", sizeof(short));
 exit(0);
 }
 EOF
-if { (eval echo configure:3453: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5
+if { (eval echo configure:3452: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5
 then
 ac_cv_sizeof_short=`cat conftestval`
 else
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 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 size of int""... $ac_c" 1>&6
-echo "configure:3480: checking size of int" >&5
+echo "configure:3479: checking size of int" >&5
 cat > conftest.$ac_ext <<EOF
-#line 3483 "configure"
+#line 3482 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 main()
 {
 FILE *f=fopen("conftestval", "w");
 if (!f) exit(1);
 fprintf(f, "%d\n", sizeof(int));
 exit(0);
 }
 EOF
-if { (eval echo configure:3494: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5
+if { (eval echo configure:3493: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5
 then
 ac_cv_sizeof_int=`cat conftestval`
 else
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 EOF
 }
 echo $ac_n "checking size of long""... $ac_c" 1>&6
-echo "configure:3515: checking size of long" >&5
+echo "configure:3514: checking size of long" >&5
 cat > conftest.$ac_ext <<EOF
-#line 3518 "configure"
+#line 3517 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 main()
 {
 FILE *f=fopen("conftestval", "w");
 if (!f) exit(1);
 fprintf(f, "%d\n", sizeof(long));
 exit(0);
 }
 EOF
-if { (eval echo configure:3529: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5
+if { (eval echo configure:3528: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5
 then
 ac_cv_sizeof_long=`cat conftestval`
 else
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 EOF
 }
 echo $ac_n "checking size of long long""... $ac_c" 1>&6
-echo "configure:3550: checking size of long long" >&5
+echo "configure:3549: checking size of long long" >&5
 cat > conftest.$ac_ext <<EOF
-#line 3553 "configure"
+#line 3552 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 main()
 {
 FILE *f=fopen("conftestval", "w");
 if (!f) exit(1);
 fprintf(f, "%d\n", sizeof(long long));
 exit(0);
 }
 EOF
-if { (eval echo configure:3564: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5
+if { (eval echo configure:3563: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5
 then
 ac_cv_sizeof_long_long=`cat conftestval`
 else
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 EOF
 }
 echo $ac_n "checking size of void *""... $ac_c" 1>&6
-echo "configure:3585: checking size of void *" >&5
+echo "configure:3584: checking size of void *" >&5
 cat > conftest.$ac_ext <<EOF
-#line 3588 "configure"
+#line 3587 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 main()
 {
 FILE *f=fopen("conftestval", "w");
 if (!f) exit(1);
 fprintf(f, "%d\n", sizeof(void *));
 exit(0);
 }
 EOF
-if { (eval echo configure:3599: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5
+if { (eval echo configure:3598: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5
 then
 ac_cv_sizeof_void_p=`cat conftestval`
 else
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 }
 echo $ac_n "checking for long file names""... $ac_c" 1>&6
-echo "configure:3621: checking for long file names" >&5
+echo "configure:3620: 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:3668: checking for sqrt in -lm" >&5
+echo "configure:3667: 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 3673 "configure"
+#line 3672 "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:3684: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:3683: \"$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 "checking type of mail spool file locking" 1>&6
-echo "configure:3727: checking type of mail spool file locking" >&5
+echo "configure:3726: 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:3751: checking for kstat_open in -lkstat" >&5
+echo "configure:3750: 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 3756 "configure"
+#line 3755 "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:3767: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:3766: \"$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:3801: checking for kvm_read in -lkvm" >&5
+echo "configure:3800: 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 3806 "configure"
+#line 3805 "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:3817: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:3816: \"$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:3851: checking for cma_open in -lpthreads" >&5
+echo "configure:3850: 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 3856 "configure"
+#line 3855 "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:3867: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:3866: \"$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:3903: checking whether the -xildoff compiler flag is required" >&5
+echo "configure:3902: 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
-if test "$opsys" = "sol2" -a "${OS_RELEASE:-0}" -ge 56; then
+if test "$opsys" = "sol2" && test "$OS_RELEASE" -ge 56; then
 echo $ac_n "checking for \"-z ignore\" linker flag""... $ac_c" 1>&6
-echo "configure:3914: checking for \"-z ignore\" linker flag" >&5
+echo "configure:3913: 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
 fi
 echo "checking "for specified window system"" 1>&6
-echo "configure:3924: checking "for specified window system"" >&5
+echo "configure:3923: 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:3945: checking for X" >&5
+echo "configure:3944: 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 4005 "configure"
+#line 4004 "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:4010: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:4009: \"$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 4079 "configure"
+#line 4078 "configure"
 #include "confdefs.h"
 int main() {
 ${x_direct_test_function}()
 ; return 0; }
 EOF
-if { (eval echo configure:4086: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:4085: \"$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:4195: checking whether -R must be followed by a space" >&5
+echo "configure:4194: 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 4198 "configure"
+#line 4197 "configure"
 #include "confdefs.h"
 int main() {
 ; return 0; }
 EOF
-if { (eval echo configure:4205: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:4204: \"$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 4221 "configure"
+#line 4220 "configure"
 #include "confdefs.h"
 int main() {
 ; return 0; }
 EOF
-if { (eval echo configure:4228: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:4227: \"$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:4264: checking for dnet_ntoa in -ldnet" >&5
+echo "configure:4263: 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 4269 "configure"
+#line 4268 "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:4280: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:4279: \"$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:4304: checking for dnet_ntoa in -ldnet_stub" >&5
+echo "configure:4303: 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 4309 "configure"
+#line 4308 "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:4320: \"$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_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:4349: checking for gethostbyname" >&5
+echo "configure:4348: checking for gethostbyname" >&5
 cat > conftest.$ac_ext <<EOF
-#line 4352 "configure"
+#line 4351 "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:4375: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:4374: \"$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:4396: checking for gethostbyname in -lnsl" >&5
+echo "configure:4395: 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 4401 "configure"
+#line 4400 "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:4412: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:4411: \"$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:4442: checking for connect" >&5
+echo "configure:4441: checking for connect" >&5
 cat > conftest.$ac_ext <<EOF
-#line 4445 "configure"
+#line 4444 "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:4468: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:4467: \"$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:4491: checking "$xe_msg_checking"" >&5
+echo "configure:4490: 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 4496 "configure"
+#line 4495 "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:4507: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:4506: \"$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:4531: checking for remove" >&5
+echo "configure:4530: checking for remove" >&5
 cat > conftest.$ac_ext <<EOF
-#line 4534 "configure"
+#line 4533 "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:4557: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:4556: \"$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:4578: checking for remove in -lposix" >&5
+echo "configure:4577: 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 4583 "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 remove();
 int main() {
 remove()
 ; return 0; }
 EOF
-if { (eval echo configure:4594: \"$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
 fi
 # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
 echo $ac_n "checking for shmat""... $ac_c" 1>&6
-echo "configure:4618: checking for shmat" >&5
+echo "configure:4617: checking for shmat" >&5
 cat > conftest.$ac_ext <<EOF
-#line 4621 "configure"
+#line 4620 "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:4644: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:4643: \"$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:4665: checking for shmat in -lipc" >&5
+echo "configure:4664: 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 4670 "configure"
+#line 4669 "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:4681: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:4680: \"$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:4715: checking for IceConnectionNumber in -lICE" >&5
+echo "configure:4714: 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 4720 "configure"
+#line 4719 "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:4731: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:4730: \"$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
 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 -e 's:^ ::' -e "s/$dash_r[^ ]*//"`
+ld_switch_site=`echo   '' $ld_switch_site   | sed -e 's:^ ::' -e "s/$dash_r[^ ]*//g"`
-ld_switch_x_site=`echo '' $ld_switch_x_site | sed -e 's:^ ::' -e "s/$dash_r[^ ]*//"`
+ld_switch_x_site=`echo '' $ld_switch_x_site | sed -e 's:^ ::' -e "s/$dash_r[^ ]*//g"`
 runpath="" runpath_dirs=""
 if test -n "$LD_RUN_PATH"; then
 runpath="$LD_RUN_PATH"
 elif test "$GCC" = "yes"; then
 for var in x_libraries x_includes X_CFLAGS X_LIBS X_PRE_LIBS X_EXTRA_LIBS; do eval "echo \"$var = '\$$var'\""; done
 echo
 fi
 echo "checking for X defines extracted by xmkmf" 1>&6
-echo "configure:4863: checking for X defines extracted by xmkmf" >&5
+echo "configure:4862: checking for X defines extracted by xmkmf" >&5
 rm -fr conftestdir
 if mkdir conftestdir; then
 cd conftestdir
 cat > Imakefile <<'EOF'
 xetest:
 done
 fi
 ac_safe=`echo "X11/Intrinsic.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for X11/Intrinsic.h""... $ac_c" 1>&6
-echo "configure:4895: checking for X11/Intrinsic.h" >&5
+echo "configure:4894: checking for X11/Intrinsic.h" >&5
 cat > conftest.$ac_ext <<EOF
-#line 4898 "configure"
+#line 4897 "configure"
 #include "confdefs.h"
 #include <X11/Intrinsic.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:4903: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:4902: \"$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:4927: checking for XOpenDisplay in -lX11" >&5
+echo "configure:4926: 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 4932 "configure"
+#line 4931 "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:4943: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:4942: \"$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:4968: checking "$xe_msg_checking"" >&5
+echo "configure:4967: 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 4973 "configure"
+#line 4972 "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:4984: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:4983: \"$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:5011: checking for XShapeSelectInput in -lXext" >&5
+echo "configure:5010: 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 5016 "configure"
+#line 5015 "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:5027: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:5026: \"$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:5051: checking for XtOpenDisplay in -lXt" >&5
+echo "configure:5050: 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 5056 "configure"
+#line 5055 "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:5067: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:5066: \"$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:5091: checking the version of X11 being used" >&5
+echo "configure:5090: checking the version of X11 being used" >&5
 cat > conftest.$ac_ext <<EOF
-#line 5093 "configure"
+#line 5092 "configure"
 #include "confdefs.h"
 #include <X11/Intrinsic.h>
 main(int c, char* v[]) { return c>1 ? XlibSpecificationRelease : 0; }
 EOF
-if { (eval echo configure:5098: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5
+if { (eval echo configure:5097: \"$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:5122: checking for $ac_hdr" >&5
+echo "configure:5121: checking for $ac_hdr" >&5
 cat > conftest.$ac_ext <<EOF
-#line 5125 "configure"
+#line 5124 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:5130: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:5129: \"$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:5161: checking for XFree86" >&5
+echo "configure:5160: 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:5183: checking for XmuConvertStandardSelection in -lXmu" >&5
+echo "configure:5182: 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 5188 "configure"
+#line 5187 "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:5199: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:5198: \"$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:5232: checking for main in -lXbsd" >&5
+echo "configure:5231: 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 5237 "configure"
+#line 5236 "configure"
 #include "confdefs.h"
 int main() {
 main()
 ; return 0; }
 EOF
-if { (eval echo configure:5244: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:5243: \"$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:5267: checking for XawScrollbarSetThumb in -lXaw" >&5
+echo "configure:5266: 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 5272 "configure"
+#line 5271 "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:5283: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:5282: \"$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
 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:5340: checking for X11/Xauth.h" >&5
+echo "configure:5339: checking for X11/Xauth.h" >&5
 cat > conftest.$ac_ext <<EOF
-#line 5343 "configure"
+#line 5342 "configure"
 #include "confdefs.h"
 #include <X11/Xauth.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:5348: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:5347: \"$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:5371: checking for XauGetAuthByAddr in -lXau" >&5
+echo "configure:5370: 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 5376 "configure"
+#line 5375 "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:5387: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:5386: \"$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_offix" && { ac_safe=`echo "OffiX/DragAndDrop.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for OffiX/DragAndDrop.h""... $ac_c" 1>&6
-echo "configure:5428: checking for OffiX/DragAndDrop.h" >&5
+echo "configure:5427: checking for OffiX/DragAndDrop.h" >&5
 cat > conftest.$ac_ext <<EOF
-#line 5431 "configure"
+#line 5430 "configure"
 #include "confdefs.h"
 #include <OffiX/DragAndDrop.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:5436: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:5435: \"$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:5459: checking for DndInitialize in -lDnd" >&5
+echo "configure:5458: 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 5464 "configure"
+#line 5463 "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:5475: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:5474: \"$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:5514: checking for ${dir}tt_c.h" >&5
+echo "configure:5513: checking for ${dir}tt_c.h" >&5
 cat > conftest.$ac_ext <<EOF
-#line 5517 "configure"
+#line 5516 "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:5522: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:5521: \"$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:5551: checking "$xe_msg_checking"" >&5
+echo "configure:5550: 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 5556 "configure"
+#line 5555 "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:5567: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:5566: \"$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:5616: checking for Dt/Dt.h" >&5
+echo "configure:5615: checking for Dt/Dt.h" >&5
 cat > conftest.$ac_ext <<EOF
-#line 5619 "configure"
+#line 5618 "configure"
 #include "confdefs.h"
 #include <Dt/Dt.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:5624: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:5623: \"$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:5647: checking for DtDndDragStart in -lDtSvc" >&5
+echo "configure:5646: 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 5652 "configure"
+#line 5651 "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:5663: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:5662: \"$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:5710: checking for main in -lenergize" >&5
+echo "configure:5709: 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 5715 "configure"
+#line 5714 "configure"
 #include "confdefs.h"
 int main() {
 main()
 ; return 0; }
 EOF
-if { (eval echo configure:5722: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:5721: \"$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:5754: checking for main in -lconn" >&5
+echo "configure:5753: 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 5759 "configure"
+#line 5758 "configure"
 #include "confdefs.h"
 int main() {
 main()
 ; 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:5765: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
 rm -rf conftest*
 eval "ac_cv_lib_$ac_lib_var=yes"
 else
 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:5799: checking for editorconn.h" >&5
+echo "configure:5798: checking for editorconn.h" >&5
 cat > conftest.$ac_ext <<EOF
-#line 5802 "configure"
+#line 5801 "configure"
 #include "confdefs.h"
 #include <editorconn.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:5807: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:5806: \"$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:5849: checking for graphics libraries" >&5
+echo "configure:5848: 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
 echo "    xemacs will be linked with \"dgif_lib.o gif_err.o gifalloc.o\""
 fi
 fi
 echo $ac_n "checking for Xpm - no older than 3.4f""... $ac_c" 1>&6
-echo "configure:5866: checking for Xpm - no older than 3.4f" >&5
+echo "configure:5865: checking for Xpm - no older than 3.4f" >&5
 xe_check_libs=-lXpm
 test -z "$with_xpm" && { cat > conftest.$ac_ext <<EOF
-#line 5869 "configure"
+#line 5868 "configure"
 #include "confdefs.h"
 #include <X11/xpm.h>
 int main(int c, char **v) {
 return c == 1 ? 0 :
 XpmIncludeVersion != XpmLibraryVersion() ? 1 :
 XpmIncludeVersion < 30406 ? 2 :
 		0 ;
 }
 EOF
-if { (eval echo configure:5879: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5
+if { (eval echo configure:5878: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5
 then
 ./conftest foobar; xpm_status=$?;
 if test "$xpm_status" = "0"; then with_xpm=yes; else with_xpm=no; fi;
 else
 echo "configure: failed program was:" >&5
 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:5917: checking for compface.h" >&5
+echo "configure:5916: checking for compface.h" >&5
 cat > conftest.$ac_ext <<EOF
-#line 5920 "configure"
+#line 5919 "configure"
 #include "confdefs.h"
 #include <compface.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:5925: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:5924: \"$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_xface=no
 fi
 }
 test -z "$with_xface" && {
 echo $ac_n "checking for UnGenFace in -lcompface""... $ac_c" 1>&6
-echo "configure:5948: checking for UnGenFace in -lcompface" >&5
+echo "configure:5947: 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 5953 "configure"
+#line 5952 "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:5964: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:5963: \"$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:6000: checking for jpeglib.h" >&5
+echo "configure:5999: checking for jpeglib.h" >&5
 cat > conftest.$ac_ext <<EOF
-#line 6003 "configure"
+#line 6002 "configure"
 #include "confdefs.h"
 #include <jpeglib.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:6008: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:6007: \"$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:6031: checking for jpeg_destroy_decompress in -ljpeg" >&5
+echo "configure:6030: 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 6036 "configure"
+#line 6035 "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:6047: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:6046: \"$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:6083: checking for png.h" >&5
+echo "configure:6082: checking for png.h" >&5
 cat > conftest.$ac_ext <<EOF
-#line 6086 "configure"
+#line 6085 "configure"
 #include "confdefs.h"
 #include <png.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:6091: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:6090: \"$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:6113: checking for pow" >&5
+echo "configure:6112: checking for pow" >&5
 cat > conftest.$ac_ext <<EOF
-#line 6116 "configure"
+#line 6115 "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:6139: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:6138: \"$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:6164: checking "$xe_msg_checking"" >&5
+echo "configure:6163: 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 6169 "configure"
+#line 6168 "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:6180: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:6179: \"$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:6230: checking for Xm/Xm.h" >&5
+echo "configure:6229: checking for Xm/Xm.h" >&5
 cat > conftest.$ac_ext <<EOF
-#line 6233 "configure"
+#line 6232 "configure"
 #include "confdefs.h"
 #include <Xm/Xm.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:6238: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:6237: \"$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:6255: checking for XmStringFree in -lXm" >&5
+echo "configure:6254: 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 6260 "configure"
+#line 6259 "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:6271: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:6270: \"$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:6519: checking for Mule-related features" >&5
+echo "configure:6518: 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:6536: checking for $ac_hdr" >&5
+echo "configure:6535: checking for $ac_hdr" >&5
 cat > conftest.$ac_ext <<EOF
-#line 6539 "configure"
+#line 6538 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:6544: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:6543: \"$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:6575: checking for strerror in -lintl" >&5
+echo "configure:6574: 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 6580 "configure"
+#line 6579 "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:6591: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:6590: \"$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:6624: checking for Mule input methods" >&5
+echo "configure:6623: checking for Mule input methods" >&5
 test -z "$with_xim" -a "$opsys" != "sol2" && with_xim=no
 case "$with_xim" in "" | "yes" )
 echo "checking for XIM" 1>&6
-echo "configure:6628: checking for XIM" >&5
+echo "configure:6627: checking for XIM" >&5
 echo $ac_n "checking for XmImMbLookupString in -lXm""... $ac_c" 1>&6
-echo "configure:6631: checking for XmImMbLookupString in -lXm" >&5
+echo "configure:6630: 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 6636 "configure"
+#line 6635 "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:6647: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:6646: \"$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:6709: checking for wnn/jllib.h" >&5
+echo "configure:6708: checking for wnn/jllib.h" >&5
 cat > conftest.$ac_ext <<EOF
-#line 6712 "configure"
+#line 6711 "configure"
 #include "confdefs.h"
 #include <wnn/jllib.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:6717: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:6716: \"$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_wnn=no
 fi
 }
 test -z "$with_wnn" && {
 echo $ac_n "checking for jl_dic_list_e in -lwnn""... $ac_c" 1>&6
-echo "configure:6740: checking for jl_dic_list_e in -lwnn" >&5
+echo "configure:6739: checking for jl_dic_list_e in -lwnn" >&5
 ac_lib_var=`echo wnn'_'jl_dic_list_e | sed 'y%./+-%__p_%'`
 xe_check_libs=" -lwnn "
 cat > conftest.$ac_ext <<EOF
-#line 6745 "configure"
+#line 6744 "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:6756: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:6755: \"$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
 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:6793: checking for jl_fi_dic_list in -lwnn" >&5
+echo "configure:6792: 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 6798 "configure"
+#line 6797 "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:6809: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:6808: \"$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:6841: checking for canna/RK.h" >&5
+echo "configure:6840: checking for canna/RK.h" >&5
 cat > conftest.$ac_ext <<EOF
-#line 6844 "configure"
+#line 6843 "configure"
 #include "confdefs.h"
 #include <canna/RK.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:6849: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:6848: \"$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:6872: checking for RkBgnBun in -lRKC" >&5
+echo "configure:6871: 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 6877 "configure"
+#line 6876 "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:6888: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:6887: \"$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:6911: checking for jrKanjiControl in -lcanna" >&5
+echo "configure:6910: 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 6916 "configure"
+#line 6915 "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:6927: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:6926: \"$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 -e 's:^ ::' -e "s/$dash_r[^ ]*//"`
+ld_switch_site=`echo   '' $ld_switch_site   | sed -e 's:^ ::' -e "s/$dash_r[^ ]*//g"`
-ld_switch_x_site=`echo '' $ld_switch_x_site | sed -e 's:^ ::' -e "s/$dash_r[^ ]*//"`
+ld_switch_x_site=`echo '' $ld_switch_x_site | sed -e 's:^ ::' -e "s/$dash_r[^ ]*//g"`
 runpath="" runpath_dirs=""
 if test -n "$LD_RUN_PATH"; then
 runpath="$LD_RUN_PATH"
 elif test "$GCC" = "yes"; then
 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:7027: checking for $ac_func" >&5
+echo "configure:7026: checking for $ac_func" >&5
 cat > conftest.$ac_ext <<EOF
-#line 7030 "configure"
+#line 7029 "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:7053: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:7052: \"$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:7090: checking for $ac_func" >&5
+echo "configure:7089: checking for $ac_func" >&5
 cat > conftest.$ac_ext <<EOF
-#line 7093 "configure"
+#line 7092 "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:7116: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:7115: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
 rm -rf conftest*
 eval "ac_cv_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:7149: checking whether netdb declares h_errno" >&5
+echo "configure:7148: checking whether netdb declares h_errno" >&5
 cat > conftest.$ac_ext <<EOF
-#line 7151 "configure"
+#line 7150 "configure"
 #include "confdefs.h"
 #include <netdb.h>
 int main() {
 return h_errno;
 ; return 0; }
 EOF
-if { (eval echo configure:7158: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:7157: \"$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:7178: checking for sigsetjmp" >&5
+echo "configure:7177: checking for sigsetjmp" >&5
 cat > conftest.$ac_ext <<EOF
-#line 7180 "configure"
+#line 7179 "configure"
 #include "confdefs.h"
 #include <setjmp.h>
 int main() {
 sigjmp_buf bar; sigsetjmp (bar, 0);
 ; return 0; }
 EOF
-if { (eval echo configure:7187: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:7186: \"$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:7207: checking whether localtime caches TZ" >&5
+echo "configure:7206: checking whether localtime caches TZ" >&5
 if test "$ac_cv_func_tzset" = "yes"; then
 cat > conftest.$ac_ext <<EOF
-#line 7211 "configure"
+#line 7210 "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:7246: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5
+if { (eval echo configure:7245: \"$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:7275: checking whether gettimeofday cannot accept two arguments" >&5
+echo "configure:7274: checking whether gettimeofday cannot accept two arguments" >&5
 cat > conftest.$ac_ext <<EOF
-#line 7277 "configure"
+#line 7276 "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:7299: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:7298: \"$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:7321: checking for inline" >&5
+echo "configure:7320: checking for inline" >&5
 ac_cv_c_inline=no
 for ac_kw in inline __inline__ __inline; do
 cat > conftest.$ac_ext <<EOF
-#line 7326 "configure"
+#line 7325 "configure"
 #include "confdefs.h"
 int main() {
 } $ac_kw foo() {
 ; return 0; }
 EOF
-if { (eval echo configure:7333: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:7332: \"$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:7383: checking for working alloca.h" >&5
+echo "configure:7382: checking for working alloca.h" >&5
 cat > conftest.$ac_ext <<EOF
-#line 7386 "configure"
+#line 7385 "configure"
 #include "confdefs.h"
 #include <alloca.h>
 int main() {
 char *p = alloca(2 * sizeof(int));
 ; return 0; }
 EOF
-if { (eval echo configure:7393: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:7392: \"$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:7417: checking for alloca" >&5
+echo "configure:7416: checking for alloca" >&5
 cat > conftest.$ac_ext <<EOF
-#line 7420 "configure"
+#line 7419 "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:7443: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:7442: \"$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:7482: checking whether alloca needs Cray hooks" >&5
+echo "configure:7481: checking whether alloca needs Cray hooks" >&5
 cat > conftest.$ac_ext <<EOF
-#line 7485 "configure"
+#line 7484 "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:7509: checking for $ac_func" >&5
+echo "configure:7508: checking for $ac_func" >&5
 cat > conftest.$ac_ext <<EOF
-#line 7512 "configure"
+#line 7511 "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:7535: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:7534: \"$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:7565: checking stack direction for C alloca" >&5
+echo "configure:7564: checking stack direction for C alloca" >&5
 cat > conftest.$ac_ext <<EOF
-#line 7568 "configure"
+#line 7567 "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:7587: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5
+if { (eval echo configure:7586: \"$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
 echo "    xemacs will be linked with \"$ALLOCA\""
 fi
 ac_safe=`echo "vfork.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for vfork.h""... $ac_c" 1>&6
-echo "configure:7615: checking for vfork.h" >&5
+echo "configure:7614: checking for vfork.h" >&5
 cat > conftest.$ac_ext <<EOF
-#line 7618 "configure"
+#line 7617 "configure"
 #include "confdefs.h"
 #include <vfork.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:7623: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7622: \"$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:7651: checking for working vfork" >&5
+echo "configure:7650: checking for working vfork" >&5
 cat > conftest.$ac_ext <<EOF
-#line 7654 "configure"
+#line 7653 "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:7749: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5
+if { (eval echo configure:7748: \"$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:7774: checking for working strcoll" >&5
+echo "configure:7773: checking for working strcoll" >&5
 cat > conftest.$ac_ext <<EOF
-#line 7777 "configure"
+#line 7776 "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:7787: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5
+if { (eval echo configure:7786: \"$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
 for ac_func in getpgrp
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:7814: checking for $ac_func" >&5
+echo "configure:7813: checking for $ac_func" >&5
 cat > conftest.$ac_ext <<EOF
-#line 7817 "configure"
+#line 7816 "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:7840: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:7839: \"$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 "$ac_t""no" 1>&6
 fi
 done
 echo $ac_n "checking whether getpgrp takes no argument""... $ac_c" 1>&6
-echo "configure:7868: checking whether getpgrp takes no argument" >&5
+echo "configure:7867: checking whether getpgrp takes no argument" >&5
 cat > conftest.$ac_ext <<EOF
-#line 7871 "configure"
+#line 7870 "configure"
 #include "confdefs.h"
 /*
 * If this system has a BSD-style getpgrp(),
 * which takes a pid argument, exit unsuccessfully.
 exit(s>>8);
 }
 }
 EOF
-if { (eval echo configure:7926: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5
+if { (eval echo configure:7925: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5
 then
 ac_cv_func_getpgrp_void=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:7952: checking for working mmap" >&5
+echo "configure:7951: checking for working mmap" >&5
 case "$opsys" in ultrix* ) have_mmap=no ;; *)
 cat > conftest.$ac_ext <<EOF
-#line 7955 "configure"
+#line 7954 "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:7988: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5
+if { (eval echo configure:7987: \"$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:8021: checking for socket" >&5
+echo "configure:8020: checking for socket" >&5
 cat > conftest.$ac_ext <<EOF
-#line 8024 "configure"
+#line 8023 "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:8047: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:8046: \"$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:8062: checking for netinet/in.h" >&5
+echo "configure:8061: checking for netinet/in.h" >&5
 cat > conftest.$ac_ext <<EOF
-#line 8065 "configure"
+#line 8064 "configure"
 #include "confdefs.h"
 #include <netinet/in.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8070: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8069: \"$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:8087: checking for arpa/inet.h" >&5
+echo "configure:8086: checking for arpa/inet.h" >&5
 cat > conftest.$ac_ext <<EOF
-#line 8090 "configure"
+#line 8089 "configure"
 #include "confdefs.h"
 #include <arpa/inet.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8095: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8094: \"$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:8120: checking "for sun_len member in struct sockaddr_un"" >&5
+echo "configure:8119: checking "for sun_len member in struct sockaddr_un"" >&5
 cat > conftest.$ac_ext <<EOF
-#line 8122 "configure"
+#line 8121 "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:8133: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:8132: \"$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:8164: checking for msgget" >&5
+echo "configure:8163: checking for msgget" >&5
 cat > conftest.$ac_ext <<EOF
-#line 8167 "configure"
+#line 8166 "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:8190: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:8189: \"$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:8205: checking for sys/ipc.h" >&5
+echo "configure:8204: checking for sys/ipc.h" >&5
 cat > conftest.$ac_ext <<EOF
-#line 8208 "configure"
+#line 8207 "configure"
 #include "confdefs.h"
 #include <sys/ipc.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8213: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8212: \"$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:8230: checking for sys/msg.h" >&5
+echo "configure:8229: checking for sys/msg.h" >&5
 cat > conftest.$ac_ext <<EOF
-#line 8233 "configure"
+#line 8232 "configure"
 #include "confdefs.h"
 #include <sys/msg.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8238: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8237: \"$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:8276: checking for dirent.h" >&5
+echo "configure:8275: checking for dirent.h" >&5
 cat > conftest.$ac_ext <<EOF
-#line 8279 "configure"
+#line 8278 "configure"
 #include "confdefs.h"
 #include <dirent.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8284: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8283: \"$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:8311: checking for sys/dir.h" >&5
+echo "configure:8310: checking for sys/dir.h" >&5
 cat > conftest.$ac_ext <<EOF
-#line 8314 "configure"
+#line 8313 "configure"
 #include "confdefs.h"
 #include <sys/dir.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8319: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8318: \"$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:8352: checking for nlist.h" >&5
+echo "configure:8351: checking for nlist.h" >&5
 cat > conftest.$ac_ext <<EOF
-#line 8355 "configure"
+#line 8354 "configure"
 #include "confdefs.h"
 #include <nlist.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8360: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8359: \"$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 "checking "for sound support"" 1>&6
-echo "configure:8464: checking "for sound support"" >&5
+echo "configure:8463: 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:8475: checking for multimedia/audio_device.h" >&5
+echo "configure:8474: checking for multimedia/audio_device.h" >&5
 cat > conftest.$ac_ext <<EOF
-#line 8478 "configure"
+#line 8477 "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:8483: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8482: \"$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:8531: checking for ALopenport in -laudio" >&5
+echo "configure:8530: 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 8536 "configure"
+#line 8535 "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:8547: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:8546: \"$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:8578: checking for AOpenAudio in -lAlib" >&5
+echo "configure:8577: 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 8583 "configure"
+#line 8582 "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:8594: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:8593: \"$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:8632: checking for ${dir}/soundcard.h" >&5
+echo "configure:8631: checking for ${dir}/soundcard.h" >&5
 cat > conftest.$ac_ext <<EOF
-#line 8635 "configure"
+#line 8634 "configure"
 #include "confdefs.h"
 #include <${dir}/soundcard.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:8639: \"$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 8710 "configure"
+#line 8709 "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:8737: checking for TTY-related features" >&5
+echo "configure:8736: 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:8752: checking for termios.h" >&5
+echo "configure:8751: checking for termios.h" >&5
 cat > conftest.$ac_ext <<EOF
-#line 8755 "configure"
+#line 8754 "configure"
 #include "confdefs.h"
 #include <termios.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8760: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8759: \"$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:8787: checking for termio.h" >&5
+echo "configure:8786: checking for termio.h" >&5
 cat > conftest.$ac_ext <<EOF
-#line 8790 "configure"
+#line 8789 "configure"
 #include "confdefs.h"
 #include <termio.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8795: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8794: \"$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:8828: checking for tgetent in -lncurses" >&5
+echo "configure:8827: 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 8833 "configure"
+#line 8832 "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:8844: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:8843: \"$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:8877: checking for ncurses/curses.h" >&5
+echo "configure:8876: checking for ncurses/curses.h" >&5
 cat > conftest.$ac_ext <<EOF
-#line 8880 "configure"
+#line 8879 "configure"
 #include "confdefs.h"
 #include <ncurses/curses.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8885: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8884: \"$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:8907: checking for ncurses/term.h" >&5
+echo "configure:8906: checking for ncurses/term.h" >&5
 cat > conftest.$ac_ext <<EOF
-#line 8910 "configure"
+#line 8909 "configure"
 #include "confdefs.h"
 #include <ncurses/term.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8915: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8914: \"$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:8945: checking for ncurses/curses.h" >&5
+echo "configure:8944: checking for ncurses/curses.h" >&5
 cat > conftest.$ac_ext <<EOF
-#line 8948 "configure"
+#line 8947 "configure"
 #include "confdefs.h"
 #include <ncurses/curses.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8953: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8952: \"$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:8988: checking for tgetent in -l$lib" >&5
+echo "configure:8987: 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 8993 "configure"
+#line 8992 "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:9004: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:9003: \"$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:9035: checking for tgetent in -lcurses" >&5
+echo "configure:9034: 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 9040 "configure"
+#line 9039 "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:9051: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:9050: \"$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:9069: checking for tgetent in -ltermcap" >&5
+echo "configure:9068: 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 9074 "configure"
+#line 9073 "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:9085: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:9084: \"$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:9133: checking for gpm.h" >&5
+echo "configure:9132: checking for gpm.h" >&5
 cat > conftest.$ac_ext <<EOF
-#line 9136 "configure"
+#line 9135 "configure"
 #include "confdefs.h"
 #include <gpm.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9141: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9140: \"$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:9164: checking for Gpm_Open in -lgpm" >&5
+echo "configure:9163: 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 9169 "configure"
+#line 9168 "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:9180: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:9179: \"$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 "    xemacs will be linked with \"event-unixoid.o\""
 fi
 echo "checking for database support" 1>&6
-echo "configure:9229: checking for database support" >&5
+echo "configure:9228: 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:9234: checking for dbm_open in -lgdbm" >&5
+echo "configure:9233: 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 9239 "configure"
+#line 9238 "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:9250: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:9249: \"$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:9272: checking for dbm_open" >&5
+echo "configure:9271: checking for dbm_open" >&5
 cat > conftest.$ac_ext <<EOF
-#line 9275 "configure"
+#line 9274 "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:9298: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:9297: \"$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:9334: checking for dbm_open" >&5
+echo "configure:9333: checking for dbm_open" >&5
 cat > conftest.$ac_ext <<EOF
-#line 9337 "configure"
+#line 9336 "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:9360: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:9359: \"$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:9381: checking for dbm_open in -ldbm" >&5
+echo "configure:9380: 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 9386 "configure"
+#line 9385 "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:9397: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:9396: \"$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:9434: checking for dbopen" >&5
+echo "configure:9433: checking for dbopen" >&5
 cat > conftest.$ac_ext <<EOF
-#line 9437 "configure"
+#line 9436 "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:9460: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:9459: \"$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:9481: checking for dbopen in -ldb" >&5
+echo "configure:9480: 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 9486 "configure"
+#line 9485 "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:9497: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:9496: \"$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 9521 "configure"
+#line 9520 "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:9539: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:9538: \"$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:9591: checking for SOCKSinit in -lsocks" >&5
+echo "configure:9590: 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 9596 "configure"
+#line 9595 "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:9607: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:9606: \"$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 creating $dir/Makefile
 (
 cd $dir
 rm -f junk.c
 < Makefile.in \
-sed -e 's/^# Generated.*//' \
+sed -e '/^# Generated/d' \
 -e 's%/\*\*/#.*%%' \
--e 's/^[ \f\t]*#[ \f\t]*/#/' \
+-e 's/^ *# */#/' \
 -e '/^##/d' \
 -e '/^#/ {
 p
 d
 }'        -e '/./ {
 s/$/"/
 }'  > junk.c;
 $CPP -I. -I${top_srcdir}/src $CPPFLAGS junk.c > junk.cpp;
 < junk.cpp				\
 sed -e 's/^#.*//'			\
-	-e 's/^[ \f\t][ \f\t]*$//'	\
+	-e 's/^[ 	][ 	]*$//'	\
-	-e 's/^ /	/'		\
+	-e 's/^ /	/'			\
 	| sed -n -e '/^..*$/p'		\
 	| sed '/^"/ {
 s/\\\([\"]\)/\1/g
 s/^"//
 s/"$//
 }'	> Makefile.new
 chmod 444 Makefile.new
 mv -f Makefile.new Makefile
 rm -f junk.c junk.cpp
 )
 done
 exit 0
 EOF
 chmod +x $CONFIG_STATUS

Mercurial > hg > xemacs-beta

comparison configure @ 165:5a88923fcbfe r20-3b9