Merge 0.9->0.10

[prosody.git] / configure

diff --git a/configure b/configure
index d669d3a8ebccc686a42376de76abcf785065cfab..84f4b9ef251f343cf0c89cdffe8f0120ab006a3b 100755 (executable)
--- a/configure
+++ b/configure
@@ -138,6 +138,7 @@ do
       ;;
    --libdir=*)
       LIBDIR="$value"
+      LIBDIR_SET=yes
       ;;
    --datadir=*)
        DATADIR="$value"
@@ -212,6 +213,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/'`"