diff options
| author | rhaas <rhaas@c7ba4c71-c2f2-49b2-85d5-cb7b5f04bdfb> | 2012-11-07 02:46:00 +0000 |
|---|---|---|
| committer | rhaas <rhaas@c7ba4c71-c2f2-49b2-85d5-cb7b5f04bdfb> | 2012-11-07 02:46:00 +0000 |
| commit | d7d60e213206bdab04fc173ccd593ba33044f363 (patch) | |
| tree | ecc1de423330447cd39527cdbb4ae9309ffdb90c | |
| parent | 8095c277920a56cc2e5ded49ffa9d430236ebb80 (diff) | |
support LAPACK_INC_DIRS, LAPACK_LIB_DIRS to specify these folders directly
in case an LAPACK installation stores its library in include files in odd
places
git-svn-id: http://svn.cactuscode.org/projects/ExternalLibraries/LAPACK/trunk@34 c7ba4c71-c2f2-49b2-85d5-cb7b5f04bdfb
| -rw-r--r-- | configuration.ccl | 2 | ||||
| -rw-r--r-- | configure.sh | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/configuration.ccl b/configuration.ccl index 5f613ee..e5599e3 100644 --- a/configuration.ccl +++ b/configuration.ccl @@ -4,7 +4,7 @@ PROVIDES LAPACK { SCRIPT configure.sh LANG bash - OPTIONS LAPACK_DIR LAPACK_INSTALL_DIR LAPACK_LIBS + OPTIONS LAPACK_DIR LAPACK_INC_DIRS LAPACK_LIB_DIRS LAPACK_LIBS LAPACK_INSTALL_DIR } REQUIRES BLAS diff --git a/configure.sh b/configure.sh index e0f1828..35af7c7 100644 --- a/configure.sh +++ b/configure.sh @@ -166,8 +166,8 @@ fi # Set options if [ "${LAPACK_DIR}" != '/usr/lib' -a "${LAPACK_DIR}" != '/usr/local/lib' ]; then - LAPACK_INC_DIRS= - LAPACK_LIB_DIRS="${LAPACK_DIR}" + : ${LAPACK_INC_DIRS=} + : ${LAPACK_LIB_DIRS="${LAPACK_DIR}"} fi : ${LAPACK_LIBS='lapack'} |