Merge pull request #324 from mversluys/master

OSX and Linux SSL support and OSX fixes

contrib/curl/lib/curl_config.h

@@ -2,7 +2,7 @@
 /* lib/curl_config.h.in.  Generated from configure.ac by autoheader.  */
 
 /* Location of default ca bundle */
-#define CURL_CA_BUNDLE "/etc/pki/tls/certs/ca-bundle.crt"
+/* #undef CURL_CA_BUNDLE */
 
 /* Location of default ca path */
 /* #undef CURL_CA_PATH */

contrib/curl/premake5.lua

@@ -17,10 +17,31 @@ project "curl-lib"
 		defines {"USE_SSL", "USE_SCHANNEL", "USE_WINDOWS_SSPI"}
 
 	configuration { 'linux' }
-		defines {"HAVE_CONFIG_H", "CURL_HIDDEN_SYMBOLS"}
+		
+		defines {"HAVE_CONFIG_H", "CURL_HIDDEN_SYMBOLS" }
+		if os.findlib("ssl") then
+			defines { "USE_SSL", "USE_OPENSSL", "USE_SSLEAY" }
+
+			-- find the location of the ca bundle
+			local ca = nil
+			for _, f in ipairs {
+				'/etc/ssl/certs/ca-certificates.crt',
+				'/etc/pki/tls/certs/ca-bundle.crt',
+				'/usr/share/ssl/certs/ca-bundle.crt',
+				'/usr/local/share/certs/ca-root.crt',
+				'/etc/ssl/cert.pem' } do
+				if os.isfile(f) then
+					ca = f
+					break
+				end
+			end
+			if ca then
+				defines { 'CURL_CA_BUNDLE=\\"' .. ca .. '\\"' }
+			end
+		end
 
 	configuration { 'macosx' }
-		defines { 'HAVE_CONFIG_H' }	
+		defines { 'HAVE_CONFIG_H', 'USE_SSL', 'USE_DARWINSSL' }	
 
 	configuration "Release"
 		defines {"NDEBUG"}

premake5.lua

@@ -90,6 +90,10 @@
 		configurations { "Release", "Debug" }
 		location ( _OPTIONS["to"] )
 
+		configuration { "macosx", "gmake" }
+			buildoptions { "-mmacosx-version-min=10.4" }
+			linkoptions  { "-mmacosx-version-min=10.4" }
+
 	project "Premake5"
 		targetname  "premake5"
 		language    "C"
@@ -155,14 +159,20 @@
 		configuration "linux or hurd"
 			links       { "dl", "rt" }
 
+		configuration "linux"
+			if not _OPTIONS["no-curl"] and os.findlib("ssl") then
+				links       { "ssl", "crypto" }
+			end
+
 		configuration "macosx"
 			defines     { "LUA_USE_MACOSX" }
 			links       { "CoreServices.framework" }
+			if not _OPTIONS["no-curl"] then
+				links   { "Security.framework" }
+			end
 
 		configuration { "macosx", "gmake" }
 			toolset "clang"
-			buildoptions { "-mmacosx-version-min=10.4" }
-			linkoptions  { "-mmacosx-version-min=10.4" }
 
 		configuration { "solaris" }
 			linkoptions { "-Wl,--export-dynamic" }
@@ -171,6 +181,7 @@
 			defines     { "LUA_USE_POSIX", "LUA_USE_DLOPEN" }
 			links       { "m" }
 
+
 	-- optional 3rd party libraries
 	group "contrib"
 		if not _OPTIONS["no-zlib"] then

src/tools/gcc.lua

@@ -304,9 +304,11 @@
 			end
 		end
 
-		if #result > 1 then
-			table.insert(result, 1, "-Wl,--start-group")
-			table.insert(result, "-Wl,--end-group")
+		if cfg.system ~= premake.MACOSX then
+			if #result > 1 then
+				table.insert(result, 1, "-Wl,--start-group")
+				table.insert(result, "-Wl,--end-group")
+			end
 		end
 
 		-- The "-l" flag is fine for system libraries