Package: deal.ii / 6.3.1-1

srcdir.patch Patch series | download
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
Change $(D) to point to installed location instead of build.

Index: deal.ii-6.3.1/common/Make.global_options.in
===================================================================
--- deal.ii-6.3.1.orig/common/Make.global_options.in	2010-07-22 13:04:50.000000000 +0200
+++ deal.ii-6.3.1/common/Make.global_options.in	2010-07-22 13:04:54.000000000 +0200
@@ -21,7 +21,7 @@
 # the following lines will be replaced by the output
 # of ./configure
 
-D                    = @prefix@
+D                    = @DEAL_II_PATH@
 CXX                  = @CXX@
 GXX-VERSION          = @GXX_VERSION@
 GXX-VERSION-DETAILED = @GXX_VERSION_DETAILED@
Index: deal.ii-6.3.1/doc/Makefile.in
===================================================================
--- deal.ii-6.3.1.orig/doc/Makefile.in	2010-07-22 13:04:50.000000000 +0200
+++ deal.ii-6.3.1/doc/Makefile.in	2010-07-22 13:04:54.000000000 +0200
@@ -3,7 +3,7 @@
 ###############################
 # Configured variables
 
-D     = @prefix@
+D     = @DEAL_II_PATH@
 include $D/common/Make.global_options
 
 
Index: deal.ii-6.3.1/doc/doxygen/Makefile.in
===================================================================
--- deal.ii-6.3.1.orig/doc/doxygen/Makefile.in	2010-07-22 13:04:50.000000000 +0200
+++ deal.ii-6.3.1/doc/doxygen/Makefile.in	2010-07-22 13:04:54.000000000 +0200
@@ -6,7 +6,7 @@
 ###############################
 # Configured variables
 
-D     = @prefix@
+D     = @DEAL_II_PATH@
 include $D/common/Make.global_options
 
 
Index: deal.ii-6.3.1/doc/doxygen/options.dox.in
===================================================================
--- deal.ii-6.3.1.orig/doc/doxygen/options.dox.in	2010-07-22 13:04:50.000000000 +0200
+++ deal.ii-6.3.1/doc/doxygen/options.dox.in	2010-07-22 13:04:54.000000000 +0200
@@ -105,7 +105,7 @@
 # If left blank the directory from which doxygen is run is used as the 
 # path to strip.
 
-STRIP_FROM_PATH        = @prefix@
+STRIP_FROM_PATH        = @DEAL_II_PATH@
 
 # The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of 
 # the path mentioned in the documentation of a class, which tells 
@@ -483,7 +483,7 @@
 # directories that contain example code fragments that are included (see 
 # the \include command).
 
-EXAMPLE_PATH           = @prefix@/examples/doxygen
+EXAMPLE_PATH           = @DEAL_II_PATH@/examples/doxygen
 
 # If the value of the EXAMPLE_PATH tag contains directories, you can use the 
 # EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp 
@@ -980,9 +980,9 @@
 # contain include files that are not input files but should be processed by 
 # the preprocessor.
 
-INCLUDE_PATH           = @prefix@/base/include \
-			 @prefix@/lac/include \
-			 @prefix@/deal.II/include
+INCLUDE_PATH           = @DEAL_II_PATH@/base/include \
+			 @DEAL_II_PATH@/lac/include \
+			 @DEAL_II_PATH@/deal.II/include
 
 # You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard 
 # patterns (like *.h and *.hpp) to filter out the header-files in the 
Index: deal.ii-6.3.1/contrib/configure.in
===================================================================
--- deal.ii-6.3.1.orig/contrib/configure.in	2010-07-22 13:04:50.000000000 +0200
+++ deal.ii-6.3.1/contrib/configure.in	2010-07-22 13:04:54.000000000 +0200
@@ -8,12 +8,17 @@
 
 define([AC_CACHE_LOAD], )dnl
 define([AC_CACHE_SAVE], )dnl
-AC_REVISION($Revision: 9596 $)
+AC_REVISION($Revision: 20388 $)
+
+AC_PREREQ(2.61)
 AC_INIT(config)
 
 dnl Have the auxiliary tools like config.guess etc in contrib/config
 AC_CONFIG_AUX_DIR(config)
 
+AC_PROG_CC
+AC_PROG_CXX
+
 
 AC_MSG_RESULT()
 AC_MSG_RESULT(---------------- configuring contrib subdir -----------------)
Index: deal.ii-6.3.1/contrib/utilities/configure.in
===================================================================
--- deal.ii-6.3.1.orig/contrib/utilities/configure.in	2010-07-22 13:04:50.000000000 +0200
+++ deal.ii-6.3.1/contrib/utilities/configure.in	2010-07-22 13:04:54.000000000 +0200
@@ -3,8 +3,12 @@
 dnl in .. or ../deal.II or ../deal
 dnl
 
+AC_PREREQ(2.61)
 AC_INIT(embedding.cc)
 
+AC_PROG_CC
+AC_PROG_CXX
+
 dnl Supply deal-directory in command line or find it
 AC_ARG_WITH(deal,
 [  --with-deal=DIR where DIR is the root of the deal.II library],