From 18b48db8ac69d12db3627ba9bab7884231ff52c1 Mon Sep 17 00:00:00 2001
From: Christoph Grueninger <christoph.grueninger@iws.uni-stuttgart.de>
Date: Tue, 7 May 2013 16:38:15 +0000
Subject: [PATCH] [patch] Update patches/dumux-m4.patch to reflect changes in
m4 file and avoid distracing output from patch.
git-svn-id: svn://svn.iws.uni-stuttgart.de/DUMUX/dumux/trunk@10639 2fb0f335-1f38-0410-981e-8018bf24f1b0
---
patches/dumux-m4.patch | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/patches/dumux-m4.patch b/patches/dumux-m4.patch
index 7a679a2b66..28370e400d 100644
--- a/patches/dumux-m4.patch
+++ b/patches/dumux-m4.patch
@@ -1,8 +1,8 @@
Index: m4/dumux.m4
===================================================================
---- m4/dumux.m4 (Revision 10244)
-+++ m4/dumux.m4 (Arbeitskopie)
-@@ -177,9 +177,9 @@
+--- m4/dumux.m4 (revision 10629)
++++ m4/dumux.m4 (working copy)
+@@ -179,9 +179,9 @@
# DUMUX_CHECK_MODULES(NAME, HEADER, SYMBOL)
#
@@ -15,7 +15,7 @@ Index: m4/dumux.m4
#
# Generic check for dune modules. This macro should not be used directly, but
# in the modules m4/{module}.m4 in the {MODULE}_CHECK_MODULE macro. The
-@@ -290,15 +290,11 @@
+@@ -292,15 +292,11 @@
AC_MSG_ERROR([pkg-config is required for using installed modules])
])
AS_IF(AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]),[
@@ -34,7 +34,7 @@ Index: m4/dumux.m4
HAVE_[]_DUNE_MODULE=1
AC_MSG_RESULT([global installation in $_DUNE_MODULE[]_ROOT])
],[
-@@ -312,6 +308,7 @@
+@@ -314,6 +310,7 @@
AS_IF([test -d "$with_[]_dune_module"],[
# expand tilde / other stuff
_DUNE_MODULE[]_ROOT=`cd $with_[]_dune_module && pwd`
@@ -42,7 +42,7 @@ Index: m4/dumux.m4
# expand search path (otherwise empty CPPFLAGS)
AS_IF([test -d "$_DUNE_MODULE[]_ROOT/include/dune"],[
-@@ -319,21 +316,18 @@
+@@ -321,21 +318,18 @@
_dune_cm_CPPFLAGS="-I$_DUNE_MODULE[]_ROOT/include"
_DUNE_MODULE[]_BUILDDIR=_DUNE_MODULE[]_ROOT
_DUNE_MODULE[]_VERSION="`PKG_CONFIG_PATH=$PKG_CONFIG_PATH:$_DUNE_MODULE[]_ROOT/lib/pkgconfig $PKG_CONFIG --modversion _dune_name`" 2>/dev/null
@@ -69,7 +69,7 @@ Index: m4/dumux.m4
# set expanded module path
with_[]_dune_module="$_DUNE_MODULE[]_ROOT"
HAVE_[]_DUNE_MODULE=1
-@@ -345,7 +339,7 @@
+@@ -347,7 +341,7 @@
])
])
@@ -78,7 +78,7 @@ Index: m4/dumux.m4
##
## check for an arbitrary header
##
-@@ -357,50 +351,54 @@
+@@ -359,50 +353,54 @@
AC_CHECK_HEADER([[]_dune_header],
[HAVE_[]_DUNE_MODULE=1; DUNE_[]_HEADER_PREFIX=""],
[HAVE_[]_DUNE_MODULE=0])
@@ -156,7 +156,7 @@ Index: m4/dumux.m4
])
# reset variables
-@@ -416,9 +414,9 @@
+@@ -418,9 +416,9 @@
[$_dune_cm_CPPFLAGS], [$_dune_cm_LDFLAGS], [$_dune_cm_LIBS])
# set variables for our modules
@@ -169,7 +169,7 @@ Index: m4/dumux.m4
AC_SUBST(_DUNE_MODULE[]_ROOT, "$_DUNE_MODULE[]_ROOT")
ifelse(m4_defn([_dune_symbol]),,
[],
-@@ -431,8 +429,14 @@
+@@ -433,8 +431,14 @@
# set DUNE_* variables
# This should actually be unneccesary, but I'm keeping it in here for now
# for backward compatibility
--
GitLab