From 8517dc95a6ad6eec34aa5295b5133c6c18fcd1e9 Mon Sep 17 00:00:00 2001
From: Tor Lillqvist <tml@collabora.com>
Date: Tue, 20 May 2014 13:03:06 +0300
Subject: If we don't want lpsolve we don't want lpsolve

Change-Id: I6038faf296831da0855eb7cd3628c5c6978d4cb3
---
 configure.ac | 38 ++++++++++++++++++++------------------
 1 file changed, 20 insertions(+), 18 deletions(-)

(limited to 'configure.ac')

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)
 
-- 
cgit