HybridDog/geany
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Check for libsocket on OpenSolaris to fix build.

Browse Source 
git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@5162 ea778897-0a13-0410-b9d1-a72fbfd435f5
This commit is contained in:
Enrico Tröger 2010-08-15 12:53:09 +00:00
parent efd930da51
commit 7aaf51f9b4
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2010-08-15 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de>
* wscript:
Check for libsocket on OpenSolaris to fix build.
2010-08-13 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> 2010-08-13 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com>
* configure.ac: * configure.ac:

7
wscript
View File

@ -196,6 +196,11 @@ def configure(conf):
conf.check(function_name='mkstemp', header_name='stdlib.h') conf.check(function_name='mkstemp', header_name='stdlib.h')
conf.check(function_name='strstr', header_name='string.h', mandatory=True) 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 # check for cxx after the header and function checks have been done to ensure they are
# checked with cc not cxx # checked with cc not cxx
conf.check_tool('compiler_cxx misc') conf.check_tool('compiler_cxx misc')
@ -385,7 +390,7 @@ def build(bld):
source = geany_sources, source = geany_sources,
includes = '. src/ scintilla/include/ tagmanager/include/', includes = '. src/ scintilla/include/ tagmanager/include/',
defines = 'G_LOG_DOMAIN="Geany"', defines = 'G_LOG_DOMAIN="Geany"',
uselib = 'GTK GIO WIN32', uselib = 'GTK GIO WIN32 SUNOS_SOCKET',
uselib_local = 'scintilla tagmanager', uselib_local = 'scintilla tagmanager',
add_objects = 'geany-rc' if is_win32 else None add_objects = 'geany-rc' if is_win32 else None
) )