emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Emacs-diffs] /srv/bzr/emacs/trunk r109772: Auto-commit of generated fil


From: Glenn Morris
Subject: [Emacs-diffs] /srv/bzr/emacs/trunk r109772: Auto-commit of generated files.
Date: Sat, 25 Aug 2012 06:17:28 -0400
User-agent: Bazaar (2.5.0)

------------------------------------------------------------
revno: 109772
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Sat 2012-08-25 06:17:28 -0400
message:
  Auto-commit of generated files.
modified:
  autogen/Makefile.in
  autogen/aclocal.m4
  autogen/config.in
  autogen/configure
=== modified file 'autogen/Makefile.in'
--- a/autogen/Makefile.in       2012-08-21 10:17:31 +0000
+++ b/autogen/Makefile.in       2012-08-25 10:17:28 +0000
@@ -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=errno --avoid=fcntl --avoid=fcntl-h --avoid=fstat --avoid=msvc-inval 
--avoid=msvc-nothrow --avoid=raise --avoid=select --avoid=sigprocmask 
--avoid=sys_types --avoid=threadlib --makefile-name=gnulib.mk 
--conditional-dependencies --no-libtool --macro-prefix=gl --no-vc-files 
alloca-opt c-ctype c-strcase careadlinkat crypto/md5 crypto/sha1 crypto/sha256 
crypto/sha512 dtoastr dtotimespec dup2 environ filemode getloadavg getopt-gnu 
gettime gettimeofday ignore-value intprops largefile lstat manywarnings mktime 
pselect pthread_sigmask readlink socklen stat-time stdalign stdarg stdbool 
stdio strftime strtoimax strtoumax symlink sys_stat sys_time time timespec-add 
timespec-sub utimens warnings
+# 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=errno --avoid=fcntl --avoid=fcntl-h --avoid=fstat --avoid=msvc-inval 
--avoid=msvc-nothrow --avoid=raise --avoid=select --avoid=sigprocmask 
--avoid=sys_types --avoid=threadlib --makefile-name=gnulib.mk 
--conditional-dependencies --no-libtool --macro-prefix=gl --no-vc-files 
alloca-opt c-ctype c-strcase careadlinkat crypto/md5 crypto/sha1 crypto/sha256 
crypto/sha512 dtoastr dtotimespec dup2 environ execinfo filemode getloadavg 
getopt-gnu gettime gettimeofday ignore-value intprops largefile lstat 
manywarnings mktime pselect pthread_sigmask readlink socklen stat-time stdalign 
stdarg stdbool stdio strftime strtoimax strtoumax symlink sys_stat sys_time 
time timespec-add timespec-sub utimens warnings
 
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
@@ -65,7 +65,8 @@
 am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \
        $(top_srcdir)/m4/alloca.m4 $(top_srcdir)/m4/c-strtod.m4 \
        $(top_srcdir)/m4/clock_time.m4 $(top_srcdir)/m4/dup2.m4 \
-       $(top_srcdir)/m4/environ.m4 $(top_srcdir)/m4/extensions.m4 \
+       $(top_srcdir)/m4/environ.m4 $(top_srcdir)/m4/execinfo.m4 \
+       $(top_srcdir)/m4/extensions.m4 \
        $(top_srcdir)/m4/extern-inline.m4 $(top_srcdir)/m4/filemode.m4 \
        $(top_srcdir)/m4/getloadavg.m4 $(top_srcdir)/m4/getopt.m4 \
        $(top_srcdir)/m4/gettime.m4 $(top_srcdir)/m4/gettimeofday.m4 \
@@ -180,6 +181,7 @@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
+EXECINFO_H = @EXECINFO_H@
 EXEEXT = @EXEEXT@
 FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@
 FONTCONFIG_LIBS = @FONTCONFIG_LIBS@
@@ -556,6 +558,7 @@
 LIBXT_OTHER = @LIBXT_OTHER@
 LIBX_OTHER = @LIBX_OTHER@
 LIB_CLOCK_GETTIME = @LIB_CLOCK_GETTIME@
+LIB_EXECINFO = @LIB_EXECINFO@
 LIB_GCC = @LIB_GCC@
 LIB_MATH = @LIB_MATH@
 LIB_PTHREAD = @LIB_PTHREAD@
@@ -845,16 +848,17 @@
 # statements but through direct file reference. Therefore this snippet must be
 # present in all Makefile.am that need it. This is ensured by the applicability
 # 'all' defined above.
-BUILT_SOURCES = $(ALLOCA_H) $(GETOPT_H) inttypes.h signal.h \
-       arg-nonnull.h c++defs.h warn-on-use.h $(STDALIGN_H) \
+BUILT_SOURCES = $(ALLOCA_H) $(EXECINFO_H) $(GETOPT_H) inttypes.h \
+       signal.h arg-nonnull.h c++defs.h warn-on-use.h $(STDALIGN_H) \
        $(STDARG_H) $(STDBOOL_H) $(STDDEF_H) $(STDINT_H) stdio.h \
        stdlib.h sys/select.h sys/stat.h sys/time.h time.h unistd.h
 EXTRA_DIST = alloca.in.h allocator.h careadlinkat.h md5.h sha1.h \
        sha256.h sha512.h dosname.h ftoastr.c ftoastr.h dup2.c \
-       filemode.h getloadavg.c getopt.c getopt.in.h getopt1.c \
-       getopt_int.h gettimeofday.c ignore-value.h intprops.h \
-       inttypes.in.h lstat.c mktime-internal.h mktime.c pathmax.h \
-       pselect.c pthread_sigmask.c readlink.c signal.in.h \
+       execinfo.c execinfo.in.h filemode.h getloadavg.c getopt.c \
+       getopt.in.h getopt1.c getopt_int.h gettimeofday.c \
+       ignore-value.h intprops.h inttypes.in.h lstat.c \
+       mktime-internal.h mktime.c pathmax.h pselect.c \
+       pthread_sigmask.c readlink.c signal.in.h \
        $(top_srcdir)/build-aux/snippet/_Noreturn.h \
        $(top_srcdir)/build-aux/snippet/arg-nonnull.h \
        $(top_srcdir)/build-aux/snippet/c++defs.h \
@@ -866,14 +870,15 @@
        sys_time.in.h time.in.h time_r.c timespec.h u64.h unistd.in.h \
        utimens.h verify.h
 MOSTLYCLEANDIRS = sys sys
-MOSTLYCLEANFILES = core *.stackdump alloca.h alloca.h-t getopt.h \
-       getopt.h-t inttypes.h inttypes.h-t signal.h signal.h-t \
-       arg-nonnull.h arg-nonnull.h-t c++defs.h c++defs.h-t \
-       warn-on-use.h warn-on-use.h-t stdalign.h stdalign.h-t stdarg.h \
-       stdarg.h-t stdbool.h stdbool.h-t stddef.h stddef.h-t stdint.h \
-       stdint.h-t stdio.h stdio.h-t stdlib.h stdlib.h-t sys/select.h \
-       sys/select.h-t sys/stat.h sys/stat.h-t sys/time.h sys/time.h-t \
-       time.h time.h-t unistd.h unistd.h-t
+MOSTLYCLEANFILES = core *.stackdump alloca.h alloca.h-t execinfo.h \
+       execinfo.h-t getopt.h getopt.h-t inttypes.h inttypes.h-t \
+       signal.h signal.h-t arg-nonnull.h arg-nonnull.h-t c++defs.h \
+       c++defs.h-t warn-on-use.h warn-on-use.h-t stdalign.h \
+       stdalign.h-t stdarg.h stdarg.h-t stdbool.h stdbool.h-t \
+       stddef.h stddef.h-t stdint.h stdint.h-t stdio.h stdio.h-t \
+       stdlib.h stdlib.h-t sys/select.h sys/select.h-t sys/stat.h \
+       sys/stat.h-t sys/time.h sys/time.h-t time.h time.h-t unistd.h \
+       unistd.h-t
 noinst_LIBRARIES = libgnu.a
 AM_CFLAGS = $(GNULIB_WARN_CFLAGS) $(WERROR_CFLAGS)
 DEFAULT_INCLUDES = -I. -I$(top_srcdir)/lib -I../src -I$(top_srcdir)/src
