aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2013-07-09 06:17:37 -0400
committerGlenn Morris2013-07-09 06:17:37 -0400
commitd236c30240ace745267139304fee11d1ea79fa7b (patch)
tree46d5db580884132f2f0d21108a6f27e124559caa
parent3c51b96b4a916a54372bbba94b35e8924e356825 (diff)
downloademacs-d236c30240ace745267139304fee11d1ea79fa7b.tar.gz
emacs-d236c30240ace745267139304fee11d1ea79fa7b.zip
Auto-commit of generated files.
-rw-r--r--autogen/Makefile.in14
-rwxr-xr-xautogen/configure3
2 files changed, 8 insertions, 9 deletions
diff --git a/autogen/Makefile.in b/autogen/Makefile.in
index 34eda262d88..52228a594d9 100644
--- a/autogen/Makefile.in
+++ b/autogen/Makefile.in
@@ -59,7 +59,7 @@
59# the same distribution terms as the rest of that program. 59# the same distribution terms as the rest of that program.
60# 60#
61# Generated by gnulib-tool. 61# Generated by gnulib-tool.
62# 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=binary-io --avoid=close --avoid=dup --avoid=fchdir --avoid=fstat --avoid=malloc-posix --avoid=msvc-inval --avoid=msvc-nothrow --avoid=open --avoid=openat-die --avoid=opendir --avoid=raise --avoid=save-cwd --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 close-stream crypto/md5 crypto/sha1 crypto/sha256 crypto/sha512 dtoastr dtotimespec dup2 environ execinfo faccessat fcntl fcntl-h fdatasync fdopendir filemode fstatat fsync getloadavg getopt-gnu gettime gettimeofday ignore-value intprops largefile lstat manywarnings memrchr mktime pipe2 pselect pthread_sigmask putenv qacl readlink readlinkat sig2str socklen stat-time stdalign stdarg stdbool stdio strftime strtoimax strtoumax symlink sys_stat sys_time time timer-time timespec-add timespec-sub unsetenv utimens warnings 62# 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=binary-io --avoid=close --avoid=dup --avoid=fchdir --avoid=fstat --avoid=malloc-posix --avoid=msvc-inval --avoid=msvc-nothrow --avoid=open --avoid=openat-die --avoid=opendir --avoid=raise --avoid=save-cwd --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 close-stream crypto/md5 crypto/sha1 crypto/sha256 crypto/sha512 dtoastr dtotimespec dup2 environ execinfo faccessat fcntl fcntl-h fdatasync fdopendir filemode fstatat fsync getloadavg getopt-gnu gettime gettimeofday intprops largefile lstat manywarnings memrchr mktime pipe2 pselect pthread_sigmask putenv qacl readlink readlinkat sig2str socklen stat-time stdalign stdarg stdbool stdio strftime strtoimax strtoumax symlink sys_stat sys_time time timer-time timespec-add timespec-sub unsetenv utimens warnings
63 63
64VPATH = @srcdir@ 64VPATH = @srcdir@
65pkgdatadir = $(datadir)/@PACKAGE@ 65pkgdatadir = $(datadir)/@PACKAGE@
@@ -200,12 +200,12 @@ DIST_COMMON = $(srcdir)/../nt/gnulib.mk $(srcdir)/Makefile.am \
200@BUILDING_FOR_WINDOWSNT_FALSE@ getloadavg.c getopt.c \ 200@BUILDING_FOR_WINDOWSNT_FALSE@ getloadavg.c getopt.c \
201@BUILDING_FOR_WINDOWSNT_FALSE@ getopt.in.h getopt1.c \ 201@BUILDING_FOR_WINDOWSNT_FALSE@ getopt.in.h getopt1.c \
202@BUILDING_FOR_WINDOWSNT_FALSE@ getopt_int.h gettimeofday.c \ 202@BUILDING_FOR_WINDOWSNT_FALSE@ getopt_int.h gettimeofday.c \
203@BUILDING_FOR_WINDOWSNT_FALSE@ group-member.c ignore-value.h \ 203@BUILDING_FOR_WINDOWSNT_FALSE@ group-member.c intprops.h \
204@BUILDING_FOR_WINDOWSNT_FALSE@ intprops.h inttypes.in.h lstat.c \ 204@BUILDING_FOR_WINDOWSNT_FALSE@ inttypes.in.h lstat.c memrchr.c \
205@BUILDING_FOR_WINDOWSNT_FALSE@ memrchr.c mktime-internal.h \ 205@BUILDING_FOR_WINDOWSNT_FALSE@ mktime-internal.h mktime.c \
206@BUILDING_FOR_WINDOWSNT_FALSE@ mktime.c openat.h pathmax.h \ 206@BUILDING_FOR_WINDOWSNT_FALSE@ openat.h pathmax.h pselect.c \
207@BUILDING_FOR_WINDOWSNT_FALSE@ pselect.c pthread_sigmask.c \ 207@BUILDING_FOR_WINDOWSNT_FALSE@ pthread_sigmask.c putenv.c \
208@BUILDING_FOR_WINDOWSNT_FALSE@ putenv.c acl-internal.h acl.h \ 208@BUILDING_FOR_WINDOWSNT_FALSE@ acl-internal.h acl.h \
209@BUILDING_FOR_WINDOWSNT_FALSE@ acl_entries.c readlink.c \ 209@BUILDING_FOR_WINDOWSNT_FALSE@ acl_entries.c readlink.c \
210@BUILDING_FOR_WINDOWSNT_FALSE@ at-func.c readlinkat.c \ 210@BUILDING_FOR_WINDOWSNT_FALSE@ at-func.c readlinkat.c \
211@BUILDING_FOR_WINDOWSNT_FALSE@ root-uid.h sig2str.c sig2str.h \ 211@BUILDING_FOR_WINDOWSNT_FALSE@ root-uid.h sig2str.c sig2str.h \
diff --git a/autogen/configure b/autogen/configure
index 2f739343d46..ce15955a483 100755
--- a/autogen/configure
+++ b/autogen/configure
@@ -7267,7 +7267,6 @@ esac
7267 # Code from module gettime: 7267 # Code from module gettime:
7268 # Code from module gettimeofday: 7268 # Code from module gettimeofday:
7269 # Code from module group-member: 7269 # Code from module group-member:
7270 # Code from module ignore-value:
7271 # Code from module include_next: 7270 # Code from module include_next:
7272 # Code from module intprops: 7271 # Code from module intprops:
7273 # Code from module inttypes-incomplete: 7272 # Code from module inttypes-incomplete:
@@ -11183,7 +11182,7 @@ $as_echo "#define HAVE_RSVG 1" >>confdefs.h
11183fi 11182fi
11184 11183
11185HAVE_IMAGEMAGICK=no 11184HAVE_IMAGEMAGICK=no
11186if test "${HAVE_X11}" = "yes"; then 11185if test "${HAVE_X11}" = "yes" || test "${HAVE_NS}" = "yes"; then
11187 if test "${with_imagemagick}" != "no"; then 11186 if test "${with_imagemagick}" != "no"; then
11188 ## 6.2.8 is the earliest version known to work, but earlier versions 11187 ## 6.2.8 is the earliest version known to work, but earlier versions
11189 ## might work - let us know if you find one. 11188 ## might work - let us know if you find one.