Mercurial > hg > octave-max

changeset 9231:8a5a04b6c46b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fixes confgure script for QHULL detection and add dependency on user32 [Win32]
author Michael Goffioul <michael.goffioul@gmail.com>
date Thu, 21 May 2009 18:30:30 +0100
parents 579a19943d38
children 7319e4de9e44
files ChangeLog aclocal.m4 configure.in
diffstat 3 files changed, 10 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2008-05-21  Michael Goffioul <michael.goffioul@gmail.com>
 
+	* aclocal.m4 (AC_CHECK_QHULL_OK): Do not use -lm under
+	Windows systems.
+	* configure.in: Add -luser32 to LIBS under Windows.
+
 	* configure.in (SCRIPTS_EXE_SUFFIX): New substituted
 	variable. Define to ".exe" for MSVC compilation.
 	* octMakefile.in (SCRIPTS_EXE_SUFFIX): New variable.
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -968,7 +968,11 @@
 AC_CACHE_VAL(octave_cv_lib_qhull_ok,
 [
   save_LIBS="$LIBS"
-  LIBS="$LIBS -lqhull -lm"
+  LIBS="$LIBS -lqhull"
+  case $host in
+    *-mingw*|*-msdosmsvc*) ;;
+    *) LIBS="$LIBS -lm" ;;
+  esac
 AC_RUN_IFELSE([AC_LANG_SOURCE([[
 #include <stdio.h>
 #include <qhull/qhull.h>
--- a/configure.in
+++ b/configure.in
@@ -1464,7 +1464,7 @@
    LIBS="$LIBS -lwsock32"
   ;;
   *-*-msdosmsvc* | *-*-mingw*)
-  LIBS="$LIBS -lgdi32 -lws2_32 -lkernel32"
+  LIBS="$LIBS -lgdi32 -lws2_32 -luser32 -lkernel32"
   ;;
 esac