Move NO_EDITRES from src/s to configure

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

* src/s/aix4-2.h, src/s/hpux10-20.h: Let configure set NO_EDITRES.

5 files changed, 25 insertions, 15 deletions

diff --git a/ChangeLog b/ChangeLog
index a7aad6a0734..850eb040376 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,7 +5,7 @@
 
         * configure.ac (NARROWPROTO, NO_ABORT, BROKEN_GET_CURRENT_DIR_NAME)
         (BROKEN_FIONREAD, BROKEN_PTY_READ_AFTER_EAGAIN, BROKEN_SIGAIO)
-        (BROKEN_SIGPOLL, BROKEN_SIGPTY, FIRST_PTY_LETTER)
+        (BROKEN_SIGPOLL, BROKEN_SIGPTY, FIRST_PTY_LETTER, NO_EDITRES)
         (G_SLICE_ALWAYS_MALLOC, PREFER_VSUSP, PTY_ITERATION, PTY_OPEN)
         (PTY_NAME_SPRINTF, PTY_TTY_NAME_SPRINTF, RUN_TIME_REMAP)
         (SETPGRP_RELEASES_CTTY, TAB3, TABDLY, RUN_TIME_REMAP, UNIX98_PTYS)
diff --git a/configure.ac b/configure.ac
index 6ac53bbd64d..1a37f044295 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2137,6 +2137,7 @@ dnl tranle@intellicorp.com says libXmu.a can need XtMalloc in libXt.a to link.
   fi
   AC_CHECK_LIB(Xmu, XmuConvertStandardSelection)
   test $ac_cv_lib_Xmu_XmuConvertStandardSelection = no && LIBS="$OLDLIBS"
+  dnl ac_cv_lib_Xmu_XmuConvertStandardSelection is also referenced below.
 fi
 AC_SUBST(LIBXTR6)
 
@@ -3149,6 +3150,24 @@ AC_DEFINE(HAVE_SOCKETS, 1, [Define if the system supports
   4.2-compatible sockets.])
 
 
+AH_TEMPLATE(NO_EDITRES, [Define if XEditRes should not be used.])
+
+case $opsys in
+  aix4-2)
+    dnl Unfortunately without libXmu we cannot support EditRes.
+    if test x$ac_cv_lib_Xmu_XmuConvertStandardSelection != xyes; then
+      AC_DEFINE(NO_EDITRES, 1)    
+    fi
+    ;;
+
+  hpux*)
+    dnl Assar Westerlund <assar@sics.se> says this is necessary for
+    dnl HP-UX 10.20, and that it works for HP-UX 0 as well.
+    AC_DEFINE(NO_EDITRES, 1)
+    ;;
+esac
+
+
 case $opsys in
   darwin | gnu | hpux* | *bsd )
     AC_DEFINE(NO_TERMIO, 1, [Define if termio.h should not be included.])
diff --git a/src/ChangeLog b/src/ChangeLog
index f0b532df145..49014c340dc 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,8 +1,3 @@
-2012-07-12  Glenn Morris  <rgm@gnu.org>
-
-        * s/gnu-linux.h, s/hpux10-20.h:
-        Do not unconditionally define HAVE_XRMSETDATABASE.
-
 2012-07-12  Eli Zaretskii  <eliz@gnu.org>
 
         * xdisp.c (insert_left_trunc_glyphs): Fix incorrect size in
@@ -19,6 +14,11 @@
 
 2012-07-12  Glenn Morris  <rgm@gnu.org>
 
+        * s/aix4-2.h, s/hpux10-20.h: Let configure set NO_EDITRES.
+
+        * s/gnu-linux.h, s/hpux10-20.h:
+        Do not unconditionally define HAVE_XRMSETDATABASE.
+
         * s/gnu-linux.h (UNIX98_PTYS): Let configure set it.
 
 2012-07-12  Paul Eggert  <eggert@cs.ucla.edu>
diff --git a/src/s/aix4-2.h b/src/s/aix4-2.h
index 49eabfc8466..55000f6f279 100644
--- a/src/s/aix4-2.h
+++ b/src/s/aix4-2.h
@@ -32,11 +32,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 /* Perry Smith <pedz@ddivt1.austin.ibm.com> says these are correct.  */
 #undef sigmask
 
-#ifndef HAVE_LIBXMU
-/* Unfortunately without libXmu we cannot support EditRes.  */
-#define NO_EDITRES
-#endif
-
 /* 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/s/hpux10-20.h b/src/s/hpux10-20.h
index 00b384f1f3c..6115565e9d0 100644
--- a/src/s/hpux10-20.h
+++ b/src/s/hpux10-20.h
@@ -26,10 +26,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 /* Special hacks needed to make Emacs run on this system.  */
 
-/* Assar Westerlund <assar@sics.se> says this is necessary for
-   HP-UX 10.20, and that it works for HP-UX 0 as well.  */
-#define NO_EDITRES
-
 /* We have to go this route, rather than hpux9's approach of renaming the
    functions via macros.  The system's stdlib.h has fully prototyped
    declarations, which yields a conflicting definition of srand48; it