[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: latest CVS compilation error
From: |
David Bateman |
Subject: |
Re: latest CVS compilation error |
Date: |
Sat, 01 Sep 2007 00:07:00 +0200 |
User-agent: |
Thunderbird 1.5.0.7 (X11/20060921) |
John W. Eaton wrote:
> On 31-Aug-2007, Shai Ayal wrote:
>
> | make[3]: *** [voronoi.eps] Error 1
> | make[3]: Leaving directory `/home/shaia/octave/doc/interpreter'
> | make[2]: *** [interpreter] Error 2
> | make[2]: Leaving directory `/home/shaia/octave/doc'
> | make[1]: *** [doc] Error 2
> | make[1]: Leaving directory `/home/shaia/octave'
> | make: *** [all] Error 2
>
> I guess we need to disable the creation of these figures if the qhull
> library is not present, similar to what we do for the sparse figures
> when the necessary sparse functionality is not available.
Grrr, ok. Then we need another autoconf test. Consider the attached
patch. I've rerun autogen.sh; ./configure; make with QHULL installed and
it worked fine... Its based on the same code for sparseimages.m and so
it should work if QHULL isn't installed, but haven't tested..
Regards
David
*** ./doc/interpreter/geometryimages.m.orig15 2007-08-31 22:54:30.791223359
+0200
--- ./doc/interpreter/geometryimages.m 2007-09-01 00:03:46.776489677 +0200
***************
*** 1,6 ****
function geometryimages (nm, typ)
bury_output ();
! if (strcmp (nm, "voronoi"))
rand("state",9);
x = rand(10,1);
y = rand(10,1);
--- 1,10 ----
function geometryimages (nm, typ)
bury_output ();
! if (isempty (findstr (octave_config_info ("DEFS"), "HAVE_QHULL")) && ...
! (strcmp (nm, "voronoi") || strcmp (nm, "griddata") || ...
! strcmp (nm, "convhull") || strcmp (nm, "delaunay")))
! sombreroimage (nm, typ);
! elseif (strcmp (nm, "voronoi"))
rand("state",9);
x = rand(10,1);
y = rand(10,1);
***************
*** 141,143 ****
--- 145,174 ----
f = figure (1);
set (f, "visible", "off");
endfunction
+
+ function sombreroimage (nm, typ)
+ if (strcmp (typ, "txt"))
+ fid = fopen (sprintf ("%s.txt", nm), "wt");
+ fputs (fid, "+-----------------------------+\n");
+ fputs (fid, "| Image unavailable because |\n");
+ fputs (fid, "| of a missing QHULL library. |\n");
+ fputs (fid, "+-----------------------------+\n");
+ fclose (fid);
+ return;
+ else ## if (!strcmp (typ, "txt"))
+
+ bury_output ();
+
+ x = y = linspace (-8, 8, 41)';
+ [xx, yy] = meshgrid (x, y);
+ r = sqrt (xx .^ 2 + yy .^ 2) + eps;
+ z = sin (r) ./ r;
+ unwind_protect
+ mesh (x, y, z);
+ title ("Sorry, graphics not available because octave was\\ncompiled
without the QHULL library.");
+ unwind_protect_cleanup
+ print (strcat (nm, ".", typ), strcat ("-d", typ));
+ bury_output ();
+ end_unwind_protect
+ endif
+ endfunction
*** ./doc/interpreter/geometry.txi.orig15 2007-08-31 23:03:46.873892789
+0200
--- ./doc/interpreter/geometry.txi 2007-08-31 23:05:55.227353605 +0200
***************
*** 62,67 ****
--- 62,68 ----
@end group
@end example
+ @ifset HAVE_QHULL
@ifnotinfo
@noindent
The result of which can be seen in @ref{fig:delaunay}.
***************
*** 71,76 ****
--- 72,78 ----
@caption{Delaunay triangulation of a random set of points}
@end float
@end ifnotinfo
+ @end ifset
@menu
* Plotting the Triangulation::
***************
*** 285,290 ****
--- 287,293 ----
@end group
@end example
+ @ifset HAVE_QHULL
@ifnotinfo
@noindent
The result of which can be seen in @ref{fig:voronoi}. Note that the
***************
*** 297,302 ****
--- 300,306 ----
@caption{Delaunay triangulation and Voronoi diagram of a random set of points}
@end float
@end ifnotinfo
+ @end ifset
Additional information about the size of the facets of a Voronoi
diagram, and which points of a set of points is in a polygon can be had
***************
*** 373,378 ****
--- 377,383 ----
@end group
@end example
+ @ifset HAVE_QHULL
@ifnotinfo
@noindent
The output of the above can be seen in @ref{fig:convhull}.
***************
*** 382,387 ****
--- 387,393 ----
@caption{The convex hull of a simple set of points}
@end float
@end ifnotinfo
+ @end ifset
@node Interpolation on Scattered Data
@section Interpolation on Scattered Data
***************
*** 415,420 ****
--- 421,427 ----
@end group
@end example
+ @ifset HAVE_QHULL
@noindent
that interpolates from a random scattering of points, to a uniform
grid.
***************
*** 426,428 ****
--- 433,436 ----
@caption{Interpolation from a scattered data to a regular grid}
@end float
@end ifnotinfo
+ @end ifset
*** ./doc/conf.texi.in.orig15 2007-08-31 22:48:49.892591014 +0200
--- ./doc/conf.texi.in 2007-08-31 22:49:16.127254445 +0200
***************
*** 10,12 ****
--- 10,13 ----
%TEXINFO_COLAMD%
%TEXINFO_CHOLMOD%
%TEXINFO_UMFPACK%
+ %TEXINFO_QHULL%
*** ./configure.in.orig15 2007-08-31 22:48:24.421888662 +0200
--- ./configure.in 2007-08-31 22:49:05.833778864 +0200
***************
*** 437,447 ****
--- 437,450 ----
if test "$have_qhull" = yes; then
AC_DEFINE(HAVE_QHULL, 1, [Define if the QHull library is used.])
QHULL_LIBS="-lqhull"
+ TEXINFO_QHULL="@set HAVE_QHULL"
else
warn_qhull="Qhull library not found --- This will result in loss of
functionality of some geometry functions."
AC_MSG_WARN($warn_qhull)
fi
+ AC_SUBST(TEXINFO_QHULL)
+
### Check for pcre/regex library.
AC_SUBST(REGEX_LIBS)
WITH_PCRE_CONFIG=no
*** ./Makeconf.in.orig15 2007-08-31 23:15:50.783012017 +0200
--- ./Makeconf.in 2007-08-31 23:23:23.660939387 +0200
***************
*** 227,232 ****
--- 227,233 ----
TEXINFO_COLAMD = @TEXINFO_COLAMD@
TEXINFO_CHOLMOD = @TEXINFO_CHOLMOD@
TEXINFO_UMFPACK = @TEXINFO_UMFPACK@
+ TEXINFO_QHULL = @TEXINFO_QHULL@
# The arguments passed to configure.
config_opts = @config_opts@
***************
*** 577,583 ****
-e "s|%OCTAVE_VERSION%|${version}|" \
-e "s|%TEXINFO_COLAMD%|${TEXINFO_COLAMD}|" \
-e "s|%TEXINFO_CHOLMOD%|${TEXINFO_CHOLMOD}|" \
! -e "s|%TEXINFO_UMFPACK%|${TEXINFO_UMFPACK}|" | \
$(SED) -e "s|%OCTAVE_CONF_DEFS%|\"${UGLY_DEFS}\"|" > address@hidden
$(simple-move-if-change-rule)
endef
--- 578,585 ----
-e "s|%OCTAVE_VERSION%|${version}|" \
-e "s|%TEXINFO_COLAMD%|${TEXINFO_COLAMD}|" \
-e "s|%TEXINFO_CHOLMOD%|${TEXINFO_CHOLMOD}|" \
! -e "s|%TEXINFO_UMFPACK%|${TEXINFO_UMFPACK}|" \
! -e "s|%TEXINFO_QHULL%|${TEXINFO_QHULL}|" | \
$(SED) -e "s|%OCTAVE_CONF_DEFS%|\"${UGLY_DEFS}\"|" > address@hidden
$(simple-move-if-change-rule)
endef