From d2a6a22ae997d0e35147e8790a70882c3eaa736c Mon Sep 17 00:00:00 2001
From: Christian Engwer <christi@dune-project.org>
Date: Thu, 27 Feb 2014 13:41:44 +0100
Subject: [PATCH] remove long unused code in the context of autogen.sh
---
autogen.sh | 77 +-----------------------------------------------------
gcc.opts | 17 ------------
icc.opts | 17 ------------
3 files changed, 1 insertion(+), 110 deletions(-)
delete mode 100644 gcc.opts
delete mode 100644 icc.opts
diff --git a/autogen.sh b/autogen.sh
index 633ab5236..db8ed77aa 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-# $Id$
+# $Id: autogen.sh 8435 2012-10-23 17:23:07Z sander $
# barf on errors
set -e
@@ -11,70 +11,6 @@ AMVERS=
# (should be off for source distributions, this should happen automatically)
DEFAULTCONFOPT="--enable-maintainer-mode"
-# default values
-DEBUG=1
-OPTIM=0
-
-usage () {
- echo "Usage: ./autogen.sh [options]"
- echo " -i, --intel use intel compiler"
- echo " -g, --gnu use gnu compiler (default)"
- echo " --opts=FILE use compiler-options from FILE"
- echo " -d, --debug switch debug-opts on"
- echo " -n, --nodebug switch debug-opts off"
- echo " -o, --optim switch optimization on"
- echo " -h, --help you already found this :)"
-}
-
-# no compiler set yet
-COMPSET=0
-for OPT in "$@"; do
- set +e
- # stolen from configure...
- # when no option is set, this returns an error code
- arg=`expr "x$OPT" : 'x[^=]*=\(.*\)'`
- set -e
-
- case "$OPT" in
- -i|--intel) . ./icc.opts ; COMPSET=1 ;;
- -g|--gnu) . ./gcc.opts ; COMPSET=1 ;;
- --opts=*)
- if [ -r $arg ] ; then
- echo "reading options from $arg..."
- . ./$arg ;
- COMPSET=1;
- else
- echo "Cannot open compiler options file $arg!" ;
- exit 1;
- fi ;;
- -d|--debug) DEBUG=1 ;;
- -n|--nodebug) DEBUG=0 ;;
- -o|--optim) OPTIM=1 ;;
- -h|--help) usage ; exit 0 ;;
- # pass unknown opts to ./configure
- *) CONFOPT="$CONFOPT \"$OPT\"" ;;
- esac
-done
-
-# use the free compiler as default
-if [ "$COMPSET" != "1" ] ; then
- echo "No compiler set, using GNU compiler as default"
- . ./gcc.opts
-fi
-
-# create flags
-COMPFLAGS="$FLAGS"
-
-# maybe add debug flag
-if [ "$DEBUG" = "1" ] ; then
- COMPFLAGS="$COMPFLAGS $DEBUGFLAGS"
-fi
-
-# maybe add optimization flag
-if [ "$OPTIM" = "1" ] ; then
- COMPFLAGS="$COMPFLAGS $OPTIMFLAGS"
-fi
-
# check if automake-version was set
if test "x$AMVERS" != x ; then
echo Warning: explicitly using automake version $AMVERS
@@ -102,14 +38,3 @@ automake$AMVERS --add-missing
echo "--> autoconf..."
autoconf
-
-#### start configure with special environment
-
-export CC="$COMP"
-export CXX="$CXXCOMP"
-export CPP="$COMP -E"
-
-export CFLAGS="$COMPFLAGS"
-export CXXFLAGS="$COMPFLAGS"
-
-# eval ./configure $DEFAULTCONFOPT $CONFOPT
diff --git a/gcc.opts b/gcc.opts
deleted file mode 100644
index d18773c9b..000000000
--- a/gcc.opts
+++ /dev/null
@@ -1,17 +0,0 @@
-# $Id$
-
-# options for gcc/g++
-# remember to run ./autogen.sh after changing these values!
-
-# name of compiler binaries
-COMP="gcc"
-CXXCOMP="g++"
-
-# flags set in any case
-FLAGS="-Wall"
-
-# additional flags for debugging
-DEBUGFLAGS="-g"
-
-# additional flags for optimization
-OPTIMFLAGS="-O2"
diff --git a/icc.opts b/icc.opts
deleted file mode 100644
index 0de1c67fb..000000000
--- a/icc.opts
+++ /dev/null
@@ -1,17 +0,0 @@
-# $Id$
-
-# options for icc
-# remember to run ./autogen.sh after changing these values!
-
-# name of compiler binaries
-COMP="icc"
-CXXCOMP="icc"
-
-# flags set in any case
-FLAGS=""
-
-# additional flags for debugging
-DEBUGFLAGS="-O0 -g"
-
-# additional flags for optimization
-OPTIMFLAGS="-O3"
--
GitLab