blob: 24c72cc6352f493f883f4582b8df7dd339ff3ddd (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
|
--- solenv/inc/libs.mk-old 2008-04-29 12:50:10.000000000 +0200
+++ solenv/inc/libs.mk 2008-04-29 12:51:27.000000000 +0200
@@ -340,7 +340,13 @@
MYTHESLIB=-lmythes-1.2
.ENDIF
PYUNOLIB=-lpyuno
+.IF "$(SYSTEM_LPSOLVE)" == "YES"
+# FIXME. Even with -L/usr/lib/lp_solve -llpsolve55 the liblpsolve55.a from
+# /usr/lib gets picked and we get a static link...
+LPSOLVELIB = /usr/lib/lp_solve/liblpsolve55.so -Wl,-rpath=/usr/lib/lp_solve
+.ELSE
LPSOLVELIB=-llpsolve55
+.ENDIF
SOFFICELIB=-lsofficeapp
UNOPKGAPPLIB=-lunopkgapp
TESTLIB=-ltest
--- configure.in-old 2008-04-29 12:59:49.000000000 +0200
+++ configure.in 2008-04-29 13:00:07.000000000 +0200
@ -5401,7 +5401,7 @@
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.)], [])
+ [ AC_MSG_ERROR(lpsolve library not found or too old.)], [-L/usr/lib/lp_solve])
else
AC_MSG_RESULT([internal])
SYSTEM_LPSOLVE=NO
|
