summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Baumann <mail@daniel-baumann.ch>2015-11-08 04:17:11 +0000
committerDaniel Baumann <mail@daniel-baumann.ch>2015-11-08 04:17:11 +0000
commit92411a5d4d0083722696abf6fdfcc8f1c894a150 (patch)
tree6537ba2692e058862caa756938bc00df8462deaf
parentAdding debian version 0.7-1. (diff)
downloadzutils-92411a5d4d0083722696abf6fdfcc8f1c894a150.tar.xz
zutils-92411a5d4d0083722696abf6fdfcc8f1c894a150.zip
Merging upstream version 0.8~rc1.
Signed-off-by: Daniel Baumann <mail@daniel-baumann.ch>
-rw-r--r--ChangeLog6
-rw-r--r--NEWS8
-rwxr-xr-xconfigure41
-rw-r--r--doc/zcat.12
-rw-r--r--doc/zdiff.12
-rw-r--r--doc/zgrep.12
-rw-r--r--doc/ztest.12
-rw-r--r--doc/zutils.infobin7251 -> 7255 bytes
-rw-r--r--doc/zutils.texinfo4
-rwxr-xr-xtestsuite/check.sh2
-rw-r--r--zcat.in4
-rw-r--r--zdiff.in4
-rw-r--r--zgrep.in4
-rw-r--r--ztest.in4
14 files changed, 35 insertions, 50 deletions
diff --git a/ChangeLog b/ChangeLog
index 9b76424..85f7717 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2009-12-01 Antonio Diaz Diaz <ant_diaz@teleline.es>
+
+ * Version 0.8-rc1 released.
+ * Removed environment safeguards from configure as requested by
+ Richard Stallman. Now environment variables affect configure.
+
2009-10-21 Antonio Diaz Diaz <ant_diaz@teleline.es>
* Version 0.7 released.
diff --git a/NEWS b/NEWS
index f089972..66001d3 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,4 @@
-Changes in version 0.7:
+Changes in version 0.8:
-The new utility ztest, able to recursively test all the compressed files
-in a directory tree, has been added.
-
-The option "--recursive" has been added to zcat.
+Environment safeguards from configure have been removed. This allows
+environment variables to affect configuration.
diff --git a/configure b/configure
index c8eda48..c94a506 100755
--- a/configure
+++ b/configure
@@ -5,12 +5,12 @@
# This configure script is free software: you have unlimited permission
# to copy, distribute and modify it.
#
-# Date of this version: 2009-10-21
+# Date of this version: 2009-12-01
args=
no_create=
progname=zutils
-progversion=0.7
+progversion=0.8-rc1
srctrigger=zdiff.in
# clear some things potentially inherited from environment.
@@ -24,15 +24,15 @@ datadir='$(prefix)/share'
infodir='$(datadir)/info'
mandir='$(datadir)/man'
sysconfdir='$(prefix)/etc'
-CC=
-CXX=
-CPPFLAGS=
-CFLAGS='-Wall -W -O2'
-CXXFLAGS='-Wall -W -O2'
-LDFLAGS=
+
+if [ -n "${CXX}" ] ; then args="${args} CXX=\"${CXX}\"" ; fi
+if [ -n "${CPPFLAGS}" ] ; then args="${args} CPPFLAGS=\"${CPPFLAGS}\"" ; fi
+if [ -n "${CXXFLAGS}" ] ; then args="${args} CXXFLAGS=\"${CXXFLAGS}\""
+else CXXFLAGS='-Wall -W -O2' ; fi
+if [ -n "${LDFLAGS}" ] ; then args="${args} LDFLAGS=\"${LDFLAGS}\"" ; fi
# Loop over all args
-while [ x"$1" != x ] ; do
+while [ -n "$1" ] ; do
# Get the first arg, and shuffle
option=$1
@@ -62,10 +62,8 @@ while [ x"$1" != x ] ; do
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 " CC=COMPILER C compiler to use [gcc]"
echo " CXX=COMPILER C++ compiler to use [g++]"
echo " CPPFLAGS=OPTIONS command line options for the preprocessor [${CPPFLAGS}]"
- echo " CFLAGS=OPTIONS command line options for the C compiler [${CFLAGS}]"
echo " CXXFLAGS=OPTIONS command line options for the C++ compiler [${CXXFLAGS}]"
echo " LDFLAGS=OPTIONS command line options for the linker [${LDFLAGS}]"
echo
@@ -92,10 +90,8 @@ while [ x"$1" != x ] ; do
--no-create | --no-c*)
no_create=yes ;;
- CC=*) CC=${optarg} ;;
CXX=*) CXX=${optarg} ;;
CPPFLAGS=*) CPPFLAGS=${optarg} ;;
- CFLAGS=*) CFLAGS=${optarg} ;;
CXXFLAGS=*) CXXFLAGS=${optarg} ;;
LDFLAGS=*) LDFLAGS=${optarg} ;;
@@ -108,7 +104,7 @@ done
# Find the source files, if location was not specified.
srcdirtext=
-if [ x"${srcdir}" = x ] ; then
+if [ -z "${srcdir}" ] ; then
srcdirtext="or . or .." ; srcdir=.
if [ ! -r ${srcdir}/${srctrigger} ] ; then srcdir=.. ; fi
if [ ! -r ${srcdir}/${srctrigger} ] ; then
@@ -128,19 +124,8 @@ 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 [ x"${CC}" = x ] ; then # Let the user override the test.
- if [ -x /bin/gcc ] ||
- [ -x /usr/bin/gcc ] ||
- [ -x /usr/local/bin/gcc ] ; then
- CC="gcc"
- else
- CC="cc"
- fi
-fi
-
# checking whether we are using GNU C++.
-if [ x"${CXX}" = x ] ; then # Let the user override the test.
+if [ -z "${CXX}" ] ; then # Let the user override the test.
if [ -x /bin/g++ ] ||
[ -x /usr/bin/g++ ] ||
[ -x /usr/local/bin/g++ ] ; then
@@ -176,10 +161,8 @@ echo "datadir = ${datadir}"
echo "infodir = ${infodir}"
echo "mandir = ${mandir}"
echo "sysconfdir = ${sysconfdir}"
-echo "CC = ${CC}"
echo "CXX = ${CXX}"
echo "CPPFLAGS = ${CPPFLAGS}"
-echo "CFLAGS = ${CFLAGS}"
echo "CXXFLAGS = ${CXXFLAGS}"
echo "LDFLAGS = ${LDFLAGS}"
rm -f Makefile
@@ -201,10 +184,8 @@ datadir = ${datadir}
infodir = ${infodir}
mandir = ${mandir}
sysconfdir = ${sysconfdir}
-CC = ${CC}
CXX = ${CXX}
CPPFLAGS = ${CPPFLAGS}
-CFLAGS = ${CFLAGS}
CXXFLAGS = ${CXXFLAGS}
LDFLAGS = ${LDFLAGS}
EOF
diff --git a/doc/zcat.1 b/doc/zcat.1
index 5187b27..407e270 100644
--- a/doc/zcat.1
+++ b/doc/zcat.1
@@ -1,5 +1,5 @@
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.36.
-.TH ZCAT "1" "October 2009" "Zcat 0.7" "User Commands"
+.TH ZCAT "1" "December 2009" "Zcat (zutils) 0.8-rc1" "User Commands"
.SH NAME
Zcat \- concatenate compressed files to stdout
.SH SYNOPSIS
diff --git a/doc/zdiff.1 b/doc/zdiff.1
index 896d735..dc7abdb 100644
--- a/doc/zdiff.1
+++ b/doc/zdiff.1
@@ -1,5 +1,5 @@
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.36.
-.TH ZDIFF "1" "October 2009" "Zdiff 0.7" "User Commands"
+.TH ZDIFF "1" "December 2009" "Zdiff (zutils) 0.8-rc1" "User Commands"
.SH NAME
Zdiff \- compare compressed files
.SH SYNOPSIS
diff --git a/doc/zgrep.1 b/doc/zgrep.1
index 92c4010..fee5e3d 100644
--- a/doc/zgrep.1
+++ b/doc/zgrep.1
@@ -1,5 +1,5 @@
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.36.
-.TH ZGREP "1" "October 2009" "Zgrep 0.7" "User Commands"
+.TH ZGREP "1" "December 2009" "Zgrep (zutils) 0.8-rc1" "User Commands"
.SH NAME
Zgrep \- search compressed files for a regular expression
.SH SYNOPSIS
diff --git a/doc/ztest.1 b/doc/ztest.1
index f32c7d7..2c53401 100644
--- a/doc/ztest.1
+++ b/doc/ztest.1
@@ -1,5 +1,5 @@
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.36.
-.TH ZTEST "1" "October 2009" "Ztest 0.7" "User Commands"
+.TH ZTEST "1" "December 2009" "Ztest (zutils) 0.8-rc1" "User Commands"
.SH NAME
Ztest \- verify integrity of compressed files
.SH SYNOPSIS
diff --git a/doc/zutils.info b/doc/zutils.info
index ba5ff0a..e9762b9 100644
--- a/doc/zutils.info
+++ b/doc/zutils.info
Binary files differ
diff --git a/doc/zutils.texinfo b/doc/zutils.texinfo
index d6f724d..5442249 100644
--- a/doc/zutils.texinfo
+++ b/doc/zutils.texinfo
@@ -5,8 +5,8 @@
@finalout
@c %**end of header
-@set UPDATED 21 October 2009
-@set VERSION 0.7
+@set UPDATED 1 December 2009
+@set VERSION 0.8-rc1
@dircategory Data Compression
@direntry
diff --git a/testsuite/check.sh b/testsuite/check.sh
index 1c8b249..94e9c71 100755
--- a/testsuite/check.sh
+++ b/testsuite/check.sh
@@ -18,7 +18,7 @@ ZFGREP="${objdir}"/zfgrep
ZTEST="${objdir}"/ztest
ZUTILS="${objdir}"/zutils
compressors="bzip2 gzip lzip"
-extensions="gz bz2 lz"
+extensions="bz2 gz lz"
framework_failure() { echo 'failure in testing framework'; exit 1; }
compressor_needed() { echo "${compressors} are needed to run tests"; exit 1; }
diff --git a/zcat.in b/zcat.in
index 010b7bb..2284c97 100644
--- a/zcat.in
+++ b/zcat.in
@@ -14,7 +14,7 @@ recursive=0
two_hyphens=0
# Loop over args until a filename is found
-while [ x"$1" != x ] ; do
+while [ -n "$1" ] ; do
case "$1" in
--help | --he* | -h)
@@ -44,7 +44,7 @@ while [ x"$1" != x ] ; do
echo "Zutils home page: http://www.nongnu.org/zutils/zutils.html"
exit 0 ;;
--version | --ve* | -V)
- echo "Zcat VERSION"
+ echo "Zcat (zutils) VERSION"
echo "Copyright (C) 2009 Antonio Diaz Diaz."
echo "This script is free software: you have unlimited permission"
echo "to copy, distribute and modify it."
diff --git a/zdiff.in b/zdiff.in
index 0ece51f..dde93ba 100644
--- a/zdiff.in
+++ b/zdiff.in
@@ -14,7 +14,7 @@ file2=
two_hyphens=0
# Loop over args
-while [ x"$1" != x ] ; do
+while [ -n "$1" ] ; do
case "$1" in
--help | --he* | -h)
@@ -47,7 +47,7 @@ while [ x"$1" != x ] ; do
echo "Zutils home page: http://www.nongnu.org/zutils/zutils.html"
exit 0 ;;
--version | --ve* | -V)
- echo "Zdiff VERSION"
+ echo "Zdiff (zutils) VERSION"
echo "Copyright (C) 2009 Antonio Diaz Diaz."
echo "This script is free software: you have unlimited permission"
echo "to copy, distribute and modify it."
diff --git a/zgrep.in b/zgrep.in
index 3298646..dbcb58c 100644
--- a/zgrep.in
+++ b/zgrep.in
@@ -14,7 +14,7 @@ no_name=0
two_hyphens=0
# Loop over args until pattern is found
-while [ x"$1" != x ] ; do
+while [ -n "$1" ] ; do
case "$1" in
--help | --he* | -h)
@@ -46,7 +46,7 @@ while [ x"$1" != x ] ; do
echo "Zutils home page: http://www.nongnu.org/zutils/zutils.html"
exit 0 ;;
--version | --ve* | -V)
- echo "Zgrep VERSION"
+ echo "Zgrep (zutils) VERSION"
echo "Copyright (C) 2009 Antonio Diaz Diaz."
echo "This script is free software: you have unlimited permission"
echo "to copy, distribute and modify it."
diff --git a/ztest.in b/ztest.in
index f56c853..98e93f6 100644
--- a/ztest.in
+++ b/ztest.in
@@ -12,7 +12,7 @@ recursive=0
two_hyphens=0
# Loop over args until a filename is found
-while [ x"$1" != x ] ; do
+while [ -n "$1" ] ; do
case "$1" in
--help | --he* | -h)
@@ -39,7 +39,7 @@ while [ x"$1" != x ] ; do
echo "Zutils home page: http://www.nongnu.org/zutils/zutils.html"
exit 0 ;;
--version | --ve* | -V)
- echo "Ztest VERSION"
+ echo "Ztest (zutils) VERSION"
echo "Copyright (C) 2009 Antonio Diaz Diaz."
echo "This script is free software: you have unlimited permission"
echo "to copy, distribute and modify it."