prosody
441f8cb0deec

Find changesets by keywords by author, files, the commit message, revision number or hash, or revset expression.

Software / code / prosody

Changeset

6636:441f8cb0deec

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Mon, 27 Apr 2015 00:03:14 +0200
parents 6633:832987170da8 (current diff) 6635:ef88a6072228 (diff)
children 6647:0c363fddcdd9
files
diffstat 1 files changed, 3 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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";