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
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
|
diff -Nur mpb-1.4.2.orig/configure.ac mpb-1.4.2/configure.ac
--- mpb-1.4.2.orig/configure.ac 2003-03-04 02:38:41.000000000 +0000
+++ mpb-1.4.2/configure.ac 2008-11-25 17:31:12.000000000 +0000
@@ -6,15 +6,8 @@
MPB_VERSION=1.4.2
AC_SUBST(MPB_VERSION)
-AC_MSG_CHECKING([for vendor f77 to be used instead of g77])
-AC_MSG_RESULT()
-AC_CHECK_PROGS(F77, f77 xlf77 cf77 fort77 f90 xlf90)
AC_PROG_F77
-
-# Get C compiler.
-AC_MSG_CHECKING([for vendor cc to be used instead of gcc])
-AC_MSG_RESULT()
-AC_CHECK_PROGS(CC, cc xlc) # prefer vendor cc, to stay in sync with Fortran
+AC_F77_WRAPPERS
AC_PROG_CC
# Checks for programs.
@@ -79,12 +72,6 @@
echo "*********************** HERMITIAN EPS. ***********************"
fi
-# Add lots of compiler warnings to check for if we are using gcc:
-# (The variable $GCC is set to "yes" by AC_PROG_CC if we are using gcc.)
-if test "$GCC" = "yes"; then
- CFLAGS="$CFLAGS -Wall -W -Wbad-function-cast -Wcast-qual -Wpointer-arith -Wcast-align -pedantic"
-fi
-
##############################################################################
# Checks for libraries:
##############################################################################
@@ -203,6 +190,10 @@
# how to run mpb-mpi in general
fi
+# Checks for header files.
+AC_HEADER_STDC
+AC_CHECK_HEADERS(unistd.h getopt.h)
+
##############################################################################
# Check for HDF5 library
AC_ARG_WITH(hdf5, [AC_HELP_STRING([--without-hdf5],[do not use HDF5 output])], ok=$withval, ok=yes)
@@ -349,9 +340,7 @@
]], [AC_MSG_RESULT(ok)], [AC_MSG_ERROR([libctl version ${LIBCTL_MAJOR}.${LIBCTL_MINOR}.${LIBCTL_BUGFIX} or later is required])])
##############################################################################
-# Checks for header files.
-AC_HEADER_STDC
-AC_CHECK_HEADERS(unistd.h getopt.h)
+
# Checks for typedefs, structures, and compiler characteristics.
AC_C_CONST
diff -Nur mpb-1.4.2.orig/Makefile.in mpb-1.4.2/Makefile.in
--- mpb-1.4.2.orig/Makefile.in 2002-01-18 22:52:41.000000000 +0000
+++ mpb-1.4.2/Makefile.in 2008-11-25 17:31:12.000000000 +0000
@@ -2,6 +2,9 @@
SHELL = @SHELL@
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
+VPATH = @srcdir@
CC = @CC@
CFLAGS = @CFLAGS@
CPPFLAGS = @CPPFLAGS@
diff -Nur mpb-1.4.2.orig/mpb-ctl/Makefile.in mpb-1.4.2/mpb-ctl/Makefile.in
--- mpb-1.4.2.orig/mpb-ctl/Makefile.in 2002-09-14 23:20:55.000000000 +0100
+++ mpb-1.4.2/mpb-ctl/Makefile.in 2008-11-25 18:23:20.000000000 +0000
@@ -13,6 +13,12 @@
SHELL = @SHELL@
+mandir = @mandir@
+
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
+VPATH = @srcdir@
+
##############################################################################
# Makefile.in for programs using libctl (assumes that autoconf is
@@ -37,8 +43,8 @@
../src/util/util.a
MY_LDFLAGS = # extra -L flags go here
-MY_CPPFLAGS = -I. -I../src/util -I../src/matrices -I../src/matrixio \
- -I../src/maxwell
+MY_CPPFLAGS = -I$(srcdir) -I$(top_srcdir)/src/util -I$(top_srcdir)/src/matrices -I$(top_srcdir)/src/matrixio \
+ -I$(top_srcdir)/src/maxwell
MY_DEFS = -DHAVE_CTL_HOOKS=1 -DHAVE_CTL_EXPORT_HOOK=1
# The following variables should be detected and set by autoconf:
@@ -134,11 +140,11 @@
install-mpb: $(PROGRAM_NAME)
$(INSTALL) -d $(prefix)/bin
- $(INSTALL) -m 0755 -s .$(PROGRAM_NAME) $(prefix)/bin/`echo $(PROGRAM_NAME)|sed '$(transform)'`
+ $(INSTALL) -m 0755 .$(PROGRAM_NAME) $(prefix)/bin/`echo $(PROGRAM_NAME)|sed '$(transform)'`
$(INSTALL) -d $(prefix)/share/libctl/specs
$(INSTALL) -m 0644 $(SPECIFICATION_FILE) $(prefix)/share/libctl/specs
$(INSTALL) -d $(mandir)/man1
- $(INSTALL) -m 0644 $(PROGRAM_NAME).1 $(mandir)/man1
+ $(INSTALL) -m 0644 $(srcdir)/$(PROGRAM_NAME).1 $(mandir)/man1
mpb-split-tmp:
rm -f mpb-split-tmp
@@ -149,7 +155,7 @@
mpb_name=`echo mpb | sed '$(transform)'`; \
$(INSTALL) -m 0755 mpb-split-tmp $(prefix)/bin/$${mpb_name}-split
$(INSTALL) -d $(mandir)/man1
- $(INSTALL) -m 0644 mpb-split.1 $(mandir)/man1
+ $(INSTALL) -m 0644 $(srcdir)/mpb-split.1 $(mandir)/man1
clean:
rm -f $(ALL_OBJECTS) ctl-io.c ctl-io.h main.c geom.c \
diff -Nur mpb-1.4.2.orig/src/matrices/Makefile.in mpb-1.4.2/src/matrices/Makefile.in
--- mpb-1.4.2.orig/src/matrices/Makefile.in 2002-09-14 23:20:55.000000000 +0100
+++ mpb-1.4.2/src/matrices/Makefile.in 2008-11-25 17:31:12.000000000 +0000
@@ -2,9 +2,11 @@
SHELL = @SHELL@
-CC = @CC@
-CFLAGS = @CFLAGS@
-CPPFLAGS = -I../util -I. @CPPFLAGS@
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
+VPATH = @srcdir@
+
+CPPFLAGS = -I$(top_srcdir)/src/util -I$(srcdir) -I. @CPPFLAGS@
DEFS = @DEFS@
LDFLAGS = @LDFLAGS@
LIBS = @LIBS@
diff -Nur mpb-1.4.2.orig/src/matrixio/Makefile.in mpb-1.4.2/src/matrixio/Makefile.in
--- mpb-1.4.2.orig/src/matrixio/Makefile.in 2002-09-14 23:20:55.000000000 +0100
+++ mpb-1.4.2/src/matrixio/Makefile.in 2008-11-25 17:31:12.000000000 +0000
@@ -2,9 +2,11 @@
SHELL = @SHELL@
-CC = @CC@
-CFLAGS = @CFLAGS@
-CPPFLAGS = -I../util -I../matrices -I. @CPPFLAGS@
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
+VPATH = @srcdir@
+
+CPPFLAGS = -I$(top_srcdir)/src/util -I$(top_srcdir)/src/matrices -I$(srcdir) -I. @CPPFLAGS@
DEFS = @DEFS@
LDFLAGS = @LDFLAGS@
LIBS = @LIBS@
diff -Nur mpb-1.4.2.orig/src/maxwell/Makefile.in mpb-1.4.2/src/maxwell/Makefile.in
--- mpb-1.4.2.orig/src/maxwell/Makefile.in 2002-09-14 23:20:55.000000000 +0100
+++ mpb-1.4.2/src/maxwell/Makefile.in 2008-11-25 17:31:12.000000000 +0000
@@ -2,9 +2,11 @@
SHELL = @SHELL@
-CC = @CC@
-CFLAGS = @CFLAGS@
-CPPFLAGS = -I../util -I../matrices @CPPFLAGS@
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
+VPATH = @srcdir@
+
+CPPFLAGS = -I$(top_srcdir)/src/util -I$(top_srcdir)/src/matrices -I. @CPPFLAGS@
DEFS = @DEFS@
LDFLAGS = @LDFLAGS@
LIBS = @LIBS@
diff -Nur mpb-1.4.2.orig/src/util/Makefile.in mpb-1.4.2/src/util/Makefile.in
--- mpb-1.4.2.orig/src/util/Makefile.in 2002-09-14 23:20:55.000000000 +0100
+++ mpb-1.4.2/src/util/Makefile.in 2008-11-25 17:31:12.000000000 +0000
@@ -2,9 +2,11 @@
SHELL = @SHELL@
-CC = @CC@
-CFLAGS = @CFLAGS@
-CPPFLAGS = -I. @CPPFLAGS@
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
+VPATH = @srcdir@
+
+CPPFLAGS = -I$(top_srcdir) -I. @CPPFLAGS@
DEFS = @DEFS@
LDFLAGS = @LDFLAGS@
LIBS = @LIBS@
diff -Nur mpb-1.4.2.orig/tests/Makefile.in mpb-1.4.2/tests/Makefile.in
--- mpb-1.4.2.orig/tests/Makefile.in 2002-09-14 23:20:55.000000000 +0100
+++ mpb-1.4.2/tests/Makefile.in 2008-11-25 17:31:58.000000000 +0000
@@ -2,12 +2,14 @@
SHELL = @SHELL@
-CC = @CC@
-CFLAGS = @CFLAGS@
-CPPFLAGS = -I../src/util -I../src/matrices -I../src/maxwell @CPPFLAGS@
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
+VPATH = @srcdir@
+
+CPPFLAGS = -I$(top_srcdir)/src/util -I$(top_srcdir)/src/matrices -I$(top_srcdir)/src/maxwell -I. @CPPFLAGS@
DEFS = @DEFS@
-LDFLAGS = @LDFLAGS@
LIBS = @LIBS@
+LDFLAGS = @LDFLAGS@
RANLIB = @RANLIB@
@SET_MAKE@
@@ -15,11 +17,11 @@
../src/matrices/matrices.a \
../src/util/util.a
-all: blastest eigs_test maxwell_test malloctest normal_vectors
+all:
libs:
-check: all
+check: blastest eigs_test maxwell_test malloctest normal_vectors
rm -f blastest.out.test
./blastest | sed 's/\-0\.000\([ ,)]\)/ 0.000\1/g' | sed 's/\-0\.000$$/ 0.000/g' > blastest.out.test
diff blastest.@SCALAR_TYPE@.out blastest.out.test
diff -Nur mpb-1.4.2.orig/utils/Makefile.in mpb-1.4.2/utils/Makefile.in
--- mpb-1.4.2.orig/utils/Makefile.in 2002-09-14 23:20:55.000000000 +0100
+++ mpb-1.4.2/utils/Makefile.in 2008-11-25 18:23:46.000000000 +0000
@@ -1,13 +1,16 @@
# Variables substituted by the autoconf configure script:
SHELL = @SHELL@
+mandir = @mandir@
+
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
+VPATH = @srcdir@
-CC = @CC@
-CFLAGS = @CFLAGS@
-CPPFLAGS = -I../src/util -I../src/matrices -I../src/matrixio @CPPFLAGS@
+CPPFLAGS = -I$(top_srcdir)/src/util -I$(top_srcdir)/src/matrices -I$(top_srcdir)/src/matrixio -I. @CPPFLAGS@
DEFS = @DEFS@ -DMPB_VERSION='"'"@MPB_VERSION@"'"'
-LDFLAGS = @LDFLAGS@
LIBS = @LIBS@
+LDFLAGS=@LDFLAGS@
RANLIB = @RANLIB@
@SET_MAKE@
@@ -36,9 +39,9 @@
install-mpb-data: mpb-data
$(INSTALL) -d $(prefix)/bin
- $(INSTALL) -m 0755 -s mpb-data $(prefix)/bin/`echo mpb-data|sed '$(transform)'`
+ $(INSTALL) -m 0755 mpb-data $(prefix)/bin/`echo mpb-data|sed '$(transform)'`
$(INSTALL) -d $(mandir)/man1
- $(INSTALL) -m 0644 mpb-data.1 $(mandir)/man1
+ $(INSTALL) -m 0644 $(srcdir)/mpb-data.1 $(mandir)/man1
clean:
rm -f mpb-data mpb-data.o core
|
GitWeb