[PATCH 21.5] Remove LISP_FLOAT_TYPE

See <URL:http://list-archive.xemacs.org/xemacs-beta/200210/msg00295.html> for the rationale. It looks like my autoconf is operating somewhat differently from the one that generated the configure script in CVS. Is there some way I can reduce the size of the diff against configure? (In fact, why is configure even in CVS, since it is generated from configure.in?) ChangeLog addition: 2002-10-14 Jerry James <james(a)xemacs.org&gt; * configure.in: Remove LISP_FLOAT_TYPE definition. lisp/ChangeLog addition: 2002-10-14 Jerry James <james(a)xemacs.org&gt; * gtk-font-menu.el (gtk-reset-device-font-menus): Simplify code that previously could not depend on LISP_FLOAT_TYPE. * x-font-menu.el (x-reset-device-font-menus): Ditto. src/ChangeLog addition: 2002-10-14 Jerry James <james(a)xemacs.org&gt; * alloc.c: Unconditionally use LISP_FLOAT_TYPE code. * bytecode.c: Ditto. * data.c: Ditto. * ecrt0.c: Ditto. * emacs.c: Ditto. * event-stream.c: Ditto. * floatfns.c: Ditto. * lisp.h: Ditto. * lread.c: Ditto. * print.c: Ditto. * config.h.in: Remove LISP_FLOAT_TYPE entry. * s/windowsnt.h: Remove LISP_FLOAT_TYPE definition. xemacs-21.5 source patch: Diff command: cvs -q diff -uN Files affected: src/s/windowsnt.h src/print.c src/lread.c src/lisp.h src/floatfns.c src/event-stream.c src/emacs.c src/ecrt0.c src/data.c src/config.h.in src/bytecode.c src/alloc.c lisp/x-font-menu.el lisp/gtk-font-menu.el configure.in configure Index: configure =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/configure,v retrieving revision 1.182 diff -d -u -u -r1.182 configure --- configure 2002/09/10 15:37:49 1.182 +++ configure 2002/10/14 14:25:33 ＠＠ -4845,24 +4845,15 ＠＠ fi -{ test "$extra_verbose" = "yes" && cat << \EOF - Defining LISP_FLOAT_TYPE -EOF -cat >> confdefs.h <<\EOF -#define LISP_FLOAT_TYPE 1 -EOF -} - - cat > conftest.$ac_ext <<EOF -#line 4859 "configure" +#line 4850 "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:4866: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4857: \"$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 ＠＠ -4881,10 +4872,10 ＠＠ for ac_func in mkstemp do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:4885: checking for $ac_func" >&5 +echo "configure:4876: checking for $ac_func" >&5 cat > conftest.$ac_ext <<EOF -#line 4888 "configure" +#line 4879 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ ＠＠ -4907,7 +4898,7 ＠＠ ; return 0; } EOF -if { (eval echo configure:4911: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4902: \"$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 ＠＠ -4936,14 +4927,14 ＠＠ echo "checking type of mail spool file locking" 1>&6 -echo "configure:4940: checking type of mail spool file locking" >&5 +echo "configure:4931: 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:4944: checking for $ac_func" >&5 +echo "configure:4935: checking for $ac_func" >&5 cat > conftest.$ac_ext <<EOF -#line 4947 "configure" +#line 4938 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ ＠＠ -4966,7 +4957,7 ＠＠ ; return 0; } EOF -if { (eval echo configure:4970: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4961: \"$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 ＠＠ -5048,12 +5039,12 ＠＠ case "$opsys" in decosf*) echo $ac_n "checking for cma_open in -lpthreads""... $ac_c" 1>&6 -echo "configure:5052: checking for cma_open in -lpthreads" >&5 +echo "configure:5043: 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 5057 "configure" +#line 5048 "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 ＠＠ -5064,7 +5055,7 ＠＠ cma_open() ; return 0; } EOF -if { (eval echo configure:5068: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5059: \"$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 ＠＠ -5101,7 +5092,7 ＠＠ echo $ac_n "checking whether the -xildoff compiler flag is required""... $ac_c" 1>&6 -echo "configure:5105: checking whether the -xildoff compiler flag is required" >&5 +echo "configure:5096: 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; ＠＠ -5113,7 +5104,7 ＠＠ 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:5117: checking for \"-z ignore\" linker flag" >&5 +echo "configure:5108: 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 ;; ＠＠ -5124,7 +5115,7 ＠＠ echo "checking "for specified window system"" 1>&6 -echo "configure:5128: checking "for specified window system"" >&5 +echo "configure:5119: checking "for specified window system"" >&5 GNOME_CONFIG=no ＠＠ -5132,7 +5123,7 ＠＠ if test "$with_gnome" != "no"; then echo $ac_n "checking for GNOME configuration script""... $ac_c" 1>&6 -echo "configure:5136: checking for GNOME configuration script" >&5 +echo "configure:5127: checking for GNOME configuration script" >&5 for possible in gnome-config do possible_version=`${possible} --version 2> /dev/null` ＠＠ -5163,7 +5154,7 ＠＠ if test "$with_gtk" != "no";then echo $ac_n "checking for GTK configuration script""... $ac_c" 1>&6 -echo "configure:5167: checking for GTK configuration script" >&5 +echo "configure:5158: checking for GTK configuration script" >&5 for possible in gtk12-config gtk14-config gtk-config do possible_version=`${possible} --version 2> /dev/null` ＠＠ -5185,18 +5176,18 ＠＠ if test "${GTK_CONFIG}" != "no"; then echo $ac_n "checking gtk version""... $ac_c" 1>&6 -echo "configure:5189: checking gtk version" >&5 +echo "configure:5180: 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:5194: checking gtk libs" >&5 +echo "configure:5185: 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:5200: checking gtk cflags" >&5 +echo "configure:5191: checking gtk cflags" >&5 GTK_CFLAGS=`${GTK_CONFIG} --cflags` if test "$GCC" = "yes"; then GTK_CFLAGS="${GTK_CFLAGS} -Wno-shadow" ＠＠ -5206,19 +5197,19 ＠＠ echo $ac_n "checking for main in -lgdk_imlib""... $ac_c" 1>&6 -echo "configure:5210: checking for main in -lgdk_imlib" >&5 +echo "configure:5201: 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 5215 "configure" +#line 5206 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:5222: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5213: \"$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 ＠＠ -5240,12 +5231,12 ＠＠ echo $ac_n "checking for Imlib_init in -lImlib""... $ac_c" 1>&6 -echo "configure:5244: checking for Imlib_init in -lImlib" >&5 +echo "configure:5235: 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 5249 "configure" +#line 5240 "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 ＠＠ -5256,7 +5247,7 ＠＠ Imlib_init() ; return 0; } EOF -if { (eval echo configure:5260: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5251: \"$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 ＠＠ -5279,10 +5270,10 ＠＠ for ac_func in gdk_imlib_init do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:5283: checking for $ac_func" >&5 +echo "configure:5274: checking for $ac_func" >&5 cat > conftest.$ac_ext <<EOF -#line 5286 "configure" +#line 5277 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ ＠＠ -5305,7 +5296,7 ＠＠ ; return 0; } EOF -if { (eval echo configure:5309: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5300: \"$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 ＠＠ -5371,15 +5362,15 ＠＠ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:5375: checking for $ac_hdr" >&5 +echo "configure:5366: checking for $ac_hdr" >&5 cat > conftest.$ac_ext <<EOF -#line 5378 "configure" +#line 5369 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5383: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5374: \"$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* ＠＠ -5410,19 +5401,19 ＠＠ echo $ac_n "checking for main in -lxml""... $ac_c" 1>&6 -echo "configure:5414: checking for main in -lxml" >&5 +echo "configure:5405: 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 5419 "configure" +#line 5410 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:5426: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5417: \"$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 ＠＠ -5444,19 +5435,19 ＠＠ echo $ac_n "checking for main in -lglade""... $ac_c" 1>&6 -echo "configure:5448: checking for main in -lglade" >&5 +echo "configure:5439: 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 5453 "configure" +#line 5444 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:5460: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5451: \"$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 ＠＠ -5478,19 +5469,19 ＠＠ echo $ac_n "checking for main in -lglade-gnome""... $ac_c" 1>&6 -echo "configure:5482: checking for main in -lglade-gnome" >&5 +echo "configure:5473: 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 5487 "configure" +#line 5478 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:5494: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5485: \"$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 ＠＠ -5511,7 +5502,7 ＠＠ cat > conftest.$ac_ext <<EOF -#line 5515 "configure" +#line 5506 "configure" #include "confdefs.h" #include <glade/glade-xml.h> EOF ＠＠ -5570,7 +5561,7 ＠＠ # Uses ac_ vars as temps to allow command line to override cache and checks. # --without-x overrides everything else, but does not touch the cache. echo $ac_n "checking for X""... $ac_c" 1>&6 -echo "configure:5574: checking for X" >&5 +echo "configure:5565: checking for X" >&5 # Check whether --with-x or --without-x was given. if test "${with_x+set}" = set; then ＠＠ -5630,12 +5621,12 ＠＠ # First, try using that file with no special directory specified. cat > conftest.$ac_ext <<EOF -#line 5634 "configure" +#line 5625 "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:5639: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5630: \"$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* ＠＠ -5704,14 +5695,14 ＠＠ ac_save_LIBS="$LIBS" LIBS="-l$x_direct_test_library $LIBS" cat > conftest.$ac_ext <<EOF -#line 5708 "configure" +#line 5699 "configure" #include "confdefs.h" int main() { ${x_direct_test_function}() ; return 0; } EOF -if { (eval echo configure:5715: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5706: \"$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. ＠＠ -5820,17 +5811,17 ＠＠ case "`(uname -sr) 2>/dev/null`" in "SunOS 5"*) echo $ac_n "checking whether -R must be followed by a space""... $ac_c" 1>&6 -echo "configure:5824: checking whether -R must be followed by a space" >&5 +echo "configure:5815: 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 5827 "configure" +#line 5818 "configure" #include "confdefs.h" int main() { ; return 0; } EOF -if { (eval echo configure:5834: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5825: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_R_nospace=yes else ＠＠ -5846,14 +5837,14 ＠＠ else LIBS="$ac_xsave_LIBS -R $x_libraries" cat > conftest.$ac_ext <<EOF -#line 5850 "configure" +#line 5841 "configure" #include "confdefs.h" int main() { ; return 0; } EOF -if { (eval echo configure:5857: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5848: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_R_space=yes else ＠＠ -5889,12 +5880,12 ＠＠ else echo $ac_n "checking for dnet_ntoa in -ldnet""... $ac_c" 1>&6 -echo "configure:5893: checking for dnet_ntoa in -ldnet" >&5 +echo "configure:5884: 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 5898 "configure" +#line 5889 "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 ＠＠ -5905,7 +5896,7 ＠＠ dnet_ntoa() ; return 0; } EOF -if { (eval echo configure:5909: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5900: \"$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 ＠＠ -5929,12 +5920,12 ＠＠ if test $ac_cv_lib_dnet_dnet_ntoa = no; then echo $ac_n "checking for dnet_ntoa in -ldnet_stub""... $ac_c" 1>&6 -echo "configure:5933: checking for dnet_ntoa in -ldnet_stub" >&5 +echo "configure:5924: 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 5938 "configure" +#line 5929 "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 ＠＠ -5945,7 +5936,7 ＠＠ dnet_ntoa() ; return 0; } EOF -if { (eval echo configure:5949: \"$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* eval "ac_cv_lib_$ac_lib_var=yes" else ＠＠ -5974,10 +5965,10 ＠＠ # The nsl library prevents programs from opening the X display # on Irix 5.2, according to dickey(a)clark.net. echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6 -echo "configure:5978: checking for gethostbyname" >&5 +echo "configure:5969: checking for gethostbyname" >&5 cat > conftest.$ac_ext <<EOF -#line 5981 "configure" +#line 5972 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char gethostbyname(); below. */ ＠＠ -6000,7 +5991,7 ＠＠ ; return 0; } EOF -if { (eval echo configure:6004: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5995: \"$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 ＠＠ -6021,12 +6012,12 ＠＠ if test $ac_cv_func_gethostbyname = no; then echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6 -echo "configure:6025: checking for gethostbyname in -lnsl" >&5 +echo "configure:6016: 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 6030 "configure" +#line 6021 "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 ＠＠ -6037,7 +6028,7 ＠＠ gethostbyname() ; return 0; } EOF -if { (eval echo configure:6041: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6032: \"$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 ＠＠ -6067,10 +6058,10 ＠＠ # -lsocket must be given before -lnsl if both are needed. # We assume that if connect needs -lnsl, so does gethostbyname. echo $ac_n "checking for connect""... $ac_c" 1>&6 -echo "configure:6071: checking for connect" >&5 +echo "configure:6062: checking for connect" >&5 cat > conftest.$ac_ext <<EOF -#line 6074 "configure" +#line 6065 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char connect(); below. */ ＠＠ -6093,7 +6084,7 ＠＠ ; return 0; } EOF -if { (eval echo configure:6097: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6088: \"$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 ＠＠ -6116,12 +6107,12 ＠＠ xe_msg_checking="for connect in -lsocket" test -n "$X_EXTRA_LIBS" && xe_msg_checking="$xe_msg_checking using extra libs $X_EXTRA_LIBS" echo $ac_n "checking "$xe_msg_checking"""... $ac_c" 1>&6 -echo "configure:6120: checking "$xe_msg_checking"" >&5 +echo "configure:6111: 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 6125 "configure" +#line 6116 "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 ＠＠ -6132,7 +6123,7 ＠＠ connect() ; return 0; } EOF -if { (eval echo configure:6136: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6127: \"$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 ＠＠ -6156,10 +6147,10 ＠＠ # gomez(a)mi.uni-erlangen.de says -lposix is necessary on A/UX. echo $ac_n "checking for remove""... $ac_c" 1>&6 -echo "configure:6160: checking for remove" >&5 +echo "configure:6151: checking for remove" >&5 cat > conftest.$ac_ext <<EOF -#line 6163 "configure" +#line 6154 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char remove(); below. */ ＠＠ -6182,7 +6173,7 ＠＠ ; return 0; } EOF -if { (eval echo configure:6186: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6177: \"$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 ＠＠ -6203,12 +6194,12 ＠＠ if test $ac_cv_func_remove = no; then echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6 -echo "configure:6207: checking for remove in -lposix" >&5 +echo "configure:6198: 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 6212 "configure" +#line 6203 "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 ＠＠ -6219,7 +6210,7 ＠＠ remove() ; return 0; } EOF -if { (eval echo configure:6223: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6214: \"$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 ＠＠ -6243,10 +6234,10 ＠＠ # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay. echo $ac_n "checking for shmat""... $ac_c" 1>&6 -echo "configure:6247: checking for shmat" >&5 +echo "configure:6238: checking for shmat" >&5 cat > conftest.$ac_ext <<EOF -#line 6250 "configure" +#line 6241 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char shmat(); below. */ ＠＠ -6269,7 +6260,7 ＠＠ ; return 0; } EOF -if { (eval echo configure:6273: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6264: \"$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 ＠＠ -6290,12 +6281,12 ＠＠ if test $ac_cv_func_shmat = no; then echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6 -echo "configure:6294: checking for shmat in -lipc" >&5 +echo "configure:6285: 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 6299 "configure" +#line 6290 "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 ＠＠ -6306,7 +6297,7 ＠＠ shmat() ; return 0; } EOF -if { (eval echo configure:6310: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6301: \"$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 ＠＠ -6342,12 +6333,12 ＠＠ 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:6346: checking "$xe_msg_checking"" >&5 +echo "configure:6337: 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 6351 "configure" +#line 6342 "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 ＠＠ -6358,7 +6349,7 ＠＠ IceConnectionNumber() ; return 0; } EOF -if { (eval echo configure:6362: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6353: \"$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 ＠＠ -6525,7 +6516,7 ＠＠ echo "checking for X defines extracted by xmkmf" 1>&6 -echo "configure:6529: checking for X defines extracted by xmkmf" >&5 +echo "configure:6520: checking for X defines extracted by xmkmf" >&5 rm -fr conftestdir if mkdir conftestdir; then cd conftestdir ＠＠ -6574,15 +6565,15 ＠＠ ac_safe=`echo "X11/Intrinsic.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for X11/Intrinsic.h""... $ac_c" 1>&6 -echo "configure:6578: checking for X11/Intrinsic.h" >&5 +echo "configure:6569: checking for X11/Intrinsic.h" >&5 cat > conftest.$ac_ext <<EOF -#line 6581 "configure" +#line 6572 "configure" #include "confdefs.h" #include <X11/Intrinsic.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:6586: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:6577: \"$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* ＠＠ -6606,12 +6597,12 ＠＠ echo $ac_n "checking for XOpenDisplay in -lX11""... $ac_c" 1>&6 -echo "configure:6610: checking for XOpenDisplay in -lX11" >&5 +echo "configure:6601: 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 6615 "configure" +#line 6606 "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 ＠＠ -6622,7 +6613,7 ＠＠ XOpenDisplay() ; return 0; } EOF -if { (eval echo configure:6626: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6617: \"$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 ＠＠ -6647,12 +6638,12 ＠＠ xe_msg_checking="for XGetFontProperty in -lX11" test -n "-b i486-linuxaout" && xe_msg_checking="$xe_msg_checking using extra libs -b i486-linuxaout" echo $ac_n "checking "$xe_msg_checking"""... $ac_c" 1>&6 -echo "configure:6651: checking "$xe_msg_checking"" >&5 +echo "configure:6642: 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 6656 "configure" +#line 6647 "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 ＠＠ -6663,7 +6654,7 ＠＠ XGetFontProperty() ; return 0; } EOF -if { (eval echo configure:6667: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6658: \"$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 ＠＠ -6690,12 +6681,12 ＠＠ echo $ac_n "checking for XShapeSelectInput in -lXext""... $ac_c" 1>&6 -echo "configure:6694: checking for XShapeSelectInput in -lXext" >&5 +echo "configure:6685: 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 6699 "configure" +#line 6690 "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 ＠＠ -6706,7 +6697,7 ＠＠ XShapeSelectInput() ; return 0; } EOF -if { (eval echo configure:6710: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6701: \"$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 ＠＠ -6729,12 +6720,12 ＠＠ echo $ac_n "checking for XtOpenDisplay in -lXt""... $ac_c" 1>&6 -echo "configure:6733: checking for XtOpenDisplay in -lXt" >&5 +echo "configure:6724: 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 6738 "configure" +#line 6729 "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 ＠＠ -6745,7 +6736,7 ＠＠ XtOpenDisplay() ; return 0; } EOF -if { (eval echo configure:6749: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6740: \"$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 ＠＠ -6768,14 +6759,14 ＠＠ echo $ac_n "checking the version of X11 being used""... $ac_c" 1>&6 -echo "configure:6772: checking the version of X11 being used" >&5 +echo "configure:6763: checking the version of X11 being used" >&5 cat > conftest.$ac_ext <<EOF -#line 6774 "configure" +#line 6765 "configure" #include "confdefs.h" #include <X11/Intrinsic.h> int main(int c, char *v[]) { return c>1 ? XlibSpecificationRelease : 0; } EOF -if { (eval echo configure:6779: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 +if { (eval echo configure:6770: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 then ./conftest foobar; x11_release=$? else ＠＠ -6806,10 +6797,10 ＠＠ for ac_func in XConvertCase do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:6810: checking for $ac_func" >&5 +echo "configure:6801: checking for $ac_func" >&5 cat > conftest.$ac_ext <<EOF -#line 6813 "configure" +#line 6804 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ ＠＠ -6832,7 +6823,7 ＠＠ ; return 0; } EOF -if { (eval echo configure:6836: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6827: \"$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 ＠＠ -6864,15 +6855,15 ＠＠ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:6868: checking for $ac_hdr" >&5 +echo "configure:6859: checking for $ac_hdr" >&5 cat > conftest.$ac_ext <<EOF -#line 6871 "configure" +#line 6862 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:6876: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:6867: \"$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* ＠＠ -6905,10 +6896,10 ＠＠ for ac_func in XRegisterIMInstantiateCallback do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:6909: checking for $ac_func" >&5 +echo "configure:6900: checking for $ac_func" >&5 cat > conftest.$ac_ext <<EOF -#line 6912 "configure" +#line 6903 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ ＠＠ -6931,7 +6922,7 ＠＠ ; return 0; } EOF -if { (eval echo configure:6935: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6926: \"$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 ＠＠ -6959,9 +6950,9 ＠＠ done echo $ac_n "checking for standard XRegisterIMInstantiateCallback prototype""... $ac_c" 1>&6 -echo "configure:6963: checking for standard XRegisterIMInstantiateCallback prototype" >&5 +echo "configure:6954: checking for standard XRegisterIMInstantiateCallback prototype" >&5 cat > conftest.$ac_ext <<EOF -#line 6965 "configure" +#line 6956 "configure" #include "confdefs.h" #define NeedFunctionPrototypes 1 ＠＠ -6973,7 +6964,7 ＠＠ ; return 0; } EOF -if { (eval echo configure:6977: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6968: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t""yes" 1>&6 else ＠＠ -6994,12 +6985,12 ＠＠ test -z "$with_xmu" && { echo $ac_n "checking for XmuReadBitmapDataFromFile in -lXmu""... $ac_c" 1>&6 -echo "configure:6998: checking for XmuReadBitmapDataFromFile in -lXmu" >&5 +echo "configure:6989: 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 7003 "configure" +#line 6994 "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 ＠＠ -7010,7 +7001,7 ＠＠ XmuReadBitmapDataFromFile() ; return 0; } EOF -if { (eval echo configure:7014: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7005: \"$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 ＠＠ -7049,19 +7040,19 ＠＠ echo $ac_n "checking for main in -lXbsd""... $ac_c" 1>&6 -echo "configure:7053: checking for main in -lXbsd" >&5 +echo "configure:7044: 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 7058 "configure" +#line 7049 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:7065: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7056: \"$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 ＠＠ -7098,22 +7089,22 ＠＠ fi if test "$with_msw" != "no"; then echo "checking for MS-Windows" 1>&6 -echo "configure:7102: checking for MS-Windows" >&5 +echo "configure:7093: checking for MS-Windows" >&5 echo $ac_n "checking for main in -lgdi32""... $ac_c" 1>&6 -echo "configure:7105: checking for main in -lgdi32" >&5 +echo "configure:7096: 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 7110 "configure" +#line 7101 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:7117: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7108: \"$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 ＠＠ -7164,12 +7155,12 ＠＠ test "$with_widgets" != "no" && with_widgets=msw fi cat > conftest.$ac_ext <<EOF -#line 7168 "configure" +#line 7159 "configure" #include "confdefs.h" #include <fcntl.h> int main() { return (open("/dev/windows", O_RDONLY, 0) > 0)? 0 : 1; } EOF -if { (eval echo configure:7173: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 +if { (eval echo configure:7164: \"$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 ＠＠ -7230,15 +7221,15 ＠＠ 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:7234: checking for X11/extensions/shape.h" >&5 +echo "configure:7225: checking for X11/extensions/shape.h" >&5 cat > conftest.$ac_ext <<EOF -#line 7237 "configure" +#line 7228 "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:7242: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7233: \"$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* ＠＠ -7288,7 +7279,7 ＠＠ esac echo "checking for WM_COMMAND option" 1>&6 -echo "configure:7292: checking for WM_COMMAND option" >&5; +echo "configure:7283: checking for WM_COMMAND option" >&5; if test "$with_wmcommand" != "no"; then { test "$extra_verbose" = "yes" && cat << \EOF Defining HAVE_WMCOMMAND ＠＠ -7303,15 +7294,15 ＠＠ test -z "$with_xauth" && test "$window_system" = "none" && with_xauth=no test -z "$with_xauth" && { ac_safe=`echo "X11/Xauth.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for X11/Xauth.h""... $ac_c" 1>&6 -echo "configure:7307: checking for X11/Xauth.h" >&5 +echo "configure:7298: checking for X11/Xauth.h" >&5 cat > conftest.$ac_ext <<EOF -#line 7310 "configure" +#line 7301 "configure" #include "confdefs.h" #include <X11/Xauth.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:7315: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7306: \"$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* ＠＠ -7334,12 +7325,12 ＠＠ } test -z "$with_xauth" && { echo $ac_n "checking for XauGetAuthByAddr in -lXau""... $ac_c" 1>&6 -echo "configure:7338: checking for XauGetAuthByAddr in -lXau" >&5 +echo "configure:7329: 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 7343 "configure" +#line 7334 "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 ＠＠ -7350,7 +7341,7 ＠＠ XauGetAuthByAddr() ; return 0; } EOF -if { (eval echo configure:7354: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7345: \"$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 ＠＠ -7393,22 +7384,22 ＠＠ if test "$with_modules" != "no"; then echo "checking for module support" 1>&6 -echo "configure:7397: checking for module support" >&5 +echo "configure:7388: checking for module support" >&5 if test "$with_msw" = "yes"; then have_dl=yes; else ac_safe=`echo "dlfcn.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for dlfcn.h""... $ac_c" 1>&6 -echo "configure:7404: checking for dlfcn.h" >&5 +echo "configure:7395: checking for dlfcn.h" >&5 cat > conftest.$ac_ext <<EOF -#line 7407 "configure" +#line 7398 "configure" #include "confdefs.h" #include <dlfcn.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:7412: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7403: \"$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* ＠＠ -7425,16 +7416,16 ＠＠ echo "$ac_t""yes" 1>&6 echo $ac_n "checking for dlopen in -lc""... $ac_c" 1>&6 -echo "configure:7429: checking for dlopen in -lc" >&5 +echo "configure:7420: checking for dlopen in -lc" >&5 cat > conftest.$ac_ext <<EOF -#line 7431 "configure" +#line 7422 "configure" #include "confdefs.h" #include <dlfcn.h> int main() { dlopen ("", 0); ; return 0; } EOF -if { (eval echo configure:7438: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7429: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* have_dl=yes else ＠＠ -7443,18 +7434,18 ＠＠ rm -rf conftest* echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6 -echo "configure:7447: checking for dlopen in -ldl" >&5 +echo "configure:7438: checking for dlopen in -ldl" >&5 ac_save_LIBS="$LIBS" LIBS="-ldl $LIBS" cat > conftest.$ac_ext <<EOF -#line 7451 "configure" +#line 7442 "configure" #include "confdefs.h" #include <dlfcn.h> int main() { dlopen ("", 0); ; return 0; } EOF -if { (eval echo configure:7458: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7449: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* have_dl=yes else ＠＠ -7483,12 +7474,12 ＠＠ else echo $ac_n "checking for shl_load in -ldld""... $ac_c" 1>&6 -echo "configure:7487: checking for shl_load in -ldld" >&5 +echo "configure:7478: 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 7492 "configure" +#line 7483 "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 ＠＠ -7499,7 +7490,7 ＠＠ shl_load() ; return 0; } EOF -if { (eval echo configure:7503: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7494: \"$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 ＠＠ -7526,12 +7517,12 ＠＠ echo "$ac_t""no" 1>&6 echo $ac_n "checking for dld_init in -ldld""... $ac_c" 1>&6 -echo "configure:7530: checking for dld_init in -ldld" >&5 +echo "configure:7521: 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 7535 "configure" +#line 7526 "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 ＠＠ -7542,7 +7533,7 ＠＠ dld_init() ; return 0; } EOF -if { (eval echo configure:7546: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7537: \"$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 ＠＠ -7587,7 +7578,7 ＠＠ xealias=$internal_configuration echo "checking how to build dynamic libraries for ${xehost}" 1>&6 -echo "configure:7591: checking how to build dynamic libraries for ${xehost}" >&5 +echo "configure:7582: checking how to build dynamic libraries for ${xehost}" >&5 # Transform *-*-linux* to *-*-linux-gnu*, to support old configure scripts. case "$xehost" in *-*-linux-gnu*) ;; ＠＠ -7615,9 +7606,9 ＠＠ XEGCC=yes else echo $ac_n "checking checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:7619: checking checking whether we are using GNU C" >&5 +echo "configure:7610: checking checking whether we are using GNU C" >&5 cat > conftest.$ac_ext <<EOF -#line 7621 "configure" +#line 7612 "configure" #include "confdefs.h" #ifdef __GNUC__ ＠＠ -7639,7 +7630,7 ＠＠ fi echo $ac_n "checking how to produce PIC code""... $ac_c" 1>&6 -echo "configure:7643: checking how to produce PIC code" >&5 +echo "configure:7634: checking how to produce PIC code" >&5 wl= can_build_shared=yes ＠＠ -7740,18 +7731,18 ＠＠ # 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:7744: checking if PIC flag ${dll_cflags} really works" >&5 +echo "configure:7735: checking if PIC flag ${dll_cflags} really works" >&5 save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS $dll_cflags -DPIC" cat > conftest.$ac_ext <<EOF -#line 7748 "configure" +#line 7739 "configure" #include "confdefs.h" int main() { int x=0; ; return 0; } EOF -if { (eval echo configure:7755: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:7746: \"$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 ＠＠ -7782,7 +7773,7 ＠＠ xldf= xcldf= echo $ac_n "checking if C compiler can produce shared libraries""... $ac_c" 1>&6 -echo "configure:7786: checking if C compiler can produce shared libraries" >&5 +echo "configure:7777: checking if C compiler can produce shared libraries" >&5 if test "$XEGCC" = yes; then xcldf="-shared" xldf="-shared" ＠＠ -7833,14 +7824,14 ＠＠ 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 7837 "configure" +#line 7828 "configure" #include "confdefs.h" int main() { int x=0; ; return 0; } EOF -if { (eval echo configure:7844: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7835: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cc_produces_so=yes else ＠＠ -7865,7 +7856,7 ＠＠ 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:7869: checking for ld used by GCC" >&5 +echo "configure:7860: checking for ld used by GCC" >&5 ac_prog=`($CC -print-prog-name=ld) 2>&5` case "$ac_prog" in # Accept absolute paths. ＠＠ -7891,7 +7882,7 ＠＠ esac else echo $ac_n "checking for GNU ld""... $ac_c" 1>&6 -echo "configure:7895: checking for GNU ld" >&5 +echo "configure:7886: checking for GNU ld" >&5 fi if test -z "$LTLD"; then ＠＠ -7929,7 +7920,7 ＠＠ # 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:7933: checking if the linker is GNU ld" >&5 +echo "configure:7924: 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 ＠＠ -7957,7 +7948,7 ＠＠ # 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:7961: checking whether the linker supports shared libraries" >&5 +echo "configure:7952: checking whether the linker supports shared libraries" >&5 dll_ld=$CC dll_ldflags=$LDFLAGS ld_shlibs=yes ＠＠ -8165,10 +8156,10 ＠＠ for ac_func in dlerror _dlerror do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:8169: checking for $ac_func" >&5 +echo "configure:8160: checking for $ac_func" >&5 cat > conftest.$ac_ext <<EOF -#line 8172 "configure" +#line 8163 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ ＠＠ -8191,7 +8182,7 ＠＠ ; return 0; } EOF -if { (eval echo configure:8195: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8186: \"$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 ＠＠ -8253,15 +8244,15 ＠＠ for dir in "" "Tt/" "desktop/" ; do ac_safe=`echo "${dir}tt_c.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for ${dir}tt_c.h""... $ac_c" 1>&6 -echo "configure:8257: checking for ${dir}tt_c.h" >&5 +echo "configure:8248: checking for ${dir}tt_c.h" >&5 cat > conftest.$ac_ext <<EOF -#line 8260 "configure" +#line 8251 "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:8265: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8256: \"$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* ＠＠ -8297,12 +8288,12 ＠＠ xe_msg_checking="for tt_message_create in -ltt" test -n "$extra_libs" && xe_msg_checking="$xe_msg_checking using extra libs $extra_libs" echo $ac_n "checking "$xe_msg_checking"""... $ac_c" 1>&6 -echo "configure:8301: checking "$xe_msg_checking"" >&5 +echo "configure:8292: 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 8306 "configure" +#line 8297 "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 ＠＠ -8313,7 +8304,7 ＠＠ tt_message_create() ; return 0; } EOF -if { (eval echo configure:8317: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8308: \"$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 ＠＠ -8367,15 +8358,15 ＠＠ test -z "$with_cde" && { ac_safe=`echo "Dt/Dt.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for Dt/Dt.h""... $ac_c" 1>&6 -echo "configure:8371: checking for Dt/Dt.h" >&5 +echo "configure:8362: checking for Dt/Dt.h" >&5 cat > conftest.$ac_ext <<EOF -#line 8374 "configure" +#line 8365 "configure" #include "confdefs.h" #include <Dt/Dt.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:8379: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8370: \"$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* ＠＠ -8398,12 +8389,12 ＠＠ } test -z "$with_cde" && { echo $ac_n "checking for DtDndDragStart in -lDtSvc""... $ac_c" 1>&6 -echo "configure:8402: checking for DtDndDragStart in -lDtSvc" >&5 +echo "configure:8393: 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 8407 "configure" +#line 8398 "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 ＠＠ -8414,7 +8405,7 ＠＠ DtDndDragStart() ; return 0; } EOF -if { (eval echo configure:8418: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8409: \"$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 ＠＠ -8495,7 +8486,7 ＠＠ if test "$with_dragndrop" != "no" ; then echo $ac_n "checking if drag and drop API is needed""... $ac_c" 1>&6 -echo "configure:8499: checking if drag and drop API is needed" >&5 +echo "configure:8490: 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 ＠＠ -8515,19 +8506,19 ＠＠ fi echo "checking for LDAP" 1>&6 -echo "configure:8519: checking for LDAP" >&5 +echo "configure:8510: 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:8523: checking for ldap.h" >&5 +echo "configure:8514: checking for ldap.h" >&5 cat > conftest.$ac_ext <<EOF -#line 8526 "configure" +#line 8517 "configure" #include "confdefs.h" #include <ldap.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:8531: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8522: \"$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* ＠＠ -8550,15 +8541,15 ＠＠ } 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:8554: checking for lber.h" >&5 +echo "configure:8545: checking for lber.h" >&5 cat > conftest.$ac_ext <<EOF -#line 8557 "configure" +#line 8548 "configure" #include "confdefs.h" #include <lber.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:8562: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8553: \"$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* ＠＠ -8582,12 +8573,12 ＠＠ if test "$with_ldap" != "no"; then echo $ac_n "checking for ldap_search in -lldap""... $ac_c" 1>&6 -echo "configure:8586: checking for ldap_search in -lldap" >&5 +echo "configure:8577: 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 8591 "configure" +#line 8582 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 ＠＠ -8598,7 +8589,7 ＠＠ ldap_search() ; return 0; } EOF -if { (eval echo configure:8602: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8593: \"$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 ＠＠ -8623,12 +8614,12 ＠＠ 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:8627: checking "$xe_msg_checking"" >&5 +echo "configure:8618: 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 8632 "configure" +#line 8623 "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 ＠＠ -8639,7 +8630,7 ＠＠ ldap_open() ; return 0; } EOF -if { (eval echo configure:8643: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8634: \"$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 ＠＠ -8664,12 +8655,12 ＠＠ 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:8668: checking "$xe_msg_checking"" >&5 +echo "configure:8659: 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 8673 "configure" +#line 8664 "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 ＠＠ -8680,7 +8671,7 ＠＠ ldap_open() ; return 0; } EOF -if { (eval echo configure:8684: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8675: \"$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 ＠＠ -8705,12 +8696,12 ＠＠ 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:8709: checking "$xe_msg_checking"" >&5 +echo "configure:8700: 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 8714 "configure" +#line 8705 "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 ＠＠ -8721,7 +8712,7 ＠＠ ldap_open() ; return 0; } EOF -if { (eval echo configure:8725: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8716: \"$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 ＠＠ -8770,10 +8761,10 ＠＠ 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:8774: checking for $ac_func" >&5 +echo "configure:8765: checking for $ac_func" >&5 cat > conftest.$ac_ext <<EOF -#line 8777 "configure" +#line 8768 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ ＠＠ -8796,7 +8787,7 ＠＠ ; return 0; } EOF -if { (eval echo configure:8800: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8791: \"$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 ＠＠ -8834,20 +8825,20 ＠＠ postgresql_libs= if test "$with_postgresql" != "no"; then echo "checking for PostgreSQL" 1>&6 -echo "configure:8838: checking for PostgreSQL" >&5 +echo "configure:8829: 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:8843: checking for ${header_dir}libpq-fe.h" >&5 +echo "configure:8834: checking for ${header_dir}libpq-fe.h" >&5 cat > conftest.$ac_ext <<EOF -#line 8846 "configure" +#line 8837 "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:8851: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8842: \"$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* ＠＠ -8871,12 +8862,12 ＠＠ test -n "$libpq_fe_h_file" && { echo $ac_n "checking for PQconnectdb in -lpq""... $ac_c" 1>&6 -echo "configure:8875: checking for PQconnectdb in -lpq" >&5 +echo "configure:8866: 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 8880 "configure" +#line 8871 "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 ＠＠ -8887,7 +8878,7 ＠＠ PQconnectdb() ; return 0; } EOF -if { (eval echo configure:8891: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8882: \"$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 ＠＠ -8920,12 +8911,12 ＠＠ echo $ac_n "checking for PQconnectStart in -lpq""... $ac_c" 1>&6 -echo "configure:8924: checking for PQconnectStart in -lpq" >&5 +echo "configure:8915: 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 8929 "configure" +#line 8920 "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 ＠＠ -8936,7 +8927,7 ＠＠ PQconnectStart() ; return 0; } EOF -if { (eval echo configure:8940: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8931: \"$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 ＠＠ -8986,7 +8977,7 ＠＠ if test "$window_system" != "none"; then echo "checking for graphics libraries" 1>&6 -echo "configure:8990: checking for graphics libraries" >&5 +echo "configure:8981: checking for graphics libraries" >&5 libpath_xpm= incpath_xpm= ＠＠ -9012,10 +9003,10 ＠＠ 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:9016: checking for Xpm - no older than 3.4f" >&5 +echo "configure:9007: checking for Xpm - no older than 3.4f" >&5 xe_check_libs=-lXpm cat > conftest.$ac_ext <<EOF -#line 9019 "configure" +#line 9010 "configure" #include "confdefs.h" #define XPM_NUMBERS #include <X11/xpm.h> ＠＠ -9024,7 +9015,7 ＠＠ XpmIncludeVersion != XpmLibraryVersion() ? 1 : XpmIncludeVersion < 30406 ? 2 : 0 ;} EOF -if { (eval echo configure:9028: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 +if { (eval echo configure:9019: \"$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 ＠＠ -9068,17 +9059,17 ＠＠ 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:9072: checking for \"FOR_MSW\" xpm" >&5 +echo "configure:9063: checking for \"FOR_MSW\" xpm" >&5 xe_check_libs=-lXpm cat > conftest.$ac_ext <<EOF -#line 9075 "configure" +#line 9066 "configure" #include "confdefs.h" int main() { XpmCreatePixmapFromData() ; return 0; } EOF -if { (eval echo configure:9082: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9073: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* xpm_for_msw=no else ＠＠ -9104,15 +9095,15 ＠＠ test -z "$with_xface" && { ac_safe=`echo "compface.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for compface.h""... $ac_c" 1>&6 -echo "configure:9108: checking for compface.h" >&5 +echo "configure:9099: checking for compface.h" >&5 cat > conftest.$ac_ext <<EOF -#line 9111 "configure" +#line 9102 "configure" #include "confdefs.h" #include <compface.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:9116: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:9107: \"$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* ＠＠ -9135,12 +9126,12 ＠＠ } test -z "$with_xface" && { echo $ac_n "checking for UnGenFace in -lcompface""... $ac_c" 1>&6 -echo "configure:9139: checking for UnGenFace in -lcompface" >&5 +echo "configure:9130: 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 9144 "configure" +#line 9135 "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 ＠＠ -9151,7 +9142,7 ＠＠ UnGenFace() ; return 0; } EOF -if { (eval echo configure:9155: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9146: \"$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 ＠＠ -9200,12 +9191,12 ＠＠ if test "$with_png $with_tiff" != "no no"; then echo $ac_n "checking for inflate in -lc""... $ac_c" 1>&6 -echo "configure:9204: checking for inflate in -lc" >&5 +echo "configure:9195: 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 9209 "configure" +#line 9200 "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 ＠＠ -9216,7 +9207,7 ＠＠ inflate() ; return 0; } EOF -if { (eval echo configure:9220: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9211: \"$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 ＠＠ -9235,12 +9226,12 ＠＠ echo "$ac_t""no" 1>&6 echo $ac_n "checking for inflate in -lz""... $ac_c" 1>&6 -echo "configure:9239: checking for inflate in -lz" >&5 +echo "configure:9230: 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 9244 "configure" +#line 9235 "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 ＠＠ -9251,7 +9242,7 ＠＠ inflate() ; return 0; } EOF -if { (eval echo configure:9255: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9246: \"$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 ＠＠ -9270,12 +9261,12 ＠＠ echo "$ac_t""no" 1>&6 echo $ac_n "checking for inflate in -lgz""... $ac_c" 1>&6 -echo "configure:9274: checking for inflate in -lgz" >&5 +echo "configure:9265: 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 9279 "configure" +#line 9270 "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 ＠＠ -9286,7 +9277,7 ＠＠ inflate() ; return 0; } EOF -if { (eval echo configure:9290: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9281: \"$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 ＠＠ -9316,15 +9307,15 ＠＠ test -z "$with_jpeg" && { ac_safe=`echo "jpeglib.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for jpeglib.h""... $ac_c" 1>&6 -echo "configure:9320: checking for jpeglib.h" >&5 +echo "configure:9311: checking for jpeglib.h" >&5 cat > conftest.$ac_ext <<EOF -#line 9323 "configure" +#line 9314 "configure" #include "confdefs.h" #include <jpeglib.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:9328: \"$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* ＠＠ -9347,12 +9338,12 ＠＠ } test -z "$with_jpeg" && { echo $ac_n "checking for jpeg_destroy_decompress in -ljpeg""... $ac_c" 1>&6 -echo "configure:9351: checking for jpeg_destroy_decompress in -ljpeg" >&5 +echo "configure:9342: 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 9356 "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 ＠＠ -9363,7 +9354,7 ＠＠ jpeg_destroy_decompress() ; return 0; } EOF -if { (eval echo configure:9367: \"$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 ＠＠ -9399,10 +9390,10 ＠＠ png_problem="" test -z "$with_png" && { echo $ac_n "checking for pow""... $ac_c" 1>&6 -echo "configure:9403: checking for pow" >&5 +echo "configure:9394: checking for pow" >&5 cat > conftest.$ac_ext <<EOF -#line 9406 "configure" +#line 9397 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char pow(); below. */ ＠＠ -9425,7 +9416,7 ＠＠ ; return 0; } EOF -if { (eval echo configure:9429: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9420: \"$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 ＠＠ -9446,15 +9437,15 ＠＠ } test -z "$with_png" && { ac_safe=`echo "png.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for png.h""... $ac_c" 1>&6 -echo "configure:9450: checking for png.h" >&5 +echo "configure:9441: checking for png.h" >&5 cat > conftest.$ac_ext <<EOF -#line 9453 "configure" +#line 9444 "configure" #include "confdefs.h" #include <png.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:9458: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:9449: \"$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* ＠＠ -9477,12 +9468,12 ＠＠ } test -z "$with_png" && { echo $ac_n "checking for png_read_image in -lpng""... $ac_c" 1>&6 -echo "configure:9481: checking for png_read_image in -lpng" >&5 +echo "configure:9472: 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 9486 "configure" +#line 9477 "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 ＠＠ -9493,7 +9484,7 ＠＠ png_read_image() ; return 0; } EOF -if { (eval echo configure:9497: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9488: \"$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 ＠＠ -9516,10 +9507,10 ＠＠ } if test -z "$with_png"; then echo $ac_n "checking for workable png version information""... $ac_c" 1>&6 -echo "configure:9520: checking for workable png version information" >&5 +echo "configure:9511: checking for workable png version information" >&5 xe_check_libs="-lpng -lz" cat > conftest.$ac_ext <<EOF -#line 9523 "configure" +#line 9514 "configure" #include "confdefs.h" #include <png.h> int main(int c, char **v) { ＠＠ -9527,7 +9518,7 ＠＠ if (strcmp(png_libpng_ver, PNG_LIBPNG_VER_STRING) != 0) return 1; return (PNG_LIBPNG_VER < 10002) ? 2 : 0 ;} EOF -if { (eval echo configure:9531: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 +if { (eval echo configure:9522: \"$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 ＠＠ -9570,15 +9561,15 ＠＠ 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:9574: checking for tiffio.h" >&5 +echo "configure:9565: checking for tiffio.h" >&5 cat > conftest.$ac_ext <<EOF -#line 9577 "configure" +#line 9568 "configure" #include "confdefs.h" #include <tiffio.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:9582: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:9573: \"$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* ＠＠ -9601,12 +9592,12 ＠＠ } test -z "$with_tiff" && { echo $ac_n "checking for TIFFClientOpen in -ltiff""... $ac_c" 1>&6 -echo "configure:9605: checking for TIFFClientOpen in -ltiff" >&5 +echo "configure:9596: 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 9610 "configure" +#line 9601 "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 ＠＠ -9617,7 +9608,7 ＠＠ TIFFClientOpen() ; return 0; } EOF -if { (eval echo configure:9621: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9612: \"$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 ＠＠ -9656,15 +9647,15 ＠＠ 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:9660: checking for compface.h" >&5 +echo "configure:9651: checking for compface.h" >&5 cat > conftest.$ac_ext <<EOF -#line 9663 "configure" +#line 9654 "configure" #include "confdefs.h" #include <compface.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:9668: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:9659: \"$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* ＠＠ -9687,12 +9678,12 ＠＠ } test -z "$with_xface" && { echo $ac_n "checking for UnGenFace in -lcompface""... $ac_c" 1>&6 -echo "configure:9691: checking for UnGenFace in -lcompface" >&5 +echo "configure:9682: 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 9696 "configure" +#line 9687 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 ＠＠ -9703,7 +9694,7 ＠＠ UnGenFace() ; return 0; } EOF -if { (eval echo configure:9707: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9698: \"$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 ＠＠ -9742,7 +9733,7 ＠＠ if test "$with_x11" = "yes"; then echo "checking for X11 graphics libraries" 1>&6 -echo "configure:9746: checking for X11 graphics libraries" >&5 +echo "configure:9737: checking for X11 graphics libraries" >&5 fi case "$with_widgets" in ＠＠ -9752,7 +9743,7 ＠＠ if test "$with_x11" = "yes" -a "$detect_athena" = "yes" ; then echo "checking for the Athena widgets" 1>&6 -echo "configure:9756: checking for the Athena widgets" >&5 +echo "configure:9747: checking for the Athena widgets" >&5 case "$with_athena" in "xaw" | "") athena_variant=Xaw athena_3d=no ;; ＠＠ -9766,12 +9757,12 ＠＠ if test "$athena_3d" = "no"; then echo $ac_n "checking for XawScrollbarSetThumb in -l$athena_variant""... $ac_c" 1>&6 -echo "configure:9770: checking for XawScrollbarSetThumb in -l$athena_variant" >&5 +echo "configure:9761: 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 9775 "configure" +#line 9766 "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 ＠＠ -9782,7 +9773,7 ＠＠ XawScrollbarSetThumb() ; return 0; } EOF -if { (eval echo configure:9786: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9777: \"$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 ＠＠ -9798,12 +9789,12 ＠＠ echo "$ac_t""yes" 1>&6 echo $ac_n "checking for threeDClassRec in -l$athena_variant""... $ac_c" 1>&6 -echo "configure:9802: checking for threeDClassRec in -l$athena_variant" >&5 +echo "configure:9793: 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 9807 "configure" +#line 9798 "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 ＠＠ -9814,7 +9805,7 ＠＠ threeDClassRec() ; return 0; } EOF -if { (eval echo configure:9818: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9809: \"$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 ＠＠ -9845,12 +9836,12 ＠＠ else echo $ac_n "checking for threeDClassRec in -l$athena_variant""... $ac_c" 1>&6 -echo "configure:9849: checking for threeDClassRec in -l$athena_variant" >&5 +echo "configure:9840: 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 9854 "configure" +#line 9845 "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 ＠＠ -9861,7 +9852,7 ＠＠ threeDClassRec() ; return 0; } EOF -if { (eval echo configure:9865: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9856: \"$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 ＠＠ -9879,12 +9870,12 ＠＠ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for threeDClassRec in -lXaw""... $ac_c" 1>&6 -echo "configure:9883: checking for threeDClassRec in -lXaw" >&5 +echo "configure:9874: 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 9888 "configure" +#line 9879 "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 ＠＠ -9895,7 +9886,7 ＠＠ threeDClassRec() ; return 0; } EOF -if { (eval echo configure:9899: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9890: \"$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 ＠＠ -9926,15 +9917,15 ＠＠ 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:9930: checking for X11/Xaw/ThreeD.h" >&5 +echo "configure:9921: checking for X11/Xaw/ThreeD.h" >&5 cat > conftest.$ac_ext <<EOF -#line 9933 "configure" +#line 9924 "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:9938: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:9929: \"$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* ＠＠ -9954,15 +9945,15 ＠＠ 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:9958: checking for X11/Xaw/XawInit.h" >&5 +echo "configure:9949: checking for X11/Xaw/XawInit.h" >&5 cat > conftest.$ac_ext <<EOF -#line 9961 "configure" +#line 9952 "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:9966: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:9957: \"$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* ＠＠ -9988,15 +9979,15 ＠＠ 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:9992: checking for X11/$athena_variant/XawInit.h" >&5 +echo "configure:9983: checking for X11/$athena_variant/XawInit.h" >&5 cat > conftest.$ac_ext <<EOF -#line 9995 "configure" +#line 9986 "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:10000: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:9991: \"$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* ＠＠ -10013,15 +10004,15 ＠＠ 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:10017: checking for X11/$athena_variant/ThreeD.h" >&5 +echo "configure:10008: checking for X11/$athena_variant/ThreeD.h" >&5 cat > conftest.$ac_ext <<EOF -#line 10020 "configure" +#line 10011 "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:10025: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:10016: \"$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* ＠＠ -10049,15 +10040,15 ＠＠ 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:10053: checking for $athena_variant/XawInit.h" >&5 +echo "configure:10044: checking for $athena_variant/XawInit.h" >&5 cat > conftest.$ac_ext <<EOF -#line 10056 "configure" +#line 10047 "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:10061: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:10052: \"$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* ＠＠ -10074,15 +10065,15 ＠＠ 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:10078: checking for $athena_variant/ThreeD.h" >&5 +echo "configure:10069: checking for $athena_variant/ThreeD.h" >&5 cat > conftest.$ac_ext <<EOF -#line 10081 "configure" +#line 10072 "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:10086: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:10077: \"$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* ＠＠ -10111,15 +10102,15 ＠＠ 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:10115: checking for X11/Xaw3d/XawInit.h" >&5 +echo "configure:10106: checking for X11/Xaw3d/XawInit.h" >&5 cat > conftest.$ac_ext <<EOF -#line 10118 "configure" +#line 10109 "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:10123: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:10114: \"$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* ＠＠ -10136,15 +10127,15 ＠＠ 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:10140: checking for X11/Xaw3d/ThreeD.h" >&5 +echo "configure:10131: checking for X11/Xaw3d/ThreeD.h" >&5 cat > conftest.$ac_ext <<EOF -#line 10143 "configure" +#line 10134 "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:10148: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:10139: \"$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* ＠＠ -10176,15 +10167,15 ＠＠ 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:10180: checking for Xaw3d/XawInit.h" >&5 +echo "configure:10171: checking for Xaw3d/XawInit.h" >&5 cat > conftest.$ac_ext <<EOF -#line 10183 "configure" +#line 10174 "configure" #include "confdefs.h" #include <Xaw3d/XawInit.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:10188: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:10179: \"$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* ＠＠ -10201,15 +10192,15 ＠＠ 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:10205: checking for Xaw3d/ThreeD.h" >&5 +echo "configure:10196: checking for Xaw3d/ThreeD.h" >&5 cat > conftest.$ac_ext <<EOF -#line 10208 "configure" +#line 10199 "configure" #include "confdefs.h" #include <Xaw3d/ThreeD.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:10213: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:10204: \"$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* ＠＠ -10241,15 +10232,15 ＠＠ 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:10245: checking for X11/Xaw/ThreeD.h" >&5 +echo "configure:10236: checking for X11/Xaw/ThreeD.h" >&5 cat > conftest.$ac_ext <<EOF -#line 10248 "configure" +#line 10239 "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:10253: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:10244: \"$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* ＠＠ -10288,15 +10279,15 ＠＠ 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:10292: checking for Xm/Xm.h" >&5 +echo "configure:10283: checking for Xm/Xm.h" >&5 cat > conftest.$ac_ext <<EOF -#line 10295 "configure" +#line 10286 "configure" #include "confdefs.h" #include <Xm/Xm.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:10300: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:10291: \"$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* ＠＠ -10313,12 +10304,12 ＠＠ echo "$ac_t""yes" 1>&6 echo $ac_n "checking for XmStringFree in -lXm""... $ac_c" 1>&6 -echo "configure:10317: checking for XmStringFree in -lXm" >&5 +echo "configure:10308: 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 10322 "configure" +#line 10313 "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 ＠＠ -10329,7 +10320,7 ＠＠ XmStringFree() ; return 0; } EOF -if { (eval echo configure:10333: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10324: \"$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 ＠＠ -10358,9 +10349,9 ＠＠ if test "$have_motif" = "yes"; then echo $ac_n "checking for Lesstif""... $ac_c" 1>&6 -echo "configure:10362: checking for Lesstif" >&5 +echo "configure:10353: checking for Lesstif" >&5 cat > conftest.$ac_ext <<EOF -#line 10364 "configure" +#line 10355 "configure" #include "confdefs.h" #include <Xm/Xm.h> #ifdef LESSTIF_VERSION ＠＠ -10733,7 +10724,7 ＠＠ if test "$with_mule" = "yes" ; then echo "checking for Mule-related features" 1>&6 -echo "configure:10737: checking for Mule-related features" >&5 +echo "configure:10728: checking for Mule-related features" >&5 { test "$extra_verbose" = "yes" && cat << \EOF Defining MULE EOF ＠＠ -10747,15 +10738,15 ＠＠ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:10751: checking for $ac_hdr" >&5 +echo "configure:10742: checking for $ac_hdr" >&5 cat > conftest.$ac_ext <<EOF -#line 10754 "configure" +#line 10745 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:10759: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:10750: \"$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* ＠＠ -10786,12 +10777,12 ＠＠ echo $ac_n "checking for strerror in -lintl""... $ac_c" 1>&6 -echo "configure:10790: checking for strerror in -lintl" >&5 +echo "configure:10781: 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 10795 "configure" +#line 10786 "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 ＠＠ -10802,7 +10793,7 ＠＠ strerror() ; return 0; } EOF -if { (eval echo configure:10806: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10797: \"$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 ＠＠ -10835,18 +10826,18 ＠＠ echo "checking for Mule input methods" 1>&6 -echo "configure:10839: checking for Mule input methods" >&5 +echo "configure:10830: checking for Mule input methods" >&5 case "$with_xim" in "" | "yes" ) echo "checking for XIM" 1>&6 -echo "configure:10842: checking for XIM" >&5 +echo "configure:10833: checking for XIM" >&5 echo $ac_n "checking for XOpenIM in -lX11""... $ac_c" 1>&6 -echo "configure:10845: checking for XOpenIM in -lX11" >&5 +echo "configure:10836: 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 10850 "configure" +#line 10841 "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 ＠＠ -10857,7 +10848,7 ＠＠ XOpenIM() ; return 0; } EOF -if { (eval echo configure:10861: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10852: \"$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 ＠＠ -10881,12 +10872,12 ＠＠ if test "$have_motif $have_lesstif" = "yes no"; then echo $ac_n "checking for XmImMbLookupString in -lXm""... $ac_c" 1>&6 -echo "configure:10885: checking for XmImMbLookupString in -lXm" >&5 +echo "configure:10876: 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 10890 "configure" +#line 10881 "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 ＠＠ -10897,7 +10888,7 ＠＠ XmImMbLookupString() ; return 0; } EOF -if { (eval echo configure:10901: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10892: \"$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 ＠＠ -10962,15 +10953,15 ＠＠ if test "$with_xfs" = "yes" ; then echo "checking for XFontSet" 1>&6 -echo "configure:10966: checking for XFontSet" >&5 +echo "configure:10957: checking for XFontSet" >&5 echo $ac_n "checking for XmbDrawString in -lX11""... $ac_c" 1>&6 -echo "configure:10969: checking for XmbDrawString in -lX11" >&5 +echo "configure:10960: 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 10974 "configure" +#line 10965 "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 ＠＠ -10981,7 +10972,7 ＠＠ XmbDrawString() ; return 0; } EOF -if { (eval echo configure:10985: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10976: \"$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 ＠＠ -11021,15 +11012,15 ＠＠ test "$with_wnn6" = "yes" && with_wnn=yes # wnn6 implies wnn support test -z "$with_wnn" && { ac_safe=`echo "wnn/jllib.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for wnn/jllib.h""... $ac_c" 1>&6 -echo "configure:11025: checking for wnn/jllib.h" >&5 +echo "configure:11016: checking for wnn/jllib.h" >&5 cat > conftest.$ac_ext <<EOF -#line 11028 "configure" +#line 11019 "configure" #include "confdefs.h" #include <wnn/jllib.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:11033: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:11024: \"$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* ＠＠ -11052,15 +11043,15 ＠＠ } 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:11056: checking for wnn/commonhd.h" >&5 +echo "configure:11047: checking for wnn/commonhd.h" >&5 cat > conftest.$ac_ext <<EOF -#line 11059 "configure" +#line 11050 "configure" #include "confdefs.h" #include <wnn/commonhd.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:11064: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:11055: \"$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* ＠＠ -11085,10 +11076,10 ＠＠ for ac_func in crypt do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:11089: checking for $ac_func" >&5 +echo "configure:11080: checking for $ac_func" >&5 cat > conftest.$ac_ext <<EOF -#line 11092 "configure" +#line 11083 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ ＠＠ -11111,7 +11102,7 ＠＠ ; return 0; } EOF -if { (eval echo configure:11115: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11106: \"$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 ＠＠ -11140,12 +11131,12 ＠＠ test "$ac_cv_func_crypt" != "yes" && { echo $ac_n "checking for crypt in -lcrypt""... $ac_c" 1>&6 -echo "configure:11144: checking for crypt in -lcrypt" >&5 +echo "configure:11135: 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 11149 "configure" +#line 11140 "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 ＠＠ -11156,7 +11147,7 ＠＠ crypt() ; return 0; } EOF -if { (eval echo configure:11160: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11151: \"$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 ＠＠ -11191,12 +11182,12 ＠＠ 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:11195: checking for jl_dic_list_e in -lwnn" >&5 +echo "configure:11186: 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 11200 "configure" +#line 11191 "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 ＠＠ -11207,7 +11198,7 ＠＠ jl_dic_list_e() ; return 0; } EOF -if { (eval echo configure:11211: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11202: \"$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 ＠＠ -11225,12 +11216,12 ＠＠ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for jl_dic_list_e in -lwnn4""... $ac_c" 1>&6 -echo "configure:11229: checking for jl_dic_list_e in -lwnn4" >&5 +echo "configure:11220: 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 11234 "configure" +#line 11225 "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 ＠＠ -11241,7 +11232,7 ＠＠ jl_dic_list_e() ; return 0; } EOF -if { (eval echo configure:11245: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11236: \"$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 ＠＠ -11259,12 +11250,12 ＠＠ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for jl_dic_list_e in -lwnn6""... $ac_c" 1>&6 -echo "configure:11263: checking for jl_dic_list_e in -lwnn6" >&5 +echo "configure:11254: 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 11268 "configure" +#line 11259 "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 ＠＠ -11275,7 +11266,7 ＠＠ jl_dic_list_e() ; return 0; } EOF -if { (eval echo configure:11279: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11270: \"$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 ＠＠ -11293,12 +11284,12 ＠＠ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for dic_list_e in -lwnn6_fromsrc""... $ac_c" 1>&6 -echo "configure:11297: checking for dic_list_e in -lwnn6_fromsrc" >&5 +echo "configure:11288: 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 11302 "configure" +#line 11293 "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 ＠＠ -11309,7 +11300,7 ＠＠ dic_list_e() ; return 0; } EOF -if { (eval echo configure:11313: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11304: \"$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 ＠＠ -11354,12 +11345,12 ＠＠ if test "$with_wnn6" != "no"; then echo $ac_n "checking for jl_fi_dic_list in -l$libwnn""... $ac_c" 1>&6 -echo "configure:11358: checking for jl_fi_dic_list in -l$libwnn" >&5 +echo "configure:11349: 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 11363 "configure" +#line 11354 "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 ＠＠ -11370,7 +11361,7 ＠＠ jl_fi_dic_list() ; return 0; } EOF -if { (eval echo configure:11374: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11365: \"$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 ＠＠ -11405,15 +11396,15 ＠＠ 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:11409: checking for canna/jrkanji.h" >&5 +echo "configure:11400: checking for canna/jrkanji.h" >&5 cat > conftest.$ac_ext <<EOF -#line 11412 "configure" +#line 11403 "configure" #include "confdefs.h" #include <canna/jrkanji.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:11417: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:11408: \"$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* ＠＠ -11440,15 +11431,15 ＠＠ 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:11444: checking for canna/jrkanji.h" >&5 +echo "configure:11435: checking for canna/jrkanji.h" >&5 cat > conftest.$ac_ext <<EOF -#line 11447 "configure" +#line 11438 "configure" #include "confdefs.h" #include <canna/jrkanji.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:11452: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:11443: \"$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* ＠＠ -11476,15 +11467,15 ＠＠ test -z "$with_canna" && { ac_safe=`echo "canna/RK.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for canna/RK.h""... $ac_c" 1>&6 -echo "configure:11480: checking for canna/RK.h" >&5 +echo "configure:11471: checking for canna/RK.h" >&5 cat > conftest.$ac_ext <<EOF -#line 11483 "configure" +#line 11474 "configure" #include "confdefs.h" #include <canna/RK.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:11488: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:11479: \"$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* ＠＠ -11507,12 +11498,12 ＠＠ } test -z "$with_canna" && { echo $ac_n "checking for RkBgnBun in -lRKC""... $ac_c" 1>&6 -echo "configure:11511: checking for RkBgnBun in -lRKC" >&5 +echo "configure:11502: 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 11516 "configure" +#line 11507 "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 ＠＠ -11523,7 +11514,7 ＠＠ RkBgnBun() ; return 0; } EOF -if { (eval echo configure:11527: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11518: \"$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 ＠＠ -11546,12 +11537,12 ＠＠ } test -z "$with_canna" && { echo $ac_n "checking for jrKanjiControl in -lcanna""... $ac_c" 1>&6 -echo "configure:11550: checking for jrKanjiControl in -lcanna" >&5 +echo "configure:11541: 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 11555 "configure" +#line 11546 "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 ＠＠ -11562,7 +11553,7 ＠＠ jrKanjiControl() ; return 0; } EOF -if { (eval echo configure:11566: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11557: \"$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 ＠＠ -11608,12 +11599,12 ＠＠ libs_x="-lXm $libs_x" && if test "$extra_verbose" = "yes"; then echo " Prepending \"-lXm\" to \$libs_x"; fi echo $ac_n "checking for layout_object_getvalue in -li18n""... $ac_c" 1>&6 -echo "configure:11612: checking for layout_object_getvalue in -li18n" >&5 +echo "configure:11603: 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 11617 "configure" +#line 11608 "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 ＠＠ -11624,7 +11615,7 ＠＠ layout_object_getvalue() ; return 0; } EOF -if { (eval echo configure:11628: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11619: \"$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 ＠＠ -11710,10 +11701,10 ＠＠ 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 symlink tzset ulimit usleep waitpid vsnprintf fsync ftruncate umask do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:11714: checking for $ac_func" >&5 +echo "configure:11705: checking for $ac_func" >&5 cat > conftest.$ac_ext <<EOF -#line 11717 "configure" +#line 11708 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ ＠＠ -11736,7 +11727,7 ＠＠ ; return 0; } EOF -if { (eval echo configure:11740: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11731: \"$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 ＠＠ -11768,10 +11759,10 ＠＠ 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:11772: checking for $ac_func" >&5 +echo "configure:11763: checking for $ac_func" >&5 cat > conftest.$ac_ext <<EOF -#line 11775 "configure" +#line 11766 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ ＠＠ -11794,7 +11785,7 ＠＠ ; return 0; } EOF -if { (eval echo configure:11798: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11789: \"$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 ＠＠ -11823,10 +11814,10 ＠＠ echo $ac_n "checking for openpty""... $ac_c" 1>&6 -echo "configure:11827: checking for openpty" >&5 +echo "configure:11818: checking for openpty" >&5 cat > conftest.$ac_ext <<EOF -#line 11830 "configure" +#line 11821 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char openpty(); below. */ ＠＠ -11849,7 +11840,7 ＠＠ ; return 0; } EOF -if { (eval echo configure:11853: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11844: \"$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 ＠＠ -11868,12 +11859,12 ＠＠ echo $ac_n "checking for openpty in -lutil""... $ac_c" 1>&6 -echo "configure:11872: checking for openpty in -lutil" >&5 +echo "configure:11863: 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 11877 "configure" +#line 11868 "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 ＠＠ -11884,7 +11875,7 ＠＠ openpty() ; return 0; } EOF -if { (eval echo configure:11888: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11879: \"$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 ＠＠ -11919,15 +11910,15 ＠＠ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:11923: checking for $ac_hdr" >&5 +echo "configure:11914: checking for $ac_hdr" >&5 cat > conftest.$ac_ext <<EOF -#line 11926 "configure" +#line 11917 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:11931: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:11922: \"$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* ＠＠ -11964,15 +11955,15 ＠＠ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:11968: checking for $ac_hdr" >&5 +echo "configure:11959: checking for $ac_hdr" >&5 cat > conftest.$ac_ext <<EOF -#line 11971 "configure" +#line 11962 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:11976: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:11967: \"$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* ＠＠ -12005,15 +11996,15 ＠＠ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:12009: checking for $ac_hdr" >&5 +echo "configure:12000: checking for $ac_hdr" >&5 cat > conftest.$ac_ext <<EOF -#line 12012 "configure" +#line 12003 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:12017: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:12008: \"$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* ＠＠ -12046,15 +12037,15 ＠＠ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:12050: checking for $ac_hdr" >&5 +echo "configure:12041: checking for $ac_hdr" >&5 cat > conftest.$ac_ext <<EOF -#line 12053 "configure" +#line 12044 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:12058: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:12049: \"$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* ＠＠ -12090,15 +12081,15 ＠＠ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:12094: checking for $ac_hdr" >&5 +echo "configure:12085: checking for $ac_hdr" >&5 cat > conftest.$ac_ext <<EOF -#line 12097 "configure" +#line 12088 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:12102: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:12093: \"$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* ＠＠ -12131,10 +12122,10 ＠＠ for ac_func in isastream do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:12135: checking for $ac_func" >&5 +echo "configure:12126: checking for $ac_func" >&5 cat > conftest.$ac_ext <<EOF -#line 12138 "configure" +#line 12129 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ ＠＠ -12157,7 +12148,7 ＠＠ ; return 0; } EOF -if { (eval echo configure:12161: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:12152: \"$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 ＠＠ -12188,15 +12179,15 ＠＠ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:12192: checking for $ac_hdr" >&5 +echo "configure:12183: checking for $ac_hdr" >&5 cat > conftest.$ac_ext <<EOF -#line 12195 "configure" +#line 12186 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:12200: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:12191: \"$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* ＠＠ -12229,10 +12220,10 ＠＠ for ac_func in getloadavg do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:12233: checking for $ac_func" >&5 +echo "configure:12224: checking for $ac_func" >&5 cat > conftest.$ac_ext <<EOF -#line 12236 "configure" +#line 12227 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ ＠＠ -12255,7 +12246,7 ＠＠ ; return 0; } EOF -if { (eval echo configure:12259: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:12250: \"$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 ＠＠ -12288,15 +12279,15 ＠＠ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:12292: checking for $ac_hdr" >&5 +echo "configure:12283: checking for $ac_hdr" >&5 cat > conftest.$ac_ext <<EOF -#line 12295 "configure" +#line 12286 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:12300: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:12291: \"$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* ＠＠ -12332,12 +12323,12 ＠＠ echo $ac_n "checking for kstat_open in -lkstat""... $ac_c" 1>&6 -echo "configure:12336: checking for kstat_open in -lkstat" >&5 +echo "configure:12327: 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 12341 "configure" +#line 12332 "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 ＠＠ -12348,7 +12339,7 ＠＠ kstat_open() ; return 0; } EOF -if { (eval echo configure:12352: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:12343: \"$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 ＠＠ -12383,15 +12374,15 ＠＠ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:12387: checking for $ac_hdr" >&5 +echo "configure:12378: checking for $ac_hdr" >&5 cat > conftest.$ac_ext <<EOF -#line 12390 "configure" +#line 12381 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:12395: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:12386: \"$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* ＠＠ -12423,12 +12414,12 ＠＠ echo $ac_n "checking for kvm_read in -lkvm""... $ac_c" 1>&6 -echo "configure:12427: checking for kvm_read in -lkvm" >&5 +echo "configure:12418: 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 12432 "configure" +#line 12423 "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 ＠＠ -12439,7 +12430,7 ＠＠ kvm_read() ; return 0; } EOF -if { (eval echo configure:12443: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:12434: \"$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 ＠＠ -12473,16 +12464,16 ＠＠ fi echo $ac_n "checking whether netdb declares h_errno""... $ac_c" 1>&6 -echo "configure:12477: checking whether netdb declares h_errno" >&5 +echo "configure:12468: checking whether netdb declares h_errno" >&5 cat > conftest.$ac_ext <<EOF -#line 12479 "configure" +#line 12470 "configure" #include "confdefs.h" #include <netdb.h> int main() { return h_errno; ; return 0; } EOF -if { (eval echo configure:12486: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:12477: \"$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 ＠＠ -12502,16 +12493,16 ＠＠ rm -f conftest* echo $ac_n "checking for sigsetjmp""... $ac_c" 1>&6 -echo "configure:12506: checking for sigsetjmp" >&5 +echo "configure:12497: checking for sigsetjmp" >&5 cat > conftest.$ac_ext <<EOF -#line 12508 "configure" +#line 12499 "configure" #include "confdefs.h" #include <setjmp.h> int main() { sigjmp_buf bar; sigsetjmp (bar, 0); ; return 0; } EOF -if { (eval echo configure:12515: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:12506: \"$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 ＠＠ -12531,11 +12522,11 ＠＠ rm -f conftest* echo $ac_n "checking whether localtime caches TZ""... $ac_c" 1>&6 -echo "configure:12535: checking whether localtime caches TZ" >&5 +echo "configure:12526: checking whether localtime caches TZ" >&5 if test "$ac_cv_func_tzset" = "yes"; then cat > conftest.$ac_ext <<EOF -#line 12539 "configure" +#line 12530 "configure" #include "confdefs.h" #include <time.h> #if STDC_HEADERS ＠＠ -12570,7 +12561,7 ＠＠ exit (0); } EOF -if { (eval echo configure:12574: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 +if { (eval echo configure:12565: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 then emacs_cv_localtime_cache=no else ＠＠ -12600,9 +12591,9 ＠＠ if test "$HAVE_TIMEVAL" = "yes"; then echo $ac_n "checking whether gettimeofday accepts one or two arguments""... $ac_c" 1>&6 -echo "configure:12604: checking whether gettimeofday accepts one or two arguments" >&5 +echo "configure:12595: checking whether gettimeofday accepts one or two arguments" >&5 cat > conftest.$ac_ext <<EOF -#line 12606 "configure" +#line 12597 "configure" #include "confdefs.h" #ifdef TIME_WITH_SYS_TIME ＠＠ -12623,7 +12614,7 ＠＠ ; return 0; } EOF -if { (eval echo configure:12627: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:12618: \"$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 ＠＠ -12645,19 +12636,19 ＠＠ echo $ac_n "checking for inline""... $ac_c" 1>&6 -echo "configure:12649: checking for inline" >&5 +echo "configure:12640: checking for inline" >&5 ac_cv_c_inline=no for ac_kw in inline __inline__ __inline; do cat > conftest.$ac_ext <<EOF -#line 12654 "configure" +#line 12645 "configure" #include "confdefs.h" int main() { } $ac_kw foo() { ; return 0; } EOF -if { (eval echo configure:12661: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:12652: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_inline=$ac_kw; break else ＠＠ -12698,17 +12689,17 ＠＠ # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works # for constant arguments. Useless! echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6 -echo "configure:12702: checking for working alloca.h" >&5 +echo "configure:12693: checking for working alloca.h" >&5 cat > conftest.$ac_ext <<EOF -#line 12705 "configure" +#line 12696 "configure" #include "confdefs.h" #include <alloca.h> int main() { char *p = alloca(2 * sizeof(int)); ; return 0; } EOF -if { (eval echo configure:12712: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:12703: \"$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 ＠＠ -12732,10 +12723,10 ＠＠ fi echo $ac_n "checking for alloca""... $ac_c" 1>&6 -echo "configure:12736: checking for alloca" >&5 +echo "configure:12727: checking for alloca" >&5 cat > conftest.$ac_ext <<EOF -#line 12739 "configure" +#line 12730 "configure" #include "confdefs.h" #ifdef __GNUC__ ＠＠ -12763,7 +12754,7 ＠＠ char *p = (char *) alloca(1); ; return 0; } EOF -if { (eval echo configure:12767: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:12758: \"$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 ＠＠ -12802,10 +12793,10 ＠＠ echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6 -echo "configure:12806: checking whether alloca needs Cray hooks" >&5 +echo "configure:12797: checking whether alloca needs Cray hooks" >&5 cat > conftest.$ac_ext <<EOF -#line 12809 "configure" +#line 12800 "configure" #include "confdefs.h" #if defined(CRAY) && ! defined(CRAY2) webecray ＠＠ -12829,10 +12820,10 ＠＠ if test $ac_cv_os_cray = yes; then for ac_func in _getb67 GETB67 getb67; do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:12833: checking for $ac_func" >&5 +echo "configure:12824: checking for $ac_func" >&5 cat > conftest.$ac_ext <<EOF -#line 12836 "configure" +#line 12827 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ ＠＠ -12855,7 +12846,7 ＠＠ ; return 0; } EOF -if { (eval echo configure:12859: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:12850: \"$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 ＠＠ -12885,10 +12876,10 ＠＠ fi echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6 -echo "configure:12889: checking stack direction for C alloca" >&5 +echo "configure:12880: checking stack direction for C alloca" >&5 cat > conftest.$ac_ext <<EOF -#line 12892 "configure" +#line 12883 "configure" #include "confdefs.h" find_stack_direction () { ＠＠ -12907,7 +12898,7 ＠＠ exit (find_stack_direction() < 0); } EOF -if { (eval echo configure:12911: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 +if { (eval echo configure:12902: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 then ac_cv_c_stack_direction=1 else ＠＠ -12936,10 +12927,10 ＠＠ fi echo $ac_n "checking for working strcoll""... $ac_c" 1>&6 -echo "configure:12940: checking for working strcoll" >&5 +echo "configure:12931: checking for working strcoll" >&5 cat > conftest.$ac_ext <<EOF -#line 12943 "configure" +#line 12934 "configure" #include "confdefs.h" #include <string.h> main () ＠＠ -12949,7 +12940,7 ＠＠ strcoll ("123", "456") >= 0); } EOF -if { (eval echo configure:12953: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 +if { (eval echo configure:12944: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 then ac_cv_func_strcoll_works=yes else ＠＠ -12977,10 +12968,10 ＠＠ for ac_func in getpgrp do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:12981: checking for $ac_func" >&5 +echo "configure:12972: checking for $ac_func" >&5 cat > conftest.$ac_ext <<EOF -#line 12984 "configure" +#line 12975 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ ＠＠ -13003,7 +12994,7 ＠＠ ; return 0; } EOF -if { (eval echo configure:13007: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:12998: \"$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 ＠＠ -13031,10 +13022,10 ＠＠ done echo $ac_n "checking whether getpgrp takes no argument""... $ac_c" 1>&6 -echo "configure:13035: checking whether getpgrp takes no argument" >&5 +echo "configure:13026: checking whether getpgrp takes no argument" >&5 cat > conftest.$ac_ext <<EOF -#line 13038 "configure" +#line 13029 "configure" #include "confdefs.h" /* ＠＠ -13089,7 +13080,7 ＠＠ } EOF -if { (eval echo configure:13093: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 +if { (eval echo configure:13084: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 then ac_cv_func_getpgrp_void=yes else ＠＠ -13116,10 +13107,10 ＠＠ echo $ac_n "checking for working mmap""... $ac_c" 1>&6 -echo "configure:13120: checking for working mmap" >&5 +echo "configure:13111: checking for working mmap" >&5 case "$opsys" in ultrix* ) have_mmap=no ;; *) cat > conftest.$ac_ext <<EOF -#line 13123 "configure" +#line 13114 "configure" #include "confdefs.h" #include <stdio.h> #include <unistd.h> ＠＠ -13152,7 +13143,7 ＠＠ return 1; } EOF -if { (eval echo configure:13156: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 +if { (eval echo configure:13147: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 then have_mmap=yes else ＠＠ -13181,9 +13172,9 ＠＠ 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:13185: checking for M_MMAP_THRESHOLD" >&5 +echo "configure:13176: checking for M_MMAP_THRESHOLD" >&5 cat > conftest.$ac_ext <<EOF -#line 13187 "configure" +#line 13178 "configure" #include "confdefs.h" #include <malloc.h> int main() { ＠＠ -13195,7 +13186,7 ＠＠ ; return 0; } EOF -if { (eval echo configure:13199: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:13190: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* rel_alloc=no; echo "$ac_t""yes" 1>&6; else ＠＠ -13220,15 +13211,15 ＠＠ ac_safe=`echo "termios.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for termios.h""... $ac_c" 1>&6 -echo "configure:13224: checking for termios.h" >&5 +echo "configure:13215: checking for termios.h" >&5 cat > conftest.$ac_ext <<EOF -#line 13227 "configure" +#line 13218 "configure" #include "confdefs.h" #include <termios.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:13232: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:13223: \"$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* ＠＠ -13271,15 +13262,15 ＠＠ echo "$ac_t""no" 1>&6 ac_safe=`echo "termio.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for termio.h""... $ac_c" 1>&6 -echo "configure:13275: checking for termio.h" >&5 +echo "configure:13266: checking for termio.h" >&5 cat > conftest.$ac_ext <<EOF -#line 13278 "configure" +#line 13269 "configure" #include "confdefs.h" #include <termio.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:13283: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:13274: \"$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* ＠＠ -13311,10 +13302,10 ＠＠ echo $ac_n "checking for socket""... $ac_c" 1>&6 -echo "configure:13315: checking for socket" >&5 +echo "configure:13306: checking for socket" >&5 cat > conftest.$ac_ext <<EOF -#line 13318 "configure" +#line 13309 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char socket(); below. */ ＠＠ -13337,7 +13328,7 ＠＠ ; return 0; } EOF -if { (eval echo configure:13341: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:13332: \"$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 ＠＠ -13352,15 +13343,15 ＠＠ echo "$ac_t""yes" 1>&6 ac_safe=`echo "netinet/in.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for netinet/in.h""... $ac_c" 1>&6 -echo "configure:13356: checking for netinet/in.h" >&5 +echo "configure:13347: checking for netinet/in.h" >&5 cat > conftest.$ac_ext <<EOF -#line 13359 "configure" +#line 13350 "configure" #include "confdefs.h" #include <netinet/in.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:13364: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:13355: \"$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* ＠＠ -13377,15 +13368,15 ＠＠ echo "$ac_t""yes" 1>&6 ac_safe=`echo "arpa/inet.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for arpa/inet.h""... $ac_c" 1>&6 -echo "configure:13381: checking for arpa/inet.h" >&5 +echo "configure:13372: checking for arpa/inet.h" >&5 cat > conftest.$ac_ext <<EOF -#line 13384 "configure" +#line 13375 "configure" #include "confdefs.h" #include <arpa/inet.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:13389: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:13380: \"$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* ＠＠ -13410,9 +13401,9 ＠＠ } echo $ac_n "checking "for sun_len member in struct sockaddr_un"""... $ac_c" 1>&6 -echo "configure:13414: checking "for sun_len member in struct sockaddr_un"" >&5 +echo "configure:13405: checking "for sun_len member in struct sockaddr_un"" >&5 cat > conftest.$ac_ext <<EOF -#line 13416 "configure" +#line 13407 "configure" #include "confdefs.h" #include <sys/types.h> ＠＠ -13423,7 +13414,7 ＠＠ static struct sockaddr_un x; x.sun_len = 1; ; return 0; } EOF -if { (eval echo configure:13427: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:13418: \"$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 ＠＠ -13441,9 +13432,9 ＠＠ fi rm -f conftest* echo $ac_n "checking "for ip_mreq struct in netinet/in.h"""... $ac_c" 1>&6 -echo "configure:13445: checking "for ip_mreq struct in netinet/in.h"" >&5 +echo "configure:13436: checking "for ip_mreq struct in netinet/in.h"" >&5 cat > conftest.$ac_ext <<EOF -#line 13447 "configure" +#line 13438 "configure" #include "confdefs.h" #include <sys/types.h> ＠＠ -13453,7 +13444,7 ＠＠ static struct ip_mreq x; ; return 0; } EOF -if { (eval echo configure:13457: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:13448: \"$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 ＠＠ -13484,10 +13475,10 ＠＠ echo $ac_n "checking for msgget""... $ac_c" 1>&6 -echo "configure:13488: checking for msgget" >&5 +echo "configure:13479: checking for msgget" >&5 cat > conftest.$ac_ext <<EOF -#line 13491 "configure" +#line 13482 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char msgget(); below. */ ＠＠ -13510,7 +13501,7 ＠＠ ; return 0; } EOF -if { (eval echo configure:13514: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:13505: \"$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 ＠＠ -13525,15 +13516,15 ＠＠ echo "$ac_t""yes" 1>&6 ac_safe=`echo "sys/ipc.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for sys/ipc.h""... $ac_c" 1>&6 -echo "configure:13529: checking for sys/ipc.h" >&5 +echo "configure:13520: checking for sys/ipc.h" >&5 cat > conftest.$ac_ext <<EOF -#line 13532 "configure" +#line 13523 "configure" #include "confdefs.h" #include <sys/ipc.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:13537: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:13528: \"$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* ＠＠ -13550,15 +13541,15 ＠＠ echo "$ac_t""yes" 1>&6 ac_safe=`echo "sys/msg.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for sys/msg.h""... $ac_c" 1>&6 -echo "configure:13554: checking for sys/msg.h" >&5 +echo "configure:13545: checking for sys/msg.h" >&5 cat > conftest.$ac_ext <<EOF -#line 13557 "configure" +#line 13548 "configure" #include "confdefs.h" #include <sys/msg.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:13562: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:13553: \"$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* ＠＠ -13596,15 +13587,15 ＠＠ ac_safe=`echo "dirent.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for dirent.h""... $ac_c" 1>&6 -echo "configure:13600: checking for dirent.h" >&5 +echo "configure:13591: checking for dirent.h" >&5 cat > conftest.$ac_ext <<EOF -#line 13603 "configure" +#line 13594 "configure" #include "confdefs.h" #include <dirent.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:13608: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:13599: \"$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* ＠＠ -13631,15 +13622,15 ＠＠ echo "$ac_t""no" 1>&6 ac_safe=`echo "sys/dir.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for sys/dir.h""... $ac_c" 1>&6 -echo "configure:13635: checking for sys/dir.h" >&5 +echo "configure:13626: checking for sys/dir.h" >&5 cat > conftest.$ac_ext <<EOF -#line 13638 "configure" +#line 13629 "configure" #include "confdefs.h" #include <sys/dir.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:13643: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:13634: \"$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* ＠＠ -13672,15 +13663,15 ＠＠ ac_safe=`echo "nlist.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for nlist.h""... $ac_c" 1>&6 -echo "configure:13676: checking for nlist.h" >&5 +echo "configure:13667: checking for nlist.h" >&5 cat > conftest.$ac_ext <<EOF -#line 13679 "configure" +#line 13670 "configure" #include "confdefs.h" #include <nlist.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:13684: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:13675: \"$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* ＠＠ -13710,22 +13701,22 ＠＠ echo "checking "for sound support"" 1>&6 -echo "configure:13714: checking "for sound support"" >&5 +echo "configure:13705: 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:13721: checking for multimedia/audio_device.h" >&5 +echo "configure:13712: checking for multimedia/audio_device.h" >&5 cat > conftest.$ac_ext <<EOF -#line 13724 "configure" +#line 13715 "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:13729: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:13720: \"$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* ＠＠ -13773,12 +13764,12 ＠＠ if test -z "$native_sound_lib"; then echo $ac_n "checking for ALopenport in -laudio""... $ac_c" 1>&6 -echo "configure:13777: checking for ALopenport in -laudio" >&5 +echo "configure:13768: 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 13782 "configure" +#line 13773 "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 ＠＠ -13789,7 +13780,7 ＠＠ ALopenport() ; return 0; } EOF -if { (eval echo configure:13793: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:13784: \"$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 ＠＠ -13820,12 +13811,12 ＠＠ if test -z "$native_sound_lib"; then echo $ac_n "checking for AOpenAudio in -lAlib""... $ac_c" 1>&6 -echo "configure:13824: checking for AOpenAudio in -lAlib" >&5 +echo "configure:13815: 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 13829 "configure" +#line 13820 "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 ＠＠ -13836,7 +13827,7 ＠＠ AOpenAudio() ; return 0; } EOF -if { (eval echo configure:13840: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:13831: \"$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 ＠＠ -13884,15 +13875,15 ＠＠ for dir in "machine" "sys" "linux"; do ac_safe=`echo "${dir}/soundcard.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for ${dir}/soundcard.h""... $ac_c" 1>&6 -echo "configure:13888: checking for ${dir}/soundcard.h" >&5 +echo "configure:13879: checking for ${dir}/soundcard.h" >&5 cat > conftest.$ac_ext <<EOF -#line 13891 "configure" +#line 13882 "configure" #include "confdefs.h" #include <${dir}/soundcard.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:13896: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:13887: \"$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* ＠＠ -13946,15 +13937,15 ＠＠ 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:13950: checking for audio/audiolib.h" >&5 +echo "configure:13941: checking for audio/audiolib.h" >&5 cat > conftest.$ac_ext <<EOF -#line 13953 "configure" +#line 13944 "configure" #include "confdefs.h" #include <audio/audiolib.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:13958: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:13949: \"$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* ＠＠ -13972,12 +13963,12 ＠＠ echo $ac_n "checking for AuOpenServer in -laudio""... $ac_c" 1>&6 -echo "configure:13976: checking for AuOpenServer in -laudio" >&5 +echo "configure:13967: 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 13981 "configure" +#line 13972 "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 ＠＠ -13988,7 +13979,7 ＠＠ AuOpenServer() ; return 0; } EOF -if { (eval echo configure:13992: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:13983: \"$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 ＠＠ -14027,7 +14018,7 ＠＠ fi libs_x="-laudio $libs_x" && if test "$extra_verbose" = "yes"; then echo " Prepending \"-laudio\" to \$libs_x"; fi cat > conftest.$ac_ext <<EOF -#line 14031 "configure" +#line 14022 "configure" #include "confdefs.h" #include <audio/Xtutil.h> EOF ＠＠ -14058,7 +14049,7 ＠＠ # 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:14062: checking for $ac_word" >&5 +echo "configure:14053: 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. ＠＠ -14087,10 +14078,10 ＠＠ 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:14091: checking for esd_play_stream" >&5 +echo "configure:14082: checking for esd_play_stream" >&5 cat > conftest.$ac_ext <<EOF -#line 14094 "configure" +#line 14085 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char esd_play_stream(); below. */ ＠＠ -14113,7 +14104,7 ＠＠ ; return 0; } EOF -if { (eval echo configure:14117: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14108: \"$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 ＠＠ -14164,7 +14155,7 ＠＠ if test "$with_tty" = "yes" ; then echo "checking for TTY-related features" 1>&6 -echo "configure:14168: checking for TTY-related features" >&5 +echo "configure:14159: checking for TTY-related features" >&5 { test "$extra_verbose" = "yes" && cat << \EOF Defining HAVE_TTY EOF ＠＠ -14177,12 +14168,12 ＠＠ if test -z "$with_ncurses"; then echo $ac_n "checking for tgetent in -lncurses""... $ac_c" 1>&6 -echo "configure:14181: checking for tgetent in -lncurses" >&5 +echo "configure:14172: 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 14186 "configure" +#line 14177 "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 ＠＠ -14193,7 +14184,7 ＠＠ tgetent() ; return 0; } EOF -if { (eval echo configure:14197: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14188: \"$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 ＠＠ -14226,15 +14217,15 ＠＠ ac_safe=`echo "ncurses/curses.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for ncurses/curses.h""... $ac_c" 1>&6 -echo "configure:14230: checking for ncurses/curses.h" >&5 +echo "configure:14221: checking for ncurses/curses.h" >&5 cat > conftest.$ac_ext <<EOF -#line 14233 "configure" +#line 14224 "configure" #include "confdefs.h" #include <ncurses/curses.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:14238: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:14229: \"$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* ＠＠ -14256,15 +14247,15 ＠＠ ac_safe=`echo "ncurses/term.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for ncurses/term.h""... $ac_c" 1>&6 -echo "configure:14260: checking for ncurses/term.h" >&5 +echo "configure:14251: checking for ncurses/term.h" >&5 cat > conftest.$ac_ext <<EOF -#line 14263 "configure" +#line 14254 "configure" #include "confdefs.h" #include <ncurses/term.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:14268: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:14259: \"$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* ＠＠ -14294,15 +14285,15 ＠＠ c_switch_site="$c_switch_site -I/usr/include/ncurses" ac_safe=`echo "ncurses/curses.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for ncurses/curses.h""... $ac_c" 1>&6 -echo "configure:14298: checking for ncurses/curses.h" >&5 +echo "configure:14289: checking for ncurses/curses.h" >&5 cat > conftest.$ac_ext <<EOF -#line 14301 "configure" +#line 14292 "configure" #include "confdefs.h" #include <ncurses/curses.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:14306: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:14297: \"$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* ＠＠ -14337,12 +14328,12 ＠＠ for lib in curses termlib termcap; do echo $ac_n "checking for tgetent in -l$lib""... $ac_c" 1>&6 -echo "configure:14341: checking for tgetent in -l$lib" >&5 +echo "configure:14332: 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 14346 "configure" +#line 14337 "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 ＠＠ -14353,7 +14344,7 ＠＠ tgetent() ; return 0; } EOF -if { (eval echo configure:14357: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14348: \"$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 ＠＠ -14384,12 +14375,12 ＠＠ else echo $ac_n "checking for tgetent in -lcurses""... $ac_c" 1>&6 -echo "configure:14388: checking for tgetent in -lcurses" >&5 +echo "configure:14379: 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 14393 "configure" +#line 14384 "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 ＠＠ -14400,7 +14391,7 ＠＠ tgetent() ; return 0; } EOF -if { (eval echo configure:14404: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14395: \"$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 ＠＠ -14418,12 +14409,12 ＠＠ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for tgetent in -ltermcap""... $ac_c" 1>&6 -echo "configure:14422: checking for tgetent in -ltermcap" >&5 +echo "configure:14413: 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 14427 "configure" +#line 14418 "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 ＠＠ -14434,7 +14425,7 ＠＠ tgetent() ; return 0; } EOF -if { (eval echo configure:14438: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14429: \"$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 ＠＠ -14482,15 +14473,15 ＠＠ test -z "$with_gpm" && { ac_safe=`echo "gpm.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for gpm.h""... $ac_c" 1>&6 -echo "configure:14486: checking for gpm.h" >&5 +echo "configure:14477: checking for gpm.h" >&5 cat > conftest.$ac_ext <<EOF -#line 14489 "configure" +#line 14480 "configure" #include "confdefs.h" #include <gpm.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:14494: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:14485: \"$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* ＠＠ -14513,12 +14504,12 ＠＠ } test -z "$with_gpm" && { echo $ac_n "checking for Gpm_Open in -lgpm""... $ac_c" 1>&6 -echo "configure:14517: checking for Gpm_Open in -lgpm" >&5 +echo "configure:14508: 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 14522 "configure" +#line 14513 "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 ＠＠ -14529,7 +14520,7 ＠＠ Gpm_Open() ; return 0; } EOF -if { (eval echo configure:14533: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14524: \"$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 ＠＠ -14572,20 +14563,20 ＠＠ test "$with_database_gdbm $with_database_dbm $with_database_berkdb" \ != "no no no" && echo "checking for database support" 1>&6 -echo "configure:14576: checking for database support" >&5 +echo "configure:14567: 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:14581: checking for ndbm.h" >&5 +echo "configure:14572: checking for ndbm.h" >&5 cat > conftest.$ac_ext <<EOF -#line 14584 "configure" +#line 14575 "configure" #include "confdefs.h" #include <ndbm.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:14589: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:14580: \"$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* ＠＠ -14615,12 +14606,12 ＠＠ if test "$with_database_gdbm" != "no"; then echo $ac_n "checking for dbm_open in -lgdbm""... $ac_c" 1>&6 -echo "configure:14619: checking for dbm_open in -lgdbm" >&5 +echo "configure:14610: 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 14624 "configure" +#line 14615 "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 ＠＠ -14631,7 +14622,7 ＠＠ dbm_open() ; return 0; } EOF -if { (eval echo configure:14635: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14626: \"$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 ＠＠ -14659,10 +14650,10 ＠＠ if test "$with_database_dbm" != "no"; then echo $ac_n "checking for dbm_open""... $ac_c" 1>&6 -echo "configure:14663: checking for dbm_open" >&5 +echo "configure:14654: checking for dbm_open" >&5 cat > conftest.$ac_ext <<EOF -#line 14666 "configure" +#line 14657 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char dbm_open(); below. */ ＠＠ -14685,7 +14676,7 ＠＠ ; return 0; } EOF -if { (eval echo configure:14689: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14680: \"$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 ＠＠ -14704,12 +14695,12 ＠＠ echo $ac_n "checking for dbm_open in -ldbm""... $ac_c" 1>&6 -echo "configure:14708: checking for dbm_open in -ldbm" >&5 +echo "configure:14699: 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 14713 "configure" +#line 14704 "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 ＠＠ -14720,7 +14711,7 ＠＠ dbm_open() ; return 0; } EOF -if { (eval echo configure:14724: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14715: \"$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 ＠＠ -14761,10 +14752,10 ＠＠ if test "$with_database_berkdb" != "no"; then echo $ac_n "checking for Berkeley db.h""... $ac_c" 1>&6 -echo "configure:14765: checking for Berkeley db.h" >&5 +echo "configure:14756: checking for Berkeley db.h" >&5 for header in "db/db.h" "db.h"; do cat > conftest.$ac_ext <<EOF -#line 14768 "configure" +#line 14759 "configure" #include "confdefs.h" #include <stdlib.h> ＠＠ -14786,7 +14777,7 ＠＠ ; return 0; } EOF -if { (eval echo configure:14790: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:14781: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* db_h_file="$header"; break else ＠＠ -14802,9 +14793,9 ＠＠ if test "$with_database_berkdb" != "no"; then echo $ac_n "checking for Berkeley DB version""... $ac_c" 1>&6 -echo "configure:14806: checking for Berkeley DB version" >&5 +echo "configure:14797: checking for Berkeley DB version" >&5 cat > conftest.$ac_ext <<EOF -#line 14808 "configure" +#line 14799 "configure" #include "confdefs.h" #include <$db_h_file> #if DB_VERSION_MAJOR > 1 ＠＠ -14816,7 +14807,7 ＠＠ egrep "yes" >/dev/null 2>&1; then rm -rf conftest* cat > conftest.$ac_ext <<EOF -#line 14820 "configure" +#line 14811 "configure" #include "confdefs.h" #include <$db_h_file> #if DB_VERSION_MAJOR > 2 ＠＠ -14843,10 +14834,10 ＠＠ rm -f conftest* echo $ac_n "checking for $dbfunc""... $ac_c" 1>&6 -echo "configure:14847: checking for $dbfunc" >&5 +echo "configure:14838: checking for $dbfunc" >&5 cat > conftest.$ac_ext <<EOF -#line 14850 "configure" +#line 14841 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $dbfunc(); below. */ ＠＠ -14869,7 +14860,7 ＠＠ ; return 0; } EOF -if { (eval echo configure:14873: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14864: \"$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 ＠＠ -14888,12 +14879,12 ＠＠ echo $ac_n "checking for $dbfunc in -ldb""... $ac_c" 1>&6 -echo "configure:14892: checking for $dbfunc in -ldb" >&5 +echo "configure:14883: 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 14897 "configure" +#line 14888 "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 ＠＠ -14904,7 +14895,7 ＠＠ $dbfunc() ; return 0; } EOF -if { (eval echo configure:14908: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14899: \"$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 ＠＠ -14965,12 +14956,12 ＠＠ if test "$with_socks" = "yes"; then echo $ac_n "checking for SOCKSinit in -lsocks""... $ac_c" 1>&6 -echo "configure:14969: checking for SOCKSinit in -lsocks" >&5 +echo "configure:14960: 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 14974 "configure" +#line 14965 "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 ＠＠ -14981,7 +14972,7 ＠＠ SOCKSinit() ; return 0; } EOF -if { (eval echo configure:14985: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14976: \"$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 ＠＠ -15035,11 +15026,11 ＠＠ fi cat > conftest.$ac_ext <<EOF -#line 15039 "configure" +#line 15030 "configure" #include "confdefs.h" int main(int c,char *v[]){return 0;} EOF -if { (eval echo configure:15043: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 +if { (eval echo configure:15034: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 then : else Index: configure.in =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/configure.in,v retrieving revision 1.183 diff -d -u -u -r1.183 configure.in --- configure.in 2002/09/10 15:38:03 1.183 +++ configure.in 2002/10/14 14:25:33 ＠＠ -2502,11 +2502,8 ＠＠ dnl check for long file names AC_SYS_LONG_FILE_NAMES -dnl -lm is required by LISP_FLOAT_TYPE, among other things +dnl -lm is required for floating point support, among other things AC_CHECK_FUNC(sin, ,AC_CHECK_LIB(m, sin)) - -dnl Floating operation support is now unconditional -AC_DEFINE(LISP_FLOAT_TYPE) AC_TRY_LINK([#include <math.h>], [return atanh(1.0) + asinh(1.0) + acosh(1.0); ], Index: lisp/gtk-font-menu.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/gtk-font-menu.el,v retrieving revision 1.3 diff -d -u -u -r1.3 gtk-font-menu.el --- lisp/gtk-font-menu.el 2001/05/04 22:42:04 1.3 +++ lisp/gtk-font-menu.el 2002/10/14 14:25:33 ＠＠ -166,10 +166,8 ＠＠ families) (mapcar (lambda (x) (vector (if (/= 0 (% x 10)) - ;; works with no LISP_FLOAT_TYPE - (concat (int-to-string (/ x 10)) "." - (int-to-string (% x 10))) - (int-to-string (/ x 10))) + (number-to-string (/ x 10.0)) + (number-to-string (/ x 10))) (list 'font-menu-set-font nil nil x) ':style 'radio ':active nil ':selected nil)) sizes) Index: lisp/x-font-menu.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/x-font-menu.el,v retrieving revision 1.9 diff -d -u -u -r1.9 x-font-menu.el --- lisp/x-font-menu.el 2001/05/09 13:43:54 1.9 +++ lisp/x-font-menu.el 2002/10/14 14:25:33 ＠＠ -167,10 +167,8 ＠＠ families) (mapcar (lambda (x) (vector (if (/= 0 (% x 10)) - ;; works with no LISP_FLOAT_TYPE - (concat (int-to-string (/ x 10)) "." - (int-to-string (% x 10))) - (int-to-string (/ x 10))) + (number-to-string (/ x 10.0)) + (number-to-string (/ x 10))) (list 'font-menu-set-font nil nil x) ':style 'radio ':active nil ':selected nil)) sizes) Index: src/alloc.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/alloc.c,v retrieving revision 1.76 diff -d -u -u -r1.76 alloc.c --- src/alloc.c 2002/09/10 15:27:33 1.76 +++ src/alloc.c 2002/10/14 14:25:34 ＠＠ -1095,8 +1095,6 ＠＠ /* Float allocation */ /************************************************************************/ -#ifdef LISP_FLOAT_TYPE - DECLARE_FIXED_TYPE_ALLOC (float, Lisp_Float); #define MINIMUM_ALLOWED_FIXED_TYPE_CELLS_float 1000 ＠＠ -1116,8 +1114,6 ＠＠ return wrap_float (f); } -#endif /* LISP_FLOAT_TYPE */ -  /************************************************************************/ /* Vector allocation */ ＠＠ -3649,8 +3645,6 ＠＠ SWEEP_FIXED_TYPE_BLOCK (compiled_function, Lisp_Compiled_Function); } - -#ifdef LISP_FLOAT_TYPE static void sweep_floats (void) { ＠＠ -3659,7 +3653,6 ＠＠ SWEEP_FIXED_TYPE_BLOCK (float, Lisp_Float); } -#endif /* LISP_FLOAT_TYPE */ static void sweep_symbols (void) ＠＠ -4066,10 +4059,8 ＠＠ /* Free all unmarked compiled-function objects */ sweep_compiled_functions (); -#ifdef LISP_FLOAT_TYPE /* Put all unmarked floats on free list */ sweep_floats (); -#endif /* Put all unmarked symbols on free list */ sweep_symbols (); ＠＠ -4581,11 +4572,9 ＠＠ HACK_O_MATIC (marker, "marker-storage", pl); pl = gc_plist_hack ("markers-free", gc_count_num_marker_freelist, pl); pl = gc_plist_hack ("markers-used", gc_count_num_marker_in_use, pl); -#ifdef LISP_FLOAT_TYPE HACK_O_MATIC (float, "float-storage", pl); pl = gc_plist_hack ("floats-free", gc_count_num_float_freelist, pl); pl = gc_plist_hack ("floats-used", gc_count_num_float_in_use, pl); -#endif /* LISP_FLOAT_TYPE */ HACK_O_MATIC (string, "string-header-storage", pl); pl = gc_plist_hack ("long-strings-total-length", gc_count_string_total_size ＠＠ -4874,9 +4863,7 ＠＠ init_cons_alloc (); init_symbol_alloc (); init_compiled_function_alloc (); -#ifdef LISP_FLOAT_TYPE init_float_alloc (); -#endif /* LISP_FLOAT_TYPE */ init_marker_alloc (); init_extent_alloc (); init_event_alloc (); Index: src/bytecode.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/bytecode.c,v retrieving revision 1.29 diff -d -u -u -r1.29 bytecode.c --- src/bytecode.c 2002/07/29 09:21:15 1.29 +++ src/bytecode.c 2002/10/14 14:25:34 ＠＠ -247,9 +247,7 ＠＠ retry: if (INTP (obj)) return make_int (- XINT (obj)); -#ifdef LISP_FLOAT_TYPE if (FLOATP (obj)) return make_float (- XFLOAT_DATA (obj)); -#endif if (CHARP (obj)) return make_int (- ((int) XCHAR (obj))); if (MARKERP (obj)) return make_int (- ((int) marker_position (obj))); ＠＠ -283,7 +281,6 ＠＠ { retry: -#ifdef LISP_FLOAT_TYPE { EMACS_INT ival1, ival2; ＠＠ -327,37 +324,11 ＠＠ return dval1 < dval2 ? -1 : dval1 > dval2 ? 1 : 0; } -#else /* !LISP_FLOAT_TYPE */ - { - EMACS_INT ival1, ival2; - - if (INTP (obj1)) ival1 = XINT (obj1); - else if (CHARP (obj1)) ival1 = XCHAR (obj1); - else if (MARKERP (obj1)) ival1 = marker_position (obj1); - else - { - obj1 = wrong_type_argument (Qnumber_char_or_marker_p, obj1); - goto retry; - } - - if (INTP (obj2)) ival2 = XINT (obj2); - else if (CHARP (obj2)) ival2 = XCHAR (obj2); - else if (MARKERP (obj2)) ival2 = marker_position (obj2); - else - { - obj2 = wrong_type_argument (Qnumber_char_or_marker_p, obj2); - goto retry; - } - - return ival1 < ival2 ? -1 : ival1 > ival2 ? 1 : 0; - } -#endif /* !LISP_FLOAT_TYPE */ } static Lisp_Object bytecode_arithop (Lisp_Object obj1, Lisp_Object obj2, Opcode opcode) { -#ifdef LISP_FLOAT_TYPE EMACS_INT ival1, ival2; int float_p; ＠＠ -419,43 +390,6 ＠＠ } return make_float (dval1); } -#else /* !LISP_FLOAT_TYPE */ - EMACS_INT ival1, ival2; - - retry: - - if (INTP (obj1)) ival1 = XINT (obj1); - else if (CHARP (obj1)) ival1 = XCHAR (obj1); - else if (MARKERP (obj1)) ival1 = marker_position (obj1); - else - { - obj1 = wrong_type_argument (Qnumber_char_or_marker_p, obj1); - goto retry; - } - - if (INTP (obj2)) ival2 = XINT (obj2); - else if (CHARP (obj2)) ival2 = XCHAR (obj2); - else if (MARKERP (obj2)) ival2 = marker_position (obj2); - else - { - obj2 = wrong_type_argument (Qnumber_char_or_marker_p, obj2); - goto retry; - } - - switch (opcode) - { - case Bplus: ival1 += ival2; break; - case Bdiff: ival1 -= ival2; break; - case Bmult: ival1 *= ival2; break; - case Bquo: - if (ival2 == 0) Fsignal (Qarith_error, Qnil); - ival1 /= ival2; - break; - case Bmax: if (ival1 < ival2) ival1 = ival2; break; - case Bmin: if (ival1 > ival2) ival1 = ival2; break; - } - return make_int (ival1); -#endif /* !LISP_FLOAT_TYPE */ }  Index: src/config.h.in =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/config.h.in,v retrieving revision 1.77 diff -d -u -u -r1.77 config.h.in --- src/config.h.in 2002/08/28 05:36:34 1.77 +++ src/config.h.in 2002/10/14 14:25:34 ＠＠ -136,9 +136,6 ＠＠ /* Undefine on systems which don't have processes */ #undef HAVE_UNIX_PROCESSES -/* Does XEmacs support floating-point numbers? */ -#undef LISP_FLOAT_TYPE - /* Define GNU_MALLOC if you want to use the GNU memory allocator. */ #undef GNU_MALLOC Index: src/data.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/data.c,v retrieving revision 1.43 diff -d -u -u -r1.43 data.c --- src/data.c 2002/09/03 11:00:10 1.43 +++ src/data.c 2002/10/14 14:25:35 ＠＠ -535,7 +535,6 ＠＠ ? Qt : Qnil; } -#ifdef LISP_FLOAT_TYPE DEFUN ("floatp", Ffloatp, 1, 1, 0, /* Return t if OBJECT is a floating point number. */ ＠＠ -543,7 +542,6 ＠＠ { return FLOATP (object) ? Qt : Qnil; } -#endif /* LISP_FLOAT_TYPE */ DEFUN ("type-of", Ftype_of, 1, 1, 0, /* Return a symbol representing the type of OBJECT. ＠＠ -819,9 +817,7 ＠＠ if (INTP (obj)) p->c.ival = XINT (obj); else if (CHARP (obj)) p->c.ival = XCHAR (obj); else if (MARKERP (obj)) p->c.ival = marker_position (obj); -#ifdef LISP_FLOAT_TYPE else if (FLOATP (obj)) p->c.dval = XFLOAT_DATA (obj), p->int_p = 0; -#endif else { obj = wrong_type_argument (Qnumber_char_or_marker_p, obj); ＠＠ -836,9 +832,7 ＠＠ if (INTP (obj)) return (double) XINT (obj); else if (CHARP (obj)) return (double) XCHAR (obj); else if (MARKERP (obj)) return (double) marker_position (obj); -#ifdef LISP_FLOAT_TYPE else if (FLOATP (obj)) return XFLOAT_DATA (obj); -#endif else { obj = wrong_type_argument (Qnumber_char_or_marker_p, obj); ＠＠ -965,10 +959,8 ＠＠ retry: if (INTP (number)) return EQ (number, Qzero) ? Qt : Qnil; -#ifdef LISP_FLOAT_TYPE else if (FLOATP (number)) return XFLOAT_DATA (number) == 0.0 ? Qt : Qnil; -#endif /* LISP_FLOAT_TYPE */ else { number = wrong_type_argument (Qnumberp, number); ＠＠ -1014,7 +1006,6 ＠＠ { CHECK_INT_OR_FLOAT (number); -#ifdef LISP_FLOAT_TYPE if (FLOATP (number)) { char pigbuf[350]; /* see comments in float_to_string */ ＠＠ -1022,7 +1013,6 ＠＠ float_to_string (pigbuf, XFLOAT_DATA (number)); return build_string (pigbuf); } -#endif /* LISP_FLOAT_TYPE */ { char buffer[DECIMAL_PRINT_SIZE (long)]; ＠＠ -1076,10 +1066,8 ＠＠ while (*p == ' ' || *p == '\t') p++; -#ifdef LISP_FLOAT_TYPE if (isfloat_string (p) && b == 10) return make_float (atof (p)); -#endif /* LISP_FLOAT_TYPE */ if (b == 10) { ＠＠ -1461,7 +1449,6 ＠＠ number_char_or_marker_to_int_or_double (x, &iod1); number_char_or_marker_to_int_or_double (y, &iod2); -#ifdef LISP_FLOAT_TYPE if (!iod1.int_p || !iod2.int_p) { double dval1 = iod1.int_p ? (double) iod1.c.ival : iod1.c.dval; ＠＠ -1475,7 +1462,7 ＠＠ return make_float (dval1); } -#endif /* LISP_FLOAT_TYPE */ + { EMACS_INT ival; if (iod2.c.ival == 0) goto divide_by_zero; ＠＠ -1535,9 +1522,7 ＠＠ if (INTP (number)) return make_int (XINT (number) + 1); if (CHARP (number)) return make_int (XCHAR (number) + 1); if (MARKERP (number)) return make_int (marker_position (number) + 1); -#ifdef LISP_FLOAT_TYPE if (FLOATP (number)) return make_float (XFLOAT_DATA (number) + 1.0); -#endif /* LISP_FLOAT_TYPE */ number = wrong_type_argument (Qnumber_char_or_marker_p, number); goto retry; ＠＠ -1554,9 +1539,7 ＠＠ if (INTP (number)) return make_int (XINT (number) - 1); if (CHARP (number)) return make_int (XCHAR (number) - 1); if (MARKERP (number)) return make_int (marker_position (number) - 1); -#ifdef LISP_FLOAT_TYPE if (FLOATP (number)) return make_float (XFLOAT_DATA (number) - 1.0); -#endif /* LISP_FLOAT_TYPE */ number = wrong_type_argument (Qnumber_char_or_marker_p, number); goto retry; ＠＠ -2488,10 +2471,7 ＠＠ DEFSYMBOL (Qcdr); DEFSYMBOL (Qerror_lacks_explanatory_string); DEFSYMBOL_MULTIWORD_PREDICATE (Qweak_listp); - -#ifdef LISP_FLOAT_TYPE DEFSYMBOL (Qfloatp); -#endif /* LISP_FLOAT_TYPE */ DEFSUBR (Fwrong_type_argument); ＠＠ -2517,9 +2497,7 ＠＠ DEFSUBR (Fnumberp); DEFSUBR (Fnumber_or_marker_p); DEFSUBR (Fnumber_char_or_marker_p); -#ifdef LISP_FLOAT_TYPE DEFSUBR (Ffloatp); -#endif /* LISP_FLOAT_TYPE */ DEFSUBR (Fnatnump); DEFSUBR (Fsymbolp); DEFSUBR (Fkeywordp); Index: src/ecrt0.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/ecrt0.c,v retrieving revision 1.3 diff -d -u -u -r1.3 ecrt0.c --- src/ecrt0.c 2002/03/13 08:52:37 1.3 +++ src/ecrt0.c 2002/10/14 14:25:35 ＠＠ -371,9 +371,7 ＠＠ _start () { #ifdef sun -#ifdef LISP_FLOAT_TYPE finitfp_(); -#endif #endif /* On 68000, _start pushes a6 onto stack */ start1 (); Index: src/emacs.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/emacs.c,v retrieving revision 1.129 diff -d -u -u -r1.129 emacs.c --- src/emacs.c 2002/09/10 15:27:36 1.129 +++ src/emacs.c 2002/10/14 14:25:35 ＠＠ -1048,9 +1048,7 ＠＠ init_signals_very_early (); init_data_very_early (); /* Catch math errors. */ -#ifdef LISP_FLOAT_TYPE init_floatfns_very_early (); /* Catch floating-point math errors. */ -#endif init_process_times_very_early (); /* Initialize our process timers. As early as possible, of course, so we can be fairly accurate. */ Index: src/event-stream.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/event-stream.c,v retrieving revision 1.72 diff -d -u -u -r1.72 event-stream.c --- src/event-stream.c 2002/08/01 08:28:35 1.72 +++ src/event-stream.c 2002/10/14 14:25:36 ＠＠ -1521,15 +1521,9 ＠＠ static unsigned long lisp_number_to_milliseconds (Lisp_Object secs, int allow_0) { -#ifdef LISP_FLOAT_TYPE double fsecs; CHECK_INT_OR_FLOAT (secs); fsecs = XFLOATINT (secs); -#else - long fsecs; - CHECK_INT (secs); - fsecs = XINT (secs); -#endif if (fsecs < 0) invalid_argument ("timeout is negative", secs); if (!allow_0 && fsecs == 0) Index: src/floatfns.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/floatfns.c,v retrieving revision 1.14 diff -d -u -u -r1.14 floatfns.c --- src/floatfns.c 2002/07/29 09:21:20 1.14 +++ src/floatfns.c 2002/10/14 14:25:36 ＠＠ -48,9 +48,6 ＠＠ #include <config.h> #include "lisp.h" #include "syssignal.h" - -#ifdef LISP_FLOAT_TYPE - #include "sysfloat.h" /* The code uses emacs_rint, so that it works to undefine HAVE_RINT ＠＠ -211,11 +208,8 ＠＠ return extract_float (wrong_type_argument (Qnumberp, num)); } -#endif /* LISP_FLOAT_TYPE */ -  /* Trig functions. */ -#ifdef LISP_FLOAT_TYPE DEFUN ("acos", Facos, 1, 1, 0, /* Return the inverse cosine of NUMBER. ＠＠ -302,12 +296,9 ＠＠ IN_FLOAT (d = (sin (d) / c), "tan", number); return make_float (d); } -#endif /* LISP_FLOAT_TYPE (trig functions) */ -  /* Bessel functions */ #if 0 /* Leave these out unless we find there's a reason for them. */ -/* #ifdef LISP_FLOAT_TYPE */ DEFUN ("bessel-j0", Fbessel_j0, 1, 1, 0, /* Return the bessel function j0 of NUMBER. ＠＠ -379,7 +370,6 ＠＠  /* Error functions. */ #if 0 /* Leave these out unless we see they are worth having. */ -/* #ifdef LISP_FLOAT_TYPE */ DEFUN ("erf", Ferf, 1, 1, 0, /* Return the mathematical error function of NUMBER. ＠＠ -416,7 +406,6 ＠＠  /* Root and Log functions. */ -#ifdef LISP_FLOAT_TYPE DEFUN ("exp", Fexp, 1, 1, 0, /* Return the exponential base e of NUMBER. */ ＠＠ -433,8 +422,6 ＠＠ IN_FLOAT (d = exp (d), "exp", number); return make_float (d); } -#endif /* LISP_FLOAT_TYPE */ - DEFUN ("expt", Fexpt, 2, 2, 0, /* Return the exponential NUMBER1 ** NUMBER2. ＠＠ -471,7 +458,6 ＠＠ return make_int (retval); } -#ifdef LISP_FLOAT_TYPE { double f1 = extract_float (number1); double f2 = extract_float (number2); ＠＠ -485,14 +471,8 ＠＠ IN_FLOAT2 (f1 = pow (f1, f2), "expt", number1, number2); return make_float (f1); } -#else - CHECK_INT_OR_FLOAT (number1); - CHECK_INT_OR_FLOAT (number2); - return Fexpt (number1, number2); -#endif /* LISP_FLOAT_TYPE */ } -#ifdef LISP_FLOAT_TYPE DEFUN ("log", Flog, 1, 2, 0, /* Return the natural logarithm of NUMBER. If second optional argument BASE is given, return the logarithm of ＠＠ -569,12 +549,8 ＠＠ #endif return make_float (d); } -#endif /* LISP_FLOAT_TYPE */ -  /* Inverse trig functions. */ -#ifdef LISP_FLOAT_TYPE -/* #if 0 Not clearly worth adding... */ DEFUN ("acosh", Facosh, 1, 1, 0, /* Return the inverse hyperbolic cosine of NUMBER. ＠＠ -663,7 +639,6 ＠＠ IN_FLOAT (d = tanh (d), "tanh", number); return make_float (d); } -#endif /* LISP_FLOAT_TYPE (inverse trig functions) */  /* Rounding functions */ ＠＠ -672,14 +647,12 ＠＠ */ (number)) { -#ifdef LISP_FLOAT_TYPE if (FLOATP (number)) { IN_FLOAT (number = make_float (fabs (XFLOAT_DATA (number))), "abs", number); return number; } -#endif /* LISP_FLOAT_TYPE */ if (INTP (number)) return (XINT (number) >= 0) ? number : make_int (- XINT (number)); ＠＠ -687,7 +660,6 ＠＠ return Fabs (wrong_type_argument (Qnumberp, number)); } -#ifdef LISP_FLOAT_TYPE DEFUN ("float", Ffloat, 1, 1, 0, /* Return the floating point number numerically equal to NUMBER. */ ＠＠ -701,10 +673,7 ＠＠ return Ffloat (wrong_type_argument (Qnumberp, number)); } -#endif /* LISP_FLOAT_TYPE */ - -#ifdef LISP_FLOAT_TYPE DEFUN ("logb", Flogb, 1, 1, 0, /* Return largest integer <= the base 2 log of the magnitude of NUMBER. This is the same as the exponent of a float. ＠＠ -755,22 +724,18 ＠＠ #endif /* ! HAVE_FREXP */ #endif /* ! HAVE_LOGB */ } -#endif /* LISP_FLOAT_TYPE */ - DEFUN ("ceiling", Fceiling, 1, 1, 0, /* Return the smallest integer no less than NUMBER. (Round toward +inf.) */ (number)) { -#ifdef LISP_FLOAT_TYPE if (FLOATP (number)) { double d; IN_FLOAT ((d = ceil (XFLOAT_DATA (number))), "ceiling", number); return (float_to_int (d, "ceiling", number, Qunbound)); } -#endif /* LISP_FLOAT_TYPE */ if (INTP (number)) return number; ＠＠ -794,7 +759,6 ＠＠ CHECK_INT_OR_FLOAT (divisor); -#ifdef LISP_FLOAT_TYPE if (FLOATP (number) || FLOATP (divisor)) { double f1 = extract_float (number); ＠＠ -806,7 +770,6 ＠＠ IN_FLOAT2 (f1 = floor (f1 / f2), "floor", number, divisor); return float_to_int (f1, "floor", number, divisor); } -#endif /* LISP_FLOAT_TYPE */ i1 = XINT (number); i2 = XINT (divisor); ＠＠ -823,14 +786,12 ＠＠ return (make_int (i1)); } -#ifdef LISP_FLOAT_TYPE if (FLOATP (number)) { double d; IN_FLOAT ((d = floor (XFLOAT_DATA (number))), "floor", number); return (float_to_int (d, "floor", number, Qunbound)); } -#endif /* LISP_FLOAT_TYPE */ return number; } ＠＠ -840,7 +801,6 ＠＠ */ (number)) { -#ifdef LISP_FLOAT_TYPE if (FLOATP (number)) { double d; ＠＠ -848,7 +808,6 ＠＠ IN_FLOAT ((d = emacs_rint (XFLOAT_DATA (number))), "round", number); return (float_to_int (d, "round", number, Qunbound)); } -#endif /* LISP_FLOAT_TYPE */ if (INTP (number)) return number; ＠＠ -862,10 +821,8 ＠＠ */ (number)) { -#ifdef LISP_FLOAT_TYPE if (FLOATP (number)) return float_to_int (XFLOAT_DATA (number), "truncate", number, Qunbound); -#endif /* LISP_FLOAT_TYPE */ if (INTP (number)) return number; ＠＠ -874,8 +831,6 ＠＠ }  /* Float-rounding functions. */ -#ifdef LISP_FLOAT_TYPE -/* #if 1 It's not clear these are worth adding... */ DEFUN ("fceiling", Ffceiling, 1, 1, 0, /* Return the smallest integer no less than NUMBER, as a float. ＠＠ -922,11 +877,7 ＠＠ IN_FLOAT (d = ceil (d), "ftruncate", number); return make_float (d); } - -#endif /* LISP_FLOAT_TYPE (float-rounding functions) */ -  -#ifdef LISP_FLOAT_TYPE #ifdef FLOAT_CATCH_SIGILL static SIGTYPE float_error (int signo) ＠＠ -981,18 +932,14 ＠＠ return 1; /* don't set errno or print a message */ } #endif /* HAVE_MATHERR */ -#endif /* LISP_FLOAT_TYPE */ -  void init_floatfns_very_early (void) { -#ifdef LISP_FLOAT_TYPE # ifdef FLOAT_CATCH_SIGILL EMACS_SIGNAL (SIGILL, float_error); # endif in_float = 0; -#endif /* LISP_FLOAT_TYPE */ } void ＠＠ -1002,14 +949,12 ＠＠ /* Trig functions. */ -#ifdef LISP_FLOAT_TYPE DEFSUBR (Facos); DEFSUBR (Fasin); DEFSUBR (Fatan); DEFSUBR (Fcos); DEFSUBR (Fsin); DEFSUBR (Ftan); -#endif /* LISP_FLOAT_TYPE */ /* Bessel functions */ ＠＠ -1032,35 +977,27 ＠＠ /* Root and Log functions. */ -#ifdef LISP_FLOAT_TYPE DEFSUBR (Fexp); -#endif /* LISP_FLOAT_TYPE */ DEFSUBR (Fexpt); -#ifdef LISP_FLOAT_TYPE DEFSUBR (Flog); DEFSUBR (Flog10); DEFSUBR (Fsqrt); DEFSUBR (Fcube_root); -#endif /* LISP_FLOAT_TYPE */ /* Inverse trig functions. */ -#ifdef LISP_FLOAT_TYPE DEFSUBR (Facosh); DEFSUBR (Fasinh); DEFSUBR (Fatanh); DEFSUBR (Fcosh); DEFSUBR (Fsinh); DEFSUBR (Ftanh); -#endif /* LISP_FLOAT_TYPE */ /* Rounding functions */ DEFSUBR (Fabs); -#ifdef LISP_FLOAT_TYPE DEFSUBR (Ffloat); DEFSUBR (Flogb); -#endif /* LISP_FLOAT_TYPE */ DEFSUBR (Fceiling); DEFSUBR (Ffloor); DEFSUBR (Fround); ＠＠ -1068,18 +1005,14 ＠＠ /* Float-rounding functions. */ -#ifdef LISP_FLOAT_TYPE DEFSUBR (Ffceiling); DEFSUBR (Fffloor); DEFSUBR (Ffround); DEFSUBR (Fftruncate); -#endif /* LISP_FLOAT_TYPE */ } void vars_of_floatfns (void) { -#ifdef LISP_FLOAT_TYPE Fprovide (intern ("lisp-float-type")); -#endif } Index: src/lisp.h =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/lisp.h,v retrieving revision 1.88 diff -d -u -u -r1.88 lisp.h --- src/lisp.h 2002/09/10 15:27:37 1.88 +++ src/lisp.h 2002/10/14 14:25:37 ＠＠ -2369,8 +2369,6 ＠＠ /*------------------------------ float ---------------------------------*/ -#ifdef LISP_FLOAT_TYPE - /* Note: the 'unused_next_' field exists only to ensure that the `next' pointer fits within the structure, for the purposes of the free list. This makes a difference in the unlikely case of ＠＠ -2406,20 +2404,6 ＠＠ } while (0) # define INT_OR_FLOATP(x) (INTP (x) || FLOATP (x)) - -#else /* not LISP_FLOAT_TYPE */ - -#define XFLOAT(x) --- error! No float support. --- -#define FLOATP(x) 0 -#define CHECK_FLOAT(x) --- error! No float support. --- -#define CONCHECK_FLOAT(x) --- error! No float support. --- - -#define XFLOATINT(n) XINT(n) -#define CHECK_INT_OR_FLOAT CHECK_INT -#define CONCHECK_INT_OR_FLOAT CONCHECK_INT -#define INT_OR_FLOATP(x) INTP (x) - -#endif /* not LISP_FLOAT_TYPE */ /*-------------------------------- int ---------------------------------*/ Index: src/lread.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/lread.c,v retrieving revision 1.58 diff -d -u -u -r1.58 lread.c --- src/lread.c 2002/08/02 15:35:54 1.58 +++ src/lread.c 2002/10/14 14:25:38 ＠＠ -1720,11 +1720,6 ＠＠ while (c > 040 /* #### - comma should be here as should backquote */ && !(c == '\"' || c == '\'' || c == ';' || c == '(' || c == ')' -#ifndef LISP_FLOAT_TYPE - /* If we have floating-point support, then we need - to allow <digits><dot><digits>. */ - || c =='.' -#endif /* not LISP_FLOAT_TYPE */ || c == '[' || c == ']' || c == '#' )) { ＠＠ -1780,18 +1775,14 ＠＠ while (p1 != p && (c = *p1) >= '0' && c <= '9') p1++; -#ifdef LISP_FLOAT_TYPE /* Integers can have trailing decimal points. */ if (p1 > read_ptr && p1 < p && *p1 == '.') p1++; -#endif if (p1 == p) { /* It is an integer. */ -#ifdef LISP_FLOAT_TYPE if (p1[-1] == '.') p1[-1] = '\0'; -#endif #if 0 { int number = 0; ＠＠ -1808,10 +1799,8 ＠＠ #endif } } -#ifdef LISP_FLOAT_TYPE if (isfloat_string (read_ptr)) return make_float (atof (read_ptr)); -#endif } { ＠＠ -2220,7 +2209,6 ＠＠ return noseeum_cons (Qunbound, make_char (c)); case '.': { -#ifdef LISP_FLOAT_TYPE /* If a period is followed by a number, then we should read it as a floating point number. Otherwise, it denotes a dotted pair. ＠＠ -2238,10 +2226,6 ＠＠ (I think this doesn't matter anymore because there should be no more danger in unreading multiple characters) */ return read_atom (readcharfun, '.', 0); - -#else /* ! LISP_FLOAT_TYPE */ - return noseeum_cons (Qunbound, make_char ('.')); -#endif /* ! LISP_FLOAT_TYPE */ } case '#': ＠＠ -2566,8 +2550,6 ＠＠  -#ifdef LISP_FLOAT_TYPE - #define LEAD_INT 1 #define DOT_CHAR 2 #define TRAIL_INT 4 ＠＠ -2622,7 +2604,6 ＠＠ || state == (LEAD_INT|DOT_CHAR|TRAIL_INT|E_CHAR|EXP_INT) || state == (DOT_CHAR|TRAIL_INT|E_CHAR|EXP_INT))); } -#endif /* LISP_FLOAT_TYPE */  static void * sequence_reader (Lisp_Object readcharfun, Index: src/print.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/print.c,v retrieving revision 1.43 diff -d -u -u -r1.43 print.c --- src/print.c 2002/06/20 21:18:41 1.43 +++ src/print.c 2002/10/14 14:25:38 ＠＠ -971,8 +971,6 ＠＠ }  -#ifdef LISP_FLOAT_TYPE - Lisp_Object Vfloat_output_format; /* ＠＠ -1060,7 +1058,6 ＠＠ buf [(buf [0] == '-' ? 1 : 0)] = '0'; } } -#endif /* LISP_FLOAT_TYPE */ #define ONE_DIGIT(figure) *p++ = n / (figure) + '0' #define ONE_DIGIT_ADVANCE(figure) (ONE_DIGIT (figure), n %= (figure)) ＠＠ -1608,8 +1605,6 ＠＠ unbind_to (specdepth); } - -#ifdef LISP_FLOAT_TYPE void print_float (Lisp_Object obj, Lisp_Object printcharfun, int escapeflag) { ＠＠ -1618,7 +1613,6 ＠＠ float_to_string (pigbuf, XFLOAT_DATA (obj)); write_c_string (printcharfun, pigbuf); } -#endif /* LISP_FLOAT_TYPE */ void print_symbol (Lisp_Object obj, Lisp_Object printcharfun, int escapeflag) ＠＠ -1707,13 +1701,11 ＠＠ } not_yet_confused: -#ifdef LISP_FLOAT_TYPE if (!confusing) /* #### Ugh, this is needlessly complex and slow for what we need here. It might be a good idea to copy equivalent code from FSF. --hniksic */ confusing = isfloat_string ((char *) data); -#endif if (confusing) write_c_string (printcharfun, "\\"); } ＠＠ -2040,7 +2032,6 ＠＠ */ ); Vstandard_output = Qt; -#ifdef LISP_FLOAT_TYPE DEFVAR_LISP ("float-output-format", &Vfloat_output_format /* The format descriptor string that lisp uses to print floats. This is a %-spec like those accepted by `printf' in C, ＠＠ -2064,7 +2055,6 ＠＠ are all zero. This is to preserve read-equivalence. */ ); Vfloat_output_format = Qnil; -#endif /* LISP_FLOAT_TYPE */ DEFVAR_LISP ("print-length", &Vprint_length /* Maximum length of list or vector to print before abbreviating. Index: src/s/windowsnt.h =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/s/windowsnt.h,v retrieving revision 1.25 diff -d -u -u -r1.25 windowsnt.h --- src/s/windowsnt.h 2002/06/20 21:19:10 1.25 +++ src/s/windowsnt.h 2002/10/14 14:25:38 ＠＠ -118,8 +118,6 ＠＠ #define NTHEAP_PROBE_BASE 1 -#define LISP_FLOAT_TYPE - #ifdef HAVE_X_WINDOWS #define HAVE_XREGISTERIMINSTANTIATECALLBACK -- Jerry James http://www.ittc.ku.edu/~james/