[Emacs-diffs] /srv/bzr/emacs/emacs-24 r108579: Remove a couple of src/s files

[Glenn Morris]

------------------------------------------------------------
revno: 108579
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Tue 2012-06-12 13:53:25 -0400
message:
  Remove a couple of src/s files
  
  * configure.in (opsysfile): Set specially for gnu-kfreebsd, openbsd.
  
  * src/s/gnu-kfreebsd.h, src/s/openbsd.h: Remove files.
removed:
  src/s/gnu-kfreebsd.h
  src/s/openbsd.h
modified:
  ChangeLog
  configure.in
  src/ChangeLog

=== modified file 'ChangeLog'
--- a/ChangeLog 2012-06-12 17:43:09 +0000
+++ b/ChangeLog 2012-06-12 17:53:25 +0000
@@ -6,6 +6,8 @@
 
 2012-06-12  Glenn Morris  <address@hidden>
 
+       * configure.in (opsysfile): Set specially for gnu-kfreebsd, openbsd.
+
        * configure.in (NO_TERMIO, BROKEN_SIGIO): Move here from src/s.
 
        * configure.in: Anticipate platforms with no src/s file.

=== modified file 'configure.in'
--- a/configure.in      2012-06-12 17:43:09 +0000
+++ b/configure.in      2012-06-12 17:53:25 +0000
@@ -3125,6 +3125,11 @@
   ;;
 esac
 
+case $opsys in
+  gnu-kfreebsd) opsysfile="s/gnu-linux.h" ;;
+  openbsd) opsysfile="s/netbsd.h" ;;
+esac
+
 # Set up the CFLAGS for real compilation, so we can substitute it.
 CFLAGS="$REAL_CFLAGS"
 CPPFLAGS="$REAL_CPPFLAGS"

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2012-06-12 17:43:09 +0000
+++ b/src/ChangeLog     2012-06-12 17:53:25 +0000
@@ -1,5 +1,7 @@
 2012-06-12  Glenn Morris  <address@hidden>
 
+       * s/gnu-kfreebsd.h, s/openbsd.h: Remove files.
+
        * s/hpux10-20.h, s/openbsd.h, s/usg5-4-common.h:
        Move BROKEN_SIGIO to configure.
 

=== removed file 'src/s/gnu-kfreebsd.h'
--- a/src/s/gnu-kfreebsd.h      2012-06-12 17:43:09 +0000
+++ b/src/s/gnu-kfreebsd.h      1970-01-01 00:00:00 +0000
@@ -1,2 +0,0 @@
-#include "gnu-linux.h"
-

=== removed file 'src/s/openbsd.h'
--- a/src/s/openbsd.h   2012-06-12 17:43:09 +0000
+++ b/src/s/openbsd.h   1970-01-01 00:00:00 +0000
@@ -1,5 +0,0 @@
-/* System file for openbsd.  */
-
-/* Nearly the same as NetBSD.  Note there are differences in configure.  */
-#include "netbsd.h"
-