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
263
264
265
266
267
268
269
270
271
272
273
274
|
configure.ac | 32 ++++++++++++-------------------
examples/simple/igraph_arpack_rnsolve.out | 3 +++
examples/simple/igraph_layout_merge2.out | 20 +++++++++----------
examples/simple/igraph_sparsemat2.c | 2 +-
examples/simple/igraph_sparsemat3.c | 2 +-
examples/simple/igraph_sparsemat4.c | 2 +-
src/Makefile.am | 11 +++--------
src/sparsemat.c | 2 +-
tests/Makefile.am | 2 +-
tests/mt.at | 2 +-
tests/types.at | 2 +-
11 files changed, 35 insertions(+), 45 deletions(-)
diff --git a/configure.ac b/configure.ac
index c617aec..6d5d162 100644
--- a/configure.ac
+++ b/configure.ac
@@ -165,7 +165,8 @@ if test "x$enable_gmp" != "xno"; then
AC_CHECK_HEADER([gmp.h], [
AC_DEFINE([HAVE_GMP], [1], [Define to 1 if you have the GMP library])
gmp_support=yes
- LDFLAGS="${LDFLAGS} -lgmp"
+ GMP_LIBS="-lgmp"
+ AC_SUBST(GMP_LIBS)
])
])
fi
@@ -223,23 +224,15 @@ else
fi
if test "$internal_blas" = "no"; then
- AC_CHECK_LIB([blas], [daxpy_], [],
- AC_CHECK_LIB([blas], [daxpy], [],
- AC_CHECK_LIB([blas], [DAXPY_], [],
- AC_CHECK_LIB([blas], [DAXPY], [],
- [AC_MSG_RESULT(not found, trying to use -lblas anyway.)]))))
- LDFLAGS="${LDFLAGS} -lblas"
+ PKG_CHECK_MODULES([BLAS],[blas])
+ CPPFLAGS="${CPPFLAGS} ${BLAS_CFLAGS}"
else
AC_DEFINE([INTERNAL_BLAS], [1], [Define to 1 if you use the internal BLAS library])
fi
if test "$internal_lapack" = "no"; then
- AC_CHECK_LIB([lapack], [dlarnv_], [],
- AC_CHECK_LIB([lapack], [dlarnv], [],
- AC_CHECK_LIB([lapack], [DLARNV_], [],
- AC_CHECK_LIB([lapack], [DLARNV], [],
- [AC_MSG_RESULT(not found, trying to use -llapack anyway.)]))))
- LDFLAGS="${LDFLAGS} -llapack"
+ PKG_CHECK_MODULES([LAPACK],[lapack])
+ CPPFLAGS="${CPPFLAGS} ${LAPACK_CFLAGS}"
else
AC_DEFINE([INTERNAL_LAPACK], [1], [Define to 1 if you use the internal LAPACK library])
fi
@@ -248,16 +241,14 @@ if test "$internal_arpack" = "no"; then
if test "$tls_support" = "yes"; then
AC_MSG_ERROR([Thread-local storage only supported with internal ARPACK library])
fi
- AC_CHECK_LIB([arpack], [dsaupd_], [],
- AC_CHECK_LIB([arpack], [dsaupd], [],
- AC_CHECK_LIB([arpack], [DSAUPD_], [],
- AC_CHECK_LIB([arpack], [DSAUPD], [],
- [AC_MSG_RESULT(not found, trying to use -larpack anyway.)]))))
- LDFLAGS="${LDFLAGS} -larpack"
+ PKG_CHECK_MODULES([ARPACK],[arpack])
+ CPPFLAGS="${CPPFLAGS} ${ARPACK_CFLAGS}"
else
AC_DEFINE([INTERNAL_ARPACK], [1], [Define to 1 if you use the internal ARPACK library])
fi
+PKG_CHECK_MODULES([CS],[cxsparse])
+
glpk_support=no
if test "$internal_glpk" = "no"; then
AC_CHECK_LIB([glpk], [glp_read_mps], [
@@ -270,7 +261,8 @@ if test "$internal_glpk" = "no"; then
], [
AC_DEFINE([HAVE_GLPK], [1], [Define to 1 if you have the GLPK library])
glpk_support=yes
- LDFLAGS="${LDFLAGS} -lglpk"
+ GLPK_LIBS="-lglpk"
+ AC_SUBST(GLPK_LIBS)
])
])
])
diff --git a/examples/simple/igraph_arpack_rnsolve.out b/examples/simple/igraph_arpack_rnsolve.out
index ec38497..47b1a6b 100644
--- a/examples/simple/igraph_arpack_rnsolve.out
+++ b/examples/simple/igraph_arpack_rnsolve.out
@@ -17,6 +17,7 @@
22.0483 0
-21.3281 0
-3.00735 -19.2957
+-3.00735 19.2957
---
0.373224 0.226696 0.204213 0.0473383
-0.289145 -0.296079 -0.0479785 0.156365
@@ -32,6 +33,7 @@
-21.3281 0
-12.4527 0
-3.00735 -19.2957
+-3.00735 19.2957
---
-0.226696 0.695866 -0.204213 -0.0473383
0.296079 0.120213 0.0479785 -0.156365
@@ -47,6 +49,7 @@
-3.00735 19.2957
-3.00735 -19.2957
12.1099 6.27293
+12.1099 -6.27293
---
0.0768616 -0.195028 -0.152389 0.21912
0.147607 0.0704569 0.346547 0.125122
diff --git a/examples/simple/igraph_layout_merge2.out b/examples/simple/igraph_layout_merge2.out
index dfe2c22..9fe81bf 100644
--- a/examples/simple/igraph_layout_merge2.out
+++ b/examples/simple/igraph_layout_merge2.out
@@ -1,13 +1,13 @@
--2.73912 -2.95429
--0.479512 -4.00008
-1.96326 -3.51798
-3.65613 -1.69214
-3.95248 0.780051
-2.73912 2.95429
-0.479512 4.00008
--1.96326 3.51798
--3.65613 1.69214
--3.95248 -0.780051
+-2.55311 -3.13964
+-0.22007 -4.0407
+2.19703 -3.39835
+3.77493 -1.45795
+3.91094 1.03935
+2.55311 3.13964
+0.22007 4.0407
+-2.19703 3.39835
+-3.77493 1.45795
+-3.91094 -1.03935
-1.6061 6.30088
-4.92661 5.80435
-3.69637 8.92826
diff --git a/examples/simple/igraph_sparsemat2.c b/examples/simple/igraph_sparsemat2.c
index 296e52e..3abd0e3 100644
--- a/examples/simple/igraph_sparsemat2.c
+++ b/examples/simple/igraph_sparsemat2.c
@@ -21,7 +21,7 @@
*/
-#include <cs/cs.h>
+#include <cs.h>
#include <igraph.h>
#include <igraph_sparsemat.h>
#include <igraph_blas_internal.h>
diff --git a/examples/simple/igraph_sparsemat3.c b/examples/simple/igraph_sparsemat3.c
index 630bf1a..b23cbe1 100644
--- a/examples/simple/igraph_sparsemat3.c
+++ b/examples/simple/igraph_sparsemat3.c
@@ -21,7 +21,7 @@
*/
-#include <cs/cs.h>
+#include <cs.h>
#include <igraph.h>
#include <igraph_sparsemat.h>
diff --git a/examples/simple/igraph_sparsemat4.c b/examples/simple/igraph_sparsemat4.c
index 4d85bde..7497faf 100644
--- a/examples/simple/igraph_sparsemat4.c
+++ b/examples/simple/igraph_sparsemat4.c
@@ -21,7 +21,7 @@
*/
-#include <cs/cs.h>
+#include <cs.h>
#include <igraph.h>
#include <igraph_sparsemat.h>
diff --git a/src/Makefile.am b/src/Makefile.am
index af7cae7..5db09eb 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -9,9 +9,6 @@ AM_YFLAGS = -d
lib_LTLIBRARIES = libigraph.la
-include lapack/blas.inc
-include lapack/lapack.inc
-include lapack/arpack.inc
include plfit/plfit.inc
F2C = f2c/abort_.c f2c/dolio.c f2c/r_sin.c\
@@ -99,8 +96,6 @@ if INTERNAL_ARPACK
ARPACK_LIB = libarpack.la
endif
-include ../optional/glpk/glpk.inc
-
if INTERNAL_GLPK
libglpk_la_SOURCES = $(GLPK)
libglpk_la_CFLAGS = -I$(top_srcdir)/optional/glpk
@@ -247,7 +242,7 @@ libigraph_la_SOURCES = $(HEADERS_PRIVATE) \
drl_layout_3d.cpp drl_graph_3d.cpp \
DensityGrid_3d.cpp \
foreign-dl-parser.y foreign-dl-lexer.l \
- $(CS) sparsemat.c mixing.c bigint.c bignum.c \
+ sparsemat.c mixing.c bigint.c bignum.c \
version.c optimal_modularity.c \
igraph_fixed_vectorlist.c separators.c \
igraph_marked_queue.c igraph_estack.c st-cuts.c \
@@ -263,8 +258,8 @@ libigraph_la_SOURCES = $(HEADERS_PRIVATE) \
libigraph_la_CFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include $(WARNING_CFLAGS)
libigraph_la_CXXFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include $(WARNING_CFLAGS)
libigraph_la_LDFLAGS = -no-undefined
-libigraph_la_LIBADD = -lm $(XML2_LIBS) $(F2C_LIB) $(BLAS_LIB) \
- $(LAPACK_LIB) $(ARPACK_LIB) $(GLPK_LIB) $(PLFIT_LIB)
+libigraph_la_LIBADD = -lm $(XML2_LIBS) $(F2C_LIB) $(BLAS_LIBS) $(GMP_LIBS) \
+ $(LAPACK_LIBS) $(ARPACK_LIBS) $(GLPK_LIBS) $(PLFIT_LIB) $(CS_LIBS)
if INTERNAL_GLPK
libigraph_la_CFLAGS += -I$(top_srcdir)/optional/glpk
diff --git a/src/sparsemat.c b/src/sparsemat.c
index 2cbdab1..b78b88d 100644
--- a/src/sparsemat.c
+++ b/src/sparsemat.c
@@ -23,7 +23,7 @@
#include "config.h"
-#include "cs/cs.h"
+#include <cs.h>
#include "igraph_sparsemat.h"
#include "igraph_error.h"
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 6d0ba59..af9bca9 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -13,7 +13,7 @@ $(srcdir)/package.m4: $(top_srcdir)/configure.ac
echo 'm4_define([AT_PACKAGE_BUGREPORT], [@PACKAGE_BUGREPORT@])'; \
} >$(srcdir)/package.m4
-EXTRA_DIST += package.m4
+#EXTRA_DIST += package.m4
TESTSUITE_AT = \
testsuite.at \
diff --git a/tests/mt.at b/tests/mt.at
index 050974a..e1496ac 100644
--- a/tests/mt.at
+++ b/tests/mt.at
@@ -29,5 +29,5 @@ AT_CLEANUP
AT_SETUP([Thread-safe ARPACK:])
AT_KEYWORDS([thread-safe ARPACK])
AT_COMPILE_CHECK([simple/tls2.c], [simple/tls2.out], [], [internal],
- [-lpthread])
+ [-lpthread $(${PKG_CONFIG} --libs arpack)])
AT_CLEANUP
diff --git a/tests/types.at b/tests/types.at
index f80a6a2..45087e8 100644
--- a/tests/types.at
+++ b/tests/types.at
@@ -133,7 +133,7 @@ AT_CLEANUP
AT_SETUP([Sparse matrix, multiplications (igraph_sparsemat_t): ])
AT_KEYWORDS([sparse matrix igraph_sparsemat_t])
AT_COMPILE_CHECK([simple/igraph_sparsemat2.c], [simple/igraph_sparsemat2.out],
- [], [INTERNAL], [-lblas])
+ [], [INTERNAL], [$(${PKG_CONFIG} --libs blas)])
AT_CLEANUP
AT_SETUP([Sparse matrix, indexing (igraph_sparsemat_t): ])
|
GitWeb