From: Glenn Morris <rgm@gnu.org>
Date: Mon, 30 Jul 2012 10:17:41 +0000 (-0400)
Subject: Auto-commit of generated files.
X-Git-Tag: emacs-24.2.90~995
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=259a41782b8470ff72809b83c7b116bf219f14f3;p=emacs.git

Auto-commit of generated files.
---

diff --git a/autogen/configure b/autogen/configure
index 13ffa90b2df..b52d3157b10 100755
--- a/autogen/configure
+++ b/autogen/configure
@@ -15179,6 +15179,7 @@ esac
 
 case $opsys in
   aix4-2)
+    opsysfile=
     $as_echo "#define USG /**/" >>confdefs.h
 
     $as_echo "#define USG5 /**/" >>confdefs.h
@@ -15226,6 +15227,7 @@ $as_echo "#define DARWIN_OS /**/" >>confdefs.h
     ;;
 
   freebsd)
+    opsysfile=
     $as_echo "#define BSD4_2 /**/" >>confdefs.h
 
 
@@ -15261,6 +15263,7 @@ rm -f conftest.err conftest.$ac_ext
     ;;
 
   gnu-linux | gnu-kfreebsd )
+    opsysfile=
     $as_echo "#define USG /**/" >>confdefs.h
 
 
@@ -15289,6 +15292,7 @@ $as_echo "#define IRIX6_5 /**/" >>confdefs.h
     ;;
 
   sol2*)
+    opsysfile="s/usg5-4-common.h"
     $as_echo "#define USG /**/" >>confdefs.h
 
     $as_echo "#define USG5 /**/" >>confdefs.h
@@ -15299,6 +15303,7 @@ $as_echo "#define SOLARIS2 /**/" >>confdefs.h
     ;;
 
   unixware)
+    opsysfile="s/usg5-4-common.h"
     $as_echo "#define USG /**/" >>confdefs.h
 
     $as_echo "#define USG5 /**/" >>confdefs.h
@@ -15316,8 +15321,6 @@ $as_echo "#define G_SLICE_ALWAYS_MALLOC 1" >>confdefs.h
 
   gnu) opsysfile= ;;
 
-  gnu-kfreebsd) opsysfile="s/gnu-linux.h" ;;
-
   hpux11)
 
 $as_echo "#define BROKEN_SA_RESTART 1" >>confdefs.h
@@ -23784,7 +23787,7 @@ echo "
 Configured for \`${canonical}'.
 
   Where should the build process find the source code?    ${srcdir}
-  What operating system file should Emacs use?            ${opsysfile-none}
+  What operating system file should Emacs use?            ${opsysfile:-none}
   What compiler should emacs be built with?               ${CC} ${CFLAGS}
   Should Emacs use the GNU version of malloc?             ${GNU_MALLOC}${GNU_MALLOC_reason}
   Should Emacs use a relocating allocator for buffers?    ${REL_ALLOC}