Commit 02899a8b authored by Uwe Schulzweida's avatar Uwe Schulzweida
Browse files

cgribexlib update

parent 76e8c31e
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.68 for cdi 1.5.5rc2.
# Generated by GNU Autoconf 2.68 for cdi 1.5.5.
#
# Report bugs to <http://code.zmaw.de/projects/cdi>.
#
......@@ -570,8 +570,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='cdi'
PACKAGE_TARNAME='cdi'
PACKAGE_VERSION='1.5.5rc2'
PACKAGE_STRING='cdi 1.5.5rc2'
PACKAGE_VERSION='1.5.5'
PACKAGE_STRING='cdi 1.5.5'
PACKAGE_BUGREPORT='http://code.zmaw.de/projects/cdi'
PACKAGE_URL=''
 
......@@ -1396,7 +1396,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 cdi 1.5.5rc2 to adapt to many kinds of systems.
\`configure' configures cdi 1.5.5 to adapt to many kinds of systems.
 
Usage: $0 [OPTION]... [VAR=VALUE]...
 
......@@ -1466,7 +1466,7 @@ fi
 
if test -n "$ac_init_help"; then
case $ac_init_help in
short | recursive ) echo "Configuration of cdi 1.5.5rc2:";;
short | recursive ) echo "Configuration of cdi 1.5.5:";;
esac
cat <<\_ACEOF
 
......@@ -1623,7 +1623,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
cdi configure 1.5.5rc2
cdi configure 1.5.5
generated by GNU Autoconf 2.68
 
Copyright (C) 2010 Free Software Foundation, Inc.
......@@ -2338,7 +2338,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 cdi $as_me 1.5.5rc2, which was
It was created by cdi $as_me 1.5.5, which was
generated by GNU Autoconf 2.68. Invocation command line was
 
$ $0 $@
......@@ -3270,7 +3270,7 @@ fi
 
# Define the identity of the package.
PACKAGE='cdi'
VERSION='1.5.5rc2'
VERSION='1.5.5'
 
 
cat >>confdefs.h <<_ACEOF
......@@ -27361,7 +27361,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 cdi $as_me 1.5.5rc2, which was
This file was extended by cdi $as_me 1.5.5, which was
generated by GNU Autoconf 2.68. Invocation command line was
 
CONFIG_FILES = $CONFIG_FILES
......@@ -27427,7 +27427,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="\\
cdi config.status 1.5.5rc2
cdi config.status 1.5.5
configured by $0, generated by GNU Autoconf 2.68,
with options \\"\$ac_cs_config\\"
 
......
# Process this file with autoconf to produce a configure script.
AC_INIT([cdi], [1.5.5rc2], [http://code.zmaw.de/projects/cdi])
AC_INIT([cdi], [1.5.5], [http://code.zmaw.de/projects/cdi])
echo "configuring ${PACKAGE_NAME} ${PACKAGE_VERSION}"
......
! This file was automatically generated, don't edit!
!
! Fortran interface for CDI library version 1.5.5rc2
! Fortran interface for CDI library version 1.5.5
!
! Author:
! -------
......
/* Automatically generated by m214003 at 2012-05-09, do not edit */
/* Automatically generated by m214003 at 2012-05-11, do not edit */
/* CGRIBEXLIB_VERSION="1.5.2" */
......@@ -20,11 +20,20 @@
//#undef _GET_IBM_COUNTER
//#undef _ARCH_PWR6
#ifdef __PGI
#if defined(__GNUC__) && (__GNUC__ >= 4)
#elif defined(__ICC) && (__ICC >= 1100)
#else
#define DISABLE_SIMD
#endif
#ifdef DISABLE_SIMD
#ifndef ENABLE_AVX
#undef __AVX__
#endif
#ifndef ENABLE_SSE2
#undef __SSE2__
#endif
#endif
#ifdef _GET_IBM_COUNTER
#include <libhpc.h>
......@@ -667,11 +676,20 @@ double intpow2(int x)
//#undef _GET_IBM_COUNTER
//#undef _ARCH_PWR6
#ifdef __PGI
#if defined(__GNUC__) && (__GNUC__ >= 4)
#elif defined(__ICC) && (__ICC >= 1100)
#else
#define DISABLE_SIMD
#endif
#ifdef DISABLE_SIMD
#ifndef ENABLE_AVX
#undef __AVX__
#endif
#ifndef ENABLE_SSE2
#undef __SSE2__
#endif
#endif
#ifdef _GET_IBM_COUNTER
#endif
......@@ -9765,7 +9783,7 @@ int gribUnzip(unsigned char *dbuf, long dbufsize, unsigned char *sbuf, long sbu
return (gribLen);
}
static const char grb_libvers[] = "1.5.2" " of ""May 9 2012"" ""10:07:15";
static const char grb_libvers[] = "1.5.2" " of ""May 11 2012"" ""14:32:49";
const char *
cgribexLibraryVersion(void)
{
......
......@@ -64,6 +64,51 @@ cat > ${PROG} << EOR
# include <szlib.h>
#endif
//#undef _GET_X86_COUNTER
//#undef _GET_IBM_COUNTER
//#undef _ARCH_PWR6
#if defined(__GNUC__) && (__GNUC__ >= 4)
#elif defined(__ICC) && (__ICC >= 1100)
#else
#define DISABLE_SIMD
#endif
#ifdef DISABLE_SIMD
#ifndef ENABLE_AVX
#undef __AVX__
#endif
#ifndef ENABLE_SSE2
#undef __SSE2__
#endif
#endif
#ifdef _GET_IBM_COUNTER
#include <libhpc.h>
#endif
#ifdef __AVX__
#include <float.h>
#include <stdint.h>
#include <inttypes.h>
#include <immintrin.h>
#ifdef _GET_X86_COUNTER
#include <x86intrin.h>
#endif
#else
#ifdef __SSE2__
#include <float.h>
#include <stdint.h>
#include <inttypes.h>
#include <emmintrin.h>
#ifdef _GET_X86_COUNTER
#include <x86intrin.h>
#endif
#endif
#endif
#if ! defined (HAVE_CONFIG_H)
# define HAVE_LIBGRIB 1
# define HAVE_LIBCGRIBEX 1
......
Markdown is supported
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