diff options
| author | Tor Lillqvist <tml@collabora.com> | 2014-05-20 13:03:06 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2014-05-20 15:25:44 +0300 |
| commit | 8517dc95a6ad6eec34aa5295b5133c6c18fcd1e9 (patch) | |
| tree | 1443b4e815783a848c9a584d7d91ee364c8720ea /configure.ac | |
| parent | eff1d991de77700505ce18dfaaa3e01d76551ffd (diff) | |
If we don't want lpsolve we don't want lpsolve
Change-Id: I6038faf296831da0855eb7cd3628c5c6978d4cb3
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 38 |
1 files changed, 20 insertions, 18 deletions
diff --git a/configure.ac b/configure.ac index b4052c64ee2d..91f464dc5e99 100644 --- a/configure.ac +++ b/configure.ac @@ -9560,24 +9560,26 @@ else fi AC_SUBST(ENABLE_LPSOLVE) -AC_MSG_CHECKING([which lpsolve to use]) -if test "$with_system_lpsolve" = "yes"; then - AC_MSG_RESULT([external]) - SYSTEM_LPSOLVE=TRUE - AC_CHECK_HEADER(lpsolve/lp_lib.h, [], - [ AC_MSG_ERROR(lpsolve headers not found.)], []) - save_LIBS=$LIBS - # some systems need this. Like Ubuntu.... - AC_CHECK_LIB(m, floor) - AC_CHECK_LIB(dl, dlopen) - AC_CHECK_LIB([lpsolve55], [make_lp], [:], - [ AC_MSG_ERROR(lpsolve library not found or too old.)], []) - LIBS=$save_LIBS - libo_MINGW_CHECK_DLL([lpsolve55]) -else - AC_MSG_RESULT([internal]) - SYSTEM_LPSOLVE= - BUILD_TYPE="$BUILD_TYPE LPSOLVE" +if test "$ENABLE_LPSOLVE" = TRUE; then + AC_MSG_CHECKING([which lpsolve to use]) + if test "$with_system_lpsolve" = "yes"; then + AC_MSG_RESULT([external]) + SYSTEM_LPSOLVE=TRUE + AC_CHECK_HEADER(lpsolve/lp_lib.h, [], + [ AC_MSG_ERROR(lpsolve headers not found.)], []) + save_LIBS=$LIBS + # some systems need this. Like Ubuntu.... + AC_CHECK_LIB(m, floor) + AC_CHECK_LIB(dl, dlopen) + AC_CHECK_LIB([lpsolve55], [make_lp], [:], + [ AC_MSG_ERROR(lpsolve library not found or too old.)], []) + LIBS=$save_LIBS + libo_MINGW_CHECK_DLL([lpsolve55]) + else + AC_MSG_RESULT([internal]) + SYSTEM_LPSOLVE= + BUILD_TYPE="$BUILD_TYPE LPSOLVE" + fi fi AC_SUBST(SYSTEM_LPSOLVE) |