[ooo-build-commit] patches/dev300

[René Engelhard]

 patches/dev300/configure-fix-lpsolve-depends.diff   |   37 +++++---------------
 patches/dev300/system-lpsolve-link-with-colamd.diff |   10 +++++
 2 files changed, 21 insertions(+), 26 deletions(-)

New commits:
commit e6c53f47153726fa17b4bdef4e5acd12b0146dc8
Author: Rene Engelhard <rene at debian.org>
Date:   Fri Oct 23 10:42:49 2009 +0200

    fix lpsolve configure "fixes"
    
    * patches/dev300/configure-fix-lpsolve-depends.diff: remove colamd check;
      no need to bother distros which do not need it with this. Move
      thee (imho also unneeded) m/dl checks into the if
    * patches/dev300/system-lpsolve-link-with-colamd.diff: add AC_CHECK_LIB
      for colamd here ad here's where we *do* need it

diff --git a/patches/dev300/configure-fix-lpsolve-depends.diff b/patches/dev300/configure-fix-lpsolve-depends.diff
index e271969..c6e26d1 100644
--- a/patches/dev300/configure-fix-lpsolve-depends.diff
+++ b/patches/dev300/configure-fix-lpsolve-depends.diff
@@ -1,26 +1,11 @@
-From 417c6999e81a415cf1be7f6ba765322a98c8b4ac Mon Sep 17 00:00:00 2001
-From: Jan Nieuwenhuizen <janneke at gnu.org>
-Date: Wed, 21 Oct 2009 08:32:16 +0200
-Subject: [PATCH 3/3] configure.in: lpsolve may need libm, libdl, libcolamd.
-
----
- configure.in |    3 +++
- 1 files changed, 3 insertions(+), 0 deletions(-)
-
-diff --git configure.in configure.in
-index 2c9cf6f..5aca145 100644
---- configure.in
-+++ configure.in
-@@ -4984,6 +4984,9 @@ AC_LANG_POP([C++])
- dnl ===================================================================
- dnl Checking for lpsolve
- dnl ===================================================================
-+AC_CHECK_LIB(m, floor)
-+AC_CHECK_LIB(dl, dlopen)
-+AC_CHECK_LIB(colamd, colamd)
- AC_MSG_CHECKING([which lpsolve to use])
- if test -n "$with_system_lpsolve" -o -n "$with_system_libs" && \
- 	test "$with_system_lpsolve" != "no"; then
--- 
-1.6.3.3
-
+--- configure.in-old	2009-10-23 10:36:09.000000000 +0200
++++ configure.in	2009-10-23 10:36:44.000000000 +0200
+@@ -5378,6 +5378,8 @@
+     SYSTEM_LPSOLVE=YES
+     AC_CHECK_HEADER(lpsolve/lp_lib.h, [],
+        [ AC_MSG_ERROR(lpsolve headers not found.)], [])
++    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.)], [-L/usr/lib/lp_solve])
+ else
diff --git a/patches/dev300/system-lpsolve-link-with-colamd.diff b/patches/dev300/system-lpsolve-link-with-colamd.diff
index 5b345ec..0482f0f 100644
--- a/patches/dev300/system-lpsolve-link-with-colamd.diff
+++ b/patches/dev300/system-lpsolve-link-with-colamd.diff
@@ -18,3 +18,13 @@ diff -u -u -r1.3 makefile.mk
  RESLIB1NAME=solver
  RESLIB1SRSFILES=$(RESLIB1LIST)
  
+--- configure.in-old	2009-10-23 10:40:02.000000000 +0200
++++ configure.in	2009-10-23 10:40:35.000000000 +0200
+@@ -5380,6 +5380,7 @@
+        [ AC_MSG_ERROR(lpsolve headers not found.)], [])
+     AC_CHECK_LIB(m, floor)
+     AC_CHECK_LIB(dl, dlopen)
++    AC_CHECK_LIB(colamd, colamd)
+     AC_CHECK_LIB(lpsolve55, make_lp, ,
+         [ AC_MSG_ERROR(lpsolve library not found or too old.)], [-L/usr/lib/lp_solve])
+ else