view src/mingw-cfitsio-1-fixes.patch @ 5499:be0a7ce498e6

Update mesa to version 20.0.8 (bug #58689). * src/mesa.mk: Update version and checksum. Add build-meson to dependecies. Update build rule to use meson and ninja as the build tools. * src/mesa-1-meson.patch: Add new patch. * src/mesa-1-fixes.patch: Remove old patch for the scons rule that is no longer needed. * dist-files.mk: Update file list. * src/build-mako.mk: Depend on and use python3. * src/build-markupsafe.mk: Depend on and use python3.
author Markus Mützel <markus.muetzel@gmx.de>
date Sun, 05 Jul 2020 20:58:57 +0200
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: