diff --git a/Makefile.am b/Makefile.am deleted file mode 100644 index 4a3367ae65fdf400fbd7eda7129060f130682964..0000000000000000000000000000000000000000 --- a/Makefile.am +++ /dev/null @@ -1,25 +0,0 @@ -# $Id: Makefile.am 731 2007-03-17 20:53:00Z christi $ - -# we need the module file to be able to build via dunecontrol -EXTRA_DIST=dune.module \ - CMakeLists.txt - -# don't follow the full GNU-standard -# need automake >= 1.5 -AUTOMAKE_OPTIONS = foreign 1.5 - -SUBDIRS = dune doc m4 cmake - -pkgconfigdir = $(libdir)/pkgconfig -pkgconfig_DATA = dune-fufem.pc - -# use configured compiler for "make distcheck" -# doxygen is difficult to convince to build in a special directory... -DISTCHECK_CONFIGURE_FLAGS = --with-dune-common="$(DUNE_COMMON_ROOT)" --with-dune-geometry="$(DUNE_GEOMETRY_ROOT)" --with-dune-grid="$(DUNE_GRID_ROOT)" --with-dune-istl="$(DUNE_ISTL_ROOT)" --with-dune-localfunctions="$(DUNE_LOCALFUNCTIONS_ROOT)" CXX="$(CXX)" CC="$(CC)" DOXYGEN="true" --enable-parallel=@ENABLE_PARALLEL@ MPICC="$(MPICC)" - -include $(top_srcdir)/am/global-rules - -# Generate package configuration files for finding -# installed modules with CMake -include $(top_srcdir)/am/cmake-pkg-config - diff --git a/cmake/Makefile.am b/cmake/Makefile.am deleted file mode 100644 index 26735eb4029328e305290cf95dfdc43a0e5fa55d..0000000000000000000000000000000000000000 --- a/cmake/Makefile.am +++ /dev/null @@ -1,3 +0,0 @@ -SUBDIRS = modules - -include $(top_srcdir)/am/global-rules diff --git a/cmake/modules/Makefile.am b/cmake/modules/Makefile.am deleted file mode 100644 index 9817bfb91e5af09802773769792bd3b108dad149..0000000000000000000000000000000000000000 --- a/cmake/modules/Makefile.am +++ /dev/null @@ -1,6 +0,0 @@ -MODULES = DuneFufemMacros.cmake -modulesdir = $(datadir)/dune/cmake/modules -dist_modules_DATA = ${MODULES} - -include $(top_srcdir)/am/global-rules -EXTRA_DIST = CMakeLists.txt AddPythonFlags.cmake DuneFufemMacros.cmake AddAdolcFlags.cmake FindAdolc.cmake diff --git a/configure.ac b/configure.ac deleted file mode 100644 index 5233d5f8ae1041fe8fed9423540722058c118311..0000000000000000000000000000000000000000 --- a/configure.ac +++ /dev/null @@ -1,40 +0,0 @@ -#! /bin/bash -# $Id: configure.ac 848 2008-01-07 16:29:01Z christi $ -# Process this file with autoconf to produce a configure script. -DUNE_AC_INIT -AM_INIT_AUTOMAKE -AC_CONFIG_SRCDIR([dune/fufem/boundarypatch.hh]) -AC_CONFIG_HEADERS([config.h]) - -# check all dune-module stuff -DUNE_CHECK_ALL - -# preset variable to path such that #include works -AC_SUBST([AM_CPPFLAGS], '$(DUNE_CPPFLAGS) -I$(top_srcdir)') -AC_SUBST([AM_LDFLAGS], '$(DUNE_LDFLAGS) $(DUNE_LIBS)') - -DUNE_SUMMARY_ALL - -# write output -AC_CONFIG_FILES([Makefile - cmake/Makefile - cmake/modules/Makefile - doc/doxygen/Makefile - doc/doxygen/Doxyfile - doc/Makefile - dune/Makefile - dune/fufem/assemblers/Makefile - dune/fufem/assemblers/localassemblers/Makefile - dune/fufem/estimators/Makefile - dune/fufem/functionspacebases/Makefile - dune/fufem/functiontools/Makefile - dune/fufem/functions/Makefile - dune/fufem/mechanics/Makefile - dune/fufem/python/Makefile - dune/fufem/quadraturerules/Makefile - dune/fufem/test/Makefile - dune/fufem/utilities/Makefile - dune/fufem/Makefile - m4/Makefile - dune-fufem.pc]) -AC_OUTPUT diff --git a/doc/Makefile.am b/doc/Makefile.am deleted file mode 100644 index 7c260a938b6a97c66da1dec2b1761abfc30e1da7..0000000000000000000000000000000000000000 --- a/doc/Makefile.am +++ /dev/null @@ -1,10 +0,0 @@ - -SUBDIRS = doxygen -CURDIR = doc -BASEDIR = .. - -# where to install the documentation -docdir=$(datadir)/doc/dune-fufem - -include $(top_srcdir)/am/webstuff -include $(top_srcdir)/am/global-rules diff --git a/doc/Makefile.dist.am b/doc/Makefile.dist.am deleted file mode 100644 index 0f0217fb8c0689b5a3f415a560ab511fdb022493..0000000000000000000000000000000000000000 --- a/doc/Makefile.dist.am +++ /dev/null @@ -1,13 +0,0 @@ -# $Id: Makefile.am 724 2007-03-01 11:30:49Z christi $ - -SUBDIRS = doxygen - -docdir=$(datadir)/doc/dune-fufem - -#doc_DATA = istl.pdf - -CONFIG_CLEAN_FILES = *.dist - -include $(top_srcdir)/am/latex -include $(top_srcdir)/am/webstuff -include $(top_srcdir)/am/global-rules diff --git a/doc/doxygen/Makefile.am b/doc/doxygen/Makefile.am deleted file mode 100644 index d94c751b4a1ba391b553822f67bcb7ea32621f90..0000000000000000000000000000000000000000 --- a/doc/doxygen/Makefile.am +++ /dev/null @@ -1,7 +0,0 @@ - -BASEDIR=../.. -CURDIR=doc/doxygen - -include $(top_srcdir)/am/doxygen -include $(top_srcdir)/am/global-rules - diff --git a/dune/Makefile.am b/dune/Makefile.am deleted file mode 100644 index 0574bdef85831f65414c503263dc143551866557..0000000000000000000000000000000000000000 --- a/dune/Makefile.am +++ /dev/null @@ -1,5 +0,0 @@ -# $Id: $ - -SUBDIRS = fufem - -include $(top_srcdir)/am/global-rules diff --git a/dune/fufem/Makefile.am b/dune/fufem/Makefile.am deleted file mode 100644 index e5fdea80461676c82d4ee29693c9085f483dfc59..0000000000000000000000000000000000000000 --- a/dune/fufem/Makefile.am +++ /dev/null @@ -1,49 +0,0 @@ -# $Id: Makefile.am 810 2007-08-20 19:42:04Z mblatt $ - -SUBDIRS = assemblers estimators functions functionspacebases functiontools mechanics python quadraturerules utilities test - -fufemdir = $(includedir)/dune/fufem -fufem_HEADERS = any.hh \ - arcofcircle.hh \ - arithmetic.hh \ - blockmatrixview.hh \ - boundaryiterator.hh \ - boundarypatch.hh \ - boundarypatchprolongator.hh \ - boundarywriter.hh \ - boundingbox.hh \ - box.hh \ - concept.hh \ - dataio.hh \ - dgindexset.hh \ - dgpqkindexset.hh \ - differencenormsquared.hh \ - discretizationerror.hh \ - dunedataio.hh \ - dunepython.hh \ - facehierarchy.hh \ - facelocalfiniteelement.hh \ - formatstring.hh \ - globalintersectioniterator.hh \ - improvegrid.hh \ - indexedsliceiterator.hh \ - interval.hh \ - lumpmatrix.hh \ - makehalfcircle.hh \ - makesphere.hh \ - mappedmatrix.hh \ - matlab_io.hh \ - prolongboundarypatch.hh \ - readbitfield.hh \ - referenceelementhelper.hh \ - refinedfehelper.hh \ - sampleonbitfield.hh \ - sharedpointermap.hh \ - staticmatrixtools.hh \ - surfmassmatrix.hh \ - symmetrictensor.hh \ - ulis_tools.hh - -headercheck_IGNORE = - -include $(top_srcdir)/am/global-rules diff --git a/dune/fufem/assemblers/Makefile.am b/dune/fufem/assemblers/Makefile.am deleted file mode 100644 index 9b7fc94f7e89cecd2af09b34857889ecff878611..0000000000000000000000000000000000000000 --- a/dune/fufem/assemblers/Makefile.am +++ /dev/null @@ -1,19 +0,0 @@ -SUBDIRS = localassemblers - -assemblersdir = $(includedir)/dune/fufem/assemblers -assemblers_HEADERS = assembler.hh \ - boundaryoperatorassembler.hh \ - functionalassembler.hh \ - localassembler.hh \ - localoperatorassembler.hh \ - localfunctionalassembler.hh \ - operatorassembler.hh \ - transferoperatorassembler.hh \ - preconditioneddefectassembler.hh \ - integraloperatorassembler.hh \ - boundaryfunctionalassembler.hh \ - intersectionoperatorassembler.hh \ - localboundaryassembler.hh - - -include $(top_srcdir)/am/global-rules diff --git a/dune/fufem/assemblers/localassemblers/Makefile.am b/dune/fufem/assemblers/localassemblers/Makefile.am deleted file mode 100644 index 7af5c03ff3330e5978cb4254543aa834ddea3643..0000000000000000000000000000000000000000 --- a/dune/fufem/assemblers/localassemblers/Makefile.am +++ /dev/null @@ -1,27 +0,0 @@ -SUBDIRS = - -localassemblersdir = $(includedir)/dune/fufem/assemblers/localassemblers -localassemblers_HEADERS = adolclinearizationassembler.hh \ - adolchessianassembler.hh \ - adolclocalenergy.hh \ - generalizedlaplaceassembler.hh \ - l2functionalassembler.hh \ - lumpedmassassembler.hh \ - massassembler.hh \ - gradientassembler.hh \ - laplaceassembler.hh \ - subgridl2functionalassembler.hh \ - stvenantkirchhoffassembler.hh \ - convolutionassembler.hh \ - neumannboundaryassembler.hh \ - normalstressboundaryassembler.hh \ - viscosityassembler.hh \ - h1functionalassembler.hh \ - subgridh1functionalassembler.hh \ - boundarymassassembler.hh \ - weightedmassassembler.hh \ - geomexactstvenantkirchhoffoperatorassembler.hh \ - geomexactstvenantkirchhofffunctionalassembler.hh \ - secondorderoperatorassembler.hh - -include $(top_srcdir)/am/global-rules diff --git a/dune/fufem/estimators/Makefile.am b/dune/fufem/estimators/Makefile.am deleted file mode 100644 index 326e032cbacf2508084309890b9dad40d503633d..0000000000000000000000000000000000000000 --- a/dune/fufem/estimators/Makefile.am +++ /dev/null @@ -1,7 +0,0 @@ -SUBDIRS = - -estimatorsdir = $(includedir)/dune/fufem/estimators -estimators_HEADERS = errorfractionmarking.hh geometricmarking.hh hierarchicalestimator.hh \ - refinementindicator.hh fractionalmarking.hh hierarchicestimatorbase.hh - -include $(top_srcdir)/am/global-rules diff --git a/dune/fufem/functions/Makefile.am b/dune/fufem/functions/Makefile.am deleted file mode 100644 index 0d478f9d6c933f0a5c08f15ebd97571c96539f4a..0000000000000000000000000000000000000000 --- a/dune/fufem/functions/Makefile.am +++ /dev/null @@ -1,25 +0,0 @@ -SUBDIRS = - -functionsdir = $(includedir)/dune/fufem/functions -functions_HEADERS = alienelementlocalbasisfunction.hh \ - analyticgridfunction.hh \ - basisgridfunction.hh \ - cachedcomponentwrapper.hh \ - coarsegridfunctionwrapper.hh \ - composedfunction.hh \ - composedgridfunction.hh \ - constantfunction.hh \ - deformationfunction.hh \ - localbasisderivativefunction.hh \ - localbasisjacobianfunction.hh \ - polynomial.hh \ - portablegreymap.hh \ - portablepixelmap.hh \ - sumfunction.hh \ - sumgridfunction.hh \ - virtualdifferentiablefunction.hh \ - virtualgridfunction.hh \ - virtualfunctiontoboundarysegmentadapter.hh \ - vtkbasisgridfunction.hh - -include $(top_srcdir)/am/global-rules diff --git a/dune/fufem/functionspacebases/Makefile.am b/dune/fufem/functionspacebases/Makefile.am deleted file mode 100644 index 7200901722cd1314168ba8fdf7ae335fd3254bb6..0000000000000000000000000000000000000000 --- a/dune/fufem/functionspacebases/Makefile.am +++ /dev/null @@ -1,20 +0,0 @@ -SUBDIRS = - -functionspacebasesdir = $(includedir)/dune/fufem/functionspacebases -functionspacebases_HEADERS = conformingbasis.hh \ - dofconstraints.hh \ - dunefunctionsbasis.hh \ - extensionbasis.hh \ - functionspacebasis.hh \ - p0basis.hh \ - p1nodalbasis.hh \ - p2hierarchicalbasis.hh \ - p2hierarchicalwithelementbubblesbasis.hh \ - p2nodalbasis.hh \ - p3nodalbasis.hh \ - q1nodalbasis.hh \ - reducedconformingbasis.hh \ - refinedp0basis.hh \ - refinedp1nodalbasis.hh - -include $(top_srcdir)/am/global-rules diff --git a/dune/fufem/functiontools/Makefile.am b/dune/fufem/functiontools/Makefile.am deleted file mode 100644 index 160ff9aba2d92963deb3cbc05cde4bbd50590613..0000000000000000000000000000000000000000 --- a/dune/fufem/functiontools/Makefile.am +++ /dev/null @@ -1,15 +0,0 @@ -SUBDIRS = - -functiontoolsdir = $(includedir)/dune/fufem/functiontools -functiontools_HEADERS = basisidmapper.hh \ - namedfunctionmap.hh \ - amirameshbasiswriter.hh \ - vtkbasiswriter.hh \ - gridfunctionadaptor.hh \ - boundarydofs.hh \ - functionintegrator.hh \ - gradientbasis.hh \ - basisinterpolator.hh \ - p0p1interpolation.hh - -include $(top_srcdir)/am/global-rules diff --git a/dune/fufem/mechanics/Makefile.am b/dune/fufem/mechanics/Makefile.am deleted file mode 100644 index 5b7f23bc9ffaf25753462536a2db831c8f0bc174..0000000000000000000000000000000000000000 --- a/dune/fufem/mechanics/Makefile.am +++ /dev/null @@ -1,11 +0,0 @@ -SUBDIRS = - -mechanicsdir = $(includedir)/dune/fufem/mechanics -mechanics_HEADERS = \ - cubictensor.hh \ - elasticitytensor.hh \ - isotropictensor.hh \ - newpfeassembler.hh \ - tetratensor.hh - -include $(top_srcdir)/am/global-rules diff --git a/dune/fufem/python/Makefile.am b/dune/fufem/python/Makefile.am deleted file mode 100644 index 23def9a5f6065aae685c119b0180356d32784808..0000000000000000000000000000000000000000 --- a/dune/fufem/python/Makefile.am +++ /dev/null @@ -1,15 +0,0 @@ -# $Id: $ - -SUBDIRS = - -pythondir = $(includedir)/dune/fufem/python - -python_HEADERS = \ - callable.hh \ - common.hh \ - conversion.hh \ - function.hh \ - module.hh \ - reference.hh - -include $(top_srcdir)/am/global-rules diff --git a/dune/fufem/quadraturerules/Makefile.am b/dune/fufem/quadraturerules/Makefile.am deleted file mode 100644 index c6e33777346f0293e8bd8d250ec5d83a21fea930..0000000000000000000000000000000000000000 --- a/dune/fufem/quadraturerules/Makefile.am +++ /dev/null @@ -1,10 +0,0 @@ -SUBDIRS = - -quadraturerulesdir = $(includedir)/dune/fufem/quadraturerules -quadraturerules_HEADERS = \ - compositequadraturerule.hh \ - lumpingquadraturerule.hh \ - quadraturerulecache.hh \ - refinedquadraturerule.hh - -include $(top_srcdir)/am/global-rules diff --git a/dune/fufem/test/Makefile.am b/dune/fufem/test/Makefile.am deleted file mode 100644 index feedb9695d3b15da05bc3d5390f0f894b8ad2af6..0000000000000000000000000000000000000000 --- a/dune/fufem/test/Makefile.am +++ /dev/null @@ -1,197 +0,0 @@ - -# list of tests to run -TESTS = arithmetictest\ - basisgridfunctiontest \ - basisinterpolatortest \ - basisinterpolationmatrixtest \ - boundarypatchtest \ - coarsegridfunctionwrappertest \ - composedfunctiontest \ - constantfunctiontest \ - functionintegratortest \ - generalizedlaplaceassemblertest \ - gradientassemblertest \ - gridfunctiontest \ - gridfunctionadaptortest \ - h1functionalassemblertest \ - integraloperatorassemblertest \ - laplaceassemblertest \ - pgmtest \ - polynomialtest \ - ppmtest \ - secondorderassemblertest \ - serializationtest \ - staticmatrixtoolstest \ - subgridxyfunctionalassemblertest \ - sumfunctiontest \ - tensortest - -CLEANFILES = $(TESTS) dataiotest - -# programs just to build when "make check" is used -check_PROGRAMS = $(TESTS) - -noinst_HEADERS = common.hh - -# collect some common flags -COMMON_CPPFLAGS = $(AM_CPPFLAGS) $(DUNEMPICPPFLAGS) -COMMON_LDADD = $(DUNE_LDFLAGS) $(DUNE_LIBS) $(DUNEMPILIBS) $(LDADD) -COMMON_LDFLAGS = $(AM_LDFLAGS) $(DUNEMPILDFLAGS) $(DUNE_LDFLAGS) - -GRID_CPPFLAGS = $(UG_CPPFLAGS) $(ALUGRID_CPPFLAGS) -GRID_LDADD = $(UG_LDFLAGS) $(UG_LIBS) $(ALUGRID_LDFLAGS) $(ALUGRID_LIBS) -GRID_LDFLAGS = $(UG_LDFLAGS) $(ALUGRID_LDFLAGS) - - -# define the programs -arithmetictest_SOURCES = arithmetictest.cc -arithmetictest_CPPFLAGS = $(COMMON_CPPFLAGS) -arithmetictest_LDADD = $(COMMON_LDADD) -arithmetictest_LDFLAGS = $(COMMON_LDFLAGS) - -if ADOLC -TESTS += adolctest -adolctest_SOURCES = adolctest.cc -adolctest_CPPFLAGS = $(COMMON_CPPFLAGS) $(GRID_CPPFLAGS) $(ADOLC_CPPFLAGS) -adolctest_LDADD = $(COMMON_LDADD) $(GRID_LDADD) $(ADOLC_LDFLAGS) -adolctest_LDFLAGS = $(COMMON_LDFLAGS) $(GRID_LDFLAGS) $(ADOLC_LDFLAGS) -endif - -basisgridfunctiontest_SOURCES = basisgridfunctiontest.cc -basisgridfunctiontest_CPPFLAGS = $(COMMON_CPPFLAGS) $(GRID_CPPFLAGS) -basisgridfunctiontest_LDADD = $(COMMON_LDADD) $(GRID_LDADD) -basisgridfunctiontest_LDFLAGS = $(COMMON_LDFLAGS) $(GRID_LDFLAGS) - -basisinterpolatortest_SOURCES = basisinterpolatortest.cc -basisinterpolatortest_CPPFLAGS = $(COMMON_CPPFLAGS) $(GRID_CPPFLAGS) -basisinterpolatortest_LDADD = $(COMMON_LDADD) $(GRID_LDADD) -basisinterpolatortest_LDFLAGS = $(COMMON_LDFLAGS) $(GRID_LDFLAGS) - -basisinterpolationmatrixtest_SOURCES = basisinterpolationmatrixtest.cc -basisinterpolationmatrixtest_CPPFLAGS = $(COMMON_CPPFLAGS) $(GRID_CPPFLAGS) -basisinterpolationmatrixtest_LDADD = $(COMMON_LDADD) $(GRID_LDADD) -basisinterpolationmatrixtest_LDFLAGS = $(COMMON_LDFLAGS) $(GRID_LDFLAGS) - -boundarypatchtest_SOURCES = boundarypatchtest.cc -boundarypatchtest_CPPFLAGS = $(COMMON_CPPFLAGS) $(GRID_CPPFLAGS) -boundarypatchtest_LDADD = $(COMMON_LDADD) $(GRID_LDADD) -boundarypatchtest_LDFLAGS = $(COMMON_LDFLAGS) $(GRID_LDFLAGS) - -coarsegridfunctionwrappertest_SOURCES = coarsegridfunctionwrappertest.cc -coarsegridfunctionwrappertest_CPPFLAGS = $(COMMON_CPPFLAGS) $(GRID_CPPFLAGS) -coarsegridfunctionwrappertest_LDADD = $(COMMON_LDADD) $(GRID_LDADD) -coarsegridfunctionwrappertest_LDFLAGS = $(COMMON_LDFLAGS) $(GRID_LDFLAGS) - -if PYTHON -TESTS += dunepythontest - -dunepythontest_SOURCES = dunepythontest.cc -dunepythontest_CPPFLAGS = \ - $(PYTHON_CPPFLAGS) $(COMMON_CPPFLAGS) $(GRID_CPPFLAGS) \ - -DDUNE_FUFEM_TEST_MODULE_PATH=\"$(srcdir)\" -dunepythontest_LDADD = $(PYTHON_LIBS) $(COMMON_LDADD) $(GRID_LDADD) -dunepythontest_LDFLAGS = $(PYTHON_LDFLAGS) $(COMMON_LDFLAGS) $(GRID_LDFLAGS) -endif - -generalizedlaplaceassemblertest_SOURCES = generalizedlaplaceassemblertest.cc -generalizedlaplaceassemblertest_CPPFLAGS = $(COMMON_CPPFLAGS) $(GRID_CPPFLAGS) -generalizedlaplaceassemblertest_LDADD = $(COMMON_LDADD) $(GRID_LDADD) -generalizedlaplaceassemblertest_LDFLAGS = $(COMMON_LDFLAGS) $(GRID_LDFLAGS) - -gradientassemblertest_SOURCES = gradientassemblertest.cc -gradientassemblertest_CPPFLAGS = $(COMMON_CPPFLAGS) $(GRID_CPPFLAGS) -gradientassemblertest_LDADD = $(COMMON_LDADD) $(GRID_LDADD) -gradientassemblertest_LDFLAGS = $(COMMON_LDFLAGS) $(GRID_LDFLAGS) - -gridfunctiontest_SOURCES = gridfunctiontest.cc -gridfunctiontest_CPPFLAGS = $(COMMON_CPPFLAGS) $(GRID_CPPFLAGS) -gridfunctiontest_LDADD = $(COMMON_LDADD) $(GRID_LDADD) -gridfunctiontest_LDFLAGS = $(COMMON_LDFLAGS) $(GRID_LDFLAGS) - -gridfunctionadaptortest_SOURCES = gridfunctionadaptortest.cc -gridfunctionadaptortest_CPPFLAGS = $(COMMON_CPPFLAGS) $(GRID_CPPFLAGS) -gridfunctionadaptortest_LDADD = $(COMMON_LDADD) $(GRID_LDADD) -gridfunctionadaptortest_LDFLAGS = $(COMMON_LDFLAGS) $(GRID_LDFLAGS) - -h1functionalassemblertest_SOURCES = h1functionalassemblertest.cc -h1functionalassemblertest_CPPFLAGS = $(COMMON_CPPFLAGS) $(GRID_CPPFLAGS) -h1functionalassemblertest_LDADD = $(COMMON_LDADD) $(GRID_LDADD) -h1functionalassemblertest_LDFLAGS = $(COMMON_LDFLAGS) $(GRID_LDFLAGS) - -integraloperatorassemblertest_SOURCES = integraloperatorassemblertest.cc -integraloperatorassemblertest_CPPFLAGS = $(COMMON_CPPFLAGS) $(GRID_CPPFLAGS) -integraloperatorassemblertest_LDADD = $(COMMON_LDADD) $(GRID_LDADD) -integraloperatorassemblertest_LDFLAGS = $(COMMON_LDFLAGS) $(GRID_LDFLAGS) - -laplaceassemblertest_SOURCES = laplaceassemblertest.cc -laplaceassemblertest_CPPFLAGS = $(COMMON_CPPFLAGS) $(GRID_CPPFLAGS) -laplaceassemblertest_LDADD = $(COMMON_LDADD) $(GRID_LDADD) -laplaceassemblertest_LDFLAGS = $(COMMON_LDFLAGS) $(GRID_LDFLAGS) - -pgmtest_SOURCES = pgmtest.cc -pgmtest_CPPFLAGS = $(COMMON_CPPFLAGS) $(GRID_CPPFLAGS) -pgmtest_LDADD = $(COMMON_LDADD) $(GRID_LDADD) -pgmtest_LDFLAGS = $(COMMON_LDFLAGS) $(GRID_LDFLAGS) - -polynomialtest_SOURCES = polynomialtest.cc -polynomialtest_CPPFLAGS = $(COMMON_CPPFLAGS) $(GRID_CPPFLAGS) -polynomialtest_LDADD = $(COMMON_LDADD) $(GRID_LDADD) -polynomialtest_LDFLAGS = $(COMMON_LDFLAGS) $(GRID_LDFLAGS) - -ppmtest_SOURCES = ppmtest.cc -ppmtest_CPPFLAGS = $(COMMON_CPPFLAGS) $(GRID_CPPFLAGS) -ppmtest_LDADD = $(COMMON_LDADD) $(GRID_LDADD) -ppmtest_LDFLAGS = $(COMMON_LDFLAGS) $(GRID_LDFLAGS) - -composedfunctiontest_SOURCES = composedfunctiontest.cc -composedfunctiontest_CPPFLAGS = $(COMMON_CPPFLAGS) $(GRID_CPPFLAGS) -composedfunctiontest_LDADD = $(COMMON_LDADD) $(GRID_LDADD) -composedfunctiontest_LDFLAGS = $(COMMON_LDFLAGS) $(GRID_LDFLAGS) - -constantfunctiontest_SOURCES = constantfunctiontest.cc -constantfunctiontest_CPPFLAGS = $(COMMON_CPPFLAGS) $(GRID_CPPFLAGS) -constantfunctiontest_LDADD = $(COMMON_LDADD) $(GRID_LDADD) -constantfunctiontest_LDFLAGS = $(COMMON_LDFLAGS) $(GRID_LDFLAGS) - -functionintegratortest_SOURCES = functionintegratortest.cc -functionintegratortest_CPPFLAGS = $(COMMON_CPPFLAGS) $(GRID_CPPFLAGS) -functionintegratortest_LDADD = $(COMMON_LDADD) $(GRID_LDADD) -functionintegratortest_LDFLAGS = $(COMMON_LDFLAGS) $(GRID_LDFLAGS) - -if UG - TESTS += functionspacebasistest - - functionspacebasistest_SOURCES = functionspacebasistest.cc - functionspacebasistest_CPPFLAGS = $(COMMON_CPPFLAGS) $(GRID_CPPFLAGS) - functionspacebasistest_LDADD = $(COMMON_LDADD) $(GRID_LDADD) - functionspacebasistest_LDFLAGS = $(COMMON_LDFLAGS) $(GRID_LDFLAGS) -endif - -serializationtest_SOURCES = serializationtest.cc -serializationtest_CXXFLAGS = $(COMMON_CPPFLAGS) $(BOOST_CPPFLAGS) -serializationtest_LDADD = $(COMMON_LDADD) $(BOOST_SERIALIZATION_LIB) -serializationtest_LDFLAGS = $(COMMON_LDFLAGS) - -secondorderassemblertest_SOURCES = secondorderassemblertest.cc -secondorderassemblertest_CXXFLAGS = $(COMMON_CPPFLAGS) -secondorderassemblertest_LDADD = $(COMMON_LDADD) -secondorderassemblertest_LDFLAGS = $(COMMON_LDFLAGS) - -staticmatrixtoolstest_SOURCES = staticmatrixtoolstest.cc -staticmatrixtoolstest_CPPFLAGS = $(COMMON_CPPFLAGS) -staticmatrixtoolstest_LDADD = $(COMMON_LDADD) -staticmatrixtoolstest_LDFLAGS = $(COMMON_LDFLAGS) - -subgridxyfunctionalassemblertest_SOURCES = subgridxyfunctionalassemblertest.cc -subgridxyfunctionalassemblertest_CPPFLAGS = $(COMMON_CPPFLAGS) $(GRID_CPPFLAGS) $(AMIRAMESH_CPPFLAGS) -Wno-deprecated-declarations -subgridxyfunctionalassemblertest_LDADD = $(COMMON_LDADD) $(GRID_LDADD) $(AMIRAMESH_LDFLAGS) $(AMIRAMESH_LIBS) -subgridxyfunctionalassemblertest_LDFLAGS = $(COMMON_LDFLAGS) $(GRID_LDFLAGS) - -sumfunctiontest_SOURCES = sumfunctiontest.cc -sumfunctiontest_CPPFLAGS = $(COMMON_CPPFLAGS) $(GRID_CPPFLAGS) -sumfunctiontest_LDADD = $(COMMON_LDADD) $(GRID_LDADD) -sumfunctiontest_LDFLAGS = $(COMMON_LDFLAGS) $(GRID_LDFLAGS) - -tensortest_SOURCES = tensortest.cc - -include $(top_srcdir)/am/global-rules diff --git a/dune/fufem/utilities/Makefile.am b/dune/fufem/utilities/Makefile.am deleted file mode 100644 index d26775dcef8769660ca9c8030510200bdb9b486b..0000000000000000000000000000000000000000 --- a/dune/fufem/utilities/Makefile.am +++ /dev/null @@ -1,9 +0,0 @@ -# $Id: $ - -SUBDIRS = - -utilitiesdir = $(includedir)/dune/fufem/utilities -utilities_HEADERS = adolcnamespaceinjections.hh - hierarchicleafiterator.hh - -include $(top_srcdir)/am/global-rules diff --git a/m4/CMakeLists.txt b/m4/CMakeLists.txt deleted file mode 100644 index 80b317a87468d39ce0d6261b18407a86eed029a6..0000000000000000000000000000000000000000 --- a/m4/CMakeLists.txt +++ /dev/null @@ -1,7 +0,0 @@ -install(FILES - ax_python_devel.m4 - adolc.m4 - dune_fufem.m4 - m4_ax_boost_base.m4 - m4_ax_boost_serialization.m4 - DESTINATION share/dune/aclocal) diff --git a/m4/Makefile.am b/m4/Makefile.am deleted file mode 100644 index bff30f741a67d2ae64360fdabe8c92e8977e5d15..0000000000000000000000000000000000000000 --- a/m4/Makefile.am +++ /dev/null @@ -1,10 +0,0 @@ -# $Id: Makefile.am 5184 2008-04-27 17:37:27Z christi $ - -ALLM4S = dune_fufem.m4 ax_python_devel.m4 m4_ax_boost_base.m4 m4_ax_boost_serialization.m4 adolc.m4 - -aclocaldir = $(datadir)/dune/aclocal -aclocal_DATA = $(ALLM4S) - -EXTRA_DIST = $(ALLM4S) - -include $(top_srcdir)/am/global-rules diff --git a/m4/adolc.m4 b/m4/adolc.m4 deleted file mode 100644 index 6bb32aa031e0bc432136f216a9b47e596d6777dc..0000000000000000000000000000000000000000 --- a/m4/adolc.m4 +++ /dev/null @@ -1,88 +0,0 @@ -# searches for Adol-C headers and libs - -AC_DEFUN([DUNE_ADOLC],[ - AC_REQUIRE([AC_PROG_CXX]) - AC_CHECK_HEADERS(cstddef stddef.h) - - AC_ARG_WITH(adolc, - AC_HELP_STRING([--with-adolc=PATH],[directory with Adol-C inside])) - -# store values -ac_save_LDFLAGS="$LDFLAGS" -ac_save_CPPFLAGS="$CPPFLAGS" -ac_save_LIBS="$LIBS" -ac_save_PKG_CONFIG_PATH="$PKG_CONFIG_PATH" - -## do nothing if --without-adolc is used -AS_IF([test x$with_adolc != xno], [ - # is --with-adolc=bla used? - AS_IF([test "x$with_adolc" != xyes], [ - AS_IF([! test -d $with_adolc], [ - AC_MSG_WARN([Adol-C directory $with_adolc does not exist]) - ], [ - # expand tilde / other stuff - ADOLCROOT=`cd $with_adolc && pwd` - ]) - ]) - AS_IF([test "x$ADOLCROOT" = x], [ - # use some default value... - ADOLCROOT="/usr/local/adolc" - ]) - - ADOLC_LIB_PATH="$ADOLCROOT/lib" - - # Check for adol-c and set ADOLC_* - export PKG_CONFIG_PATH="$ADOLC_LIB_PATH/pkgconfig:$PKG_CONFIG_PATH" - PKG_CHECK_MODULES([ADOLC], [adolc], [ - HAVE_ADOLC="1" - ], [ dnl default rule would fail - AC_MSG_WARN([Adol-C not found in $ADOLCROOT]) - ]) - - dnl For some strange reason, PKG_CHECK_MODULES puts the stuff we would expect - dnl in ADOLC_CPPFLAGS (namely, -I)in ADOLC_CFLAGS - dnl We therefore copy it by hand - ADOLC_CPPFLAGS="$ADOLC_CFLAGS -DENABLE_ADOLC" - - LDFLAGS="$LDFLAGS $ADOLC_LDFLAGS" - CPPFLAGS="$CPPFLAGS $ADOLC_CPPFLAGS" - LIBS="$LIBS $ADOLC_LIBS" - -]) - -with_adolc="no" -# survived all tests? -AS_IF([test x$HAVE_ADOLC = x1], [ - AC_SUBST(ADOLC_LIBS, $ADOLC_LIBS) - AC_SUBST(ADOLC_LDFLAGS, $ADOLC_LDFLAGS) - AC_SUBST(ADOLC_CPPFLAGS, $ADOLC_CPPFLAGS) - AC_DEFINE(HAVE_ADOLC, [ENABLE_ADOLC], [Define to ENABLE_ADOLC if Adol-C library is found]) - - # add to global list - DUNE_PKG_LDFLAGS="$DUNE_PKG_LDFLAGS $ADOLC_LDFLAGS" - DUNE_PKG_LIBS="$DUNE_PKG_LIBS $ADOLC_LIBS" - DUNE_PKG_CPPFLAGS="$DUNE_PKG_CPPFLAGS $ADOLC_CPPFLAGS" - - # set variable for summary - with_adolc="yes" -], [ - unset ADOLC_LIBS - AC_SUBST(ADOLC_LIBS, "") - unset ADOLC_LDFLAGS - AC_SUBST(ADOLC_LDFLAGS, "") - unset ADOLC_CPPFLAGS - AC_SUBST(ADOLC_CPPFLAGS, "") -]) - -# also tell automake -AM_CONDITIONAL(ADOLC, test x$HAVE_ADOLC = x1) - -# reset old values -LIBS="$ac_save_LIBS" -CPPFLAGS="$ac_save_CPPFLAGS" -LDFLAGS="$ac_save_LDFLAGS" -PKG_CONFIG_PATH="$ac_save_PKG_CONFIG_PATH" - -DUNE_ADD_SUMMARY_ENTRY([Adol-C],[$with_adolc]) - -]) diff --git a/m4/ax_python_devel.m4 b/m4/ax_python_devel.m4 deleted file mode 100644 index 73d5571419b5639695253bfb63f8b52ad4d2df93..0000000000000000000000000000000000000000 --- a/m4/ax_python_devel.m4 +++ /dev/null @@ -1,339 +0,0 @@ -# =========================================================================== -# http://www.nongnu.org/autoconf-archive/ax_python_devel.html -# =========================================================================== -# -# SYNOPSIS -# -# AX_PYTHON_DEVEL([version]) -# -# DESCRIPTION -# -# Note: Defines as a precious variable "PYTHON_VERSION". Don't override it -# in your configure.ac. -# -# This macro checks for Python and tries to get the include path to -# 'Python.h'. It provides the $(PYTHON_CPPFLAGS) and $(PYTHON_LDFLAGS) -# output variables. It also exports $(PYTHON_EXTRA_LIBS) and -# $(PYTHON_EXTRA_LDFLAGS) for embedding Python in your code. -# -# You can search for some particular version of Python by passing a -# parameter to this macro, for example ">= '2.3.1'", or "== '2.4'". Please -# note that you *have* to pass also an operator along with the version to -# match, and pay special attention to the single quotes surrounding the -# version number. Don't use "PYTHON_VERSION" for this: that environment -# variable is declared as precious and thus reserved for the end-user. -# -# This macro should work for all versions of Python >= 2.1.0. As an end -# user, you can disable the check for the python version by setting the -# PYTHON_NOVERSIONCHECK environment variable to something else than the -# empty string. -# -# If you need to use this macro for an older Python version, please -# contact the authors. We're always open for feedback. -# -# LICENSE -# -# Copyright (c) 2009 Sebastian Huber -# Copyright (c) 2009 Alan W. Irwin -# Copyright (c) 2009 Rafael Laboissiere -# Copyright (c) 2009 Andrew Collier -# Copyright (c) 2009 Matteo Settenvini -# Copyright (c) 2009 Horst Knorr -# -# 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 . -# -# 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. - -AU_ALIAS([AC_PYTHON_DEVEL], [AX_PYTHON_DEVEL]) -AC_DEFUN([AX_PYTHON_DEVEL],[ - # enable the old numbering methods in the grid interface - AC_ARG_ENABLE(embedded-python, - AC_HELP_STRING([--enable-embedded-python],[enable embedded python]), - [embedded_python=$enableval], - [embedded_python=no]) - -if test x$enable_embedded_python = xyes; then - # - # Allow the use of a (user set) custom python version - # - AC_ARG_VAR([PYTHON_VERSION],[The installed Python - version to use, for example '2.3'. This string - will be appended to the Python interpreter - canonical name.]) - - AC_PATH_PROG([PYTHON],[python[$PYTHON_VERSION]]) - if test -z "$PYTHON"; then - AC_MSG_ERROR([Cannot find python$PYTHON_VERSION in your system path]) - PYTHON_VERSION="" - fi - - # - # Check for a version of Python >= 2.1.0 - # - AC_MSG_CHECKING([for a version of Python >= '2.1.0']) - ac_supports_python_ver=`$PYTHON -c "import sys; \ - ver = sys.version.split ()[[0]]; \ - print (ver >= '2.1.0')"` - if test "$ac_supports_python_ver" != "True"; then - if test -z "$PYTHON_NOVERSIONCHECK"; then - AC_MSG_RESULT([no]) - AC_MSG_FAILURE([ -This version of the AC@&t@_PYTHON_DEVEL macro -doesn't work properly with versions of Python before -2.1.0. You may need to re-run configure, setting the -variables PYTHON_CPPFLAGS, PYTHON_LDFLAGS, PYTHON_SITE_PKG, -PYTHON_EXTRA_LIBS and PYTHON_EXTRA_LDFLAGS by hand. -Moreover, to disable this check, set PYTHON_NOVERSIONCHECK -to something else than an empty string. -]) - else - AC_MSG_RESULT([skip at user request]) - fi - else - AC_MSG_RESULT([yes]) - fi - - # - # if the macro parameter ``version'' is set, honour it - # - if test -n "$1"; then - AC_MSG_CHECKING([for a version of Python $1]) - ac_supports_python_ver=`$PYTHON -c "import sys; \ - ver = sys.version.split ()[[0]]; \ - print (ver $1)"` - if test "$ac_supports_python_ver" = "True"; then - AC_MSG_RESULT([yes]) - else - AC_MSG_RESULT([no]) - AC_MSG_ERROR([this package requires Python $1. -If you have it installed, but it isn't the default Python -interpreter in your system path, please pass the PYTHON_VERSION -variable to configure. See ``configure --help'' for reference. -]) - PYTHON_VERSION="" - fi - fi - - # - # Check if you have distutils, else fail - # - AC_MSG_CHECKING([for the distutils Python package]) - ac_distutils_result=`$PYTHON -c "import distutils" 2>&1` - if test -z "$ac_distutils_result"; then - AC_MSG_RESULT([yes]) - else - AC_MSG_RESULT([no]) - AC_MSG_ERROR([cannot import Python module "distutils". -Please check your Python installation. The error was: -$ac_distutils_result]) - PYTHON_VERSION="" - fi - - # - # Check for Python include path - # - AC_MSG_CHECKING([for Python include path]) - if test -z "$PYTHON_CPPFLAGS"; then - python_path=`$PYTHON -c "import distutils.sysconfig; \ - print (distutils.sysconfig.get_python_inc ());"` - if test -n "${python_path}"; then - python_path="-I$python_path" - fi - PYTHON_CPPFLAGS=$python_path - fi - AC_MSG_RESULT([$PYTHON_CPPFLAGS]) - AC_SUBST([PYTHON_CPPFLAGS]) - - # - # Check for Python library path - # - AC_MSG_CHECKING([for Python library path]) - if test -z "$PYTHON_LDFLAGS"; then - # (makes two attempts to ensure we've got a version number - # from the interpreter) - ac_python_version=`cat<]], - [[Py_Initialize();]]) - ],[pythonexists=yes],[pythonexists=no]) - AC_LANG_POP([C]) - # turn back to default flags - CPPFLAGS="$ac_save_CPPFLAGS" - LIBS="$ac_save_LIBS" - - AC_MSG_RESULT([$pythonexists]) - - if test ! "x$pythonexists" = "xyes"; then - AC_MSG_FAILURE([ - Could not link test program to Python. Maybe the main Python library has been - installed in some non-standard library path. If so, pass it to configure, - via the LDFLAGS environment variable. - Example: ./configure LDFLAGS="-L/usr/non-standard-path/python/lib" - ============================================================================ - ERROR! - You probably have to install the development version of the Python package - for your distribution. The exact name of this package varies among them. - ============================================================================ - ]) - PYTHON_VERSION="" - fi - - # - # all done! - # - AM_CONDITIONAL(PYTHON, true) - -else - AC_SUBST(PYTHON_EXTRA_LIBS, "") - AC_SUBST(PYTHON_EXTRA_LDFLAGS, "") - AC_SUBST(PYTHON_LDFLAGS, "") - AC_SUBST(PYTHON_CPPFLAGS, "") - AM_CONDITIONAL(PYTHON, false) -fi -DUNE_ADD_ALL_PKG([PYTHON], [$PYTHON_CPPFLAGS], [$PYTHON_LDFLAGS $PYTHON_EXTRA_LDFLAGS], [$PYTHON_EXTRA_LIBS]) -]) diff --git a/m4/dune_fufem.m4 b/m4/dune_fufem.m4 deleted file mode 100644 index d3e14da773073da66f7f830577d101cbd155d29f..0000000000000000000000000000000000000000 --- a/m4/dune_fufem.m4 +++ /dev/null @@ -1,13 +0,0 @@ -AC_DEFUN([DUNE_FUFEM_CHECKS],[ - AC_REQUIRE([AX_PYTHON_DEVEL]) - AC_REQUIRE([AX_BOOST_BASE]) - AC_REQUIRE([AX_BOOST_SERIALIZATION]) - AC_REQUIRE([DUNE_ADOLC]) - -]) - - - -AC_DEFUN([DUNE_FUFEM_CHECK_MODULE],[ - DUNE_CHECK_MODULES([dune-fufem], [fufem/boundarypatch.hh]) -]) diff --git a/m4/m4_ax_boost_base.m4 b/m4/m4_ax_boost_base.m4 deleted file mode 100644 index 54a2a1bee74e97f9c20eae32667dc6cf66c05bdd..0000000000000000000000000000000000000000 --- a/m4/m4_ax_boost_base.m4 +++ /dev/null @@ -1,258 +0,0 @@ -# =========================================================================== -# http://www.gnu.org/software/autoconf-archive/ax_boost_base.html -# =========================================================================== -# -# SYNOPSIS -# -# AX_BOOST_BASE([MINIMUM-VERSION], [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) -# -# DESCRIPTION -# -# Test for the Boost C++ libraries of a particular version (or newer) -# -# If no path to the installed boost library is given the macro searchs -# under /usr, /usr/local, /opt and /opt/local and evaluates the -# $BOOST_ROOT environment variable. Further documentation is available at -# . -# -# This macro calls: -# -# AC_SUBST(BOOST_CPPFLAGS) / AC_SUBST(BOOST_LDFLAGS) -# -# And sets: -# -# HAVE_BOOST -# -# LICENSE -# -# Copyright (c) 2008 Thomas Porschberg -# Copyright (c) 2009 Peter Adolphs -# -# Copying and distribution of this file, with or without modification, are -# permitted in any medium without royalty provided the copyright notice -# and this notice are preserved. This file is offered as-is, without any -# warranty. - -#serial 20 - -AC_DEFUN([AX_BOOST_BASE], -[ -AC_ARG_WITH([boost], - [AS_HELP_STRING([--with-boost@<:@=ARG@:>@], - [use Boost library from a standard location (ARG=yes), - from the specified location (ARG=), - or disable it (ARG=no) - @<:@ARG=yes@:>@ ])], - [ - if test "$withval" = "no"; then - want_boost="no" - elif test "$withval" = "yes"; then - want_boost="yes" - ac_boost_path="" - else - want_boost="yes" - ac_boost_path="$withval" - fi - ], - [want_boost="yes"]) - - -AC_ARG_WITH([boost-libdir], - AS_HELP_STRING([--with-boost-libdir=LIB_DIR], - [Force given directory for boost libraries. Note that this will override library path detection, so use this parameter only if default library detection fails and you know exactly where your boost libraries are located.]), - [ - if test -d "$withval" - then - ac_boost_lib_path="$withval" - else - AC_MSG_ERROR(--with-boost-libdir expected directory name) - fi - ], - [ac_boost_lib_path=""] -) - -if test "x$want_boost" = "xyes"; then - boost_lib_version_req=ifelse([$1], ,1.20.0,$1) - boost_lib_version_req_shorten=`expr $boost_lib_version_req : '\([[0-9]]*\.[[0-9]]*\)'` - boost_lib_version_req_major=`expr $boost_lib_version_req : '\([[0-9]]*\)'` - boost_lib_version_req_minor=`expr $boost_lib_version_req : '[[0-9]]*\.\([[0-9]]*\)'` - boost_lib_version_req_sub_minor=`expr $boost_lib_version_req : '[[0-9]]*\.[[0-9]]*\.\([[0-9]]*\)'` - if test "x$boost_lib_version_req_sub_minor" = "x" ; then - boost_lib_version_req_sub_minor="0" - fi - WANT_BOOST_VERSION=`expr $boost_lib_version_req_major \* 100000 \+ $boost_lib_version_req_minor \* 100 \+ $boost_lib_version_req_sub_minor` - AC_MSG_CHECKING(for boostlib >= $boost_lib_version_req) - succeeded=no - - dnl On 64-bit systems check for system libraries in both lib64 and lib. - dnl The former is specified by FHS, but e.g. Debian does not adhere to - dnl this (as it rises problems for generic multi-arch support). - dnl The last entry in the list is chosen by default when no libraries - dnl are found, e.g. when only header-only libraries are installed! - libsubdirs="lib" - ax_arch=`uname -m` - if test $ax_arch = x86_64 -o $ax_arch = ppc64 -o $ax_arch = s390x -o $ax_arch = sparc64; then - libsubdirs="lib64 lib lib64" - fi - - dnl first we check the system location for boost libraries - dnl this location ist chosen if boost libraries are installed with the --layout=system option - dnl or if you install boost with RPM - if test "$ac_boost_path" != ""; then - BOOST_CPPFLAGS="-I$ac_boost_path/include" - for ac_boost_path_tmp in $libsubdirs; do - if test -d "$ac_boost_path"/"$ac_boost_path_tmp" ; then - BOOST_LDFLAGS="-L$ac_boost_path/$ac_boost_path_tmp" - break - fi - done - elif test "$cross_compiling" != yes; then - for ac_boost_path_tmp in /usr /usr/local /opt /opt/local ; do - if test -d "$ac_boost_path_tmp/include/boost" && test -r "$ac_boost_path_tmp/include/boost"; then - for libsubdir in $libsubdirs ; do - if ls "$ac_boost_path_tmp/$libsubdir/libboost_"* >/dev/null 2>&1 ; then break; fi - done - BOOST_LDFLAGS="-L$ac_boost_path_tmp/$libsubdir" - BOOST_CPPFLAGS="-I$ac_boost_path_tmp/include" - break; - fi - done - fi - - dnl overwrite ld flags if we have required special directory with - dnl --with-boost-libdir parameter - if test "$ac_boost_lib_path" != ""; then - BOOST_LDFLAGS="-L$ac_boost_lib_path" - fi - - CPPFLAGS_SAVED="$CPPFLAGS" - CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS" - export CPPFLAGS - - LDFLAGS_SAVED="$LDFLAGS" - LDFLAGS="$LDFLAGS $BOOST_LDFLAGS" - export LDFLAGS - - AC_REQUIRE([AC_PROG_CXX]) - AC_LANG_PUSH(C++) - AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ - @%:@include - ]], [[ - #if BOOST_VERSION >= $WANT_BOOST_VERSION - // Everything is okay - #else - # error Boost version is too old - #endif - ]])],[ - AC_MSG_RESULT(yes) - succeeded=yes - found_system=yes - ],[ - ]) - AC_LANG_POP([C++]) - - - - dnl if we found no boost with system layout we search for boost libraries - dnl built and installed without the --layout=system option or for a staged(not installed) version - if test "x$succeeded" != "xyes"; then - _version=0 - if test "$ac_boost_path" != ""; then - if test -d "$ac_boost_path" && test -r "$ac_boost_path"; then - for i in `ls -d $ac_boost_path/include/boost-* 2>/dev/null`; do - _version_tmp=`echo $i | sed "s#$ac_boost_path##" | sed 's/\/include\/boost-//' | sed 's/_/./'` - V_CHECK=`expr $_version_tmp \> $_version` - if test "$V_CHECK" = "1" ; then - _version=$_version_tmp - fi - VERSION_UNDERSCORE=`echo $_version | sed 's/\./_/'` - BOOST_CPPFLAGS="-I$ac_boost_path/include/boost-$VERSION_UNDERSCORE" - done - fi - else - if test "$cross_compiling" != yes; then - for ac_boost_path in /usr /usr/local /opt /opt/local ; do - if test -d "$ac_boost_path" && test -r "$ac_boost_path"; then - for i in `ls -d $ac_boost_path/include/boost-* 2>/dev/null`; do - _version_tmp=`echo $i | sed "s#$ac_boost_path##" | sed 's/\/include\/boost-//' | sed 's/_/./'` - V_CHECK=`expr $_version_tmp \> $_version` - if test "$V_CHECK" = "1" ; then - _version=$_version_tmp - best_path=$ac_boost_path - fi - done - fi - done - - VERSION_UNDERSCORE=`echo $_version | sed 's/\./_/'` - BOOST_CPPFLAGS="-I$best_path/include/boost-$VERSION_UNDERSCORE" - if test "$ac_boost_lib_path" = ""; then - for libsubdir in $libsubdirs ; do - if ls "$best_path/$libsubdir/libboost_"* >/dev/null 2>&1 ; then break; fi - done - BOOST_LDFLAGS="-L$best_path/$libsubdir" - fi - fi - - if test "x$BOOST_ROOT" != "x"; then - for libsubdir in $libsubdirs ; do - if ls "$BOOST_ROOT/stage/$libsubdir/libboost_"* >/dev/null 2>&1 ; then break; fi - done - if test -d "$BOOST_ROOT" && test -r "$BOOST_ROOT" && test -d "$BOOST_ROOT/stage/$libsubdir" && test -r "$BOOST_ROOT/stage/$libsubdir"; then - version_dir=`expr //$BOOST_ROOT : '.*/\(.*\)'` - stage_version=`echo $version_dir | sed 's/boost_//' | sed 's/_/./g'` - stage_version_shorten=`expr $stage_version : '\([[0-9]]*\.[[0-9]]*\)'` - V_CHECK=`expr $stage_version_shorten \>\= $_version` - if test "$V_CHECK" = "1" -a "$ac_boost_lib_path" = "" ; then - AC_MSG_NOTICE(We will use a staged boost library from $BOOST_ROOT) - BOOST_CPPFLAGS="-I$BOOST_ROOT" - BOOST_LDFLAGS="-L$BOOST_ROOT/stage/$libsubdir" - fi - fi - fi - fi - - CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS" - export CPPFLAGS - LDFLAGS="$LDFLAGS $BOOST_LDFLAGS" - export LDFLAGS - - AC_LANG_PUSH(C++) - AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ - @%:@include - ]], [[ - #if BOOST_VERSION >= $WANT_BOOST_VERSION - // Everything is okay - #else - # error Boost version is too old - #endif - ]])],[ - AC_MSG_RESULT(yes) - succeeded=yes - found_system=yes - ],[ - ]) - AC_LANG_POP([C++]) - fi - - if test "$succeeded" != "yes" ; then - if test "$_version" = "0" ; then - AC_MSG_NOTICE([[We could not detect the boost libraries (version $boost_lib_version_req_shorten or higher). If you have a staged boost library (still not installed) please specify \$BOOST_ROOT in your environment and do not give a PATH to --with-boost option. If you are sure you have boost installed, then check your version number looking in . See http://randspringer.de/boost for more documentation.]]) - else - AC_MSG_NOTICE([Your boost libraries seems to old (version $_version).]) - fi - # execute ACTION-IF-NOT-FOUND (if present): - ifelse([$3], , :, [$3]) - else - AC_SUBST(BOOST_CPPFLAGS) - AC_SUBST(BOOST_LDFLAGS) - AC_DEFINE(HAVE_BOOST,,[define if the Boost library is available]) - # execute ACTION-IF-FOUND (if present): - ifelse([$2], , :, [$2]) - fi - - CPPFLAGS="$CPPFLAGS_SAVED" - LDFLAGS="$LDFLAGS_SAVED" -fi - -]) diff --git a/m4/m4_ax_boost_serialization.m4 b/m4/m4_ax_boost_serialization.m4 deleted file mode 100644 index 8225a2fe2d024ce579a382e17f9949cb2b175c0e..0000000000000000000000000000000000000000 --- a/m4/m4_ax_boost_serialization.m4 +++ /dev/null @@ -1,118 +0,0 @@ -# =========================================================================== -# http://www.gnu.org/software/autoconf-archive/ax_boost_serialization.html -# =========================================================================== -# -# SYNOPSIS -# -# AX_BOOST_SERIALIZATION -# -# DESCRIPTION -# -# Test for Serialization library from the Boost C++ libraries. The macro -# requires a preceding call to AX_BOOST_BASE. Further documentation is -# available at . -# -# This macro calls: -# -# AC_SUBST(BOOST_SERIALIZATION_LIB) -# -# And sets: -# -# HAVE_BOOST_SERIALIZATION -# -# LICENSE -# -# Copyright (c) 2008 Thomas Porschberg -# -# Copying and distribution of this file, with or without modification, are -# permitted in any medium without royalty provided the copyright notice -# and this notice are preserved. This file is offered as-is, without any -# warranty. - -#serial 18 - -AC_DEFUN([AX_BOOST_SERIALIZATION], -[ - AC_ARG_WITH([boost-serialization], - AS_HELP_STRING([--with-boost-serialization@<:@=special-lib@:>@], - [use the Serialization library from boost - it is possible to specify a certain library for the linker - e.g. --with-boost-serialization=boost_serialization-gcc-mt-d-1_33_1 ]), - [ - if test "$withval" = "no"; then - want_boost="no" - elif test "$withval" = "yes"; then - want_boost="yes" - ax_boost_user_serialization_lib="" - else - want_boost="yes" - ax_boost_user_serialization_lib="$withval" - fi - ], - [want_boost="yes"] - ) - - if test "x$want_boost" = "xyes"; then - AC_REQUIRE([AC_PROG_CC]) - CPPFLAGS_SAVED="$CPPFLAGS" - CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS" - AC_MSG_WARN(BOOST_CPPFLAGS $BOOST_CPPFLAGS) - export CPPFLAGS - - LDFLAGS_SAVED="$LDFLAGS" - LDFLAGS="$LDFLAGS $BOOST_LDFLAGS" - export LDFLAGS - - AC_CACHE_CHECK(whether the Boost::Serialization library is available, - ax_cv_boost_serialization, - [AC_LANG_PUSH([C++]) - AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[@%:@include - @%:@include - @%:@include - ]], - [[std::ofstream ofs("filename"); - boost::archive::text_oarchive oa(ofs); - return 0; - ]])], - ax_cv_boost_serialization=yes, ax_cv_boost_serialization=no) - AC_LANG_POP([C++]) - ]) - ax_lib= - if test "x$ax_cv_boost_serialization" = "xyes"; then - AC_DEFINE(HAVE_BOOST_SERIALIZATION,,[define if the Boost::Serialization library is available]) - BOOSTLIBDIR=`echo $BOOST_LDFLAGS | sed -e 's/@<:@^\/@:>@*//'` - if test "x$ax_boost_user_serialization_lib" = "x"; then - for libextension in `ls $BOOSTLIBDIR/libboost_serialization*.so* $BOOSTLIBDIR/libboost_serialization*.a* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^lib\(boost_serialization.*\)\.so.*$;\1;' -e 's;^lib\(boost_serialization.*\)\.a*$;\1;'` ; do - ax_lib=${libextension} - AC_CHECK_LIB($ax_lib, exit, - [BOOST_SERIALIZATION_LIB="-l$ax_lib"; AC_SUBST(BOOST_SERIALIZATION_LIB) link_serialization="yes"; break], - [link_serialization="no"]) - done - if test "x$link_serialization" != "xyes"; then - for libextension in `ls $BOOSTLIBDIR/boost_serialization*.{dll,a}* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^\(boost_serialization.*\)\.dll.*$;\1;' -e 's;^\(boost_serialization.*\)\.a*$;\1;'` ; do - ax_lib=${libextension} - AC_CHECK_LIB($ax_lib, exit, - [BOOST_SERIALIZATION_LIB="-l$ax_lib"; AC_SUBST(BOOST_SERIALIZATION_LIB) link_serialization="yes"; break], - [link_serialization="no"]) - done - fi - - else - for ax_lib in $ax_boost_user_serialization_lib boost_serialization-$ax_boost_user_serialization_lib; do - AC_CHECK_LIB($ax_lib, main, - [BOOST_SERIALIZATION_LIB="-l$ax_lib"; AC_SUBST(BOOST_SERIALIZATION_LIB) link_serialization="yes"; break], - [link_serialization="no"]) - done - - fi - if test "x$ax_lib" = "x"; then - AC_MSG_ERROR(Could not find a version of the library!) - fi - if test "x$link_serialization" != "xyes"; then - AC_MSG_ERROR(Could not link against $ax_lib !) - fi - fi - - CPPFLAGS="$CPPFLAGS_SAVED" - LDFLAGS="$LDFLAGS_SAVED" - fi -]) diff --git a/stamp-vc b/stamp-vc deleted file mode 100644 index 093711c197e5bade361b2b9e105fdea2f68594b6..0000000000000000000000000000000000000000 --- a/stamp-vc +++ /dev/null @@ -1 +0,0 @@ -Stamp file to show that we are not in a distribution tarball (i.e., dune-autogen.sh needs to be called).