From 2c7709c2c4a58f60a27439a6633598c6b781a603 Mon Sep 17 00:00:00 2001 From: Nick Treleaven Date: Mon, 16 Aug 2010 11:22:45 +0000 Subject: [PATCH] r5162 | eht16 | 2010-08-15 13:53:09 +0100 (Sun, 15 Aug 2010) | 1 line Check for libsocket on OpenSolaris to fix build. git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/branches/Geany-0_19_1@5165 ea778897-0a13-0410-b9d1-a72fbfd435f5 --- ChangeLog | 6 ++++++ NEWS | 1 + wscript | 7 ++++++- 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index f0c2b16d0..185bcdd3a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2010-08-15 Enrico Tröger + + * wscript: + Check for libsocket on OpenSolaris to fix build. + + 2010-08-13 Nick Treleaven * win32-config.h, geany.nsi, configure.ac, doc/geany.txt, diff --git a/NEWS b/NEWS index 71dce5a55..99736198e 100644 --- a/NEWS +++ b/NEWS @@ -17,6 +17,7 @@ Geany 0.19.1 (TBA) * Fix build menu translation problems. * Fix segfault on Tools->Reload Configuration when no documents are open (#3037079). + * Fix building with Waf on Solaris. * Fix a memory leak (thanks to Daniel Marjamäki). * Use g_free instead of free (patch by Daniel Marjamäki, thanks). diff --git a/wscript b/wscript index a92372e5b..ebb78430e 100644 --- a/wscript +++ b/wscript @@ -196,6 +196,11 @@ def configure(conf): conf.check(function_name='mkstemp', header_name='stdlib.h') conf.check(function_name='strstr', header_name='string.h', mandatory=True) + # check sunOS socket support + if Options.platform == 'sunos': + conf.check(function_name='socket', lib='socket', + header_name='sys/socket.h', uselib_store='SUNOS_SOCKET', mandatory=True) + # check for cxx after the header and function checks have been done to ensure they are # checked with cc not cxx conf.check_tool('compiler_cxx misc') @@ -385,7 +390,7 @@ def build(bld): source = geany_sources, includes = '. src/ scintilla/include/ tagmanager/include/', defines = 'G_LOG_DOMAIN="Geany"', - uselib = 'GTK GIO WIN32', + uselib = 'GTK GIO WIN32 SUNOS_SOCKET', uselib_local = 'scintilla tagmanager', add_objects = 'geany-rc' if is_win32 else None ) -- 2.11.4.GIT