Merging upstream version 0.8.

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

1 files changed, 11 insertions, 9 deletions

diff --git a/configure b/configure
index c94a506..2a45a9a 100755
--- a/configure
+++ b/configure
@@ -1,17 +1,18 @@
 #! /bin/sh
 # configure script for Zutils - Utilities dealing with compressed files
-# Copyright (C) 2009 Antonio Diaz Diaz.
+# Copyright (C) 2009, 2010 Antonio Diaz Diaz.
 #
 # This configure script is free software: you have unlimited permission
 # to copy, distribute and modify it.
 #
-# Date of this version: 2009-12-01
+# Date of this version: 2010-11-15
 
 args=
 no_create=
+pkgname=zutils
+pkgversion=0.8
 progname=zutils
-progversion=0.8-rc1
-srctrigger=zdiff.in
+srctrigger=zutils.h
 
 # clear some things potentially inherited from environment.
 LC_ALL=C
@@ -69,7 +70,7 @@ while [ -n "$1" ] ; do
 		echo
 		exit 0 ;;
 	--version | --ve* | -V)
-		echo "Configure script for ${progname} version ${progversion}"
+		echo "Configure script for ${pkgname} version ${pkgversion}"
 		exit 0 ;;
 	--srcdir* | --sr*)
 		srcdir=`echo ${optarg} | sed -e 's,/$,,'` ;;
@@ -81,7 +82,7 @@ while [ -n "$1" ] ; do
 		bindir=`echo ${optarg} | sed -e 's,/$,,'` ;;
 	--datadir* | --da*)
 		datadir=`echo ${optarg} | sed -e 's,/$,,'` ;;
-	--infodir* | --in*)
+	--infodir* | --inf*)
 		infodir=`echo ${optarg} | sed -e 's,/$,,'` ;;
 	--mandir* | --ma*)
 		mandir=`echo ${optarg} | sed -e 's,/$,,'` ;;
@@ -136,7 +137,7 @@ if [ -z "${CXX}" ] ; then		# Let the user override the test.
 fi
 
 echo
-if [ x${no_create} = x ] ; then
+if [ -z "${no_create}" ] ; then
 	echo "creating config.status"
 	rm -f config.status
 	cat > config.status << EOF
@@ -168,14 +169,15 @@ echo "LDFLAGS = ${LDFLAGS}"
 rm -f Makefile
 cat > Makefile << EOF
 # Makefile for Zutils - Utilities dealing with compressed files
-# Copyright (C) 2009 Antonio Diaz Diaz.
+# Copyright (C) 2009, 2010 Antonio Diaz Diaz.
 # This file was generated automatically by configure. Do not edit.
 #
 # This Makefile is free software: you have unlimited permission
 # to copy, distribute and modify it.
 
+pkgname = ${pkgname}
+pkgversion = ${pkgversion}
 progname = ${progname}
-progversion = ${progversion}
 VPATH = ${srcdir}
 prefix = ${prefix}
 exec_prefix = ${exec_prefix}