# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1424791329 0
# Node ID 74946f050209c7d72a9865d409e71224290e2e9f
# Parent  1e749832ed3b1f110790d47ebc61769a3638f84c# Parent  5a82ee60e07e273a85969452ec18b1f1c5e0a404
Merge 0.9->0.10

diff -r 1e749832ed3b -r 74946f050209 configure
--- a/configure	Sun Feb 22 18:44:48 2015 +0100
+++ b/configure	Tue Feb 24 15:22:09 2015 +0000
@@ -138,6 +138,7 @@
       ;;
    --libdir=*)
       LIBDIR="$value"
+      LIBDIR_SET=yes
       ;;
    --datadir=*)
    	DATADIR="$value"
@@ -212,6 +213,11 @@
    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/'`"
diff -r 1e749832ed3b -r 74946f050209 plugins/mod_admin_telnet.lua