emacs-diffs
[Top][All Lists]
Advanced

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

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


From: Glenn Morris
Subject: [Emacs-diffs] /srv/bzr/emacs/trunk r112042: Auto-commit of generated files.
Date: Thu, 14 Mar 2013 06:17:38 -0400
User-agent: Bazaar (2.5.0)

------------------------------------------------------------
revno: 112042
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Thu 2013-03-14 06:17:38 -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       2013-02-25 11:17:36 +0000
+++ b/autogen/Makefile.in       2013-03-14 10:17:38 +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=dup 
--avoid=errno --avoid=fchdir --avoid=fcntl --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-h fdopendir filemode fstatat 
getloadavg getopt-gnu gettime gettimeofday ignore-value intprops largefile 
lstat manywarnings memrchr mktime pselect pthread_sigmask putenv 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
+# 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=dup 
--avoid=errno --avoid=fchdir --avoid=fcntl --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-h fdatasync fdopendir 
filemode fstatat fsync getloadavg getopt-gnu gettime gettimeofday ignore-value 
intprops largefile lstat manywarnings memrchr mktime pselect pthread_sigmask 
putenv 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
 
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
@@ -71,8 +71,9 @@
        $(top_srcdir)/m4/extensions.m4 \
        $(top_srcdir)/m4/extern-inline.m4 \
        $(top_srcdir)/m4/faccessat.m4 $(top_srcdir)/m4/fcntl_h.m4 \
-       $(top_srcdir)/m4/fdopendir.m4 $(top_srcdir)/m4/filemode.m4 \
-       $(top_srcdir)/m4/fpending.m4 $(top_srcdir)/m4/fstatat.m4 \
+       $(top_srcdir)/m4/fdatasync.m4 $(top_srcdir)/m4/fdopendir.m4 \
+       $(top_srcdir)/m4/filemode.m4 $(top_srcdir)/m4/fpending.m4 \
+       $(top_srcdir)/m4/fstatat.m4 $(top_srcdir)/m4/fsync.m4 \
        $(top_srcdir)/m4/getgroups.m4 $(top_srcdir)/m4/getloadavg.m4 \
        $(top_srcdir)/m4/getopt.m4 $(top_srcdir)/m4/gettime.m4 \
        $(top_srcdir)/m4/gettimeofday.m4 \
@@ -657,6 +658,7 @@
 LIB_CLOCK_GETTIME = @LIB_CLOCK_GETTIME@
 LIB_EACCESS = @LIB_EACCESS@
 LIB_EXECINFO = @LIB_EXECINFO@
+LIB_FDATASYNC = @LIB_FDATASYNC@
 LIB_MATH = @LIB_MATH@
 LIB_PTHREAD = @LIB_PTHREAD@
 LIB_PTHREAD_SIGMASK = @LIB_PTHREAD_SIGMASK@
@@ -988,13 +990,13 @@
        careadlinkat.h close-stream.h md5.h sha1.h sha256.h sha512.h \
        dirent.in.h dosname.h ftoastr.c ftoastr.h dup2.c euidaccess.c \
        execinfo.c execinfo.in.h at-func.c faccessat.c fcntl.in.h \
-       fdopendir.c filemode.h fpending.c fpending.h at-func.c \
-       fstatat.c getgroups.c getloadavg.c getopt.c getopt.in.h \
-       getopt1.c getopt_int.h gettimeofday.c group-member.c \
-       ignore-value.h intprops.h inttypes.in.h lstat.c memrchr.c \
-       mktime-internal.h mktime.c openat.h pathmax.h pselect.c \
-       pthread_sigmask.c putenv.c readlink.c at-func.c readlinkat.c \
-       root-uid.h sig2str.c sig2str.h signal.in.h \
+       fdatasync.c fdopendir.c filemode.h fpending.c fpending.h \
+       at-func.c fstatat.c fsync.c getgroups.c getloadavg.c getopt.c \
+       getopt.in.h getopt1.c getopt_int.h gettimeofday.c \
+       group-member.c ignore-value.h intprops.h inttypes.in.h lstat.c \
+       memrchr.c mktime-internal.h mktime.c openat.h pathmax.h \
+       pselect.c pthread_sigmask.c putenv.c readlink.c at-func.c \
+       readlinkat.c root-uid.h sig2str.c sig2str.h 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 \
@@ -1028,13 +1030,13 @@
 libgnu_a_LIBADD = $(gl_LIBOBJS)
 libgnu_a_DEPENDENCIES = $(gl_LIBOBJS)
 EXTRA_libgnu_a_SOURCES = openat-proc.c ftoastr.c dup2.c euidaccess.c \
