diff options
| author | Lars Ingebrigtsen <larsi@gnus.org> | 2016-02-22 15:06:33 +1100 |
|---|---|---|
| committer | Lars Ingebrigtsen <larsi@gnus.org> | 2016-02-22 15:06:33 +1100 |
| commit | f577f59a5216bc7708bb840f5eac3e82950e81e8 (patch) | |
| tree | c154db8bc4b920ea06c98efb7fc407562753b2d6 /src/Makefile.in | |
| parent | 5df6e3212bbb3213d1704dab89299a96b60eac6d (diff) | |
| parent | 0d3c0f6f906d5494f76b8b686bae72853b1f729c (diff) | |
| download | emacs-f577f59a5216bc7708bb840f5eac3e82950e81e8.tar.gz | |
Fix merge conflicts in network-stream-tests.el
Diffstat (limited to 'src/Makefile.in')
| -rw-r--r-- | src/Makefile.in | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/Makefile.in b/src/Makefile.in index a14d36f3f80..99394ac57cf 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -235,6 +235,8 @@ IMAGEMAGICK_CFLAGS= @IMAGEMAGICK_CFLAGS@ LIBXML2_LIBS = @LIBXML2_LIBS@ LIBXML2_CFLAGS = @LIBXML2_CFLAGS@ +GETADDRINFO_A_LIBS = @GETADDRINFO_A_LIBS@ + LIBZ = @LIBZ@ ## system-specific libs for dynamic modules, else empty @@ -486,7 +488,7 @@ LIBES = $(LIBS) $(W32_LIBS) $(LIBS_GNUSTEP) $(LIBX_BASE) $(LIBIMAGE) \ $(LIBXML2_LIBS) $(LIBGPM) $(LIBRESOLV) $(LIBS_SYSTEM) $(CAIRO_LIBS) \ $(LIBS_TERMCAP) $(GETLOADAVG_LIBS) $(SETTINGS_LIBS) $(LIBSELINUX_LIBS) \ $(FREETYPE_LIBS) $(FONTCONFIG_LIBS) $(LIBOTF_LIBS) $(M17N_FLT_LIBS) \ - $(LIBGNUTLS_LIBS) $(LIB_PTHREAD) \ + $(LIBGNUTLS_LIBS) $(LIB_PTHREAD) $(GETADDRINFO_A_LIBS) \ $(NOTIFY_LIBS) $(LIB_MATH) $(LIBZ) $(LIBMODULES) $(leimdir)/leim-list.el: bootstrap-emacs$(EXEEXT) |