From c9cb17fbd6bc224a739ba794e3569830d87a5f6a Mon Sep 17 00:00:00 2001 From: Martin Storsjo Date: Thu, 20 Oct 2016 13:16:10 +0300 Subject: configure: Check for other variants of the -m*os*-version-min flags In addition to -miphoneos-version-min, the same version can be set using -mios-version-min. And for WatchOS and TvOS, there's -mwatchos-version-min and -mtvos-version-min. --- acinclude.m4 | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'acinclude.m4') diff --git a/acinclude.m4 b/acinclude.m4 index ea97400b4..95a73e5ec 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -3203,8 +3203,9 @@ TEST EINVAL TEST dnl CURL_MAC_CFLAGS dnl -dnl Check if -mmacosx-version-min or -miphoneos-version-min are set manually, -dnl otherwise do. And set -Werror=partial-availability. +dnl Check if -mmacosx-version-min, -miphoneos-version-min or any +dnl similar are set manually, otherwise do. And set +dnl -Werror=partial-availability. dnl AC_DEFUN([CURL_MAC_CFLAGS], [ @@ -3222,8 +3223,7 @@ AC_DEFUN([CURL_MAC_CFLAGS], [ if test "$tst_cflags" = "yes"; then AC_MSG_CHECKING([for *version-min in CFLAGS]) min="" - if test -z "$(echo $CFLAGS | grep mmacosx-version-min)" -a - test -z "$(echo $CFLAGS | grep miphoneos-version-min)"; then + if test -z "$(echo $CFLAGS | grep m.*os.*-version-min)"; then min="-mmacosx-version-min=10.5" CFLAGS="$CFLAGS $min" fi -- cgit v1.2.1