Skip to content
Snippets Groups Projects
Commit 8c8d71fe authored by Jorrit Fahlke's avatar Jorrit Fahlke
Browse files

Move adding the MPI stuff to the ALL_PKG_* variables out of the

DUNE_COMMON_CHECKS macro into the DUNE_MPI macro.

Also add the GL flags to the ALL_PKG_* variables.

[[Imported from SVN: r5839]]
parent 92b127d0
No related branches found
No related tags found
No related merge requests found
...@@ -23,7 +23,6 @@ AC_DEFUN([DUNE_COMMON_CHECKS], ...@@ -23,7 +23,6 @@ AC_DEFUN([DUNE_COMMON_CHECKS],
AC_REQUIRE([DUNE_SET_MINIMAL_DEBUG_LEVEL]) AC_REQUIRE([DUNE_SET_MINIMAL_DEBUG_LEVEL])
AC_REQUIRE([DUNE_PATH_XDR]) AC_REQUIRE([DUNE_PATH_XDR])
AC_REQUIRE([DUNE_MPI]) AC_REQUIRE([DUNE_MPI])
DUNE_ADD_ALL_PKG([MPI], [$DUNEMPICPPFLAGS], [$DUNEMPILDFLAGS], [$DUNEMPILIBS])
AC_REQUIRE([DUNE_EXPRTMPL]) AC_REQUIRE([DUNE_EXPRTMPL])
AC_REQUIRE([DUNE_DEV_MODE]) AC_REQUIRE([DUNE_DEV_MODE])
......
...@@ -69,6 +69,9 @@ dnl -*- autoconf -*- ...@@ -69,6 +69,9 @@ dnl -*- autoconf -*-
# dune_MPI_VERSION # dune_MPI_VERSION
# with_mpi ("no" if MPI is missing, "yes" followed by some more details if # with_mpi ("no" if MPI is missing, "yes" followed by some more details if
# MPI is present) # MPI is present)
# ALL_PKG_CPPFLAGS (adds its stuff here)
# ALL_PKG_LDFLAGS (adds its stuff here)
# ALL_PKG_LIBS (adds its stuff here)
# #
# configure substitutions/Makefile variables # configure substitutions/Makefile variables
# MPICC # MPICC
...@@ -212,6 +215,8 @@ AC_DEFUN([DUNE_MPI],[ ...@@ -212,6 +215,8 @@ AC_DEFUN([DUNE_MPI],[
[The MPI_CPPFLAGS configure substitute is deprecated. Please change your Makefile.am to use DUNEMPICPPFLAGS instead. Note that it is a good idea to change any occurance of MPI_LDFLAGS into DUNEMPILIBS and DUNEMPILDFLAGS as apropriate, since it is not possible to issue a deprecation warning in that case.]) [The MPI_CPPFLAGS configure substitute is deprecated. Please change your Makefile.am to use DUNEMPICPPFLAGS instead. Note that it is a good idea to change any occurance of MPI_LDFLAGS into DUNEMPILIBS and DUNEMPILDFLAGS as apropriate, since it is not possible to issue a deprecation warning in that case.])
AC_SUBST(MPI_LDFLAGS) AC_SUBST(MPI_LDFLAGS)
DUNE_ADD_ALL_PKG([MPI], [$DUNEMPICPPFLAGS], [$DUNEMPILDFLAGS], [$DUNEMPILIBS])
AM_CONDITIONAL(MPI, [test "x$with_mpi" != "xno"]) AM_CONDITIONAL(MPI, [test "x$with_mpi" != "xno"])
DUNE_ADD_SUMMARY_ENTRY([MPI],[$with_mpi]) DUNE_ADD_SUMMARY_ENTRY([MPI],[$with_mpi])
......
## -*- autoconf -*-
# $Id$ # $Id$
# searches for OpenGL-stuff # searches for OpenGL-stuff
# DUNE_PATH_OPENGL()
#
# Call AX_CHECK_OPENGL, but also add the discovered flags too the ALL_PKG_*
# family and add a summary entry. Also make sure that pthreads are supported.
AC_DEFUN([DUNE_PATH_OPENGL],[ AC_DEFUN([DUNE_PATH_OPENGL],[
dnl use test from autoconf-archive dnl use test from autoconf-archive
AC_REQUIRE([AX_CHECK_GL]) AC_REQUIRE([AX_CHECK_GL])
...@@ -15,6 +20,10 @@ dnl use test from autoconf-archive ...@@ -15,6 +20,10 @@ dnl use test from autoconf-archive
# need pthreads-stuff in linker commandline as well # need pthreads-stuff in linker commandline as well
AC_SUBST(GL_LDFLAGS, $PTHREAD_CFLAGS) AC_SUBST(GL_LDFLAGS, $PTHREAD_CFLAGS)
# GL_CFLAGS contain stuff like -pthread, which according to the gcc
# documentation is a flag for both the preprocessor and the linker. So we
# add it to the preprocessor flags here.
DUNE_ADD_ALL_PKG([GL], [$GL_CFLAGS], [$GL_LDFLAGS], [$GL_LIBS])
fi fi
DUNE_ADD_SUMMARY_ENTRY([OpenGL],[$with_opengl]) DUNE_ADD_SUMMARY_ENTRY([OpenGL],[$with_opengl])
......
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