Skip to content

C
core
Kaydet (Commit) 8517dc95 authored tarafından Tor Lillqvist's avatar Tor Lillqvist
Dosyalara gözat
Seçenekler

If we don't want lpsolve we don't want lpsolve 

Change-Id: I6038faf296831da0855eb7cd3628c5c6978d4cb3
üst eff1d991
Hide whitespace changes
Inline Side-by-side
Showing with 20 additions and 18 deletions
configure.ac
Dosyayı görüntüle @ 8517dc95
...@@ -9560,24 +9560,26 @@ else ...@@ -9560,24 +9560,26 @@ else
fi fi
AC_SUBST(ENABLE_LPSOLVE) AC_SUBST(ENABLE_LPSOLVE)
AC_MSG_CHECKING([which lpsolve to use]) if test "$ENABLE_LPSOLVE" = TRUE; then
if test "$with_system_lpsolve" = "yes"; then AC_MSG_CHECKING([which lpsolve to use])
AC_MSG_RESULT([external]) if test "$with_system_lpsolve" = "yes"; then
SYSTEM_LPSOLVE=TRUE AC_MSG_RESULT([external])
AC_CHECK_HEADER(lpsolve/lp_lib.h, [], SYSTEM_LPSOLVE=TRUE
[ AC_MSG_ERROR(lpsolve headers not found.)], []) AC_CHECK_HEADER(lpsolve/lp_lib.h, [],
save_LIBS=$LIBS [ AC_MSG_ERROR(lpsolve headers not found.)], [])
# some systems need this. Like Ubuntu.... save_LIBS=$LIBS
AC_CHECK_LIB(m, floor) # some systems need this. Like Ubuntu....
AC_CHECK_LIB(dl, dlopen) AC_CHECK_LIB(m, floor)
AC_CHECK_LIB([lpsolve55], [make_lp], [:], AC_CHECK_LIB(dl, dlopen)
[ AC_MSG_ERROR(lpsolve library not found or too old.)], []) AC_CHECK_LIB([lpsolve55], [make_lp], [:],
LIBS=$save_LIBS [ AC_MSG_ERROR(lpsolve library not found or too old.)], [])
libo_MINGW_CHECK_DLL([lpsolve55]) LIBS=$save_LIBS
else libo_MINGW_CHECK_DLL([lpsolve55])
AC_MSG_RESULT([internal]) else
SYSTEM_LPSOLVE= AC_MSG_RESULT([internal])
BUILD_TYPE="$BUILD_TYPE LPSOLVE" SYSTEM_LPSOLVE=
BUILD_TYPE="$BUILD_TYPE LPSOLVE"
fi
fi fi
AC_SUBST(SYSTEM_LPSOLVE) AC_SUBST(SYSTEM_LPSOLVE)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment