Merging upstream version 1.0~rc1.

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

configure

@@ -1,6 +1,6 @@
 #! /bin/sh
 # configure script for Plzip - A parallel compressor compatible with lzip
-# Copyright (C) 2009, 2010, 2011, 2012 Antonio Diaz Diaz.
+# Copyright (C) 2009, 2010, 2011, 2012, 2013 Antonio Diaz Diaz.
 #
 # This configure script is free software: you have unlimited permission
 # to copy, distribute and modify it.
@@ -8,9 +8,9 @@
 args=
 no_create=
 pkgname=plzip
-pkgversion=0.9
+pkgversion=1.0-rc1
 progname=plzip
-srctrigger=plzip.h
+srctrigger=doc/plzip.texinfo
 
 # clear some things potentially inherited from environment.
 LC_ALL=C
@@ -22,11 +22,19 @@ bindir='$(exec_prefix)/bin'
 datarootdir='$(prefix)/share'
 infodir='$(datarootdir)/info'
 mandir='$(datarootdir)/man'
-CXX=
+CXX=g++
 CPPFLAGS=
 CXXFLAGS='-Wall -W -O2'
 LDFLAGS=
 
+# checking whether we are using GNU C++.
+if [ ! -x /bin/g++ ] &&
+   [ ! -x /usr/bin/g++ ] &&
+   [ ! -x /usr/local/bin/g++ ] ; then
+	CXX=c++
+	CXXFLAGS='-W -O2'
+fi
+
 # Loop over all args
 while [ -n "$1" ] ; do
 
@@ -109,17 +117,6 @@ fi
 # Set srcdir to . if that's what it is.
 if [ "`pwd`" = "`cd "${srcdir}" ; pwd`" ] ; then srcdir=. ; fi
 
-# checking whether we are using GNU C++.
-if [ -z "${CXX}" ] ; then		# Let the user override the test.
-	if [ -x /bin/g++ ] ||
-	   [ -x /usr/bin/g++ ] ||
-	   [ -x /usr/local/bin/g++ ] ; then
-		CXX="g++"
-	else
-		CXX="c++"
-	fi
-fi
-
 echo
 if [ -z "${no_create}" ] ; then
 	echo "creating config.status"
@@ -152,7 +149,7 @@ echo "LDFLAGS = ${LDFLAGS}"
 rm -f Makefile
 cat > Makefile << EOF
 # Makefile for Plzip - A parallel compressor compatible with lzip
-# Copyright (C) 2009, 2010, 2011, 2012 Antonio Diaz Diaz.
+# Copyright (C) 2009, 2010, 2011, 2012, 2013 Antonio Diaz Diaz.
 # This file was generated automatically by configure. Do not edit.
 #
 # This Makefile is free software: you have unlimited permission