Merge 0.9->0.10

diff --combined configure
index d669d3a8ebccc686a42376de76abcf785065cfab,199f5fcf8c0a9b45b24de6b6c264b73f2ba509e6..84f4b9ef251f343cf0c89cdffe8f0120ab006a3b
--- 1/configure
--- 2/configure
+++ b/configure
@@@ -99,31 -99,32 +99,31 @@@ d
     --ostype=*)
        OSTYPE="$value"
        OSTYPE_SET=yes
 -      if [ "$OSTYPE" = "debian" ]
 -      then LUA_SUFFIX="5.1";
 -      LUA_SUFFIX_SET=yes
 -      RUNWITH="lua5.1"
 -      LUA_INCDIR=/usr/include/lua5.1;
 -      LUA_INCDIR_SET=yes
 -      CFLAGS="$CFLAGS -D_GNU_SOURCE"
 -      fi
 -      if [ "$OSTYPE" = "macosx" ]
 -      then LUA_INCDIR=/usr/local/include;
 -      LUA_INCDIR_SET=yes
 -      LUA_LIBDIR=/usr/local/lib
 -      LUA_LIBDIR_SET=yes
 -      LDFLAGS="-bundle -undefined dynamic_lookup"
 -      fi
 -        if [ "$OSTYPE" = "linux" ]
 -        then LUA_INCDIR=/usr/local/include;
 +      if [ "$OSTYPE" = "debian" ]; then
 +        LUA_SUFFIX="5.1";
 +              LUA_SUFFIX_SET=yes
 +              RUNWITH="lua5.1"
 +              LUA_INCDIR=/usr/include/lua5.1;
 +              LUA_INCDIR_SET=yes
 +              CFLAGS="$CFLAGS -D_GNU_SOURCE"
 +      fi
 +      if [ "$OSTYPE" = "macosx" ]; then
 +        LUA_INCDIR=/usr/local/include;
 +              LUA_INCDIR_SET=yes
 +              LUA_LIBDIR=/usr/local/lib
 +              LUA_LIBDIR_SET=yes
 +              LDFLAGS="-bundle -undefined dynamic_lookup"
 +      fi
 +      if [ "$OSTYPE" = "linux" ]; then
 +        LUA_INCDIR=/usr/local/include;
          LUA_INCDIR_SET=yes
          LUA_LIBDIR=/usr/local/lib
          LUA_LIBDIR_SET=yes
 -        CFLAGS="-Wall -fPIC"
 -        CFLAGS="$CFLAGS -D_GNU_SOURCE"
 +        CFLAGS="-Wall -fPIC -D_GNU_SOURCE"
          LDFLAGS="-shared"
 -        fi
 -        if [ "$OSTYPE" = "freebsd" -o "$OSTYPE" = "openbsd" ]
 -        then LUA_INCDIR="/usr/local/include/lua51"
 +      fi
 +      if [ "$OSTYPE" = "freebsd" -o "$OSTYPE" = "openbsd" ]; then
 +        LUA_INCDIR="/usr/local/include/lua51"
          LUA_INCDIR_SET=yes
          CFLAGS="-Wall -fPIC -I/usr/local/include"
          LDFLAGS="-I/usr/local/include -L/usr/local/lib -shared"
@@@ -131,13 -132,14 +131,14 @@@
          LUA_SUFFIX_SET=yes
          LUA_DIR=/usr/local
          LUA_DIR_SET=yes
 -        fi
 -        if [ "$OSTYPE" = "openbsd" ]
 -        then LUA_INCDIR="/usr/local/include";
 -        fi
 +      fi
 +      if [ "$OSTYPE" = "openbsd" ]; then
 +        LUA_INCDIR="/usr/local/include";
 +      fi
        ;;
     --libdir=*)
        LIBDIR="$value"
+       LIBDIR_SET=yes
        ;;
     --datadir=*)
        DATADIR="$value"
@@@ -212,6 -214,11 +213,11 @@@ the
     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/'`"
@@@ -296,7 -303,7 +302,7 @@@ the
        IDNA_LIBS="$ICU_FLAGS"
        CFLAGS="$CFLAGS -DUSE_STRINGPREP_ICU"
  fi
 -if [ "$IDN_LIBRARY" = "idn" ] 
 +if [ "$IDN_LIBRARY" = "idn" ]
  then
        IDNA_LIBS="-l$IDN_LIB"
  fi