mirror of
https://github.com/SebastianWendel/nixpkgs.git
synced 2024-11-05 17:56:46 +01:00
26 lines
1.1 KiB
Diff
26 lines
1.1 KiB
Diff
diff -ruN cfitsio/configure cfitsio-curl-config/configure
|
|
--- cfitsio/configure 2018-05-09 21:16:00.000000000 +0200
|
|
+++ cfitsio-curl-config/configure 2018-05-30 13:28:58.000000000 +0200
|
|
@@ -4783,13 +4783,6 @@
|
|
CURL_LIB=""
|
|
CURL_INC=""
|
|
# Use curl-config to get compiler & linker flags, if available.
|
|
-# On Macs, prefer XCode curl-config, and reject MacPorts version
|
|
-# until further notice to prevent build errors:
|
|
-if test "x$EXT" = xdarwin -a -x /usr/bin/curl-config; then
|
|
- CURLCONFIG="/usr/bin/curl-config"
|
|
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: checking for curl-config... choosing /usr/bin/curl-config on Mac" >&5
|
|
-$as_echo "checking for curl-config... choosing /usr/bin/curl-config on Mac" >&6; }
|
|
-else
|
|
# Extract the first word of "curl-config", so it can be a program name with args.
|
|
set dummy curl-config; ac_word=$2
|
|
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
|
|
@@ -4833,7 +4826,6 @@
|
|
fi
|
|
fi
|
|
fi
|
|
-fi
|
|
CURLCONFIG=$ac_cv_prog_CURLCONFIG
|
|
if test -n "$CURLCONFIG"; then
|
|
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CURLCONFIG" >&5
|