4 files changed, 6 insertions, 22 deletions

diff --git a/ChangeLog b/ChangeLog
index 17690d1d913..af41ed60968 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2012-07-11  Glenn Morris  <rgm@gnu.org>
 
+        * configure.ac (opsysfile): Use bsd-common on gnu systems.
+
         * configure.ac (GNU_LIBRARY_PENDING_OUTPUT_COUNT):
         Move here from src/s.
 
diff --git a/configure.ac b/configure.ac
index 23ddaa7e9f5..4c4c1ea9016 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3254,6 +3254,8 @@ case $opsys in
 esac
 
 case $opsys in
+   gnu) opsysfile="s/bsd-common.h" ;;
+
    gnu-kfreebsd) opsysfile="s/gnu-linux.h" ;;
 
    hpux11)
diff --git a/src/ChangeLog b/src/ChangeLog
index 045a3d374b8..140cd54d8cd 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,7 @@
 2012-07-11  Glenn Morris  <rgm@gnu.org>
 
+        * s/gnu.h: Remove file, which is now empty.
+
         * s/gnu.h, s/gnu-linux.h:
         Move GNU_LIBRARY_PENDING_OUTPUT_COUNT to configure.
 
diff --git a/src/s/gnu.h b/src/s/gnu.h
deleted file mode 100644
index 9ec75081ca1..00000000000
--- a/src/s/gnu.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/* Definitions file for GNU Emacs running on the GNU Hurd.
-
-Copyright (C) 1994-1996, 2001-2012  Free Software Foundation, Inc.
-
-This file is part of GNU Emacs.
-
-GNU Emacs is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-GNU Emacs is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
-
-
-/* Get most of the stuff from bsd-common */
-#include "bsd-common.h"