aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2012-04-22 06:18:54 -0400
committerGlenn Morris2012-04-22 06:18:54 -0400
commitac1ca7e94815497da2cb01d48b51faa68d0fe1cb (patch)
treef0cbd026adf19856c67db5055279255ba0417540
parentda05bc4c1f811079e53dbda24fb3661714f6bde1 (diff)
downloademacs-ac1ca7e94815497da2cb01d48b51faa68d0fe1cb.tar.gz
emacs-ac1ca7e94815497da2cb01d48b51faa68d0fe1cb.zip
Auto-commit of generated files.
-rw-r--r--autogen/Makefile.in2
-rwxr-xr-xautogen/configure46
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
41VPATH = @srcdir@ 41VPATH = @srcdir@
42pkgdatadir = $(datadir)/@PACKAGE@ 42pkgdatadir = $(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
628gl_GNULIB_ENABLED_dosname_TRUE 628gl_GNULIB_ENABLED_dosname_TRUE
629LTLIBINTL 629LTLIBINTL
630LIBINTL 630LIBINTL
631WARN_CFLAGS
631HAVE_UNISTD_H 632HAVE_UNISTD_H
632NEXT_AS_FIRST_DIRECTIVE_UNISTD_H 633NEXT_AS_FIRST_DIRECTIVE_UNISTD_H
633NEXT_UNISTD_H 634NEXT_UNISTD_H
@@ -1186,7 +1187,6 @@ HAVE_MAKEINFO
1186GZIP_PROG 1187GZIP_PROG
1187INSTALL_INFO 1188INSTALL_INFO
1188GNULIB_WARN_CFLAGS 1189GNULIB_WARN_CFLAGS
1189WARN_CFLAGS
1190WERROR_CFLAGS 1190WERROR_CFLAGS
1191RANLIB 1191RANLIB
1192ARFLAGS 1192ARFLAGS
@@ -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.
10529GNU_MALLOC=yes 10529GNU_MALLOC=yes
10530doug_lea_malloc=yes
10531ac_fn_c_check_func "$LINENO" "malloc_get_state" "ac_cv_func_malloc_get_state"
10532if test "x$ac_cv_func_malloc_get_state" = x""yes; then :
10533
10534else
10535 doug_lea_malloc=no
10536fi
10537 10530
10538ac_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
10539if test "x$ac_cv_func_malloc_set_state" = x""yes; then : 10532$as_echo_n "checking whether malloc is Doug Lea style... " >&6; }
10540 10533if test "${emacs_cv_var_doug_lea_malloc+set}" = set; then :
10541else
10542 doug_lea_malloc=no
10543fi
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; }
10547if test "${emacs_cv_var___after_morecore_hook+set}" = set; then :
10548 $as_echo_n "(cached) " >&6 10534 $as_echo_n "(cached) " >&6
10549else 10535else
10550 cat confdefs.h - <<_ACEOF >conftest.$ac_ext 10536 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
10551/* end confdefs.h. */ 10537/* end confdefs.h. */
10552extern void (* __after_morecore_hook)(); 10538#include <malloc.h>
10539 static void hook (void) {}
10553int 10540int
10554main () 10541main ()
10555{ 10542{
10556__after_morecore_hook = 0 10543malloc_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
10561if ac_fn_c_try_link "$LINENO"; then : 10550if ac_fn_c_try_link "$LINENO"; then :
10562 emacs_cv_var___after_morecore_hook=yes 10551 emacs_cv_var_doug_lea_malloc=yes
10563else 10552else
10564 emacs_cv_var___after_morecore_hook=no 10553 emacs_cv_var_doug_lea_malloc=no
10565fi 10554fi
10566rm -f core conftest.err conftest.$ac_objext \ 10555rm -f core conftest.err conftest.$ac_objext \
10567 conftest$ac_exeext conftest.$ac_ext 10556 conftest$ac_exeext conftest.$ac_ext
10568fi 10557fi
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; }
10571if test $emacs_cv_var___after_morecore_hook = no; then 10560doug_lea_malloc=$emacs_cv_var_doug_lea_malloc
10572 doug_lea_malloc=no
10573fi
10574 10561
10575 10562
10576system_malloc=no 10563system_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