Skip to content
GitLab
Commit 2ddab033 authored by Uwe Schulzweida's avatar Uwe Schulzweida
Browse files

config/default: cleanup

parent 701a172f
Expand all Hide whitespace changes
Inline Side-by-side
config/default
View file @ 2ddab033
......@@ -11,7 +11,6 @@ fi
COMP=""
HOSTNAME=`hostname`
#
set -x
while test $# != 0
do
case $1 in
......@@ -30,32 +29,30 @@ set -x
case "${HOSTNAME}" in
# i386-apple-darwin10
bailung*|d133*|d134*)
if test "$COMP" = icc ; then
${CONFPATH}configure --prefix=$HOME/local \
--enable-maintainer-mode \
--with-jasper=$HOME/local \
CDOLIBS=" --with-jasper=$HOME/local \
--with-grib_api=$HOME/local/gribapi-1.10.4 \
--with-netcdf=$HOME/local \
--with-hdf5=$HOME/local \
--with-szlib=$HOME/local \
--with-udunits2=$HOME/local/udunits-2.1.24 \
--with-proj=/opt/local \
--with-curl=/opt/local \
CC=icc CFLAGS="-g -Wall -O3 -vec-report2 -march=native -openmp -fp-model source -fast-transcendentals" \
LIBS="-L/opt/local/lib -lopenjpeg"
--with-curl=/opt/local"
if test "$COMP" = icc ; then
${CONFPATH}configure --prefix=$HOME/local \
$CDOLIBS \
LIBS="-L/opt/local/lib -lopenjpeg" \
CC=icc CFLAGS="-g -Wall -O3 -vec-report2 -march=native -fp-model source -fast-transcendentals"
elif test "$COMP" = clang ; then
${CONFPATH}configure --prefix=$HOME/local \
$CDOLIBS \
LIBS="-L/opt/local/lib -lopenjpeg" \
CC=clang CFLAGS="-g -Wall -O3"
else
${CONFPATH}configure --prefix=$HOME/local \
--enable-maintainer-mode \
--with-jasper=$HOME/local \
--with-grib_api=$HOME/local/gribapi-1.10.4 \
--with-netcdf=$HOME/local \
--with-hdf5=$HOME/local \
--with-szlib=$HOME/local \
--with-udunits2=$HOME/local/udunits-2.1.24 \
--with-proj=/opt/local \
--with-curl=/opt/local \
CC=gcc CFLAGS="-g -pipe -D_REENTRANT -Wall -W -Wfloat-equal -std=c99 -pedantic -O3 -march=native" \
LIBS="-L/opt/local/lib -lopenjpeg"
$CDOLIBS \
LIBS="-L/opt/local/lib -lopenjpeg" \
CC=gcc CFLAGS="-g -pipe -Wall -W -Wfloat-equal -pedantic -O3 -march=native"
# --with-libxml2=/usr
# --with-magics=/Users/m214003/local/magics-2.14.9
fi
......@@ -82,7 +79,7 @@ case "${HOSTNAME}" in
--with-szlib=$HOME/local \
--with-proj=/opt/local \
--with-curl=/opt/local \
CC=gcc CFLAGS="-g -pipe -D_REENTRANT -Wall -W -Wfloat-equal -pedantic -O3 -march=native"
CC=gcc CFLAGS="-g -pipe -Wall -W -Wfloat-equal -pedantic -O3 -march=native"
# --with-libxml2=/usr \
# --with-magics=/Users/m214003/local/Magics-2.18.14nio \
fi
......@@ -202,17 +199,6 @@ case "${HOSTNAME}" in
--with-zlib=/usr \
CC=gcc44 CFLAGS="-g -Wall -O3"
;;
# powerpc-ibm-aix5.2.0.0
ecga*)
${CONFPATH}configure --prefix=$HOME/local \
--with-jasper=/usr/local/lib/metaps/lib/grib_api/jasper_64 \
--with-grib_api=$HOME/gribapi/1.9.8 \
--with-netcdf=/usr/local/apps/netCDF/3.6.2/LP64 \
--with-szlib=$HOME/local \
AR="ar -X 64" LDFLAGS="-brtl" \
CC=xlc_r CFLAGS="-g -O3 -q64 -qhot -qstrict -qarch=auto -qtune=auto -qsmp=omp -DHAVE_MMAP -qthreaded"
;;
# powerpc-ibm-aix5.3.0.0
blizzard*)
${CONFPATH}configure --prefix=$HOME/local \
......@@ -227,13 +213,6 @@ case "${HOSTNAME}" in
AR="ar -X 64" LDFLAGS="-brtl -R/sw/aix61/openssl-1.0.0d/lib:/sw/aix61/zlib-1.2.6/lib" \
CC=xlc_r CFLAGS="-g -O3 -q64 -qhot -qstrict -qarch=auto -qtune=auto -qsmp=omp -DHAVE_MMAP -qthreaded"
;;
vip*)
${CONFPATH}configure --prefix=$HOME/local \
--with-netcdf=$HOME/local \
--with-szlib=$HOME/local \
AR="ar -X 64" LDFLAGS="-brtl" \
CC=xlc_r CFLAGS="-g -O3 -q64 -qhot -qstrict -qarch=auto -qtune=auto -qsmp=omp -DHAVE_MMAP -qthreaded"
;;
# powerpc-ibm-aix6.0.0.0
c1a*)
${CONFPATH}configure --prefix=$HOME/local \
......@@ -243,13 +222,6 @@ case "${HOSTNAME}" in
AR="ar -X 64" LDFLAGS="-brtl" \
CC=xlc_r CFLAGS="-g -O3 -q64 -qhot -qstrict -qarch=auto -qtune=auto -qsmp=omp -DHAVE_MMAP -qthreaded"
;;
# powerpc-ibm-aix6.0.0.0
dwd | p???et01)
${CONFPATH}configure --prefix=$HOME/local \
--with-netcdf=/uhome/mpischul/local \
AR="ar -X 64" LDFLAGS="-brtl" \
CC=xlc_r CFLAGS="-g -O3 -q64 -qhot -qstrict -qarch=auto -qtune=auto -qsmp=omp -DHAVE_MMAP -qthreaded"
;;
*)
echo "configuration for hostname $HOSTNAME not found!"
;;
......
configure
View file @ 2ddab033
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.68 for cdo 1.6.4.
# Generated by GNU Autoconf 2.68 for cdo 1.6.5rc1.
#
# Report bugs to <http://code.zmaw.de/projects/cdo>.
#
......@@ -570,8 +570,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='cdo'
PACKAGE_TARNAME='cdo'
PACKAGE_VERSION='1.6.4'
PACKAGE_STRING='cdo 1.6.4'
PACKAGE_VERSION='1.6.5rc1'
PACKAGE_STRING='cdo 1.6.5rc1'
PACKAGE_BUGREPORT='http://code.zmaw.de/projects/cdo'
PACKAGE_URL=''
 
