procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Move NO_EDITRES from src/s to configure

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

* src/s/aix4-2.h, src/s/hpux10-20.h: Let configure set NO_EDITRES.
This commit is contained in:
Glenn Morris 2012-07-12 17:14:13 -04:00
parent a7208036ed
commit ba9e4b84ac
5 changed files with 25 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ChangeLog
View file

@ -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)

19
configure.ac
View file

@ -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.])

10
src/ChangeLog
View file

@ -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>

5
src/s/aix4-2.h
View file

@ -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

4
src/s/hpux10-20.h
View file

@ -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