From 07f04e69a3173b12c9545eda7f319e7dfb09e154 Mon Sep 17 00:00:00 2001 From: kevinb Date: Fri, 28 Sep 2001 23:42:07 +0000 Subject: [PATCH] * configure.in (_XOPEN_SOURCE): Permit definition of _NSIG to define _XOPEN_SOURCE too. * configure: Regenerated. --- expect/ChangeLog | 6 +++ expect/configure | 107 +++++++++++++++++++++++++++------------------------- expect/configure.in | 3 ++ 3 files changed, 64 insertions(+), 52 deletions(-) diff --git a/expect/ChangeLog b/expect/ChangeLog index bf3106179c..cb23045774 100644 --- a/expect/ChangeLog +++ b/expect/ChangeLog @@ -1,3 +1,9 @@ +2001-09-28 Kevin Buettner + + * configure.in (_XOPEN_SOURCE): Permit definition of _NSIG to + define _XOPEN_SOURCE too. + * configure: Regenerated. + Thu Sep 20 16:00:44 2001 Andrew Cagney * Makefile.in (shared/tcl_regexp.o, tcl_regexp.o): Add explict diff --git a/expect/configure b/expect/configure index 16a5a8b6d9..08ff551af1 100755 --- a/expect/configure +++ b/expect/configure @@ -5110,12 +5110,15 @@ echo "configure:5106: checking for NSIG definition with _XOPEN_SOURCE" >&5 /* _XOPEN_SOURCE can remove NSIG on UnixWare or OSF/1. */ #define _XOPEN_SOURCE #include +#ifndef NSIG +#define NSIG _NSIG +#endif char junk[NSIG]; int main() { ; return 0; } EOF -if { (eval echo configure:5119: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5122: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cat >> confdefs.h <<\EOF #define _XOPEN_SOURCE 1 @@ -5139,7 +5142,7 @@ fi # In OSF/1 case, SVR4 are somewhat different. # Gregory Depp 17Aug93 echo $ac_n "checking for OSF/1 style pty allocation""... $ac_c" 1>&6 -echo "configure:5143: checking for OSF/1 style pty allocation" >&5 +echo "configure:5146: checking for OSF/1 style pty allocation" >&5 if test -r /dev/ptmx_bsd -a "$cross_compiling" != "yes" ; then cat >> confdefs.h <<\EOF #define HAVE_PTMX_BSD 1 @@ -5162,12 +5165,12 @@ esac tcgetattr=0 tcsetattr=0 echo $ac_n "checking for tcgetattr""... $ac_c" 1>&6 -echo "configure:5166: checking for tcgetattr" >&5 +echo "configure:5169: checking for tcgetattr" >&5 if eval "test \"`echo '$''{'ac_cv_func_tcgetattr'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5197: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_tcgetattr=yes" else @@ -5210,12 +5213,12 @@ else fi echo $ac_n "checking for tcsetattr""... $ac_c" 1>&6 -echo "configure:5214: checking for tcsetattr" >&5 +echo "configure:5217: checking for tcsetattr" >&5 if eval "test \"`echo '$''{'ac_cv_func_tcsetattr'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5245: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_tcsetattr=yes" else @@ -5270,7 +5273,7 @@ fi # first check for the pure bsd echo $ac_n "checking for struct sgttyb""... $ac_c" 1>&6 -echo "configure:5274: checking for struct sgttyb" >&5 +echo "configure:5277: checking for struct sgttyb" >&5 if test "$cross_compiling" = yes; then case "${host}" in *-*-cygwin*) echo "$ac_t""no" 1>&6 ;; @@ -5279,7 +5282,7 @@ if test "$cross_compiling" = yes; then else cat > conftest.$ac_ext < @@ -5289,7 +5292,7 @@ main() exit(0); } EOF -if { (eval echo configure:5293: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:5296: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then echo "$ac_t""yes" 1>&6 cat >> confdefs.h <<\EOF @@ -5318,7 +5321,7 @@ if test $mach -eq 0 ; then # since that just controls which of pty_XXXX.c file is use and # pty_termios.c is set up to handle pty_termio. echo $ac_n "checking for struct termio""... $ac_c" 1>&6 -echo "configure:5322: checking for struct termio" >&5 +echo "configure:5325: checking for struct termio" >&5 if test "$cross_compiling" = yes; then case "${host}" in *-*-cygwin*) echo "$ac_t""no" 1>&6 ;; @@ -5327,7 +5330,7 @@ echo "configure:5322: checking for struct termio" >&5 else cat > conftest.$ac_ext < main() @@ -5336,7 +5339,7 @@ else exit(0); } EOF -if { (eval echo configure:5340: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:5343: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then cat >> confdefs.h <<\EOF #define HAVE_TERMIO 1 @@ -5358,7 +5361,7 @@ fi # now check for the new style ttys (not yet posix) echo $ac_n "checking for struct termios""... $ac_c" 1>&6 -echo "configure:5362: checking for struct termios" >&5 +echo "configure:5365: checking for struct termios" >&5 if test "$cross_compiling" = yes; then case "${host}" in *-*-cygwin*) cat >> confdefs.h <<\EOF @@ -5372,7 +5375,7 @@ EOF else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:5392: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then cat >> confdefs.h <<\EOF #define HAVE_TERMIOS 1 @@ -5407,7 +5410,7 @@ fi fi echo $ac_n "checking if TCGETS or TCGETA in termios.h""... $ac_c" 1>&6 -echo "configure:5411: checking if TCGETS or TCGETA in termios.h" >&5 +echo "configure:5414: checking if TCGETS or TCGETA in termios.h" >&5 if test "$cross_compiling" = yes; then case "${host}" in *-*-cygwin*) cat >> confdefs.h <<\EOF @@ -5420,7 +5423,7 @@ EOF else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:5443: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then cat >> confdefs.h <<\EOF #define HAVE_TCGETS_OR_TCGETA_IN_TERMIOS_H 1 @@ -5456,7 +5459,7 @@ fi echo $ac_n "checking if TIOCGWINSZ in termios.h""... $ac_c" 1>&6 -echo "configure:5460: checking if TIOCGWINSZ in termios.h" >&5 +echo "configure:5463: checking if TIOCGWINSZ in termios.h" >&5 if test "$cross_compiling" = yes; then case "${host}" in *-*-cygwin*) cat >> confdefs.h <<\EOF @@ -5469,7 +5472,7 @@ EOF else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:5492: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then cat >> confdefs.h <<\EOF #define HAVE_TIOCGWINSZ_IN_TERMIOS_H 1 @@ -5506,7 +5509,7 @@ fi # finally check for Cray style ttys echo $ac_n "checking for Cray-style ptys""... $ac_c" 1>&6 -echo "configure:5510: checking for Cray-style ptys" >&5 +echo "configure:5513: checking for Cray-style ptys" >&5 SETUID=":" if test "$cross_compiling" = yes; then case "${host}" in @@ -5516,7 +5519,7 @@ if test "$cross_compiling" = yes; then else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:5535: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then PTY_TYPE=unicos SETUID="chmod u+s" @@ -5553,12 +5556,12 @@ select=0 poll=0 unset ac_cv_func_select echo $ac_n "checking for select""... $ac_c" 1>&6 -echo "configure:5557: checking for select" >&5 +echo "configure:5560: checking for select" >&5 if eval "test \"`echo '$''{'ac_cv_func_select'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5588: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_select=yes" else @@ -5601,12 +5604,12 @@ else fi echo $ac_n "checking for poll""... $ac_c" 1>&6 -echo "configure:5605: checking for poll" >&5 +echo "configure:5608: checking for poll" >&5 if eval "test \"`echo '$''{'ac_cv_func_poll'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5636: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_poll=yes" else @@ -5649,7 +5652,7 @@ else fi echo $ac_n "checking event handling""... $ac_c" 1>&6 -echo "configure:5653: checking event handling" >&5 +echo "configure:5656: checking event handling" >&5 if test $select -eq 1 ; then EVENT_TYPE=select EVENT_ABLE=event @@ -5671,12 +5674,12 @@ fi for ac_func in _getpty do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:5675: checking for $ac_func" >&5 +echo "configure:5678: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5706: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -5726,12 +5729,12 @@ done for ac_func in getpty do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:5730: checking for $ac_func" >&5 +echo "configure:5733: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5761: \"$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 @@ -5783,7 +5786,7 @@ done # check for timezones # echo $ac_n "checking for SV-style timezone""... $ac_c" 1>&6 -echo "configure:5787: checking for SV-style timezone" >&5 +echo "configure:5790: checking for SV-style timezone" >&5 if test "$cross_compiling" = yes; then case "${host}" in *-*-cygwin*) echo "$ac_t""no" 1>&6 ;; @@ -5792,7 +5795,7 @@ if test "$cross_compiling" = yes; then else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:5812: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then cat >> confdefs.h <<\EOF #define HAVE_SV_TIMEZONE 1 @@ -5851,7 +5854,7 @@ else # #no_tk=true echo $ac_n "checking for Tk private headers""... $ac_c" 1>&6 -echo "configure:5855: checking for Tk private headers" >&5 +echo "configure:5858: checking for Tk private headers" >&5 # Check whether --with-tkinclude or --without-tkinclude was given. if test "${with_tkinclude+set}" = set; then withval="$with_tkinclude" @@ -5921,17 +5924,17 @@ fi if test x"${ac_cv_c_tkh}" = x ; then ac_safe=`echo "tk.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for tk.h""... $ac_c" 1>&6 -echo "configure:5925: checking for tk.h" >&5 +echo "configure:5928: checking for tk.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5935: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5938: \"$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* @@ -6031,7 +6034,7 @@ fi # also remove dots on systems that don't support filenames > 14 # (are there systems which support shared libs and restrict filename lengths!?) echo $ac_n "checking for long file names""... $ac_c" 1>&6 -echo "configure:6035: checking for long file names" >&5 +echo "configure:6038: checking for long file names" >&5 if eval "test \"`echo '$''{'ac_cv_sys_long_file_names'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -6084,7 +6087,7 @@ EXP_UNSHARED_LIB_FILE=libexpect${EXP_LIB_VERSION}.a EXP_BUILD_LIB_SPEC=${EXP_UNSHARED_LIB_FILE} echo $ac_n "checking for type of library to build""... $ac_c" 1>&6 -echo "configure:6088: checking for type of library to build" >&5 +echo "configure:6091: checking for type of library to build" >&5 if test "$enable_shared" = "yes" && test "x${TCL_SHLIB_SUFFIX}" != "x" ; then EXP_SHLIB_CFLAGS=$TCL_SHLIB_CFLAGS # EXP_SHARED_LIB_FILE=libexpect$EXP_LIB_VERSION$TCL_SHLIB_SUFFIX @@ -6124,19 +6127,19 @@ else fi echo $ac_n "checking for Cygwin32 environment""... $ac_c" 1>&6 -echo "configure:6128: checking for Cygwin32 environment" >&5 +echo "configure:6131: checking for Cygwin32 environment" >&5 if eval "test \"`echo '$''{'ac_cv_cygwin32'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6143: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_cygwin32=yes else @@ -6153,7 +6156,7 @@ echo "$ac_t""$ac_cv_cygwin32" 1>&6 CYGWIN= test "$ac_cv_cygwin32" = yes && CYGWIN=yes echo $ac_n "checking for executable suffix""... $ac_c" 1>&6 -echo "configure:6157: checking for executable suffix" >&5 +echo "configure:6160: checking for executable suffix" >&5 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else diff --git a/expect/configure.in b/expect/configure.in index c65c9fd455..17fde2e8c7 100644 --- a/expect/configure.in +++ b/expect/configure.in @@ -867,6 +867,9 @@ if test -r /dev/ptmx -a "x$svr4_ptys_broken" = x -a "$cross_compiling" != "yes" /* _XOPEN_SOURCE can remove NSIG on UnixWare or OSF/1. */ #define _XOPEN_SOURCE #include +#ifndef NSIG +#define NSIG _NSIG +#endif char junk[NSIG];], [], AC_DEFINE(_XOPEN_SOURCE) -- 2.11.0