From: Glenn Morris <rgm@gnu.org>
Date: Sat, 19 May 2012 10:17:29 +0000 (-0400)
Subject: Auto-commit of generated files.
X-Git-Tag: emacs-24.2.90~471^2~7
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=21a8caaa4af24f258e6c7f80c1fc913b00aee044;p=emacs.git

Auto-commit of generated files.
---

diff --git a/autogen/config.in b/autogen/config.in
index 10efc70e6d3..56d5d1976f0 100644
--- a/autogen/config.in
+++ b/autogen/config.in
@@ -254,9 +254,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 /* Define to 1 if you have the `fsync' function. */
 #undef HAVE_FSYNC
 
-/* Define to 1 if you have the `ftime' function. */
-#undef HAVE_FTIME
-
 /* Define to 1 if you have the `gai_strerror' function. */
 #undef HAVE_GAI_STRERROR
 
diff --git a/autogen/configure b/autogen/configure
index e397eb8f4b2..559fe4c526c 100755
--- a/autogen/configure
+++ b/autogen/configure
@@ -4457,7 +4457,6 @@ case "${canonical}" in
       m68k-*)      machine=m68k ;;
       powerpc-*)   machine=macppc ;;
       sparc*-)     machine=sparc ;;
-      vax-*)       machine=vax ;;
     esac
   ;;
 
@@ -4470,7 +4469,6 @@ case "${canonical}" in
       i386-*)    machine=intel386 ;;
       powerpc-*) machine=macppc ;;
       sparc*)    machine=sparc ;;
-      vax-*)     machine=vax ;;
     esac
   ;;
 
@@ -10133,6 +10131,7 @@ if test "${HAVE_NS}" = yes; then
      docdir="\${ns_appresdir}/etc"
      etcdir="\${ns_appresdir}/etc"
                infodir="\${ns_appresdir}/info"
+     mandir="\${ns_appresdir}/man"
      lispdir="\${ns_appresdir}/lisp"
      LEIM_INSTALLDIR="\${ns_appresdir}/leim"
      INSTALL_ARCH_INDEP_EXTRA=
@@ -14315,7 +14314,7 @@ esac
 
 for ac_func in gethostname getdomainname \
 rename closedir mkdir rmdir sysinfo getrusage get_current_dir_name \
-random lrand48 logb frexp fmod rint cbrt ftime setsid \
+random lrand48 logb frexp fmod rint cbrt setsid \
 strerror fpathconf select euidaccess getpagesize tzset setlocale \
 utimes getrlimit setrlimit setpgid getcwd getwd shutdown getaddrinfo \
 __fpending mblen mbrlen mbsinit strsignal setitimer ualarm \