# HG changeset patch
# User Kim Alvefur <zash@zash.se>
# Date 1472047096 -7200
# Node ID 9ddc9401911f64c3c703b4c2776fc234ec92924c
# Parent  f50c039d6bb16a9feb41b245b2a18cd685a0334b# Parent  2b14e2121700032b385a5d31cfdfb5815385c926
Merge 0.10->trunk

diff -r f50c039d6bb1 -r 9ddc9401911f configure
--- a/configure	Wed Aug 24 00:34:46 2016 +0200
+++ b/configure	Wed Aug 24 15:58:16 2016 +0200
@@ -32,8 +32,8 @@
 Configure Prosody prior to building.
 
 --help                      This help.
---ostype=OS                 Use one of the OS presets.
-                            May be one of: debian, macosx, linux, freebsd, openbsd
+--ostype=OS                 Use one of the OS presets. May be one of:
+                            debian, macosx, linux, freebsd, openbsd, netbsd
 --prefix=DIR                Prefix where Prosody should be installed.
                             Default is $PREFIX
 --sysconfdir=DIR            Location where the config file should be installed.
@@ -146,6 +146,15 @@
          LUA_INCDIR="/usr/local/include";
          LUA_INCDIR_SET="yes"
       fi
+      if [ "$OSTYPE" = "netbsd" ]; then
+         RUNWITH="lua5.1"
+         LUA_INCDIR="/usr/pkg/include/lua-5.1"
+         LUA_INCDIR_SET=yes
+         LUA_LIBDIR="/usr/pkg/lib/lua/5.1"
+         LUA_LIBDIR_SET=yes
+         CFLAGS="-Wall -fPIC -I/usr/pkg/include"
+         LDFLAGS="-L/usr/pkg/lib -Wl,-rpath,/usr/pkg/lib -shared"
+      fi
       if [ "$OSTYPE" = "pkg-config" ]; then
          if [ "$LUA_SUFFIX_SET" != "yes" ]; then
             LUA_SUFFIX="5.1";