Merge 0.10->trunk

1 files changed, 11 insertions, 2 deletions

diff --git a/configure b/configure
index 2c1ecabe..2513eed3 100755
--- a/configure
+++ b/configure
@@ -32,8 +32,8 @@ cat <<EOF
 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 @@ do
          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";