SF.net SVN: geany:[5162] trunk

[eht16 at users.sourceforge.net]

Revision: 5162
          http://geany.svn.sourceforge.net/geany/?rev=5162&view=rev
Author:   eht16
Date:     2010-08-15 12:53:09 +0000 (Sun, 15 Aug 2010)

Log Message:
-----------
Check for libsocket on OpenSolaris to fix build.

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/wscript

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2010-08-13 17:00:36 UTC (rev 5161)
+++ trunk/ChangeLog	2010-08-15 12:53:09 UTC (rev 5162)
@@ -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>
 
  * configure.ac:

Modified: trunk/wscript
===================================================================
--- trunk/wscript	2010-08-13 17:00:36 UTC (rev 5161)
+++ trunk/wscript	2010-08-15 12:53:09 UTC (rev 5162)
@@ -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.