summaryrefslogtreecommitdiff
path: root/autogen
diff options
context:
space:
mode:
authorGlenn Morris <rgm@gnu.org>2012-04-22 06:18:54 -0400
committerGlenn Morris <rgm@gnu.org>2012-04-22 06:18:54 -0400
commitac1ca7e94815497da2cb01d48b51faa68d0fe1cb (patch)
treef0cbd026adf19856c67db5055279255ba0417540 /autogen
parentda05bc4c1f811079e53dbda24fb3661714f6bde1 (diff)
downloademacs-ac1ca7e94815497da2cb01d48b51faa68d0fe1cb.tar.gz
Auto-commit of generated files.
Diffstat (limited to 'autogen')
-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 @@
# the same distribution terms as the rest of that program.
#
# Generated by gnulib-tool.
-# 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
+# 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
VPATH = @srcdir@
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
gl_GNULIB_ENABLED_dosname_TRUE
LTLIBINTL
LIBINTL
+WARN_CFLAGS
HAVE_UNISTD_H
NEXT_AS_FIRST_DIRECTIVE_UNISTD_H
NEXT_UNISTD_H
@@ -1186,7 +1187,6 @@ HAVE_MAKEINFO
GZIP_PROG
INSTALL_INFO
GNULIB_WARN_CFLAGS
-WARN_CFLAGS
WERROR_CFLAGS
RANLIB
ARFLAGS
@@ -6962,6 +6962,7 @@ esac
# Code from module largefile:
# Code from module lstat:
+ # Code from module manywarnings:
# Code from module mktime:
# Code from module multiarch:
# Code from module nocrash:
@@ -6998,6 +6999,7 @@ esac
# Code from module u64:
# Code from module unistd:
# Code from module verify:
+ # Code from module warnings:
# On Suns, sometimes $CPP names a directory.
@@ -7717,8 +7719,6 @@ fi
-
-
$as_echo "#define lint 1" >>confdefs.h
@@ -10527,50 +10527,37 @@ esac
# Do the opsystem or machine files prohibit the use of the GNU malloc?
# Assume not, until told otherwise.
GNU_MALLOC=yes
-doug_lea_malloc=yes
-ac_fn_c_check_func "$LINENO" "malloc_get_state" "ac_cv_func_malloc_get_state"
-if test "x$ac_cv_func_malloc_get_state" = x""yes; then :
-
-else
- doug_lea_malloc=no
-fi
-ac_fn_c_check_func "$LINENO" "malloc_set_state" "ac_cv_func_malloc_set_state"
-if test "x$ac_cv_func_malloc_set_state" = x""yes; then :
-
-else
- doug_lea_malloc=no
-fi
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether __after_morecore_hook exists" >&5
-$as_echo_n "checking whether __after_morecore_hook exists... " >&6; }
-if test "${emacs_cv_var___after_morecore_hook+set}" = set; then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether malloc is Doug Lea style" >&5
+$as_echo_n "checking whether malloc is Doug Lea style... " >&6; }
+if test "${emacs_cv_var_doug_lea_malloc+set}" = set; then :
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-extern void (* __after_morecore_hook)();
+#include <malloc.h>
+ static void hook (void) {}
int
main ()
{
-__after_morecore_hook = 0
+malloc_set_state (malloc_get_state ());
+ __after_morecore_hook = hook;
+ __malloc_initialize_hook = hook;
;
return 0;
}
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
- emacs_cv_var___after_morecore_hook=yes
+ emacs_cv_var_doug_lea_malloc=yes
else
- emacs_cv_var___after_morecore_hook=no
+ emacs_cv_var_doug_lea_malloc=no
fi
rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $emacs_cv_var___after_morecore_hook" >&5
-$as_echo "$emacs_cv_var___after_morecore_hook" >&6; }
-if test $emacs_cv_var___after_morecore_hook = no; then
- doug_lea_malloc=no
-fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $emacs_cv_var_doug_lea_malloc" >&5
+$as_echo "$emacs_cv_var_doug_lea_malloc" >&6; }
+doug_lea_malloc=$emacs_cv_var_doug_lea_malloc
system_malloc=no
@@ -22368,6 +22355,7 @@ $as_echo "$gl_cv_next_unistd_h" >&6; }
+
gl_gnulib_enabled_dosname=false
gl_gnulib_enabled_be453cec5eecf5731a274f2de7f2db36=false
gl_gnulib_enabled_pathmax=false