Merging upstream version 1.1~rc2.

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

1 files changed, 11 insertions, 7 deletions

diff --git a/configure b/configure
index 6447312..2d5898f 100755
--- a/configure
+++ b/configure
@@ -6,9 +6,9 @@
 # to copy, distribute and modify it.
 
 pkgname=zutils
-pkgversion=1.0
+pkgversion=1.1-rc2
 progname=zutils
-srctrigger=zutils.h
+srctrigger=${pkgname}rc
 
 # clear some things potentially inherited from environment.
 LC_ALL=C
@@ -20,6 +20,7 @@ bindir='$(exec_prefix)/bin'
 datarootdir='$(prefix)/share'
 infodir='$(datarootdir)/info'
 mandir='$(datarootdir)/man'
+sysconfdir='$(prefix)/etc'
 CXX=g++
 CPPFLAGS=
 CXXFLAGS='-Wall -W -O2'
@@ -66,6 +67,7 @@ while [ $# != 0 ] ; do
 		echo "  --datarootdir=DIR     base directory for doc and data [${datarootdir}]"
 		echo "  --infodir=DIR         info files directory [${infodir}]"
 		echo "  --mandir=DIR          man pages directory [${mandir}]"
+		echo "  --sysconfdir=DIR      read-only single-machine data directory [${sysconfdir}]"
 		echo "  CXX=COMPILER          C++ compiler to use [g++]"
 		echo "  CPPFLAGS=OPTIONS      command line options for the preprocessor [${CPPFLAGS}]"
 		echo "  CXXFLAGS=OPTIONS      command line options for the C++ compiler [${CXXFLAGS}]"
@@ -84,6 +86,7 @@ while [ $# != 0 ] ; do
 	--datarootdir)  datarootdir=$1 ; arg2=yes ;;
 	--infodir)          infodir=$1 ; arg2=yes ;;
 	--mandir)            mandir=$1 ; arg2=yes ;;
+	--sysconfdir)    sysconfdir=$1 ; arg2=yes ;;
 
 	--srcdir=*)            srcdir=${optarg} ;;
 	--prefix=*)            prefix=${optarg} ;;
@@ -92,6 +95,7 @@ while [ $# != 0 ] ; do
 	--datarootdir=*)  datarootdir=${optarg} ;;
 	--infodir=*)          infodir=${optarg} ;;
 	--mandir=*)            mandir=${optarg} ;;
+	--sysconfdir=*)    sysconfdir=${optarg} ;;
 	--no-create)              no_create=yes ;;
 
 	CXX=*)           CXX=${optarg} ;;
@@ -106,7 +110,7 @@ while [ $# != 0 ] ; do
 	*=* | *-*-*) ;;
 	*)
 		echo "configure: unrecognized option: '${option}'" 1>&2
-		echo "Try 'configure --help' for more information."
+		echo "Try 'configure --help' for more information." 1>&2
 		exit 1 ;;
 	esac
 
@@ -131,10 +135,8 @@ if [ -z "${srcdir}" ] ; then
 fi
 
 if [ ! -r "${srcdir}/${srctrigger}" ] ; then
-	exec 1>&2
-	echo
-	echo "configure: Can't find sources in ${srcdir} ${srcdirtext}"
-	echo "configure: (At least ${srctrigger} is missing)."
+	echo "configure: Can't find sources in ${srcdir} ${srcdirtext}" 1>&2
+	echo "configure: (At least ${srctrigger} is missing)." 1>&2
 	exit 1
 fi
 
@@ -166,6 +168,7 @@ echo "bindir = ${bindir}"
 echo "datarootdir = ${datarootdir}"
 echo "infodir = ${infodir}"
 echo "mandir = ${mandir}"
+echo "sysconfdir = ${sysconfdir}"
 echo "CXX = ${CXX}"
 echo "CPPFLAGS = ${CPPFLAGS}"
 echo "CXXFLAGS = ${CXXFLAGS}"
@@ -191,6 +194,7 @@ bindir = ${bindir}
 datarootdir = ${datarootdir}
 infodir = ${infodir}
 mandir = ${mandir}
+sysconfdir = ${sysconfdir}
 CXX = ${CXX}
 CPPFLAGS = ${CPPFLAGS}
 CXXFLAGS = ${CXXFLAGS}