Move some AIX defines from src/s to configure

* configure.ac (BROKEN_FIONREAD, BROKEN_SIGAIO, BROKEN_SIGPOLL)
(BROKEN_SIGPTY): Move here from src/s.

* src/s/aix4-2.h (BROKEN_FIONREAD, BROKEN_SIGAIO, BROKEN_SIGPTY)
(BROKEN_SIGPOLL): Let configure set them.

* src/s/syssignal.h: Comment fix.

5 files changed, 23 insertions, 18 deletions

diff --git a/ChangeLog b/ChangeLog
index d6882a8fe0b..16b33ac5add 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,7 +3,8 @@
         * configure.ac (NO_MATHERR): Unconditionally define for Darwin;
         as src/s/darwin.h used to.
 
-        * configure.ac (NARROWPROTO, NO_ABORT): Move here from src/s.
+        * configure.ac (NARROWPROTO, NO_ABORT, BROKEN_FIONREAD, BROKEN_SIGAIO):
+        (BROKEN_SIGPOLL, BROKEN_SIGPTY): Move here from src/s.
 
 2012-07-11  Glenn Morris  <rgm@gnu.org>
 
diff --git a/configure.ac b/configure.ac
index a6d3851836b..eb29a2621f4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3152,13 +3152,27 @@ case $opsys in
   ;;
 esac
 
-dnl SIGIO exists, but the feature doesn't work in the way Emacs needs.
-dnl See eg <http://article.gmane.org/gmane.os.openbsd.ports/46831>.
+
 case $opsys in
+  dnl SIGIO exists, but the feature doesn't work in the way Emacs needs.
+  dnl See eg <http://article.gmane.org/gmane.os.openbsd.ports/46831>.
   hpux* | irix6-5 | openbsd | sol2* | unixware )
     AC_DEFINE(BROKEN_SIGIO, 1, [Define if SIGIO should not be used.])
     ;;
 
+  aix4-2)
+    dnl BUILD 9008 - FIONREAD problem still exists in X-Windows.
+    AC_DEFINE(BROKEN_FIONREAD, 1, [Define if FIONREAD should not be used.])
+    dnl As we define BROKEN_FIONREAD, SIGIO will be undefined in systty.h.
+    dnl But, on AIX, SIGAIO, SIGPTY, and SIGPOLL are defined as SIGIO,
+    dnl which causes compilation error at init_signals in sysdep.c.
+    dnl So, we define these macros so that syssignal.h detects them
+    dnl and undefine SIGAIO, SIGPTY and SIGPOLL.
+    AC_DEFINE(BROKEN_SIGAIO, 1, [Define if SIGAIO should not be used.])
+    AC_DEFINE(BROKEN_SIGPOLL,1, [Define if SIGPOLL should not be used.])
+    AC_DEFINE(BROKEN_SIGPTY, 1, [Define if SIGPTY should not be used.])
+    ;;
+
   dnl Define the following so emacs symbols will not conflict with those
   dnl in the System framework.  Otherwise -prebind will not work.
   darwin)
diff --git a/src/ChangeLog b/src/ChangeLog
index f53b9a212c8..9085e91f9ce 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,6 +1,9 @@
 2012-07-12  Glenn Morris  <rgm@gnu.org>
 
-        * s/darwin.h (NO_ABORT, NO_MATHERR): Let configure set it.
+        * s/aix4-2.h (BROKEN_FIONREAD, BROKEN_SIGAIO, BROKEN_SIGPTY)
+        (BROKEN_SIGPOLL): Let configure set them.
+
+        * s/darwin.h (NO_ABORT, NO_MATHERR): Let configure set them.
 
         * s/bsd-common.h, s/cygwin.h, s/gnu-linux.h, s/irix6-5.h:
         * s/template.h: Move NARROWPROTO to configure.
diff --git a/src/s/aix4-2.h b/src/s/aix4-2.h
index 7b7f785954d..ec7a1eeb0b8 100644
--- a/src/s/aix4-2.h
+++ b/src/s/aix4-2.h
@@ -60,17 +60,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
    to avoid a crash just use the Emacs implementation for that function.  */
 #define BROKEN_GET_CURRENT_DIR_NAME 1
 
-/*** BUILD 9008 - FIONREAD problem still exists in X-Windows. ***/
-#define BROKEN_FIONREAD
-/* As we define BROKEN_FIONREAD, SIGIO will be undefined in systty.h.
-   But, on AIX, SIGAIO, SIGPTY, and SIGPOLL are defined as SIGIO,
-   which causes compilation error at init_signals in sysdep.c.  So, we
-   define these macros so that syssignal.h detects them and undefine
-   SIGAIO, SIGPTY and SIGPOLL.  */
-#define BROKEN_SIGAIO
-#define BROKEN_SIGPTY
-#define BROKEN_SIGPOLL
-
 /* Conservative garbage collection has not been tested, so for now
    play it safe and stick with the old-fashioned way of marking.  */
 #define GC_MARK_STACK GC_USE_GCPROS_AS_BEFORE
diff --git a/src/syssignal.h b/src/syssignal.h
index 5c3683423be..d4578839596 100644
--- a/src/syssignal.h
+++ b/src/syssignal.h
@@ -86,15 +86,13 @@ _Noreturn void croak (char *);
 #if defined (SIGIO) && defined (BROKEN_SIGIO)
 # undef SIGIO
 #endif
-/* Last user: m/ibmrs6000.h  */
+/* These are only used by AIX  */
 #if defined (SIGPOLL) && defined (BROKEN_SIGPOLL)
 #undef SIGPOLL
 #endif
-/* Last user: m/ibmrs6000.h  */
 #if defined (SIGAIO) && defined (BROKEN_SIGAIO)
 #undef SIGAIO
 #endif
-/* Last user: m/ibmrs6000.h  */
 #if defined (SIGPTY) && defined (BROKEN_SIGPTY)
 #undef SIGPTY
 #endif