Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix configure build broken by audioio #654

Merged
merged 1 commit into from
Oct 7, 2021
Merged

Fix configure build broken by audioio #654

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 34 additions & 1 deletion configure
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -747,6 +747,7 @@ ac_subst_files=''
ac_user_opts='
enable_option_checking
with_alsa
with_audioio
with_jack
with_oss
with_asihpi
Expand Down Expand Up @@ -1421,6 +1422,7 @@ Optional Packages:
--with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
--without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
--with-alsa Enable support for ALSA [autodetect]
--with-audioio Enable support for Solaris/NetBSD audio [autodetect]
--with-jack Enable support for JACK [autodetect]
--with-oss Enable support for OSS [autodetect]
--with-asihpi Enable support for ASIHPI [autodetect]
Expand Down Expand Up @@ -2696,6 +2698,13 @@ fi



# Check whether --with-audioio was given.
if test "${with_audioio+set}" = set; then :
withval=$with_audioio; with_audioio=$withval
fi



# Check whether --with-jack was given.
if test "${with_jack+set}" = set; then :
withval=$with_jack; with_jack=$withval
Expand Down Expand Up @@ -15377,6 +15386,21 @@ else
have_asihpi=no
fi

fi
have_audioio=no
if test "x$with_audioio" != "xno"; then
for ac_header in sys/audioio.h
do :
ac_fn_c_check_header_mongrel "$LINENO" "sys/audioio.h" "ac_cv_header_sys_audioio_h" "$ac_includes_default"
if test "x$ac_cv_header_sys_audioio_h" = xyes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_SYS_AUDIOIO_H 1
_ACEOF
have_audioio=yes
fi

done

fi
have_libossaudio=no
have_oss=no
Expand Down Expand Up @@ -15848,7 +15872,8 @@ case "${host_os}" in
if test "x$enable_mac_universal" = "xyes" ; then
mac_version_min="-mmacosx-version-min=10.6"
mac_sysroot="-isysroot $(xcrun --sdk macosx --show-sdk-path)"
mac_arches=""

mac_arches=""
for arch in x86_64 arm64
do
save_CFLAGS="$CFLAGS"
Expand Down Expand Up @@ -16163,6 +16188,12 @@ fi

fi

if [ "$have_audioio" = "yes" ] && [ "$with_audioio" != "no" ] ; then
OTHER_OBJS="$OTHER_OBJS src/hostapi/audioio/pa_unix_audioio.o"
$as_echo "#define PA_USE_AUDIOIO 1" >>confdefs.h

fi

if [ "$have_jack" = "yes" ] && [ "$with_jack" != "no" ] ; then
DLL_LIBS="$DLL_LIBS $JACK_LIBS"
CFLAGS="$CFLAGS $JACK_CFLAGS"
Expand Down Expand Up @@ -18794,10 +18825,12 @@ $as_echo "
;;
*)
{ $as_echo "$as_me:${as_lineno-$LINENO}: result:
AudioIO ..................... $have_audioio
OSS ......................... $have_oss
JACK ........................ $have_jack
" >&5
$as_echo "
AudioIO ..................... $have_audioio
OSS ......................... $have_oss
JACK ........................ $have_jack
" >&6; }
Expand Down
2 changes: 1 addition & 1 deletion configure.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -377,7 +377,7 @@ case "${host_os}" in
AC_DEFINE(PA_USE_ALSA,1)
fi

if [[ "$with_audioio" != "no" ]] ; then
if [[ "$have_audioio" = "yes" ] && [ "$with_audioio" != "no" ]] ; then
OTHER_OBJS="$OTHER_OBJS src/hostapi/audioio/pa_unix_audioio.o"
AC_DEFINE(PA_USE_AUDIOIO,1)
fi
Expand Down