From: Glenn Morris Date: Thu, 12 Jul 2012 10:17:28 +0000 (-0400) Subject: Auto-commit of generated files. X-Git-Tag: emacs-24.2.90~1199^2~38 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=dd0d840e4e99c2ccb691f8ac0886652ba6bdc26d;p=emacs.git Auto-commit of generated files. --- diff --git a/autogen/config.in b/autogen/config.in index 8d98dfdb2e3..32040cd4c24 100644 --- a/autogen/config.in +++ b/autogen/config.in @@ -46,12 +46,30 @@ along with GNU Emacs. If not, see . */ /* Define to the number of bits in type 'wint_t'. */ #undef BITSIZEOF_WINT_T +/* Define if FIONREAD should not be used. */ +#undef BROKEN_FIONREAD + +/* Define if get_current_dir_name should not be used. */ +#undef BROKEN_GET_CURRENT_DIR_NAME + +/* Define on FreeBSD to work around an issue when reading from a PTY. */ +#undef BROKEN_PTY_READ_AFTER_EAGAIN + /* Define if SA_RESTART should only be used in batch mode. */ #undef BROKEN_SA_RESTART +/* Define if SIGAIO should not be used. */ +#undef BROKEN_SIGAIO + /* Define if SIGIO should not be used. */ #undef BROKEN_SIGIO +/* Define if SIGPOLL should not be used. */ +#undef BROKEN_SIGPOLL + +/* Define if SIGPTY should not be used. */ +#undef BROKEN_SIGPTY + /* Define if Emacs cannot be dumped on your system. */ #undef CANNOT_DUMP @@ -101,6 +119,10 @@ along with GNU Emacs. If not, see . */ enabled. */ #undef ENABLE_CHECKING +/* Letter to use in finding device name of first PTY, if PTYs are supported. + */ +#undef FIRST_PTY_LETTER + /* Define to 1 if futimesat mishandles a NULL file name. */ #undef FUTIMESAT_NULL_BUG @@ -148,6 +170,10 @@ along with GNU Emacs. If not, see . */ /* Define to 1 if you want to use the GNU memory allocator. */ #undef GNU_MALLOC +/* Define to set the G_SLICE environment variable to "always-malloc" at + startup, if using GTK. */ +#undef G_SLICE_ALWAYS_MALLOC + /* Define to 1 if the file /usr/lpp/X11/bin/smt.exp exists. */ #undef HAVE_AIX_SMT_EXP @@ -671,6 +697,9 @@ along with GNU Emacs. If not, see . */ /* Define to 1 if the pthread_sigmask function can be used (despite bugs). */ #undef HAVE_PTHREAD_SIGMASK +/* Define if the system supports pty devices. */ +#undef HAVE_PTYS + /* Define to 1 if you have the header file. */ #undef HAVE_PTY_H @@ -737,6 +766,9 @@ along with GNU Emacs. If not, see . */ /* Define to 1 if you have the `snprintf' function. */ #undef HAVE_SNPRINTF +/* Define if the system supports 4.2-compatible sockets. */ +#undef HAVE_SOCKETS + /* Define to 1 if you have sound support. */ #undef HAVE_SOUND @@ -1023,6 +1055,9 @@ along with GNU Emacs. If not, see . */ /* Define to support using a Hesiod database to find the POP server. */ #undef HESIOD +/* Define to read input using SIGIO. */ +#undef INTERRUPT_INPUT + /* Define to support Kerberos-authenticated POP mail retrieval. */ #undef KERBEROS @@ -1054,6 +1089,13 @@ along with GNU Emacs. If not, see . */ /* Define to support POP mail retrieval. */ #undef MAIL_USE_POP +/* Define if system's imake configuration file defines `NeedWidePrototypes' as + `NO'. */ +#undef NARROWPROTO + +/* Do not define abort in emacs.c. */ +#undef NO_ABORT + /* Define to 1 if you don't have struct exception in math.h. */ #undef NO_MATHERR @@ -1107,6 +1149,9 @@ along with GNU Emacs. If not, see . */ png_longjmp. */ #undef PNG_DEPSTRUCT +/* Define if process_send_signal should use VSUSP instead of VSWTCH. */ +#undef PREFER_VSUSP + /* Define to 1 if pthread_sigmask(), when it fails, returns -1 and sets errno. */ #undef PTHREAD_SIGMASK_FAILS_WITH_ERRNO @@ -1121,6 +1166,18 @@ along with GNU Emacs. If not, see . */ 'ptrdiff_t'. */ #undef PTRDIFF_T_SUFFIX +/* How to iterate over PTYs. */ +#undef PTY_ITERATION + +/* How to get the device name of the control end of a PTY, if non-standard. */ +#undef PTY_NAME_SPRINTF + +/* How to open a PTY, if non-standard. */ +#undef PTY_OPEN + +/* How to get device name of the tty end of a PTY, if non-standard. */ +#undef PTY_TTY_NAME_SPRINTF + /* Define to 1 if readlink fails to recognize a trailing slash. */ #undef READLINK_TRAILING_SLASH_BUG @@ -1136,6 +1193,12 @@ along with GNU Emacs. If not, see . */ slash */ #undef REPLACE_FUNC_STAT_FILE +/* Define if emacs.c needs to call run_time_remap; for HPUX. */ +#undef RUN_TIME_REMAP + +/* Define if process.c:child_setup should not call setpgrp. */ +#undef SETPGRP_RELEASES_CTTY + /* Make process_send_signal work by "typing" a signal character on the pty. */ #undef SIGNALS_VIA_CHARACTERS @@ -1173,6 +1236,12 @@ along with GNU Emacs. If not, see . */ /* The type of system you are compiling for; sets `system-type'. */ #undef SYSTEM_TYPE +/* Undocumented. */ +#undef TAB3 + +/* Undocumented. */ +#undef TABDLY + /* Define to 1 if you use terminfo instead of termcap. */ #undef TERMINFO @@ -1247,6 +1316,9 @@ along with GNU Emacs. If not, see . */ /* Define this to check for malloc buffer overrun. */ #undef XMALLOC_OVERRUN_CHECK +/* Compensate for a bug in Xos.h on some systems, where it requires time.h. */ +#undef XOS_NEEDS_TIME_H + /* Define to the type of the 6th arg of XRegisterIMInstantiateCallback, either XPointer or XPointer*. */ #undef XRegisterIMInstantiateCallback_arg6 diff --git a/autogen/configure b/autogen/configure index dfda0b689ac..51f2dacf360 100755 --- a/autogen/configure +++ b/autogen/configure @@ -16786,7 +16786,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $emacs_cv_struct_exception" >&5 $as_echo "$emacs_cv_struct_exception" >&6; } HAVE_EXCEPTION=$emacs_cv_struct_exception -if test $emacs_cv_struct_exception != yes; then +if test $emacs_cv_struct_exception != yes || test $opsys = darwin; then $as_echo "#define NO_MATHERR 1" >>confdefs.h @@ -22624,6 +22624,16 @@ fi $as_echo "#define CLASH_DETECTION 1" >>confdefs.h +## Note: PTYs are broken on darwin <6. Use at your own risk. + +$as_echo "#define HAVE_PTYS 1" >>confdefs.h + + + +$as_echo "#define HAVE_SOCKETS 1" >>confdefs.h + + + case $opsys in darwin | gnu | hpux* | *bsd ) @@ -22632,12 +22642,44 @@ $as_echo "#define NO_TERMIO 1" >>confdefs.h ;; esac + case $opsys in - hpux* | irix6-5 | openbsd | sol2* | unixware ) + hpux* | irix6-5 | openbsd | sol2* | unixware ) $as_echo "#define BROKEN_SIGIO 1" >>confdefs.h - ;; + ;; + + aix4-2) + +$as_echo "#define BROKEN_FIONREAD 1" >>confdefs.h + + +$as_echo "#define BROKEN_SIGAIO 1" >>confdefs.h + + +$as_echo "#define BROKEN_SIGPOLL 1" >>confdefs.h + + +$as_echo "#define BROKEN_SIGPTY 1" >>confdefs.h + + + +$as_echo "#define BROKEN_GET_CURRENT_DIR_NAME 1" >>confdefs.h + + ;; + + freebsd) + +$as_echo "#define BROKEN_PTY_READ_AFTER_EAGAIN 1" >>confdefs.h + + ;; + + darwin) + +$as_echo "#define NO_ABORT 1" >>confdefs.h + + ;; esac case $opsys in @@ -22668,6 +22710,132 @@ _ACEOF +case $opsys in + darwin | gnu-linux | gnu-kfreebsd ) + +$as_echo "#define INTERRUPT_INPUT 1" >>confdefs.h + + ;; +esac + + +case $opsys in + cygwin|gnu|gnu-linux|gnu-kfreebsd|irix6-5|freebsd|netbsd|openbsd) + +$as_echo "#define NARROWPROTO 1" >>confdefs.h + + ;; +esac + + + + + + + + +case $opsys in + aix4-2 ) + $as_echo "#define PTY_ITERATION int c; for (c = 0; !c ; c++) " >>confdefs.h + + $as_echo "#define PTY_NAME_SPRINTF strcpy (pty_name, \"/dev/ptc\"); " >>confdefs.h + + $as_echo "#define PTY_TTY_NAME_SPRINTF strcpy (pty_name, ttyname (fd)); " >>confdefs.h + + ;; + + cygwin ) + $as_echo "#define PTY_ITERATION int i; for (i = 0; i < 1; i++) " >>confdefs.h + + $as_echo "#define PTY_OPEN do { int dummy; SIGMASKTYPE mask; mask = sigblock (sigmask (SIGCHLD)); if (-1 == openpty (&fd, &dummy, pty_name, 0, 0)) fd = -1; sigsetmask (mask); if (fd >= 0) emacs_close (dummy); } while (0) " >>confdefs.h + + $as_echo "#define PTY_NAME_SPRINTF " >>confdefs.h + + $as_echo "#define PTY_TTY_NAME_SPRINTF " >>confdefs.h + + ;; + + darwin ) + $as_echo "#define PTY_ITERATION int i; for (i = 0; i < 1; i++) " >>confdefs.h + + $as_echo "#define FIRST_PTY_LETTER 'p'" >>confdefs.h + + $as_echo "#define PTY_OPEN do { int slave; if (openpty (&fd, &slave, pty_name, NULL, NULL) == -1) fd = -1; else emacs_close (slave); } while (0) " >>confdefs.h + + $as_echo "#define PTY_NAME_SPRINTF " >>confdefs.h + + $as_echo "#define PTY_TTY_NAME_SPRINTF " >>confdefs.h + + ;; + + gnu | freebsd | netbsd | openbsd ) + $as_echo "#define FIRST_PTY_LETTER 'p'" >>confdefs.h + + ;; + + gnu-linux | gnu-kfreebsd ) + if test "x$ac_cv_func_grantpt" = xyes; then + $as_echo "#define PTY_ITERATION int i; for (i = 0; i < 1; i++) " >>confdefs.h + + $as_echo "#define PTY_TTY_NAME_SPRINTF { char *ptyname; sigblock (sigmask (SIGCHLD)); if (grantpt (fd) == -1 || unlockpt (fd) == -1 || !(ptyname = ptsname(fd))) { sigunblock (sigmask (SIGCHLD)); close (fd); return -1; } snprintf (pty_name, sizeof pty_name, \"%s\", ptyname); sigunblock (sigmask (SIGCHLD)); } " >>confdefs.h + + if test "x$ac_cv_func_getpt" = xyes; then + $as_echo "#define PTY_OPEN fd = getpt ()" >>confdefs.h + + $as_echo "#define PTY_NAME_SPRINTF " >>confdefs.h + + else + $as_echo "#define PTY_NAME_SPRINTF strcpy (pty_name, \"/dev/ptmx\"); " >>confdefs.h + + fi + else + $as_echo "#define FIRST_PTY_LETTER 'p'" >>confdefs.h + + fi + ;; + + hpux*) + $as_echo "#define FIRST_PTY_LETTER 'p'" >>confdefs.h + + $as_echo "#define PTY_NAME_SPRINTF sprintf (pty_name, \"/dev/ptym/pty%c%x\", c, i); " >>confdefs.h + + $as_echo "#define PTY_TTY_NAME_SPRINTF sprintf (pty_name, \"/dev/pty/tty%c%x\", c, i); " >>confdefs.h + + ;; + + irix6-5 ) + $as_echo "#define PTY_ITERATION /**/" >>confdefs.h + + $as_echo "#define FIRST_PTY_LETTER 'q'" >>confdefs.h + + $as_echo "#define PTY_OPEN { struct sigaction ocstat, cstat; struct stat stb; char * name; sigemptyset(&cstat.sa_mask); cstat.sa_handler = SIG_DFL; cstat.sa_flags = 0; sigaction(SIGCLD, &cstat, &ocstat); name = _getpty (&fd, O_RDWR | O_NDELAY, 0600, 0); sigaction(SIGCLD, &ocstat, (struct sigaction *)0); if (name == 0) return -1; if (fd < 0) return -1; if (fstat (fd, &stb) < 0) return -1; strcpy (pty_name, name); } " >>confdefs.h + + $as_echo "#define PTY_NAME_SPRINTF " >>confdefs.h + + $as_echo "#define PTY_TTY_NAME_SPRINTF " >>confdefs.h + + ;; + + sol2* ) + $as_echo "#define FIRST_PTY_LETTER 'z'" >>confdefs.h + + $as_echo "#define PTY_NAME_SPRINTF strcpy (pty_name, \"/dev/ptmx\"); " >>confdefs.h + + $as_echo "#define PTY_TTY_NAME_SPRINTF { char *ptsname (int), *ptyname; sigblock (sigmask (SIGCLD)); if (grantpt (fd) == -1) { emacs_close (fd); return -1; } sigunblock (sigmask (SIGCLD)); if (unlockpt (fd) == -1) { emacs_close (fd); return -1; } if (!(ptyname = ptsname (fd))) { emacs_close (fd); return -1; } snprintf (pty_name, sizeof pty_name, \"%s\", ptyname); } " >>confdefs.h + + ;; + + unixware ) + $as_echo "#define FIRST_PTY_LETTER 'z'" >>confdefs.h + + $as_echo "#define PTY_NAME_SPRINTF strcpy (pty_name, \"/dev/ptmx\"); " >>confdefs.h + + $as_echo "#define PTY_TTY_NAME_SPRINTF { char *ptsname (int), *ptyname; sigblock(sigmask(SIGCLD)); if (grantpt(fd) == -1) fatal(\"could not grant slave pty\"); sigunblock(sigmask(SIGCLD)); if (unlockpt(fd) == -1) fatal(\"could not unlock slave pty\"); if (!(ptyname = ptsname(fd))) fatal (\"could not enable slave pty\"); snprintf (pty_name, sizeof pty_name, \"%s\", ptyname); } " >>confdefs.h + + ;; +esac + + case $opsys in @@ -22825,12 +22993,50 @@ case $opsys in ;; esac + + + +case $opsys in + darwin) $as_echo "#define TAB3 OXTABS" >>confdefs.h + ;; + + gnu | freebsd | netbsd | openbsd ) + +$as_echo "#define TABDLY OXTABS" >>confdefs.h + + $as_echo "#define TAB3 OXTABS" >>confdefs.h + + ;; + + hpux*) + +$as_echo "#define RUN_TIME_REMAP 1" >>confdefs.h + + ;; +esac + + case $opsys in - gnu) opsysfile="s/bsd-common.h" ;; + hpux* | sol2* ) - gnu-kfreebsd) opsysfile="s/gnu-linux.h" ;; +$as_echo "#define XOS_NEEDS_TIME_H 1" >>confdefs.h - hpux11) + ;; +esac + + +case $opsys in + cygwin) + +$as_echo "#define G_SLICE_ALWAYS_MALLOC 1" >>confdefs.h + + ;; + + gnu) opsysfile="s/bsd-common.h" ;; + + gnu-kfreebsd) opsysfile="s/gnu-linux.h" ;; + + hpux11) $as_echo "#define BROKEN_SA_RESTART 1" >>confdefs.h @@ -22838,17 +23044,26 @@ $as_echo "#define BROKEN_SA_RESTART 1" >>confdefs.h $as_echo "#define USG_SUBTTY_WORKS 1" >>confdefs.h - opsysfile="s/hpux10-20.h" - ;; + opsysfile="s/hpux10-20.h" + ;; - openbsd) opsysfile="s/netbsd.h" ;; + irix6-5) - sol2-10) +$as_echo "#define PREFER_VSUSP 1" >>confdefs.h + + +$as_echo "#define SETPGRP_RELEASES_CTTY 1" >>confdefs.h + + ;; + + openbsd) opsysfile="s/netbsd.h" ;; + + sol2-10) $as_echo "#define _STRUCTURED_PROC 1" >>confdefs.h - opsysfile="s/sol2-6.h" - ;; + opsysfile="s/sol2-6.h" + ;; esac # Set up the CFLAGS for real compilation, so we can substitute it.