From 906debc3b7206396a00f9dd91a519909c1c9d3bb Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Tue, 31 Jul 2012 06:17:40 -0400 Subject: [PATCH] Auto-commit of generated files. --- autogen/config.in | 116 +++++++++------------------------------------- autogen/configure | 72 ++++++++++++++++------------ 2 files changed, 64 insertions(+), 124 deletions(-) diff --git a/autogen/config.in b/autogen/config.in index f20c556c940..b08eb6cea1f 100644 --- a/autogen/config.in +++ b/autogen/config.in @@ -1246,6 +1246,9 @@ along with GNU Emacs. If not, see . */ /* Make process_send_signal work by "typing" a signal character on the pty. */ #undef SIGNALS_VIA_CHARACTERS +/* Define if AH_BOTTOM should include signal.h. */ +#undef SIGNAL_H_AHB + /* Define to l, ll, u, ul, ull, etc., as suitable for constants of type 'sig_atomic_t'. */ #undef SIG_ATOMIC_T_SUFFIX @@ -1295,6 +1298,9 @@ along with GNU Emacs. If not, see . */ /* Define to 1 if you can safely include both and . */ #undef TIME_WITH_SYS_TIME +/* Some platforms redefine this. */ +#undef TIOCSIGSEND + /* Define to 1 if your declares `struct tm'. */ #undef TM_IN_SYS_TIME @@ -1342,6 +1348,9 @@ along with GNU Emacs. If not, see . */ /* Define if the system is compatible with System V. */ #undef USG5 +/* Define if the system is compatible with System V Release 4. */ +#undef USG5_4 + /* Define for USG systems where it works to open a pty's tty in the parent process, then close and reopen it in the child. */ #undef USG_SUBTTY_WORKS @@ -1372,6 +1381,9 @@ along with GNU Emacs. If not, see . */ # endif #endif +/* Some platforms redefine this. */ +#undef WRETCODE + /* Define this to check for malloc buffer overrun. */ #undef XMALLOC_OVERRUN_CHECK @@ -1473,6 +1485,12 @@ along with GNU Emacs. If not, see . */ declarations. Define as empty for no equivalent. */ #undef __restrict_arr +/* Some platforms redefine this. */ +#undef _longjmp + +/* Some platforms redefine this. */ +#undef _setjmp + /* Define to the used os dependent file. */ #undef config_opsysfile @@ -1575,102 +1593,10 @@ along with GNU Emacs. If not, see . */ /* Define as `fork' if `vfork' does not work. */ #undef vfork +/* Some platforms redefine this. */ +#undef wait3 -/* On AIX 3 this must be included before any other include file. */ -#include -#if ! HAVE_ALLOCA -# error "alloca not available on this machine" -#endif - -/* This silences a few compilation warnings on FreeBSD. */ -#ifdef BSD_SYSTEM_AHB -#undef BSD_SYSTEM_AHB -#undef BSD_SYSTEM -#if __FreeBSD__ == 1 -#define BSD_SYSTEM 199103 -#elif __FreeBSD__ == 2 -#define BSD_SYSTEM 199306 -#elif __FreeBSD__ >= 3 -#define BSD_SYSTEM 199506 -#endif -#endif - -/* Define AMPERSAND_FULL_NAME if you use the convention - that & in the full name stands for the login id. */ -/* Turned on June 1996 supposing nobody will mind it. */ -#define AMPERSAND_FULL_NAME - -/* `subprocesses' should be defined if you want to - have code for asynchronous subprocesses - (as used in M-x compile and M-x shell). - Only MSDOS does not support this (it overrides - this in its config_opsysfile below). */ - -#define subprocesses - -/* Include the os dependent file. */ -#ifdef config_opsysfile -# include config_opsysfile -#endif - -/* Mac OS X / GNUstep need a bit more pure memory. Of the existing knobs, - SYSTEM_PURESIZE_EXTRA seems like the least likely to cause problems. */ -#ifdef HAVE_NS -#if defined NS_IMPL_GNUSTEP -# define SYSTEM_PURESIZE_EXTRA 30000 -#elif defined DARWIN_OS -# define SYSTEM_PURESIZE_EXTRA 200000 -#endif -#endif - -#ifdef emacs /* Don't do this for lib-src. */ -/* Tell regex.c to use a type compatible with Emacs. */ -#define RE_TRANSLATE_TYPE Lisp_Object -#define RE_TRANSLATE(TBL, C) CHAR_TABLE_TRANSLATE (TBL, C) -#ifdef make_number -/* If make_number is a macro, use it. */ -#define RE_TRANSLATE_P(TBL) (!EQ (TBL, make_number (0))) -#else -/* If make_number is a function, avoid it. */ -#define RE_TRANSLATE_P(TBL) (!(INTEGERP (TBL) && XINT (TBL) == 0)) -#endif -#endif - -#include -#include - -#if __GNUC__ >= 3 /* On GCC 3.0 we might get a warning. */ -#define NO_INLINE __attribute__((noinline)) -#else -#define NO_INLINE -#endif - -#if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 1)) -#define EXTERNALLY_VISIBLE __attribute__((externally_visible)) -#else -#define EXTERNALLY_VISIBLE -#endif - -#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 7) -# define ATTRIBUTE_FORMAT(spec) __attribute__ ((__format__ spec)) -#else -# define ATTRIBUTE_FORMAT(spec) /* empty */ -#endif - -#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4) -# define ATTRIBUTE_FORMAT_PRINTF(formatstring_parameter, first_argument) \ - ATTRIBUTE_FORMAT ((__gnu_printf__, formatstring_parameter, first_argument)) -#else -# define ATTRIBUTE_FORMAT_PRINTF(formatstring_parameter, first_argument) \ - ATTRIBUTE_FORMAT ((__printf__, formatstring_parameter, first_argument)) -#endif - -#define ATTRIBUTE_CONST _GL_ATTRIBUTE_CONST - -/* Some versions of GNU/Linux define noinline in their headers. */ -#ifdef noinline -#undef noinline -#endif +#include #endif /* EMACS_CONFIG_H */ diff --git a/autogen/configure b/autogen/configure index b52d3157b10..e17d72684c4 100755 --- a/autogen/configure +++ b/autogen/configure @@ -4353,9 +4353,6 @@ case "${srcdir}" in * ) srcdir="`(cd ${srcdir}; pwd)`" ;; esac -#### Given the configuration name, set opsysfile to the -#### name of s/*.h file we should use. - ### Canonicalize the configuration name. # Make sure we can run config.sub. @@ -4604,8 +4601,6 @@ if test $unported = yes; then Check \`etc/MACHINES' for recognized configuration names." "$LINENO" 5 fi -opsysfile="s/${opsys}.h" - #### Choose a compiler. @@ -15163,12 +15158,44 @@ else esac fi +case $opsys in + sol2* | unixware ) + +$as_echo "#define _setjmp setjmp" >>confdefs.h + + +$as_echo "#define _longjmp longjmp" >>confdefs.h + + +$as_echo "#define TIOCSIGSEND TIOCSIGNAL" >>confdefs.h + + ;; +esac + +case $opsys in + irix6-5 | sol2* | unixware ) + +$as_echo "#define wait3(status, options, rusage) waitpid ((pid_t) -1, (status), (options))" >>confdefs.h + + +$as_echo "#define WRETCODE(w) (w >> 8)" >>confdefs.h + + ;; +esac + + case $opsys in hpux* | sol2* ) $as_echo "#define XOS_NEEDS_TIME_H 1" >>confdefs.h ;; + + netbsd | openbsd ) + +$as_echo "#define SIGNAL_H_AHB 1" >>confdefs.h + + ;; esac @@ -15177,9 +15204,9 @@ esac + case $opsys in aix4-2) - opsysfile= $as_echo "#define USG /**/" >>confdefs.h $as_echo "#define USG5 /**/" >>confdefs.h @@ -15210,7 +15237,6 @@ rm -f conftest.err conftest.$ac_ext ;; cygwin) - opsysfile= $as_echo "#define CYGWIN 1" >>confdefs.h @@ -15227,7 +15253,6 @@ $as_echo "#define DARWIN_OS /**/" >>confdefs.h ;; freebsd) - opsysfile= $as_echo "#define BSD4_2 /**/" >>confdefs.h @@ -15263,7 +15288,6 @@ rm -f conftest.err conftest.$ac_ext ;; gnu-linux | gnu-kfreebsd ) - opsysfile= $as_echo "#define USG /**/" >>confdefs.h @@ -15286,28 +15310,32 @@ $as_echo "#define HPUX /**/" >>confdefs.h $as_echo "#define USG5 /**/" >>confdefs.h + $as_echo "#define USG5_4 /**/" >>confdefs.h + $as_echo "#define IRIX6_5 /**/" >>confdefs.h ;; sol2*) - opsysfile="s/usg5-4-common.h" $as_echo "#define USG /**/" >>confdefs.h $as_echo "#define USG5 /**/" >>confdefs.h + $as_echo "#define USG5_4 /**/" >>confdefs.h + $as_echo "#define SOLARIS2 /**/" >>confdefs.h ;; unixware) - opsysfile="s/usg5-4-common.h" $as_echo "#define USG /**/" >>confdefs.h $as_echo "#define USG5 /**/" >>confdefs.h + $as_echo "#define USG5_4 /**/" >>confdefs.h + ;; esac @@ -15319,8 +15347,6 @@ $as_echo "#define G_SLICE_ALWAYS_MALLOC 1" >>confdefs.h ;; - gnu) opsysfile= ;; - hpux11) $as_echo "#define BROKEN_SA_RESTART 1" >>confdefs.h @@ -15328,8 +15354,6 @@ $as_echo "#define BROKEN_SA_RESTART 1" >>confdefs.h $as_echo "#define USG_SUBTTY_WORKS 1" >>confdefs.h - - opsysfile="s/hpux10-20.h" ;; irix6-5) @@ -15341,13 +15365,10 @@ $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" ;; esac @@ -15401,11 +15422,7 @@ version=$PACKAGE_VERSION ## Used in lwlib/Makefile.in. -if test -n "${opsysfile}"; then - S_FILE="\$(srcdir)/${opsysfile}" -else - S_FILE= -fi +S_FILE= @@ -15424,11 +15441,9 @@ cat >>confdefs.h <<_ACEOF #define EMACS_CONFIG_OPTIONS "${ac_configure_args}" _ACEOF -if test -n "$opsysfile"; then +if test -z "No longer used"; then -cat >>confdefs.h <<_ACEOF -#define config_opsysfile "${opsysfile}" -_ACEOF +$as_echo "#define config_opsysfile /**/" >>confdefs.h fi @@ -23787,7 +23802,6 @@ echo " Configured for \`${canonical}'. Where should the build process find the source code? ${srcdir} - What operating system file should Emacs use? ${opsysfile:-none} What compiler should emacs be built with? ${CC} ${CFLAGS} Should Emacs use the GNU version of malloc? ${GNU_MALLOC}${GNU_MALLOC_reason} Should Emacs use a relocating allocator for buffers? ${REL_ALLOC} @@ -25450,7 +25464,7 @@ done ;; "epaths":C) echo creating src/epaths.h -${MAKE-make} epaths-force +${MAKE-make} MAKEFILE_NAME=do-not-make-Makefile epaths-force ;; "gdbinit":C) if test ! -f src/.gdbinit && test -f $srcdir/src/.gdbinit; then -- 2.39.2