Merge 0.10->trunk

author: Kim Alvefur <zash@zash.se>
date: Sun, 27 Sep 2015 00:37:18 +0200
parent: 6886:27f5a76e3fa5
child: 7187:3d2c2f0809ee
--- a/configure	Fri Sep 25 18:11:45 2015 +0200
+++ b/configure	Sun Sep 27 00:37:18 2015 +0200
@@ -112,6 +112,7 @@
       	LUA_INCDIR_SET=yes
       	LUA_LIBDIR=/usr/local/lib
       	LUA_LIBDIR_SET=yes
+      	CFLAGS="$CFLAGS -mmacosx-version-min=10.3"
       	LDFLAGS="-bundle -undefined dynamic_lookup"
     	fi
       if [ "$OSTYPE" = "linux" ]; then
@@ -309,6 +310,8 @@
 	IDNA_LIBS="-l$IDN_LIB"
 fi
 
+OPENSSL_LIBS="-l$OPENSSL_LIB"
+
 echo -n "Checking Lua includes... "
 lua_h="$LUA_INCDIR/lua.h"
 if [ -f "$lua_h" ]
@@ -361,7 +364,7 @@
 REQUIRE_CONFIG=$REQUIRE_CONFIG
 IDN_LIB=$IDN_LIB
 IDNA_LIBS=$IDNA_LIBS
-OPENSSL_LIB=$OPENSSL_LIB
+OPENSSL_LIBS=$OPENSSL_LIBS
 CFLAGS=$CFLAGS
 LDFLAGS=$LDFLAGS
 CC=$CC