[Emacs-diffs] /srv/bzr/emacs/trunk r109057: Move NO_EDITRES from src/s to configure

[Glenn Morris]

------------------------------------------------------------
revno: 109057
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Thu 2012-07-12 17:14:13 -0400
message:
  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.
modified:
  ChangeLog
  configure.ac
  src/ChangeLog
  src/s/aix4-2.h
  src/s/hpux10-20.h

=== modified file 'ChangeLog'
--- a/ChangeLog 2012-07-12 19:48:21 +0000
+++ b/ChangeLog 2012-07-12 21:14:13 +0000
@@ -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)

=== modified file 'configure.ac'
--- a/configure.ac      2012-07-12 19:48:21 +0000
+++ b/configure.ac      2012-07-12 21:14:13 +0000
@@ -2137,6 +2137,7 @@
   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 @@
   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 <address@hidden> 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.])

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2012-07-12 20:53:41 +0000
+++ b/src/ChangeLog     2012-07-12 21:14:13 +0000
@@ -1,8 +1,3 @@
-2012-07-12  Glenn Morris  <address@hidden>
-
-       * s/gnu-linux.h, s/hpux10-20.h:
-       Do not unconditionally define HAVE_XRMSETDATABASE.
-
 2012-07-12  Eli Zaretskii  <address@hidden>
 
        * xdisp.c (insert_left_trunc_glyphs): Fix incorrect size in
@@ -19,6 +14,11 @@
 
 2012-07-12  Glenn Morris  <address@hidden>
 
+       * 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  <address@hidden>

=== modified file 'src/s/aix4-2.h'
--- a/src/s/aix4-2.h    2012-07-12 07:43:05 +0000
+++ b/src/s/aix4-2.h    2012-07-12 21:14:13 +0000
@@ -32,11 +32,6 @@
 /* Perry Smith <address@hidden> 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

=== modified file 'src/s/hpux10-20.h'
--- a/src/s/hpux10-20.h 2012-07-12 20:53:41 +0000
+++ b/src/s/hpux10-20.h 2012-07-12 21:14:13 +0000
@@ -26,10 +26,6 @@
 
 /* Special hacks needed to make Emacs run on this system.  */
 
-/* Assar Westerlund <address@hidden> 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