From 1a9b91c9b2e25c551ed61dc9144b3a300d27f4b0 Mon Sep 17 00:00:00 2001
From: Phil Burk <philburk@mobileer.com>
Date: Tue, 21 Jun 2022 16:17:07 -0700
Subject: [PATCH] autoconf: use c11 on Mac if supported (#717)

This uses a macro from the Autoconf archive to check compiler features.

Fixes #674
---
 aclocal.m4   |  63 +++++++++++++++++++++++++++++++++++++++++++++++----
 configure    | Bin 575081 -> 575960 bytes
 configure.in |   3 ++-
 3 files changed, 61 insertions(+), 5 deletions(-)

diff --git a/aclocal.m4 b/aclocal.m4
index f6850af..38a9629 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1202,7 +1202,7 @@ fi
 # Invoke $ECHO with all args, space-separated.
 func_echo_all ()
 {
-    $ECHO "$*" 
+    $ECHO "$*"
 }
 
 case "$ECHO" in
@@ -8542,7 +8542,7 @@ _LT_DECL(, macro_revision, 0)
 # included after everything else.  This provides aclocal with the
 # AC_DEFUNs it wants, but when m4 processes it, it doesn't do anything
 # because those macros already exist, or will be overwritten later.
-# We use AC_DEFUN over AU_DEFUN for compatibility with aclocal-1.6. 
+# We use AC_DEFUN over AU_DEFUN for compatibility with aclocal-1.6.
 #
 # Anytime we withdraw an AC_DEFUN or AU_DEFUN, remember to add it here.
 # Yes, that means every name once taken will need to remain here until
@@ -8616,7 +8616,7 @@ m4_ifndef([_LT_PROG_CXX],		[AC_DEFUN([_LT_PROG_CXX])])
 
 # pkg.m4 - Macros to locate and utilise pkg-config.            -*- Autoconf -*-
 # serial 1 (pkg-config-0.24)
-# 
+#
 # Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
 #
 # This program is free software; you can redistribute it and/or modify
@@ -8739,7 +8739,7 @@ if test $pkg_failed = yes; then
         _PKG_SHORT_ERRORS_SUPPORTED
         if test $_pkg_short_errors_supported = yes; then
 	        $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1`
-        else 
+        else
 	        $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
@@ -8774,3 +8774,58 @@ else
 fi[]dnl
 ])# PKG_CHECK_MODULES
 
+# This was added to aclocal.m4 because PortAudio ships with configure.in
+# and Makefile.in created manually.
+# ===========================================================================
+#  https://www.gnu.org/software/autoconf-archive/ax_check_compile_flag.html
+# ===========================================================================
+#
+# SYNOPSIS
+#
+#   AX_CHECK_COMPILE_FLAG(FLAG, [ACTION-SUCCESS], [ACTION-FAILURE], [EXTRA-FLAGS], [INPUT])
+#
+# DESCRIPTION
+#
+#   Check whether the given FLAG works with the current language's compiler
+#   or gives an error.  (Warnings, however, are ignored)
+#
+#   ACTION-SUCCESS/ACTION-FAILURE are shell commands to execute on
+#   success/failure.
+#
+#   If EXTRA-FLAGS is defined, it is added to the current language's default
+#   flags (e.g. CFLAGS) when the check is done.  The check is thus made with
+#   the flags: "CFLAGS EXTRA-FLAGS FLAG".  This can for example be used to
+#   force the compiler to issue an error when a bad flag is given.
+#
+#   INPUT gives an alternative input source to AC_COMPILE_IFELSE.
+#
+#   NOTE: Implementation based on AX_CFLAGS_GCC_OPTION. Please keep this
+#   macro in sync with AX_CHECK_{PREPROC,LINK}_FLAG.
+#
+# LICENSE
+#
+#   Copyright (c) 2008 Guido U. Draheim <guidod@gmx.de>
+#   Copyright (c) 2011 Maarten Bosmans <mkbosmans@gmail.com>
+#
+#   Copying and distribution of this file, with or without modification, are
+#   permitted in any medium without royalty provided the copyright notice
+#   and this notice are preserved.  This file is offered as-is, without any
+#   warranty.
+
+#serial 6
+
+AC_DEFUN([AX_CHECK_COMPILE_FLAG],
+[AC_PREREQ(2.64)dnl for _AC_LANG_PREFIX and AS_VAR_IF
+AS_VAR_PUSHDEF([CACHEVAR],[ax_cv_check_[]_AC_LANG_ABBREV[]flags_$4_$1])dnl
+AC_CACHE_CHECK([whether _AC_LANG compiler accepts $1], CACHEVAR, [
+  ax_check_save_flags=$[]_AC_LANG_PREFIX[]FLAGS
+  _AC_LANG_PREFIX[]FLAGS="$[]_AC_LANG_PREFIX[]FLAGS $4 $1"
+  AC_COMPILE_IFELSE([m4_default([$5],[AC_LANG_PROGRAM()])],
+    [AS_VAR_SET(CACHEVAR,[yes])],
+    [AS_VAR_SET(CACHEVAR,[no])])
+  _AC_LANG_PREFIX[]FLAGS=$ax_check_save_flags])
+AS_VAR_IF(CACHEVAR,yes,
+  [m4_default([$2], :)],
+  [m4_default([$3], :)])
+AS_VAR_POPDEF([CACHEVAR])dnl
+])dnl AX_CHECK_COMPILE_FLAGS
diff --git a/configure b/configure
index c13a09d3c62671c6881d49f562b27b21f31035ca..4128064c274aa8913c6add416e983ee2117c531b 100755
GIT binary patch
delta 506
zcmaFaqkLnsazhJa3sVbo3rh=Y3)>cUZola>CE1OpALwJ`kaku`&d)8#%t<X$NK8&n
zEhs5g&@C=Wu}wBKoSvx0q>NX=#c)Pp>5BN|viRhT)a2~=<g}c`^y2vVc%TXKAQL89
zGMZR(DJUcY6@gV0CzhqggH_q8IJ@~cx(5SgAq-n3sE7jG1xnKou4fFLZlJ@gIbHr2
zo0J>GBwW_nR;CtnrREf;LT$vQZu<HSj4rZpdsVQwZhE6JqqzqjuPG_mshM)ABo@b~
zCTHX;D1i;ZX(7KLyC~j(GE8O{wuOZQECLju0ip!+6siJCON4^7%;|#p>{9J2e(c*-
I{5V`I0MX^9X#fBK

delta 38
ucmcaHS@~s;azhJa3sVbo3rh=Y3)>cUZolcVf$S3PlLFbdPYUF4s{jBILJb`N

diff --git a/configure.in b/configure.in
index c1dad1a..b7bf566 100644
--- a/configure.in
+++ b/configure.in
@@ -252,7 +252,8 @@ case "${host_os}" in
            mac_version=""
         fi
         SHARED_FLAGS="$LIBS -dynamiclib $mac_arches $mac_sysroot $mac_version_min"
-        CFLAGS="-std=c99 $CFLAGS $mac_arches $mac_sysroot $mac_version_min"
+        AX_CHECK_COMPILE_FLAG([-std=c11], [CFLAGS="-std=c11 $CFLAGS"], [CFLAGS="-std=c99 $CFLAGS"])
+        CFLAGS="$CFLAGS $mac_arches $mac_sysroot $mac_version_min"
         OTHER_OBJS="src/os/unix/pa_unix_hostapis.o src/os/unix/pa_unix_util.o src/hostapi/coreaudio/pa_mac_core.o src/hostapi/coreaudio/pa_mac_core_utilities.o src/hostapi/coreaudio/pa_mac_core_blocking.o src/common/pa_ringbuffer.o"
         PADLL="libportaudio.dylib"
         ;;