blob: e8a24e914e690089115de6608f5e7ad2c322d3a4 (
plain)
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
|
Description: Do not use embedded copy of AMD and COLAMD libraries from suitesparse
Author: Sébastien Villemot <sebastien@debian.org>
Forwarded: not-needed
Last-Update: 2013-06-25
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
--- a/configure.ac
+++ b/configure.ac
@@ -142,6 +142,11 @@
AC_CHECK_LIB([z], [gzopen])
+AC_CHECK_LIB([amd], [amd_1])
+AC_CHECK_LIB([colamd], [colamd])
+
+AC_CHECK_HEADER([amd.h])
+
AC_CONFIG_FILES(
[src/Makefile examples/Makefile Makefile])
AC_OUTPUT
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -6,10 +6,8 @@
libglpk_la_CPPFLAGS = \
-I$(srcdir) \
--I$(srcdir)/amd \
-I$(srcdir)/bflib \
-I$(srcdir)/cglib \
--I$(srcdir)/colamd \
-I$(srcdir)/env \
-I$(srcdir)/minisat \
-I$(srcdir)/misc \
@@ -99,18 +97,6 @@
glpssx01.c \
glpssx02.c \
glptsp.c \
-amd/amd_1.c \
-amd/amd_2.c \
-amd/amd_aat.c \
-amd/amd_control.c \
-amd/amd_defaults.c \
-amd/amd_dump.c \
-amd/amd_info.c \
-amd/amd_order.c \
-amd/amd_post_tree.c \
-amd/amd_postorder.c \
-amd/amd_preprocess.c \
-amd/amd_valid.c \
bflib/fhv.c \
bflib/fhvint.c \
bflib/luf.c \
@@ -119,7 +105,6 @@
bflib/sva.c \
cglib/cfg.c \
cglib/cfg1.c \
-colamd/colamd.c \
env/alloc.c \
env/env.c \
env/error.c \
|
GitWeb
