Skip to content

Commit

Permalink
v2.4.0
Browse files Browse the repository at this point in the history
  • Loading branch information
@jougs
jougs committed Sep 30, 2015
1 parent 870b200 commit dfa61d4
Show file tree
Hide file tree
Showing 748 changed files with 27,515 additions and 10,529 deletions.
12 changes: 7 additions & 5 deletions Makefile.am
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,8 @@ dist-hook:
rm -rf $(distdir)/doc/doxygen
rm -f $(distdir)/doc/doxygen.log
rm -rf $(distdir)/examples/nest/FacetsBenchmarks/debugging_versions
rm -f $(distdir)/libltdl/{config.h,config.log,config.status,Makefile,stamp-h1}
rm -f $(distdir)/libltdl/{config.h,config.log,config.status,Makefile,stamp-h1,libtool}
rm -rf $(distdir)/libltdl/.deps
rm -f $(distdir)/extras/logos/*.{ai,svg}
rm -f $(distdir)/extras/logos/nest-initiative-logo*.*

Expand Down Expand Up @@ -52,15 +53,16 @@ endif

if HAVE_PYTHON

# Python interpreter is discovered by AM_PATH_PYTHON and declared as a make variable by AC_SUBST
installcheck-local:
PATH=$(exec_prefix)/bin:$(PATH) \
/bin/sh $(DESTDIR)@PKGDATADIR@/extras/do_tests.sh --test-pynest
PATH="$(exec_prefix)/bin:$(PATH)" PYTHON="$(PYTHON)" PYTHONPATH="$(pyexecdir):$(PYTHONPATH)" \
/bin/sh $(DESTDIR)@PKGDATADIR@/extras/do_tests.sh --test-pynest --source-dir=$(top_srcdir)

else

installcheck-local:
PATH=$(exec_prefix)/bin:$(PATH) \
/bin/sh $(DESTDIR)@PKGDATADIR@/extras/do_tests.sh
PATH="$(exec_prefix)/bin:$(PATH)" \
/bin/sh $(DESTDIR)@PKGDATADIR@/extras/do_tests.sh --source-dir=$(top_srcdir)

endif

Expand Down
146 changes: 131 additions & 15 deletions acinclude.m4
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,6 @@ echo "Platform: ${host}"
if test "${compversion:0:4}" = "icpc"; then
# Intel compiler pretending to be g++
echo "Compiler : icpc"
SLI_pynest_cxxflags="-fpermissive"
if test "$SLI_debug" = "set" -a -z "$SLI_debugflags"; then
SLI_debugflags="-g -inline-debug-info"
fi
Expand All @@ -75,7 +74,6 @@ echo "Platform: ${host}"
else
#real g++
echo "Compiler : g++"
SLI_pynest_cxxflags="-fpermissive"
if test "$SLI_debug" = "set" -a -z "$SLI_debugflags"; then
SLI_debugflags="-g"
fi
Expand All @@ -89,7 +87,6 @@ echo "Platform: ${host}"
fi
if test "x$enable_bluegene" = xyes; then
echo "Compiling for the Blue Gene using compilers specified by CC and CXX environment variables"
SLI_pynest_cxxflags=" "
if test "$SLI_debug" = "set"; then
SLI_debugflags=" "
fi
Expand All @@ -105,7 +102,6 @@ echo "Platform: ${host}"
SLI_forte=`$CXX -V 2>&1 | grep Forte`
if test "$GXX" = "yes"; then
echo "Compiler : g++"
SLI_pynest_cxxflags="-fpermissive"
if test "$SLI_debug" = "set" -a -z "$SLI_debugflags"; then
SLI_debugflags="-g"
fi
Expand Down Expand Up @@ -155,7 +151,6 @@ echo "Platform: ${host}"
*-hp-hpux*)
if test "$GXX" = "yes"; then
echo "Compiler : g++"
SLI_pynest_cxxflags="-fpermissive"
if test "$SLI_debug" = "set" -a -z "$SLI_debugflags"; then
SLI_debugflags="-g"
fi
Expand All @@ -172,7 +167,6 @@ echo "Platform: ${host}"
mips-sgi-irix*)
if test "$GXX" = "yes"; then
echo "Compiler : g++"
SLI_pynest_cxxflags="-fpermissive"
if test "$SLI_debug" = "set" -a -z "$SLI_debugflags"; then
SLI_debugflags="-g"
fi
Expand All @@ -198,7 +192,6 @@ echo "Platform: ${host}"
*-dec-osf*)
if test "$GXX" = "yes"; then
echo "Compiler : g++"
SLI_pynest_cxxflags="-fpermissive"
if test "$SLI_debug" = "set" -a -z "$SLI_debugflags"; then
SLI_debugflags="-g"
fi
Expand All @@ -225,7 +218,6 @@ echo "Platform: ${host}"
hppa1.1-hitachi-hiuxwe2*)
if test "$GXX" = "yes"; then
echo "Compiler : g++"
SLI_pynest_cxxflags="-fpermissive"
if test "$SLI_debug" = "set" -a -z "$SLI_debugflags"; then
SLI_debugflags="-g"
fi
Expand Down Expand Up @@ -253,7 +245,6 @@ echo "Platform: ${host}"
powerpc-ibm-aix5.1*)
if test "$GXX" = "yes"; then
echo "Compiler : g++"
SLI_pynest_cxxflags="-fpermissive"
if test "$SLI_debug" = "set" -a -z "$SLI_debugflags"; then
SLI_debugflags="-g"
fi
Expand Down Expand Up @@ -282,7 +273,6 @@ echo "Platform: ${host}"
## For all other OS, we just check for the GNU compiler.
if test "$GXX" = "yes"; then
echo "Compiler : g++"
SLI_pynest_cxxflags="-fpermissive"
if test "$SLI_debug" = "set" -a -z "$SLI_debugflags"; then
SLI_debugflags="-g"
fi
Expand All @@ -302,13 +292,10 @@ echo "Platform: ${host}"
## CXXFLAGS now appended instead of prepended, so that it can
## override default values.
AM_CXXFLAGS="$SLI_threadflags $SLI_cxxflags $SLI_warningflags $SLI_debugflags $SLI_optimizeflags $SLI_SAVE_CXXFLAGS"
PYNEST_CXXFLAGS="$SLI_pynest_cxxflags"
echo "Using AM_CXXFLAGS= $AM_CXXFLAGS"
echo "Using PYNEST_CXXFLAGS= $PYNEST_CXXFLAGS"
AC_SUBST(SLI_CXXBACKEND)
AC_SUBST(AM_CXXFLAGS)
AC_SUBST(PYNEST_CXXFLAGS)
AC_SUBST(CXX_AR)
])

Expand Down Expand Up @@ -388,7 +375,6 @@ echo "Platform: ${host}"
fi
if test "x$enable_bluegene" = xyes; then
echo "Compiling for the Blue Gene using compilers specified by CC and CXX environment variables"
SLI_pynest_cxxflags=" "
if test "$SLI_debug" = "set"; then
SLI_debugflags=" "
fi
Expand Down Expand Up @@ -1513,6 +1499,65 @@ if test "$hep_cv_cxx_specialization_bug" = yes; then
fi
])

dnl @synopsis SLI_CHECK_XLC_ICE_ON_USING
dnl
dnl Tests for a an internal compiler error obeserved in IBM xlC.
dnl If bug the ICE is detected, defines
dnl HAVE_XLC_ICE_ON_USING
dnl
dnl @author Hans E. Plesser
dnl

AC_DEFUN([SLI_CHECK_XLC_ICE_ON_USING],
[AC_CACHE_CHECK(whether the compiler fails with ICE,
hep_cv_xlc_ice_on_using,
[AC_LANG_SAVE
AC_LANG_CPLUSPLUS
AC_TRY_LINK([
class RandomDev
{
public:
virtual double operator()(void) =0;
virtual double operator()(double x) =0;
};
class GenericRandomDevFactory
{
public:
virtual RandomDev* create() const =0;
};
template <typename DevType>
class RandomDevFactory: public GenericRandomDevFactory
{
public:
RandomDev* create() const
{
return new DevType();
}
};
template <typename T>
class Wrapper: public T
{
public:
using RandomDev::operator();
double operator()(void) { return 0.0; }
double operator()(double x) { return x; }
};
],
[
RandomDevFactory<Wrapper<RandomDev> > r;
],
hep_cv_xlc_ice_on_using=no, hep_cv_xlc_ice_on_using=yes)
AC_LANG_RESTORE
])
if test "$hep_cv_xlc_ice_on_using" = yes; then
AC_DEFINE(HAVE_XLC_ICE_ON_USING,,
[define if the compiler fails with ICE])
fi
])

# SLI_C_INLINE
# ------------
# Do nothing if the compiler accepts the inline keyword.
Expand Down Expand Up @@ -1607,4 +1652,75 @@ AC_DEFUN([SLI_CHECK_SOURCE_FILE],
else
$3
fi
])
])

# ===========================================================================
# http://www.gnu.org/software/autoconf-archive/ax_check_compile_flag.html
# ===========================================================================
#
# SYNOPSIS
#
# AX_CHECK_COMPILE_FLAG(FLAG, [ACTION-SUCCESS], [ACTION-FAILURE], [EXTRA-FLAGS])
#
# DESCRIPTION
#
# Check whether the given FLAG works with the current language's compiler
# or gives an error. (Warnings, however, are ignored)
#
# ACTION-SUCCESS/ACTION-FAILURE are shell commands to execute on
# success/failure.
#
# If EXTRA-FLAGS is defined, it is added to the current language's default
# flags (e.g. CFLAGS) when the check is done. The check is thus made with
# the flags: "CFLAGS EXTRA-FLAGS FLAG". This can for example be used to
# force the compiler to issue an error when a bad flag is given.
#
# NOTE: Implementation based on AX_CFLAGS_GCC_OPTION. Please keep this
# macro in sync with AX_CHECK_{PREPROC,LINK}_FLAG.
#
# LICENSE
#
# Copyright (c) 2008 Guido U. Draheim <[email protected]>
# Copyright (c) 2011 Maarten Bosmans <[email protected]>
#
# This program is free software: you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by the
# Free Software Foundation, either version 3 of the License, or (at your
# option) any later version.
#
# This program is distributed in the hope that it will be useful, but
# WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
# Public License for more details.
#
# You should have received a copy of the GNU General Public License along
# with this program. If not, see <http://www.gnu.org/licenses/>.
#
# As a special exception, the respective Autoconf Macro's copyright owner
# gives unlimited permission to copy, distribute and modify the configure
# scripts that are the output of Autoconf when processing the Macro. You
# need not follow the terms of the GNU General Public License when using
# or distributing such scripts, even though portions of the text of the
# Macro appear in them. The GNU General Public License (GPL) does govern
# all other use of the material that constitutes the Autoconf Macro.
#
# This special exception to the GPL applies to versions of the Autoconf
# Macro released by the Autoconf Archive. When you make and distribute a
# modified version of the Autoconf Macro, you may extend this special
# exception to the GPL to apply to your modified version as well.

AC_DEFUN([AX_CHECK_COMPILE_FLAG],
[AC_PREREQ(2.59)dnl for _AC_LANG_PREFIX
AS_VAR_PUSHDEF([CACHEVAR],[ax_cv_check_[]_AC_LANG_ABBREV[]flags_$4_$1])dnl
AC_CACHE_CHECK([whether _AC_LANG compiler accepts $1], CACHEVAR, [
ax_check_save_flags=$[]_AC_LANG_PREFIX[]FLAGS
_AC_LANG_PREFIX[]FLAGS="$[]_AC_LANG_PREFIX[]FLAGS $4 $1"
AC_COMPILE_IFELSE([AC_LANG_PROGRAM()],
[AS_VAR_SET(CACHEVAR,[yes])],
[AS_VAR_SET(CACHEVAR,[no])])
_AC_LANG_PREFIX[]FLAGS=$ax_check_save_flags])
AS_IF([test x"AS_VAR_GET(CACHEVAR)" = xyes],
[m4_default([$2], :)],
[m4_default([$3], :)])
AS_VAR_POPDEF([CACHEVAR])dnl
])dnl AX_CHECK_COMPILE_FLAGS
16 changes: 10 additions & 6 deletions bootstrap.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,19 +27,15 @@ fi

libtool_major=`$LIBTOOLIZE --version | head -n1 | cut -d\) -f2 | cut -d\. -f1`
if test $libtool_major -lt 2; then
echo " -> Patching configure.ac for libtoolize 1.5..."
echo " -> Patching configure.ac for libtoolize 1.5 ..."
patch -s -f -p0 < extras/libtool-1.5-fix.patch
$LIBTOOLIZE --force --copy --ltdl
else
$LIBTOOLIZE --force --copy --quiet --ltdl
fi

echo " -> Re-running aclocal ..."
if test $libtool_major -le 2; then
aclocal --force
else
aclocal --force -I $pwd/libltdl/m4
fi
aclocal --force

echo " -> Running autoconf ..."
autoconf
Expand All @@ -48,6 +44,14 @@ autoconf
echo " -> Running autoheader ..."
autoheader

# patch configure.ac for old (pre 1.14) versions of automake
am_major=`automake --version | head -n1 | cut -d\) -f2 | cut -d. -f1`
am_minor=`automake --version | head -n1 | cut -d. -f2`
if test $am_major -lt 1 -o \( $am_major -le 1 -a $am_minor -lt 14 \); then
echo " -> Patching configure.ac for automake < 1.14 ..."
patch -s -f -p0 < extras/automake-pre-1.14-fix.patch
fi

echo " -> Running automake ..."
automake --foreign --add-missing --force-missing --copy

Expand Down
Loading

0 comments on commit dfa61d4

Please sign in to comment.