Revision: 5165 http://geany.svn.sourceforge.net/geany/?rev=5165&view=rev Author: ntrel Date: 2010-08-16 11:22:45 +0000 (Mon, 16 Aug 2010)
Log Message: ----------- r5162 | eht16 | 2010-08-15 13:53:09 +0100 (Sun, 15 Aug 2010) | 1 line
Check for libsocket on OpenSolaris to fix build.
Modified Paths: -------------- branches/Geany-0_19_1/ChangeLog branches/Geany-0_19_1/NEWS branches/Geany-0_19_1/wscript
Modified: branches/Geany-0_19_1/ChangeLog =================================================================== --- branches/Geany-0_19_1/ChangeLog 2010-08-15 17:44:31 UTC (rev 5164) +++ branches/Geany-0_19_1/ChangeLog 2010-08-16 11:22:45 UTC (rev 5165) @@ -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>
* win32-config.h, geany.nsi, configure.ac, doc/geany.txt,
Modified: branches/Geany-0_19_1/NEWS =================================================================== --- branches/Geany-0_19_1/NEWS 2010-08-15 17:44:31 UTC (rev 5164) +++ branches/Geany-0_19_1/NEWS 2010-08-16 11:22:45 UTC (rev 5165) @@ -17,6 +17,7 @@ * 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).
Modified: branches/Geany-0_19_1/wscript =================================================================== --- branches/Geany-0_19_1/wscript 2010-08-15 17:44:31 UTC (rev 5164) +++ branches/Geany-0_19_1/wscript 2010-08-16 11:22:45 UTC (rev 5165) @@ -196,6 +196,11 @@ 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 @@ 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 )
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.