Commit 7ab88e83 authored by Lorenz Huedepohl's avatar Lorenz Huedepohl
Browse files

Final(?) version number scheme change

It was decided that the version number shall be all of 2014.06.001, that
is including the release version.

Sadly, pkg-config is not too flexible with different versions of
libraries, therefore the pkg-config file will have the full version
number including the release. This might be a bit cumbersome for
dependent projects.
parent c7228c45
...@@ -649,7 +649,6 @@ OTOOL = @OTOOL@ ...@@ -649,7 +649,6 @@ OTOOL = @OTOOL@
OTOOL64 = @OTOOL64@ OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@ PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_MINOR_VERSION = @PACKAGE_MINOR_VERSION@
PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
......
#! /bin/sh #! /bin/sh
# Guess values for system-dependent variables and create Makefiles. # Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.69 for elpa 2014.06. # Generated by GNU Autoconf 2.69 for elpa 2014.06.001.
# #
# Report bugs to <elpa-library@rzg.mpg.de>. # Report bugs to <elpa-library@rzg.mpg.de>.
# #
...@@ -590,8 +590,8 @@ MAKEFLAGS= ...@@ -590,8 +590,8 @@ MAKEFLAGS=
# Identity of this package. # Identity of this package.
PACKAGE_NAME='elpa' PACKAGE_NAME='elpa'
PACKAGE_TARNAME='elpa' PACKAGE_TARNAME='elpa'
PACKAGE_VERSION='2014.06' PACKAGE_VERSION='2014.06.001'
PACKAGE_STRING='elpa 2014.06' PACKAGE_STRING='elpa 2014.06.001'
PACKAGE_BUGREPORT='elpa-library@rzg.mpg.de' PACKAGE_BUGREPORT='elpa-library@rzg.mpg.de'
PACKAGE_URL='' PACKAGE_URL=''
   
