From e098a0dc5414f67006c9e8f0ff02f22f715a0a55 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Helleu?= Date: Sat, 17 Dec 2016 17:52:33 +0100 Subject: [PATCH] core: fix compilation on Mac OS X (closes #276) The resolver functions like res_init() require link with resolv. --- ChangeLog.adoc | 1 + src/gui/curses/CMakeLists.txt | 2 ++ src/gui/curses/Makefile.am | 3 ++- 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/ChangeLog.adoc b/ChangeLog.adoc index 6d03d0cbb..6ded64a74 100644 --- a/ChangeLog.adoc +++ b/ChangeLog.adoc @@ -51,6 +51,7 @@ Bug fixes:: Build:: + * core: fix compilation on Mac OS X (add link with resolv) (issue #276) * core: add build of xz package with make dist (cmake) [[v1.6]] diff --git a/src/gui/curses/CMakeLists.txt b/src/gui/curses/CMakeLists.txt index 8fadce2d2..18b77f8f2 100644 --- a/src/gui/curses/CMakeLists.txt +++ b/src/gui/curses/CMakeLists.txt @@ -73,6 +73,8 @@ list(APPEND EXTRA_LIBS "m") list(APPEND EXTRA_LIBS ${CURL_LIBRARIES}) +list(APPEND EXTRA_LIBS "resolv") + include_directories(.. ../../core ../../plugins ${NCURSES_INCLUDE_PATH}) add_library(weechat_gui_curses STATIC ${LIB_GUI_CURSES_SRC}) diff --git a/src/gui/curses/Makefile.am b/src/gui/curses/Makefile.am index 2e04ff820..213c47da8 100644 --- a/src/gui/curses/Makefile.am +++ b/src/gui/curses/Makefile.am @@ -45,7 +45,8 @@ weechat_LDADD = ./../../core/lib_weechat_core.a \ $(GCRYPT_LFLAGS) \ $(GNUTLS_LFLAGS) \ $(CURL_LFLAGS) \ - -lm + -lm \ + -lresolv weechat_SOURCES = main.c