octave-maintainers
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[changeset] Fix --without-library


From: David Grundberg
Subject: [changeset] Fix --without-library
Date: Tue, 18 Aug 2009 14:51:23 +0200
User-agent: Thunderbird 2.0.0.21 (X11/20090302)

Hi,

I had some troubles with the --without-library arguments (qhull, amd, etc). Make tries linking against -lno. Here's the changed I've done to aclocal.m4 in order to make it work correctly. Also fixed so that QHULL_LIBS is cleared on missing headers.

Best regards,
David
# HG changeset patch
# User David Grundberg <address@hidden>
# Date 1250599319 -7200
# Node ID f231f1740da67757125f46686685fcfa162befc9
# Parent  8f8cb45ad674f83daaef8a55e663c0a33920d3e5
Clear QHULL_LIBS etc on errors. Interpret --without-qhull etc correctly.

diff -r 8f8cb45ad674 -r f231f1740da6 ChangeLog
--- a/ChangeLog Mon Aug 17 18:57:48 2009 -0400
+++ b/ChangeLog Tue Aug 18 14:41:59 2009 +0200
@@ -1,3 +1,8 @@
+2009-08-18  David Grundberg  <address@hidden>
+
+       * aclocal.m4 (OCTAVE_CHECK_LIBRARY): Clear QHULL_LIBS etc on
+       errors. Interpret --without-qhull etc correctly.
+
 2009-08-17  John W. Eaton  <address@hidden>
 
        * octave-bug.in, octave-bug.cc.in: Include AMD_CPPFLAGS,
diff -r 8f8cb45ad674 -r f231f1740da6 aclocal.m4
--- a/aclocal.m4        Mon Aug 17 18:57:48 2009 -0400
+++ b/aclocal.m4        Tue Aug 18 14:41:59 2009 +0200
@@ -449,6 +449,9 @@
 
   m4_toupper([$1])_LIBS=
   case $with_$1 in
+    no)
+      m4_toupper([$1])_LIBS=
+    ;;
     yes | "")
       m4_toupper([$1])_LIBS="-l$1"
     ;;
@@ -474,7 +477,7 @@
       octave_$1_ok=no
       AC_MSG_CHECKING([for $5 in $m4_toupper([$1])_LIBS])
       AC_LINK_IFELSE([AC_LANG_CALL([], [$5])],
-       [octave_$1_ok=yes], [m4_toupper([$1])_LIBS=""])
+       [octave_$1_ok=yes])
       AC_MSG_RESULT($octave_$1_ok)
       if test $octave_$1_ok = yes; then
        m4_ifblank([$8], [
@@ -492,6 +495,7 @@
   AC_SUBST([TEXINFO_]m4_toupper([$1]))
   if test -n "$warn_$1"; then
     AC_MSG_WARN($warn_$1)
+    m4_toupper([$1])_LIBS=
   fi
 ])
 dnl

reply via email to

[Prev in Thread] Current Thread [Next in Thread]