diff options
| author | Stefan Kangas <stefan@marxist.se> | 2021-12-03 06:30:26 +0100 |
|---|---|---|
| committer | Stefan Kangas <stefan@marxist.se> | 2021-12-03 06:30:26 +0100 |
| commit | c66eb524537f98667507024e5f21e0b24038c964 (patch) | |
| tree | a1eb41cf4585796fb43a0b2c51b177cbb1bf9b37 /lib-src | |
| parent | 67191f7eee3f2a4e83897c3d820f8c13c629dedb (diff) | |
| parent | 9c222b9c1a7f91497a37567b4d7de3a511fff069 (diff) | |
| download | emacs-c66eb524537f98667507024e5f21e0b24038c964.tar.gz | |
Merge from origin/emacs-28
9c222b9c1a Port to C compilers that lack size-0 arrays
fed35a8951 Port emacsclient to Solaris 10
f35d6a9c73 * CONTRIBUTE: Improve commit message instructions
e0ee1d003a Work around IBM XL C compiler bug
6b99b6eb8b * admin/make-tarball.txt: Various clarifications.
bbf4140091 * admin/diff-tar-files: Don't assume .tar.gz.
0a50ad11db * lisp/tab-bar.el (tab-bar-close-other-tabs): Fix regression.
Diffstat (limited to 'lib-src')
| -rw-r--r-- | lib-src/Makefile.in | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lib-src/Makefile.in b/lib-src/Makefile.in index d062e78366f..c07b678839c 100644 --- a/lib-src/Makefile.in +++ b/lib-src/Makefile.in @@ -195,6 +195,8 @@ LIB_CLOCK_GETTIME = @LIB_CLOCK_GETTIME@ LIB_GETRANDOM = @LIB_GETRANDOM@ ## Whatever libraries are needed for euidaccess LIB_EACCESS=@LIB_EACCESS@ +## Libraries needed for file_has_acl +LIB_HAS_ACL=@LIB_HAS_ACL@ ## empty or -lwsock2 for MinGW LIB_WSOCK32=@LIB_WSOCK32@ @@ -418,7 +420,7 @@ pop.o: ${srcdir}/pop.c ${srcdir}/pop.h ${srcdir}/../lib/min-max.h $(config_h) emacsclient${EXEEXT}: ${srcdir}/emacsclient.c $(NTLIB) $(config_h) $(AM_V_CCLD)$(CC) ${ALL_CFLAGS} $< \ $(NTLIB) $(LOADLIBES) \ - $(LIB_WSOCK32) $(LIB_EACCESS) $(LIBS_ECLIENT) -o $@ + $(LIB_WSOCK32) $(LIB_EACCESS) $(LIB_HAS_ACL) $(LIBS_ECLIENT) -o $@ emacsclientw${EXEEXT}: ${srcdir}/emacsclient.c $(NTLIB) $(CLIENTRES) $(config_h) $(AM_V_CCLD)$(CC) ${ALL_CFLAGS} $(CLIENTRES) -mwindows $< \ |