......@@ -1385,7 +1385,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
\`configure' configures cdo 1.6.4 to adapt to many kinds of systems.
\`configure' configures cdo 1.6.5rc1 to adapt to many kinds of systems.
 
Usage: $0 [OPTION]... [VAR=VALUE]...
 
......@@ -1455,7 +1455,7 @@ fi
 
if test -n "$ac_init_help"; then
case $ac_init_help in
short | recursive ) echo "Configuration of cdo 1.6.4:";;
short | recursive ) echo "Configuration of cdo 1.6.5rc1:";;
esac
cat <<\_ACEOF
 
......@@ -1609,7 +1609,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
cdo configure 1.6.4
cdo configure 1.6.5rc1
generated by GNU Autoconf 2.68
 
Copyright (C) 2010 Free Software Foundation, Inc.
......@@ -2202,7 +2202,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
 
It was created by cdo $as_me 1.6.4, which was
It was created by cdo $as_me 1.6.5rc1, which was
generated by GNU Autoconf 2.68. Invocation command line was
 
$ $0 $@
......@@ -3145,7 +3145,7 @@ fi
 
# Define the identity of the package.
PACKAGE='cdo'
VERSION='1.6.4'
VERSION='1.6.5rc1'
 
 
cat >>confdefs.h <<_ACEOF
......@@ -21088,7 +21088,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
This file was extended by cdo $as_me 1.6.4, which was
This file was extended by cdo $as_me 1.6.5rc1, which was
generated by GNU Autoconf 2.68. Invocation command line was
 
CONFIG_FILES = $CONFIG_FILES
......@@ -21154,7 +21154,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
cdo config.status 1.6.4
cdo config.status 1.6.5rc1
configured by $0, generated by GNU Autoconf 2.68,
with options \\"\$ac_cs_config\\"
 
......
configure.ac
View file @ 2ddab033
......@@ -4,7 +4,7 @@
# autoconf 2.68
# libtool 2.4.2
AC_INIT([cdo], [1.6.4], [http://code.zmaw.de/projects/cdo])
AC_INIT([cdo], [1.6.5rc1], [http://code.zmaw.de/projects/cdo])
CONFIG_ABORT=yes
AC_CONFIG_AUX_DIR(config)
......@@ -13,7 +13,7 @@ AC_CANONICAL_HOST
AC_CANONICAL_BUILD
# AM_INIT_AUTOMAKE([foreign -Wall -Werror])
AM_INIT_AUTOMAKE([foreign -Wall])
AM_INIT_AUTOMAKE([subdir-objects foreign -Wall])
AC_CONFIG_HEADERS([src/config.h])
AM_MAINTAINER_MODE([disable])
......
src/Makefile.in
View file @ 2ddab033
This diff is collapsed.
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

Imprint | Privacy Policy