util.xml: Remove unused parameter (thanks, luacheck)

[prosody.git] / configure

diff --git a/configure b/configure
index d669d3a8ebccc686a42376de76abcf785065cfab..37f45f9b1efd231060c98351cc09d0807cf17064 100755 (executable)
--- a/configure
+++ b/configure
@@ -32,7 +32,7 @@ Configure Prosody prior to building.
 
 --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 @@ do
         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";
@@ -138,6 +140,7 @@ do
       ;;
    --libdir=*)
       LIBDIR="$value"
+      LIBDIR_SET=yes
       ;;
    --datadir=*)
        DATADIR="$value"
@@ -212,6 +215,11 @@ then
    fi
 fi
 
+if [ "$PREFIX_SET" = "yes" -a ! "$LIBDIR_SET" = "yes" ]
+then
+   LIBDIR=$PREFIX/lib
+fi
+
 find_program() {
    path="$PATH"
    item="`echo "$path" | sed 's/\([^:]*\):.*/\1/'`"