Move NSIG_MINIMUM from src/s to configure

* configure.ac (NSIG_MINIMUM): Move here from src/s.

* src/s/usg5-4-common.h (NSIG_MINIMUM): Let configure set it.

5 files changed, 14 insertions, 7 deletions

diff --git a/ChangeLog b/ChangeLog
index 0132571d2e0..2902ec882ed 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,7 @@
 2012-07-13  Glenn Morris  <rgm@gnu.org>
 
-        * configure.ac (ULIMIT_BREAK_VALUE): Move here from src/s.
+        * configure.ac (NSIG_MINIMUM, ULIMIT_BREAK_VALUE):
+        Move here from src/s.
 
 2012-07-12  Glenn Morris  <rgm@gnu.org>
 
diff --git a/configure.ac b/configure.ac
index 90016de779b..6b3642766d4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3171,7 +3171,15 @@ esac
 case $opsys in
   darwin | gnu | hpux* | *bsd )
     AC_DEFINE(NO_TERMIO, 1, [Define if termio.h should not be included.])
-  ;;
+    ;;
+
+  irix6-5 | sol2* | unixware )
+    dnl Some SVr4s don't define NSIG in sys/signal.h for ANSI environments;
+    dnl instead, there's a system variable _sys_nsig.  Unfortunately, we
+    dnl need the constant to dimension an array.  So wire in the appropriate
+    dnl value here.
+    AC_DEFINE(NSIG_MINIMUM, 32, [Minimum value of NSIG.])
+    ;;
 esac
 
 
diff --git a/src/ChangeLog b/src/ChangeLog
index c66b38147ff..65d9ae916b9 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,7 @@
 2012-07-13  Glenn Morris  <rgm@gnu.org>
 
+        * s/usg5-4-common.h (NSIG_MINIMUM): Let configure set it.
+
         * s/gnu-linux.h, s/irix6-5.h: Let configure set ULIMIT_BREAK_VALUE.
 
         * process.c (init_process_emacs): Replace MIN_PTY_KERNEL_VERSION.
diff --git a/src/s/usg5-4-common.h b/src/s/usg5-4-common.h
index 3d3cea803dc..883d0b5dc21 100644
--- a/src/s/usg5-4-common.h
+++ b/src/s/usg5-4-common.h
@@ -46,11 +46,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include <sys/termios.h>
 #endif
 
-/* Some SVr4s don't define NSIG in sys/signal.h for ANSI environments;
-   instead, there's a system variable _sys_nsig.  Unfortunately, we need the
-   constant to dimension an array.  So wire in the appropriate value here.  */
-#define NSIG_MINIMUM 32
-
 /* It is possible to receive SIGCHLD when there are no children
    waiting, because a previous waitsys(2) cleaned up the carcass of child
    without clearing the SIGCHLD pending info.  So, use a non-blocking
diff --git a/src/syssignal.h b/src/syssignal.h
index d4578839596..71151ed4c6a 100644
--- a/src/syssignal.h
+++ b/src/syssignal.h
@@ -98,6 +98,7 @@ _Noreturn void croak (char *);
 #endif
 
 
+/* FIXME?  Emacs only defines NSIG_MINIMUM on some platforms?  */
 #if NSIG < NSIG_MINIMUM
 # ifdef NSIG
 #  undef NSIG