-       execinfo.c at-func.c faccessat.c fdopendir.c fpending.c \
-       at-func.c fstatat.c getgroups.c getloadavg.c getopt.c \
-       getopt1.c gettimeofday.c group-member.c lstat.c memrchr.c \
-       mktime.c pselect.c pthread_sigmask.c putenv.c readlink.c \
-       at-func.c readlinkat.c sig2str.c stat.c strtoimax.c strtol.c \
-       strtoll.c strtol.c strtoul.c strtoull.c strtoimax.c \
-       strtoumax.c symlink.c time_r.c unsetenv.c
+       execinfo.c at-func.c faccessat.c fdatasync.c fdopendir.c \
+       fpending.c at-func.c fstatat.c fsync.c getgroups.c \
+       getloadavg.c getopt.c getopt1.c gettimeofday.c group-member.c \
+       lstat.c memrchr.c mktime.c pselect.c pthread_sigmask.c \
+       putenv.c readlink.c at-func.c readlinkat.c sig2str.c stat.c \
+       strtoimax.c strtol.c strtoll.c strtol.c strtoul.c strtoull.c \
+       strtoimax.c strtoumax.c symlink.c time_r.c unsetenv.c
 
 # Because this Makefile snippet defines a variable used by other
 # gnulib Makefile snippets, it must be present in all Makefile.am that
@@ -1105,10 +1107,12 @@
 @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@
 @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        2013-02-12 11:17:35 +0000
+++ b/autogen/aclocal.m4        2013-03-14 10:17:38 +0000
@@ -998,10 +998,12 @@
 m4_include([m4/extern-inline.m4])
 m4_include([m4/faccessat.m4])
 m4_include([m4/fcntl_h.m4])
+m4_include([m4/fdatasync.m4])
 m4_include([m4/fdopendir.m4])
 m4_include([m4/filemode.m4])
 m4_include([m4/fpending.m4])
 m4_include([m4/fstatat.m4])
+m4_include([m4/fsync.m4])
 m4_include([m4/getgroups.m4])
 m4_include([m4/getloadavg.m4])
 m4_include([m4/getopt.m4])

=== modified file 'autogen/config.in'
--- a/autogen/config.in 2013-03-13 10:17:36 +0000
+++ b/autogen/config.in 2013-03-14 10:17:38 +0000
@@ -56,12 +56,6 @@
 /* Define on FreeBSD to work around an issue when reading from a PTY. */
 #undef BROKEN_PTY_READ_AFTER_EAGAIN
 
-/* Define if the system is compatible with BSD 4.2. */
-#undef BSD_SYSTEM
-
-/* Define if AH_BOTTOM should change BSD_SYSTEM. */
-#undef BSD_SYSTEM_AHB
-
 /* Define if Emacs cannot be dumped on your system. */
 #undef CANNOT_DUMP
 
@@ -282,6 +276,10 @@
    */
 #undef HAVE_DECL_ALARM
 
+/* Define to 1 if you have the declaration of `fdatasync', and to 0 if you
+   don't. */
+#undef HAVE_DECL_FDATASYNC
+
 /* Define to 1 if you have the declaration of `fdopendir', and to 0 if you
    don't. */
 #undef HAVE_DECL_FDOPENDIR
@@ -378,6 +376,9 @@
 /* Define to 1 if you have the `faccessat' function. */
 #undef HAVE_FACCESSAT
 
