Skip to content
Snippets Groups Projects
Commit e5865ec1 authored by Markus Blatt's avatar Markus Blatt
Browse files

Merged changes from trunk.

[[Imported from SVN: r6950]]
parents 50e5c665 61315333
No related branches found
No related tags found
No related merge requests found
......@@ -32,7 +32,7 @@ dnl do not use LT_INIT since we want to be compatible with libtool 1.5
AC_REQUIRE([DUNE_CHECK_MOD_DEPENDENCIES])
# convenience-variables if every found package should be used
AC_SUBST([ALL_PKG_LIBS], "$ALL_PKG_LIBS $DUNE_PKG_LIBS $LIBS")
AC_SUBST([ALL_PKG_LIBS], "$DUNE_PKG_LIBS $ALL_PKG_LIBS $LIBS")
AC_SUBST([ALL_PKG_LDFLAGS], "$LDFLAGS $DUNE_PKG_LDFLAGS $ALL_PKG_LDFLAGS")
AC_SUBST([ALL_PKG_CPPFLAGS], "$CPPFLAGS $DUNE_PKG_CPPFLAGS $ALL_PKG_CPPFLAGS")
......
......@@ -60,9 +60,6 @@ AC_DEFUN([DUNE_COMMON_CHECKS],
AC_REQUIRE([AC_STRUCT_TM])
dnl check for library functions
AC_REQUIRE([AC_FUNC_MALLOC])
# doesn't work, but we don't need it currently
# AC_REQUIRE([AC_FUNC_REALLOC])
AC_LANG_PUSH([C++])
AC_CHECK_LIB([m], [pow])
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment