emacs-diffs
[Top][All Lists]
Advanced

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

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


From: Glenn Morris
Subject: [Emacs-diffs] /srv/bzr/emacs/trunk r104353: Auto-commit of generated files.
Date: Tue, 24 May 2011 12:31:25 -0400
User-agent: Bazaar (2.3.1)

------------------------------------------------------------
revno: 104353
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Tue 2011-05-24 12:31:25 -0400
message:
  Auto-commit of generated files.
modified:
  autogen/Makefile.in
  autogen/aclocal.m4
  autogen/configure
=== modified file 'autogen/Makefile.in'
--- a/autogen/Makefile.in       2011-05-24 04:03:44 +0000
+++ b/autogen/Makefile.in       2011-05-24 16:31:25 +0000
@@ -24,7 +24,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=. 
--makefile-name=gnulib.mk --no-libtool --macro-prefix=gl --no-vc-files 
careadlinkat crypto/md5 dtoastr filemode getloadavg getopt-gnu ignore-value 
intprops lstat mktime readlink socklen stdarg stdio strftime 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=. 
--makefile-name=gnulib.mk --no-libtool --macro-prefix=gl --no-vc-files 
careadlinkat crypto/md5 crypto/sha1 dtoastr filemode getloadavg getopt-gnu 
ignore-value intprops lstat mktime readlink socklen stdarg stdio strftime 
strtoumax symlink sys_stat
 
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
@@ -59,17 +59,17 @@
        $(top_srcdir)/m4/longlong.m4 $(top_srcdir)/m4/lstat.m4 \
        $(top_srcdir)/m4/md5.m4 $(top_srcdir)/m4/mktime.m4 \
        $(top_srcdir)/m4/multiarch.m4 $(top_srcdir)/m4/readlink.m4 \
-       $(top_srcdir)/m4/socklen.m4 $(top_srcdir)/m4/ssize_t.m4 \
-       $(top_srcdir)/m4/st_dm_mode.m4 $(top_srcdir)/m4/stat.m4 \
-       $(top_srcdir)/m4/stdarg.m4 $(top_srcdir)/m4/stdbool.m4 \
-       $(top_srcdir)/m4/stddef_h.m4 $(top_srcdir)/m4/stdint.m4 \
-       $(top_srcdir)/m4/stdio_h.m4 $(top_srcdir)/m4/stdlib_h.m4 \
-       $(top_srcdir)/m4/strftime.m4 $(top_srcdir)/m4/strtoull.m4 \
-       $(top_srcdir)/m4/strtoumax.m4 $(top_srcdir)/m4/symlink.m4 \
-       $(top_srcdir)/m4/sys_stat_h.m4 $(top_srcdir)/m4/time_h.m4 \
-       $(top_srcdir)/m4/time_r.m4 $(top_srcdir)/m4/tm_gmtoff.m4 \
-       $(top_srcdir)/m4/unistd_h.m4 $(top_srcdir)/m4/wchar_t.m4 \
-       $(top_srcdir)/configure.in
+       $(top_srcdir)/m4/sha1.m4 $(top_srcdir)/m4/socklen.m4 \
+       $(top_srcdir)/m4/ssize_t.m4 $(top_srcdir)/m4/st_dm_mode.m4 \
+       $(top_srcdir)/m4/stat.m4 $(top_srcdir)/m4/stdarg.m4 \
+       $(top_srcdir)/m4/stdbool.m4 $(top_srcdir)/m4/stddef_h.m4 \
+       $(top_srcdir)/m4/stdint.m4 $(top_srcdir)/m4/stdio_h.m4 \
+       $(top_srcdir)/m4/stdlib_h.m4 $(top_srcdir)/m4/strftime.m4 \
+       $(top_srcdir)/m4/strtoull.m4 $(top_srcdir)/m4/strtoumax.m4 \
+       $(top_srcdir)/m4/symlink.m4 $(top_srcdir)/m4/sys_stat_h.m4 \
+       $(top_srcdir)/m4/time_h.m4 $(top_srcdir)/m4/time_r.m4 \
+       $(top_srcdir)/m4/tm_gmtoff.m4 $(top_srcdir)/m4/unistd_h.m4 \
+       $(top_srcdir)/m4/wchar_t.m4 $(top_srcdir)/configure.in
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
        $(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -733,15 +733,15 @@
        $(STDARG_H) $(STDBOOL_H) $(STDDEF_H) $(STDINT_H) stdio.h \
        stdlib.h sys/stat.h time.h unistd.h warn-on-use.h
 EXTRA_DIST = allocator.h $(top_srcdir)/./arg-nonnull.h \
-       $(top_srcdir)/./c++defs.h careadlinkat.h md5.c md5.h dosname.h \
-       ftoastr.c ftoastr.h filemode.c filemode.h getloadavg.c \
-       getopt.c getopt.in.h getopt1.c getopt_int.h ignore-value.h \
-       intprops.h inttypes.in.h lstat.c mktime-internal.h mktime.c \
-       readlink.c stat.c stdarg.in.h stdbool.in.h stddef.in.h \
-       stdint.in.h stdio.in.h stdlib.in.h strftime.c strftime.h \
-       strtol.c strtoul.c strtoull.c strtoimax.c strtoumax.c \
-       symlink.c sys_stat.in.h time.in.h time_r.c unistd.in.h \
-       verify.h $(top_srcdir)/./warn-on-use.h
+       $(top_srcdir)/./c++defs.h careadlinkat.h md5.c md5.h sha1.c \
+       sha1.h dosname.h ftoastr.c ftoastr.h filemode.c filemode.h \
+       getloadavg.c getopt.c getopt.in.h getopt1.c getopt_int.h \
+       ignore-value.h intprops.h inttypes.in.h lstat.c \
+       mktime-internal.h mktime.c readlink.c stat.c stdarg.in.h \
+       stdbool.in.h stddef.in.h stdint.in.h stdio.in.h stdlib.in.h \
+       strftime.c strftime.h strtol.c strtoul.c strtoull.c \
+       strtoimax.c strtoumax.c symlink.c sys_stat.in.h time.in.h \
+       time_r.c unistd.in.h verify.h $(top_srcdir)/./warn-on-use.h
 MOSTLYCLEANDIRS = sys
 MOSTLYCLEANFILES = core *.stackdump arg-nonnull.h arg-nonnull.h-t \
        c++defs.h c++defs.h-t getopt.h getopt.h-t inttypes.h \
@@ -755,9 +755,9 @@
        $(am__append_1)
 libgnu_a_LIBADD = $(gl_LIBOBJS)
 libgnu_a_DEPENDENCIES = $(gl_LIBOBJS)
-EXTRA_libgnu_a_SOURCES = md5.c ftoastr.c filemode.c getloadavg.c \
-       getopt.c getopt1.c lstat.c mktime.c readlink.c stat.c \
-       strftime.c strtol.c strtoul.c strtoull.c strtoimax.c \
+EXTRA_libgnu_a_SOURCES = md5.c sha1.c ftoastr.c filemode.c \
+       getloadavg.c getopt.c getopt1.c lstat.c mktime.c readlink.c \
+       stat.c strftime.c strtol.c strtoul.c strtoull.c strtoimax.c \
        strtoumax.c symlink.c time_r.c
 ARG_NONNULL_H = arg-nonnull.h
 CXXDEFS_H = c++defs.h
@@ -823,6 +823,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@

=== modified file 'autogen/aclocal.m4'
--- a/autogen/aclocal.m4        2011-05-18 05:58:40 +0000
+++ b/autogen/aclocal.m4        2011-05-24 16:31:25 +0000
@@ -1000,6 +1000,7 @@
 m4_include([m4/mktime.m4])
 m4_include([m4/multiarch.m4])
 m4_include([m4/readlink.m4])
+m4_include([m4/sha1.m4])
 m4_include([m4/socklen.m4])
 m4_include([m4/ssize_t.m4])
 m4_include([m4/st_dm_mode.m4])

=== modified file 'autogen/configure'
--- a/autogen/configure 2011-05-24 07:20:51 +0000
+++ b/autogen/configure 2011-05-24 16:31:25 +0000
@@ -4216,23 +4216,6 @@
   *  ) srcdir="`(cd ${srcdir}; pwd)`" ;;
 esac
 
-#### Check if the source directory already has a configured system in it.
-if test `pwd` != `(cd ${srcdir} && pwd)` \
-   && test -f "${srcdir}/src/config.h" ; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: The directory tree 
\`${srcdir}' is being used
-   as a build directory right now; it has been configured in its own
-   right.  To configure in another directory as well, you MUST
-   use GNU make.  If you do not have GNU make, then you must
-   now do \`make distclean' in ${srcdir},
-   and then run $0 again." >&5
-$as_echo "$as_me: WARNING: The directory tree \`${srcdir}' is being used
-   as a build directory right now; it has been configured in its own
-   right.  To configure in another directory as well, you MUST
-   use GNU make.  If you do not have GNU make, then you must
-   now do \`make distclean' in ${srcdir},
-   and then run $0 again." >&2;}
-fi
-
 #### Given the configuration name, set machfile and opsysfile to the
 #### names of the m/*.h and s/*.h files we should use.
 
@@ -6541,6 +6524,7 @@
   # Code from module c++defs:
   # Code from module careadlinkat:
   # Code from module crypto/md5:
+  # Code from module crypto/sha1:
   # Code from module dosname:
   # Code from module dtoastr:
   # Code from module extensions:
@@ -16699,6 +16683,22 @@
 
 
 
+  gl_LIBOBJS="$gl_LIBOBJS sha1.$ac_objext"
+
+
+
+
+  :
+
+
+
+
+
+
+
+
+
+
 
 
   gl_LIBOBJS="$gl_LIBOBJS filemode.$ac_objext"


reply via email to

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