Merging upstream version 1.6~pre3.

Signed-off-by: Daniel Baumann <daniel@debian.org>

configure

@@ -6,10 +6,12 @@
 # to copy, distribute and modify it.
 
 pkgname=lzlib
-pkgversion=1.6-pre2
+pkgversion=1.6-pre3
 soversion=1
 progname=minilzip
+progname_static=${progname}
 progname_shared=
+progname_lzip=${progname}
 disable_ldconfig=
 libname=lz
 srctrigger=doc/${pkgname}.texi
@@ -72,6 +74,8 @@ while [ $# != 0 ] ; do
 		echo "  --infodir=DIR         info files directory [${infodir}]"
 		echo "  --libdir=DIR          object code libraries [${libdir}]"
 		echo "  --mandir=DIR          man pages directory [${mandir}]"
+		echo "  --disable-static      do not build a static library [enable]"
+		echo "                        (implies --enable-shared)"
 		echo "  --enable-shared       build also a shared library [disable]"
 		echo "  --disable-ldconfig    do not run ldconfig after install"
 		echo "  CC=COMPILER           C compiler to use [gcc]"
@@ -103,6 +107,10 @@ while [ $# != 0 ] ; do
 	--libdir=*)            libdir=${optarg} ;;
 	--mandir=*)            mandir=${optarg} ;;
 	--no-create)              no_create=yes ;;
+	--disable-static)
+		progname_static=
+		progname_shared=${progname}_shared
+		progname_lzip=${progname}_shared ;;
 	--enable-shared) progname_shared=${progname}_shared ;;
 	--disable-ldconfig) disable_ldconfig=yes ;;
 
@@ -193,7 +201,9 @@ pkgname = ${pkgname}
 pkgversion = ${pkgversion}
 soversion = ${soversion}
 progname = ${progname}
+progname_static = ${progname_static}
 progname_shared = ${progname_shared}
+progname_lzip = ${progname_lzip}
 disable_ldconfig = ${disable_ldconfig}
 libname = ${libname}
 VPATH = ${srcdir}