Merging upstream version 1.6~pre1.

Signed-off-by: Daniel Baumann <mail@daniel-baumann.ch>

1 files changed, 5 insertions, 1 deletions

diff --git a/configure b/configure
index d021c9f..cbd6078 100755
--- a/configure
+++ b/configure
@@ -6,10 +6,11 @@
 # to copy, distribute and modify it.
 
 pkgname=lzlib
-pkgversion=1.5
+pkgversion=1.6-pre1
 soversion=1
 progname=minilzip
 progname_shared=
+disable_ldconfig=
 libname=lz
 srctrigger=doc/${pkgname}.texinfo
 
@@ -72,6 +73,7 @@ while [ $# != 0 ] ; do
 		echo "  --libdir=DIR          object code libraries [${libdir}]"
 		echo "  --mandir=DIR          man pages directory [${mandir}]"
 		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]"
 		echo "  CPPFLAGS=OPTIONS      command line options for the preprocessor [${CPPFLAGS}]"
 		echo "  CFLAGS=OPTIONS        command line options for the C compiler [${CFLAGS}]"
@@ -102,6 +104,7 @@ while [ $# != 0 ] ; do
 	--mandir=*)            mandir=${optarg} ;;
 	--no-create)              no_create=yes ;;
 	--enable-shared) progname_shared=${progname}_shared ;;
+	--disable-ldconfig) disable_ldconfig=yes ;;
 
 	CC=*)             CC=${optarg} ;;
 	CPPFLAGS=*) CPPFLAGS=${optarg} ;;
@@ -191,6 +194,7 @@ pkgversion = ${pkgversion}
 soversion = ${soversion}
 progname = ${progname}
 progname_shared = ${progname_shared}
+disable_ldconfig = ${disable_ldconfig}
 libname = ${libname}
 VPATH = ${srcdir}
 prefix = ${prefix}