diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6a2d30bc039744d318c70cfa7a7c3216c924237c..ae563f91a460930f1b197d4bdd87b7fca4c30bfc 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -22,7 +22,6 @@ dune_project()
find_package(SuiteSparse OPTIONAL_COMPONENTS UMFPACK)
include(AddSuiteSparseFlags)
-add_subdirectory("m4")
add_subdirectory("dune")
add_subdirectory("doc")
add_subdirectory("cmake/modules")
diff --git a/Makefile.am b/Makefile.am
deleted file mode 100644
index 6429c75c4cb7dffbdd2d0dc32963743263dd7ff2..0000000000000000000000000000000000000000
--- a/Makefile.am
+++ /dev/null
@@ -1,28 +0,0 @@
-# $Id$
-
-# we need the module file to be able to build via dunecontrol
-EXTRA_DIST = dune.module \
- CMakeLists.txt \
- config.h.cmake
-
-SUBDIRS = m4 dune doc cmake
-
-if BUILD_DOCS
-SUBDIRS += doc
-endif
-
-# don't follow the full GNU-standard
-# we need automake 1.9 or newer
-AUTOMAKE_OPTIONS = foreign 1.9
-
-# pass most important options when "make distcheck" is used
-# dune-geometry is a dependency of dune-grid.
-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)"
-
-include $(top_srcdir)/am/top-rules
-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 b7f1f3da752e0dcca6e4d7cff03e2315d2aefa1e..0000000000000000000000000000000000000000
--- a/cmake/modules/Makefile.am
+++ /dev/null
@@ -1,6 +0,0 @@
-MODULES = DuneSolversMacros.cmake
-modulesdir = $(datadir)/dune/cmake/modules
-dist_modules_DATA = ${MODULES}
-
-include $(top_srcdir)/am/global-rules
-EXTRA_DIST = CMakeLists.txt AddIPOptflags.cmake DuneSolversMacros.cmake FindIPOpt.cmake
diff --git a/configure.ac b/configure.ac
deleted file mode 100644
index 65e70c45bbd01c0b74e84e2c3701b7450a9ccedf..0000000000000000000000000000000000000000
--- a/configure.ac
+++ /dev/null
@@ -1,41 +0,0 @@
-# -*- Autoconf -*-
-# Process this file with autoconf to produce a configure script.
-AC_PREREQ([2.62])
-DUNE_AC_INIT # gets module version from dune.module file
-AM_INIT_AUTOMAKE
-AC_CONFIG_SRCDIR([dune-solvers.pc.in])
-AC_CONFIG_HEADERS([config.h])
-
-
-# we need no more than the standard DE-stuff
-# this module depends on dune-common dune-grid dune-istl dune-localfunctions
-# this implies checking for [dune-common], [dune-geometry], [dune-grid], [dune-istl], [dune-localfunctions]
-DUNE_CHECK_ALL
-
-# implicitly set the Dune-flags everywhere
-AC_SUBST(AM_CPPFLAGS, $DUNE_CPPFLAGS)
-AC_SUBST(AM_LDFLAGS, $DUNE_LDFLAGS)
-LIBS="$DUNE_LIBS"
-
-AC_CONFIG_FILES([
- Makefile
- cmake/Makefile
- cmake/modules/Makefile
- doc/Makefile
- doc/doxygen/Makefile
- doc/doxygen/Doxyfile
- dune/Makefile
- dune/solvers/Makefile
- dune/solvers/common/Makefile
- dune/solvers/iterationsteps/Makefile
- dune/solvers/norms/Makefile
- dune/solvers/operators/Makefile
- dune/solvers/solvers/Makefile
- dune/solvers/test/Makefile
- dune/solvers/transferoperators/Makefile
- m4/Makefile
- dune-solvers.pc
-])
-AC_OUTPUT
-# finally print the summary information
-DUNE_SUMMARY_ALL
diff --git a/doc/Makefile.am b/doc/Makefile.am
deleted file mode 100644
index 3e9b46985508dcc8601d8d9aa1c839b569036129..0000000000000000000000000000000000000000
--- a/doc/Makefile.am
+++ /dev/null
@@ -1,14 +0,0 @@
-
-SUBDIRS = doxygen
-CURDIR = doc
-BASEDIR = ..
-
-# add list of html files to generate from wml
-PAGES=
-
-docdir=$(datadir)/doc/dune-solvers
-
-EXTRA_DIST = CMakeLists.txt LOWRANKBRANCH-BACKPORT-CHANGES
-
-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 a4917f4dffcf42997a809eadcdbffb6be0bd740c..0000000000000000000000000000000000000000
--- a/doc/doxygen/Makefile.am
+++ /dev/null
@@ -1,9 +0,0 @@
-
-BASEDIR=../..
-CURDIR=doc/doxygen
-
-EXTRA_DIST = CMakeLists.txt
-
-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 b5abf089252de0eb38618d15a56bcd271491bdaa..0000000000000000000000000000000000000000
--- a/dune/Makefile.am
+++ /dev/null
@@ -1,5 +0,0 @@
-SUBDIRS = solvers
-
-EXTRA_DIST = CMakeLists.txt
-
-include $(top_srcdir)/am/global-rules
diff --git a/dune/solvers/Makefile.am b/dune/solvers/Makefile.am
deleted file mode 100644
index 3d0a8933d1796e0fe12f53ea4fe38f00574b269f..0000000000000000000000000000000000000000
--- a/dune/solvers/Makefile.am
+++ /dev/null
@@ -1,9 +0,0 @@
-
-SUBDIRS = common iterationsteps norms operators solvers test transferoperators
-
-dune_solversdir = $(includedir)/dune/solvers
-dune_solvers_HEADERS = computeenergy.hh
-
-EXTRA_DIST = CMakeLists.txt
-
-include $(top_srcdir)/am/global-rules
diff --git a/dune/solvers/common/Makefile.am b/dune/solvers/common/Makefile.am
deleted file mode 100644
index 14bd9a2ed137dadf4e18087af052197c3a33ddcb..0000000000000000000000000000000000000000
--- a/dune/solvers/common/Makefile.am
+++ /dev/null
@@ -1,16 +0,0 @@
-SUBDIRS =
-
-commondir = $(includedir)/dune/solvers/common
-common_HEADERS = arithmetic.hh \
- boxconstraint.hh \
- genericvectortools.hh \
- canignore.hh \
- interval.hh \
- numproc.hh \
- permutationmanager.hh \
- preconditioner.hh \
- staticmatrixtools.hh
-
-EXTRA_DIST = CMakeLists.txt
-
-include $(top_srcdir)/am/global-rules
diff --git a/dune/solvers/iterationsteps/Makefile.am b/dune/solvers/iterationsteps/Makefile.am
deleted file mode 100644
index e08f928bf294e169b104cb7aefc7bfdd4ef8f290..0000000000000000000000000000000000000000
--- a/dune/solvers/iterationsteps/Makefile.am
+++ /dev/null
@@ -1,33 +0,0 @@
-SUBDIRS =
-
-iterationstepsdir = $(includedir)/dune/solvers/iterationsteps
-iterationsteps_HEADERS = amgstep.hh \
- blockgsstep.hh \
- blockgsstep.cc \
- cgstep.hh \
- cgstep.cc \
- istlseqilu0step.hh \
- istlseqssorstep.hh \
- iterationstep.hh \
- lineariterationstep.hh \
- linegsstep.hh \
- linegsstep.cc \
- minimalpolynomialextrapolationstep.hh \
- mmgstep.hh mmgstep.cc \
- multigridstep.hh \
- multigridstep.cc \
- obstacletnnmgstep.hh \
- projectedblockgsstep.hh \
- projectedblockgsstep.cc \
- projectedgradientstep.hh \
- projectedgradientstep.cc \
- projectedlinegsstep.cc projectedlinegsstep.hh \
- richardsonstep.hh \
- truncatedblockgsstep.hh \
- truncatedsaddlepointgsstep.hh \
- trustregiongsstep.cc \
- trustregiongsstep.hh
-
-EXTRA_DIST = CMakeLists.txt
-
-include $(top_srcdir)/am/global-rules
diff --git a/dune/solvers/norms/Makefile.am b/dune/solvers/norms/Makefile.am
deleted file mode 100644
index 6d8942fdf528a6f318f594233a05efa0a6507808..0000000000000000000000000000000000000000
--- a/dune/solvers/norms/Makefile.am
+++ /dev/null
@@ -1,18 +0,0 @@
-SUBDIRS =
-
-normsdir = $(includedir)/dune/solvers/norms
-norms_HEADERS = \
- blocknorm.hh \
- diagnorm.hh \
- energynorm.hh \
- fullnorm.hh \
- h1seminorm.hh \
- norm.hh \
- pnorm.hh \
- reorderedblocknorm.hh \
- sumnorm.hh \
- twonorm.hh
-
-EXTRA_DIST = CMakeLists.txt
-
-include $(top_srcdir)/am/global-rules
\ No newline at end of file
diff --git a/dune/solvers/operators/Makefile.am b/dune/solvers/operators/Makefile.am
deleted file mode 100644
index 10ece4a3189186817c46591699d71b54a4dca72f..0000000000000000000000000000000000000000
--- a/dune/solvers/operators/Makefile.am
+++ /dev/null
@@ -1,10 +0,0 @@
-SUBDIRS =
-
-operatorsdir = $(includedir)/dune/solvers/operators
-operators_HEADERS = lowrankoperator.hh \
- nulloperator.hh \
- sumoperator.hh
-
-EXTRA_DIST = CMakeLists.txt
-
-include $(top_srcdir)/am/global-rules
diff --git a/dune/solvers/solvers/Makefile.am b/dune/solvers/solvers/Makefile.am
deleted file mode 100644
index 5c9d0e02432af68947ea1aed0f409f6e1e6bd23c..0000000000000000000000000000000000000000
--- a/dune/solvers/solvers/Makefile.am
+++ /dev/null
@@ -1,10 +0,0 @@
-SUBDIRS =
-
-solversdir = $(includedir)/dune/solvers/solvers
-solvers_HEADERS = criterion.hh iterativesolver.cc iterativesolver.hh \
- loopsolver.cc loopsolver.hh quadraticipopt.hh solver.hh \
- tcgsolver.cc tcgsolver.hh trustregionsolver.cc trustregionsolver.hh
-
-EXTRA_DIST = CMakeLists.txt
-
-include $(top_srcdir)/am/global-rules
diff --git a/dune/solvers/test/Makefile.am b/dune/solvers/test/Makefile.am
deleted file mode 100644
index c7f20a1a0f6642cddc3e88b4c242589592776b2f..0000000000000000000000000000000000000000
--- a/dune/solvers/test/Makefile.am
+++ /dev/null
@@ -1,85 +0,0 @@
-
-# list of tests to run
-TESTS = genericvectortoolstest \
- lowrankoperatortest \
- cgsteptest \
- multigridtest \
- nulloperatortest \
- obstacletnnmgtest \
- projectedgradienttest \
- sumoperatortest
-
-if IPOPT
-TESTS += \
- mmgtest \
- quadraticipoptsolvertest
-endif
-
-# 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) -I$(top_srcdir)
-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
-cgsteptest_SOURCES = cgsteptest.cc
-cgsteptest_CPPFLAGS = $(COMMON_CPPFLAGS) $(GRID_CPPFLAGS)
-cgsteptest_LDADD = $(COMMON_LDADD) $(GRID_LDADD)
-cgsteptest_LDFLAGS = $(COMMON_LDFLAGS) $(GRID_LDFLAGS)
-
-genericvectortoolstest_SOURCES = genericvectortoolstest.cc
-genericvectortoolstest_CPPFLAGS = $(COMMON_CPPFLAGS) $(GRID_CPPFLAGS)
-genericvectortoolstest_LDADD = $(COMMON_LDADD) $(GRID_LDADD)
-genericvectortoolstest_LDFLAGS = $(COMMON_LDFLAGS) $(GRID_LDFLAGS)
-
-lowrankoperatortest_SOURCES = lowrankoperatortest.cc
-lowrankoperatortest_CPPFLAGS = $(COMMON_CPPFLAGS) $(GRID_CPPFLAGS)
-lowrankoperatortest_LDADD = $(COMMON_LDADD) $(GRID_LDADD)
-lowrankoperatortest_LDFLAGS = $(COMMON_LDFLAGS) $(GRID_LDFLAGS)
-
-mmgtest_SOURCES = mmgtest.cc
-mmgtest_CPPFLAGS = $(COMMON_CPPFLAGS) $(GRID_CPPFLAGS) $(IPOPT_CPPFLAGS)
-mmgtest_LDADD = $(COMMON_LDADD) $(GRID_LDADD) $(IPOPT_LIBS)
-mmgtest_LDFLAGS = $(COMMON_LDFLAGS) $(GRID_LDFLAGS) $(IPOPT_LIBS)
-
-multigridtest_SOURCES = multigridtest.cc
-multigridtest_CPPFLAGS = $(COMMON_CPPFLAGS) $(GRID_CPPFLAGS)
-multigridtest_LDADD = $(COMMON_LDADD) $(GRID_LDADD)
-multigridtest_LDFLAGS = $(COMMON_LDFLAGS) $(GRID_LDFLAGS)
-
-nulloperatortest_SOURCES = nulloperatortest.cc
-nulloperatortest_CPPFLAGS = $(COMMON_CPPFLAGS) $(GRID_CPPFLAGS)
-nulloperatortest_LDADD = $(COMMON_LDADD) $(GRID_LDADD)
-nulloperatortest_LDFLAGS = $(COMMON_LDFLAGS) $(GRID_LDFLAGS)
-
-obstacletnnmgtest_SOURCES = obstacletnnmgtest.cc
-obstacletnnmgtest_CPPFLAGS = $(COMMON_CPPFLAGS) $(GRID_CPPFLAGS)
-obstacletnnmgtest_LDADD = $(COMMON_LDADD) $(GRID_LDADD)
-obstacletnnmgtest_LDFLAGS = $(COMMON_LDFLAGS) $(GRID_LDFLAGS)
-
-projectedgradienttest_SOURCES = projectedgradienttest.cc
-projectedgradienttest_CPPFLAGS = $(COMMON_CPPFLAGS) $(GRID_CPPFLAGS)
-projecredgradienttest_LDADD = $(COMMON_LDADD) $(GRID_LDADD)
-projectedgradienttest_LDFLAGS = $(COMMON_LDFLAGS) $(GRID_LDFLAGS)
-
-quadraticipoptsolvertest_SOURCES = quadraticipoptsolvertest.cc
-quadraticipoptsolvertest_CPPFLAGS = $(COMMON_CPPFLAGS) $(IPOPT_CPPFLAGS)
-quadraticipoptsolvertest_LDADD = $(COMMON_LDADD) $(IPOPT_LDFLAGS) $(IPOPT_LIBS)
-quadraticipoptsolvertest_LDFLAGS = $(COMMON_LDFLAGS) $(IPOPT_LDFLAGS) $(IPOPT_LIBS)
-
-sumoperatortest_SOURCES = sumoperatortest.cc
-sumoperatortest_CPPFLAGS = $(COMMON_CPPFLAGS) $(GRID_CPPFLAGS)
-sumoperatortest_LDADD = $(COMMON_LDADD) $(GRID_LDADD)
-sumoperatortest_LDFLAGS = $(COMMON_LDFLAGS) $(GRID_LDFLAGS)
-
-CLEANFILES = *.vtu *.vtp
-
-include $(top_srcdir)/am/global-rules
diff --git a/dune/solvers/transferoperators/Makefile.am b/dune/solvers/transferoperators/Makefile.am
deleted file mode 100644
index 47e9926129c9ec4010afa92f9ffae4e78824a9b9..0000000000000000000000000000000000000000
--- a/dune/solvers/transferoperators/Makefile.am
+++ /dev/null
@@ -1,12 +0,0 @@
-SUBDIRS =
-
-transferoperatorsdir = $(includedir)/dune/solvers/transferoperators
-transferoperators_HEADERS = compressedmultigridtransfer.hh multigridtransfer.hh \
- truncatedcompressedmgtransfer.hh truncatedmgtransfer.hh densemultigridtransfer.hh \
- mandelobsrestrictor.cc obstaclerestrictor.hh truncateddensemgtransfer.cc \
- genericmultigridtransfer.hh mandelobsrestrictor.hh truncatedcompressedmgtransfer.cc \
- truncateddensemgtransfer.hh
-
-EXTRA_DIST = CMakeLists.txt
-
-include $(top_srcdir)/am/global-rules
\ No newline at end of file
diff --git a/m4/CMakeLists.txt b/m4/CMakeLists.txt
deleted file mode 100644
index ab4832ecc0f7ce739d483a3312e3a2ae74f1909e..0000000000000000000000000000000000000000
--- a/m4/CMakeLists.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-
-install(FILES
- dune-solvers.m4
- ipopt.m4
- DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/dune/aclocal)
-
diff --git a/m4/Makefile.am b/m4/Makefile.am
deleted file mode 100644
index 725c62cc9f6fb0b92f1e366ecb97da78669bf7e1..0000000000000000000000000000000000000000
--- a/m4/Makefile.am
+++ /dev/null
@@ -1,8 +0,0 @@
-M4FILES = dune-solvers.m4 ipopt.m4
-
-aclocaldir = $(datadir)/dune/aclocal
-aclocal_DATA = $(M4FILES)
-
-EXTRA_DIST = $(M4FILES) CMakeLists.txt
-
-include $(top_srcdir)/am/global-rules
diff --git a/m4/dune-solvers.m4 b/m4/dune-solvers.m4
deleted file mode 100644
index 22ef1d4fc7bcad6eccc29367cb469fdad63c0078..0000000000000000000000000000000000000000
--- a/m4/dune-solvers.m4
+++ /dev/null
@@ -1,19 +0,0 @@
-dnl -*- autoconf -*-
-# Macros needed to find dune-solvers and dependent libraries. They are called by
-# the macros in ${top_src_dir}/dependencies.m4, which is generated by
-# "dunecontrol autogen"
-
-# Additional checks needed to build dune-solvers
-# This macro should be invoked by every module which depends on dune-solvers, as
-# well as by dune-solvers itself
-AC_DEFUN([DUNE_SOLVERS_CHECKS],[
- AC_REQUIRE([DUNE_IPOPT])
-])
-
-# Additional checks needed to find dune-solvers
-# This macro should be invoked by every module which depends on dune-solvers, but
-# not by dune-solvers itself
-AC_DEFUN([DUNE_SOLVERS_CHECK_MODULE],
-[
- DUNE_CHECK_MODULES([dune-solvers],[solvers/solvers/solver.hh])
-])
diff --git a/m4/ipopt.m4 b/m4/ipopt.m4
deleted file mode 100644
index 985c794d849b118a636431cbf42b931cb84f1df2..0000000000000000000000000000000000000000
--- a/m4/ipopt.m4
+++ /dev/null
@@ -1,88 +0,0 @@
-# searches for ipopt headers and libs
-
-AC_DEFUN([DUNE_IPOPT],[
- AC_REQUIRE([AC_PROG_CXX])
- AC_CHECK_HEADERS(cstddef stddef.h)
-
- AC_ARG_WITH(ipopt,
- AC_HELP_STRING([--with-ipopt=PATH],[directory with IPOpt 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-ipopt is used
-AS_IF([test x$with_ipopt != xno], [
- # is --with-ipopt=bla used?
- AS_IF([test "x$with_ipopt" != xyes], [
- AS_IF([! test -d $with_ipopt], [
- AC_MSG_WARN([IPOpt directory $with_ipopt does not exist])
- ], [
- # expand tilde / other stuff
- IPOPTROOT=`cd $with_ipopt && pwd`
- ])
- ])
- AS_IF([test "x$IPOPTROOT" = x], [
- # use some default value...
- IPOPTROOT="/usr/local/ipopt"
- ])
-
- IPOPT_LIB_PATH="$IPOPTROOT/lib"
-
- # Check for ipopt and set IPOPT_*
- export PKG_CONFIG_PATH="$IPOPT_LIB_PATH/pkgconfig:$PKG_CONFIG_PATH"
- PKG_CHECK_MODULES([IPOPT], [ipopt], [
- HAVE_IPOPT="1"
- ], [ dnl default rule would fail
- AC_MSG_WARN([IPOpt not found in $IPOPTROOT])
- ])
-
- dnl For some strange reason, PKG_CHECK_MODULES puts the stuff we would expect
- dnl in IPOPT_CPPFLAGS (namely, -I<path>)in IPOPT_CFLAGS with ipopt 3.10.1.
- dnl We therefore copy it by hand
- IPOPT_CPPFLAGS="$IPOPT_CFLAGS -DENABLE_IPOPT"
-
- LDFLAGS="$LDFLAGS $IPOPT_LDFLAGS"
- CPPFLAGS="$CPPFLAGS $IPOPT_CPPFLAGS"
- LIBS="$LIBS $IPOPT_LIBS"
-
-])
-
-with_ipopt="no"
-# survived all tests?
-AS_IF([test x$HAVE_IPOPT = x1], [
- AC_SUBST(IPOPT_LIBS, $IPOPT_LIBS)
- AC_SUBST(IPOPT_LDFLAGS, $IPOPT_LDFLAGS)
- AC_SUBST(IPOPT_CPPFLAGS, $IPOPT_CPPFLAGS)
- AC_DEFINE(HAVE_IPOPT, [ENABLE_IPOPT], [Define to ENABLE_IPOPT if IPOpt library is found])
-
- # add to global list
- DUNE_PKG_LDFLAGS="$DUNE_PKG_LDFLAGS $IPOPT_LDFLAGS"
- DUNE_PKG_LIBS="$DUNE_PKG_LIBS $IPOPT_LIBS"
- DUNE_PKG_CPPFLAGS="$DUNE_PKG_CPPFLAGS $IPOPT_CPPFLAGS"
-
- # set variable for summary
- with_ipopt="yes"
-], [
- unset IPOPT_LIBS
- AC_SUBST(IPOPT_LIBS, "")
- unset IPOPT_LDFLAGS
- AC_SUBST(IPOPT_LDFLAGS, "")
- unset IPOPT_CPPFLAGS
- AC_SUBST(IPOPT_CPPFLAGS, "")
-])
-
-# also tell automake
-AM_CONDITIONAL(IPOPT, test x$HAVE_IPOPT = 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([IPOpt],[$with_ipopt])
-
-])
diff --git a/stamp-vc b/stamp-vc
deleted file mode 100644
index ea2c89e7d0add59fdefb1c3278dc5e54b73990ea..0000000000000000000000000000000000000000
--- a/stamp-vc
+++ /dev/null
@@ -1 +0,0 @@
-A stamp file to signify that this directory comes from a version control system, not an unpacked tarball