+/* Define to 1 if you have the `fdatasync' function. */
+#undef HAVE_FDATASYNC
+
 /* Define to 1 if you have the `fdopendir' function. */
 #undef HAVE_FDOPENDIR
 

=== modified file 'autogen/configure'
--- a/autogen/configure 2013-03-13 10:17:36 +0000
+++ b/autogen/configure 2013-03-14 10:17:38 +0000
@@ -1060,6 +1060,7 @@
 GNULIB_FSTATAT
 GNULIB_FSTAT
 GNULIB_FCHMODAT
+LIB_FDATASYNC
 NEXT_AS_FIRST_DIRECTIVE_FCNTL_H
 NEXT_FCNTL_H
 REPLACE_OPENAT
@@ -3340,6 +3341,7 @@
 as_fn_append ac_header_list " stdio_ext.h"
 as_fn_append ac_func_list " __fpending"
 as_fn_append ac_func_list " fstatat"
+as_fn_append ac_func_list " fsync"
 gl_getopt_required=GNU
 as_fn_append ac_header_list " getopt.h"
 as_fn_append ac_func_list " gettimeofday"
@@ -7181,10 +7183,12 @@
   # Code from module extern-inline:
   # Code from module faccessat:
   # Code from module fcntl-h:
+  # Code from module fdatasync:
   # Code from module fdopendir:
   # Code from module filemode:
   # Code from module fpending:
   # Code from module fstatat:
+  # Code from module fsync:
   # Code from module getgroups:
   # Code from module getloadavg:
   # Code from module getopt-gnu:
@@ -13802,7 +13806,7 @@
 utimes getrlimit setrlimit shutdown getaddrinfo \
 strsignal setitimer \
 sendto recvfrom getsockname getpeername getifaddrs freeifaddrs \
-gai_strerror mkstemp getline getdelim fsync sync \
+gai_strerror mkstemp getline getdelim sync \
 difftime posix_memalign \
 getpwent endpwent getgrent endgrent \
 touchlock \
@@ -15904,7 +15908,6 @@
 
 
 
-
 case $opsys in
   aix4-2)
     $as_echo "#define USG /**/" >>confdefs.h
@@ -15943,44 +15946,11 @@
     ;;
 
   darwin)
-        $as_echo "#define BSD_SYSTEM /**/" >>confdefs.h
-
 
 $as_echo "#define DARWIN_OS /**/" >>confdefs.h
 
     ;;
 
-  freebsd)
-
-$as_echo "#define BSD_SYSTEM_AHB 1" >>confdefs.h
-
-    ;;
-
-  gnu | netbsd | openbsd )
-    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-#ifndef BSD_SYSTEM
-# error "BSD_SYSTEM not defined"
-#endif
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
-
-else
-  $as_echo "#define BSD_SYSTEM 43" >>confdefs.h
-
-fi
-rm -f conftest.err conftest.$ac_ext
-    ;;
-
   gnu-linux | gnu-kfreebsd )
     $as_echo "#define USG /**/" >>confdefs.h
 
@@ -17212,6 +17182,17 @@
 
 fi
 
+ac_fn_c_check_decl "$LINENO" "fdatasync" "ac_cv_have_decl_fdatasync" 
"$ac_includes_default"
+if test "x$ac_cv_have_decl_fdatasync" = x""yes; then :
+  ac_have_decl=1
+else
+  ac_have_decl=0
+fi
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_DECL_FDATASYNC $ac_have_decl
+_ACEOF
+
 
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for st_dm_mode in struct 
stat" >&5
@@ -17365,6 +17346,8 @@
 
 
 
+
+
   GNULIB__EXIT=0;
   GNULIB_ATOLL=0;
   GNULIB_CALLOC_POSIX=0;
@@ -21302,6 +21285,114 @@
 
 
 
