# HG changeset patch
# User Kim Alvefur <zash@zash.se>
# Date 1430085794 -7200
# Node ID 441f8cb0deec223ce0922aa63e300ac1fa7c0989
# Parent  832987170da80e46b1b91057da93aa3ff3d21017# Parent  ef88a6072228050052597d5283cbc4b9026e762c
Merge 0.10->trunk

diff -r 832987170da8 -r 441f8cb0deec configure
--- a/configure	Sun Apr 26 00:07:36 2015 +0200
+++ b/configure	Mon Apr 27 00:03:14 2015 +0200
@@ -32,7 +32,7 @@
 
 --help                      This help.
 --ostype=OS                 Use one of the OS presets.
-                            May be one of: debian, macosx, linux, freebsd
+                            May be one of: debian, macosx, linux, freebsd, openbsd
 --prefix=DIR                Prefix where Prosody should be installed.
                             Default is $PREFIX
 --sysconfdir=DIR            Location where the config file should be installed.
@@ -131,6 +131,8 @@
         LUA_SUFFIX_SET=yes
         LUA_DIR=/usr/local
         LUA_DIR_SET=yes
+        CC=cc
+        LD=ld
       fi
       if [ "$OSTYPE" = "openbsd" ]; then
         LUA_INCDIR="/usr/local/include";