From 24e454d66b403bfa962040b74c4aaae108347c24 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Sat, 7 Nov 2015 08:48:23 +0100 Subject: Adding upstream version 1.9. Signed-off-by: Daniel Baumann --- configure | 48 ++++++++++++++---------------------------------- 1 file changed, 14 insertions(+), 34 deletions(-) (limited to 'configure') diff --git a/configure b/configure index 070f86c..56462e8 100755 --- a/configure +++ b/configure @@ -1,17 +1,17 @@ #! /bin/sh # configure script for Lzip - A data compressor based on the LZMA algorithm -# Copyright (C) 2008, 2009 Antonio Diaz Diaz. +# Copyright (C) 2008, 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-09-02 +# Date of this version: 2010-01-17 -invocation_name=$0 args= no_create= +pkgname=lzip +pkgversion=1.9 progname=lzip -progversion=1.8 srctrigger=lzip.h # clear some things potentially inherited from environment. @@ -25,15 +25,13 @@ datadir='$(prefix)/share' infodir='$(datadir)/info' mandir='$(datadir)/man' sysconfdir='$(prefix)/etc' -CC= CXX= CPPFLAGS= -CFLAGS='-Wall -W -O2' CXXFLAGS='-Wall -W -O2' LDFLAGS= # Loop over all args -while [ x"$1" != x ] ; do +while [ -n "$1" ] ; do # Get the first arg, and shuffle option=$1 @@ -63,16 +61,14 @@ 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 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,/$,,'` ;; @@ -93,10 +89,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} ;; @@ -109,12 +103,12 @@ 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 ## the sed command below emulates the dirname command - srcdir=`echo ${invocation_name} | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'` + srcdir=`echo $0 | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'` fi fi @@ -129,19 +123,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 @@ -152,7 +135,7 @@ if [ x"${CXX}" = x ] ; 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 @@ -163,7 +146,7 @@ if [ x${no_create} = x ] ; then # This script is free software: you have unlimited permission # to copy, distribute and modify it. -exec /bin/sh ${invocation_name} ${args} --no-create +exec /bin/sh $0 ${args} --no-create EOF chmod +x config.status fi @@ -177,23 +160,22 @@ 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 cat > Makefile << EOF # Makefile for Lzip - A data compressor based on the LZMA algorithm -# Copyright (C) 2008, 2009 Antonio Diaz Diaz. +# Copyright (C) 2008, 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} @@ -202,10 +184,8 @@ datadir = ${datadir} infodir = ${infodir} mandir = ${mandir} sysconfdir = ${sysconfdir} -CC = ${CC} CXX = ${CXX} CPPFLAGS = ${CPPFLAGS} -CFLAGS = ${CFLAGS} CXXFLAGS = ${CXXFLAGS} LDFLAGS = ${LDFLAGS} EOF -- cgit v1.2.3