xemacs-beta: configure comparison

comparison configure @ 1470:1364f9716d7b

[xemacs-hg @ 2003-05-10 02:57:05 by youngs] 2003-05-10 Steve Youngs <youngs@xemacs.org> * Revert this patch: 2003-05-01 Andrew Begel <abegel@CS.Berkeley.EDU> * configure.in: Move module detection to after src/ is added to MAKE_SUBDIR. On MacOS X, building modules requires xemacs to already be built. * aclocal.m4 (XE_SHLIB_STUFF): Properly define ellcc flags for MacOS X. It was stopping certain libs from making their way into the Makefiles. * configure: Regenerate.

author	youngs
date	Sat, 10 May 2003 02:57:07 +0000
parents	b02bdcffb55f
children	d968d4073031

comparison

equal deleted inserted replaced

-:51cfeb2ed271
+:1364f9716d7b
 cat > conftest.$ac_ext <<EOF
 #line 4640 "configure"
 #include "confdefs.h"
 #include <stdio.h>
-#include <sys/types.h>
 main()
 {
 FILE *f=fopen("conftestval", "w");
 if (!f) exit(1);
 fprintf(f, "%d\n", sizeof(short));
 exit(0);
 }
 EOF
-if { (eval echo configure:4652: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:4651: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
 then
 ac_cv_sizeof_short=`cat conftestval`
 else
 conftest_rc="$?"
 echo "configure: failed program was:" >&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:4680: checking size of int" >&5
+echo "configure:4679: checking size of int" >&5
 cat > conftest.$ac_ext <<EOF
-#line 4683 "configure"
+#line 4682 "configure"
 #include "confdefs.h"
 #include <stdio.h>
-#include <sys/types.h>
 main()
 {
 FILE *f=fopen("conftestval", "w");
 if (!f) exit(1);
 fprintf(f, "%d\n", sizeof(int));
 exit(0);
 }
 EOF
-if { (eval echo configure:4695: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:4693: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
 then
 ac_cv_sizeof_int=`cat conftestval`
 else
 conftest_rc="$?"
 echo "configure: failed program was:" >&5
 EOF
 }
 echo $ac_n "checking size of long""... $ac_c" 1>&6
-echo "configure:4717: checking size of long" >&5
+echo "configure:4715: checking size of long" >&5
 cat > conftest.$ac_ext <<EOF
-#line 4720 "configure"
+#line 4718 "configure"
 #include "confdefs.h"
 #include <stdio.h>
-#include <sys/types.h>
 main()
 {
 FILE *f=fopen("conftestval", "w");
 if (!f) exit(1);
 fprintf(f, "%d\n", sizeof(long));
 exit(0);
 }
 EOF
-if { (eval echo configure:4732: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:4729: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
 then
 ac_cv_sizeof_long=`cat conftestval`
 else
 conftest_rc="$?"
 echo "configure: failed program was:" >&5
 EOF
 }
 echo $ac_n "checking size of long long""... $ac_c" 1>&6
-echo "configure:4754: checking size of long long" >&5
+echo "configure:4751: checking size of long long" >&5
 cat > conftest.$ac_ext <<EOF
-#line 4757 "configure"
+#line 4754 "configure"
 #include "confdefs.h"
 #include <stdio.h>
-#include <sys/types.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:4769: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:4765: \"$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
 conftest_rc="$?"
 echo "configure: failed program was:" >&5
 EOF
 }
 echo $ac_n "checking size of void *""... $ac_c" 1>&6
-echo "configure:4791: checking size of void *" >&5
+echo "configure:4787: checking size of void *" >&5
 cat > conftest.$ac_ext <<EOF
-#line 4794 "configure"
+#line 4790 "configure"
 #include "confdefs.h"
 #include <stdio.h>
-#include <sys/types.h>
 main()
 {
 FILE *f=fopen("conftestval", "w");
 if (!f) exit(1);
 fprintf(f, "%d\n", sizeof(void *));
 exit(0);
 }
 EOF
-if { (eval echo configure:4806: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:4801: \"$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
 conftest_rc="$?"
 echo "configure: failed program was:" >&5
 }
 echo $ac_n "checking for long file names""... $ac_c" 1>&6
-echo "configure:4829: checking for long file names" >&5
+echo "configure:4824: 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 sin""... $ac_c" 1>&6
-echo "configure:4875: checking for sin" >&5
+echo "configure:4870: checking for sin" >&5
 cat > conftest.$ac_ext <<EOF
-#line 4878 "configure"
+#line 4873 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
 which can conflict with char sin(); below.  */
 #include <assert.h>
 /* Override any gcc2 internal prototype to avoid an error.  */
 sin();
 #endif
 ; return 0; }
 EOF
-if { (eval echo configure:4901: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4896: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
 rm -rf conftest*
 eval "ac_cv_func_sin=yes"
 else
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 :
 else
 echo "$ac_t""no" 1>&6
 echo $ac_n "checking for sin in -lm""... $ac_c" 1>&6
-echo "configure:4919: checking for sin in -lm" >&5
+echo "configure:4914: checking for sin in -lm" >&5
 ac_lib_var=`echo m'_'sin | sed 'y%./+-%__p_%'`
 xe_check_libs=" -lm "
 cat > conftest.$ac_ext <<EOF
-#line 4924 "configure"
+#line 4919 "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 sin();
 int main() {
 sin()
 ; return 0; }
 EOF
-if { (eval echo configure:4935: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4930: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; 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
 cat > conftest.$ac_ext <<EOF
-#line 4970 "configure"
+#line 4965 "configure"
 #include "confdefs.h"
 #include <math.h>
 int main() {
 return atanh(1.0) + asinh(1.0) + acosh(1.0);
 ; return 0; }
 EOF
-if { (eval echo configure:4977: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4972: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
 rm -rf conftest*
 { test "$extra_verbose" = "yes" && cat << \EOF
 Defining HAVE_INVERSE_HYPERBOLIC
 EOF
 cat >> confdefs.h <<\EOF
 rm -f conftest*
 for ac_func in mkstemp
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:4996: checking for $ac_func" >&5
+echo "configure:4991: checking for $ac_func" >&5
 cat > conftest.$ac_ext <<EOF
-#line 4999 "configure"
+#line 4994 "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:5022: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5017: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
 rm -rf conftest*
 eval "ac_cv_func_$ac_func=yes"
 else
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 fi
 done
 echo "checking type of mail spool file locking" 1>&6
-echo "configure:5051: checking type of mail spool file locking" >&5
+echo "configure:5046: checking type of mail spool file locking" >&5
 for ac_func in lockf flock
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:5055: checking for $ac_func" >&5
+echo "configure:5050: checking for $ac_func" >&5
 cat > conftest.$ac_ext <<EOF
-#line 5058 "configure"
+#line 5053 "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:5081: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5076: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
 rm -rf conftest*
 eval "ac_cv_func_$ac_func=yes"
 else
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 { echo "Error:" "locking mail locking requested but not available." >&2; exit 1; }
 case "$opsys" in decosf*)
 echo $ac_n "checking for cma_open in -lpthreads""... $ac_c" 1>&6
-echo "configure:5163: checking for cma_open in -lpthreads" >&5
+echo "configure:5158: 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 5168 "configure"
+#line 5163 "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:5179: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5174: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
 rm -rf conftest*
 eval "ac_cv_lib_$ac_lib_var=yes"
 else
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 c_switch_site="$c_switch_site -threads" ;;
 esac
 echo $ac_n "checking whether the -xildoff compiler flag is required""... $ac_c" 1>&6
-echo "configure:5216: checking whether the -xildoff compiler flag is required" >&5
+echo "configure:5211: 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
 fi
 if test "$opsys" = "sol2"; then
 if test "$os_release" -ge 56; then
 echo $ac_n "checking for \"-z ignore\" linker flag""... $ac_c" 1>&6
-echo "configure:5228: checking for \"-z ignore\" linker flag" >&5
+echo "configure:5223: 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
 fi
 echo "checking "for specified window system"" 1>&6
-echo "configure:5239: checking "for specified window system"" >&5
+echo "configure:5234: checking "for specified window system"" >&5
 GNOME_CONFIG=no
 GTK_CONFIG=no
 if test "$with_gnome" != "no"; then
 echo $ac_n "checking for GNOME configuration script""... $ac_c" 1>&6
-echo "configure:5247: checking for GNOME configuration script" >&5
+echo "configure:5242: checking for GNOME configuration script" >&5
 for possible in gnome-config
 do
 possible_version=`${possible} --version 2> /dev/null`
 if test "x${possible_version}" != "x"; then
 GNOME_CONFIG="${possible}"
 c_switch_gtk="$c_switch_gtk ${GNOME_CFLAGS}" &&  if test "$extra_verbose" = "yes"; then echo "    Appending \"${GNOME_CFLAGS}\" to \$c_switch_gtk"; fi
 fi
 if test "$with_gtk" != "no";then
 echo $ac_n "checking for GTK configuration script""... $ac_c" 1>&6
-echo "configure:5278: checking for GTK configuration script" >&5
+echo "configure:5273: checking for GTK configuration script" >&5
 for possible in gtk12-config gtk14-config gtk-config
 do
 possible_version=`${possible} --version 2> /dev/null`
 if test "x${possible_version}" != "x"; then
 GTK_CONFIG="${possible}"
 echo "$ac_t""${GTK_CONFIG}" 1>&6
 fi
 if test "${GTK_CONFIG}" != "no"; then
 echo $ac_n "checking gtk version""... $ac_c" 1>&6
-echo "configure:5300: checking gtk version" >&5
+echo "configure:5295: checking gtk version" >&5
 GTK_VERSION=`${GTK_CONFIG} --version`
 echo "$ac_t""${GTK_VERSION}" 1>&6
 echo $ac_n "checking gtk libs""... $ac_c" 1>&6
-echo "configure:5305: checking gtk libs" >&5
+echo "configure:5300: checking gtk libs" >&5
 GTK_LIBS=`${GTK_CONFIG} --libs`
 libs_gtk="$libs_gtk ${GTK_LIBS}" &&  if test "$extra_verbose" = "yes"; then echo "    Appending \"${GTK_LIBS}\" to \$libs_gtk"; fi
 echo "$ac_t""${GTK_LIBS}" 1>&6
 echo $ac_n "checking gtk cflags""... $ac_c" 1>&6
-echo "configure:5311: checking gtk cflags" >&5
+echo "configure:5306: checking gtk cflags" >&5
 GTK_CFLAGS=`${GTK_CONFIG} --cflags`
 if test "$GCC" = "yes"; then
 	GTK_CFLAGS="${GTK_CFLAGS} -Wno-shadow"
 fi
 c_switch_gtk="$c_switch_gtk ${GTK_CFLAGS}" &&  if test "$extra_verbose" = "yes"; then echo "    Appending \"${GTK_CFLAGS}\" to \$c_switch_gtk"; fi
 echo "$ac_t""${GTK_CFLAGS}" 1>&6
 echo $ac_n "checking for main in -lgdk_imlib""... $ac_c" 1>&6
-echo "configure:5321: checking for main in -lgdk_imlib" >&5
+echo "configure:5316: checking for main in -lgdk_imlib" >&5
 ac_lib_var=`echo gdk_imlib'_'main | sed 'y%./+-%__p_%'`
 xe_check_libs=" -lgdk_imlib "
 cat > conftest.$ac_ext <<EOF
-#line 5326 "configure"
+#line 5321 "configure"
 #include "confdefs.h"
 int main() {
 main()
 ; return 0; }
 EOF
-if { (eval echo configure:5333: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5328: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; 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 $ac_n "checking for Imlib_init in -lImlib""... $ac_c" 1>&6
-echo "configure:5355: checking for Imlib_init in -lImlib" >&5
+echo "configure:5350: checking for Imlib_init in -lImlib" >&5
 ac_lib_var=`echo Imlib'_'Imlib_init | sed 'y%./+-%__p_%'`
 xe_check_libs=" -lImlib "
 cat > conftest.$ac_ext <<EOF
-#line 5360 "configure"
+#line 5355 "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 Imlib_init();
 int main() {
 Imlib_init()
 ; return 0; }
 EOF
-if { (eval echo configure:5371: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5366: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
 rm -rf conftest*
 eval "ac_cv_lib_$ac_lib_var=yes"
 else
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 for ac_func in gdk_imlib_init
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:5394: checking for $ac_func" >&5
+echo "configure:5389: checking for $ac_func" >&5
 cat > conftest.$ac_ext <<EOF
-#line 5397 "configure"
+#line 5392 "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:5420: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5415: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
 rm -rf conftest*
 eval "ac_cv_func_$ac_func=yes"
 else
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 LDFLAGS="${LDFLAGS} ${GTK_LIBS}"
 for ac_hdr in glade/glade.h glade.h
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:5486: checking for $ac_hdr" >&5
+echo "configure:5481: checking for $ac_hdr" >&5
 cat > conftest.$ac_ext <<EOF
-#line 5489 "configure"
+#line 5484 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:5494: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:5489: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
 rm -rf conftest*
 eval "ac_cv_header_$ac_safe=yes"
 else
 fi
 done
 echo $ac_n "checking for main in -lxml""... $ac_c" 1>&6
-echo "configure:5525: checking for main in -lxml" >&5
+echo "configure:5520: checking for main in -lxml" >&5
 ac_lib_var=`echo xml'_'main | sed 'y%./+-%__p_%'`
 xe_check_libs=" -lxml "
 cat > conftest.$ac_ext <<EOF
-#line 5530 "configure"
+#line 5525 "configure"
 #include "confdefs.h"
 int main() {
 main()
 ; return 0; }
 EOF
-if { (eval echo configure:5537: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5532: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; 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 $ac_n "checking for main in -lglade""... $ac_c" 1>&6
-echo "configure:5559: checking for main in -lglade" >&5
+echo "configure:5554: checking for main in -lglade" >&5
 ac_lib_var=`echo glade'_'main | sed 'y%./+-%__p_%'`
 xe_check_libs=" -lglade "
 cat > conftest.$ac_ext <<EOF
-#line 5564 "configure"
+#line 5559 "configure"
 #include "confdefs.h"
 int main() {
 main()
 ; return 0; }
 EOF
-if { (eval echo configure:5571: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5566: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; 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 $ac_n "checking for main in -lglade-gnome""... $ac_c" 1>&6
-echo "configure:5593: checking for main in -lglade-gnome" >&5
+echo "configure:5588: checking for main in -lglade-gnome" >&5
 ac_lib_var=`echo glade-gnome'_'main | sed 'y%./+-%__p_%'`
 xe_check_libs=" -lglade-gnome "
 cat > conftest.$ac_ext <<EOF
-#line 5598 "configure"
+#line 5593 "configure"
 #include "confdefs.h"
 int main() {
 main()
 ; return 0; }
 EOF
-if { (eval echo configure:5605: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5600: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
 rm -rf conftest*
 eval "ac_cv_lib_$ac_lib_var=yes"
 else
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 echo "$ac_t""no" 1>&6
 fi
 cat > conftest.$ac_ext <<EOF
-#line 5626 "configure"
+#line 5621 "configure"
 #include "confdefs.h"
 #include <glade/glade-xml.h>
 EOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
 egrep "char \*txtdomain;" >/dev/null 2>&1; 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:5685: checking for X" >&5
+echo "configure:5680: 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 5745 "configure"
+#line 5740 "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:5750: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:5745: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 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 5819 "configure"
+#line 5814 "configure"
 #include "confdefs.h"
 int main() {
 ${x_direct_test_function}()
 ; return 0; }
 EOF
-if { (eval echo configure:5826: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5821: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; 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:5935: checking whether -R must be followed by a space" >&5
+echo "configure:5930: 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 5938 "configure"
+#line 5933 "configure"
 #include "confdefs.h"
 int main() {
 ; return 0; }
 EOF
-if { (eval echo configure:5945: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5940: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; 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 5961 "configure"
+#line 5956 "configure"
 #include "confdefs.h"
 int main() {
 ; return 0; }
 EOF
-if { (eval echo configure:5968: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5963: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; 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:6004: checking for dnet_ntoa in -ldnet" >&5
+echo "configure:5999: 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 6009 "configure"
+#line 6004 "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:6020: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6015: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; 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:6044: checking for dnet_ntoa in -ldnet_stub" >&5
+echo "configure:6039: 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 6049 "configure"
+#line 6044 "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:6060: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6055: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; 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:6089: checking for gethostbyname" >&5
+echo "configure:6084: checking for gethostbyname" >&5
 cat > conftest.$ac_ext <<EOF
-#line 6092 "configure"
+#line 6087 "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:6115: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6110: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; 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:6136: checking for gethostbyname in -lnsl" >&5
+echo "configure:6131: 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 6141 "configure"
+#line 6136 "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:6152: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6147: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; 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:6182: checking for connect" >&5
+echo "configure:6177: checking for connect" >&5
 cat > conftest.$ac_ext <<EOF
-#line 6185 "configure"
+#line 6180 "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:6208: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6203: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; 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:6231: checking "$xe_msg_checking"" >&5
+echo "configure:6226: 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 6236 "configure"
+#line 6231 "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:6247: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6242: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; 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:6271: checking for remove" >&5
+echo "configure:6266: checking for remove" >&5
 cat > conftest.$ac_ext <<EOF
-#line 6274 "configure"
+#line 6269 "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:6297: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6292: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; 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:6318: checking for remove in -lposix" >&5
+echo "configure:6313: 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 6323 "configure"
+#line 6318 "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:6334: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6329: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; 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:6358: checking for shmat" >&5
+echo "configure:6353: checking for shmat" >&5
 cat > conftest.$ac_ext <<EOF
-#line 6361 "configure"
+#line 6356 "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:6384: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6379: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; 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:6405: checking for shmat in -lipc" >&5
+echo "configure:6400: 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 6410 "configure"
+#line 6405 "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:6421: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6416: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
 rm -rf conftest*
 eval "ac_cv_lib_$ac_lib_var=yes"
 else
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 #  --interran@uluru.Stanford.EDU, kb@cs.umb.edu.
 xe_msg_checking="for IceConnectionNumber in -lICE"
 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:6457: checking "$xe_msg_checking"" >&5
+echo "configure:6452: checking "$xe_msg_checking"" >&5
 ac_lib_var=`echo ICE'_'IceConnectionNumber | sed 'y%./+-%__p_%'`
 xe_check_libs=" -lICE $X_EXTRA_LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 6462 "configure"
+#line 6457 "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:6473: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6468: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
 rm -rf conftest*
 eval "ac_cv_lib_$ac_lib_var=yes"
 else
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 SRC_SUBDIR_DEPS="$SRC_SUBDIR_DEPS lwlib" &&  if test "$extra_verbose" = "yes"; then echo "    Appending \"lwlib\" to \$SRC_SUBDIR_DEPS"; fi
 ac_safe=`echo "Xm/Xm.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for Xm/Xm.h""... $ac_c" 1>&6
-echo "configure:6519: checking for Xm/Xm.h" >&5
+echo "configure:6514: checking for Xm/Xm.h" >&5
 cat > conftest.$ac_ext <<EOF
-#line 6522 "configure"
+#line 6517 "configure"
 #include "confdefs.h"
 #include <Xm/Xm.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:6527: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:6522: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 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:6544: checking for XmStringFree in -lXm" >&5
+echo "configure:6539: 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 6549 "configure"
+#line 6544 "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:6560: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6555: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; 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 for X defines extracted by xmkmf" 1>&6
-echo "configure:6712: checking for X defines extracted by xmkmf" >&5
+echo "configure:6707: 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:6761: checking for X11/Intrinsic.h" >&5
+echo "configure:6756: checking for X11/Intrinsic.h" >&5
 cat > conftest.$ac_ext <<EOF
-#line 6764 "configure"
+#line 6759 "configure"
 #include "confdefs.h"
 #include <X11/Intrinsic.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:6769: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:6764: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 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:6793: checking for XOpenDisplay in -lX11" >&5
+echo "configure:6788: 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 6798 "configure"
+#line 6793 "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:6809: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6804: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; 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:6834: checking "$xe_msg_checking"" >&5
+echo "configure:6829: 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 6839 "configure"
+#line 6834 "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:6850: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6845: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; 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:6877: checking for XShapeSelectInput in -lXext" >&5
+echo "configure:6872: 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 6882 "configure"
+#line 6877 "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:6893: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6888: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; 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 XtOpenDisplay in -lXt""... $ac_c" 1>&6
-echo "configure:6916: checking for XtOpenDisplay in -lXt" >&5
+echo "configure:6911: 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 6921 "configure"
+#line 6916 "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:6932: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6927: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; 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 $ac_n "checking the version of X11 being used""... $ac_c" 1>&6
-echo "configure:6955: checking the version of X11 being used" >&5
+echo "configure:6950: checking the version of X11 being used" >&5
 cat > conftest.$ac_ext <<EOF
-#line 6957 "configure"
+#line 6952 "configure"
 #include "confdefs.h"
 #include <X11/Intrinsic.h>
 int main(int c, char *v[]) { return c>1 ? XlibSpecificationRelease : 0; }
 EOF
-if { (eval echo configure:6962: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:6957: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
 then
 ./conftest foobar; x11_release=$?
 else
 conftest_rc="$?"
 echo "configure: failed program was:" >&5
 fi
 for ac_func in XConvertCase
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:6993: checking for $ac_func" >&5
+echo "configure:6988: checking for $ac_func" >&5
 cat > conftest.$ac_ext <<EOF
-#line 6996 "configure"
+#line 6991 "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:7019: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7014: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
 rm -rf conftest*
 eval "ac_cv_func_$ac_func=yes"
 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:7051: checking for $ac_hdr" >&5
+echo "configure:7046: checking for $ac_hdr" >&5
 cat > conftest.$ac_ext <<EOF
-#line 7054 "configure"
+#line 7049 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:7059: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7054: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
 rm -rf conftest*
 eval "ac_cv_header_$ac_safe=yes"
 else
 for ac_func in XRegisterIMInstantiateCallback
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:7092: checking for $ac_func" >&5
+echo "configure:7087: checking for $ac_func" >&5
 cat > conftest.$ac_ext <<EOF
-#line 7095 "configure"
+#line 7090 "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:7118: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7113: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; 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 for standard XRegisterIMInstantiateCallback prototype""... $ac_c" 1>&6
-echo "configure:7146: checking for standard XRegisterIMInstantiateCallback prototype" >&5
+echo "configure:7141: checking for standard XRegisterIMInstantiateCallback prototype" >&5
 cat > conftest.$ac_ext <<EOF
-#line 7148 "configure"
+#line 7143 "configure"
 #include "confdefs.h"
 #define NeedFunctionPrototypes 1
 #include <X11/Xlib.h>
 extern Bool XRegisterIMInstantiateCallback(
 int main() {
 ; return 0; }
 EOF
-if { (eval echo configure:7160: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:7155: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
 rm -rf conftest*
 echo "$ac_t""yes" 1>&6
 else
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 fi
 rm -f conftest*
 test -z "$with_xmu" && {
 echo $ac_n "checking for XmuReadBitmapDataFromFile in -lXmu""... $ac_c" 1>&6
-echo "configure:7181: checking for XmuReadBitmapDataFromFile in -lXmu" >&5
+echo "configure:7176: checking for XmuReadBitmapDataFromFile in -lXmu" >&5
 ac_lib_var=`echo Xmu'_'XmuReadBitmapDataFromFile | sed 'y%./+-%__p_%'`
 xe_check_libs=" -lXmu "
 cat > conftest.$ac_ext <<EOF
-#line 7186 "configure"
+#line 7181 "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 XmuReadBitmapDataFromFile();
 int main() {
 XmuReadBitmapDataFromFile()
 ; return 0; }
 EOF
-if { (eval echo configure:7197: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7192: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; 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 $ac_n "checking for main in -lXbsd""... $ac_c" 1>&6
-echo "configure:7236: checking for main in -lXbsd" >&5
+echo "configure:7231: 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 7241 "configure"
+#line 7236 "configure"
 #include "confdefs.h"
 int main() {
 main()
 ; return 0; }
 EOF
-if { (eval echo configure:7248: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7243: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; 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_msw" != "no"; then
 echo "checking for MS-Windows" 1>&6
-echo "configure:7285: checking for MS-Windows" >&5
+echo "configure:7280: checking for MS-Windows" >&5
 echo $ac_n "checking for main in -lgdi32""... $ac_c" 1>&6
-echo "configure:7288: checking for main in -lgdi32" >&5
+echo "configure:7283: checking for main in -lgdi32" >&5
 ac_lib_var=`echo gdi32'_'main | sed 'y%./+-%__p_%'`
 xe_check_libs=" -lgdi32 "
 cat > conftest.$ac_ext <<EOF
-#line 7293 "configure"
+#line 7288 "configure"
 #include "confdefs.h"
 int main() {
 main()
 ; return 0; }
 EOF
-if { (eval echo configure:7300: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7295: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; 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_toolbars"   != "no" && with_toolbars=msw
 test "$with_dialogs"    != "no" && with_dialogs=msw
 test "$with_widgets"    != "no" && with_widgets=msw
 fi
 cat > conftest.$ac_ext <<EOF
-#line 7351 "configure"
+#line 7346 "configure"
 #include "confdefs.h"
 #include <fcntl.h>
 int main() { return (open("/dev/windows", O_RDONLY, 0) > 0)? 0 : 1; }
 EOF
-if { (eval echo configure:7356: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:7351: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
 then
 { test "$extra_verbose" = "yes" && cat << \EOF
 Defining HAVE_MSG_SELECT
 EOF
 cat >> confdefs.h <<\EOF
 fi
 if test "$with_x11" = "yes"; then
 ac_safe=`echo "X11/extensions/shape.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for X11/extensions/shape.h""... $ac_c" 1>&6
-echo "configure:7417: checking for X11/extensions/shape.h" >&5
+echo "configure:7412: checking for X11/extensions/shape.h" >&5
 cat > conftest.$ac_ext <<EOF
-#line 7420 "configure"
+#line 7415 "configure"
 #include "confdefs.h"
 #include <X11/extensions/shape.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:7425: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7420: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
 rm -rf conftest*
 eval "ac_cv_header_$ac_safe=yes"
 else
 test "$opsys" = "hpux9"     && opsysfile="s/hpux9-x11r4.h"
 test "$opsys" = "hpux9-shr" && opsysfile="s/hpux9shxr4.h"
 esac
 echo "checking for WM_COMMAND option" 1>&6
-echo "configure:7475: checking for WM_COMMAND option" >&5;
+echo "configure:7470: checking for WM_COMMAND option" >&5;
 if test "$with_wmcommand" != "no"; then
 { test "$extra_verbose" = "yes" && cat << \EOF
 Defining HAVE_WMCOMMAND
 EOF
 cat >> confdefs.h <<\EOF
 fi
 test -z "$with_xauth" && test "$window_system" = "none" && with_xauth=no
 test -z "$with_xauth" && { ac_safe=`echo "X11/Xauth.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for X11/Xauth.h""... $ac_c" 1>&6
-echo "configure:7490: checking for X11/Xauth.h" >&5
+echo "configure:7485: checking for X11/Xauth.h" >&5
 cat > conftest.$ac_ext <<EOF
-#line 7493 "configure"
+#line 7488 "configure"
 #include "confdefs.h"
 #include <X11/Xauth.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:7498: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7493: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 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:7521: checking for XauGetAuthByAddr in -lXau" >&5
+echo "configure:7516: 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 7526 "configure"
+#line 7521 "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:7537: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7532: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; 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 -n "$xemacs_compiler" && XEMACS_CC="$xemacs_compiler"
 : ${XEMACS_CC:="$CC"}
+if test "$with_modules" != "no"; then
+echo "checking for module support" 1>&6
+echo "configure:7579: checking for module support" >&5
+if test "$with_msw" = "yes"; then
+have_dl=yes;
+else
+case "$opsys" in
+darwin ) have_dl=yes; { test "$extra_verbose" = "yes" && cat << \EOF
+Defining HAVE_DYLD
+EOF
+cat >> confdefs.h <<\EOF
+#define HAVE_DYLD 1
+EOF
+}
+;;
+* )
+ac_safe=`echo "dlfcn.h" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for dlfcn.h""... $ac_c" 1>&6
+echo "configure:7596: checking for dlfcn.h" >&5
+cat > conftest.$ac_ext <<EOF
+#line 7599 "configure"
+#include "confdefs.h"
+#include <dlfcn.h>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:7604: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+if test -z "$ac_err"; then
+rm -rf conftest*
+eval "ac_cv_header_$ac_safe=yes"
+else
+echo "$ac_err" >&5
+echo "configure: failed program was:" >&5
+cat conftest.$ac_ext >&5
+rm -rf conftest*
+eval "ac_cv_header_$ac_safe=no"
+fi
+rm -f conftest*
+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+echo "$ac_t""yes" 1>&6
+	echo $ac_n "checking for dlopen in -lc""... $ac_c" 1>&6
+echo "configure:7621: checking for dlopen in -lc" >&5
+	cat > conftest.$ac_ext <<EOF
+#line 7623 "configure"
+#include "confdefs.h"
+#include <dlfcn.h>
+int main() {
+	  dlopen ("", 0);
+; return 0; }
+EOF
+if { (eval echo configure:7630: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+rm -rf conftest*
+have_dl=yes
+else
+echo "configure: failed program was:" >&5
+cat conftest.$ac_ext >&5
+rm -rf conftest*
+	  echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
+echo "configure:7639: checking for dlopen in -ldl" >&5
+	ac_save_LIBS="$LIBS"
+	LIBS="-ldl $LIBS"
+	cat > conftest.$ac_ext <<EOF
+#line 7643 "configure"
+#include "confdefs.h"
+#include <dlfcn.h>
+int main() {
+	  dlopen ("", 0);
+; return 0; }
+EOF
+if { (eval echo configure:7650: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+rm -rf conftest*
+have_dl=yes
+else
+echo "configure: failed program was:" >&5
+cat conftest.$ac_ext >&5
+rm -rf conftest*
+LIBS="$ac_save_LIBS"
+fi
+rm -f conftest*
+	ac_save_LIBS=
+fi
+rm -f conftest*
+else
+echo "$ac_t""no" 1>&6
+fi
+if test -n "$have_dl"; then
+	{ test "$extra_verbose" = "yes" && cat << \EOF
+Defining HAVE_DLOPEN
+EOF
+cat >> confdefs.h <<\EOF
+#define HAVE_DLOPEN 1
+EOF
+}
+else
+echo $ac_n "checking for shl_load in -ldld""... $ac_c" 1>&6
+echo "configure:7679: checking for shl_load in -ldld" >&5
+ac_lib_var=`echo dld'_'shl_load | sed 'y%./+-%__p_%'`
+xe_check_libs=" -ldld "
+cat > conftest.$ac_ext <<EOF
+#line 7684 "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 shl_load();
+int main() {
+shl_load()
+; return 0; }
+EOF
+if { (eval echo configure:7695: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+rm -rf conftest*
+eval "ac_cv_lib_$ac_lib_var=yes"
+else
+echo "configure: failed program was:" >&5
+cat conftest.$ac_ext >&5
+rm -rf conftest*
+eval "ac_cv_lib_$ac_lib_var=no"
+fi
+rm -f conftest*
+xe_check_libs=""
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes" ; then
+echo "$ac_t""yes" 1>&6
+libdl=dld have_dl=yes;
+	  { test "$extra_verbose" = "yes" && cat << \EOF
+Defining HAVE_SHL_LOAD
+EOF
+cat >> confdefs.h <<\EOF
+#define HAVE_SHL_LOAD 1
+EOF
+}
+else
+echo "$ac_t""no" 1>&6
+echo $ac_n "checking for dld_init in -ldld""... $ac_c" 1>&6
+echo "configure:7722: checking for dld_init in -ldld" >&5
+ac_lib_var=`echo dld'_'dld_init | sed 'y%./+-%__p_%'`
+xe_check_libs=" -ldld "
+cat > conftest.$ac_ext <<EOF
+#line 7727 "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 dld_init();
+int main() {
+dld_init()
+; return 0; }
+EOF
+if { (eval echo configure:7738: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+rm -rf conftest*
+eval "ac_cv_lib_$ac_lib_var=yes"
+else
+echo "configure: failed program was:" >&5
+cat conftest.$ac_ext >&5
+rm -rf conftest*
+eval "ac_cv_lib_$ac_lib_var=no"
+fi
+rm -f conftest*
+xe_check_libs=""
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes" ; then
+echo "$ac_t""yes" 1>&6
+libdl=dld have_dl=yes;
+	  { test "$extra_verbose" = "yes" && cat << \EOF
+Defining HAVE_DLD_INIT
+EOF
+cat >> confdefs.h <<\EOF
+#define HAVE_DLD_INIT 1
+EOF
+}
+else
+echo "$ac_t""no" 1>&6
+fi
+fi
+fi
+esac   fi
+if test -n "$have_dl"; then
+dll_ld=
+dll_ldflags=
+dll_cflags=
+dll_post=
+dll_ldo="-o"
+ld_dynamic_link_flags=
+xehost=$canonical
+xealias=$internal_configuration
+echo "checking how to build dynamic libraries for ${xehost}" 1>&6
+echo "configure:7783: checking how to build dynamic libraries for ${xehost}" >&5
+# Transform *-*-linux* to *-*-linux-gnu*, to support old configure scripts.
+case "$xehost" in
+*-*-linux-gnu*) ;;
+*-*-linux*) xehost=`echo $xehost | sed 's/^\(.*-.*-linux\)\(.*\)$/\1-gnu\2/'`
+esac
+xehost_cpu=`echo $xehost | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+xehost_vendor=`echo $xehost | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
+xehost_os=`echo $xehost | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
+case "$xehost_os" in
+aix3*)
+# AIX sometimes has problems with the GCC collect2 program.  For some
+# reason, if we set the COLLECT_NAMES environment variable, the problems
+# vanish in a puff of smoke.
+if test "${COLLECT_NAMES+set}" != set; then
+COLLECT_NAMES=
+export COLLECT_NAMES
+fi
+;;
+esac
+# Now see if the compiler is really GCC.
+if test "$GCC" = "yes"; then
+XEGCC=yes
+else
+echo $ac_n "checking checking whether we are using GNU C""... $ac_c" 1>&6
+echo "configure:7811: checking checking whether we are using GNU C" >&5
+cat > conftest.$ac_ext <<EOF
+#line 7813 "configure"
+#include "confdefs.h"
+#ifdef __GNUC__
+yes;
+#endif
+EOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+egrep "yes" >/dev/null 2>&1; then
+rm -rf conftest*
+XEGCC=yes
+else
+rm -rf conftest*
+XEGCC=no
+fi
+rm -f conftest*
+echo "$ac_t""${XEGCC}" 1>&6
+fi
+echo $ac_n "checking how to produce PIC code""... $ac_c" 1>&6
+echo "configure:7835: checking how to produce PIC code" >&5
+wl=
+can_build_shared=yes
+cygwin_warn=
+if test "$XEGCC" = yes; then
+wl='-Wl,'
+case "$xehost_os" in
+aix[3-9]* | irix[5-9]* | osf[3-9])
+# PIC is the default for these OSes.
+;;
+os2*)
+# We can build DLLs from non-PIC.
+;;
+amigaos*)
+# FIXME: we need at least 68020 code to build shared libraries, but
+# adding the `-m68020' flag to GCC prevents building anything better,
+# like `-m68040'.
+dll_cflags='-m68020 -resident32 -malways-restore-a4'
+;;
+*cygwin* | *mingw* )
+# PIC is the default
+cygwin_warn=yes
+# #### Need some trickery involving import libraries that we don't
+# currently support.
+can_build_shared=no
+;;
+*)
+dll_cflags='-fPIC'
+;;
+esac
+else
+# PORTME Check for PIC flags for the system compiler.
+case "$xehost_os" in
+hpux9* | hpux1[0-9]*)
+# Is there a better link_static_flag that works with the bundled CC?
+wl='-Wl,'
+dll_cflags='+Z'
+;;
+irix[5-9]*)
+wl='-Wl,'
+# PIC (with -KPIC) is the default.
+;;
+os2*)
+# We can build DLLs from non-PIC.
+;;
+osf[3-9]*)
+# All OSF/1 code is PIC.
+wl='-Wl,'
+;;
+aix[3-9]*)
+# All AIX code is PIC.
+wl='-Wl,'
+;;
+sco3.2v5*)
+dll_cflags='-belf -Kpic'
+wl='-Wl,'
+;;
+unixware*)
+dll_cflags="-KPIC"
+wl="-Wl,"
+;;
+sysv4*)
+dll_cflags="-KPIC"
+wl="-Wl,"
+;;
+sysv5*)
+dll_cflags="-KPIC"
+wl="-Wl,"
+;;
+solaris2*)
+dll_cflags='-KPIC'
+wl='-Wl,'
+;;
+sunos4*)
+dll_cflags='-PIC'
+wl='-Qoption ld '
+;;
+uts4*)
+dll_cflags='-pic'
+;;
+*)
+can_build_shared=no
+;;
+esac
+fi
+if test -n "$dll_cflags"; then
+echo "$ac_t""${dll_cflags}" 1>&6
+# Check to make sure the dll_cflags actually works.
+echo $ac_n "checking if PIC flag ${dll_cflags} really works""... $ac_c" 1>&6
+echo "configure:7941: checking if PIC flag ${dll_cflags} really works" >&5
+save_CFLAGS="$CFLAGS"
+CFLAGS="$CFLAGS $dll_cflags -DPIC"
+cat > conftest.$ac_ext <<EOF
+#line 7945 "configure"
+#include "confdefs.h"
+int main() {
+int x=0;
+; return 0; }
+EOF
+if { (eval echo configure:7952: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+rm -rf conftest*
+# On HP-UX, the stripped-down bundled CC doesn't accept +Z, but also
+# reports no error.  So, we need to grep stderr for (Bundled).
+if grep '(Bundled)' config.log >/dev/null; then
+echo "$ac_t""no" 1>&6
+can_build_shared=no
+dll_cflags=
+else
+echo "$ac_t""yes" 1>&6
+fi
+else
+echo "configure: failed program was:" >&5
+cat conftest.$ac_ext >&5
+rm -rf conftest*
+echo "$ac_t""no" 1>&6
+can_build_shared=no
+dll_cflags=
+fi
+rm -f conftest*
+CFLAGS="$save_CFLAGS"
+else
+echo "$ac_t""none" 1>&6
+fi
+if test -n "$cygwin_warn"; then
+echo "configure: warning: Cannot currently build modules under Cygwin." 1>&2
+fi
+if test "$can_build_shared" = "yes"; then
+cc_produces_so=no
+xldf=
+xcldf=
+echo $ac_n "checking if C compiler can produce shared libraries""... $ac_c" 1>&6
+echo "configure:7987: checking if C compiler can produce shared libraries" >&5
+if test "$XEGCC" = yes; then
+xcldf="-shared"
+xldf="-shared"
+else # Not using GCC
+case "$xehost_os" in
+aix[3-9]*)
+xldf="-bE:ELLSONAME.exp -H512 -T512 -bhalt:4 -bM:SRE -bnoentry -lc"
+xcldf="${wl}-bE:ELLSONAME.exp ${wl}-H512 ${wl}-T512 ${wl}-bhalt:4 ${wl}-bM:SRE ${wl}-bnoentry ${wl}-lc"
+;;
+freebsd2* | netbsd* | openbsd*)
+xldf="-Bshareable"
+xcldf="${wl}-Bshareable"
+;;
+freebsd3*)
+xcldf="-shared"
+;;
+hpux*)
+xldf="-b +s"
+xcldf="${wl}-b ${wl}+s"
+;;
+irix[5-9]* | osf[3-9]*)
+xcldf="${wl}-shared"
+xldf="-shared"
+;;
+sco3.2v5* | unixware* | sysv5* | sysv4* | solaris2* | solaris7* | uts4*)
+xcldf="-G"
+xldf="-G"
+;;
+sunos4*)
+xcldf="${wl}-assert ${wl}pure-text ${wl}-Bstatic"
+xldf="-assert pure-text -Bstatic"
+;;
+esac
+fi # End if if we are using gcc
+if test -n "$xcldf"; then
+save_LDFLAGS=$LDFLAGS
+save_LIBS=$LIBS
+save_xe_libs=$xe_libs
+LDFLAGS="$xcldf $LDFLAGS"
+LIBS=
+xe_libs=
+ac_link='${CC-cc} -o conftest $CFLAGS '"$xe_cppflags $xe_ldflags"' conftest.$ac_ext '"$xe_libs"' 1>&5'
+cat > conftest.$ac_ext <<EOF
+#line 8038 "configure"
+#include "confdefs.h"
+int main() {
+int x=0;
+; return 0; }
+EOF
+if { (eval echo configure:8045: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+rm -rf conftest*
+cc_produces_so=yes
+else
+echo "configure: failed program was:" >&5
+cat conftest.$ac_ext >&5
+rm -rf conftest*
+cc_produces_so=no
+fi
+rm -f conftest*
+LDFLAGS=$save_LDFLAGS
+LIBS=$save_LIBS
+xe_libs=$save_xe_libs
+ac_link='${CC-cc} -o conftest $CFLAGS '"$xe_cppflags $xe_ldflags"' conftest.$ac_ext '"$xe_libs"' 1>&5'
+else
+cc_produces_so=no
+fi
+echo "$ac_t""${cc_produces_so}" 1>&6
+LTLD=$LD
+if test -z "$LTLD"; then
+ac_prog=ld
+if test "$XEGCC" = yes; then
+# Check if gcc -print-prog-name=ld gives a path.
+echo $ac_n "checking for ld used by GCC""... $ac_c" 1>&6
+echo "configure:8070: checking for ld used by GCC" >&5
+ac_prog=`($CC -print-prog-name=ld) 2>&5`
+case "$ac_prog" in
+# Accept absolute paths.
+/*)
+if test -z "$LTLD"; then
+#        case "$ac_prog" in
+#          *gcc-lib*) LTLD="$CC"
+#                     ;;
+#          *)
+LTLD="$ac_prog"
+#                     ;;
+#        esac
+fi
+;;
+"")
+# If it fails, then pretend we aren't using GCC.
+ac_prog=ld
+;;
+*)
+# If it is relative, then search for the first ld in PATH.
+with_gnu_ld=unknown
+;;
+esac
+else
+echo $ac_n "checking for GNU ld""... $ac_c" 1>&6
+echo "configure:8096: checking for GNU ld" >&5
+fi
+if test -z "$LTLD"; then
+IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
+for ac_dir in $PATH; do
+test -z "$ac_dir" && ac_dir=.
+if test -f "$ac_dir/$ac_prog"; then
+LTLD="$ac_dir/$ac_prog"
+# Check to see if the program is GNU ld.  I'd rather use --version,
+# but apparently some GNU ld's only accept -v.
+# Break only if it was the GNU/non-GNU ld that we prefer.
+if "$LTLD" -v 2>&1 < /dev/null | egrep '(GNU|with BFD)' > /dev/null; then
+xe_gnu_ld=yes
+else
+xe_gnu_ld=no
+fi
+fi
+done
+IFS="$ac_save_ifs"
+fi
+if test -n "$LTLD"; then
+echo "$ac_t""${LTLD}" 1>&6
+else
+echo "$ac_t""no" 1>&6
+fi
+if test -z "$LTLD" -a "$cc_produces_so" = no; then
+{ echo "configure: error: no acceptable linker found in \$PATH" 1>&2; exit 1; }
+exit 1
+fi
+fi
+ld_dynamic_link_flags=
+# Check to see if it really is or isn't GNU ld.
+echo $ac_n "checking if the linker is GNU ld""... $ac_c" 1>&6
+echo "configure:8134: checking if the linker is GNU ld" >&5
+# I'd rather use --version here, but apparently some GNU ld's only accept -v.
+if $LTLD -v 2>&1 </dev/null | egrep '(GNU|with BFD)' 1>&5; then
+xe_gnu_ld=yes
+else
+xe_gnu_ld=no
+fi
+echo "$ac_t""${xe_gnu_ld}" 1>&6
+case "$xehost_os" in
+amigaos* | sunos4*)
+# On these operating systems, we should treat GNU ld like the system ld.
+gnu_ld_acts_native=yes
+;;
+*)
+gnu_ld_acts_native=no
+;;
+esac
+if test "$cc_produces_so" = "yes"; then
+dll_ld=$CC
+dll_ldflags=$xcldf
+can_build_shared=yes
+ld_shlibs=yes
+else
+# OK - only NOW do we futz about with ld.
+# See if the linker supports building shared libraries.
+echo $ac_n "checking whether the linker supports shared libraries""... $ac_c" 1>&6
+echo "configure:8162: checking whether the linker supports shared libraries" >&5
+dll_ld=$CC
+dll_ldflags=$LDFLAGS
+ld_shlibs=yes
+can_build_shared=yes
+if test "$xe_gnu_ld" = yes && test "$gnu_ld_acts_native" != yes; then
+# See if GNU ld supports shared libraries.
+if $LTLD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then
+dll_ld=$CC
+dll_ldflags="-shared"
+ld_shlibs=yes
+else
+ld_shlibs=no
+fi
+else
+# PORTME fill in a description of your system's linker (not GNU ld)
+case "$xehost_os" in
+aix3*)
+dll_ld=$LTLD
+dll_ldflags=$xldf
+;;
+aix[4-9]*)
+dll_ldflags=$xcldf
+;;
+# FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
+# support.  Future versions do this automatically, but an explicit c++rt0.o
+# doesn't break anything, and helps significantly (at the cost of a little
+# extra space).
+freebsd2.2*)
+dll_ld=$LTLD
+dll_ldflags=$xldf
+dll_post="/usr/lib/c++rt0.o"
+;;
+# Unfortunately, older versions of FreeBSD 2 don't have this feature.
+freebsd2*)
+dll_ld=$LTLD
+dll_ldflags="-Bshareable"
+;;
+# FreeBSD 3, at last, uses gcc -shared to do shared libraries.
+freebsd3*)
+dll_ldflags="-shared"
+;;
+hpux*)
+dll_ld=$LTLD
+dll_ldflags=$xldf
+;;
+irix[5-9]*)
+dll_ld=$LTLD
+dll_ldflags=$xldf
+;;
+netbsd*)
+# Tested with NetBSD 1.2 ld
+dll_ld=$LTLD
+dll_ldflags=$xldf
+;;
+openbsd*)
+dll_ld=$LTLD
+dll_ldflags=$xldf
+;;
+osf3* | osf4*)
+dll_ld=$LTLD
+dll_ldflags=$xldf
+;;
+# For both SCO and Solaris we MAY want to have LDFLAGS include -z text
+sco3.2v5* | unixware* | sysv5* | sysv4* | solaris2* | solaris7*)
+dll_ld=$LTLD
+case "$dll_ld" in
+*gcc*) dll_ldflags="-shared"
+dll_ld=$CC
+;;
+*)     dll_ldflags="-G"
+;;
+esac
+;;
+sunos4*)
+if test "$XEGCC" = yes; then
+dll_ld=$CC
+else
+dll_ld=$LTLD
+fi
+dll_ldflags=$xldf
+;;
+uts4*)
+dll_ld=$LTLD
+dll_ldflags="-G"
+;;
+bsdi*)
+dll_ldflags="-r"
+dll_ld="shlicc2"
+;;
+*)
+ld_shlibs=no
+can_build_shared=no
+;;
+esac
+fi
+echo "$ac_t""${ld_shlibs}" 1>&6
+if test "$ld_shlibs" = "no"; then
+can_build_shared=no
+fi
+fi # End of if cc_produces_so = no
+if test "$xe_gnu_ld" = yes; then
+if test "$ld_shlibs" = yes; then
+ld_dynamic_link_flags="${wl}-export-dynamic"
+fi
+fi
+if test -z "$ld_dynamic_link_flags"; then
+case "$xehost_os" in
+aix[3-9]*)
+ld_dynamic_link_flags=
+;;
+freebsd2.2*)
+ld_dynamic_link_flags=
+;;
+freebsd2*)
+ld_dynamic_link_flags=
+;;
+freebsd3*)
+ld_dynamic_link_flags=
+;;
+hpux*)
+ld_dynamic_link_flags="${wl}-E"
+;;
+irix[5-9]*)
+ld_dynamic_link_flags=
+;;
+netbsd*)
+ld_dynamic_link_flags=
+;;
+openbsd*)
+ld_dynamic_link_flags=
+;;
+osf3* | osf4*)
+ld_dynamic_link_flags=
+;;
+solaris2* | solaris7*)
+ld_dynamic_link_flags=
+;;
+sco3.2v5* | unixware* | sysv5* | sysv4*)
+ld_dynamic_link_flags="${wl}-Bexport"
+;;
+sunos4*)
+ld_dynamic_link_flags=
+;;
+uts4*)
+ld_dynamic_link_flags=
+;;
+bsdi*)
+ld_dynamic_link_flags=
+;;
+esac
+fi # End of if -z ld_dynamic_link_flags
+fi # End of if test "$can_build_shared" = "yes"
+fi
+if test "$can_build_shared" = "yes"; then
+{ test "$extra_verbose" = "yes" && cat << \EOF
+Defining HAVE_SHLIB
+EOF
+cat >> confdefs.h <<\EOF
+#define HAVE_SHLIB 1
+EOF
+}
+INSTALL_ARCH_DEP_SUBDIR="$INSTALL_ARCH_DEP_SUBDIR src" &&  if test "$extra_verbose" = "yes"; then echo "    Appending \"src\" to \$INSTALL_ARCH_DEP_SUBDIR"; fi
+test -n "$libdl" && LIBS="-l${libdl} $LIBS" &&  if test "$extra_verbose" = "yes"; then echo "    Prepending \"-l${libdl}\" to \$LIBS"; fi
+for ac_func in dlerror _dlerror
+do
+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+echo "configure:8370: checking for $ac_func" >&5
+cat > conftest.$ac_ext <<EOF
+#line 8373 "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.  */
+/* We use char because int might match the return type of a gcc2
+builtin and then its argument prototype would still apply.  */
+char $ac_func();
+int main() {
+/* The GNU C library defines this for functions which it implements
+to always fail with ENOSYS.  Some functions are actually named
+something starting with __ and the normal name is an alias.  */
+#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
+choke me
+#else
+$ac_func();
+#endif
+; return 0; }
+EOF
+if { (eval echo configure:8396: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+rm -rf conftest*
+eval "ac_cv_func_$ac_func=yes"
+else
+echo "configure: failed program was:" >&5
+cat conftest.$ac_ext >&5
+rm -rf conftest*
+eval "ac_cv_func_$ac_func=no"
+fi
+rm -f conftest*
+if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
+echo "$ac_t""yes" 1>&6
+ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
+{ test "$extra_verbose" = "yes" && cat << EOF
+Defining $ac_tr_func
+EOF
+cat >> confdefs.h <<EOF
+#define $ac_tr_func 1
+EOF
+}
+else
+echo "$ac_t""no" 1>&6
+fi
+done
+with_modules=yes
+MOD_CC="../../lib-src/ellcc"
+MODCFLAGS="\$(CFLAGS) --mode=compile --mod-output=\$@ -I../../src -I\$(srcdir)/../../src"
+INSTALLPATH="\$(moduledir)"
+MOD_INSTALL_PROGRAM=${INSTALL_PROGRAM}
+OBJECT_TO_BUILD="\$(MODNAME).ell"
+else
+if test "$with_modules" = "yes"; then
+{ echo "Error:" "Required module support cannot be provided." >&2; exit 1; }
+else
+echo "    No module support."
+fi
+with_modules=no
+MOD_CC="$XEMACS_CC"
+MODCFLAGS="\$(CFLAGS) -I../../src -I\$(srcdir)/../../src"
+INSTALLPATH=""
+MOD_INSTALL_PROGRAM="true"
+OBJECT_TO_BUILD="\$(MODNAME).o"
+fi
+fi
+MODARCHDIR=
+MAKE_DOCFILE="../../lib-src/make-docfile"
 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:7587: checking for ${dir}tt_c.h" >&5
+echo "configure:8458: checking for ${dir}tt_c.h" >&5
 cat > conftest.$ac_ext <<EOF
-#line 7590 "configure"
+#line 8461 "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:7595: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8466: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 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:7631: checking "$xe_msg_checking"" >&5
+echo "configure:8502: 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 7636 "configure"
+#line 8507 "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:7647: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8518: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; 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="$tt_libs $libs_x" &&  if test "$extra_verbose" = "yes"; then echo "    Prepending \"$tt_libs\" to \$libs_x"; 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:7701: checking for Dt/Dt.h" >&5
+echo "configure:8572: checking for Dt/Dt.h" >&5
 cat > conftest.$ac_ext <<EOF
-#line 7704 "configure"
+#line 8575 "configure"
 #include "confdefs.h"
 #include <Dt/Dt.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:7709: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8580: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 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:7732: checking for DtDndDragStart in -lDtSvc" >&5
+echo "configure:8603: 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 7737 "configure"
+#line 8608 "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:7748: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8619: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
 rm -rf conftest*
 eval "ac_cv_lib_$ac_lib_var=yes"
 else
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 dragndrop_proto="$dragndrop_proto GTK" &&  if test "$extra_verbose" = "yes"; then echo "    Appending \"GTK\" to \$dragndrop_proto"; fi
 fi
 if test "$with_dragndrop" != "no" ; then
 echo $ac_n "checking if drag and drop API is needed""... $ac_c" 1>&6
-echo "configure:7829: checking if drag and drop API is needed" >&5
+echo "configure:8700: checking if drag and drop API is needed" >&5
 if test -n "$dragndrop_proto" ; then
 with_dragndrop=yes
 echo "$ac_t""yes (${dragndrop_proto} )" 1>&6
 { test "$extra_verbose" = "yes" && cat << \EOF
 Defining HAVE_DRAGNDROP
 with_dragndrop=no
 echo "$ac_t""no" 1>&6
 fi
 fi
+echo "checking for LDAP" 1>&6
+echo "configure:8720: checking for LDAP" >&5
+ldap_libs=
+test -z "$with_ldap" && { ac_safe=`echo "ldap.h" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for ldap.h""... $ac_c" 1>&6
+echo "configure:8724: checking for ldap.h" >&5
+cat > conftest.$ac_ext <<EOF
+#line 8727 "configure"
+#include "confdefs.h"
+#include <ldap.h>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:8732: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+if test -z "$ac_err"; then
+rm -rf conftest*
+eval "ac_cv_header_$ac_safe=yes"
+else
+echo "$ac_err" >&5
+echo "configure: failed program was:" >&5
+cat conftest.$ac_ext >&5
+rm -rf conftest*
+eval "ac_cv_header_$ac_safe=no"
+fi
+rm -f conftest*
+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+echo "$ac_t""yes" 1>&6
+:
+else
+echo "$ac_t""no" 1>&6
+with_ldap=no
+fi
+}
+test -z "$with_ldap" && { ac_safe=`echo "lber.h" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for lber.h""... $ac_c" 1>&6
+echo "configure:8755: checking for lber.h" >&5
+cat > conftest.$ac_ext <<EOF
+#line 8758 "configure"
+#include "confdefs.h"
+#include <lber.h>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:8763: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+if test -z "$ac_err"; then
+rm -rf conftest*
+eval "ac_cv_header_$ac_safe=yes"
+else
+echo "$ac_err" >&5
+echo "configure: failed program was:" >&5
+cat conftest.$ac_ext >&5
+rm -rf conftest*
+eval "ac_cv_header_$ac_safe=no"
+fi
+rm -f conftest*
+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+echo "$ac_t""yes" 1>&6
+:
+else
+echo "$ac_t""no" 1>&6
+with_ldap=no
+fi
+}
+if test "$with_ldap" != "no"; then
+echo $ac_n "checking for ldap_search in -lldap""... $ac_c" 1>&6
+echo "configure:8787: checking for ldap_search in -lldap" >&5
+ac_lib_var=`echo ldap'_'ldap_search | sed 'y%./+-%__p_%'`
+xe_check_libs=" -lldap "
+cat > conftest.$ac_ext <<EOF
+#line 8792 "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 ldap_search();
+int main() {
+ldap_search()
+; return 0; }
+EOF
+if { (eval echo configure:8803: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+rm -rf conftest*
+eval "ac_cv_lib_$ac_lib_var=yes"
+else
+echo "configure: failed program was:" >&5
+cat conftest.$ac_ext >&5
+rm -rf conftest*
+eval "ac_cv_lib_$ac_lib_var=no"
+fi
+rm -f conftest*
+xe_check_libs=""
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes" ; then
+echo "$ac_t""yes" 1>&6
+with_ldap_nolber=yes
+else
+echo "$ac_t""no" 1>&6
+with_ldap_nolber=no
+fi
+test "$with_ldap_nolber" = "no" && {
+xe_msg_checking="for ldap_open in -lldap"
+test -n "-llber" && xe_msg_checking="$xe_msg_checking using extra libs -llber"
+echo $ac_n "checking "$xe_msg_checking"""... $ac_c" 1>&6
+echo "configure:8828: checking "$xe_msg_checking"" >&5
+ac_lib_var=`echo ldap'_'ldap_open | sed 'y%./+-%__p_%'`
+xe_check_libs=" -lldap -llber"
+cat > conftest.$ac_ext <<EOF
+#line 8833 "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 ldap_open();
+int main() {
+ldap_open()
+; return 0; }
+EOF
+if { (eval echo configure:8844: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+rm -rf conftest*
+eval "ac_cv_lib_$ac_lib_var=yes"
+else
+echo "configure: failed program was:" >&5
+cat conftest.$ac_ext >&5
+rm -rf conftest*
+eval "ac_cv_lib_$ac_lib_var=no"
+fi
+rm -f conftest*
+xe_check_libs=""
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes" ; then
+echo "$ac_t""yes" 1>&6
+with_ldap_lber=yes
+else
+echo "$ac_t""no" 1>&6
+with_ldap_lber=no
+fi
+}
+test "$with_ldap_nolber" = "no" -a "$with_ldap_lber" = "no" && {
+xe_msg_checking="for ldap_open in -lldap"
+test -n "-llber -lkrb" && xe_msg_checking="$xe_msg_checking using extra libs -llber -lkrb"
+echo $ac_n "checking "$xe_msg_checking"""... $ac_c" 1>&6
+echo "configure:8869: checking "$xe_msg_checking"" >&5
+ac_lib_var=`echo ldap'_'ldap_open | sed 'y%./+-%__p_%'`
+xe_check_libs=" -lldap -llber -lkrb"
+cat > conftest.$ac_ext <<EOF
+#line 8874 "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 ldap_open();
+int main() {
+ldap_open()
+; return 0; }
+EOF
+if { (eval echo configure:8885: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+rm -rf conftest*
+eval "ac_cv_lib_$ac_lib_var=yes"
+else
+echo "configure: failed program was:" >&5
+cat conftest.$ac_ext >&5
+rm -rf conftest*
+eval "ac_cv_lib_$ac_lib_var=no"
+fi
+rm -f conftest*
+xe_check_libs=""
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes" ; then
+echo "$ac_t""yes" 1>&6
+with_ldap_krb=yes
+else
+echo "$ac_t""no" 1>&6
+with_ldap_krb=no
+fi
+}
+test "$with_ldap_nolber" = "no" -a "$with_ldap_lber" = "no" -a "$with_ldap_krb" = "no" && {
+xe_msg_checking="for ldap_open in -lldap"
+test -n "-llber -lkrb -ldes" && xe_msg_checking="$xe_msg_checking using extra libs -llber -lkrb -ldes"
+echo $ac_n "checking "$xe_msg_checking"""... $ac_c" 1>&6
+echo "configure:8910: checking "$xe_msg_checking"" >&5
+ac_lib_var=`echo ldap'_'ldap_open | sed 'y%./+-%__p_%'`
+xe_check_libs=" -lldap -llber -lkrb -ldes"
+cat > conftest.$ac_ext <<EOF
+#line 8915 "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 ldap_open();
+int main() {
+ldap_open()
+; return 0; }
+EOF
+if { (eval echo configure:8926: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+rm -rf conftest*
+eval "ac_cv_lib_$ac_lib_var=yes"
+else
+echo "configure: failed program was:" >&5
+cat conftest.$ac_ext >&5
+rm -rf conftest*
+eval "ac_cv_lib_$ac_lib_var=no"
+fi
+rm -f conftest*
+xe_check_libs=""
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes" ; then
+echo "$ac_t""yes" 1>&6
+with_ldap_krbdes=yes
+else
+echo "$ac_t""no" 1>&6
+with_ldap_krbdes=no
+fi
+}
+test -z "$with_ldap" -a \( "$with_ldap_lber" = "yes" -o "$with_ldap_nolber" = "yes" -o "$with_ldap_krb" = "yes" -o "$with_ldap_krbdes" = "yes" \) && with_ldap=yes
+fi
+if test "$with_ldap" = "yes"; then
+{ test "$extra_verbose" = "yes" && cat << \EOF
+Defining HAVE_LDAP
+EOF
+cat >> confdefs.h <<\EOF
+#define HAVE_LDAP 1
+EOF
+}
+if test "$with_ldap_nolber" = "yes" ; then
+ldap_libs="-lldap $ldap_libs" &&  if test "$extra_verbose" = "yes"; then echo "    Prepending \"-lldap\" to \$ldap_libs"; fi
+else
+if test "$with_ldap_krb" = "yes" ; then
+ldap_libs="-lkrb $ldap_libs" &&  if test "$extra_verbose" = "yes"; then echo "    Prepending \"-lkrb\" to \$ldap_libs"; fi
+fi
+if test "$with_ldap_krbdes" = "yes" ; then
+ldap_libs="-ldes $ldap_libs" &&  if test "$extra_verbose" = "yes"; then echo "    Prepending \"-ldes\" to \$ldap_libs"; fi
+ldap_libs="-lkrb $ldap_libs" &&  if test "$extra_verbose" = "yes"; then echo "    Prepending \"-lkrb\" to \$ldap_libs"; fi
+fi
+ldap_libs="-llber $ldap_libs" &&  if test "$extra_verbose" = "yes"; then echo "    Prepending \"-llber\" to \$ldap_libs"; fi
+ldap_libs="-lldap $ldap_libs" &&  if test "$extra_verbose" = "yes"; then echo "    Prepending \"-lldap\" to \$ldap_libs"; fi
+fi
+save_LIBS="$LIBS" LIBS="$LIBS $ldap_libs"
+for ac_func in ldap_set_option ldap_get_lderrno ldap_result2error ldap_parse_result
+do
+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+echo "configure:8975: checking for $ac_func" >&5
+cat > conftest.$ac_ext <<EOF
+#line 8978 "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.  */
+/* We use char because int might match the return type of a gcc2
+builtin and then its argument prototype would still apply.  */
+char $ac_func();
+int main() {
+/* The GNU C library defines this for functions which it implements
+to always fail with ENOSYS.  Some functions are actually named
+something starting with __ and the normal name is an alias.  */
+#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
+choke me
+#else
+$ac_func();
+#endif
+; return 0; }
+EOF
+if { (eval echo configure:9001: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+rm -rf conftest*
+eval "ac_cv_func_$ac_func=yes"
+else
+echo "configure: failed program was:" >&5
+cat conftest.$ac_ext >&5
+rm -rf conftest*
+eval "ac_cv_func_$ac_func=no"
+fi
+rm -f conftest*
+if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
+echo "$ac_t""yes" 1>&6
+ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
+{ test "$extra_verbose" = "yes" && cat << EOF
+Defining $ac_tr_func
+EOF
+cat >> confdefs.h <<EOF
+#define $ac_tr_func 1
+EOF
+}
+else
+echo "$ac_t""no" 1>&6
+fi
+done
+LIBS="$save_LIBS"
+MAKE_SUBDIR="$MAKE_SUBDIR modules/ldap" &&  if test "$extra_verbose" = "yes"; then echo "    Appending \"modules/ldap\" to \$MAKE_SUBDIR"; fi
+need_modules_common=yes
+if test "$with_modules" = "yes"; then
+INSTALL_ARCH_DEP_SUBDIR="$INSTALL_ARCH_DEP_SUBDIR modules/ldap" &&  if test "$extra_verbose" = "yes"; then echo "    Appending \"modules/ldap\" to \$INSTALL_ARCH_DEP_SUBDIR"; fi
+fi
+fi
+postgresql_libs=
+if test "$with_postgresql" != "no"; then
+echo "checking for PostgreSQL" 1>&6
+echo "configure:9040: checking for PostgreSQL" >&5
+for header_dir in "" "pgsql/" "postgresql/"; do
+ac_safe=`echo "${header_dir}libpq-fe.h" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for ${header_dir}libpq-fe.h""... $ac_c" 1>&6
+echo "configure:9045: checking for ${header_dir}libpq-fe.h" >&5
+cat > conftest.$ac_ext <<EOF
+#line 9048 "configure"
+#include "confdefs.h"
+#include <${header_dir}libpq-fe.h>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:9053: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+if test -z "$ac_err"; then
+rm -rf conftest*
+eval "ac_cv_header_$ac_safe=yes"
+else
+echo "$ac_err" >&5
+echo "configure: failed program was:" >&5
+cat conftest.$ac_ext >&5
+rm -rf conftest*
+eval "ac_cv_header_$ac_safe=no"
+fi
+rm -f conftest*
+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+echo "$ac_t""yes" 1>&6
+libpq_fe_h_file=${header_dir}libpq-fe.h; break
+else
+echo "$ac_t""no" 1>&6
+fi
+done
+test -n "$libpq_fe_h_file" && {
+echo $ac_n "checking for PQconnectdb in -lpq""... $ac_c" 1>&6
+echo "configure:9077: checking for PQconnectdb in -lpq" >&5
+ac_lib_var=`echo pq'_'PQconnectdb | sed 'y%./+-%__p_%'`
+xe_check_libs=" -lpq "
+cat > conftest.$ac_ext <<EOF
+#line 9082 "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 PQconnectdb();
+int main() {
+PQconnectdb()
+; return 0; }
+EOF
+if { (eval echo configure:9093: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+rm -rf conftest*
+eval "ac_cv_lib_$ac_lib_var=yes"
+else
+echo "configure: failed program was:" >&5
+cat conftest.$ac_ext >&5
+rm -rf conftest*
+eval "ac_cv_lib_$ac_lib_var=no"
+fi
+rm -f conftest*
+xe_check_libs=""
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes" ; then
+echo "$ac_t""yes" 1>&6
+have_libpq=yes
+else
+echo "$ac_t""no" 1>&6
+fi
+}
+if test -n "$libpq_fe_h_file" -a "$have_libpq" = "yes"; then
+with_postgresql=yes
+{ test "$extra_verbose" = "yes" && cat << \EOF
+Defining HAVE_POSTGRESQL
+EOF
+cat >> confdefs.h <<\EOF
+#define HAVE_POSTGRESQL 1
+EOF
+}
+echo $ac_n "checking for PQconnectStart in -lpq""... $ac_c" 1>&6
+echo "configure:9126: checking for PQconnectStart in -lpq" >&5
+ac_lib_var=`echo pq'_'PQconnectStart | sed 'y%./+-%__p_%'`
+xe_check_libs=" -lpq "
+cat > conftest.$ac_ext <<EOF
+#line 9131 "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 PQconnectStart();
+int main() {
+PQconnectStart()
+; return 0; }
+EOF
+if { (eval echo configure:9142: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+rm -rf conftest*
+eval "ac_cv_lib_$ac_lib_var=yes"
+else
+echo "configure: failed program was:" >&5
+cat conftest.$ac_ext >&5
+rm -rf conftest*
+eval "ac_cv_lib_$ac_lib_var=no"
+fi
+rm -f conftest*
+xe_check_libs=""
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes" ; then
+echo "$ac_t""yes" 1>&6
+with_postgresqlv7=yes;
+{ test "$extra_verbose" = "yes" && cat << \EOF
+Defining HAVE_POSTGRESQLV7
+EOF
+cat >> confdefs.h <<\EOF
+#define HAVE_POSTGRESQLV7 1
+EOF
+}
+else
+echo "$ac_t""no" 1>&6
+fi
+{ test "$extra_verbose" = "yes" && cat << EOF
+Defining LIBPQ_FE_H_FILE = "$libpq_fe_h_file"
+EOF
+cat >> confdefs.h <<EOF
+#define LIBPQ_FE_H_FILE "$libpq_fe_h_file"
+EOF
+}
+postgresql_libs="-lpq $postgresql_libs" &&  if test "$extra_verbose" = "yes"; then echo "    Prepending \"-lpq\" to \$postgresql_libs"; fi
+MAKE_SUBDIR="$MAKE_SUBDIR modules/postgresql" &&  if test "$extra_verbose" = "yes"; then echo "    Appending \"modules/postgresql\" to \$MAKE_SUBDIR"; fi
+need_modules_common=yes
+if test "$with_modules" = "yes"; then
+INSTALL_ARCH_DEP_SUBDIR="$INSTALL_ARCH_DEP_SUBDIR modules/postgresql" &&  if test "$extra_verbose" = "yes"; then echo "    Appending \"modules/postgresql\" to \$INSTALL_ARCH_DEP_SUBDIR"; fi
+fi
+elif test "$with_postgresql" = "yes"; then
+{ echo "Error:" "Required PostgreSQL support cannot be provided.  Check --site-prefixes." >&2; exit 1; }
+fi
+fi
 if test "$window_system" != "none"; then
 echo "checking for graphics libraries" 1>&6
-echo "configure:7852: checking for graphics libraries" >&5
+echo "configure:9193: checking for graphics libraries" >&5
 libpath_xpm=
 incpath_xpm=
 case "$opsys" in
 cygwin*)
 xpm_problem=""
 if test -z "$with_xpm"; then
 CFLAGS=""$incpath_xpm" $CFLAGS" &&  if test "$extra_verbose" = "yes"; then echo "    Prepending \""$incpath_xpm"\" to \$CFLAGS"; fi
 LDFLAGS=""$libpath_xpm" $LDFLAGS" &&  if test "$extra_verbose" = "yes"; then echo "    Prepending \""$libpath_xpm"\" to \$LDFLAGS"; fi
 echo $ac_n "checking for Xpm - no older than 3.4f""... $ac_c" 1>&6
-echo "configure:7878: checking for Xpm - no older than 3.4f" >&5
+echo "configure:9219: checking for Xpm - no older than 3.4f" >&5
 xe_check_libs=-lXpm
 cat > conftest.$ac_ext <<EOF
-#line 7881 "configure"
+#line 9222 "configure"
 #include "confdefs.h"
 #define XPM_NUMBERS
 #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:7890: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:9231: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
 then
 ./conftest dummy_arg; xpm_status=$?;
 if test "$xpm_status" = "0"; then
 with_xpm=yes;
 else
 LDFLAGS=""$libpath_xpm" $LDFLAGS" &&  if test "$extra_verbose" = "yes"; then echo "    Prepending \""$libpath_xpm"\" to \$LDFLAGS"; fi
 libs_x="-lXpm $libs_x" &&  if test "$extra_verbose" = "yes"; then echo "    Prepending \"-lXpm\" to \$libs_x"; fi
 CFLAGS=""$incpath_xpm" $CFLAGS" &&  if test "$extra_verbose" = "yes"; then echo "    Prepending \""$incpath_xpm"\" to \$CFLAGS"; fi
 echo $ac_n "checking for \"FOR_MSW\" xpm""... $ac_c" 1>&6
-echo "configure:7934: checking for \"FOR_MSW\" xpm" >&5
+echo "configure:9275: checking for \"FOR_MSW\" xpm" >&5
 xe_check_libs=-lXpm
 cat > conftest.$ac_ext <<EOF
-#line 7937 "configure"
+#line 9278 "configure"
 #include "confdefs.h"
 int main() {
 XpmCreatePixmapFromData()
 ; return 0; }
 EOF
-if { (eval echo configure:7944: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9285: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
 rm -rf conftest*
 xpm_for_msw=no
 else
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 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:7970: checking for compface.h" >&5
+echo "configure:9311: checking for compface.h" >&5
 cat > conftest.$ac_ext <<EOF
-#line 7973 "configure"
+#line 9314 "configure"
 #include "confdefs.h"
 #include <compface.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:7978: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9319: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 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:8001: checking for UnGenFace in -lcompface" >&5
+echo "configure:9342: 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 8006 "configure"
+#line 9347 "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:8017: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9358: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; 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_png $with_tiff" != "no no"; then
 echo $ac_n "checking for inflate in -lc""... $ac_c" 1>&6
-echo "configure:8066: checking for inflate in -lc" >&5
+echo "configure:9407: checking for inflate in -lc" >&5
 ac_lib_var=`echo c'_'inflate | sed 'y%./+-%__p_%'`
 xe_check_libs=" -lc "
 cat > conftest.$ac_ext <<EOF
-#line 8071 "configure"
+#line 9412 "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 inflate();
 int main() {
 inflate()
 ; return 0; }
 EOF
-if { (eval echo configure:8082: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9423: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
 rm -rf conftest*
 eval "ac_cv_lib_$ac_lib_var=yes"
 else
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 :
 else
 echo "$ac_t""no" 1>&6
 echo $ac_n "checking for inflate in -lz""... $ac_c" 1>&6
-echo "configure:8101: checking for inflate in -lz" >&5
+echo "configure:9442: checking for inflate in -lz" >&5
 ac_lib_var=`echo z'_'inflate | sed 'y%./+-%__p_%'`
 xe_check_libs=" -lz "
 cat > conftest.$ac_ext <<EOF
-#line 8106 "configure"
+#line 9447 "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 inflate();
 int main() {
 inflate()
 ; return 0; }
 EOF
-if { (eval echo configure:8117: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9458: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; 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="-lz $libs_x" &&  if test "$extra_verbose" = "yes"; then echo "    Prepending \"-lz\" to \$libs_x"; fi
 else
 echo "$ac_t""no" 1>&6
 echo $ac_n "checking for inflate in -lgz""... $ac_c" 1>&6
-echo "configure:8136: checking for inflate in -lgz" >&5
+echo "configure:9477: checking for inflate in -lgz" >&5
 ac_lib_var=`echo gz'_'inflate | sed 'y%./+-%__p_%'`
 xe_check_libs=" -lgz "
 cat > conftest.$ac_ext <<EOF
-#line 8141 "configure"
+#line 9482 "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 inflate();
 int main() {
 inflate()
 ; return 0; }
 EOF
-if { (eval echo configure:8152: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9493: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; 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_jpeg" && { ac_safe=`echo "jpeglib.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for jpeglib.h""... $ac_c" 1>&6
-echo "configure:8182: checking for jpeglib.h" >&5
+echo "configure:9523: checking for jpeglib.h" >&5
 cat > conftest.$ac_ext <<EOF
-#line 8185 "configure"
+#line 9526 "configure"
 #include "confdefs.h"
 #include <jpeglib.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8190: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9531: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 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:8213: checking for jpeg_destroy_decompress in -ljpeg" >&5
+echo "configure:9554: 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 8218 "configure"
+#line 9559 "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:8229: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9570: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; 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
 png_problem=""
 test -z "$with_png" && { echo $ac_n "checking for pow""... $ac_c" 1>&6
-echo "configure:8265: checking for pow" >&5
+echo "configure:9606: checking for pow" >&5
 cat > conftest.$ac_ext <<EOF
-#line 8268 "configure"
+#line 9609 "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:8291: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9632: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
 rm -rf conftest*
 eval "ac_cv_func_pow=yes"
 else
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 with_png=no
 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:8312: checking for png.h" >&5
+echo "configure:9653: checking for png.h" >&5
 cat > conftest.$ac_ext <<EOF
-#line 8315 "configure"
+#line 9656 "configure"
 #include "confdefs.h"
 #include <png.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8320: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9661: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
 rm -rf conftest*
 eval "ac_cv_header_$ac_safe=yes"
 else
 with_png=no
 fi
 }
 test -z "$with_png" && {
 echo $ac_n "checking for png_read_image in -lpng""... $ac_c" 1>&6
-echo "configure:8343: checking for png_read_image in -lpng" >&5
+echo "configure:9684: checking for png_read_image in -lpng" >&5
 ac_lib_var=`echo png'_'png_read_image | sed 'y%./+-%__p_%'`
 xe_check_libs=" -lpng "
 cat > conftest.$ac_ext <<EOF
-#line 8348 "configure"
+#line 9689 "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:8359: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9700: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; 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 -z "$with_png"; then
 echo $ac_n "checking for workable png version information""... $ac_c" 1>&6
-echo "configure:8382: checking for workable png version information" >&5
+echo "configure:9723: checking for workable png version information" >&5
 xe_check_libs="-lpng -lz"
 cat > conftest.$ac_ext <<EOF
-#line 8385 "configure"
+#line 9726 "configure"
 #include "confdefs.h"
 #include <png.h>
 int main(int c, char **v) {
 if (c == 1) return 0;
 if (strcmp(png_libpng_ver, PNG_LIBPNG_VER_STRING) != 0) return 1;
 return (PNG_LIBPNG_VER < 10002) ? 2 : 0 ;}
 EOF
-if { (eval echo configure:8393: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:9734: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
 then
 ./conftest dummy_arg; png_status=$?;
 if test "$png_status" = "0"; then
 	with_png=yes;
 else
 libs_x="-lpng $libs_x" &&  if test "$extra_verbose" = "yes"; then echo "    Prepending \"-lpng\" to \$libs_x"; fi
 fi
 test -z "$with_tiff" && { ac_safe=`echo "tiffio.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for tiffio.h""... $ac_c" 1>&6
-echo "configure:8436: checking for tiffio.h" >&5
+echo "configure:9777: checking for tiffio.h" >&5
 cat > conftest.$ac_ext <<EOF
-#line 8439 "configure"
+#line 9780 "configure"
 #include "confdefs.h"
 #include <tiffio.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8444: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9785: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
 rm -rf conftest*
 eval "ac_cv_header_$ac_safe=yes"
 else
 with_tiff=no
 fi
 }
 test -z "$with_tiff" && {
 echo $ac_n "checking for TIFFClientOpen in -ltiff""... $ac_c" 1>&6
-echo "configure:8467: checking for TIFFClientOpen in -ltiff" >&5
+echo "configure:9808: checking for TIFFClientOpen in -ltiff" >&5
 ac_lib_var=`echo tiff'_'TIFFClientOpen | sed 'y%./+-%__p_%'`
 xe_check_libs=" -ltiff "
 cat > conftest.$ac_ext <<EOF
-#line 8472 "configure"
+#line 9813 "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 TIFFClientOpen();
 int main() {
 TIFFClientOpen()
 ; return 0; }
 EOF
-if { (eval echo configure:8483: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9824: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; 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 "$with_gtk" = "yes"; then
 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:8522: checking for compface.h" >&5
+echo "configure:9863: checking for compface.h" >&5
 cat > conftest.$ac_ext <<EOF
-#line 8525 "configure"
+#line 9866 "configure"
 #include "confdefs.h"
 #include <compface.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8530: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9871: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 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:8553: checking for UnGenFace in -lcompface" >&5
+echo "configure:9894: 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 8558 "configure"
+#line 9899 "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:8569: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9910: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; 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 "$with_x11" = "yes"; then
 echo "checking for X11 graphics libraries" 1>&6
-echo "configure:8608: checking for X11 graphics libraries" >&5
+echo "configure:9949: checking for X11 graphics libraries" >&5
 fi
 case "$with_widgets" in
 "yes" | "athena")		detect_athena=yes ;;
 *)				detect_athena=no ;;
 esac
 if test "$with_x11" = "yes" -a "$detect_athena" = "yes" ; then
 echo "checking for the Athena widgets" 1>&6
-echo "configure:8618: checking for the Athena widgets" >&5
+echo "configure:9959: checking for the Athena widgets" >&5
 case "$with_athena" in
 "xaw" | "")	athena_variant=Xaw	athena_3d=no  ;;
 "3d")	athena_variant=Xaw3d	athena_3d=yes ;;
 "next")	athena_variant=neXtaw	athena_3d=yes ;;
 esac
 if test "$athena_3d" = "no"; then
 echo $ac_n "checking for XawScrollbarSetThumb in -l$athena_variant""... $ac_c" 1>&6
-echo "configure:8632: checking for XawScrollbarSetThumb in -l$athena_variant" >&5
+echo "configure:9973: checking for XawScrollbarSetThumb in -l$athena_variant" >&5
 ac_lib_var=`echo $athena_variant'_'XawScrollbarSetThumb | sed 'y%./+-%__p_%'`
 xe_check_libs=" -l$athena_variant "
 cat > conftest.$ac_ext <<EOF
-#line 8637 "configure"
+#line 9978 "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:8648: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9989: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; 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 eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes" ; then
 echo "$ac_t""yes" 1>&6
 echo $ac_n "checking for threeDClassRec in -l$athena_variant""... $ac_c" 1>&6
-echo "configure:8664: checking for threeDClassRec in -l$athena_variant" >&5
+echo "configure:10005: checking for threeDClassRec in -l$athena_variant" >&5
 ac_lib_var=`echo $athena_variant'_'threeDClassRec | sed 'y%./+-%__p_%'`
 xe_check_libs=" -l$athena_variant "
 cat > conftest.$ac_ext <<EOF
-#line 8669 "configure"
+#line 10010 "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 threeDClassRec();
 int main() {
 threeDClassRec()
 ; return 0; }
 EOF
-if { (eval echo configure:8680: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10021: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
 rm -rf conftest*
 eval "ac_cv_lib_$ac_lib_var=yes"
 else
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 else
 echo $ac_n "checking for threeDClassRec in -l$athena_variant""... $ac_c" 1>&6
-echo "configure:8711: checking for threeDClassRec in -l$athena_variant" >&5
+echo "configure:10052: checking for threeDClassRec in -l$athena_variant" >&5
 ac_lib_var=`echo $athena_variant'_'threeDClassRec | sed 'y%./+-%__p_%'`
 xe_check_libs=" -l$athena_variant "
 cat > conftest.$ac_ext <<EOF
-#line 8716 "configure"
+#line 10057 "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 threeDClassRec();
 int main() {
 threeDClassRec()
 ; return 0; }
 EOF
-if { (eval echo configure:8727: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10068: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; 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
 athena_lib=$athena_variant
 else
 echo "$ac_t""no" 1>&6
 echo $ac_n "checking for threeDClassRec in -lXaw""... $ac_c" 1>&6
-echo "configure:8745: checking for threeDClassRec in -lXaw" >&5
+echo "configure:10086: checking for threeDClassRec in -lXaw" >&5
 ac_lib_var=`echo Xaw'_'threeDClassRec | sed 'y%./+-%__p_%'`
 xe_check_libs=" -lXaw "
 cat > conftest.$ac_ext <<EOF
-#line 8750 "configure"
+#line 10091 "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 threeDClassRec();
 int main() {
 threeDClassRec()
 ; return 0; }
 EOF
-if { (eval echo configure:8761: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10102: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; 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 "$athena_3d" = "no"; then
 ac_safe=`echo "X11/Xaw/ThreeD.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for X11/Xaw/ThreeD.h""... $ac_c" 1>&6
-echo "configure:8792: checking for X11/Xaw/ThreeD.h" >&5
+echo "configure:10133: checking for X11/Xaw/ThreeD.h" >&5
 cat > conftest.$ac_ext <<EOF
-#line 8795 "configure"
+#line 10136 "configure"
 #include "confdefs.h"
 #include <X11/Xaw/ThreeD.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8800: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10141: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
 rm -rf conftest*
 eval "ac_cv_header_$ac_safe=yes"
 else
 echo "configure: warning: Could not find a non-3d Athena header set." 1>&2
 else
 echo "$ac_t""no" 1>&6
 ac_safe=`echo "X11/Xaw/XawInit.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for X11/Xaw/XawInit.h""... $ac_c" 1>&6
-echo "configure:8820: checking for X11/Xaw/XawInit.h" >&5
+echo "configure:10161: checking for X11/Xaw/XawInit.h" >&5
 cat > conftest.$ac_ext <<EOF
-#line 8823 "configure"
+#line 10164 "configure"
 #include "confdefs.h"
 #include <X11/Xaw/XawInit.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8828: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10169: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
 rm -rf conftest*
 eval "ac_cv_header_$ac_safe=yes"
 else
 fi
 else
 ac_safe=`echo "X11/$athena_variant/XawInit.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for X11/$athena_variant/XawInit.h""... $ac_c" 1>&6
-echo "configure:8854: checking for X11/$athena_variant/XawInit.h" >&5
+echo "configure:10195: checking for X11/$athena_variant/XawInit.h" >&5
 cat > conftest.$ac_ext <<EOF
-#line 8857 "configure"
+#line 10198 "configure"
 #include "confdefs.h"
 #include <X11/$athena_variant/XawInit.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8862: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10203: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 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 "X11/$athena_variant/ThreeD.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for X11/$athena_variant/ThreeD.h""... $ac_c" 1>&6
-echo "configure:8879: checking for X11/$athena_variant/ThreeD.h" >&5
+echo "configure:10220: checking for X11/$athena_variant/ThreeD.h" >&5
 cat > conftest.$ac_ext <<EOF
-#line 8882 "configure"
+#line 10223 "configure"
 #include "confdefs.h"
 #include <X11/$athena_variant/ThreeD.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8887: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10228: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
 rm -rf conftest*
 eval "ac_cv_header_$ac_safe=yes"
 else
 if test -z "$athena_h_path"; then
 ac_safe=`echo "$athena_variant/XawInit.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $athena_variant/XawInit.h""... $ac_c" 1>&6
-echo "configure:8915: checking for $athena_variant/XawInit.h" >&5
+echo "configure:10256: checking for $athena_variant/XawInit.h" >&5
 cat > conftest.$ac_ext <<EOF
-#line 8918 "configure"
+#line 10259 "configure"
 #include "confdefs.h"
 #include <$athena_variant/XawInit.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8923: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10264: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 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 "$athena_variant/ThreeD.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $athena_variant/ThreeD.h""... $ac_c" 1>&6
-echo "configure:8940: checking for $athena_variant/ThreeD.h" >&5
+echo "configure:10281: checking for $athena_variant/ThreeD.h" >&5
 cat > conftest.$ac_ext <<EOF
-#line 8943 "configure"
+#line 10284 "configure"
 #include "confdefs.h"
 #include <$athena_variant/ThreeD.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8948: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10289: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
 rm -rf conftest*
 eval "ac_cv_header_$ac_safe=yes"
 else
 fi
 if test -z "$athena_h_path" -a "$athena_variant" != "Xaw3d"; then
 ac_safe=`echo "X11/Xaw3d/XawInit.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for X11/Xaw3d/XawInit.h""... $ac_c" 1>&6
-echo "configure:8977: checking for X11/Xaw3d/XawInit.h" >&5
+echo "configure:10318: checking for X11/Xaw3d/XawInit.h" >&5
 cat > conftest.$ac_ext <<EOF
-#line 8980 "configure"
+#line 10321 "configure"
 #include "confdefs.h"
 #include <X11/Xaw3d/XawInit.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8985: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10326: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 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 "X11/Xaw3d/ThreeD.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for X11/Xaw3d/ThreeD.h""... $ac_c" 1>&6
-echo "configure:9002: checking for X11/Xaw3d/ThreeD.h" >&5
+echo "configure:10343: checking for X11/Xaw3d/ThreeD.h" >&5
 cat > conftest.$ac_ext <<EOF
-#line 9005 "configure"
+#line 10346 "configure"
 #include "confdefs.h"
 #include <X11/Xaw3d/ThreeD.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9010: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10351: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
 rm -rf conftest*
 eval "ac_cv_header_$ac_safe=yes"
 else
 fi
 if test -z "$athena_h_path" -a "$athena_variant" != "Xaw3d"; then
 ac_safe=`echo "Xaw3d/XawInit.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for Xaw3d/XawInit.h""... $ac_c" 1>&6
-echo "configure:9042: checking for Xaw3d/XawInit.h" >&5
+echo "configure:10383: checking for Xaw3d/XawInit.h" >&5
 cat > conftest.$ac_ext <<EOF
-#line 9045 "configure"
+#line 10386 "configure"
 #include "confdefs.h"
 #include <Xaw3d/XawInit.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9050: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10391: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 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 "Xaw3d/ThreeD.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for Xaw3d/ThreeD.h""... $ac_c" 1>&6
-echo "configure:9067: checking for Xaw3d/ThreeD.h" >&5
+echo "configure:10408: checking for Xaw3d/ThreeD.h" >&5
 cat > conftest.$ac_ext <<EOF
-#line 9070 "configure"
+#line 10411 "configure"
 #include "confdefs.h"
 #include <Xaw3d/ThreeD.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9075: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10416: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
 rm -rf conftest*
 eval "ac_cv_header_$ac_safe=yes"
 else
 fi
 if test -z "$athena_h_path"; then
 ac_safe=`echo "X11/Xaw/ThreeD.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for X11/Xaw/ThreeD.h""... $ac_c" 1>&6
-echo "configure:9107: checking for X11/Xaw/ThreeD.h" >&5
+echo "configure:10448: checking for X11/Xaw/ThreeD.h" >&5
 cat > conftest.$ac_ext <<EOF
-#line 9110 "configure"
+#line 10451 "configure"
 #include "confdefs.h"
 #include <X11/Xaw/ThreeD.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9115: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10456: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
 rm -rf conftest*
 eval "ac_cv_header_$ac_safe=yes"
 else
 have_xaw=no
 fi
 if test "$with_x11" = "yes"; then
 ac_safe=`echo "Xm/Xm.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for Xm/Xm.h""... $ac_c" 1>&6
-echo "configure:9154: checking for Xm/Xm.h" >&5
+echo "configure:10495: checking for Xm/Xm.h" >&5
 cat > conftest.$ac_ext <<EOF
-#line 9157 "configure"
+#line 10498 "configure"
 #include "confdefs.h"
 #include <Xm/Xm.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9162: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10503: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 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:9179: checking for XmStringFree in -lXm" >&5
+echo "configure:10520: 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 9184 "configure"
+#line 10525 "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:9195: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10536: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; 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 "$have_motif" = "yes"; then
 echo $ac_n "checking for Lesstif""... $ac_c" 1>&6
-echo "configure:9224: checking for Lesstif" >&5
+echo "configure:10565: checking for Lesstif" >&5
 cat > conftest.$ac_ext <<EOF
-#line 9226 "configure"
+#line 10567 "configure"
 #include "confdefs.h"
 #include <Xm/Xm.h>
 #ifdef LESSTIF_VERSION
 yes
 #endif
 fi
 if test "$with_mule" = "yes" ; then
 echo "checking for Mule-related features" 1>&6
-echo "configure:9599: checking for Mule-related features" >&5
+echo "configure:10940: 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:9613: checking for $ac_hdr" >&5
+echo "configure:10954: checking for $ac_hdr" >&5
 cat > conftest.$ac_ext <<EOF
-#line 9616 "configure"
+#line 10957 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9621: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10962: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 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:9652: checking for strerror in -lintl" >&5
+echo "configure:10993: 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 9657 "configure"
+#line 10998 "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:9668: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11009: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; 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:9701: checking for Mule input methods" >&5
+echo "configure:11042: checking for Mule input methods" >&5
 case "$with_xim" in "" | "yes" )
 echo "checking for XIM" 1>&6
-echo "configure:9704: checking for XIM" >&5
+echo "configure:11045: checking for XIM" >&5
 echo $ac_n "checking for XOpenIM in -lX11""... $ac_c" 1>&6
-echo "configure:9707: checking for XOpenIM in -lX11" >&5
+echo "configure:11048: checking for XOpenIM in -lX11" >&5
 ac_lib_var=`echo X11'_'XOpenIM | sed 'y%./+-%__p_%'`
 xe_check_libs=" -lX11 "
 cat > conftest.$ac_ext <<EOF
-#line 9712 "configure"
+#line 11053 "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 XOpenIM();
 int main() {
 XOpenIM()
 ; return 0; }
 EOF
-if { (eval echo configure:9723: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11064: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; 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_motif $have_lesstif" = "yes no"; then
 echo $ac_n "checking for XmImMbLookupString in -lXm""... $ac_c" 1>&6
-echo "configure:9747: checking for XmImMbLookupString in -lXm" >&5
+echo "configure:11088: 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 9752 "configure"
+#line 11093 "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:9763: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11104: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; 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_xfs" = "yes" ; then
 echo "checking for XFontSet" 1>&6
-echo "configure:9828: checking for XFontSet" >&5
+echo "configure:11169: checking for XFontSet" >&5
 echo $ac_n "checking for XmbDrawString in -lX11""... $ac_c" 1>&6
-echo "configure:9831: checking for XmbDrawString in -lX11" >&5
+echo "configure:11172: checking for XmbDrawString in -lX11" >&5
 ac_lib_var=`echo X11'_'XmbDrawString | sed 'y%./+-%__p_%'`
 xe_check_libs=" -lX11 "
 cat > conftest.$ac_ext <<EOF
-#line 9836 "configure"
+#line 11177 "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 XmbDrawString();
 int main() {
 XmbDrawString()
 ; return 0; }
 EOF
-if { (eval echo configure:9847: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11188: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; 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:9887: checking for wnn/jllib.h" >&5
+echo "configure:11228: checking for wnn/jllib.h" >&5
 cat > conftest.$ac_ext <<EOF
-#line 9890 "configure"
+#line 11231 "configure"
 #include "confdefs.h"
 #include <wnn/jllib.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9895: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:11236: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 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" && { ac_safe=`echo "wnn/commonhd.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for wnn/commonhd.h""... $ac_c" 1>&6
-echo "configure:9918: checking for wnn/commonhd.h" >&5
+echo "configure:11259: checking for wnn/commonhd.h" >&5
 cat > conftest.$ac_ext <<EOF
-#line 9921 "configure"
+#line 11262 "configure"
 #include "confdefs.h"
 #include <wnn/commonhd.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9926: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:11267: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
 rm -rf conftest*
 eval "ac_cv_header_$ac_safe=yes"
 else
 }
 if test "$with_wnn" != "no"; then
 for ac_func in crypt
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:9951: checking for $ac_func" >&5
+echo "configure:11292: checking for $ac_func" >&5
 cat > conftest.$ac_ext <<EOF
-#line 9954 "configure"
+#line 11295 "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:9977: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11318: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
 rm -rf conftest*
 eval "ac_cv_func_$ac_func=yes"
 else
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 fi
 done
 test "$ac_cv_func_crypt" != "yes" && {
 echo $ac_n "checking for crypt in -lcrypt""... $ac_c" 1>&6
-echo "configure:10006: checking for crypt in -lcrypt" >&5
+echo "configure:11347: checking for crypt in -lcrypt" >&5
 ac_lib_var=`echo crypt'_'crypt | sed 'y%./+-%__p_%'`
 xe_check_libs=" -lcrypt "
 cat > conftest.$ac_ext <<EOF
-#line 10011 "configure"
+#line 11352 "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 crypt();
 int main() {
 crypt()
 ; return 0; }
 EOF
-if { (eval echo configure:10022: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11363: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; 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 -z "$with_wnn" -o "$with_wnn" = "yes"; then
 echo $ac_n "checking for jl_dic_list_e in -lwnn""... $ac_c" 1>&6
-echo "configure:10057: checking for jl_dic_list_e in -lwnn" >&5
+echo "configure:11398: 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 10062 "configure"
+#line 11403 "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:10073: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11414: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; 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
 libwnn=wnn
 else
 echo "$ac_t""no" 1>&6
 echo $ac_n "checking for jl_dic_list_e in -lwnn4""... $ac_c" 1>&6
-echo "configure:10091: checking for jl_dic_list_e in -lwnn4" >&5
+echo "configure:11432: checking for jl_dic_list_e in -lwnn4" >&5
 ac_lib_var=`echo wnn4'_'jl_dic_list_e | sed 'y%./+-%__p_%'`
 xe_check_libs=" -lwnn4 "
 cat > conftest.$ac_ext <<EOF
-#line 10096 "configure"
+#line 11437 "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:10107: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11448: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; 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
 libwnn=wnn4
 else
 echo "$ac_t""no" 1>&6
 echo $ac_n "checking for jl_dic_list_e in -lwnn6""... $ac_c" 1>&6
-echo "configure:10125: checking for jl_dic_list_e in -lwnn6" >&5
+echo "configure:11466: checking for jl_dic_list_e in -lwnn6" >&5
 ac_lib_var=`echo wnn6'_'jl_dic_list_e | sed 'y%./+-%__p_%'`
 xe_check_libs=" -lwnn6 "
 cat > conftest.$ac_ext <<EOF
-#line 10130 "configure"
+#line 11471 "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:10141: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11482: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; 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
 libwnn=wnn6
 else
 echo "$ac_t""no" 1>&6
 echo $ac_n "checking for dic_list_e in -lwnn6_fromsrc""... $ac_c" 1>&6
-echo "configure:10159: checking for dic_list_e in -lwnn6_fromsrc" >&5
+echo "configure:11500: checking for dic_list_e in -lwnn6_fromsrc" >&5
 ac_lib_var=`echo wnn6_fromsrc'_'dic_list_e | sed 'y%./+-%__p_%'`
 xe_check_libs=" -lwnn6_fromsrc "
 cat > conftest.$ac_ext <<EOF
-#line 10164 "configure"
+#line 11505 "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 dic_list_e();
 int main() {
 dic_list_e()
 ; return 0; }
 EOF
-if { (eval echo configure:10175: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11516: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; 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="-l$libwnn $libs_x" &&  if test "$extra_verbose" = "yes"; then echo "    Prepending \"-l$libwnn\" to \$libs_x"; fi
 if test "$with_wnn6" != "no"; then
 echo $ac_n "checking for jl_fi_dic_list in -l$libwnn""... $ac_c" 1>&6
-echo "configure:10220: checking for jl_fi_dic_list in -l$libwnn" >&5
+echo "configure:11561: checking for jl_fi_dic_list in -l$libwnn" >&5
 ac_lib_var=`echo $libwnn'_'jl_fi_dic_list | sed 'y%./+-%__p_%'`
 xe_check_libs=" -l$libwnn "
 cat > conftest.$ac_ext <<EOF
-#line 10225 "configure"
+#line 11566 "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:10236: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11577: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
 rm -rf conftest*
 eval "ac_cv_lib_$ac_lib_var=yes"
 else
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 canna_includes_found=no
 if test "$with_canna" != "no"; then
 ac_safe=`echo "canna/jrkanji.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for canna/jrkanji.h""... $ac_c" 1>&6
-echo "configure:10271: checking for canna/jrkanji.h" >&5
+echo "configure:11612: checking for canna/jrkanji.h" >&5
 cat > conftest.$ac_ext <<EOF
-#line 10274 "configure"
+#line 11615 "configure"
 #include "confdefs.h"
 #include <canna/jrkanji.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10279: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:11620: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
 rm -rf conftest*
 eval "ac_cv_header_$ac_safe=yes"
 else
 -d "/usr/local/canna/include"; then
 save_c_switch_site="$c_switch_site"
 c_switch_site="$c_switch_site -I/usr/local/canna/include"
 ac_safe=`echo "canna/jrkanji.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for canna/jrkanji.h""... $ac_c" 1>&6
-echo "configure:10306: checking for canna/jrkanji.h" >&5
+echo "configure:11647: checking for canna/jrkanji.h" >&5
 cat > conftest.$ac_ext <<EOF
-#line 10309 "configure"
+#line 11650 "configure"
 #include "confdefs.h"
 #include <canna/jrkanji.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10314: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:11655: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
 rm -rf conftest*
 eval "ac_cv_header_$ac_safe=yes"
 else
 fi
 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:10342: checking for canna/RK.h" >&5
+echo "configure:11683: checking for canna/RK.h" >&5
 cat > conftest.$ac_ext <<EOF
-#line 10345 "configure"
+#line 11686 "configure"
 #include "confdefs.h"
 #include <canna/RK.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10350: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:11691: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 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:10373: checking for RkBgnBun in -lRKC" >&5
+echo "configure:11714: 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 10378 "configure"
+#line 11719 "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:10389: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11730: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; 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:10412: checking for jrKanjiControl in -lcanna" >&5
+echo "configure:11753: 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 10417 "configure"
+#line 11758 "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:10428: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11769: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; 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
 echo $ac_n "checking for layout_object_getvalue in -li18n""... $ac_c" 1>&6
-echo "configure:10474: checking for layout_object_getvalue in -li18n" >&5
+echo "configure:11815: checking for layout_object_getvalue in -li18n" >&5
 ac_lib_var=`echo i18n'_'layout_object_getvalue | sed 'y%./+-%__p_%'`
 xe_check_libs=" -li18n "
 cat > conftest.$ac_ext <<EOF
-#line 10479 "configure"
+#line 11820 "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 layout_object_getvalue();
 int main() {
 layout_object_getvalue()
 ; return 0; }
 EOF
-if { (eval echo configure:10490: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11831: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
 rm -rf conftest*
 eval "ac_cv_lib_$ac_lib_var=yes"
 else
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 for ac_func in cbrt closedir dup2 eaccess fmod fpathconf frexp ftime getaddrinfo gethostname getnameinfo getpagesize gettimeofday getcwd getwd link logb lrand48 matherr mkdir mktime perror poll random readlink rename res_init rint rmdir select setitimer setpgid setlocale setsid sigblock sighold sigprocmask snprintf stpcpy strerror strlwr strupr symlink tzset ulimit usleep waitpid vsnprintf fsync ftruncate umask wcslen wcscmp
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:10577: checking for $ac_func" >&5
+echo "configure:11918: checking for $ac_func" >&5
 cat > conftest.$ac_ext <<EOF
-#line 10580 "configure"
+#line 11921 "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:10603: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11944: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
 rm -rf conftest*
 eval "ac_cv_func_$ac_func=yes"
 else
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 for ac_func in getpt _getpty grantpt unlockpt ptsname killpg tcgetpgrp
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:10644: checking for $ac_func" >&5
+echo "configure:11985: checking for $ac_func" >&5
 cat > conftest.$ac_ext <<EOF
-#line 10647 "configure"
+#line 11988 "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:10670: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12011: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
 rm -rf conftest*
 eval "ac_cv_func_$ac_func=yes"
 else
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 fi
 done
 echo $ac_n "checking for openpty""... $ac_c" 1>&6
-echo "configure:10699: checking for openpty" >&5
+echo "configure:12040: checking for openpty" >&5
 cat > conftest.$ac_ext <<EOF
-#line 10702 "configure"
+#line 12043 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
 which can conflict with char openpty(); below.  */
 #include <assert.h>
 /* Override any gcc2 internal prototype to avoid an error.  */
 openpty();
 #endif
 ; return 0; }
 EOF
-if { (eval echo configure:10725: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12066: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
 rm -rf conftest*
 eval "ac_cv_func_openpty=yes"
 else
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 else
 echo "$ac_t""no" 1>&6
 echo $ac_n "checking for openpty in -lutil""... $ac_c" 1>&6
-echo "configure:10744: checking for openpty in -lutil" >&5
+echo "configure:12085: checking for openpty in -lutil" >&5
 ac_lib_var=`echo util'_'openpty | sed 'y%./+-%__p_%'`
 xe_check_libs=" -lutil "
 cat > conftest.$ac_ext <<EOF
-#line 10749 "configure"
+#line 12090 "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 openpty();
 int main() {
 openpty()
 ; return 0; }
 EOF
-if { (eval echo configure:10760: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12101: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
 rm -rf conftest*
 eval "ac_cv_lib_$ac_lib_var=yes"
 else
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 for ac_hdr in libutil.h util.h
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:10795: checking for $ac_hdr" >&5
+echo "configure:12136: checking for $ac_hdr" >&5
 cat > conftest.$ac_ext <<EOF
-#line 10798 "configure"
+#line 12139 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10803: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:12144: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
 rm -rf conftest*
 eval "ac_cv_header_$ac_safe=yes"
 else
 case "$opsys" in
 hpux*) for ac_hdr in sys/ptyio.h
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:10840: checking for $ac_hdr" >&5
+echo "configure:12181: checking for $ac_hdr" >&5
 cat > conftest.$ac_ext <<EOF
-#line 10843 "configure"
+#line 12184 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10848: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:12189: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
 rm -rf conftest*
 eval "ac_cv_header_$ac_safe=yes"
 else
 ;;
 *) for ac_hdr in pty.h
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:10881: checking for $ac_hdr" >&5
+echo "configure:12222: checking for $ac_hdr" >&5
 cat > conftest.$ac_ext <<EOF
-#line 10884 "configure"
+#line 12225 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10889: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:12230: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
 rm -rf conftest*
 eval "ac_cv_header_$ac_safe=yes"
 else
 test "$ac_cv_header_pty_h" = "no" && for ac_hdr in sys/pty.h
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:10922: checking for $ac_hdr" >&5
+echo "configure:12263: checking for $ac_hdr" >&5
 cat > conftest.$ac_ext <<EOF
-#line 10925 "configure"
+#line 12266 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10930: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:12271: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
 rm -rf conftest*
 eval "ac_cv_header_$ac_safe=yes"
 else
 for ac_hdr in stropts.h
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:10966: checking for $ac_hdr" >&5
+echo "configure:12307: checking for $ac_hdr" >&5
 cat > conftest.$ac_ext <<EOF
-#line 10969 "configure"
+#line 12310 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10974: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:12315: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
 rm -rf conftest*
 eval "ac_cv_header_$ac_safe=yes"
 else
 if test "$ac_cv_header_stropts_h" = "yes"; then
 for ac_func in isastream
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:11007: checking for $ac_func" >&5
+echo "configure:12348: checking for $ac_func" >&5
 cat > conftest.$ac_ext <<EOF
-#line 11010 "configure"
+#line 12351 "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:11033: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12374: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
 rm -rf conftest*
 eval "ac_cv_func_$ac_func=yes"
 else
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 for ac_hdr in strtio.h
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:11064: checking for $ac_hdr" >&5
+echo "configure:12405: checking for $ac_hdr" >&5
 cat > conftest.$ac_ext <<EOF
-#line 11067 "configure"
+#line 12408 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:11072: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:12413: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
 rm -rf conftest*
 eval "ac_cv_header_$ac_safe=yes"
 else
 fi
 for ac_func in getloadavg
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:11105: checking for $ac_func" >&5
+echo "configure:12446: checking for $ac_func" >&5
 cat > conftest.$ac_ext <<EOF
-#line 11108 "configure"
+#line 12449 "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:11131: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12472: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
 rm -rf conftest*
 eval "ac_cv_func_$ac_func=yes"
 else
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 if test "$ac_cv_func_getloadavg" = "yes"; then
 for ac_hdr in sys/loadavg.h
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:11164: checking for $ac_hdr" >&5
+echo "configure:12505: checking for $ac_hdr" >&5
 cat > conftest.$ac_ext <<EOF
-#line 11167 "configure"
+#line 12508 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:11172: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:12513: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
 rm -rf conftest*
 eval "ac_cv_header_$ac_safe=yes"
 else
 echo "    xemacs will be linked with \"getloadavg.o\""
 fi
 echo $ac_n "checking for kstat_open in -lkstat""... $ac_c" 1>&6
-echo "configure:11208: checking for kstat_open in -lkstat" >&5
+echo "configure:12549: 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 11213 "configure"
+#line 12554 "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:11224: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12565: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
 rm -rf conftest*
 eval "ac_cv_lib_$ac_lib_var=yes"
 else
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 for ac_hdr in kstat.h
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:11259: checking for $ac_hdr" >&5
+echo "configure:12600: checking for $ac_hdr" >&5
 cat > conftest.$ac_ext <<EOF
-#line 11262 "configure"
+#line 12603 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:11267: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:12608: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
 rm -rf conftest*
 eval "ac_cv_header_$ac_safe=yes"
 else
 done
 echo $ac_n "checking for kvm_read in -lkvm""... $ac_c" 1>&6
-echo "configure:11299: checking for kvm_read in -lkvm" >&5
+echo "configure:12640: 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 11304 "configure"
+#line 12645 "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:11315: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12656: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; 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 $ac_n "checking whether netdb declares h_errno""... $ac_c" 1>&6
-echo "configure:11349: checking whether netdb declares h_errno" >&5
+echo "configure:12690: checking whether netdb declares h_errno" >&5
 cat > conftest.$ac_ext <<EOF
-#line 11351 "configure"
+#line 12692 "configure"
 #include "confdefs.h"
 #include <netdb.h>
 int main() {
 return h_errno;
 ; return 0; }
 EOF
-if { (eval echo configure:11358: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12699: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; 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:11378: checking for sigsetjmp" >&5
+echo "configure:12719: checking for sigsetjmp" >&5
 cat > conftest.$ac_ext <<EOF
-#line 11380 "configure"
+#line 12721 "configure"
 #include "confdefs.h"
 #include <setjmp.h>
 int main() {
 sigjmp_buf bar; sigsetjmp (bar, 0);
 ; return 0; }
 EOF
-if { (eval echo configure:11387: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:12728: \"$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:11407: checking whether localtime caches TZ" >&5
+echo "configure:12748: checking whether localtime caches TZ" >&5
 if test "$ac_cv_func_tzset" = "yes"; then
 cat > conftest.$ac_ext <<EOF
-#line 11411 "configure"
+#line 12752 "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:11446: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:12787: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
 then
 emacs_cv_localtime_cache=no
 else
 conftest_rc="$?"
 echo "configure: failed program was:" >&5
 fi
 if test "$HAVE_TIMEVAL" = "yes"; then
 echo $ac_n "checking whether gettimeofday accepts one or two arguments""... $ac_c" 1>&6
-echo "configure:11476: checking whether gettimeofday accepts one or two arguments" >&5
+echo "configure:12817: checking whether gettimeofday accepts one or two arguments" >&5
 cat > conftest.$ac_ext <<EOF
-#line 11478 "configure"
+#line 12819 "configure"
 #include "confdefs.h"
 #ifdef TIME_WITH_SYS_TIME
 #include <sys/time.h>
 #include <time.h>
 struct timeval time;
 gettimeofday (&time, 0);
 ; return 0; }
 EOF
-if { (eval echo configure:11499: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12840: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
 rm -rf conftest*
 echo "$ac_t""two" 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:11521: checking for inline" >&5
+echo "configure:12862: checking for inline" >&5
 ac_cv_c_inline=no
 for ac_kw in inline __inline__ __inline; do
 cat > conftest.$ac_ext <<EOF
-#line 11526 "configure"
+#line 12867 "configure"
 #include "confdefs.h"
 int main() {
 } $ac_kw foo() {
 ; return 0; }
 EOF
-if { (eval echo configure:11533: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:12874: \"$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
 if test "$__DECC" != "yes"; then
 # 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:11574: checking for working alloca.h" >&5
+echo "configure:12915: checking for working alloca.h" >&5
 cat > conftest.$ac_ext <<EOF
-#line 11577 "configure"
+#line 12918 "configure"
 #include "confdefs.h"
 #include <alloca.h>
 int main() {
 char *p = alloca(2 * sizeof(int));
 ; return 0; }
 EOF
-if { (eval echo configure:11584: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12925: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; 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:11608: checking for alloca" >&5
+echo "configure:12949: checking for alloca" >&5
 cat > conftest.$ac_ext <<EOF
-#line 11611 "configure"
+#line 12952 "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:11639: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12980: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; 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:11678: checking whether alloca needs Cray hooks" >&5
+echo "configure:13019: checking whether alloca needs Cray hooks" >&5
 cat > conftest.$ac_ext <<EOF
-#line 11681 "configure"
+#line 13022 "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:11705: checking for $ac_func" >&5
+echo "configure:13046: checking for $ac_func" >&5
 cat > conftest.$ac_ext <<EOF
-#line 11708 "configure"
+#line 13049 "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:11731: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13072: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; 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:11761: checking stack direction for C alloca" >&5
+echo "configure:13102: checking stack direction for C alloca" >&5
 cat > conftest.$ac_ext <<EOF
-#line 11764 "configure"
+#line 13105 "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:11783: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:13124: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
 then
 ac_cv_c_stack_direction=1
 else
 conftest_rc="$?"
 echo "configure: failed program was:" >&5
 echo "    xemacs will be linked with \"$ALLOCA\""
 fi
 fi
 echo $ac_n "checking for working alloca in function calls""... $ac_c" 1>&6
-echo "configure:11812: checking for working alloca in function calls" >&5
+echo "configure:13153: checking for working alloca in function calls" >&5
 cat > conftest.$ac_ext <<EOF
-#line 11814 "configure"
+#line 13155 "configure"
 #include "confdefs.h"
 #if defined (__CYGWIN__)
 #include <alloca.h>
 #elif defined (__GNUC__)
 return 1;
 return 0;
 }
 EOF
-if { (eval echo configure:11867: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:13208: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
 then
 working_alloca_in_function_calls=yes
 else
 conftest_rc="$?"
 echo "configure: failed program was:" >&5
 EOF
 }
 echo $ac_n "checking for working strcoll""... $ac_c" 1>&6
-echo "configure:11890: checking for working strcoll" >&5
+echo "configure:13231: checking for working strcoll" >&5
 cat > conftest.$ac_ext <<EOF
-#line 11893 "configure"
+#line 13234 "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:11903: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:13244: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
 then
 ac_cv_func_strcoll_works=yes
 else
 conftest_rc="$?"
 echo "configure: failed program was:" >&5
 for ac_func in getpgrp
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:11931: checking for $ac_func" >&5
+echo "configure:13272: checking for $ac_func" >&5
 cat > conftest.$ac_ext <<EOF
-#line 11934 "configure"
+#line 13275 "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:11957: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13298: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; 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:11985: checking whether getpgrp takes no argument" >&5
+echo "configure:13326: checking whether getpgrp takes no argument" >&5
 cat > conftest.$ac_ext <<EOF
-#line 11988 "configure"
+#line 13329 "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:12043: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:13384: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
 then
 ac_cv_func_getpgrp_void=yes
 else
 conftest_rc="$?"
 echo "configure: failed program was:" >&5
 fi
 echo $ac_n "checking for working mmap""... $ac_c" 1>&6
-echo "configure:12070: checking for working mmap" >&5
+echo "configure:13411: checking for working mmap" >&5
 case "$opsys" in ultrix* ) have_mmap=no ;; *)
 cat > conftest.$ac_ext <<EOF
-#line 12073 "configure"
+#line 13414 "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:12106: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:13447: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
 then
 have_mmap=yes
 else
 conftest_rc="$?"
 echo "configure: failed program was:" >&5
 esac
 test "$GNU_MALLOC" != "yes" -a "$have_mmap" != "yes" && rel_alloc=no
 if test "$rel_alloc $have_mmap" = "default yes"; then
 if test "$doug_lea_malloc" = "yes"; then
 echo $ac_n "checking for M_MMAP_THRESHOLD""... $ac_c" 1>&6
-echo "configure:12135: checking for M_MMAP_THRESHOLD" >&5
+echo "configure:13476: checking for M_MMAP_THRESHOLD" >&5
 cat > conftest.$ac_ext <<EOF
-#line 12137 "configure"
+#line 13478 "configure"
 #include "confdefs.h"
 #include <malloc.h>
 int main() {
 #ifndef M_MMAP_THRESHOLD
 !@+$%^&*_)(_ - unlikely to compile...
 #endif
 ; return 0; }
 EOF
-if { (eval echo configure:12149: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:13490: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
 rm -rf conftest*
 rel_alloc=no; echo "$ac_t""yes" 1>&6;
 else
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 }
 ac_safe=`echo "termios.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for termios.h""... $ac_c" 1>&6
-echo "configure:12174: checking for termios.h" >&5
+echo "configure:13515: checking for termios.h" >&5
 cat > conftest.$ac_ext <<EOF
-#line 12177 "configure"
+#line 13518 "configure"
 #include "confdefs.h"
 #include <termios.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:12182: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:13523: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 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:12225: checking for termio.h" >&5
+echo "configure:13566: checking for termio.h" >&5
 cat > conftest.$ac_ext <<EOF
-#line 12228 "configure"
+#line 13569 "configure"
 #include "confdefs.h"
 #include <termio.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:12233: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:13574: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
 rm -rf conftest*
 eval "ac_cv_header_$ac_safe=yes"
 else
 fi
 echo $ac_n "checking for socket""... $ac_c" 1>&6
-echo "configure:12265: checking for socket" >&5
+echo "configure:13606: checking for socket" >&5
 cat > conftest.$ac_ext <<EOF
-#line 12268 "configure"
+#line 13609 "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:12291: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13632: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; 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:12306: checking for netinet/in.h" >&5
+echo "configure:13647: checking for netinet/in.h" >&5
 cat > conftest.$ac_ext <<EOF
-#line 12309 "configure"
+#line 13650 "configure"
 #include "confdefs.h"
 #include <netinet/in.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:12314: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:13655: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 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:12331: checking for arpa/inet.h" >&5
+echo "configure:13672: checking for arpa/inet.h" >&5
 cat > conftest.$ac_ext <<EOF
-#line 12334 "configure"
+#line 13675 "configure"
 #include "confdefs.h"
 #include <arpa/inet.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:12339: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:13680: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 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:12364: checking "for sun_len member in struct sockaddr_un"" >&5
+echo "configure:13705: checking "for sun_len member in struct sockaddr_un"" >&5
 cat > conftest.$ac_ext <<EOF
-#line 12366 "configure"
+#line 13707 "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:12377: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13718: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; 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
 rm -rf conftest*
 echo "$ac_t""no" 1>&6
 fi
 rm -f conftest*
 echo $ac_n "checking "for ip_mreq struct in netinet/in.h"""... $ac_c" 1>&6
-echo "configure:12395: checking "for ip_mreq struct in netinet/in.h"" >&5
+echo "configure:13736: checking "for ip_mreq struct in netinet/in.h"" >&5
 cat > conftest.$ac_ext <<EOF
-#line 12397 "configure"
+#line 13738 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <netinet/in.h>
 int main() {
 static struct ip_mreq x;
 ; return 0; }
 EOF
-if { (eval echo configure:12407: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13748: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
 rm -rf conftest*
 echo "$ac_t""yes" 1>&6; { test "$extra_verbose" = "yes" && cat << \EOF
 Defining HAVE_MULTICAST
 EOF
 cat >> confdefs.h <<\EOF
 echo "$ac_t""no" 1>&6
 fi
 echo $ac_n "checking for msgget""... $ac_c" 1>&6
-echo "configure:12438: checking for msgget" >&5
+echo "configure:13779: checking for msgget" >&5
 cat > conftest.$ac_ext <<EOF
-#line 12441 "configure"
+#line 13782 "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:12464: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13805: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; 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:12479: checking for sys/ipc.h" >&5
+echo "configure:13820: checking for sys/ipc.h" >&5
 cat > conftest.$ac_ext <<EOF
-#line 12482 "configure"
+#line 13823 "configure"
 #include "confdefs.h"
 #include <sys/ipc.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:12487: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:13828: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 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:12504: checking for sys/msg.h" >&5
+echo "configure:13845: checking for sys/msg.h" >&5
 cat > conftest.$ac_ext <<EOF
-#line 12507 "configure"
+#line 13848 "configure"
 #include "confdefs.h"
 #include <sys/msg.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:12512: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:13853: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 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:12550: checking for dirent.h" >&5
+echo "configure:13891: checking for dirent.h" >&5
 cat > conftest.$ac_ext <<EOF
-#line 12553 "configure"
+#line 13894 "configure"
 #include "confdefs.h"
 #include <dirent.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:12558: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:13899: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 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:12585: checking for sys/dir.h" >&5
+echo "configure:13926: checking for sys/dir.h" >&5
 cat > conftest.$ac_ext <<EOF
-#line 12588 "configure"
+#line 13929 "configure"
 #include "confdefs.h"
 #include <sys/dir.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:12593: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:13934: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 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:12626: checking for nlist.h" >&5
+echo "configure:13967: checking for nlist.h" >&5
 cat > conftest.$ac_ext <<EOF
-#line 12629 "configure"
+#line 13970 "configure"
 #include "confdefs.h"
 #include <nlist.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:12634: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:13975: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
 rm -rf conftest*
 eval "ac_cv_header_$ac_safe=yes"
 else
 fi
 echo "checking "for sound support"" 1>&6
-echo "configure:12664: checking "for sound support"" >&5
+echo "configure:14005: checking "for sound support"" >&5
 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:12671: checking for multimedia/audio_device.h" >&5
+echo "configure:14012: checking for multimedia/audio_device.h" >&5
 cat > conftest.$ac_ext <<EOF
-#line 12674 "configure"
+#line 14015 "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:12679: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:14020: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 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:12727: checking for ALopenport in -laudio" >&5
+echo "configure:14068: 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 12732 "configure"
+#line 14073 "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:12743: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14084: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; 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:12774: checking for AOpenAudio in -lAlib" >&5
+echo "configure:14115: 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 12779 "configure"
+#line 14120 "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:12790: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14131: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; 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:12838: checking for ${dir}/soundcard.h" >&5
+echo "configure:14179: checking for ${dir}/soundcard.h" >&5
 cat > conftest.$ac_ext <<EOF
-#line 12841 "configure"
+#line 14182 "configure"
 #include "confdefs.h"
 #include <${dir}/soundcard.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:12846: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:14187: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
 rm -rf conftest*
 eval "ac_cv_header_$ac_safe=yes"
 else
 fi
 if test "$with_nas_sound" != "no"; then
 ac_safe=`echo "audio/audiolib.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for audio/audiolib.h""... $ac_c" 1>&6
-echo "configure:12900: checking for audio/audiolib.h" >&5
+echo "configure:14241: checking for audio/audiolib.h" >&5
 cat > conftest.$ac_ext <<EOF
-#line 12903 "configure"
+#line 14244 "configure"
 #include "confdefs.h"
 #include <audio/audiolib.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:12908: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:14249: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
 rm -rf conftest*
 eval "ac_cv_header_$ac_safe=yes"
 else
 if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
 echo "$ac_t""yes" 1>&6
 echo $ac_n "checking for AuOpenServer in -laudio""... $ac_c" 1>&6
-echo "configure:12926: checking for AuOpenServer in -laudio" >&5
+echo "configure:14267: checking for AuOpenServer in -laudio" >&5
 ac_lib_var=`echo audio'_'AuOpenServer | sed 'y%./+-%__p_%'`
 xe_check_libs=" -laudio "
 cat > conftest.$ac_ext <<EOF
-#line 12931 "configure"
+#line 14272 "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 AuOpenServer();
 int main() {
 AuOpenServer()
 ; return 0; }
 EOF
-if { (eval echo configure:12942: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14283: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; 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 nas.o" &&  if test "$extra_verbose" = "yes"; then
 echo "    xemacs will be linked with \"nas.o\""
 fi
 libs_x="-laudio $libs_x" &&  if test "$extra_verbose" = "yes"; then echo "    Prepending \"-laudio\" to \$libs_x"; fi
 cat > conftest.$ac_ext <<EOF
-#line 12981 "configure"
+#line 14322 "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
 if test "$with_esd_sound" != "no"; then
 # Extract the first word of "esd-config", so it can be a program name with args.
 set dummy esd-config; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:13012: checking for $ac_word" >&5
+echo "configure:14353: checking for $ac_word" >&5
 if test -n "$have_esd_config"; then
 ac_cv_prog_have_esd_config="$have_esd_config" # Let the user override the test.
 else
 IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
 if test "$have_esd_config" = "yes"; then
 save_c_switch_site="$c_switch_site" save_LIBS="$LIBS"
 c_switch_site="$c_switch_site `esd-config --cflags`" &&  if test "$extra_verbose" = "yes"; then echo "    Appending \"`esd-config --cflags`\" to \$c_switch_site"; fi
 LIBS="`esd-config --libs` $LIBS" &&  if test "$extra_verbose" = "yes"; then echo "    Prepending \"`esd-config --libs`\" to \$LIBS"; fi
 echo $ac_n "checking for esd_play_stream""... $ac_c" 1>&6
-echo "configure:13041: checking for esd_play_stream" >&5
+echo "configure:14382: checking for esd_play_stream" >&5
 cat > conftest.$ac_ext <<EOF
-#line 13044 "configure"
+#line 14385 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
 which can conflict with char esd_play_stream(); below.  */
 #include <assert.h>
 /* Override any gcc2 internal prototype to avoid an error.  */
 esd_play_stream();
 #endif
 ; return 0; }
 EOF
-if { (eval echo configure:13067: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14408: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
 rm -rf conftest*
 eval "ac_cv_func_esd_play_stream=yes"
 else
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 test -z "$with_tty" && with_tty=yes
 if test "$with_tty" = "yes"  ; then
 echo "checking for TTY-related features" 1>&6
-echo "configure:13118: checking for TTY-related features" >&5
+echo "configure:14459: checking for TTY-related features" >&5
 { test "$extra_verbose" = "yes" && cat << \EOF
 Defining HAVE_TTY
 EOF
 cat >> confdefs.h <<\EOF
 #define HAVE_TTY 1
 if test -z "$with_ncurses"; then
 echo $ac_n "checking for tgetent in -lncurses""... $ac_c" 1>&6
-echo "configure:13131: checking for tgetent in -lncurses" >&5
+echo "configure:14472: 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 13136 "configure"
+#line 14477 "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:13147: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14488: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; 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:13180: checking for ncurses/curses.h" >&5
+echo "configure:14521: checking for ncurses/curses.h" >&5
 cat > conftest.$ac_ext <<EOF
-#line 13183 "configure"
+#line 14524 "configure"
 #include "confdefs.h"
 #include <ncurses/curses.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:13188: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:14529: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 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:13210: checking for ncurses/term.h" >&5
+echo "configure:14551: checking for ncurses/term.h" >&5
 cat > conftest.$ac_ext <<EOF
-#line 13213 "configure"
+#line 14554 "configure"
 #include "confdefs.h"
 #include <ncurses/term.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:13218: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:14559: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 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:13248: checking for ncurses/curses.h" >&5
+echo "configure:14589: checking for ncurses/curses.h" >&5
 cat > conftest.$ac_ext <<EOF
-#line 13251 "configure"
+#line 14592 "configure"
 #include "confdefs.h"
 #include <ncurses/curses.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:13256: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:14597: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 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:13291: checking for tgetent in -l$lib" >&5
+echo "configure:14632: 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 13296 "configure"
+#line 14637 "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:13307: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14648: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; 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:13338: checking for tgetent in -lcurses" >&5
+echo "configure:14679: 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 13343 "configure"
+#line 14684 "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:13354: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14695: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; 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:13372: checking for tgetent in -ltermcap" >&5
+echo "configure:14713: 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 13377 "configure"
+#line 14718 "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:13388: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14729: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; 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:13436: checking for gpm.h" >&5
+echo "configure:14777: checking for gpm.h" >&5
 cat > conftest.$ac_ext <<EOF
-#line 13439 "configure"
+#line 14780 "configure"
 #include "confdefs.h"
 #include <gpm.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:13444: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:14785: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 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:13467: checking for Gpm_Open in -lgpm" >&5
+echo "configure:14808: 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 13472 "configure"
+#line 14813 "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:13483: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14824: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
 rm -rf conftest*
 eval "ac_cv_lib_$ac_lib_var=yes"
 else
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 done
 fi
 test "$with_database_gdbm $with_database_dbm $with_database_berkdb" \
 != "no no no" && echo "checking for database support" 1>&6
-echo "configure:13526: checking for database support" >&5
+echo "configure:14867: checking for database support" >&5
 if test "$with_database_gdbm $with_database_dbm" != "no no"; then
 ac_safe=`echo "ndbm.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for ndbm.h""... $ac_c" 1>&6
-echo "configure:13531: checking for ndbm.h" >&5
+echo "configure:14872: checking for ndbm.h" >&5
 cat > conftest.$ac_ext <<EOF
-#line 13534 "configure"
+#line 14875 "configure"
 #include "confdefs.h"
 #include <ndbm.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:13539: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:14880: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
 rm -rf conftest*
 eval "ac_cv_header_$ac_safe=yes"
 else
 fi
 if test "$with_database_gdbm" != "no"; then
 echo $ac_n "checking for dbm_open in -lgdbm""... $ac_c" 1>&6
-echo "configure:13569: checking for dbm_open in -lgdbm" >&5
+echo "configure:14910: 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 13574 "configure"
+#line 14915 "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:13585: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14926: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; 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_dbm" != "no"; then
 echo $ac_n "checking for dbm_open""... $ac_c" 1>&6
-echo "configure:13613: checking for dbm_open" >&5
+echo "configure:14954: checking for dbm_open" >&5
 cat > conftest.$ac_ext <<EOF
-#line 13616 "configure"
+#line 14957 "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:13639: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14980: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
 rm -rf conftest*
 eval "ac_cv_func_dbm_open=yes"
 else
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 else
 echo "$ac_t""no" 1>&6
 echo $ac_n "checking for dbm_open in -ldbm""... $ac_c" 1>&6
-echo "configure:13658: checking for dbm_open in -ldbm" >&5
+echo "configure:14999: 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 13663 "configure"
+#line 15004 "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:13674: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15015: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; 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 "$with_database_berkdb" != "no"; then
 echo $ac_n "checking for Berkeley db.h""... $ac_c" 1>&6
-echo "configure:13715: checking for Berkeley db.h" >&5
+echo "configure:15056: checking for Berkeley db.h" >&5
 for header in "db/db.h" "db.h"; do
 cat > conftest.$ac_ext <<EOF
-#line 13718 "configure"
+#line 15059 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 #if !(defined __GLIBC__ && __GLIBC_MINOR__ >= 1)
 #ifdef HAVE_INTTYPES_H
 int main() {
 ; return 0; }
 EOF
-if { (eval echo configure:13740: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:15081: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
 rm -rf conftest*
 db_h_file="$header"; break
 else
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 else echo "$ac_t""$db_h_file" 1>&6
 fi
 if test "$with_database_berkdb" != "no"; then
 echo $ac_n "checking for Berkeley DB version""... $ac_c" 1>&6
-echo "configure:13756: checking for Berkeley DB version" >&5
+echo "configure:15097: checking for Berkeley DB version" >&5
 cat > conftest.$ac_ext <<EOF
-#line 13758 "configure"
+#line 15099 "configure"
 #include "confdefs.h"
 #include <$db_h_file>
 #if DB_VERSION_MAJOR > 1
 yes
 #endif
 EOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
 egrep "yes" >/dev/null 2>&1; then
 rm -rf conftest*
 cat > conftest.$ac_ext <<EOF
-#line 13770 "configure"
+#line 15111 "configure"
 #include "confdefs.h"
 #include <$db_h_file>
 #if DB_VERSION_MAJOR > 2
 yes
 #endif
 EOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
 egrep "yes" >/dev/null 2>&1; then
 rm -rf conftest*
 cat > conftest.$ac_ext <<EOF
-#line 13782 "configure"
+#line 15123 "configure"
 #include "confdefs.h"
 #include <$db_h_file>
 #if DB_VERSION_MAJOR > 3
 yes
 #endif
 echo "$ac_t""1" 1>&6; dbfunc=dbopen; dbver=1
 fi
 rm -f conftest*
 echo $ac_n "checking for $dbfunc""... $ac_c" 1>&6
-echo "configure:13816: checking for $dbfunc" >&5
+echo "configure:15157: checking for $dbfunc" >&5
 cat > conftest.$ac_ext <<EOF
-#line 13819 "configure"
+#line 15160 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
 which can conflict with char $dbfunc(); below.  */
 #include <assert.h>
 /* Override any gcc2 internal prototype to avoid an error.  */
 $dbfunc();
 #endif
 ; return 0; }
 EOF
-if { (eval echo configure:13842: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15183: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
 rm -rf conftest*
 eval "ac_cv_func_$dbfunc=yes"
 else
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 else
 echo "$ac_t""no" 1>&6
 echo $ac_n "checking for $dbfunc in -ldb""... $ac_c" 1>&6
-echo "configure:13861: checking for $dbfunc in -ldb" >&5
+echo "configure:15202: checking for $dbfunc in -ldb" >&5
 ac_lib_var=`echo db'_'$dbfunc | sed 'y%./+-%__p_%'`
 xe_check_libs=" -ldb "
 cat > conftest.$ac_ext <<EOF
-#line 13866 "configure"
+#line 15207 "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 $dbfunc();
 int main() {
 $dbfunc()
 ; return 0; }
 EOF
-if { (eval echo configure:13877: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15218: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
 rm -rf conftest*
 eval "ac_cv_lib_$ac_lib_var=yes"
 else
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 	| sed -n -e "s/[ 	]*=[ 	\"]*/='/" -e "s/[ 	\"]*\$/'/" -e "s/^configure___//p"`
 rm -f $tempcname
 echo "configure: warning: "db_create is really $dbfunc"" 1>&2
 echo $ac_n "checking for $dbfunc in -ldb""... $ac_c" 1>&6
-echo "configure:13911: checking for $dbfunc in -ldb" >&5
+echo "configure:15252: checking for $dbfunc in -ldb" >&5
 ac_lib_var=`echo db'_'$dbfunc | sed 'y%./+-%__p_%'`
 xe_check_libs=" -ldb "
 cat > conftest.$ac_ext <<EOF
-#line 13916 "configure"
+#line 15257 "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 $dbfunc();
 int main() {
 $dbfunc()
 ; return 0; }
 EOF
-if { (eval echo configure:13927: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15268: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; 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_socks" = "yes"; then
 echo $ac_n "checking for SOCKSinit in -lsocks""... $ac_c" 1>&6
-echo "configure:13986: checking for SOCKSinit in -lsocks" >&5
+echo "configure:15327: 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 13991 "configure"
+#line 15332 "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:14002: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15343: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; 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="-Bstatic -lut -Bdynamic $LIBS" &&  if test "$extra_verbose" = "yes"; then echo "    Prepending \"-Bstatic -lut -Bdynamic\" to \$LIBS"; fi
 fi
 cat > conftest.$ac_ext <<EOF
-#line 14056 "configure"
+#line 15397 "configure"
 #include "confdefs.h"
 int main(int c,char *v[]){return 0;}
 EOF
-if { (eval echo configure:14060: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:15401: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
 then
 :
 else
 conftest_rc="$?"
 echo "configure: failed program was:" >&5
 for W in $ld_libs_window_system $ld_libs_general $ld_libs_module; do if test -z "$T"; then T="$W"; else T="$T $W"; fi; done
 ld_libs_all="$T"
 MAKE_SUBDIR="$MAKE_SUBDIR src" &&  if test "$extra_verbose" = "yes"; then echo "    Appending \"src\" to \$MAKE_SUBDIR"; fi
-if test "$with_modules" != "no"; then
-echo "checking for module support" 1>&6
-echo "configure:14171: checking for module support" >&5
-if test "$with_msw" = "yes"; then
-have_dl=yes;
-else
-case "$opsys" in
-darwin ) have_dl=yes; { test "$extra_verbose" = "yes" && cat << \EOF
-Defining HAVE_DYLD
-EOF
-cat >> confdefs.h <<\EOF
-#define HAVE_DYLD 1
-EOF
-}
-;;
-* )
-ac_safe=`echo "dlfcn.h" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for dlfcn.h""... $ac_c" 1>&6
-echo "configure:14188: checking for dlfcn.h" >&5
-cat > conftest.$ac_ext <<EOF
-#line 14191 "configure"
-#include "confdefs.h"
-#include <dlfcn.h>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:14196: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
-rm -rf conftest*
-eval "ac_cv_header_$ac_safe=yes"
-else
-echo "$ac_err" >&5
-echo "configure: failed program was:" >&5
-cat conftest.$ac_ext >&5
-rm -rf conftest*
-eval "ac_cv_header_$ac_safe=no"
-fi
-rm -f conftest*
-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
-echo "$ac_t""yes" 1>&6
-	echo $ac_n "checking for dlopen in -lc""... $ac_c" 1>&6
-echo "configure:14213: checking for dlopen in -lc" >&5
-	cat > conftest.$ac_ext <<EOF
-#line 14215 "configure"
-#include "confdefs.h"
-#include <dlfcn.h>
-int main() {
-	  dlopen ("", 0);
-; return 0; }
-EOF
-if { (eval echo configure:14222: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-rm -rf conftest*
-have_dl=yes
-else
-echo "configure: failed program was:" >&5
-cat conftest.$ac_ext >&5
-rm -rf conftest*
-	  echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
-echo "configure:14231: checking for dlopen in -ldl" >&5
-	ac_save_LIBS="$LIBS"
-	LIBS="-ldl $LIBS"
-	cat > conftest.$ac_ext <<EOF
-#line 14235 "configure"
-#include "confdefs.h"
-#include <dlfcn.h>
-int main() {
-	  dlopen ("", 0);
-; return 0; }
-EOF
-if { (eval echo configure:14242: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-rm -rf conftest*
-have_dl=yes
-else
-echo "configure: failed program was:" >&5
-cat conftest.$ac_ext >&5
-rm -rf conftest*
-LIBS="$ac_save_LIBS"
-fi
-rm -f conftest*
-	ac_save_LIBS=
-fi
-rm -f conftest*
-else
-echo "$ac_t""no" 1>&6
-fi
-if test -n "$have_dl"; then
-	{ test "$extra_verbose" = "yes" && cat << \EOF
-Defining HAVE_DLOPEN
-EOF
-cat >> confdefs.h <<\EOF
-#define HAVE_DLOPEN 1
-EOF
-}
-else
-echo $ac_n "checking for shl_load in -ldld""... $ac_c" 1>&6
-echo "configure:14271: checking for shl_load in -ldld" >&5
-ac_lib_var=`echo dld'_'shl_load | sed 'y%./+-%__p_%'`
-xe_check_libs=" -ldld "
-cat > conftest.$ac_ext <<EOF
-#line 14276 "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 shl_load();
-int main() {
-shl_load()
-; return 0; }
-EOF
-if { (eval echo configure:14287: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-rm -rf conftest*
-eval "ac_cv_lib_$ac_lib_var=yes"
-else
-echo "configure: failed program was:" >&5
-cat conftest.$ac_ext >&5
-rm -rf conftest*
-eval "ac_cv_lib_$ac_lib_var=no"
-fi
-rm -f conftest*
-xe_check_libs=""
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes" ; then
-echo "$ac_t""yes" 1>&6
-libdl=dld have_dl=yes;
-	  { test "$extra_verbose" = "yes" && cat << \EOF
-Defining HAVE_SHL_LOAD
-EOF
-cat >> confdefs.h <<\EOF
-#define HAVE_SHL_LOAD 1
-EOF
-}
-else
-echo "$ac_t""no" 1>&6
-echo $ac_n "checking for dld_init in -ldld""... $ac_c" 1>&6
-echo "configure:14314: checking for dld_init in -ldld" >&5
-ac_lib_var=`echo dld'_'dld_init | sed 'y%./+-%__p_%'`
-xe_check_libs=" -ldld "
-cat > conftest.$ac_ext <<EOF
-#line 14319 "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 dld_init();
-int main() {
-dld_init()
-; return 0; }
-EOF
-if { (eval echo configure:14330: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-rm -rf conftest*
-eval "ac_cv_lib_$ac_lib_var=yes"
-else
-echo "configure: failed program was:" >&5
-cat conftest.$ac_ext >&5
-rm -rf conftest*
-eval "ac_cv_lib_$ac_lib_var=no"
-fi
-rm -f conftest*
-xe_check_libs=""
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes" ; then
-echo "$ac_t""yes" 1>&6
-libdl=dld have_dl=yes;
-	  { test "$extra_verbose" = "yes" && cat << \EOF
-Defining HAVE_DLD_INIT
-EOF
-cat >> confdefs.h <<\EOF
-#define HAVE_DLD_INIT 1
-EOF
-}
-else
-echo "$ac_t""no" 1>&6
-fi
-fi
-fi
-esac   fi
-if test -n "$have_dl"; then
-dll_ld=
-dll_ldflags=
-dll_cflags=
-dll_post=
-dll_ldo="-o"
-ld_dynamic_link_flags=
-xehost=$canonical
-xealias=$internal_configuration
-echo "checking how to build dynamic libraries for ${xehost}" 1>&6
-echo "configure:14375: checking how to build dynamic libraries for ${xehost}" >&5
-# Transform *-*-linux* to *-*-linux-gnu*, to support old configure scripts.
-case "$xehost" in
-*-*-linux-gnu*) ;;
-*-*-linux*) xehost=`echo $xehost | sed 's/^\(.*-.*-linux\)\(.*\)$/\1-gnu\2/'`
-esac
-xehost_cpu=`echo $xehost | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-xehost_vendor=`echo $xehost | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-xehost_os=`echo $xehost | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-case "$xehost_os" in
-aix3*)
-# AIX sometimes has problems with the GCC collect2 program.  For some
-# reason, if we set the COLLECT_NAMES environment variable, the problems
-# vanish in a puff of smoke.
-if test "${COLLECT_NAMES+set}" != set; then
-COLLECT_NAMES=
-export COLLECT_NAMES
-fi
-;;
-esac
-# Now see if the compiler is really GCC.
-if test "$GCC" = "yes"; then
-XEGCC=yes
-else
-echo $ac_n "checking checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:14403: checking checking whether we are using GNU C" >&5
-cat > conftest.$ac_ext <<EOF
-#line 14405 "configure"
-#include "confdefs.h"
-#ifdef __GNUC__
-yes;
-#endif
-EOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-egrep "yes" >/dev/null 2>&1; then
-rm -rf conftest*
-XEGCC=yes
-else
-rm -rf conftest*
-XEGCC=no
-fi
-rm -f conftest*
-echo "$ac_t""${XEGCC}" 1>&6
-fi
-echo $ac_n "checking how to produce PIC code""... $ac_c" 1>&6
-echo "configure:14427: checking how to produce PIC code" >&5
-wl=
-can_build_shared=yes
-cygwin_warn=
-if test "$XEGCC" = yes; then
-wl='-Wl,'
-case "$xehost_os" in
-aix[3-9]* | irix[5-9]* | osf[3-9])
-# PIC is the default for these OSes.
-;;
-*darwin*) dll_cflags='-dynamic'
-;;
-os2*)
-# We can build DLLs from non-PIC.
-;;
-amigaos*)
-# FIXME: we need at least 68020 code to build shared libraries, but
-# adding the `-m68020' flag to GCC prevents building anything better,
-# like `-m68040'.
-dll_cflags='-m68020 -resident32 -malways-restore-a4'
-;;
-*cygwin* | *mingw* )
-# PIC is the default
-cygwin_warn=yes
-# #### Need some trickery involving import libraries that we don't
-# currently support.
-can_build_shared=no
-;;
-*)
-dll_cflags='-fPIC'
-;;
-esac
-else
-# PORTME Check for PIC flags for the system compiler.
-case "$xehost_os" in
-hpux9* | hpux1[0-9]*)
-# Is there a better link_static_flag that works with the bundled CC?
-wl='-Wl,'
-dll_cflags='+Z'
-;;
-irix[5-9]*)
-wl='-Wl,'
-# PIC (with -KPIC) is the default.
-;;
-os2*)
-# We can build DLLs from non-PIC.
-;;
-osf[3-9]*)
-# All OSF/1 code is PIC.
-wl='-Wl,'
-;;
-aix[3-9]*)
-# All AIX code is PIC.
-wl='-Wl,'
-;;
-sco3.2v5*)
-dll_cflags='-belf -Kpic'
-wl='-Wl,'
-;;
-unixware*)
-dll_cflags="-KPIC"
-wl="-Wl,"
-;;
-sysv4*)
-dll_cflags="-KPIC"
-wl="-Wl,"
-;;
-sysv5*)
-dll_cflags="-KPIC"
-wl="-Wl,"
-;;
-solaris2*)
-dll_cflags='-KPIC'
-wl='-Wl,'
-;;
-sunos4*)
-dll_cflags='-PIC'
-wl='-Qoption ld '
-;;
-uts4*)
-dll_cflags='-pic'
-;;
-*)
-can_build_shared=no
-;;
-esac
-fi
-if test -n "$dll_cflags"; then
-echo "$ac_t""${dll_cflags}" 1>&6
-# Check to make sure the dll_cflags actually works.
-echo $ac_n "checking if PIC flag ${dll_cflags} really works""... $ac_c" 1>&6
-echo "configure:14536: checking if PIC flag ${dll_cflags} really works" >&5
-save_CFLAGS="$CFLAGS"
-CFLAGS="$CFLAGS $dll_cflags -DPIC"
-cat > conftest.$ac_ext <<EOF
-#line 14540 "configure"
-#include "confdefs.h"
-int main() {
-int x=0;
-; return 0; }
-EOF
-if { (eval echo configure:14547: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-rm -rf conftest*
-# On HP-UX, the stripped-down bundled CC doesn't accept +Z, but also
-# reports no error.  So, we need to grep stderr for (Bundled).
-if grep '(Bundled)' config.log >/dev/null; then
-echo "$ac_t""no" 1>&6
-can_build_shared=no
-dll_cflags=
-else
-echo "$ac_t""yes" 1>&6
-fi
-else
-echo "configure: failed program was:" >&5
-cat conftest.$ac_ext >&5
-rm -rf conftest*
-echo "$ac_t""no" 1>&6
-can_build_shared=no
-dll_cflags=
-fi
-rm -f conftest*
-CFLAGS="$save_CFLAGS"
-else
-echo "$ac_t""none" 1>&6
-fi
-if test -n "$cygwin_warn"; then
-echo "configure: warning: Cannot currently build modules under Cygwin." 1>&2
-fi
-if test "$can_build_shared" = "yes"; then
-cc_produces_so=no
-xldf=
-xcldf=
-echo $ac_n "checking if C compiler can produce shared libraries""... $ac_c" 1>&6
-echo "configure:14582: checking if C compiler can produce shared libraries" >&5
-if test "$XEGCC" = yes; then
-case "$xehost_os" in
-*darwin*)
-xcldf='-bundle'
-	  xldf='-bundle -bundle_loader ../../src/xemacs'
-;;
-* )
-xcldf="-shared"
-xldf="-shared"
-;;
-esac
-else # Not using GCC
-case "$xehost_os" in
-aix[3-9]*)
-xldf="-bE:ELLSONAME.exp -H512 -T512 -bhalt:4 -bM:SRE -bnoentry -lc"
-xcldf="${wl}-bE:ELLSONAME.exp ${wl}-H512 ${wl}-T512 ${wl}-bhalt:4 ${wl}-bM:SRE ${wl}-bnoentry ${wl}-lc"
-;;
-freebsd2* | netbsd* | openbsd*)
-xldf="-Bshareable"
-xcldf="${wl}-Bshareable"
-;;
-freebsd3*)
-xcldf="-shared"
-;;
-hpux*)
-xldf="-b +s"
-xcldf="${wl}-b ${wl}+s"
-;;
-irix[5-9]* | osf[3-9]*)
-xcldf="${wl}-shared"
-xldf="-shared"
-;;
-sco3.2v5* | unixware* | sysv5* | sysv4* | solaris2* | solaris7* | uts4*)
-xcldf="-G"
-xldf="-G"
-;;
-sunos4*)
-xcldf="${wl}-assert ${wl}pure-text ${wl}-Bstatic"
-xldf="-assert pure-text -Bstatic"
-;;
-esac
-fi # End if if we are using gcc
-if test -n "$xcldf"; then
-save_LDFLAGS=$LDFLAGS
-save_LIBS=$LIBS
-save_xe_libs=$xe_libs
-LDFLAGS="$xcldf $LDFLAGS"
-LIBS=
-xe_libs=
-ac_link='${CC-cc} -o conftest $CFLAGS '"$xe_cppflags $xe_ldflags"' conftest.$ac_ext '"$xe_libs"' 1>&5'
-cat > conftest.$ac_ext <<EOF
-#line 14641 "configure"
-#include "confdefs.h"
-int main() {
-int x=0;
-; return 0; }
-EOF
-if { (eval echo configure:14648: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-rm -rf conftest*
-cc_produces_so=yes
-else
-echo "configure: failed program was:" >&5
-cat conftest.$ac_ext >&5
-rm -rf conftest*
-cc_produces_so=no
-fi
-rm -f conftest*
-LDFLAGS=$save_LDFLAGS
-LIBS=$save_LIBS
-xe_libs=$save_xe_libs
-ac_link='${CC-cc} -o conftest $CFLAGS '"$xe_cppflags $xe_ldflags"' conftest.$ac_ext '"$xe_libs"' 1>&5'
-else
-cc_produces_so=no
-fi
-echo "$ac_t""${cc_produces_so}" 1>&6
-LTLD=$LD
-if test -z "$LTLD"; then
-ac_prog=ld
-if test "$XEGCC" = yes; then
-# Check if gcc -print-prog-name=ld gives a path.
-echo $ac_n "checking for ld used by GCC""... $ac_c" 1>&6
-echo "configure:14673: checking for ld used by GCC" >&5
-ac_prog=`($CC -print-prog-name=ld) 2>&5`
-case "$ac_prog" in
-# Accept absolute paths.
-/*)
-if test -z "$LTLD"; then
-#        case "$ac_prog" in
-#          *gcc-lib*) LTLD="$CC"
-#                     ;;
-#          *)
-LTLD="$ac_prog"
-#                     ;;
-#        esac
-fi
-;;
-"")
-# If it fails, then pretend we aren't using GCC.
-ac_prog=ld
-;;
-*)
-# If it is relative, then search for the first ld in PATH.
-with_gnu_ld=unknown
-;;
-esac
-else
-echo $ac_n "checking for GNU ld""... $ac_c" 1>&6
-echo "configure:14699: checking for GNU ld" >&5
-fi
-if test -z "$LTLD"; then
-IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
-for ac_dir in $PATH; do
-test -z "$ac_dir" && ac_dir=.
-if test -f "$ac_dir/$ac_prog"; then
-LTLD="$ac_dir/$ac_prog"
-# Check to see if the program is GNU ld.  I'd rather use --version,
-# but apparently some GNU ld's only accept -v.
-# Break only if it was the GNU/non-GNU ld that we prefer.
-if "$LTLD" -v 2>&1 < /dev/null | egrep '(GNU|with BFD)' > /dev/null; then
-xe_gnu_ld=yes
-else
-xe_gnu_ld=no
-fi
-fi
-done
-IFS="$ac_save_ifs"
-fi
-if test -n "$LTLD"; then
-echo "$ac_t""${LTLD}" 1>&6
-else
-echo "$ac_t""no" 1>&6
-fi
-if test -z "$LTLD" -a "$cc_produces_so" = no; then
-{ echo "configure: error: no acceptable linker found in \$PATH" 1>&2; exit 1; }
-exit 1
-fi
-fi
-ld_dynamic_link_flags=
-# Check to see if it really is or isn't GNU ld.
-echo $ac_n "checking if the linker is GNU ld""... $ac_c" 1>&6
-echo "configure:14737: checking if the linker is GNU ld" >&5
-# I'd rather use --version here, but apparently some GNU ld's only accept -v.
-if $LTLD -v 2>&1 </dev/null | egrep '(GNU|with BFD)' 1>&5; then
-xe_gnu_ld=yes
-else
-xe_gnu_ld=no
-fi
-echo "$ac_t""${xe_gnu_ld}" 1>&6
-case "$xehost_os" in
-amigaos* | sunos4*)
-# On these operating systems, we should treat GNU ld like the system ld.
-gnu_ld_acts_native=yes
-;;
-*)
-gnu_ld_acts_native=no
-;;
-esac
-if test "$cc_produces_so" = "yes"; then
-dll_ld=$CC
-dll_ldflags=$xcldf
-can_build_shared=yes
-ld_shlibs=yes
-else
-# OK - only NOW do we futz about with ld.
-# See if the linker supports building shared libraries.
-echo $ac_n "checking whether the linker supports shared libraries""... $ac_c" 1>&6
-echo "configure:14765: checking whether the linker supports shared libraries" >&5
-dll_ld=$CC
-dll_ldflags=$LDFLAGS
-ld_shlibs=yes
-can_build_shared=yes
-if test "$xe_gnu_ld" = yes && test "$gnu_ld_acts_native" != yes; then
-# See if GNU ld supports shared libraries.
-if $LTLD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then
-dll_ld=$CC
-dll_ldflags="-shared"
-ld_shlibs=yes
-else
-ld_shlibs=no
-fi
-else
-# PORTME fill in a description of your system's linker (not GNU ld)
-case "$xehost_os" in
-aix3*)
-dll_ld=$LTLD
-dll_ldflags=$xldf
-;;
-aix[4-9]*)
-dll_ldflags=$xcldf
-;;
-# FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
-# support.  Future versions do this automatically, but an explicit c++rt0.o
-# doesn't break anything, and helps significantly (at the cost of a little
-# extra space).
-freebsd2.2*)
-dll_ld=$LTLD
-dll_ldflags=$xldf
-dll_post="/usr/lib/c++rt0.o"
-;;
-# Unfortunately, older versions of FreeBSD 2 don't have this feature.
-freebsd2*)
-dll_ld=$LTLD
-dll_ldflags="-Bshareable"
-;;
-# FreeBSD 3, at last, uses gcc -shared to do shared libraries.
-freebsd3*)
-dll_ldflags="-shared"
-;;
-hpux*)
-dll_ld=$LTLD
-dll_ldflags=$xldf
-;;
-irix[5-9]*)
-dll_ld=$LTLD
-dll_ldflags=$xldf
-;;
-netbsd*)
-# Tested with NetBSD 1.2 ld
-dll_ld=$LTLD
-dll_ldflags=$xldf
-;;
-openbsd*)
-dll_ld=$LTLD
-dll_ldflags=$xldf
-;;
-osf3* | osf4*)
-dll_ld=$LTLD
-dll_ldflags=$xldf
-;;
-# For both SCO and Solaris we MAY want to have LDFLAGS include -z text
-sco3.2v5* | unixware* | sysv5* | sysv4* | solaris2* | solaris7*)
-dll_ld=$LTLD
-case "$dll_ld" in
-*gcc*) dll_ldflags="-shared"
-dll_ld=$CC
-;;
-*)     dll_ldflags="-G"
-;;
-esac
-;;
-sunos4*)
-if test "$XEGCC" = yes; then
-dll_ld=$CC
-else
-dll_ld=$LTLD
-fi
-dll_ldflags=$xldf
-;;
-uts4*)
-dll_ld=$LTLD
-dll_ldflags="-G"
-;;
-bsdi*)
-dll_ldflags="-r"
-dll_ld="shlicc2"
-;;
-*)
-ld_shlibs=no
-can_build_shared=no
-;;
-esac
-fi
-echo "$ac_t""${ld_shlibs}" 1>&6
-if test "$ld_shlibs" = "no"; then
-can_build_shared=no
-fi
-fi # End of if cc_produces_so = no
-if test "$xe_gnu_ld" = yes; then
-if test "$ld_shlibs" = yes; then
-ld_dynamic_link_flags="${wl}-export-dynamic"
-fi
-fi
-if test -z "$ld_dynamic_link_flags"; then
-case "$xehost_os" in
-aix[3-9]*)
-ld_dynamic_link_flags=
-;;
-*darwin*)
-ld_dynamic_link_flags=
-;;
-freebsd2.2*)
-ld_dynamic_link_flags=
-;;
-freebsd2*)
-ld_dynamic_link_flags=
-;;
-freebsd3*)
-ld_dynamic_link_flags=
-;;
-hpux*)
-ld_dynamic_link_flags="${wl}-E"
-;;
-irix[5-9]*)
-ld_dynamic_link_flags=
-;;
-netbsd*)
-ld_dynamic_link_flags=
-;;
-openbsd*)
-ld_dynamic_link_flags=
-;;
-osf3* | osf4*)
-ld_dynamic_link_flags=
-;;
-solaris2* | solaris7*)
-ld_dynamic_link_flags=
-;;
-sco3.2v5* | unixware* | sysv5* | sysv4*)
-ld_dynamic_link_flags="${wl}-Bexport"
-;;
-sunos4*)
-ld_dynamic_link_flags=
-;;
-uts4*)
-ld_dynamic_link_flags=
-;;
-bsdi*)
-ld_dynamic_link_flags=
-;;
-esac
-fi # End of if -z ld_dynamic_link_flags
-fi # End of if test "$can_build_shared" = "yes"
-fi
-if test "$can_build_shared" = "yes"; then
-{ test "$extra_verbose" = "yes" && cat << \EOF
-Defining HAVE_SHLIB
-EOF
-cat >> confdefs.h <<\EOF
-#define HAVE_SHLIB 1
-EOF
-}
-INSTALL_ARCH_DEP_SUBDIR="$INSTALL_ARCH_DEP_SUBDIR src" &&  if test "$extra_verbose" = "yes"; then echo "    Appending \"src\" to \$INSTALL_ARCH_DEP_SUBDIR"; fi
-test -n "$libdl" && LIBS="-l${libdl} $LIBS" &&  if test "$extra_verbose" = "yes"; then echo "    Prepending \"-l${libdl}\" to \$LIBS"; fi
-for ac_func in dlerror _dlerror
-do
-echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:14976: checking for $ac_func" >&5
-cat > conftest.$ac_ext <<EOF
-#line 14979 "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.  */
-/* We use char because int might match the return type of a gcc2
-builtin and then its argument prototype would still apply.  */
-char $ac_func();
-int main() {
-/* The GNU C library defines this for functions which it implements
-to always fail with ENOSYS.  Some functions are actually named
-something starting with __ and the normal name is an alias.  */
-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
-choke me
-#else
-$ac_func();
-#endif
-; return 0; }
-EOF
-if { (eval echo configure:15002: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-rm -rf conftest*
-eval "ac_cv_func_$ac_func=yes"
-else
-echo "configure: failed program was:" >&5
-cat conftest.$ac_ext >&5
-rm -rf conftest*
-eval "ac_cv_func_$ac_func=no"
-fi
-rm -f conftest*
-if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
-echo "$ac_t""yes" 1>&6
-ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
-{ test "$extra_verbose" = "yes" && cat << EOF
-Defining $ac_tr_func
-EOF
-cat >> confdefs.h <<EOF
-#define $ac_tr_func 1
-EOF
-}
-else
-echo "$ac_t""no" 1>&6
-fi
-done
-with_modules=yes
-MOD_CC="../../lib-src/ellcc"
-MODCFLAGS="\$(CFLAGS) --mode=compile --mod-output=\$@ -I../../src -I\$(srcdir)/../../src"
-INSTALLPATH="\$(moduledir)"
-MOD_INSTALL_PROGRAM=${INSTALL_PROGRAM}
-OBJECT_TO_BUILD="\$(MODNAME).ell"
-else
-if test "$with_modules" = "yes"; then
-{ echo "Error:" "Required module support cannot be provided." >&2; exit 1; }
-else
-echo "    No module support."
-fi
-with_modules=no
-MOD_CC="$XEMACS_CC"
-MODCFLAGS="\$(CFLAGS) -I../../src -I\$(srcdir)/../../src"
-INSTALLPATH=""
-MOD_INSTALL_PROGRAM="true"
-OBJECT_TO_BUILD="\$(MODNAME).o"
-fi
-fi
-MODARCHDIR=
-MAKE_DOCFILE="../../lib-src/make-docfile"
-echo "checking for LDAP" 1>&6
-echo "configure:15062: checking for LDAP" >&5
-ldap_libs=
-test -z "$with_ldap" && { ac_safe=`echo "ldap.h" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for ldap.h""... $ac_c" 1>&6
-echo "configure:15066: checking for ldap.h" >&5
-cat > conftest.$ac_ext <<EOF
-#line 15069 "configure"
-#include "confdefs.h"
-#include <ldap.h>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:15074: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
-rm -rf conftest*
-eval "ac_cv_header_$ac_safe=yes"
-else
-echo "$ac_err" >&5
-echo "configure: failed program was:" >&5
-cat conftest.$ac_ext >&5
-rm -rf conftest*
-eval "ac_cv_header_$ac_safe=no"
-fi
-rm -f conftest*
-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
-echo "$ac_t""yes" 1>&6
-:
-else
-echo "$ac_t""no" 1>&6
-with_ldap=no
-fi
-}
-test -z "$with_ldap" && { ac_safe=`echo "lber.h" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for lber.h""... $ac_c" 1>&6
-echo "configure:15097: checking for lber.h" >&5
-cat > conftest.$ac_ext <<EOF
-#line 15100 "configure"
-#include "confdefs.h"
-#include <lber.h>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:15105: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
-rm -rf conftest*
-eval "ac_cv_header_$ac_safe=yes"
-else
-echo "$ac_err" >&5
-echo "configure: failed program was:" >&5
-cat conftest.$ac_ext >&5
-rm -rf conftest*
-eval "ac_cv_header_$ac_safe=no"
-fi
-rm -f conftest*
-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
-echo "$ac_t""yes" 1>&6
-:
-else
-echo "$ac_t""no" 1>&6
-with_ldap=no
-fi
-}
-if test "$with_ldap" != "no"; then
-echo $ac_n "checking for ldap_search in -lldap""... $ac_c" 1>&6
-echo "configure:15129: checking for ldap_search in -lldap" >&5
-ac_lib_var=`echo ldap'_'ldap_search | sed 'y%./+-%__p_%'`
-xe_check_libs=" -lldap "
-cat > conftest.$ac_ext <<EOF
-#line 15134 "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 ldap_search();
-int main() {
-ldap_search()
-; return 0; }
-EOF
-if { (eval echo configure:15145: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-rm -rf conftest*
-eval "ac_cv_lib_$ac_lib_var=yes"
-else
-echo "configure: failed program was:" >&5
-cat conftest.$ac_ext >&5
-rm -rf conftest*
-eval "ac_cv_lib_$ac_lib_var=no"
-fi
-rm -f conftest*
-xe_check_libs=""
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes" ; then
-echo "$ac_t""yes" 1>&6
-with_ldap_nolber=yes
-else
-echo "$ac_t""no" 1>&6
-with_ldap_nolber=no
-fi
-test "$with_ldap_nolber" = "no" && {
-xe_msg_checking="for ldap_open in -lldap"
-test -n "-llber" && xe_msg_checking="$xe_msg_checking using extra libs -llber"
-echo $ac_n "checking "$xe_msg_checking"""... $ac_c" 1>&6
-echo "configure:15170: checking "$xe_msg_checking"" >&5
-ac_lib_var=`echo ldap'_'ldap_open | sed 'y%./+-%__p_%'`
-xe_check_libs=" -lldap -llber"
-cat > conftest.$ac_ext <<EOF
-#line 15175 "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 ldap_open();
-int main() {
-ldap_open()
-; return 0; }
-EOF
-if { (eval echo configure:15186: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-rm -rf conftest*
-eval "ac_cv_lib_$ac_lib_var=yes"
-else
-echo "configure: failed program was:" >&5
-cat conftest.$ac_ext >&5
-rm -rf conftest*
-eval "ac_cv_lib_$ac_lib_var=no"
-fi
-rm -f conftest*
-xe_check_libs=""
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes" ; then
-echo "$ac_t""yes" 1>&6
-with_ldap_lber=yes
-else
-echo "$ac_t""no" 1>&6
-with_ldap_lber=no
-fi
-}
-test "$with_ldap_nolber" = "no" -a "$with_ldap_lber" = "no" && {
-xe_msg_checking="for ldap_open in -lldap"
-test -n "-llber -lkrb" && xe_msg_checking="$xe_msg_checking using extra libs -llber -lkrb"
-echo $ac_n "checking "$xe_msg_checking"""... $ac_c" 1>&6
-echo "configure:15211: checking "$xe_msg_checking"" >&5
-ac_lib_var=`echo ldap'_'ldap_open | sed 'y%./+-%__p_%'`
-xe_check_libs=" -lldap -llber -lkrb"
-cat > conftest.$ac_ext <<EOF
-#line 15216 "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 ldap_open();
-int main() {
-ldap_open()
-; return 0; }
-EOF
-if { (eval echo configure:15227: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-rm -rf conftest*
-eval "ac_cv_lib_$ac_lib_var=yes"
-else
-echo "configure: failed program was:" >&5
-cat conftest.$ac_ext >&5
-rm -rf conftest*
-eval "ac_cv_lib_$ac_lib_var=no"
-fi
-rm -f conftest*
-xe_check_libs=""
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes" ; then
-echo "$ac_t""yes" 1>&6
-with_ldap_krb=yes
-else
-echo "$ac_t""no" 1>&6
-with_ldap_krb=no
-fi
-}
-test "$with_ldap_nolber" = "no" -a "$with_ldap_lber" = "no" -a "$with_ldap_krb" = "no" && {
-xe_msg_checking="for ldap_open in -lldap"
-test -n "-llber -lkrb -ldes" && xe_msg_checking="$xe_msg_checking using extra libs -llber -lkrb -ldes"
-echo $ac_n "checking "$xe_msg_checking"""... $ac_c" 1>&6
-echo "configure:15252: checking "$xe_msg_checking"" >&5
-ac_lib_var=`echo ldap'_'ldap_open | sed 'y%./+-%__p_%'`
-xe_check_libs=" -lldap -llber -lkrb -ldes"
-cat > conftest.$ac_ext <<EOF
-#line 15257 "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 ldap_open();
-int main() {
-ldap_open()
-; return 0; }
-EOF
-if { (eval echo configure:15268: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-rm -rf conftest*
-eval "ac_cv_lib_$ac_lib_var=yes"
-else
-echo "configure: failed program was:" >&5
-cat conftest.$ac_ext >&5
-rm -rf conftest*
-eval "ac_cv_lib_$ac_lib_var=no"
-fi
-rm -f conftest*
-xe_check_libs=""
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes" ; then
-echo "$ac_t""yes" 1>&6
-with_ldap_krbdes=yes
-else
-echo "$ac_t""no" 1>&6
-with_ldap_krbdes=no
-fi
-}
-test -z "$with_ldap" -a \( "$with_ldap_lber" = "yes" -o "$with_ldap_nolber" = "yes" -o "$with_ldap_krb" = "yes" -o "$with_ldap_krbdes" = "yes" \) && with_ldap=yes
-fi
-if test "$with_ldap" = "yes"; then
-{ test "$extra_verbose" = "yes" && cat << \EOF
-Defining HAVE_LDAP
-EOF
-cat >> confdefs.h <<\EOF
-#define HAVE_LDAP 1
-EOF
-}
-if test "$with_ldap_nolber" = "yes" ; then
-ldap_libs="-lldap $ldap_libs" &&  if test "$extra_verbose" = "yes"; then echo "    Prepending \"-lldap\" to \$ldap_libs"; fi
-else
-if test "$with_ldap_krb" = "yes" ; then
-ldap_libs="-lkrb $ldap_libs" &&  if test "$extra_verbose" = "yes"; then echo "    Prepending \"-lkrb\" to \$ldap_libs"; fi
-fi
-if test "$with_ldap_krbdes" = "yes" ; then
-ldap_libs="-ldes $ldap_libs" &&  if test "$extra_verbose" = "yes"; then echo "    Prepending \"-ldes\" to \$ldap_libs"; fi
-ldap_libs="-lkrb $ldap_libs" &&  if test "$extra_verbose" = "yes"; then echo "    Prepending \"-lkrb\" to \$ldap_libs"; fi
-fi
-ldap_libs="-llber $ldap_libs" &&  if test "$extra_verbose" = "yes"; then echo "    Prepending \"-llber\" to \$ldap_libs"; fi
-ldap_libs="-lldap $ldap_libs" &&  if test "$extra_verbose" = "yes"; then echo "    Prepending \"-lldap\" to \$ldap_libs"; fi
-fi
-save_LIBS="$LIBS" LIBS="$LIBS $ldap_libs"
-for ac_func in ldap_set_option ldap_get_lderrno ldap_result2error ldap_parse_result
-do
-echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:15317: checking for $ac_func" >&5
-cat > conftest.$ac_ext <<EOF
-#line 15320 "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.  */
-/* We use char because int might match the return type of a gcc2
-builtin and then its argument prototype would still apply.  */
-char $ac_func();
-int main() {
-/* The GNU C library defines this for functions which it implements
-to always fail with ENOSYS.  Some functions are actually named
-something starting with __ and the normal name is an alias.  */
-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
-choke me
-#else
-$ac_func();
-#endif
-; return 0; }
-EOF
-if { (eval echo configure:15343: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-rm -rf conftest*
-eval "ac_cv_func_$ac_func=yes"
-else
-echo "configure: failed program was:" >&5
-cat conftest.$ac_ext >&5
-rm -rf conftest*
-eval "ac_cv_func_$ac_func=no"
-fi
-rm -f conftest*
-if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
-echo "$ac_t""yes" 1>&6
-ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
-{ test "$extra_verbose" = "yes" && cat << EOF
-Defining $ac_tr_func
-EOF
-cat >> confdefs.h <<EOF
-#define $ac_tr_func 1
-EOF
-}
-else
-echo "$ac_t""no" 1>&6
-fi
-done
-LIBS="$save_LIBS"
-MAKE_SUBDIR="$MAKE_SUBDIR modules/ldap" &&  if test "$extra_verbose" = "yes"; then echo "    Appending \"modules/ldap\" to \$MAKE_SUBDIR"; fi
-need_modules_common=yes
-if test "$with_modules" = "yes"; then
-INSTALL_ARCH_DEP_SUBDIR="$INSTALL_ARCH_DEP_SUBDIR modules/ldap" &&  if test "$extra_verbose" = "yes"; then echo "    Appending \"modules/ldap\" to \$INSTALL_ARCH_DEP_SUBDIR"; fi
-fi
-fi
-postgresql_libs=
-if test "$with_postgresql" != "no"; then
-echo "checking for PostgreSQL" 1>&6
-echo "configure:15382: checking for PostgreSQL" >&5
-for header_dir in "" "pgsql/" "postgresql/"; do
-ac_safe=`echo "${header_dir}libpq-fe.h" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for ${header_dir}libpq-fe.h""... $ac_c" 1>&6
-echo "configure:15387: checking for ${header_dir}libpq-fe.h" >&5
-cat > conftest.$ac_ext <<EOF
-#line 15390 "configure"
-#include "confdefs.h"
-#include <${header_dir}libpq-fe.h>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:15395: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
-rm -rf conftest*
-eval "ac_cv_header_$ac_safe=yes"
-else
-echo "$ac_err" >&5
-echo "configure: failed program was:" >&5
-cat conftest.$ac_ext >&5
-rm -rf conftest*
-eval "ac_cv_header_$ac_safe=no"
-fi
-rm -f conftest*
-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
-echo "$ac_t""yes" 1>&6
-libpq_fe_h_file=${header_dir}libpq-fe.h; break
-else
-echo "$ac_t""no" 1>&6
-fi
-done
-test -n "$libpq_fe_h_file" && {
-echo $ac_n "checking for PQconnectdb in -lpq""... $ac_c" 1>&6
-echo "configure:15419: checking for PQconnectdb in -lpq" >&5
-ac_lib_var=`echo pq'_'PQconnectdb | sed 'y%./+-%__p_%'`
-xe_check_libs=" -lpq "
-cat > conftest.$ac_ext <<EOF
-#line 15424 "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 PQconnectdb();
-int main() {
-PQconnectdb()
-; return 0; }
-EOF
-if { (eval echo configure:15435: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-rm -rf conftest*
-eval "ac_cv_lib_$ac_lib_var=yes"
-else
-echo "configure: failed program was:" >&5
-cat conftest.$ac_ext >&5
-rm -rf conftest*
-eval "ac_cv_lib_$ac_lib_var=no"
-fi
-rm -f conftest*
-xe_check_libs=""
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes" ; then
-echo "$ac_t""yes" 1>&6
-have_libpq=yes
-else
-echo "$ac_t""no" 1>&6
-fi
-}
-if test -n "$libpq_fe_h_file" -a "$have_libpq" = "yes"; then
-with_postgresql=yes
-{ test "$extra_verbose" = "yes" && cat << \EOF
-Defining HAVE_POSTGRESQL
-EOF
-cat >> confdefs.h <<\EOF
-#define HAVE_POSTGRESQL 1
-EOF
-}
-echo $ac_n "checking for PQconnectStart in -lpq""... $ac_c" 1>&6
-echo "configure:15468: checking for PQconnectStart in -lpq" >&5
-ac_lib_var=`echo pq'_'PQconnectStart | sed 'y%./+-%__p_%'`
-xe_check_libs=" -lpq "
-cat > conftest.$ac_ext <<EOF
-#line 15473 "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 PQconnectStart();
-int main() {
-PQconnectStart()
-; return 0; }
-EOF
-if { (eval echo configure:15484: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-rm -rf conftest*
-eval "ac_cv_lib_$ac_lib_var=yes"
-else
-echo "configure: failed program was:" >&5
-cat conftest.$ac_ext >&5
-rm -rf conftest*
-eval "ac_cv_lib_$ac_lib_var=no"
-fi
-rm -f conftest*
-xe_check_libs=""
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes" ; then
-echo "$ac_t""yes" 1>&6
-with_postgresqlv7=yes;
-{ test "$extra_verbose" = "yes" && cat << \EOF
-Defining HAVE_POSTGRESQLV7
-EOF
-cat >> confdefs.h <<\EOF
-#define HAVE_POSTGRESQLV7 1
-EOF
-}
-else
-echo "$ac_t""no" 1>&6
-fi
-{ test "$extra_verbose" = "yes" && cat << EOF
-Defining LIBPQ_FE_H_FILE = "$libpq_fe_h_file"
-EOF
-cat >> confdefs.h <<EOF
-#define LIBPQ_FE_H_FILE "$libpq_fe_h_file"
-EOF
-}
-postgresql_libs="-lpq $postgresql_libs" &&  if test "$extra_verbose" = "yes"; then echo "    Prepending \"-lpq\" to \$postgresql_libs"; fi
-MAKE_SUBDIR="$MAKE_SUBDIR modules/postgresql" &&  if test "$extra_verbose" = "yes"; then echo "    Appending \"modules/postgresql\" to \$MAKE_SUBDIR"; fi
-need_modules_common=yes
-if test "$with_modules" = "yes"; then
-INSTALL_ARCH_DEP_SUBDIR="$INSTALL_ARCH_DEP_SUBDIR modules/postgresql" &&  if test "$extra_verbose" = "yes"; then echo "    Appending \"modules/postgresql\" to \$INSTALL_ARCH_DEP_SUBDIR"; fi
-fi
-elif test "$with_postgresql" = "yes"; then
-{ echo "Error:" "Required PostgreSQL support cannot be provided.  Check --site-prefixes." >&2; exit 1; }
-fi
-fi
 internal_makefile_list="Makefile.in"
 SUBDIR_MAKEFILES=''
 test -d lock || mkdir lock
 for dir in $MAKE_SUBDIR; do
 case "$dir" in */* )     ( for d in `echo $dir | sed 's:/: :g'` ; do
 s%@X_LIBS@%$X_LIBS%g
 s%@X_EXTRA_LIBS@%$X_EXTRA_LIBS%g
 s%@install_pp@%$install_pp%g
 s%@libs_xauth@%$libs_xauth%g
 s%@dnd_objs@%$dnd_objs%g
-s%@lwlib_objs@%$lwlib_objs%g
-s%@ALLOCA@%$ALLOCA%g
-s%@have_esd_config@%$have_esd_config%g
-s%@SRC_SUBDIR_DEPS@%$SRC_SUBDIR_DEPS%g
 s%@dll_ld@%$dll_ld%g
 s%@dll_cflags@%$dll_cflags%g
 s%@dll_ldflags@%$dll_ldflags%g
 s%@dll_post@%$dll_post%g
 s%@dll_ldo@%$dll_ldo%g
 s%@INSTALLPATH@%$INSTALLPATH%g
 s%@MOD_INSTALL_PROGRAM@%$MOD_INSTALL_PROGRAM%g
 s%@OBJECT_TO_BUILD@%$OBJECT_TO_BUILD%g
 s%@ldap_libs@%$ldap_libs%g
 s%@postgresql_libs@%$postgresql_libs%g
+s%@lwlib_objs@%$lwlib_objs%g
+s%@ALLOCA@%$ALLOCA%g
+s%@have_esd_config@%$have_esd_config%g
+s%@SRC_SUBDIR_DEPS@%$SRC_SUBDIR_DEPS%g
 s%@INSTALL_ARCH_DEP_SUBDIR@%$INSTALL_ARCH_DEP_SUBDIR%g
 s%@MAKE_SUBDIR@%$MAKE_SUBDIR%g
 s%@SUBDIR_MAKEFILES@%$SUBDIR_MAKEFILES%g
 s%@PROGNAME@%$PROGNAME%g
 s%@version@%$version%g

Mercurial > hg > xemacs-beta

comparison configure @ 1470:1364f9716d7b