Mercurial > octave

comparison configure.ac @ 15938:398ae067e811 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
configure.ac: Fix CAMD/COLAMD/CCOLAMD/CXSparse include search directories This appears to be a copy and paste error in changeset 0ce82753dd72. As a result the headers were not found and some #defines in liboctave/oct-sparse.h were never generated. * configure.ac: Correct typo where amd was used as search directory for camd.h, colamd.h, ccolamd.h, cs.h.
author Kyle Guinn <elyk03@gmail.com>
date Sat, 12 Jan 2013 00:58:19 -0600
parents 747dd82082c8
children cb47c8cc105d a653526ea4a5
comparison
equal deleted inserted replaced
15932:747dd82082c8 15938:398ae067e811
1104 1104
1105 # Check for CAMD library 1105 # Check for CAMD library
1106 1106
1107 OCTAVE_CHECK_LIBRARY(camd, CAMD, 1107 OCTAVE_CHECK_LIBRARY(camd, CAMD,
1108 [CAMD library not found. This will result in some lack of functionality for sparse matrices.], 1108 [CAMD library not found. This will result in some lack of functionality for sparse matrices.],
1109 [suitesparse/camd.h ufsparse/camd.h amd/camd.h camd.h], 1109 [suitesparse/camd.h ufsparse/camd.h camd/camd.h camd.h],
1110 [camd_postorder], 1110 [camd_postorder],
1111 [], [don't use CAMD library, disable some sparse matrix functionality]) 1111 [], [don't use CAMD library, disable some sparse matrix functionality])
1112 1112
1113 # Check for COLAMD library 1113 # Check for COLAMD library
1114 1114
1115 OCTAVE_CHECK_LIBRARY(colamd, COLAMD, 1115 OCTAVE_CHECK_LIBRARY(colamd, COLAMD,
1116 [COLAMD library not found. This will result in some lack of functionality for sparse matrices.], 1116 [COLAMD library not found. This will result in some lack of functionality for sparse matrices.],
1117 [suitesparse/colamd.h ufsparse/colamd.h amd/colamd.h colamd.h], 1117 [suitesparse/colamd.h ufsparse/colamd.h colamd/colamd.h colamd.h],
1118 [colamd], 1118 [colamd],
1119 [], [don't use COLAMD library, disable some sparse matrix functionality]) 1119 [], [don't use COLAMD library, disable some sparse matrix functionality])
1120 1120
1121 # Check for CCOLAMD library 1121 # Check for CCOLAMD library
1122 1122
1123 OCTAVE_CHECK_LIBRARY(ccolamd, CCOLAMD, 1123 OCTAVE_CHECK_LIBRARY(ccolamd, CCOLAMD,
1124 [CCOLAMD library not found. This will result in some lack of functionality for sparse matrices.], 1124 [CCOLAMD library not found. This will result in some lack of functionality for sparse matrices.],
1125 [suitesparse/ccolamd.h ufsparse/ccolamd.h amd/ccolamd.h ccolamd.h], 1125 [suitesparse/ccolamd.h ufsparse/ccolamd.h ccolamd/ccolamd.h ccolamd.h],
1126 [ccolamd], 1126 [ccolamd],
1127 [], [don't use CCOLAMD library, disable some sparse matrix functionality]) 1127 [], [don't use CCOLAMD library, disable some sparse matrix functionality])
1128 1128
1129 # Check for CHOLMOD library. If your cholmod library requires cblas, 1129 # Check for CHOLMOD library. If your cholmod library requires cblas,
1130 # then you will need to configure with --with-cholmod="-lcholmod -lcblas". 1130 # then you will need to configure with --with-cholmod="-lcholmod -lcblas".
1140 1140
1141 # Check for CXSparse library 1141 # Check for CXSparse library
1142 1142
1143 OCTAVE_CHECK_LIBRARY(cxsparse, CXSparse, 1143 OCTAVE_CHECK_LIBRARY(cxsparse, CXSparse,
1144 [CXSparse library not found. This will result in some lack of functionality for sparse matrices.], 1144 [CXSparse library not found. This will result in some lack of functionality for sparse matrices.],
1145 [suitesparse/cs.h ufsparse/cs.h amd/cs.h cs.h], 1145 [suitesparse/cs.h ufsparse/cs.h cxsparse/cs.h cs.h],
1146 [cs_di_sqr], 1146 [cs_di_sqr],
1147 [C++], [don't use CXSparse library, disable some sparse matrix functionality]) 1147 [C++], [don't use CXSparse library, disable some sparse matrix functionality])
1148 1148
1149 # Check for UMFPACK library. 1149 # Check for UMFPACK library.
1150 1150