view src/mingw-cfitsio-1-fixes.patch @ 5650:6805ab42c8aa

Don't convert to short paths for default-octave target (bug #59923). * installer-files/octave-no-shortpath.patch, installer-files/octave-bat-no-shortpath.patch, installer-files/cmdshell-no-shortpath.patch: Add patches that remove conversion of path to short file names from scripts. * binary-dist-rules.mk: Apply new patches for default-octave target. * dist-files.mk: Add new files to build system.
author Markus Mützel <markus.muetzel@gmx.de>
date Sun, 31 Jan 2021 18:38:38 +0100
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: