[Emacs-diffs] /srv/bzr/emacs/trunk r109294: Auto-commit of generated files.

[Glenn Morris]

------------------------------------------------------------
revno: 109294
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Mon 2012-07-30 06:17:41 -0400
message:
  Auto-commit of generated files.
modified:
  autogen/configure

=== modified file 'autogen/configure'
--- a/autogen/configure 2012-07-29 10:19:06 +0000
+++ b/autogen/configure 2012-07-30 10:17:41 +0000
@@ -15179,6 +15179,7 @@
 
 case $opsys in
   aix4-2)
+    opsysfile=
     $as_echo "#define USG /**/" >>confdefs.h
 
     $as_echo "#define USG5 /**/" >>confdefs.h
@@ -15226,6 +15227,7 @@
     ;;
 
   freebsd)
+    opsysfile=
     $as_echo "#define BSD4_2 /**/" >>confdefs.h
 
 
@@ -15261,6 +15263,7 @@
     ;;
 
   gnu-linux | gnu-kfreebsd )
+    opsysfile=
     $as_echo "#define USG /**/" >>confdefs.h
 
 
@@ -15289,6 +15292,7 @@
     ;;
 
   sol2*)
+    opsysfile="s/usg5-4-common.h"
     $as_echo "#define USG /**/" >>confdefs.h
 
     $as_echo "#define USG5 /**/" >>confdefs.h
@@ -15299,6 +15303,7 @@
     ;;
 
   unixware)
+    opsysfile="s/usg5-4-common.h"
     $as_echo "#define USG /**/" >>confdefs.h
 
     $as_echo "#define USG5 /**/" >>confdefs.h
@@ -15316,8 +15321,6 @@
 
   gnu) opsysfile= ;;
 
-  gnu-kfreebsd) opsysfile="s/gnu-linux.h" ;;
-
   hpux11)
 
 $as_echo "#define BROKEN_SA_RESTART 1" >>confdefs.h
@@ -23784,7 +23787,7 @@
 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}