@@ -884,8 +889,8 @@
        timespec-add.c timespec-sub.c u64.c utimens.c
 libgnu_a_LIBADD = $(gl_LIBOBJS)
 libgnu_a_DEPENDENCIES = $(gl_LIBOBJS)
-EXTRA_libgnu_a_SOURCES = ftoastr.c dup2.c getloadavg.c getopt.c \
-       getopt1.c gettimeofday.c lstat.c mktime.c pselect.c \
+EXTRA_libgnu_a_SOURCES = ftoastr.c dup2.c execinfo.c getloadavg.c \
+       getopt.c getopt1.c gettimeofday.c lstat.c mktime.c pselect.c \
        pthread_sigmask.c readlink.c stat.c strtoimax.c strtol.c \
        strtoll.c strtol.c strtoul.c strtoull.c strtoimax.c \
        strtoumax.c symlink.c time_r.c
@@ -954,6 +959,7 @@
 @AMDEP_TRUE@@am__include@ @address@hidden/$(DEPDIR)/address@hidden@
 @AMDEP_TRUE@@am__include@ @address@hidden/$(DEPDIR)/address@hidden@
 @AMDEP_TRUE@@am__include@ @address@hidden/$(DEPDIR)/address@hidden@
address@hidden@@am__include@ @address@hidden/$(DEPDIR)/address@hidden@
 @AMDEP_TRUE@@am__include@ @address@hidden/$(DEPDIR)/address@hidden@
 @AMDEP_TRUE@@am__include@ @address@hidden/$(DEPDIR)/address@hidden@
 @AMDEP_TRUE@@am__include@ @address@hidden/$(DEPDIR)/address@hidden@
@@ -1213,6 +1219,17 @@
 @address@hidden: $(top_builddir)/config.status
 @GL_GENERATE_ALLOCA_H_FALSE@   rm -f $@
 
+# We need the following in order to create <execinfo.h> when the system
+# doesn't have one that works.
address@hidden@execinfo.h: execinfo.in.h $(top_builddir)/config.status
address@hidden@ $(AM_V_GEN)rm -f address@hidden $@ && \
address@hidden@ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
address@hidden@   cat $(srcdir)/execinfo.in.h; \
address@hidden@ } > address@hidden && \
address@hidden@ mv address@hidden $@
address@hidden@execinfo.h: $(top_builddir)/config.status
address@hidden@ rm -f $@
+
 # We need the following in order to create <getopt.h> when the system
 # doesn't have one that works with the given compiler.
 getopt.h: getopt.in.h $(top_builddir)/config.status $(ARG_NONNULL_H)

=== modified file 'autogen/aclocal.m4'
--- a/autogen/aclocal.m4        2012-08-02 10:17:32 +0000
+++ b/autogen/aclocal.m4        2012-08-25 10:17:28 +0000
@@ -990,6 +990,7 @@
 m4_include([m4/clock_time.m4])
 m4_include([m4/dup2.m4])
 m4_include([m4/environ.m4])
+m4_include([m4/execinfo.m4])
 m4_include([m4/extensions.m4])
 m4_include([m4/extern-inline.m4])
 m4_include([m4/filemode.m4])

=== modified file 'autogen/config.in'
--- a/autogen/config.in 2012-08-22 10:17:28 +0000
+++ b/autogen/config.in 2012-08-25 10:17:28 +0000
@@ -358,6 +358,9 @@
 /* Define to 1 if you have the `euidaccess' function. */
 #undef HAVE_EUIDACCESS
 
+/* Define to 1 if you have the <execinfo.h> header file. */
+#undef HAVE_EXECINFO_H
+
 /* Define to 1 if you have the <fcntl.h> header file. */
 #undef HAVE_FCNTL_H
 

=== modified file 'autogen/configure'
--- a/autogen/configure 2012-08-21 10:17:31 +0000
+++ b/autogen/configure 2012-08-25 10:17:28 +0000
@@ -971,6 +971,10 @@
 GNULIB_CALLOC_POSIX
 GNULIB_ATOLL
 GNULIB__EXIT
