From 74f3e49ba198016d7d078fbaf4954323f2cb3a15 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Fri, 4 Jan 2019 12:13:03 +0100 Subject: Merging upstream version 1.8. Signed-off-by: Daniel Baumann --- configure | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) (limited to 'configure') diff --git a/configure b/configure index 579b578..d8fd626 100755 --- a/configure +++ b/configure @@ -1,12 +1,12 @@ #! /bin/sh # configure script for Zutils - Utilities dealing with compressed files -# Copyright (C) 2009-2018 Antonio Diaz Diaz. +# Copyright (C) 2009-2019 Antonio Diaz Diaz. # # This configure script is free software: you have unlimited permission # to copy, distribute and modify it. pkgname=zutils -pkgversion=1.7 +pkgversion=1.8 srctrigger=doc/${pkgname}.texi # clear some things potentially inherited from environment. @@ -73,6 +73,7 @@ while [ $# != 0 ] ; do echo " CXX=COMPILER C++ compiler to use [${CXX}]" echo " CPPFLAGS=OPTIONS command line options for the preprocessor [${CPPFLAGS}]" echo " CXXFLAGS=OPTIONS command line options for the C++ compiler [${CXXFLAGS}]" + echo " CXXFLAGS+=OPTIONS append options to the current value of CXXFLAGS" echo " LDFLAGS=OPTIONS command line options for the linker [${LDFLAGS}]" echo " DIFF=NAME diff program to use with zdiff [${DIFF}]" echo " GREP=NAME grep program to use with zgrep [${GREP}]" @@ -100,12 +101,13 @@ while [ $# != 0 ] ; do --sysconfdir=*) sysconfdir=${optarg} ;; --no-create) no_create=yes ;; - CXX=*) CXX=${optarg} ;; - CPPFLAGS=*) CPPFLAGS=${optarg} ;; - CXXFLAGS=*) CXXFLAGS=${optarg} ;; - LDFLAGS=*) LDFLAGS=${optarg} ;; - DIFF=*) DIFF=${optarg} ;; - GREP=*) GREP=${optarg} ;; + CXX=*) CXX=${optarg} ;; + CPPFLAGS=*) CPPFLAGS=${optarg} ;; + CXXFLAGS=*) CXXFLAGS=${optarg} ;; + CXXFLAGS+=*) CXXFLAGS="${CXXFLAGS} ${optarg}" ;; + LDFLAGS=*) LDFLAGS=${optarg} ;; + DIFF=*) DIFF=${optarg} ;; + GREP=*) GREP=${optarg} ;; --*) echo "configure: WARNING: unrecognized option: '${option}'" 1>&2 ;; @@ -180,7 +182,7 @@ echo "GREP = ${GREP}" rm -f Makefile cat > Makefile << EOF # Makefile for Zutils - Utilities dealing with compressed files -# Copyright (C) 2009-2018 Antonio Diaz Diaz. +# Copyright (C) 2009-2019 Antonio Diaz Diaz. # This file was generated automatically by configure. Don't edit. # # This Makefile is free software: you have unlimited permission -- cgit v1.2.3