diff options
| author | Glenn Morris | 2012-04-22 06:18:54 -0400 |
|---|---|---|
| committer | Glenn Morris | 2012-04-22 06:18:54 -0400 |
| commit | ac1ca7e94815497da2cb01d48b51faa68d0fe1cb (patch) | |
| tree | f0cbd026adf19856c67db5055279255ba0417540 | |
| parent | da05bc4c1f811079e53dbda24fb3661714f6bde1 (diff) | |
| download | emacs-ac1ca7e94815497da2cb01d48b51faa68d0fe1cb.tar.gz emacs-ac1ca7e94815497da2cb01d48b51faa68d0fe1cb.zip | |
Auto-commit of generated files.
| -rw-r--r-- | autogen/Makefile.in | 2 | ||||
| -rwxr-xr-x | autogen/configure | 46 |
2 files changed, 18 insertions, 30 deletions
diff --git a/autogen/Makefile.in b/autogen/Makefile.in index d395a17bef9..597fa3ec6aa 100644 --- a/autogen/Makefile.in +++ b/autogen/Makefile.in | |||
| @@ -36,7 +36,7 @@ | |||
| 36 | # the same distribution terms as the rest of that program. | 36 | # the same distribution terms as the rest of that program. |
| 37 | # | 37 | # |
| 38 | # Generated by gnulib-tool. | 38 | # Generated by gnulib-tool. |
| 39 | # Reproduce by: gnulib-tool --import --dir=. --lib=libgnu --source-base=lib --m4-base=m4 --doc-base=doc --tests-base=tests --aux-dir=build-aux --avoid=msvc-inval --avoid=msvc-nothrow --avoid=raise --avoid=threadlib --makefile-name=gnulib.mk --conditional-dependencies --no-libtool --macro-prefix=gl --no-vc-files alloca-opt careadlinkat crypto/md5 crypto/sha1 crypto/sha256 crypto/sha512 dtoastr dup2 filemode getloadavg getopt-gnu ignore-value intprops lstat mktime pthread_sigmask readlink socklen stdarg stdio strftime strtoimax strtoumax symlink sys_stat | 39 | # Reproduce by: gnulib-tool --import --dir=. --lib=libgnu --source-base=lib --m4-base=m4 --doc-base=doc --tests-base=tests --aux-dir=build-aux --avoid=msvc-inval --avoid=msvc-nothrow --avoid=raise --avoid=threadlib --makefile-name=gnulib.mk --conditional-dependencies --no-libtool --macro-prefix=gl --no-vc-files alloca-opt careadlinkat crypto/md5 crypto/sha1 crypto/sha256 crypto/sha512 dtoastr dup2 filemode getloadavg getopt-gnu ignore-value intprops lstat manywarnings mktime pthread_sigmask readlink socklen stdarg stdio strftime strtoimax strtoumax symlink sys_stat warnings |
| 40 | 40 | ||
| 41 | VPATH = @srcdir@ | 41 | VPATH = @srcdir@ |
| 42 | pkgdatadir = $(datadir)/@PACKAGE@ | 42 | pkgdatadir = $(datadir)/@PACKAGE@ |
diff --git a/autogen/configure b/autogen/configure index 0d9d1abdaa4..52575eb075b 100755 --- a/autogen/configure +++ b/autogen/configure | |||
| @@ -628,6 +628,7 @@ gl_GNULIB_ENABLED_dosname_FALSE | |||
| 628 | gl_GNULIB_ENABLED_dosname_TRUE | 628 | gl_GNULIB_ENABLED_dosname_TRUE |
| 629 | LTLIBINTL | 629 | LTLIBINTL |
| 630 | LIBINTL | 630 | LIBINTL |
| 631 | WARN_CFLAGS | ||
| 631 | HAVE_UNISTD_H | 632 | HAVE_UNISTD_H |
| 632 | NEXT_AS_FIRST_DIRECTIVE_UNISTD_H | 633 | NEXT_AS_FIRST_DIRECTIVE_UNISTD_H |
| 633 | NEXT_UNISTD_H | 634 | NEXT_UNISTD_H |
| @@ -1186,7 +1187,6 @@ HAVE_MAKEINFO | |||
| 1186 | GZIP_PROG | 1187 | GZIP_PROG |
| 1187 | INSTALL_INFO | 1188 | INSTALL_INFO |
| 1188 | GNULIB_WARN_CFLAGS | 1189 | GNULIB_WARN_CFLAGS |
| 1189 | WARN_CFLAGS | ||
| 1190 | WERROR_CFLAGS | 1190 | WERROR_CFLAGS |
| 1191 | RANLIB | 1191 | RANLIB |
| 1192 | ARFLAGS | 1192 | ARFLAGS |
| @@ -6962,6 +6962,7 @@ esac | |||
| 6962 | # Code from module largefile: | 6962 | # Code from module largefile: |
| 6963 | 6963 | ||
| 6964 | # Code from module lstat: | 6964 | # Code from module lstat: |
| 6965 | # Code from module manywarnings: | ||
| 6965 | # Code from module mktime: | 6966 | # Code from module mktime: |
| 6966 | # Code from module multiarch: | 6967 | # Code from module multiarch: |
| 6967 | # Code from module nocrash: | 6968 | # Code from module nocrash: |
| @@ -6998,6 +6999,7 @@ esac | |||
| 6998 | # Code from module u64: | 6999 | # Code from module u64: |
| 6999 | # Code from module unistd: | 7000 | # Code from module unistd: |
| 7000 | # Code from module verify: | 7001 | # Code from module verify: |
| 7002 | # Code from module warnings: | ||
| 7001 | 7003 | ||
| 7002 | 7004 | ||
| 7003 | # On Suns, sometimes $CPP names a directory. | 7005 | # On Suns, sometimes $CPP names a directory. |
| @@ -7717,8 +7719,6 @@ fi | |||
| 7717 | 7719 | ||
| 7718 | 7720 | ||
| 7719 | 7721 | ||
| 7720 | |||
| 7721 | |||
| 7722 | $as_echo "#define lint 1" >>confdefs.h | 7722 | $as_echo "#define lint 1" >>confdefs.h |
| 7723 | 7723 | ||
| 7724 | 7724 | ||
| @@ -10527,50 +10527,37 @@ esac | |||
| 10527 | # Do the opsystem or machine files prohibit the use of the GNU malloc? | 10527 | # Do the opsystem or machine files prohibit the use of the GNU malloc? |
| 10528 | # Assume not, until told otherwise. | 10528 | # Assume not, until told otherwise. |
| 10529 | GNU_MALLOC=yes | 10529 | GNU_MALLOC=yes |
| 10530 | doug_lea_malloc=yes | ||
| 10531 | ac_fn_c_check_func "$LINENO" "malloc_get_state" "ac_cv_func_malloc_get_state" | ||
| 10532 | if test "x$ac_cv_func_malloc_get_state" = x""yes; then : | ||
| 10533 | |||
| 10534 | else | ||
| 10535 | doug_lea_malloc=no | ||
| 10536 | fi | ||
| 10537 | 10530 | ||
| 10538 | ac_fn_c_check_func "$LINENO" "malloc_set_state" "ac_cv_func_malloc_set_state" | 10531 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether malloc is Doug Lea style" >&5 |
| 10539 | if test "x$ac_cv_func_malloc_set_state" = x""yes; then : | 10532 | $as_echo_n "checking whether malloc is Doug Lea style... " >&6; } |
| 10540 | 10533 | if test "${emacs_cv_var_doug_lea_malloc+set}" = set; then : | |
| 10541 | else | ||
| 10542 | doug_lea_malloc=no | ||
| 10543 | fi | ||
| 10544 | |||
| 10545 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether __after_morecore_hook exists" >&5 | ||
| 10546 | $as_echo_n "checking whether __after_morecore_hook exists... " >&6; } | ||
| 10547 | if test "${emacs_cv_var___after_morecore_hook+set}" = set; then : | ||
| 10548 | $as_echo_n "(cached) " >&6 | 10534 | $as_echo_n "(cached) " >&6 |
| 10549 | else | 10535 | else |
| 10550 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext | 10536 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
| 10551 | /* end confdefs.h. */ | 10537 | /* end confdefs.h. */ |
| 10552 | extern void (* __after_morecore_hook)(); | 10538 | #include <malloc.h> |
| 10539 | static void hook (void) {} | ||
| 10553 | int | 10540 | int |
| 10554 | main () | 10541 | main () |
| 10555 | { | 10542 | { |
| 10556 | __after_morecore_hook = 0 | 10543 | malloc_set_state (malloc_get_state ()); |
| 10544 | __after_morecore_hook = hook; | ||
| 10545 | __malloc_initialize_hook = hook; | ||
| 10557 | ; | 10546 | ; |
| 10558 | return 0; | 10547 | return 0; |
| 10559 | } | 10548 | } |
| 10560 | _ACEOF | 10549 | _ACEOF |
| 10561 | if ac_fn_c_try_link "$LINENO"; then : | 10550 | if ac_fn_c_try_link "$LINENO"; then : |
| 10562 | emacs_cv_var___after_morecore_hook=yes | 10551 | emacs_cv_var_doug_lea_malloc=yes |
| 10563 | else | 10552 | else |
| 10564 | emacs_cv_var___after_morecore_hook=no | 10553 | emacs_cv_var_doug_lea_malloc=no |
| 10565 | fi | 10554 | fi |
| 10566 | rm -f core conftest.err conftest.$ac_objext \ | 10555 | rm -f core conftest.err conftest.$ac_objext \ |
| 10567 | conftest$ac_exeext conftest.$ac_ext | 10556 | conftest$ac_exeext conftest.$ac_ext |
| 10568 | fi | 10557 | fi |
| 10569 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $emacs_cv_var___after_morecore_hook" >&5 | 10558 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $emacs_cv_var_doug_lea_malloc" >&5 |
| 10570 | $as_echo "$emacs_cv_var___after_morecore_hook" >&6; } | 10559 | $as_echo "$emacs_cv_var_doug_lea_malloc" >&6; } |
| 10571 | if test $emacs_cv_var___after_morecore_hook = no; then | 10560 | doug_lea_malloc=$emacs_cv_var_doug_lea_malloc |
| 10572 | doug_lea_malloc=no | ||
| 10573 | fi | ||
| 10574 | 10561 | ||
| 10575 | 10562 | ||
| 10576 | system_malloc=no | 10563 | system_malloc=no |
| @@ -22368,6 +22355,7 @@ $as_echo "$gl_cv_next_unistd_h" >&6; } | |||
| 22368 | 22355 | ||
| 22369 | 22356 | ||
| 22370 | 22357 | ||
| 22358 | |||
| 22371 | gl_gnulib_enabled_dosname=false | 22359 | gl_gnulib_enabled_dosname=false |
| 22372 | gl_gnulib_enabled_be453cec5eecf5731a274f2de7f2db36=false | 22360 | gl_gnulib_enabled_be453cec5eecf5731a274f2de7f2db36=false |
| 22373 | gl_gnulib_enabled_pathmax=false | 22361 | gl_gnulib_enabled_pathmax=false |