From 7e72357088801d62f3d58202943f8469651dc118 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Wed, 11 Jul 2012 06:17:32 -0400 Subject: [PATCH] Auto-commit of generated files. --- autogen/config.in | 31 ++++--- autogen/configure | 228 ++++++++++++++++++++++++++++++++++++---------- 2 files changed, 199 insertions(+), 60 deletions(-) diff --git a/autogen/config.in b/autogen/config.in index 99c67c05d95..8d98dfdb2e3 100644 --- a/autogen/config.in +++ b/autogen/config.in @@ -58,6 +58,11 @@ along with GNU Emacs. If not, see . */ /* Define this to enable compile time checks for the Lisp_Object data type. */ #undef CHECK_LISP_OBJECT_TYPE +/* Define if you want lock files to be written, so that Emacs can tell + instantly when you try to modify a file that someone else has modified in + his/her Emacs. */ +#undef CLASH_DETECTION + /* Define to one of '_getb67', 'GETB67', 'getb67' for Cray-2 and Cray-YMP systems. This function is required for 'alloca.c' support on those systems. */ @@ -72,9 +77,17 @@ along with GNU Emacs. If not, see . */ /* Address of the start of the data segment. */ #undef DATA_START +/* Name of the default sound device. */ +#undef DEFAULT_SOUND_DEVICE + /* Define to 1 for DGUX with . */ #undef DGUX +/* Define if process.c does not need to close a pty to make it a controlling + terminal (it is already a controlling terminal of the subprocess, because + we did ioctl TIOCSCTTY). */ +#undef DONT_REOPEN_PTY + /* Define to 1 if you are using the GNU C Library. */ #undef DOUG_LEA_MALLOC @@ -129,6 +142,9 @@ along with GNU Emacs. If not, see . */ whether the gnulib module scanf shall be considered present. */ #undef GNULIB_SCANF +/* Value of PENDING_OUTPUT_COUNT if using the GNU C library. */ +#undef GNU_LIBRARY_PENDING_OUTPUT_COUNT + /* Define to 1 if you want to use the GNU memory allocator. */ #undef GNU_MALLOC @@ -597,9 +613,6 @@ along with GNU Emacs. If not, see . */ systems that support xmenu.c. */ #undef HAVE_MENUS -/* Define to 1 if you have the `mkdir' function. */ -#undef HAVE_MKDIR - /* Define to 1 if you have the `mkstemp' function. */ #undef HAVE_MKSTEMP @@ -676,18 +689,12 @@ along with GNU Emacs. If not, see . */ /* Define to 1 if you have the `recvfrom' function. */ #undef HAVE_RECVFROM -/* Define to 1 if you have the `rename' function. */ -#undef HAVE_RENAME - /* Define to 1 if res_init is available. */ #undef HAVE_RES_INIT /* Define to 1 if you have the `rint' function. */ #undef HAVE_RINT -/* Define to 1 if you have the `rmdir' function. */ -#undef HAVE_RMDIR - /* Define to 1 if using librsvg. */ #undef HAVE_RSVG @@ -748,9 +755,6 @@ along with GNU Emacs. If not, see . */ /* Define to 1 if you have the header file. */ #undef HAVE_STDLIB_H -/* Define to 1 if you have the `strerror' function. */ -#undef HAVE_STRERROR - /* Define to 1 if you have the header file. */ #undef HAVE_STRINGS_H @@ -1132,6 +1136,9 @@ along with GNU Emacs. If not, see . */ slash */ #undef REPLACE_FUNC_STAT_FILE +/* Make process_send_signal work by "typing" a signal character on the pty. */ +#undef SIGNALS_VIA_CHARACTERS + /* Define to l, ll, u, ul, ull, etc., as suitable for constants of type 'sig_atomic_t'. */ #undef SIG_ATOMIC_T_SUFFIX diff --git a/autogen/configure b/autogen/configure index 875ef806318..dfda0b689ac 100755 --- a/autogen/configure +++ b/autogen/configure @@ -592,9 +592,9 @@ ac_includes_default="\ #endif" ac_func_list= -gl_getopt_required=POSIX ac_header_list= gl_getopt_required=POSIX +gl_getopt_required=POSIX ac_subst_vars='gltests_LTLIBOBJS gltests_LIBOBJS gl_LTLIBOBJS @@ -3169,6 +3169,7 @@ $as_echo "$as_me: creating cache $cache_file" >&6;} fi as_fn_append ac_func_list " readlinkat" +as_fn_append ac_header_list " sys/param.h" gl_getopt_required=GNU as_fn_append ac_header_list " getopt.h" as_fn_append ac_func_list " gettimeofday" @@ -3197,7 +3198,6 @@ as_fn_append ac_func_list " futimesat" as_fn_append ac_func_list " futimens" as_fn_append ac_func_list " utimensat" as_fn_append ac_func_list " lutimes" -as_fn_append ac_header_list " sys/param.h" as_fn_append ac_header_list " linux/version.h" as_fn_append ac_header_list " sys/systeminfo.h" as_fn_append ac_header_list " stdio_ext.h" @@ -9095,6 +9095,26 @@ _ACEOF + + for ac_header in $ac_header_list +do : + as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` +ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default +" +eval as_val=\$$as_ac_Header + if test "x$as_val" = x""yes; then : + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF + +fi + +done + + + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the preprocessor supports include_next" >&5 $as_echo_n "checking whether the preprocessor supports include_next... " >&6; } if test "${gl_cv_have_include_next+set}" = set; then : @@ -9210,24 +9230,6 @@ $as_echo "$gl_cv_pragma_columns" >&6; } - for ac_header in $ac_header_list -do : - as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default -" -eval as_val=\$$as_ac_Header - if test "x$as_val" = x""yes; then : - cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 -_ACEOF - -fi - -done - - - - @@ -9828,15 +9830,11 @@ $as_echo "$gl_cv_func_getopt_long_gnu" >&6; } - REPLACE_GETOPT=0 - - - if test -n "$gl_replace_getopt"; then : + REPLACE_GETOPT=0 + if test -n "$gl_replace_getopt"; then REPLACE_GETOPT=1 - -fi - + fi if test $REPLACE_GETOPT = 1; then @@ -12344,8 +12342,6 @@ $as_echo "#define HAVE_STRUCT_UTIMBUF 1" >>confdefs.h - - if false; then GL_COND_LIBTOOL_TRUE= GL_COND_LIBTOOL_FALSE='#' @@ -13049,6 +13045,8 @@ if test $HAVE_GETLOADAVG = 0; then # Figure out what our getloadavg.c needs. + + # On HPUX9, an unprivileged user can get load averages this way. if test $gl_func_getloadavg_done = no; then for ac_func in pstat_getdynamic @@ -13210,15 +13208,11 @@ fi - REPLACE_GETOPT=0 - - - if test -n "$gl_replace_getopt"; then : + REPLACE_GETOPT=0 + if test -n "$gl_replace_getopt"; then REPLACE_GETOPT=1 - -fi - + fi if test $REPLACE_GETOPT = 1; then @@ -21019,9 +21013,9 @@ esac for ac_func in gethostname \ -rename closedir mkdir rmdir getrusage get_current_dir_name \ +closedir getrusage get_current_dir_name \ lrand48 logb frexp fmod cbrt setsid \ -strerror fpathconf select euidaccess getpagesize setlocale \ +fpathconf select euidaccess getpagesize setlocale \ utimes getrlimit setrlimit setpgid getcwd shutdown getaddrinfo \ __fpending strsignal setitimer \ sendto recvfrom getsockname getpeername getifaddrs freeifaddrs \ @@ -22187,16 +22181,6 @@ fi -for ac_func in tzset -do : - ac_fn_c_check_func "$LINENO" "tzset" "ac_cv_func_tzset" -if test "x$ac_cv_func_tzset" = x""yes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_TZSET 1 -_ACEOF - -fi -done { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether localtime caches TZ" >&5 $as_echo_n "checking whether localtime caches TZ... " >&6; } @@ -22636,6 +22620,10 @@ $as_echo "#define __restrict_arr __restrict" >>confdefs.h fi + +$as_echo "#define CLASH_DETECTION 1" >>confdefs.h + + case $opsys in darwin | gnu | hpux* | *bsd ) @@ -22660,6 +22648,68 @@ $as_echo "#define HAVE_PROCFS 1" >>confdefs.h ;; esac +case $opsys in + darwin | freebsd | netbsd | openbsd ) + +$as_echo "#define DONT_REOPEN_PTY 1" >>confdefs.h + + ;; +esac + +case $opsys in + netbsd | openbsd) sound_device="/dev/audio" ;; + *) sound_device="/dev/dsp" ;; +esac + + +cat >>confdefs.h <<_ACEOF +#define DEFAULT_SOUND_DEVICE "$sound_device" +_ACEOF + + + + + +case $opsys in + aix4-2 | cygwin | gnu | irix6-5 | freebsd | netbsd | openbsd ) + $as_echo "#define SIGNALS_VIA_CHARACTERS 1" >>confdefs.h + + ;; + + gnu-linux | gnu-kfreebsd ) + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for signals via characters" >&5 +$as_echo_n "checking for signals via characters... " >&6; } + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#include +#if LINUX_VERSION_CODE < 0x20400 +# error "Linux version too old" +#endif + +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_cpp "$LINENO"; then : + emacs_signals_via_chars=yes +else + emacs_signals_via_chars=no +fi +rm -f conftest.err conftest.$ac_ext + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $emacs_signals_via_chars" >&5 +$as_echo "$emacs_signals_via_chars" >&6; } + test $emacs_signals_via_chars = yes && $as_echo "#define SIGNALS_VIA_CHARACTERS 1" >>confdefs.h + + ;; +esac + @@ -22676,6 +22726,86 @@ case $opsys in ;; + gnu | gnu-linux | gnu-kfreebsd ) + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for style of pending output formalism" >&5 +$as_echo_n "checking for style of pending output formalism... " >&6; } + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#include +#if !defined (_IO_STDIO_H) && !defined (_STDIO_USES_IOSTREAM) +# error "stdio definitions not found" +#endif + +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_cpp "$LINENO"; then : + emacs_pending_output=new +else + emacs_pending_output=unknown +fi +rm -f conftest.err conftest.$ac_ext + + if test $emacs_pending_output = unknown; then + case $opsys in + gnu-linux | gnu-kfreebsd) + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#include +#ifndef __UCLIBC__ +# error "not using uclibc" +#endif + +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_cpp "$LINENO"; then : + emacs_pending_output=uclibc +else + emacs_pending_output=old +fi +rm -f conftest.err conftest.$ac_ext + ;; + esac + fi + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $emacs_pending_output" >&5 +$as_echo "$emacs_pending_output" >&6; } + + case $emacs_pending_output in + new) + $as_echo "#define GNU_LIBRARY_PENDING_OUTPUT_COUNT(FILE) ((FILE)->_IO_write_ptr - (FILE)->_IO_write_base)" >>confdefs.h + + ;; + uclibc) + $as_echo "#define GNU_LIBRARY_PENDING_OUTPUT_COUNT(FILE) ((FILE)->__bufpos - (FILE)->__bufstart)" >>confdefs.h + + ;; + old) + $as_echo "#define GNU_LIBRARY_PENDING_OUTPUT_COUNT(FILE) ((FILE)->_pptr - (FILE)->_pbase)" >>confdefs.h + + ;; + esac + ;; +esac + + + + + +case $opsys in gnu) $as_echo "#define DATA_START ({ extern int data_start; (char *) &data_start; })" >>confdefs.h @@ -22696,6 +22826,8 @@ case $opsys in esac case $opsys in + gnu) opsysfile="s/bsd-common.h" ;; + gnu-kfreebsd) opsysfile="s/gnu-linux.h" ;; hpux11) -- 2.39.2