Empty src/s/netbsd.h and remove the file

* configure.ac (SIGNAL_H_AHB): New hack macro.
(opsysfile): Set to empty on netbsd, openbsd.
(AH_BOTTOM): Include signal.h if SIGNAL_H_AHB is defined.

* src/s/netbsd.h: Let configure include signal.h if needed.
Remove file, which is now empty.

4 files changed, 22 insertions, 26 deletions

diff --git a/ChangeLog b/ChangeLog
index 5c1f2c6a1b6..775b95f4626 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2012-07-30  Glenn Morris  <rgm@gnu.org>
 
+        * configure.ac (SIGNAL_H_AHB): New hack macro.
+        (opsysfile): Set to empty on netbsd, openbsd.
+        (AH_BOTTOM): Include signal.h if SIGNAL_H_AHB is defined.
+
         * configure.ac (_longjmp, _setjmp): Move here from src/s.
 
 2012-07-30  Jan Djärv  <jan.h.d@swipnet.se>
diff --git a/configure.ac b/configure.ac
index 9ca02cce7cc..77eab0821eb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3641,12 +3641,19 @@ case $opsys in
 esac
 
 
-dnl Used in xfaces.c.
 case $opsys in
   hpux* | sol2* )
+    dnl Used in xfaces.c.
     AC_DEFINE(XOS_NEEDS_TIME_H, 1, [Compensate for a bug in Xos.h on
       some systems, where it requires time.h.])
     ;;
+
+  netbsd | openbsd )
+    dnl Greg A. Woods <woods@weird.com> says we must include signal.h
+    dnl before syssignal.h is included, to work around interface conflicts
+    dnl that are handled with CPP __RENAME() macro in signal.h.
+    AC_DEFINE(SIGNAL_H_AHB, 1, [Define if AH_BOTTOM should include signal.h.])
+    ;;
 esac
 
 
@@ -3772,7 +3779,7 @@ case $opsys in
       should not call setpgrp.])
     ;;
 
-  openbsd) opsysfile="s/netbsd.h" ;;
+  netbsd | openbsd ) opsysfile= ;;
 
   sol2-10)
     AC_DEFINE(_STRUCTURED_PROC, 1, [Needed for system_process_attributes
@@ -4186,6 +4193,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #define EMACS_CONFIG_H
 ])dnl
 
+dnl FIXME undefs in here get commented out by autoconf.  :(
 AH_BOTTOM([
 /* On AIX 3 this must be included before any other include file.  */
 #include <alloca.h>
@@ -4193,6 +4201,11 @@ AH_BOTTOM([
 # error "alloca not available on this machine"
 #endif
 
+#ifdef SIGNAL_H_AHB
+#undef SIGNAL_H_AHB
+#include <signal.h>
+#endif
+
 /* This silences a few compilation warnings on FreeBSD.  */
 #ifdef BSD_SYSTEM_AHB
 #undef BSD_SYSTEM_AHB
diff --git a/src/ChangeLog b/src/ChangeLog
index 37d660da785..076b5eb1cce 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,8 @@
 2012-07-30  Glenn Morris  <rgm@gnu.org>
 
+        * s/netbsd.h: Let configure include signal.h if needed.
+        Remove file, which is now empty.
+
         * s/usg5-4-common.h (_longjmp, _setjmp): Let configure set them.
         * s/irix6-5.h (_longjmp, _setjmp): No more need to undefine.
 
diff --git a/src/s/netbsd.h b/src/s/netbsd.h
deleted file mode 100644
index 7a571ee8116..00000000000
--- a/src/s/netbsd.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/* s/ file for netbsd system.
-
-Copyright (C) 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/>.  */
-
-/* Greg A. Woods <woods@weird.com> says we must include signal.h
-   before syssignal.h is included, to work around interface conflicts
-   that are handled with CPP __RENAME() macro in signal.h.  */
-#include <signal.h>
-