+GL_GENERATE_EXECINFO_H_FALSE
+GL_GENERATE_EXECINFO_H_TRUE
+LIB_EXECINFO
+EXECINFO_H
 UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS
 UNISTD_H_HAVE_WINSOCK2_H
 REPLACE_WRITE
@@ -3194,6 +3198,7 @@
 as_fn_append ac_header_list " sys/un.h"
 as_fn_append ac_func_list " tzset"
 as_fn_append ac_func_list " readlinkat"
+as_fn_append ac_header_list " execinfo.h"
 gl_getopt_required=GNU
 as_fn_append ac_header_list " getopt.h"
 as_fn_append ac_func_list " gettimeofday"
@@ -6956,6 +6961,7 @@
   # Code from module dtotimespec:
   # Code from module dup2:
   # Code from module environ:
+  # Code from module execinfo:
   # Code from module extensions:
 
   # Code from module extern-inline:
@@ -16464,6 +16470,8 @@
 
 
 
+
+
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for st_dm_mode in struct 
stat" >&5
 $as_echo_n "checking for st_dm_mode in struct stat... " >&6; }
 if test "${ac_cv_struct_st_dm_mode+set}" = set; then :
@@ -20100,6 +20108,99 @@
 
 
 
+  LIB_EXECINFO=''
+  EXECINFO_H='execinfo.h'
+
+  if test $ac_cv_header_execinfo_h = yes; then
+    gl_saved_libs=$LIBS
+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing 
backtrace_symbols_fd" >&5
+$as_echo_n "checking for library containing backtrace_symbols_fd... " >&6; }
+if test "${ac_cv_search_backtrace_symbols_fd+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_func_search_save_LIBS=$LIBS
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char backtrace_symbols_fd ();
+int
+main ()
+{
+return backtrace_symbols_fd ();
+  ;
+  return 0;
+}
+_ACEOF
+for ac_lib in '' execinfo; do
+  if test -z "$ac_lib"; then
+    ac_res="none required"
+  else
+    ac_res=-l$ac_lib
+    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
+  fi
+  if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_search_backtrace_symbols_fd=$ac_res
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext
+  if test "${ac_cv_search_backtrace_symbols_fd+set}" = set; then :
+  break
+fi
+done
+if test "${ac_cv_search_backtrace_symbols_fd+set}" = set; then :
+
+else
+  ac_cv_search_backtrace_symbols_fd=no
+fi
+rm conftest.$ac_ext
+LIBS=$ac_func_search_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: 
$ac_cv_search_backtrace_symbols_fd" >&5
+$as_echo "$ac_cv_search_backtrace_symbols_fd" >&6; }
+ac_res=$ac_cv_search_backtrace_symbols_fd
+if test "$ac_res" != no; then :
+  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+  test "$ac_cv_search_backtrace_symbols_fd" = "none required" ||
+         LIB_EXECINFO=$ac_cv_search_backtrace_symbols_fd
+fi
+
+    LIBS=$gl_saved_libs
+    test "$ac_cv_search_backtrace_symbols_fd" = no || EXECINFO_H=''
+  fi
+
+  if test -n "$EXECINFO_H"; then
+
+
+
+
+
+
+
+
+  gl_LIBOBJS="$gl_LIBOBJS execinfo.$ac_objext"
+
+  fi
+
+
+
+   if test -n "$EXECINFO_H"; then
+  GL_GENERATE_EXECINFO_H_TRUE=
+  GL_GENERATE_EXECINFO_H_FALSE='#'
+else
+  GL_GENERATE_EXECINFO_H_TRUE='#'
+  GL_GENERATE_EXECINFO_H_FALSE=
+fi
+
+
+
+
+
 
 
 
@@ -24190,6 +24291,10 @@
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 
+if test -z "${GL_GENERATE_EXECINFO_H_TRUE}" && test -z 
"${GL_GENERATE_EXECINFO_H_FALSE}"; then
+  as_fn_error "conditional \"GL_GENERATE_EXECINFO_H\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
 if test -z "${GL_GENERATE_STDINT_H_TRUE}" && test -z 
"${GL_GENERATE_STDINT_H_FALSE}"; then
   as_fn_error "conditional \"GL_GENERATE_STDINT_H\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5


reply via email to

[Prev in Thread] Current Thread [Next in Thread]