Mercurial > mxe-octave
view src/mingw-cfitsio-1-fixes.patch @ 5571:b19fb3ed330c
use cmake command line to set build shared/static options (bug #59373)
* Makefile.in (CMAKE_BUILD_SHARED_OR_STATIC): New variable.
(build-cmake-toolchain-file): Don't define BUILD_SHARED_LIBS or
BUILD_STATIC_LIBS in the toolchain file.
* armadillo.mk, cgal.mk, cmake.mk, cminpack.mk, double-conversion.mk,
eigen.mk, gdcm.mk, gl2ps.mk, hdf5.mk, lapack.mk, libical.mk,
libproxy.mk, of-dicom.mk, openal.mk, opencv.mk, openexr.mk,
openscenegraph.mk, physfs.mk, qhull.mk, qjson.mk, rapidjson.mk,
suitesparse.mk, sundials-ida.mk, taglib.mk, vigra.mk, vmime.mk,
vtk.mk, wt.mk: Use $(CMAKE_BUILD_SHARED_OR_STATIC) on the cmake
command line.
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Fri, 30 Oct 2020 10:06:00 -0400 |
parents | 97fc509bb1df |
children | d3d051b4515f |
line wrap: on
line source
diff -ur cfitsio.orig/configure.in cfitsio/configure.in --- cfitsio.orig/configure.in 2019-03-05 10:42:18.453397421 -0500 +++ cfitsio/configure.in 2019-03-05 10:44:29.464686105 -0500 @@ -452,7 +452,7 @@ else AC_CHECK_PROG([CURLCONFIG], [curl-config], [curl-config], [], [], [/opt/local/bin/curl-config]) fi -if test "x$CURLCONFIG" != x; then +if test "x$CURLCONFIG" != x && test "x$CURLCONFIG" != "xnone" ; then CURL_LIB=`$CURLCONFIG --libs` CURL_INC=`$CURLCONFIG --cflags` # Also reject anaconda curl on Macs until further notice: