diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2021-01-01 12:52:55 -0800 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2021-01-01 12:58:17 -0800 |
| commit | 9076a631fe331763414a5d323496846d563ccaa0 (patch) | |
| tree | 8269d91345a6fadf1768fe556ec0b4e2993a14c6 /lib-src | |
| parent | ac8875173ad63c030e003363706d49a87aa85745 (diff) | |
| download | emacs-9076a631fe331763414a5d323496846d563ccaa0.tar.gz | |
Port to Solaris 10
* configure.ac: Instead of AC_CHECK_HEADER, use AC_COMPILE_IFELSE
with X11/Intrinsic.h when checking for X11/extensions/Xrender.h.
This suppresses a bogus "report a bug to bug-gnu-emacs" diagnostic
from 'configure' in Solaris 10.
(SETUP_SLAVE_PTY): Adjust to recent renaming of forkin to
std_in in callproc.c. Needed on Solaris and Unixware.
* lib-src/Makefile.in (LIB_GETRANDOM, LIBS_ETAGS): New vars,
needed because on Solaris 10 the Gnulib tempname module now needs
the -lrt library for clock_gettime. Throw in the LIB_GETRANDOM
stuff too while we’re at it; from getrandom.m4 it seems to be
needed for MingW.
(LIBS_MOVE, etags_libs): Use them.
* src/callproc.c [SETUP_SLAVE_PTY]: Include sys/stream.h
and sys/stropts.h, for SETUP_SLAVE_PTY’s definiens.
* src/process.c [NEED_BSDTTY]: Don’t include bsdtty.h; hasn’t been
needed in years.
[USG5_4]: Don’t include sys/stream.h or sys/stropts.h; these
directives havbe been moved to callproc.c because the only use of
SETUP_SLAVE_PTY is there now.
Diffstat (limited to 'lib-src')
| -rw-r--r-- | lib-src/Makefile.in | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/lib-src/Makefile.in b/lib-src/Makefile.in index 064342b4d3b..0a6dd826c10 100644 --- a/lib-src/Makefile.in +++ b/lib-src/Makefile.in @@ -204,14 +204,19 @@ LIBRESOLV=@LIBRESOLV@ LIBS_MAIL=@LIBS_MAIL@ ## empty or -lrt or -lposix4 if HAVE_CLOCK_GETTIME LIB_CLOCK_GETTIME = @LIB_CLOCK_GETTIME@ +## empty or -lbcrypt or -ladvapi32 +LIB_GETRANDOM = @LIB_GETRANDOM@ ## Whatever libraries are needed for euidaccess LIB_EACCESS=@LIB_EACCESS@ ## empty or -lwsock2 for MinGW LIB_WSOCK32=@LIB_WSOCK32@ +## Extra libraries for etags +LIBS_ETAGS = $(LIB_CLOCK_GETTIME) $(LIB_GETRANDOM) + ## Extra libraries to use when linking movemail. LIBS_MOVE = $(LIBS_MAIL) $(KRB4LIB) $(DESLIB) $(KRB5LIB) $(CRYPTOLIB) \ - $(COM_ERRLIB) $(LIBHESIOD) $(LIBRESOLV) $(LIB_WSOCK32) + $(COM_ERRLIB) $(LIBHESIOD) $(LIBRESOLV) $(LIB_WSOCK32) $(LIBS_ETAGS) ## Extra libraries when linking emacsclient ## (empty or -lcomctl32 for MinGW) @@ -360,7 +365,7 @@ TAGS: etags${EXEEXT} ${tagsfiles} $(MAKE) -C ../lib all etags_deps = ${srcdir}/etags.c $(NTLIB) $(config_h) -etags_libs = $(NTLIB) $(LOADLIBES) +etags_libs = $(NTLIB) $(LOADLIBES) $(LIBS_ETAGS) etags${EXEEXT}: ${etags_deps} $(AM_V_CCLD)$(CC) ${ALL_CFLAGS} -o $@ $< $(etags_libs) |