Move NARROWPROTO from src/s to configure

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

* src/s/bsd-common.h, src/s/cygwin.h, src/s/gnu-linux.h, src/s/irix6-5.h:
* src/s/template.h: Move NARROWPROTO to configure.

8 files changed, 22 insertions, 26 deletions

diff --git a/ChangeLog b/ChangeLog
index 802c2c0d4e5..2d048599672 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2012-07-12  Glenn Morris  <rgm@gnu.org>
+
+	* configure.ac (NARROWPROTO): Move here from src/s.
+
 2012-07-11  Glenn Morris  <rgm@gnu.org>
 
 	* configure.ac (INTERRUPT_INPUT): Move here from src/s.
diff --git a/configure.ac b/configure.ac
index 9ec7ebcd08a..1f053a6e713 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3212,6 +3212,19 @@ case $opsys in
 esac
 
 
+dnl If the system's imake configuration file defines `NeedWidePrototypes'
+dnl as `NO', we must define NARROWPROTO manually.  Such a define is
+dnl generated in the Makefile generated by `xmkmf'.  If we don't define
+dnl NARROWPROTO, we will see the wrong function prototypes for X functions
+dnl taking float or double parameters.
+case $opsys in
+  cygwin|gnu|gnu-linux|gnu-kfreebsd|irix6-5|freebsd|netbsd|openbsd)
+    AC_DEFINE(NARROWPROTO, 1, [Define if system's imake configuration
+      file defines `NeedWidePrototypes' as `NO'.])
+  ;;
+esac
+
+
 AH_TEMPLATE(SIGNALS_VIA_CHARACTERS, [Make process_send_signal work by
 "typing" a signal character on the pty.])
 
diff --git a/src/ChangeLog b/src/ChangeLog
index a15fcc08895..494f3c89861 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2012-07-12  Glenn Morris  <rgm@gnu.org>
+
+	* s/bsd-common.h, s/cygwin.h, s/gnu-linux.h, s/irix6-5.h:
+	* s/template.h: Move NARROWPROTO to configure.
+
 2012-07-11  Glenn Morris  <rgm@gnu.org>
 
 	* s/gnu-linux.h, s/sol2-6.h: No longer define POSIX,
diff --git a/src/s/bsd-common.h b/src/s/bsd-common.h
index aceb45fc63e..0fa6d146479 100644
--- a/src/s/bsd-common.h
+++ b/src/s/bsd-common.h
@@ -40,12 +40,5 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #define TABDLY OXTABS
 #define TAB3 OXTABS
 
-/* If the system's imake configuration file defines `NeedWidePrototypes'
-   as `NO', we must define NARROWPROTO manually.  Such a define is
-   generated in the Makefile generated by `xmkmf'.  If we don't
-   define NARROWPROTO, we will see the wrong function prototypes
-   for X functions taking float or double parameters.  */
-#define NARROWPROTO 1
-
 /* First pty name is /dev/ptyp0.  */
 #define FIRST_PTY_LETTER 'p'
diff --git a/src/s/cygwin.h b/src/s/cygwin.h
index 95f0bd79dc9..0c9bfe203b1 100644
--- a/src/s/cygwin.h
+++ b/src/s/cygwin.h
@@ -34,13 +34,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
     }							\
   while (0)
 
-/* If the system's imake configuration file defines `NeedWidePrototypes'
-   as `NO', we must define NARROWPROTO manually.  Such a define is
-   generated in the Makefile generated by `xmkmf'.  If we don't
-   define NARROWPROTO, we will see the wrong function prototypes
-   for X functions taking float or double parameters.  */
-#define NARROWPROTO 1
-
 /* Used in various places to enable cygwin-specific code changes.  */
 #define CYGWIN 1
 
diff --git a/src/s/gnu-linux.h b/src/s/gnu-linux.h
index c7567cfcbcb..5e8691b55ce 100644
--- a/src/s/gnu-linux.h
+++ b/src/s/gnu-linux.h
@@ -79,8 +79,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #define HAVE_XRMSETDATABASE
 #endif
 
-#define NARROWPROTO 1
-
 #ifdef __ia64__
 #define GC_MARK_SECONDARY_STACK()				\
   do {								\
diff --git a/src/s/irix6-5.h b/src/s/irix6-5.h
index 506f2c6cd8f..cd06af7c2bb 100644
--- a/src/s/irix6-5.h
+++ b/src/s/irix6-5.h
@@ -70,8 +70,6 @@ char *_getpty();
 /* Tell process_send_signal to use VSUSP instead of VSWTCH.  */
 #define PREFER_VSUSP
 
-#define NARROWPROTO 1
-
 #undef SA_RESTART     /* not the same as defining BROKEN_SA_RESTART */
 
 #undef TIOCSIGSEND		/* defined in usg5-4-common.h */
diff --git a/src/s/template.h b/src/s/template.h
index 832ff9cb438..a343a4b006e 100644
--- a/src/s/template.h
+++ b/src/s/template.h
@@ -52,14 +52,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
    your system and must be used only through an encapsulation (which
    you should place, by convention, in sysdep.c).  */
 
-/* If the system's imake configuration file defines `NeedWidePrototypes'
-   as `NO', we must define NARROWPROTO manually.  Such a define is
-   generated in the Makefile generated by `xmkmf'.  If we don't
-   define NARROWPROTO, we will see the wrong function prototypes
-   for X functions taking float or double parameters.  */
-
-/*  #define NARROWPROTO 1 */
-
 /* ============================================================ */
 
 /* After adding support for a new system, modify the large case