Mercurial > hg > xemacs-beta
changeset 535:c69610198c35
[xemacs-hg @ 2001-05-14 04:52:02 by martinb]
Eliminate the need to define HAVE_PTYS in s&m files.
| author | martinb |
|---|---|
| date | Mon, 14 May 2001 04:52:49 +0000 |
| parents | a0266879cecf |
| children | 8f3fb4fd879b |
| files | ChangeLog configure configure.in src/ChangeLog src/config.h.in src/depend src/event-msw.c src/event-stream.c src/event-unixoid.c src/m/7300.h src/m/delta.h src/m/delta88k.h src/m/dpx2.h src/m/hp800.h src/m/ibmps2-aix.h src/m/ibmrt-aix.h src/m/mips.h src/m/pfa50.h src/m/sps7.h src/m/stride.h src/m/tad68k.h src/m/tekxd88.h src/m/wicat.h src/process-unix.c src/s/aix3-1.h src/s/bsd4-1.h src/s/bsd4-2.h src/s/cxux.h src/s/cygwin32.h src/s/dgux.h src/s/esix.h src/s/hpux.h src/s/iris3-5.h src/s/iris3-6.h src/s/irix3-3.h src/s/isc2-2.h src/s/linux.h src/s/ptx.h src/s/rtu.h src/s/sco4.h src/s/sco5.h src/s/template.h src/s/umax.h src/s/umips.h src/s/unipl5-0.h src/s/unipl5-2.h src/s/usg5-0.h src/s/usg5-3.h src/s/usg5-4.h src/s/windowsnt.h src/s/xenix.h src/sysdep.c src/systty.h |
| diffstat | 53 files changed, 546 insertions(+), 582 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Mon May 14 04:16:19 2001 +0000 +++ b/ChangeLog Mon May 14 04:52:49 2001 +0000 @@ -1,3 +1,8 @@ +2001-05-11 Martin Buchholz <martin@xemacs.org> + + * configure.in: + Check for sys/ptyio.h on HPUX, else for pty.h or perhaps sys/pty.h + 2001-05-10 Ben Wing <ben@xemacs.org> * Makefile.in.in (all):
--- a/configure Mon May 14 04:16:19 2001 +0000 +++ b/configure Mon May 14 04:52:49 2001 +0000 @@ -6411,7 +6411,7 @@ cd .. rm -fr conftestdir for word in $xmkmf_defines; do - case "$word" in + case "$word" in -D__STDC__*) ;; -D* ) sym=`echo '' $word | sed -e 's:^ *-D::' -e 's:=.*::'` @@ -10980,7 +10980,7 @@ EOF } - for ac_hdr in pty.h libutil.h util.h + for ac_hdr in libutil.h util.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 @@ -11024,19 +11024,146 @@ test "$need_libutil" = "yes" && libs_system="$libs_system -lutil" && if test "$extra_verbose" = "yes"; then echo " Appending \"-lutil\" to \$libs_system"; fi fi +case "$opsys" in + hpux*) for ac_hdr in sys/ptyio.h +do +ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` +echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 +echo "configure:11033: checking for $ac_hdr" >&5 + +cat > conftest.$ac_ext <<EOF +#line 11036 "configure" +#include "confdefs.h" +#include <$ac_hdr> +EOF +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +{ (eval echo configure:11041: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` +if test -z "$ac_err"; then + rm -rf conftest* + eval "ac_cv_header_$ac_safe=yes" +else + echo "$ac_err" >&5 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_header_$ac_safe=no" +fi +rm -f conftest* +if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then + echo "$ac_t""yes" 1>&6 + ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` + { test "$extra_verbose" = "yes" && cat << EOF + Defining $ac_tr_hdr +EOF +cat >> confdefs.h <<EOF +#define $ac_tr_hdr 1 +EOF +} + +else + echo "$ac_t""no" 1>&6 +fi +done + ;; + *) for ac_hdr in pty.h +do +ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` +echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 +echo "configure:11074: checking for $ac_hdr" >&5 + +cat > conftest.$ac_ext <<EOF +#line 11077 "configure" +#include "confdefs.h" +#include <$ac_hdr> +EOF +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +{ (eval echo configure:11082: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` +if test -z "$ac_err"; then + rm -rf conftest* + eval "ac_cv_header_$ac_safe=yes" +else + echo "$ac_err" >&5 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_header_$ac_safe=no" +fi +rm -f conftest* +if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then + echo "$ac_t""yes" 1>&6 + ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` + { test "$extra_verbose" = "yes" && cat << EOF + Defining $ac_tr_hdr +EOF +cat >> confdefs.h <<EOF +#define $ac_tr_hdr 1 +EOF +} + +else + echo "$ac_t""no" 1>&6 +fi +done + + test "$ac_cv_header_pty_h" = "no" && for ac_hdr in sys/pty.h +do +ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` +echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 +echo "configure:11115: checking for $ac_hdr" >&5 + +cat > conftest.$ac_ext <<EOF +#line 11118 "configure" +#include "confdefs.h" +#include <$ac_hdr> +EOF +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +{ (eval echo configure:11123: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` +if test -z "$ac_err"; then + rm -rf conftest* + eval "ac_cv_header_$ac_safe=yes" +else + echo "$ac_err" >&5 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_header_$ac_safe=no" +fi +rm -f conftest* +if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then + echo "$ac_t""yes" 1>&6 + ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` + { test "$extra_verbose" = "yes" && cat << EOF + Defining $ac_tr_hdr +EOF +cat >> confdefs.h <<EOF +#define $ac_tr_hdr 1 +EOF +} + +else + echo "$ac_t""no" 1>&6 +fi +done + + ;; +esac + for ac_hdr in stropts.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:11032: checking for $ac_hdr" >&5 - -cat > conftest.$ac_ext <<EOF -#line 11035 "configure" +echo "configure:11159: checking for $ac_hdr" >&5 + +cat > conftest.$ac_ext <<EOF +#line 11162 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:11040: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:11167: \"$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* @@ -11069,10 +11196,10 @@ for ac_func in isastream do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:11073: checking for $ac_func" >&5 - -cat > conftest.$ac_ext <<EOF -#line 11076 "configure" +echo "configure:11200: checking for $ac_func" >&5 + +cat > conftest.$ac_ext <<EOF +#line 11203 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -11095,7 +11222,7 @@ ; return 0; } EOF -if { (eval echo configure:11099: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11226: \"$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 @@ -11126,15 +11253,15 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:11130: checking for $ac_hdr" >&5 - -cat > conftest.$ac_ext <<EOF -#line 11133 "configure" +echo "configure:11257: checking for $ac_hdr" >&5 + +cat > conftest.$ac_ext <<EOF +#line 11260 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:11138: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:11265: \"$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* @@ -11171,10 +11298,10 @@ for ac_func in getloadavg do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:11175: checking for $ac_func" >&5 - -cat > conftest.$ac_ext <<EOF -#line 11178 "configure" +echo "configure:11302: checking for $ac_func" >&5 + +cat > conftest.$ac_ext <<EOF +#line 11305 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -11197,7 +11324,7 @@ ; return 0; } EOF -if { (eval echo configure:11201: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11328: \"$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 @@ -11230,15 +11357,15 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:11234: checking for $ac_hdr" >&5 - -cat > conftest.$ac_ext <<EOF -#line 11237 "configure" +echo "configure:11361: checking for $ac_hdr" >&5 + +cat > conftest.$ac_ext <<EOF +#line 11364 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:11242: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:11369: \"$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* @@ -11274,12 +11401,12 @@ echo $ac_n "checking for kstat_open in -lkstat""... $ac_c" 1>&6 -echo "configure:11278: checking for kstat_open in -lkstat" >&5 +echo "configure:11405: 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 11283 "configure" +#line 11410 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -11290,7 +11417,7 @@ kstat_open() ; return 0; } EOF -if { (eval echo configure:11294: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11421: \"$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 @@ -11325,15 +11452,15 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:11329: checking for $ac_hdr" >&5 - -cat > conftest.$ac_ext <<EOF -#line 11332 "configure" +echo "configure:11456: checking for $ac_hdr" >&5 + +cat > conftest.$ac_ext <<EOF +#line 11459 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:11337: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:11464: \"$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* @@ -11365,12 +11492,12 @@ echo $ac_n "checking for kvm_read in -lkvm""... $ac_c" 1>&6 -echo "configure:11369: checking for kvm_read in -lkvm" >&5 +echo "configure:11496: 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 11374 "configure" +#line 11501 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -11381,7 +11508,7 @@ kvm_read() ; return 0; } EOF -if { (eval echo configure:11385: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11512: \"$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 @@ -11415,16 +11542,16 @@ fi echo $ac_n "checking whether netdb declares h_errno""... $ac_c" 1>&6 -echo "configure:11419: checking whether netdb declares h_errno" >&5 -cat > conftest.$ac_ext <<EOF -#line 11421 "configure" +echo "configure:11546: checking whether netdb declares h_errno" >&5 +cat > conftest.$ac_ext <<EOF +#line 11548 "configure" #include "confdefs.h" #include <netdb.h> int main() { return h_errno; ; return 0; } EOF -if { (eval echo configure:11428: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11555: \"$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 @@ -11444,16 +11571,16 @@ rm -f conftest* echo $ac_n "checking for sigsetjmp""... $ac_c" 1>&6 -echo "configure:11448: checking for sigsetjmp" >&5 -cat > conftest.$ac_ext <<EOF -#line 11450 "configure" +echo "configure:11575: checking for sigsetjmp" >&5 +cat > conftest.$ac_ext <<EOF +#line 11577 "configure" #include "confdefs.h" #include <setjmp.h> int main() { sigjmp_buf bar; sigsetjmp (bar, 0); ; return 0; } EOF -if { (eval echo configure:11457: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:11584: \"$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 @@ -11473,11 +11600,11 @@ rm -f conftest* echo $ac_n "checking whether localtime caches TZ""... $ac_c" 1>&6 -echo "configure:11477: checking whether localtime caches TZ" >&5 +echo "configure:11604: checking whether localtime caches TZ" >&5 if test "$ac_cv_func_tzset" = "yes"; then cat > conftest.$ac_ext <<EOF -#line 11481 "configure" +#line 11608 "configure" #include "confdefs.h" #include <time.h> #if STDC_HEADERS @@ -11512,7 +11639,7 @@ exit (0); } EOF -if { (eval echo configure:11516: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 +if { (eval echo configure:11643: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 then emacs_cv_localtime_cache=no else @@ -11542,9 +11669,9 @@ if test "$HAVE_TIMEVAL" = "yes"; then echo $ac_n "checking whether gettimeofday accepts one or two arguments""... $ac_c" 1>&6 -echo "configure:11546: checking whether gettimeofday accepts one or two arguments" >&5 -cat > conftest.$ac_ext <<EOF -#line 11548 "configure" +echo "configure:11673: checking whether gettimeofday accepts one or two arguments" >&5 +cat > conftest.$ac_ext <<EOF +#line 11675 "configure" #include "confdefs.h" #ifdef TIME_WITH_SYS_TIME @@ -11565,7 +11692,7 @@ ; return 0; } EOF -if { (eval echo configure:11569: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11696: \"$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 @@ -11587,19 +11714,19 @@ echo $ac_n "checking for inline""... $ac_c" 1>&6 -echo "configure:11591: checking for inline" >&5 +echo "configure:11718: checking for inline" >&5 ac_cv_c_inline=no for ac_kw in inline __inline__ __inline; do cat > conftest.$ac_ext <<EOF -#line 11596 "configure" +#line 11723 "configure" #include "confdefs.h" int main() { } $ac_kw foo() { ; return 0; } EOF -if { (eval echo configure:11603: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:11730: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_inline=$ac_kw; break else @@ -11640,17 +11767,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:11644: checking for working alloca.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 11647 "configure" +echo "configure:11771: checking for working alloca.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 11774 "configure" #include "confdefs.h" #include <alloca.h> int main() { char *p = alloca(2 * sizeof(int)); ; return 0; } EOF -if { (eval echo configure:11654: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11781: \"$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 @@ -11674,10 +11801,10 @@ fi echo $ac_n "checking for alloca""... $ac_c" 1>&6 -echo "configure:11678: checking for alloca" >&5 - -cat > conftest.$ac_ext <<EOF -#line 11681 "configure" +echo "configure:11805: checking for alloca" >&5 + +cat > conftest.$ac_ext <<EOF +#line 11808 "configure" #include "confdefs.h" #ifdef __GNUC__ @@ -11705,7 +11832,7 @@ char *p = (char *) alloca(1); ; return 0; } EOF -if { (eval echo configure:11709: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11836: \"$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 @@ -11744,10 +11871,10 @@ echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6 -echo "configure:11748: checking whether alloca needs Cray hooks" >&5 - -cat > conftest.$ac_ext <<EOF -#line 11751 "configure" +echo "configure:11875: checking whether alloca needs Cray hooks" >&5 + +cat > conftest.$ac_ext <<EOF +#line 11878 "configure" #include "confdefs.h" #if defined(CRAY) && ! defined(CRAY2) webecray @@ -11771,10 +11898,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:11775: checking for $ac_func" >&5 - -cat > conftest.$ac_ext <<EOF -#line 11778 "configure" +echo "configure:11902: checking for $ac_func" >&5 + +cat > conftest.$ac_ext <<EOF +#line 11905 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -11797,7 +11924,7 @@ ; return 0; } EOF -if { (eval echo configure:11801: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11928: \"$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 @@ -11827,10 +11954,10 @@ fi echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6 -echo "configure:11831: checking stack direction for C alloca" >&5 - -cat > conftest.$ac_ext <<EOF -#line 11834 "configure" +echo "configure:11958: checking stack direction for C alloca" >&5 + +cat > conftest.$ac_ext <<EOF +#line 11961 "configure" #include "confdefs.h" find_stack_direction () { @@ -11849,7 +11976,7 @@ exit (find_stack_direction() < 0); } EOF -if { (eval echo configure:11853: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 +if { (eval echo configure:11980: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 then ac_cv_c_stack_direction=1 else @@ -11879,15 +12006,15 @@ ac_safe=`echo "vfork.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for vfork.h""... $ac_c" 1>&6 -echo "configure:11883: checking for vfork.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 11886 "configure" +echo "configure:12010: checking for vfork.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 12013 "configure" #include "confdefs.h" #include <vfork.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:11891: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:12018: \"$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* @@ -11915,10 +12042,10 @@ fi echo $ac_n "checking for working vfork""... $ac_c" 1>&6 -echo "configure:11919: checking for working vfork" >&5 - -cat > conftest.$ac_ext <<EOF -#line 11922 "configure" +echo "configure:12046: checking for working vfork" >&5 + +cat > conftest.$ac_ext <<EOF +#line 12049 "configure" #include "confdefs.h" /* Thanks to Paul Eggert for this test. */ #include <stdio.h> @@ -12013,7 +12140,7 @@ } } EOF -if { (eval echo configure:12017: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 +if { (eval echo configure:12144: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 then ac_cv_func_vfork_works=yes else @@ -12039,10 +12166,10 @@ echo $ac_n "checking for working strcoll""... $ac_c" 1>&6 -echo "configure:12043: checking for working strcoll" >&5 - -cat > conftest.$ac_ext <<EOF -#line 12046 "configure" +echo "configure:12170: checking for working strcoll" >&5 + +cat > conftest.$ac_ext <<EOF +#line 12173 "configure" #include "confdefs.h" #include <string.h> main () @@ -12052,7 +12179,7 @@ strcoll ("123", "456") >= 0); } EOF -if { (eval echo configure:12056: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 +if { (eval echo configure:12183: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 then ac_cv_func_strcoll_works=yes else @@ -12080,10 +12207,10 @@ for ac_func in getpgrp do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:12084: checking for $ac_func" >&5 - -cat > conftest.$ac_ext <<EOF -#line 12087 "configure" +echo "configure:12211: checking for $ac_func" >&5 + +cat > conftest.$ac_ext <<EOF +#line 12214 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -12106,7 +12233,7 @@ ; return 0; } EOF -if { (eval echo configure:12110: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:12237: \"$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 @@ -12134,10 +12261,10 @@ done echo $ac_n "checking whether getpgrp takes no argument""... $ac_c" 1>&6 -echo "configure:12138: checking whether getpgrp takes no argument" >&5 - -cat > conftest.$ac_ext <<EOF -#line 12141 "configure" +echo "configure:12265: checking whether getpgrp takes no argument" >&5 + +cat > conftest.$ac_ext <<EOF +#line 12268 "configure" #include "confdefs.h" /* @@ -12192,7 +12319,7 @@ } EOF -if { (eval echo configure:12196: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 +if { (eval echo configure:12323: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 then ac_cv_func_getpgrp_void=yes else @@ -12219,10 +12346,10 @@ echo $ac_n "checking for working mmap""... $ac_c" 1>&6 -echo "configure:12223: checking for working mmap" >&5 +echo "configure:12350: checking for working mmap" >&5 case "$opsys" in ultrix* ) have_mmap=no ;; *) cat > conftest.$ac_ext <<EOF -#line 12226 "configure" +#line 12353 "configure" #include "confdefs.h" #include <stdio.h> #include <unistd.h> @@ -12255,7 +12382,7 @@ return 1; } EOF -if { (eval echo configure:12259: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 +if { (eval echo configure:12386: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 then have_mmap=yes else @@ -12277,16 +12404,16 @@ } -case "$opsys" in cygwin*) +case "$opsys" in cygwin*) test "$rel_alloc" = "default" && rel_alloc=no ;; esac test "$GNU_MALLOC" != "yes" -a "$have_mmap" != "yes" && rel_alloc=no if test "$rel_alloc $have_mmap" = "default yes"; then if test "$doug_lea_malloc" = "yes"; then echo $ac_n "checking for M_MMAP_THRESHOLD""... $ac_c" 1>&6 -echo "configure:12288: checking for M_MMAP_THRESHOLD" >&5 +echo "configure:12415: checking for M_MMAP_THRESHOLD" >&5 cat > conftest.$ac_ext <<EOF -#line 12290 "configure" +#line 12417 "configure" #include "confdefs.h" #include <malloc.h> int main() { @@ -12298,7 +12425,7 @@ ; return 0; } EOF -if { (eval echo configure:12302: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:12429: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* rel_alloc=no; echo "$ac_t""yes" 1>&6; else @@ -12323,15 +12450,15 @@ ac_safe=`echo "termios.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for termios.h""... $ac_c" 1>&6 -echo "configure:12327: checking for termios.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 12330 "configure" +echo "configure:12454: checking for termios.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 12457 "configure" #include "confdefs.h" #include <termios.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:12335: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:12462: \"$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* @@ -12374,15 +12501,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:12378: checking for termio.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 12381 "configure" +echo "configure:12505: checking for termio.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 12508 "configure" #include "confdefs.h" #include <termio.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:12386: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:12513: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -12414,10 +12541,10 @@ echo $ac_n "checking for socket""... $ac_c" 1>&6 -echo "configure:12418: checking for socket" >&5 - -cat > conftest.$ac_ext <<EOF -#line 12421 "configure" +echo "configure:12545: checking for socket" >&5 + +cat > conftest.$ac_ext <<EOF +#line 12548 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char socket(); below. */ @@ -12440,7 +12567,7 @@ ; return 0; } EOF -if { (eval echo configure:12444: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:12571: \"$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 @@ -12455,15 +12582,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:12459: checking for netinet/in.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 12462 "configure" +echo "configure:12586: checking for netinet/in.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 12589 "configure" #include "confdefs.h" #include <netinet/in.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:12467: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:12594: \"$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* @@ -12480,15 +12607,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:12484: checking for arpa/inet.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 12487 "configure" +echo "configure:12611: checking for arpa/inet.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 12614 "configure" #include "confdefs.h" #include <arpa/inet.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:12492: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:12619: \"$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* @@ -12513,9 +12640,9 @@ } echo $ac_n "checking "for sun_len member in struct sockaddr_un"""... $ac_c" 1>&6 -echo "configure:12517: checking "for sun_len member in struct sockaddr_un"" >&5 +echo "configure:12644: checking "for sun_len member in struct sockaddr_un"" >&5 cat > conftest.$ac_ext <<EOF -#line 12519 "configure" +#line 12646 "configure" #include "confdefs.h" #include <sys/types.h> @@ -12526,7 +12653,7 @@ static struct sockaddr_un x; x.sun_len = 1; ; return 0; } EOF -if { (eval echo configure:12530: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:12657: \"$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 @@ -12544,9 +12671,9 @@ fi rm -f conftest* echo $ac_n "checking "for ip_mreq struct in netinet/in.h"""... $ac_c" 1>&6 -echo "configure:12548: checking "for ip_mreq struct in netinet/in.h"" >&5 +echo "configure:12675: checking "for ip_mreq struct in netinet/in.h"" >&5 cat > conftest.$ac_ext <<EOF -#line 12550 "configure" +#line 12677 "configure" #include "confdefs.h" #include <sys/types.h> @@ -12556,7 +12683,7 @@ static struct ip_mreq x; ; return 0; } EOF -if { (eval echo configure:12560: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:12687: \"$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 @@ -12587,10 +12714,10 @@ echo $ac_n "checking for msgget""... $ac_c" 1>&6 -echo "configure:12591: checking for msgget" >&5 - -cat > conftest.$ac_ext <<EOF -#line 12594 "configure" +echo "configure:12718: checking for msgget" >&5 + +cat > conftest.$ac_ext <<EOF +#line 12721 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char msgget(); below. */ @@ -12613,7 +12740,7 @@ ; return 0; } EOF -if { (eval echo configure:12617: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:12744: \"$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 @@ -12628,15 +12755,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:12632: checking for sys/ipc.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 12635 "configure" +echo "configure:12759: checking for sys/ipc.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 12762 "configure" #include "confdefs.h" #include <sys/ipc.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:12640: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:12767: \"$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* @@ -12653,15 +12780,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:12657: checking for sys/msg.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 12660 "configure" +echo "configure:12784: checking for sys/msg.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 12787 "configure" #include "confdefs.h" #include <sys/msg.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:12665: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:12792: \"$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* @@ -12699,15 +12826,15 @@ ac_safe=`echo "dirent.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for dirent.h""... $ac_c" 1>&6 -echo "configure:12703: checking for dirent.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 12706 "configure" +echo "configure:12830: checking for dirent.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 12833 "configure" #include "confdefs.h" #include <dirent.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:12711: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:12838: \"$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* @@ -12734,15 +12861,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:12738: checking for sys/dir.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 12741 "configure" +echo "configure:12865: checking for sys/dir.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 12868 "configure" #include "confdefs.h" #include <sys/dir.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:12746: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:12873: \"$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* @@ -12775,15 +12902,15 @@ ac_safe=`echo "nlist.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for nlist.h""... $ac_c" 1>&6 -echo "configure:12779: checking for nlist.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 12782 "configure" +echo "configure:12906: checking for nlist.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 12909 "configure" #include "confdefs.h" #include <nlist.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:12787: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:12914: \"$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* @@ -12813,22 +12940,22 @@ echo "checking "for sound support"" 1>&6 -echo "configure:12817: checking "for sound support"" >&5 +echo "configure:12944: 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:12824: checking for multimedia/audio_device.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 12827 "configure" +echo "configure:12951: checking for multimedia/audio_device.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 12954 "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:12832: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:12959: \"$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* @@ -12876,12 +13003,12 @@ if test -z "$native_sound_lib"; then echo $ac_n "checking for ALopenport in -laudio""... $ac_c" 1>&6 -echo "configure:12880: checking for ALopenport in -laudio" >&5 +echo "configure:13007: 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 12885 "configure" +#line 13012 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -12892,7 +13019,7 @@ ALopenport() ; return 0; } EOF -if { (eval echo configure:12896: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:13023: \"$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 @@ -12923,12 +13050,12 @@ if test -z "$native_sound_lib"; then echo $ac_n "checking for AOpenAudio in -lAlib""... $ac_c" 1>&6 -echo "configure:12927: checking for AOpenAudio in -lAlib" >&5 +echo "configure:13054: 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 12932 "configure" +#line 13059 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -12939,7 +13066,7 @@ AOpenAudio() ; return 0; } EOF -if { (eval echo configure:12943: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:13070: \"$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 @@ -12977,15 +13104,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:12981: checking for ${dir}/soundcard.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 12984 "configure" +echo "configure:13108: checking for ${dir}/soundcard.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 13111 "configure" #include "confdefs.h" #include <${dir}/soundcard.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:12989: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:13116: \"$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* @@ -13046,15 +13173,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:13050: checking for audio/audiolib.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 13053 "configure" +echo "configure:13177: checking for audio/audiolib.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 13180 "configure" #include "confdefs.h" #include <audio/audiolib.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:13058: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:13185: \"$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* @@ -13072,12 +13199,12 @@ echo $ac_n "checking for AuOpenServer in -laudio""... $ac_c" 1>&6 -echo "configure:13076: checking for AuOpenServer in -laudio" >&5 +echo "configure:13203: 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 13081 "configure" +#line 13208 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -13088,7 +13215,7 @@ AuOpenServer() ; return 0; } EOF -if { (eval echo configure:13092: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:13219: \"$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 @@ -13127,7 +13254,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 13131 "configure" +#line 13258 "configure" #include "confdefs.h" #include <audio/Xtutil.h> EOF @@ -13158,7 +13285,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:13162: checking for $ac_word" >&5 +echo "configure:13289: 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. @@ -13187,10 +13314,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:13191: checking for esd_play_stream" >&5 - -cat > conftest.$ac_ext <<EOF -#line 13194 "configure" +echo "configure:13318: checking for esd_play_stream" >&5 + +cat > conftest.$ac_ext <<EOF +#line 13321 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char esd_play_stream(); below. */ @@ -13213,7 +13340,7 @@ ; return 0; } EOF -if { (eval echo configure:13217: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:13344: \"$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 @@ -13264,7 +13391,7 @@ if test "$with_tty" = "yes" ; then echo "checking for TTY-related features" 1>&6 -echo "configure:13268: checking for TTY-related features" >&5 +echo "configure:13395: checking for TTY-related features" >&5 { test "$extra_verbose" = "yes" && cat << \EOF Defining HAVE_TTY EOF @@ -13280,12 +13407,12 @@ if test -z "$with_ncurses"; then echo $ac_n "checking for tgetent in -lncurses""... $ac_c" 1>&6 -echo "configure:13284: checking for tgetent in -lncurses" >&5 +echo "configure:13411: 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 13289 "configure" +#line 13416 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -13296,7 +13423,7 @@ tgetent() ; return 0; } EOF -if { (eval echo configure:13300: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:13427: \"$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 @@ -13329,15 +13456,15 @@ ac_safe=`echo "ncurses/curses.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for ncurses/curses.h""... $ac_c" 1>&6 -echo "configure:13333: checking for ncurses/curses.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 13336 "configure" +echo "configure:13460: checking for ncurses/curses.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 13463 "configure" #include "confdefs.h" #include <ncurses/curses.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:13341: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:13468: \"$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* @@ -13359,15 +13486,15 @@ ac_safe=`echo "ncurses/term.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for ncurses/term.h""... $ac_c" 1>&6 -echo "configure:13363: checking for ncurses/term.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 13366 "configure" +echo "configure:13490: checking for ncurses/term.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 13493 "configure" #include "confdefs.h" #include <ncurses/term.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:13371: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:13498: \"$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* @@ -13397,15 +13524,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:13401: checking for ncurses/curses.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 13404 "configure" +echo "configure:13528: checking for ncurses/curses.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 13531 "configure" #include "confdefs.h" #include <ncurses/curses.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:13409: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:13536: \"$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* @@ -13440,12 +13567,12 @@ for lib in curses termlib termcap; do echo $ac_n "checking for tgetent in -l$lib""... $ac_c" 1>&6 -echo "configure:13444: checking for tgetent in -l$lib" >&5 +echo "configure:13571: 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 13449 "configure" +#line 13576 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -13456,7 +13583,7 @@ tgetent() ; return 0; } EOF -if { (eval echo configure:13460: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:13587: \"$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 @@ -13487,12 +13614,12 @@ else echo $ac_n "checking for tgetent in -lcurses""... $ac_c" 1>&6 -echo "configure:13491: checking for tgetent in -lcurses" >&5 +echo "configure:13618: 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 13496 "configure" +#line 13623 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -13503,7 +13630,7 @@ tgetent() ; return 0; } EOF -if { (eval echo configure:13507: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:13634: \"$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 @@ -13521,12 +13648,12 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for tgetent in -ltermcap""... $ac_c" 1>&6 -echo "configure:13525: checking for tgetent in -ltermcap" >&5 +echo "configure:13652: 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 13530 "configure" +#line 13657 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -13537,7 +13664,7 @@ tgetent() ; return 0; } EOF -if { (eval echo configure:13541: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:13668: \"$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 @@ -13585,15 +13712,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:13589: checking for gpm.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 13592 "configure" +echo "configure:13716: checking for gpm.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 13719 "configure" #include "confdefs.h" #include <gpm.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:13597: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:13724: \"$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* @@ -13616,12 +13743,12 @@ } test -z "$with_gpm" && { echo $ac_n "checking for Gpm_Open in -lgpm""... $ac_c" 1>&6 -echo "configure:13620: checking for Gpm_Open in -lgpm" >&5 +echo "configure:13747: 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 13625 "configure" +#line 13752 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -13632,7 +13759,7 @@ Gpm_Open() ; return 0; } EOF -if { (eval echo configure:13636: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:13763: \"$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 @@ -13682,20 +13809,20 @@ test "$with_database_gdbm $with_database_dbm $with_database_berkdb" \ != "no no no" && echo "checking for database support" 1>&6 -echo "configure:13686: checking for database support" >&5 +echo "configure:13813: 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:13691: checking for ndbm.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 13694 "configure" +echo "configure:13818: checking for ndbm.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 13821 "configure" #include "confdefs.h" #include <ndbm.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:13699: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:13826: \"$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* @@ -13725,12 +13852,12 @@ if test "$with_database_gdbm" != "no"; then echo $ac_n "checking for dbm_open in -lgdbm""... $ac_c" 1>&6 -echo "configure:13729: checking for dbm_open in -lgdbm" >&5 +echo "configure:13856: 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 13734 "configure" +#line 13861 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -13741,7 +13868,7 @@ dbm_open() ; return 0; } EOF -if { (eval echo configure:13745: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:13872: \"$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 @@ -13769,10 +13896,10 @@ if test "$with_database_dbm" != "no"; then echo $ac_n "checking for dbm_open""... $ac_c" 1>&6 -echo "configure:13773: checking for dbm_open" >&5 - -cat > conftest.$ac_ext <<EOF -#line 13776 "configure" +echo "configure:13900: checking for dbm_open" >&5 + +cat > conftest.$ac_ext <<EOF +#line 13903 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char dbm_open(); below. */ @@ -13795,7 +13922,7 @@ ; return 0; } EOF -if { (eval echo configure:13799: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:13926: \"$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 @@ -13814,12 +13941,12 @@ echo $ac_n "checking for dbm_open in -ldbm""... $ac_c" 1>&6 -echo "configure:13818: checking for dbm_open in -ldbm" >&5 +echo "configure:13945: 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 13823 "configure" +#line 13950 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -13830,7 +13957,7 @@ dbm_open() ; return 0; } EOF -if { (eval echo configure:13834: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:13961: \"$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 @@ -13871,10 +13998,10 @@ if test "$with_database_berkdb" != "no"; then echo $ac_n "checking for Berkeley db.h""... $ac_c" 1>&6 -echo "configure:13875: checking for Berkeley db.h" >&5 +echo "configure:14002: checking for Berkeley db.h" >&5 for header in "db/db.h" "db.h"; do cat > conftest.$ac_ext <<EOF -#line 13878 "configure" +#line 14005 "configure" #include "confdefs.h" #include <stdlib.h> @@ -13896,7 +14023,7 @@ ; return 0; } EOF -if { (eval echo configure:13900: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:14027: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* db_h_file="$header"; break else @@ -13912,9 +14039,9 @@ if test "$with_database_berkdb" != "no"; then echo $ac_n "checking for Berkeley DB version""... $ac_c" 1>&6 -echo "configure:13916: checking for Berkeley DB version" >&5 +echo "configure:14043: checking for Berkeley DB version" >&5 cat > conftest.$ac_ext <<EOF -#line 13918 "configure" +#line 14045 "configure" #include "confdefs.h" #include <$db_h_file> #if DB_VERSION_MAJOR > 1 @@ -13926,7 +14053,7 @@ egrep "yes" >/dev/null 2>&1; then rm -rf conftest* cat > conftest.$ac_ext <<EOF -#line 13930 "configure" +#line 14057 "configure" #include "confdefs.h" #include <$db_h_file> #if DB_VERSION_MAJOR > 2 @@ -13953,10 +14080,10 @@ rm -f conftest* echo $ac_n "checking for $dbfunc""... $ac_c" 1>&6 -echo "configure:13957: checking for $dbfunc" >&5 - -cat > conftest.$ac_ext <<EOF -#line 13960 "configure" +echo "configure:14084: checking for $dbfunc" >&5 + +cat > conftest.$ac_ext <<EOF +#line 14087 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $dbfunc(); below. */ @@ -13979,7 +14106,7 @@ ; return 0; } EOF -if { (eval echo configure:13983: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14110: \"$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 @@ -13998,12 +14125,12 @@ echo $ac_n "checking for $dbfunc in -ldb""... $ac_c" 1>&6 -echo "configure:14002: checking for $dbfunc in -ldb" >&5 +echo "configure:14129: 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 14007 "configure" +#line 14134 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -14014,7 +14141,7 @@ $dbfunc() ; return 0; } EOF -if { (eval echo configure:14018: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14145: \"$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 @@ -14078,12 +14205,12 @@ if test "$with_socks" = "yes"; then echo $ac_n "checking for SOCKSinit in -lsocks""... $ac_c" 1>&6 -echo "configure:14082: checking for SOCKSinit in -lsocks" >&5 +echo "configure:14209: 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 14087 "configure" +#line 14214 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -14094,7 +14221,7 @@ SOCKSinit() ; return 0; } EOF -if { (eval echo configure:14098: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14225: \"$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 @@ -14149,22 +14276,22 @@ if test "$with_modules" != "no"; then echo "checking for module support" 1>&6 -echo "configure:14153: checking for module support" >&5 +echo "configure:14280: 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:14160: checking for dlfcn.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 14163 "configure" +echo "configure:14287: checking for dlfcn.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 14290 "configure" #include "confdefs.h" #include <dlfcn.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:14168: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:14295: \"$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* @@ -14181,16 +14308,16 @@ echo "$ac_t""yes" 1>&6 echo $ac_n "checking for dlopen in -lc""... $ac_c" 1>&6 -echo "configure:14185: checking for dlopen in -lc" >&5 +echo "configure:14312: checking for dlopen in -lc" >&5 cat > conftest.$ac_ext <<EOF -#line 14187 "configure" +#line 14314 "configure" #include "confdefs.h" #include <dlfcn.h> int main() { dlopen ("", 0); ; return 0; } EOF -if { (eval echo configure:14194: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14321: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* have_dl=yes else @@ -14199,18 +14326,18 @@ rm -rf conftest* echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6 -echo "configure:14203: checking for dlopen in -ldl" >&5 +echo "configure:14330: checking for dlopen in -ldl" >&5 ac_save_LIBS="$LIBS" LIBS="-ldl $LIBS" cat > conftest.$ac_ext <<EOF -#line 14207 "configure" +#line 14334 "configure" #include "confdefs.h" #include <dlfcn.h> int main() { dlopen ("", 0); ; return 0; } EOF -if { (eval echo configure:14214: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14341: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* have_dl=yes else @@ -14239,12 +14366,12 @@ else echo $ac_n "checking for shl_load in -ldld""... $ac_c" 1>&6 -echo "configure:14243: checking for shl_load in -ldld" >&5 +echo "configure:14370: 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 14248 "configure" +#line 14375 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -14255,7 +14382,7 @@ shl_load() ; return 0; } EOF -if { (eval echo configure:14259: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14386: \"$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 @@ -14282,12 +14409,12 @@ echo "$ac_t""no" 1>&6 echo $ac_n "checking for dld_init in -ldld""... $ac_c" 1>&6 -echo "configure:14286: checking for dld_init in -ldld" >&5 +echo "configure:14413: 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 14291 "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 @@ -14298,7 +14425,7 @@ dld_init() ; return 0; } EOF -if { (eval echo configure:14302: \"$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 @@ -14343,7 +14470,7 @@ xealias=$internal_configuration echo "checking how to build dynamic libraries for ${xehost}" 1>&6 -echo "configure:14347: checking how to build dynamic libraries for ${xehost}" >&5 +echo "configure:14474: checking how to build dynamic libraries for ${xehost}" >&5 # Transform *-*-linux* to *-*-linux-gnu*, to support old configure scripts. case "$xehost" in *-*-linux-gnu*) ;; @@ -14371,9 +14498,9 @@ XEGCC=yes else echo $ac_n "checking checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:14375: checking checking whether we are using GNU C" >&5 +echo "configure:14502: checking checking whether we are using GNU C" >&5 cat > conftest.$ac_ext <<EOF -#line 14377 "configure" +#line 14504 "configure" #include "confdefs.h" #ifdef __GNUC__ @@ -14395,7 +14522,7 @@ fi echo $ac_n "checking how to produce PIC code""... $ac_c" 1>&6 -echo "configure:14399: checking how to produce PIC code" >&5 +echo "configure:14526: checking how to produce PIC code" >&5 wl= can_build_shared=yes @@ -14496,18 +14623,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:14500: checking if PIC flag ${dll_cflags} really works" >&5 +echo "configure:14627: checking if PIC flag ${dll_cflags} really works" >&5 save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS $dll_cflags -DPIC" cat > conftest.$ac_ext <<EOF -#line 14504 "configure" +#line 14631 "configure" #include "confdefs.h" int main() { int x=0; ; return 0; } EOF -if { (eval echo configure:14511: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:14638: \"$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 @@ -14538,7 +14665,7 @@ xldf= xcldf= echo $ac_n "checking if C compiler can produce shared libraries""... $ac_c" 1>&6 -echo "configure:14542: checking if C compiler can produce shared libraries" >&5 +echo "configure:14669: checking if C compiler can produce shared libraries" >&5 if test "$XEGCC" = yes; then xcldf="-shared" xldf="-shared" @@ -14589,14 +14716,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 14593 "configure" +#line 14720 "configure" #include "confdefs.h" int main() { int x=0; ; return 0; } EOF -if { (eval echo configure:14600: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14727: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cc_produces_so=yes else @@ -14621,7 +14748,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:14625: checking for ld used by GCC" >&5 +echo "configure:14752: checking for ld used by GCC" >&5 ac_prog=`($CC -print-prog-name=ld) 2>&5` case "$ac_prog" in # Accept absolute paths. @@ -14646,7 +14773,7 @@ esac else echo $ac_n "checking for GNU ld""... $ac_c" 1>&6 -echo "configure:14650: checking for GNU ld" >&5 +echo "configure:14777: checking for GNU ld" >&5 fi if test -z "$LTLD"; then @@ -14684,7 +14811,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:14688: checking if the linker is GNU ld" >&5 +echo "configure:14815: 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 @@ -14712,7 +14839,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:14716: checking whether the linker supports shared libraries" >&5 +echo "configure:14843: checking whether the linker supports shared libraries" >&5 dll_ld=$CC dll_ldflags=$LDFLAGS ld_shlibs=yes @@ -14923,10 +15050,10 @@ for ac_func in dlerror _dlerror do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:14927: checking for $ac_func" >&5 - -cat > conftest.$ac_ext <<EOF -#line 14930 "configure" +echo "configure:15054: checking for $ac_func" >&5 + +cat > conftest.$ac_ext <<EOF +#line 15057 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -14949,7 +15076,7 @@ ; return 0; } EOF -if { (eval echo configure:14953: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:15080: \"$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 @@ -14988,11 +15115,11 @@ fi cat > conftest.$ac_ext <<EOF -#line 14992 "configure" +#line 15119 "configure" #include "confdefs.h" int main(int c,char *v[]){return 0;} EOF -if { (eval echo configure:14996: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 +if { (eval echo configure:15123: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 then : else
--- a/configure.in Mon May 14 04:16:19 2001 +0000 +++ b/configure.in Mon May 14 04:52:49 2001 +0000 @@ -2757,7 +2757,7 @@ cd .. rm -fr conftestdir for word in $xmkmf_defines; do - case "$word" in + case "$word" in -D__STDC__*) ;; -D* ) sym=`echo '' $word | sed -e 's:^ *-D::' -e 's:=.*::'` @@ -2825,7 +2825,7 @@ #include <X11/Xlib.h> extern Bool XRegisterIMInstantiateCallback( Display*, struct _XrmHashBucketRec*, char*, char*, XIMProc, XPointer*); -], [], +], [], [AC_MSG_RESULT(yes)], [AC_MSG_RESULT(no) AC_DEFINE(XREGISTERIMINSTANTIATECALLBACK_NONSTANDARD_PROTOTYPE)]) @@ -3710,7 +3710,7 @@ AC_CHECK_FUNCS(cbrt closedir dup2 eaccess fmod fpathconf frexp ftime getaddrinfo gethostname getnameinfo getpagesize gettimeofday getcwd getwd logb lrand48 matherr mkdir mktime perror poll random rename res_init rint rmdir select setitimer setpgid setlocale setsid sigblock sighold sigprocmask snprintf stpcpy strerror tzset ulimit usleep waitpid vsnprintf fsync ftruncate umask) dnl ---------------------------------------------------------------- -dnl Check for PTY support functions. +dnl Check for Unixoid pty/process support. dnl ---------------------------------------------------------------- dnl There is no "standard" pty allocation method. Every system is different. @@ -3728,10 +3728,20 @@ AC_CHECK_LIB(util, openpty, have_openpty=yes need_libutil=yes)]) if test "$have_openpty" = "yes"; then AC_DEFINE(HAVE_OPENPTY) - AC_CHECK_HEADERS(pty.h libutil.h util.h, break) + AC_CHECK_HEADERS(libutil.h util.h, break) test "$need_libutil" = "yes" && XE_APPEND(-lutil, libs_system) fi +dnl Check for system-specific pty header files +dnl Often the TIOCSIG* symbols are hiding there. +case "$opsys" in + dnl HPUX pty.h #defines TRUE and FALSE, so just use ptyio.h there. + hpux*) AC_CHECK_HEADERS(sys/ptyio.h) ;; + *) AC_CHECK_HEADERS(pty.h) + test "$ac_cv_header_pty_h" = "no" && AC_CHECK_HEADERS(sys/pty.h) + ;; +esac + dnl Check for STREAM support functions. dnl Confusingly, "str" means both "string" and "SysV Streams". AC_CHECK_HEADERS(stropts.h) @@ -3917,7 +3927,7 @@ test "$have_mmap" = "yes" && AC_DEFINE(HAVE_MMAP) dnl By default we switch off rel-alloc on cygwin as it generally causes us grief -case "$opsys" in cygwin*) +case "$opsys" in cygwin*) test "$rel_alloc" = "default" && rel_alloc=no ;; esac dnl rel_alloc requires either GNU malloc or system malloc with mmap
--- a/src/ChangeLog Mon May 14 04:16:19 2001 +0000 +++ b/src/ChangeLog Mon May 14 04:52:49 2001 +0000 @@ -1,3 +1,63 @@ +2001-05-11 Martin Buchholz <martin@xemacs.org> + + Eliminate the need to define HAVE_PTYS in s&m files. + + * config.h.in: + * event-msw.c (emacs_mswindows_create_stream_pair): + * event-stream.c (execute_internal_event): + * event-unixoid.c (event_stream_unixoid_create_stream_pair): + * process-unix.c: + * process-unix.c (unix_create_process): + * sysdep.c: + * sysdep.c (set_descriptor_non_blocking): + * sysdep.c (setup_pty): Delete ancient FIONBIO code. + * systty.h: + * s/aix3-1.h: + * s/bsd4-1.h: + * s/bsd4-2.h: + * s/cxux.h: + * s/dgux.h: + * s/cygwin32.h: + * s/esix.h: + * s/hpux.h: + * s/iris3-5.h: + * s/iris3-6.h: + * s/irix3-3.h: + * s/isc2-2.h: + * s/linux.h: + * s/ptx.h: + * s/rtu.h: + * s/sco4.h: + * s/sco5.h: + * s/template.h: + * s/umax.h: + * s/umips.h: + * s/unipl5-0.h: + * s/unipl5-2.h: + * s/usg5-0.h: + * s/usg5-3.h: + * s/usg5-4.h: + * s/windowsnt.h: + * s/xenix.h: + * m/7300.h: + * m/delta.h: + * m/delta88k.h: + * m/dpx2.h: + * m/hp800.h: + * m/ibmps2-aix.h: + * m/ibmrt-aix.h: + * m/mips.h: + * m/pfa50.h: + * m/sps7.h: + * m/stride.h: + * m/tad68k.h: + * m/tekxd88.h: + * m/wicat.h: + Nuke all references to HAVE_PTYS, SYSV_PTYS, NEED_BSDTTY. + All current Unix systems have ptys, and even on systems without + ptys, the basic functionality has been sufficiently + autoconfiscated that everything should just work anyways. + 2001-05-11 Mike Alexander <mta@arbortext.com> * event-msw.c (mswindows_need_event_in_modal_loop):
--- a/src/config.h.in Mon May 14 04:16:19 2001 +0000 +++ b/src/config.h.in Mon May 14 04:52:49 2001 +0000 @@ -338,7 +338,7 @@ #undef HAVE_WAITPID #undef HAVE_VSNPRINTF -/* PTY support functions */ +/* Many flavors of PTY support */ #undef HAVE_GETPT /* glibc's easy pty allocation function */ #undef HAVE__GETPTY /* SGI's easy pty allocation function */ #undef HAVE_OPENPTY /* BSD's easy pty allocation function */ @@ -348,7 +348,9 @@ #undef HAVE_KILLPG /* BSD */ #undef HAVE_TCGETPGRP /* Posix 1 */ #undef HAVE_ISASTREAM /* SysV streams */ -#undef HAVE_PTY_H /* Linux, Tru64 openpty */ +#undef HAVE_SYS_PTY_H /* AIX */ +#undef HAVE_SYS_PTYIO_H /* HP-UX */ +#undef HAVE_PTY_H /* Linux, Tru64 */ #undef HAVE_LIBUTIL_H /* BSD openpty */ #undef HAVE_UTIL_H /* NetBSD openpty */ #undef HAVE_STROPTS_H /* SysV streams */
--- a/src/depend Mon May 14 04:16:19 2001 +0000 +++ b/src/depend Mon May 14 04:52:49 2001 +0000 @@ -105,7 +105,7 @@ device.o: $(LISP_H) buffer.h bufslots.h casetab.h chartab.h conslots.h console.h device.h elhash.h events.h faces.h frame.h frameslots.h glyphs.h gui.h keymap.h mule-charset.h redisplay.h scrollbar.h specifier.h sysdep.h syssignal.h systime.h toolbar.h window.h winslots.h dgif_lib.o: $(LISP_H) gifrlib.h sysfile.h dialog.o: $(LISP_H) conslots.h console.h device.h frame.h frameslots.h glyphs.h gui.h redisplay.h scrollbar.h specifier.h toolbar.h window.h winslots.h -dired.o: $(LISP_H) buffer.h bufslots.h casetab.h chartab.h commands.h elhash.h mule-charset.h ndir.h opaque.h regex.h syntax.h sysdep.h sysdir.h sysfile.h syspwd.h systime.h +dired.o: $(LISP_H) buffer.h bufslots.h casetab.h chartab.h commands.h elhash.h mule-charset.h ndir.h opaque.h regex.h syntax.h sysdep.h sysdir.h sysfile.h syspwd.h systime.h syswindows.h doc.o: $(LISP_H) buffer.h bufslots.h bytecode.h casetab.h chartab.h insdel.h keymap.h mule-charset.h sysfile.h doprnt.o: $(LISP_H) buffer.h bufslots.h casetab.h chartab.h lstream.h mule-charset.h dragdrop.o: $(LISP_H) dragdrop.h
--- a/src/event-msw.c Mon May 14 04:16:19 2001 +0000 +++ b/src/event-msw.c Mon May 14 04:52:49 2001 +0000 @@ -3554,7 +3554,7 @@ ? make_filedesc_output_stream (fdo, 0, -1, LSTR_BLOCKED_OK) : Qnil); -#if defined(HAVE_UNIX_PROCESSES) && defined(HAVE_PTYS) +#if defined(HAVE_UNIX_PROCESSES) /* FLAGS is process->pty_flag for UNIX_PROCESSES */ if ((flags & STREAM_PTY_FLUSHING) && fdo >= 0) {
--- a/src/event-stream.c Mon May 14 04:16:19 2001 +0000 +++ b/src/event-stream.c Mon May 14 04:52:49 2001 +0000 @@ -2977,7 +2977,7 @@ the filter function forces this by returning 0. Emacs must not interpret this as a closed pipe. */ connected_via_filedesc_p (XPROCESS (p)))) -#ifdef HAVE_PTYS + /* On some OSs with ptys, when the process on one end of a pty exits, the other end gets an error reading with errno = EIO instead of getting an EOF (0 bytes read). @@ -2985,8 +2985,10 @@ EIO, just continue, because the child process has exited and should clean itself up soon (e.g. when we get a SIGCHLD). */ +#ifdef EIO || (readstatus == -1 && errno == EIO) #endif + ) { /* Currently, we rely on SIGCHLD to indicate that the
--- a/src/event-unixoid.c Mon May 14 04:16:19 2001 +0000 +++ b/src/event-unixoid.c Mon May 14 04:52:49 2001 +0000 @@ -288,7 +288,7 @@ ? make_filedesc_output_stream (outfd, 0, -1, LSTR_BLOCKED_OK) : Qnil); -#if defined(HAVE_UNIX_PROCESSES) && defined(HAVE_PTYS) +#if defined(HAVE_UNIX_PROCESSES) /* FLAGS is process->pty_flag for UNIX_PROCESSES */ if ((flags & STREAM_PTY_FLUSHING) && outfd >= 0) {
--- a/src/m/7300.h Mon May 14 04:16:19 2001 +0000 +++ b/src/m/7300.h Mon May 14 04:52:49 2001 +0000 @@ -61,9 +61,6 @@ #endif -/* If you have the PD pty driver installed, uncomment the following line. */ -/* #define HAVE_PTYS */ - /* We don't have memmove. */ #define memmove(d, s, n) safe_bcopy (s, d, n)
--- a/src/m/delta.h Mon May 14 04:16:19 2001 +0000 +++ b/src/m/delta.h Mon May 14 04:52:49 2001 +0000 @@ -67,8 +67,6 @@ /* Machine specific stuff */ -#define HAVE_PTYS -#define SYSV_PTYS #define BROKEN_CLOSEDIR /* builtin closedir is interruptible */ #define memmove(t,f,s) safe_bcopy(f,t,s) /* for overlapping copies */ #undef KERNEL_FILE
--- a/src/m/delta88k.h Mon May 14 04:16:19 2001 +0000 +++ b/src/m/delta88k.h Mon May 14 04:52:49 2001 +0000 @@ -76,12 +76,6 @@ #define STACK_DIRECTION -1 /* The stack grows towards lower addresses. */ #endif /* __GNUC__ */ -/* Motorola SysV has PTYs. Not all usg3-5 systems do, so this is defined - here. */ - -#define HAVE_PTYS -#define SYSV_PTYS - /* * we have the wrong name for networking libs */ @@ -107,10 +101,6 @@ #define NO_SIOCTL_H -/* XEmacs change -- removed crap about random and bstring */ - -#define NO_PTY_H - /* XEmacs change -- smarch@quaver.urbana.mcd.mot.com */ #ifndef NOT_C_CODE #include <dirent.h>
--- a/src/m/dpx2.h Mon May 14 04:16:19 2001 +0000 +++ b/src/m/dpx2.h Mon May 14 04:52:49 2001 +0000 @@ -145,10 +145,6 @@ #define STACK_DIRECTION -1 -/* we also have this */ -#define HAVE_PTYS -#define SYSV_PTYS - /* on bos2.00.45 there is a bug that makes the F_SETOWN fcntl() call enters in an infinite loop. Avoid calling it */ #define F_SETOWN_BUG
--- a/src/m/hp800.h Mon May 14 04:16:19 2001 +0000 +++ b/src/m/hp800.h Mon May 14 04:52:49 2001 +0000 @@ -100,8 +100,6 @@ #define LIBS_MACHINE #define LIBS_DEBUG -/* Include the file bsdtty.h, since this machine has job control. */ -#define NEED_BSDTTY /* The symbol in the kernel where the load average is found is named _avenrun. At this time there are two major flavors
--- a/src/m/ibmps2-aix.h Mon May 14 04:16:19 2001 +0000 +++ b/src/m/ibmps2-aix.h Mon May 14 04:52:49 2001 +0000 @@ -93,10 +93,6 @@ /* This page was added in June 1990. It may be incorrect for some versions of aix, so delete it if it causes trouble. */ -/* AIX386 has BSD4.3 PTYs */ - -#define HAVE_PTYS - /* #define SKTPAIR */ /* SKTPAIR works, but what is advantage over pipes? */ /* Specify the font for X to use. */
--- a/src/m/ibmrt-aix.h Mon May 14 04:16:19 2001 +0000 +++ b/src/m/ibmrt-aix.h Mon May 14 04:52:49 2001 +0000 @@ -76,7 +76,6 @@ /* AIX has PTYs, so define here, along with macros needed to make them work. */ -#define HAVE_PTYS #define PTY_ITERATION for (i=0; i<256; i++) #define PTY_NAME_SPRINTF sprintf (ptyname, "/dev/ptc%d", i);
--- a/src/m/mips.h Mon May 14 04:16:19 2001 +0000 +++ b/src/m/mips.h Mon May 14 04:52:49 2001 +0000 @@ -136,8 +136,6 @@ /* The `select' in the system won't work for pipes, so don't use it. */ #undef HAVE_SELECT /* override configuration decision */ -#define HAVE_PTYS - /* ??? */ #define IRIS
--- a/src/m/pfa50.h Mon May 14 04:16:19 2001 +0000 +++ b/src/m/pfa50.h Mon May 14 04:52:49 2001 +0000 @@ -56,8 +56,6 @@ #define TERMINFO -#define HAVE_PTYS - /* SX/A use SystemV style getdents/readdir. */ #define NO_SIOCTL_H
--- a/src/m/sps7.h Mon May 14 04:16:19 2001 +0000 +++ b/src/m/sps7.h Mon May 14 04:52:49 2001 +0000 @@ -44,12 +44,6 @@ #define SMX #define V3x -/* - * Define HAVE_PTYS if the system supports pty devices. - */ - -#define HAVE_PTYS - /* Have the socketpair call */
--- a/src/m/stride.h Mon May 14 04:16:19 2001 +0000 +++ b/src/m/stride.h Mon May 14 04:52:49 2001 +0000 @@ -50,7 +50,6 @@ /* The STRIDE system is more powerful than standard USG5. */ -#define HAVE_PTYS #define SKTPAIR #define MAIL_USE_FLOCK
--- a/src/m/tad68k.h Mon May 14 04:16:19 2001 +0000 +++ b/src/m/tad68k.h Mon May 14 04:52:49 2001 +0000 @@ -73,5 +73,4 @@ /* omit next three lines if no TCP installed */ #define select gnu_select /* avoid select() name clash */ -#define HAVE_PTYS /* we do have PTYs if we have TCP */ #define LIBS_SYSTEM "-lsocket" /* get TCP networking functions */
--- a/src/m/tekxd88.h Mon May 14 04:16:19 2001 +0000 +++ b/src/m/tekxd88.h Mon May 14 04:52:49 2001 +0000 @@ -67,9 +67,6 @@ #undef LIB_X11_LIB /* Don't use shared libraries defined in usg5-3.h */ #undef LIBX11_SYSTEM -#define HAVE_PTYS /* XD88 SysV has PTYs. */ -#define SYSV_PTYS /* Requires <termios.h> */ - #ifdef ghs /* Stands for "Green Hills Software", defined only in /bin/cc */ /* -X18 means do not allocate programmer-defined local variables to a register unless they are declared register. (Copied from perl-4.036
--- a/src/m/wicat.h Mon May 14 04:16:19 2001 +0000 +++ b/src/m/wicat.h Mon May 14 04:52:49 2001 +0000 @@ -98,7 +98,6 @@ /* For WICAT version supporting PTYs and select (currently internal only) */ -#ifdef HAVE_PTYS #undef FIRST_PTY_LETTER #define FIRST_PTY_LETTER 'q' #endif
--- a/src/process-unix.c Mon May 14 04:16:19 2001 +0000 +++ b/src/process-unix.c Mon May 14 04:52:49 2001 +0000 @@ -198,7 +198,6 @@ return proc; } -#ifdef HAVE_PTYS static int allocate_pty_the_old_fashioned_way (void); /* The file name of the (slave) pty opened by allocate_pty(). */ @@ -410,7 +409,6 @@ } /* iteration */ return -1; } -#endif /* HAVE_PTYS */ static int create_bidirectional_pipe (int *inchannel, int *outchannel, @@ -854,7 +852,6 @@ volatile int forkout = -1; volatile int pty_flag = 0; -#ifdef HAVE_PTYS if (!NILP (Vprocess_connection_type)) { /* find a new pty, open the master side, return the opened @@ -863,7 +860,7 @@ outchannel = inchannel = allocate_pty (); } - if (inchannel >= 0) + if (inchannel >= 0) /* We successfully allocated a pty. */ { /* You're "supposed" to now open the slave in the child. On some systems, we can open it here; this allows for @@ -884,7 +881,6 @@ UNIX_DATA(p)->pty_flag = pty_flag = 1; } else -#endif /* HAVE_PTYS */ if (create_bidirectional_pipe (&inchannel, &outchannel, &forkin, &forkout) < 0) goto io_failure; @@ -924,7 +920,6 @@ disconnect_controlling_terminal (); -#ifdef HAVE_PTYS if (pty_flag) { /* Open the pty connection and make the pty's terminal @@ -1040,13 +1035,11 @@ process group. */ signal (SIGHUP, SIG_DFL); - } - if (pty_flag) - /* Set up the terminal characteristics of the pty. */ - child_setup_tty (xforkout); + /* Set up the terminal characteristics of the pty. */ + child_setup_tty (xforkout); + } /* if (pty_flag) */ -#endif /* HAVE_PTYS */ signal (SIGINT, SIG_DFL); signal (SIGQUIT, SIG_DFL); @@ -1098,12 +1091,7 @@ if (forkin != forkout && forkout >= 0) close (forkout); -#ifdef HAVE_PTYS - if (pty_flag) - UNIX_DATA (p)->tty_name = build_string (pty_name); - else -#endif - UNIX_DATA (p)->tty_name = Qnil; + UNIX_DATA (p)->tty_name = pty_flag ? build_string (pty_name) : Qnil; /* Notice that SIGCHLD was not blocked. (This is not possible on some systems.) No biggie if SIGCHLD occurs right around the
--- a/src/s/aix3-1.h Mon May 14 04:16:19 2001 +0000 +++ b/src/s/aix3-1.h Mon May 14 04:52:49 2001 +0000 @@ -57,15 +57,6 @@ #define SYSTEM_TYPE "aix" -/* In AIX, you allocate a pty by opening /dev/ptc to get the master side. - To get the name of the slave side, you just ttyname() the master side. */ - -/* - * Define HAVE_PTYS if the system supports pty devices. - */ - -#define HAVE_PTYS - /* If your system uses COFF (Common Object File Format) then define the preprocessor symbol "COFF". */
--- a/src/s/bsd4-1.h Mon May 14 04:16:19 2001 +0000 +++ b/src/s/bsd4-1.h Mon May 14 04:52:49 2001 +0000 @@ -38,12 +38,6 @@ #define FIRST_PTY_LETTER 'p' -/* - * Define HAVE_PTYS if the system supports pty devices. - */ - -/* #define HAVE_PTYS */ - /* If your system uses COFF (Common Object File Format) then define the preprocessor symbol "COFF". */
--- a/src/s/bsd4-2.h Mon May 14 04:16:19 2001 +0000 +++ b/src/s/bsd4-2.h Mon May 14 04:52:49 2001 +0000 @@ -39,16 +39,6 @@ #define SYSTEM_TYPE "berkeley-unix" -/* First pty name is /dev/ptyp0. */ - -#define FIRST_PTY_LETTER 'p' - -/* - * Define HAVE_PTYS if the system supports pty devices. - */ - -#define HAVE_PTYS - /* If your system uses COFF (Common Object File Format) then define the preprocessor symbol "COFF". */
--- a/src/s/cxux.h Mon May 14 04:16:19 2001 +0000 +++ b/src/s/cxux.h Mon May 14 04:52:49 2001 +0000 @@ -70,12 +70,6 @@ #define FIRST_PTY_LETTER 'A' #define PTY_ITERATION for (c = 'A'; c <= 'P'; c++) for (i = 0; i < 16; i++) -/* - * Define HAVE_PTYS if the system supports pty devices. - */ - -#define HAVE_PTYS - /* If your system uses COFF (Common Object File Format) then define the preprocessor symbol "COFF". */
--- a/src/s/cygwin32.h Mon May 14 04:16:19 2001 +0000 +++ b/src/s/cygwin32.h Mon May 14 04:52:49 2001 +0000 @@ -180,12 +180,6 @@ #define NO_MATHERR -/* - * Define HAVE_PTYS if the system supports pty devices. - */ - -#define HAVE_PTYS - /* define MAIL_USE_FLOCK if the mailer uses flock to interlock access to /usr/spool/mail/$USER. The alternative is that a lock file named
--- a/src/s/dgux.h Mon May 14 04:16:19 2001 +0000 +++ b/src/s/dgux.h Mon May 14 04:52:49 2001 +0000 @@ -55,12 +55,6 @@ #define HAVE_UNIX_DOMAIN -/* - * Define HAVE_PTYS if the system supports pty devices. - */ - -#define HAVE_PTYS - /* If your system uses COFF (Common Object File Format) then define the preprocessor symbol "COFF".
--- a/src/s/esix.h Mon May 14 04:16:19 2001 +0000 +++ b/src/s/esix.h Mon May 14 04:52:49 2001 +0000 @@ -5,10 +5,6 @@ #include "usg5-3.h" -/* Some versions of V.3 have this, but not all. ESIX does. */ -#define HAVE_PTYS -#define SYSV_PTYS - /* Have -lg be used for debugging. */ #undef LIBS_DEBUG #define LIBS_DEBUG "-lg"
--- a/src/s/hpux.h Mon May 14 04:16:19 2001 +0000 +++ b/src/s/hpux.h Mon May 14 04:52:49 2001 +0000 @@ -55,12 +55,6 @@ #define FIRST_PTY_LETTER 'p' -/* - * Define HAVE_PTYS if the system supports pty devices. - */ - -#define HAVE_PTYS - /* If your system uses COFF (Common Object File Format) then define the preprocessor symbol "COFF". */
--- a/src/s/iris3-5.h Mon May 14 04:16:19 2001 +0000 +++ b/src/s/iris3-5.h Mon May 14 04:52:49 2001 +0000 @@ -39,12 +39,6 @@ #define FIRST_PTY_LETTER 'a' -/* - * Define HAVE_PTYS if the system supports pty devices. - */ - -#define HAVE_PTYS - /* If your system uses COFF (Common Object File Format) then define the preprocessor symbol "COFF". */
--- a/src/s/iris3-6.h Mon May 14 04:16:19 2001 +0000 +++ b/src/s/iris3-6.h Mon May 14 04:52:49 2001 +0000 @@ -39,12 +39,6 @@ #define FIRST_PTY_LETTER 'a' -/* - * Define HAVE_PTYS if the system supports pty devices. - */ - -#define HAVE_PTYS - /* If your system uses COFF (Common Object File Format) then define the preprocessor symbol "COFF". */
--- a/src/s/irix3-3.h Mon May 14 04:16:19 2001 +0000 +++ b/src/s/irix3-3.h Mon May 14 04:52:49 2001 +0000 @@ -42,12 +42,6 @@ #define FIRST_PTY_LETTER 'a' -/* - * Define HAVE_PTYS if the system supports pty devices. - */ - -#define HAVE_PTYS - /* If your system uses COFF (Common Object File Format) then define the preprocessor symbol "COFF". */
--- a/src/s/isc2-2.h Mon May 14 04:16:19 2001 +0000 +++ b/src/s/isc2-2.h Mon May 14 04:52:49 2001 +0000 @@ -26,7 +26,6 @@ #define NO_FCHMOD -#define HAVE_PTYS #define MAXNAMLEN 512 #define O_NDELAY O_NONBLOCK #define MEMORY_IN_STRING_H
--- a/src/s/linux.h Mon May 14 04:16:19 2001 +0000 +++ b/src/s/linux.h Mon May 14 04:52:49 2001 +0000 @@ -37,9 +37,6 @@ #define SYSTEM_TYPE "linux" /* All the best software is free. */ -#define FIRST_PTY_LETTER 'p' -#define HAVE_PTYS - /* define MAIL_USE_FLOCK if the mailer uses flock to interlock access to /usr/spool/mail/$USER. The alternative is that a lock file named
--- a/src/s/ptx.h Mon May 14 04:16:19 2001 +0000 +++ b/src/s/ptx.h Mon May 14 04:52:49 2001 +0000 @@ -104,10 +104,6 @@ #undef BROKEN_TIOCGWINSZ #undef BROKEN_TIOCGETC -/* PTX has pty's but not like System V */ -#define HAVE_PTYS -#undef SYSV_PTYS - /* Provide pty support which is defined into process.c:allocate_pty. Basic ideas for handling getpseudotty were lifted from process.c in Emacs 18.57 included on the Sequent Public Software tape. However, this
--- a/src/s/rtu.h Mon May 14 04:16:19 2001 +0000 +++ b/src/s/rtu.h Mon May 14 04:52:49 2001 +0000 @@ -39,12 +39,6 @@ #define FIRST_PTY_LETTER 'z' /* i.e. no PTY_LETTERs */ -/* - * Define HAVE_PTYS if the system supports pty devices. - */ - -#define HAVE_PTYS - /* If your system uses COFF (Common Object File Format) then define the preprocessor symbol "COFF". */
--- a/src/s/sco4.h Mon May 14 04:16:19 2001 +0000 +++ b/src/s/sco4.h Mon May 14 04:52:49 2001 +0000 @@ -43,7 +43,6 @@ #endif /* SCO has ptys with unusual names. */ -#define HAVE_PTYS #define PTY_ITERATION \ for (i = 0; ; i++)
--- a/src/s/sco5.h Mon May 14 04:16:19 2001 +0000 +++ b/src/s/sco5.h Mon May 14 04:52:49 2001 +0000 @@ -37,7 +37,6 @@ #define SYSTEM_TYPE "SCO 3.2v5" /* SCO has ptys, but with weird names */ -#define HAVE_PTYS #define PTY_ITERATION \ for (i = 0; ; i++) #define PTY_NAME_SPRINTF \
--- a/src/s/template.h Mon May 14 04:16:19 2001 +0000 +++ b/src/s/template.h Mon May 14 04:52:49 2001 +0000 @@ -45,13 +45,7 @@ /* Letter to use in finding device name of first pty, if system supports pty's. 'a' means it is /dev/ptya0 */ -#define FIRST_PTY_LETTER 'a' - -/* - * Define HAVE_PTYS if the system supports pty devices. - */ - -#define HAVE_PTYS +#define FIRST_PTY_LETTER 'p' /* If your system uses COFF (Common Object File Format) then define the preprocessor symbol "COFF". */
--- a/src/s/umax.h Mon May 14 04:16:19 2001 +0000 +++ b/src/s/umax.h Mon May 14 04:52:49 2001 +0000 @@ -45,12 +45,6 @@ #define FIRST_PTY_LETTER 'p' -/* - * Define HAVE_PTYS if the system supports pty devices. - */ - -#define HAVE_PTYS - /* If your system uses COFF (Common Object File Format) then define the preprocessor symbol "COFF". */
--- a/src/s/umips.h Mon May 14 04:16:19 2001 +0000 +++ b/src/s/umips.h Mon May 14 04:52:49 2001 +0000 @@ -44,8 +44,6 @@ so don't use it. */ #define BROKEN_SELECT -#define HAVE_PTYS - /* ??? */ #define IRIS
--- a/src/s/unipl5-0.h Mon May 14 04:16:19 2001 +0000 +++ b/src/s/unipl5-0.h Mon May 14 04:52:49 2001 +0000 @@ -42,12 +42,6 @@ /* #define FIRST_PTY_LETTER 'a' */ -/* - * Define HAVE_PTYS if the system supports pty devices. - */ - -/* #define HAVE_PTYS */ - #define NO_SUBPROCESSES /* If your system uses COFF (Common Object File Format) then define the
--- a/src/s/unipl5-2.h Mon May 14 04:16:19 2001 +0000 +++ b/src/s/unipl5-2.h Mon May 14 04:52:49 2001 +0000 @@ -41,12 +41,6 @@ #define FIRST_PTY_LETTER 'p' -/* - * Define HAVE_PTYS if the system supports pty devices. - */ - -#define HAVE_PTYS - /* Subprocesses are supported under UniPlus System V Release 2. */ /* If your system uses COFF (Common Object File Format) then define the
--- a/src/s/usg5-0.h Mon May 14 04:16:19 2001 +0000 +++ b/src/s/usg5-0.h Mon May 14 04:52:49 2001 +0000 @@ -40,12 +40,6 @@ #define FIRST_PTY_LETTER 'p' -/* - * Define HAVE_PTYS if the system supports pty devices. - */ - -/* #define HAVE_PTYS */ - /* If your system uses COFF (Common Object File Format) then define the preprocessor symbol "COFF". */
--- a/src/s/usg5-3.h Mon May 14 04:16:19 2001 +0000 +++ b/src/s/usg5-3.h Mon May 14 04:52:49 2001 +0000 @@ -24,10 +24,6 @@ #define USG5_3 -/* Some versions of V.3 have this, but not all. - #define HAVE_PTYS - #define SYSV_PTYS */ - /* 5.3 apparently makes close() interruptible */ #define INTERRUPTIBLE_CLOSE
--- a/src/s/usg5-4.h Mon May 14 04:16:19 2001 +0000 +++ b/src/s/usg5-4.h Mon May 14 04:52:49 2001 +0000 @@ -101,7 +101,6 @@ #define USG_SHARED_LIBRARIES #endif -#define HAVE_PTYS #undef BROKEN_TIOCGWINSZ #undef BROKEN_TIOCGETC
--- a/src/s/windowsnt.h Mon May 14 04:16:19 2001 +0000 +++ b/src/s/windowsnt.h Mon May 14 04:52:49 2001 +0000 @@ -146,12 +146,6 @@ /* #define HAVE_SELECT */ -/* - * Define HAVE_PTYS if the system supports pty devices. - */ - -/* #define HAVE_PTYS */ - /* If your system uses COFF (Common Object File Format) then define the preprocessor symbol "COFF". */
--- a/src/s/xenix.h Mon May 14 04:16:19 2001 +0000 +++ b/src/s/xenix.h Mon May 14 04:52:49 2001 +0000 @@ -41,17 +41,6 @@ #define SYSTEM_TYPE "xenix" -/* Letter to use in finding device name of first pty, - if system supports pty's. 'p' means it is /dev/ptyp0 */ - -/* #define FIRST_PTY_LETTER 'p' */ - -/* - * Define HAVE_PTYS if the system supports pty devices. - */ - -/* #define HAVE_PTYS */ - /* If your system uses COFF (Common Object File Format) then define the preprocessor symbol "COFF". */
--- a/src/sysdep.c Mon May 14 04:16:19 2001 +0000 +++ b/src/sysdep.c Mon May 14 04:52:49 2001 +0000 @@ -188,7 +188,7 @@ It seems that O_NONBLOCK applies only to FIFOs? From lowry@watson.ibm.com (Andy Lowry). */ /* #### Should this be conditionalized on FIONBIO? */ -#if defined (STRIDE) || (defined (pfa) && defined (HAVE_PTYS)) || defined (AIX) +#if defined (STRIDE) || defined (pfa) || defined (AIX) { int one = 1; ioctl (fd, FIONBIO, &one); @@ -889,42 +889,11 @@ #endif } -#ifdef HAVE_PTYS - /* Set up the proper status flags for use of a pty. */ void setup_pty (int fd) { - /* I'm told that TIOCREMOTE does not mean control chars - "can't be sent" but rather that they don't have - input-editing or signaling effects. - That should be good, because we have other ways - to do those things in Emacs. - However, telnet mode seems not to work on 4.2. - So TIOCREMOTE is turned off now. */ - - /* Under hp-ux, if TIOCREMOTE is turned on, some calls - will hang. In particular, the "timeout" feature (which - causes a read to return if there is no data available) - does this. Also it is known that telnet mode will hang - in such a way that Emacs must be stopped (perhaps this - is the same problem). - - If TIOCREMOTE is turned off, then there is a bug in - hp-ux which sometimes loses data. Apparently the - code which blocks the master process when the internal - buffer fills up does not work. Other than this, - though, everything else seems to work fine. - - Since the latter lossage is more benign, we may as well - lose that way. -- cph */ -#if defined (FIONBIO) && defined (SYSV_PTYS) - { - int on = 1; - ioctl (fd, FIONBIO, &on); - } -#endif #ifdef IBMRTAIX /* On AIX, the parent gets SIGHUP when a pty attached child dies. So, we */ /* ignore SIGHUP once we've started a child on a pty. Note that this may */ @@ -932,7 +901,8 @@ /* tty goes away. I've complained to the AIX developers, and they may */ /* change this behavior, but I'm not going to hold my breath. */ signal (SIGHUP, SIG_IGN); -#endif +#endif /* IBMRTAIX */ + #ifdef TIOCPKT /* In some systems (Linux through 2.0.0, at least), packet mode doesn't get cleared when a pty is closed, so we need to clear it here. @@ -944,9 +914,8 @@ int off = 0; ioctl (fd, TIOCPKT, (char *)&off); } -#endif +#endif /* TIOCPKT */ } -#endif /* HAVE_PTYS */ /************************************************************************/
--- a/src/systty.h Mon May 14 04:16:19 2001 +0000 +++ b/src/systty.h Mon May 14 04:52:49 2001 +0000 @@ -114,39 +114,23 @@ /* miscellaneous includes */ /* ----------------------------------------------------- */ -#ifdef AIXHFT +#ifdef AIXHFT /* obsolete - only found in AIX version 3. */ /* Get files for keyboard remapping */ #define HFNKEYS 2 #include <sys/hft.h> #include <sys/devinfo.h> #endif -/* XEmacs: We don't support BSD 4.1 any more */ - -#ifdef NEED_BSDTTY -#include <sys/bsdtty.h> -#endif - /* Include files for PTY's */ -#if defined (HPUX) && defined (HAVE_PTYS) +#if defined (HAVE_SYS_PTYIO_H) /* HP-UX */ #include <sys/ptyio.h> #endif -#ifdef AIX +#if defined (HAVE_PTY_H) +#include <pty.h> +#elif defined (HAVE_SYS_PTY_H) #include <sys/pty.h> -#endif /* AIX */ - -#ifdef SYSV_PTYS -# include <sys/types.h> -# include <sys/tty.h> -# ifdef titan -# include <sys/ttyhw.h> -# include <sys/stream.h> -# endif -# ifndef NO_PTY_H -# include <sys/pty.h> -# endif #endif /* XEmacs: removed some random if defined (pfa) crap for FASYNC (SIGIO).