[Dune-devel] [Dune-Commit] dune-common r7424 - trunk/m4

[Oliver Sander]

Hi Markus,
I am getting the following error on the trunk now:  Does hash.hh need to 
be adapted?

Best,
Oliver


make[5]: Entering directory 
`/home/sander/dune/dune-grid/dune/grid/alugrid/2d'
/bin/bash ../../../../libtool  --tag=CXX   --mode=compile g++ -std=c++11 
-DHAVE_CONFIG_H -I. -I../../../..  -I/home/sander/dune/dune-common 
-I/home/sander/dune/dune-geometry -I../../../..  
-I/home/sander/ALUGrid-inst/include 
-I/home/sander/ALUGrid-inst/include/serial 
-I/home/sander/ALUGrid-inst/include/duneinterface -DENABLE_ALUGRID 
-I/home/sander/ALUGrid-inst/include/parallel   -g 
-DDISABLE_DEPRECATED_METHOD_CHECK -Wall -MT libalu2d_la-intersection.lo 
-MD -MP -MF .deps/libalu2d_la-intersection.Tpo -c -o 
libalu2d_la-intersection.lo `test -f 'intersection.cc' || echo 
'./'`intersection.cc
libtool: compile:  g++ -std=c++11 -DHAVE_CONFIG_H -I. -I../../../.. 
-I/home/sander/dune/dune-common -I/home/sander/dune/dune-geometry 
-I../../../.. -I/home/sander/ALUGrid-inst/include 
-I/home/sander/ALUGrid-inst/include/serial 
-I/home/sander/ALUGrid-inst/include/duneinterface -DENABLE_ALUGRID 
-I/home/sander/ALUGrid-inst/include/parallel -g 
-DDISABLE_DEPRECATED_METHOD_CHECK -Wall -MT libalu2d_la-intersection.lo 
-MD -MP -MF .deps/libalu2d_la-intersection.Tpo -c intersection.cc -o 
libalu2d_la-intersection.o
In file included from 
/home/sander/dune/dune-common/dune/common/bigunsignedint.hh:10:0,
                  from ../../../../dune/grid/alugrid/2d/indexsets.hh:9,
                  from ../../../../dune/grid/alugrid/2d/grid.hh:29,
                  from ../../../../dune/grid/alugrid/2d/iterator_imp.cc:3,
                  from ../../../../dune/grid/alugrid/2d/iterator.hh:470,
                  from ../../../../dune/grid/alugrid/2d/entity.hh:12,
                  from ../../../../dune/grid/alugrid/2d/intersection.hh:13,
                  from intersection.cc:9:
/home/sander/dune/dune-common/dune/common/hash.hh:14:15: error: #if with 
no expression
make[5]: *** [libalu2d_la-intersection.lo] Fehler 1
make[5]: Leaving directory 
`/home/sander/dune/dune-grid/dune/grid/alugrid/2d'
make[4]: *** [all-recursive] Fehler 1


Am 14.03.2013 09:49, schrieb mblatt at dune-project.org:
> Author: mblatt
> Date: 2013-03-14 09:49:32 +0100 (Thu, 14 Mar 2013)
> New Revision: 7424
>
> Modified:
>     trunk/m4/dune_boost_base.m4
> Log:
> [Merge][Bugfix] r7422 from branches/release-cmake-2.2: Prevent definition of HAVE_BOOST without value due to race conditions i
> n some autoconf versions.
>
> For some autoconf versions there was a race condition between ax_boost_base.m4 a
> nd dune_boost_base.m4 resulting in HAVE_BOOST being defined with no value (inste
> ad of ENABLE_BOOST). For others there were even two definitions of it (one with
> and one without value).
>
> This patch renames the symbol being defined in dune_boost_base.m4 to HAVE_DUNE_B
> OOST and defines a value for it if boost is found.
>
>
>
> Modified: trunk/m4/dune_boost_base.m4
> ===================================================================
> --- trunk/m4/dune_boost_base.m4	2013-03-14 08:43:53 UTC (rev 7423)
> +++ trunk/m4/dune_boost_base.m4	2013-03-14 08:49:32 UTC (rev 7424)
> @@ -17,7 +17,7 @@
>   #
>   #   And sets:
>   #
> -#     HAVE_BOOST
> +#     HAVE_DUNE_BOOST
>   #        ENABLE_BOOST or undefined. Whether boost was found. The correct way to
>   #        to check this is "#if HAVE_BOOST": This way boost features will be disabled
>   #        unless ${BOOST_CPPFLAGS} was given when compiling
> @@ -25,7 +25,7 @@
>   AC_DEFUN([DUNE_BOOST_BASE],
>   [
>   AX_BOOST_BASE([$1],[
> -  AC_DEFINE(HAVE_BOOST, [ENABLE_BOOST],[Define to ENABLE_BOOST if the Boost library is available])
> +  AC_DEFINE(HAVE_DUNE_BOOST, [ENABLE_BOOST],[Define to ENABLE_BOOST if the Boost library is available])
>     BOOST_CPPFLAGS="$BOOST_CPPFLAGS -DENABLE_BOOST"
>     AC_SUBST(BOOST_CPPFLAGS)
>     # execute ACTION-IF-FOUND (if present):
>
>
> Property changes on: trunk/m4/dune_boost_base.m4
> ___________________________________________________________________
> Added: svn:mergeinfo
>     + /branches/release-cmake-2.2/m4/dune_boost_base.m4:7422
>
>
> _______________________________________________
> Dune-Commit mailing list
> Dune-Commit at dune-project.org
> http://lists.dune-project.org/mailman/listinfo/dune-commit