...@@ -774,7 +774,6 @@ am__isrc ...@@ -774,7 +774,6 @@ am__isrc
INSTALL_DATA INSTALL_DATA
INSTALL_SCRIPT INSTALL_SCRIPT
INSTALL_PROGRAM INSTALL_PROGRAM
PACKAGE_MINOR_VERSION
target_alias target_alias
host_alias host_alias
build_alias build_alias
...@@ -1405,7 +1404,7 @@ if test "$ac_init_help" = "long"; then ...@@ -1405,7 +1404,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing. # 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. # This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF cat <<_ACEOF
\`configure' configures elpa 2014.06 to adapt to many kinds of systems. \`configure' configures elpa 2014.06.001 to adapt to many kinds of systems.
   
Usage: $0 [OPTION]... [VAR=VALUE]... Usage: $0 [OPTION]... [VAR=VALUE]...
   
...@@ -1475,7 +1474,7 @@ fi ...@@ -1475,7 +1474,7 @@ fi
   
if test -n "$ac_init_help"; then if test -n "$ac_init_help"; then
case $ac_init_help in case $ac_init_help in
short | recursive ) echo "Configuration of elpa 2014.06:";; short | recursive ) echo "Configuration of elpa 2014.06.001:";;
esac esac
cat <<\_ACEOF cat <<\_ACEOF
   
...@@ -1631,7 +1630,7 @@ fi ...@@ -1631,7 +1630,7 @@ fi
test -n "$ac_init_help" && exit $ac_status test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then if $ac_init_version; then
cat <<\_ACEOF cat <<\_ACEOF
elpa configure 2014.06 elpa configure 2014.06.001
generated by GNU Autoconf 2.69 generated by GNU Autoconf 2.69
   
Copyright (C) 2012 Free Software Foundation, Inc. Copyright (C) 2012 Free Software Foundation, Inc.
...@@ -2114,7 +2113,7 @@ cat >config.log <<_ACEOF ...@@ -2114,7 +2113,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake. running configure, to aid debugging if configure makes a mistake.
   
It was created by elpa $as_me 2014.06, which was It was created by elpa $as_me 2014.06.001, which was
generated by GNU Autoconf 2.69. Invocation command line was generated by GNU Autoconf 2.69. Invocation command line was
   
$ $0 $@ $ $0 $@
...@@ -2463,8 +2462,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu ...@@ -2463,8 +2462,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
   
   
   
PACKAGE_MINOR_VERSION=001
   
   
   
...@@ -2983,7 +2980,7 @@ fi ...@@ -2983,7 +2980,7 @@ fi
   
# Define the identity of the package. # Define the identity of the package.
PACKAGE='elpa' PACKAGE='elpa'
VERSION='2014.06' VERSION='2014.06.001'
   
   
cat >>confdefs.h <<_ACEOF cat >>confdefs.h <<_ACEOF
...@@ -21756,7 +21753,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 ...@@ -21756,7 +21753,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their # report actual input values of CONFIG_FILES etc. instead of their
# values after options handling. # values after options handling.
ac_log=" ac_log="
This file was extended by elpa $as_me 2014.06, which was This file was extended by elpa $as_me 2014.06.001, which was
generated by GNU Autoconf 2.69. Invocation command line was generated by GNU Autoconf 2.69. Invocation command line was
   
CONFIG_FILES = $CONFIG_FILES CONFIG_FILES = $CONFIG_FILES
...@@ -21822,7 +21819,7 @@ _ACEOF ...@@ -21822,7 +21819,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\ ac_cs_version="\\
elpa config.status 2014.06 elpa config.status 2014.06.001
configured by $0, generated by GNU Autoconf 2.69, configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\" with options \\"\$ac_cs_config\\"
   
......
AC_PREREQ([2.69]) AC_PREREQ([2.69])
AC_INIT([elpa],[2014.06], [elpa-library@rzg.mpg.de]) AC_INIT([elpa],[2014.06.001], [elpa-library@rzg.mpg.de])
AC_SUBST([PACKAGE_VERSION]) AC_SUBST([PACKAGE_VERSION])
AC_SUBST([PACKAGE_MINOR_VERSION],[001])
AC_CONFIG_SRCDIR([src/elpa1.F90]) AC_CONFIG_SRCDIR([src/elpa1.F90])
......
...@@ -3,9 +3,9 @@ exec_prefix=@exec_prefix@ ...@@ -3,9 +3,9 @@ exec_prefix=@exec_prefix@
libdir=@libdir@ libdir=@libdir@
includedir=@includedir@ includedir=@includedir@
Name: @PACKAGE_NAME@@SUFFIX@-@PACKAGE_VERSION@ Name: @PACKAGE_NAME@@SUFFIX@
Description: ELPA is a Fortran-based high-performance computational library for the (massively) parallel solution of symmetric or Hermitian, standard or generalized eigenvalue problems. Description: ELPA is a Fortran-based high-performance computational library for the (massively) parallel solution of symmetric or Hermitian, standard or generalized eigenvalue problems.
Version: @PACKAGE_VERSION@.@PACKAGE_MINOR_VERSION@ Version: @PACKAGE_VERSION@
URL: @PACKAGE_URL@ URL: @PACKAGE_URL@
Libs: -L${libdir} -lelpa@SUFFIX@ @LIBS@ @OPENMP_FCFLAGS@ Libs: -L${libdir} -lelpa@SUFFIX@ @LIBS@ @OPENMP_FCFLAGS@
Cflags: -I${includedir}/elpa@SUFFIX@-@PACKAGE_VERSION@ @OPENMP_CFLAGS@ Cflags: -I${includedir}/elpa@SUFFIX@-@PACKAGE_VERSION@ @OPENMP_CFLAGS@
......
...@@ -37,11 +37,6 @@ AM_PROG_CC_C_O ...@@ -37,11 +37,6 @@ AM_PROG_CC_C_O
AM_PROG_AR AM_PROG_AR
AM_PROG_AS AM_PROG_AS
# Here comes the ELPA specific part
PKG_PROG_PKG_CONFIG
PKG_CHECK_MODULES([ELPA],[elpa-2014.06],[],[AC_MSG_ERROR(["Need elpa-2014.06"])])
PKG_CHECK_VAR([ELPA_FCFLAGS],[elpa-2014.06],[fcflags])
AC_LANG([Fortran]) AC_LANG([Fortran])
m4_include([m4/ax_prog_fc_mpi.m4]) m4_include([m4/ax_prog_fc_mpi.m4])
...@@ -72,8 +67,16 @@ AC_ARG_WITH([openmp], ...@@ -72,8 +67,16 @@ AC_ARG_WITH([openmp],
if test x"${with_openmp}" = x"yes"; then if test x"${with_openmp}" = x"yes"; then
AC_DEFINE([WITH_OPENMP], [1], [use OpenMP threading]) AC_DEFINE([WITH_OPENMP], [1], [use OpenMP threading])
AX_ELPA_OPENMP AX_ELPA_OPENMP
elpa="elpa_openmp-2014.06.001"
else
elpa="elpa-2014.06.001"
fi fi
# Here comes the ELPA specific part
PKG_PROG_PKG_CONFIG
PKG_CHECK_MODULES([ELPA],[${elpa}],[],[AC_MSG_ERROR(["Need ${elpa}"])])
PKG_CHECK_VAR([ELPA_FCFLAGS],[${elpa}],[fcflags])
LT_INIT LT_INIT
AC_SUBST([FC_MODINC]) AC_SUBST([FC_MODINC])
......
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