+  LIB_FDATASYNC=
+
+
+  if test $ac_cv_have_decl_fdatasync = no; then
+    HAVE_DECL_FDATASYNC=0
+        for ac_func in fdatasync
+do :
+  ac_fn_c_check_func "$LINENO" "fdatasync" "ac_cv_func_fdatasync"
+if test "x$ac_cv_func_fdatasync" = x""yes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_FDATASYNC 1
+_ACEOF
+
+fi
+done
+
+    if test $ac_cv_func_fdatasync = no; then
+      HAVE_FDATASYNC=0
+    fi
+  else
+            gl_saved_libs=$LIBS
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing 
fdatasync" >&5
+$as_echo_n "checking for library containing fdatasync... " >&6; }
+if test "${ac_cv_search_fdatasync+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 fdatasync ();
+int
+main ()
+{
+return fdatasync ();
+  ;
+  return 0;
+}
+_ACEOF
+for ac_lib in '' rt posix4; 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_fdatasync=$ac_res
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext
+  if test "${ac_cv_search_fdatasync+set}" = set; then :
+  break
+fi
+done
+if test "${ac_cv_search_fdatasync+set}" = set; then :
+
+else
+  ac_cv_search_fdatasync=no
+fi
+rm conftest.$ac_ext
+LIBS=$ac_func_search_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_fdatasync" >&5
+$as_echo "$ac_cv_search_fdatasync" >&6; }
+ac_res=$ac_cv_search_fdatasync
+if test "$ac_res" != no; then :
+  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+  test "$ac_cv_search_fdatasync" = "none required" ||
+                    LIB_FDATASYNC=$ac_cv_search_fdatasync
+fi
+
+    LIBS=$gl_saved_libs
+  fi
+
+  if test $HAVE_FDATASYNC = 0; then
+
+
+
+
+
+
+
+
+  gl_LIBOBJS="$gl_LIBOBJS fdatasync.$ac_objext"
+
+  fi
+
+
+
+
+
+          GNULIB_FDATASYNC=1
+
+
+
+
+
+
+
+
+
 
     ac_fn_c_check_decl "$LINENO" "fdopendir" "ac_cv_have_decl_fdopendir" "
 #include <dirent.h>
@@ -21622,6 +21713,37 @@
 
 
 
+
+  if test $ac_cv_func_fsync = no; then
+    HAVE_FSYNC=0
+  fi
+
+  if test $HAVE_FSYNC = 0; then
+
+
+
+
+
+
+
+
+  gl_LIBOBJS="$gl_LIBOBJS fsync.$ac_objext"
+
+    :
+  fi
+
+
+
+
+
+          GNULIB_FSYNC=1
+
+
+
+
+
+
+
 # Persuade glibc <stdlib.h> to declare getloadavg().
 
 
@@ -26525,15 +26647,8 @@
    LD_SWITCH_SYSTEM_TEMACS="-fno-pie -prebind $libs_nsgui -Xlinker -headerpad 
-Xlinker $headerpad_extra"
 
    ## This is here because src/Makefile.in did some extra fiddling around
-   ## with LD_SWITCH_SYSTEM.  The cpp logic was:
-   ##   #ifndef LD_SWITCH_SYSTEM
-   ##   #if !defined (__GNUC__) && ((defined (BSD_SYSTEM) && !defined (COFF)))
-   ## Since all the *bsds define LD_SWITCH_SYSTEM, this simplifies to:
-   ## not using gcc, darwin.
-   ## Because this was done in src/Makefile.in, the resulting part of
-   ## LD_SWITCH_SYSTEM was not used in configure (ie, in ac_link).
-   ## It therefore seems cleaner to put this in LD_SWITCH_SYSTEM_TEMACS,
-   ## rather than LD_SWITCH_SYSTEM.
+   ## with LD_SWITCH_SYSTEM.  It seems cleaner to put this in
+   ## LD_SWITCH_SYSTEM_TEMACS instead,
    test "x$LD_SWITCH_SYSTEM" = "x" && test "x$GCC" != "xyes" && \
      LD_SWITCH_SYSTEM_TEMACS="-X $LD_SWITCH_SYSTEM_TEMACS"
    ;;


reply via email to

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