aboutsummaryrefslogtreecommitdiffstats
path: root/lib-src
diff options
context:
space:
mode:
authorPaul Eggert2021-01-01 12:52:55 -0800
committerPaul Eggert2021-01-01 12:58:17 -0800
commit9076a631fe331763414a5d323496846d563ccaa0 (patch)
tree8269d91345a6fadf1768fe556ec0b4e2993a14c6 /lib-src
parentac8875173ad63c030e003363706d49a87aa85745 (diff)
downloademacs-9076a631fe331763414a5d323496846d563ccaa0.tar.gz
emacs-9076a631fe331763414a5d323496846d563ccaa0.zip
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.in9
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@
204LIBS_MAIL=@LIBS_MAIL@ 204LIBS_MAIL=@LIBS_MAIL@
205## empty or -lrt or -lposix4 if HAVE_CLOCK_GETTIME 205## empty or -lrt or -lposix4 if HAVE_CLOCK_GETTIME
206LIB_CLOCK_GETTIME = @LIB_CLOCK_GETTIME@ 206LIB_CLOCK_GETTIME = @LIB_CLOCK_GETTIME@
207## empty or -lbcrypt or -ladvapi32
208LIB_GETRANDOM = @LIB_GETRANDOM@
207## Whatever libraries are needed for euidaccess 209## Whatever libraries are needed for euidaccess
208LIB_EACCESS=@LIB_EACCESS@ 210LIB_EACCESS=@LIB_EACCESS@
209## empty or -lwsock2 for MinGW 211## empty or -lwsock2 for MinGW
210LIB_WSOCK32=@LIB_WSOCK32@ 212LIB_WSOCK32=@LIB_WSOCK32@
211 213
214## Extra libraries for etags
215LIBS_ETAGS = $(LIB_CLOCK_GETTIME) $(LIB_GETRANDOM)
216
212## Extra libraries to use when linking movemail. 217## Extra libraries to use when linking movemail.
213LIBS_MOVE = $(LIBS_MAIL) $(KRB4LIB) $(DESLIB) $(KRB5LIB) $(CRYPTOLIB) \ 218LIBS_MOVE = $(LIBS_MAIL) $(KRB4LIB) $(DESLIB) $(KRB5LIB) $(CRYPTOLIB) \
214 $(COM_ERRLIB) $(LIBHESIOD) $(LIBRESOLV) $(LIB_WSOCK32) 219 $(COM_ERRLIB) $(LIBHESIOD) $(LIBRESOLV) $(LIB_WSOCK32) $(LIBS_ETAGS)
215 220
216## Extra libraries when linking emacsclient 221## Extra libraries when linking emacsclient
217## (empty or -lcomctl32 for MinGW) 222## (empty or -lcomctl32 for MinGW)
@@ -360,7 +365,7 @@ TAGS: etags${EXEEXT} ${tagsfiles}
360 $(MAKE) -C ../lib all 365 $(MAKE) -C ../lib all
361 366
362etags_deps = ${srcdir}/etags.c $(NTLIB) $(config_h) 367etags_deps = ${srcdir}/etags.c $(NTLIB) $(config_h)
363etags_libs = $(NTLIB) $(LOADLIBES) 368etags_libs = $(NTLIB) $(LOADLIBES) $(LIBS_ETAGS)
364 369
365etags${EXEEXT}: ${etags_deps} 370etags${EXEEXT}: ${etags_deps}
366 $(AM_V_CCLD)$(CC) ${ALL_CFLAGS} -o $@ $< $(etags_libs) 371 $(AM_V_CCLD)$(CC) ${ALL_CFLAGS} -o $@ $< $(etags_libs)