Attachment #198477 for bug #278325

Lines 551-556 Link Here

(-)audacity-src-1.3.8/configure.in (-7 / +17 lines)
551	esac	551	esac
552		552
553	dnl PortAudio configuration	553	dnl PortAudio configuration
		554	AC_ARG_WITH([alsa], AS_HELP_STRING([--without-alsa], [Build without alsa library (default: test)]))
		555	AC_ARG_WITH([jack], AS_HELP_STRING([--without-jack], [Build without jack library (default: test)]))
554		556
555	LOCAL_LIBS="$LOCAL_LIBS portaudio-v19/lib/libportaudio.a"	557	LOCAL_LIBS="$LOCAL_LIBS portaudio-v19/lib/libportaudio.a"
556	EXTRAOBJS="$EXTRAOBJS ../lib-src/portaudio-v19/lib/libportaudio.a"	558	EXTRAOBJS="$EXTRAOBJS ../lib-src/portaudio-v19/lib/libportaudio.a"
Lines 567-579 Link Here
567	;;	569	;;
568	*)	570	*)
569	dnl Unix	571	dnl Unix
570	AC_CHECK_LIB(asound, snd_pcm_open, have_alsa=yes, have_alsa=no)	572	if test "x$with_alsa" != "xno"; then
571	if [[ $have_alsa = "yes" ]] ; then	573	AC_CHECK_LIB(asound, snd_pcm_open, have_alsa=yes, have_alsa=no)
572	LIBS="$LIBS -lasound"	574	if [[ $have_alsa = "yes" ]] ; then
573	fi	575	LIBS="$LIBS -lasound"
574	PKG_CHECK_MODULES(JACK, jack, have_jack=yes, have_jack=no)	576	else
575	if [[ $have_jack = "yes" ]] ; then	577	AC_MSG_WARN([Support for alsa not available])
576	LIBS="$LIBS $JACK_LIBS"	578	fi
		579	fi
		580	if test "x$with_jack" != "xno"; then
		581	PKG_CHECK_MODULES(JACK, jack, have_jack=yes, have_jack=no)
		582	if [[ $have_jack = "yes" ]] ; then
		583	LIBS="$LIBS $JACK_LIBS"
		584	else
		585	AC_MSG_WARN([Support for jack not available])
		586	fi
577	fi	587	fi
578	AC_CHECK_LIB(hpi, HPI_SubSysCreate, have_asihpi=yes, have_asihpi=no, -lm)	588	AC_CHECK_LIB(hpi, HPI_SubSysCreate, have_asihpi=yes, have_asihpi=no, -lm)
579	if [[ $have_asihpi = "yes" ]] ; then	589	if [[ $have_asihpi = "yes" ]] ; then

Lines 94-99 AC_CHECK_HEADER(linux/soundcard.h, have_ Link Here

(-)audacity-src-1.3.8/lib-src/portmixer/configure.ac (-1 / +2 lines)
94	AC_CHECK_HEADER(alsa/asoundlib.h, have_alsa=yes, have_alsa=no)	94	AC_CHECK_HEADER(alsa/asoundlib.h, have_alsa=yes, have_alsa=no)
95	AC_CHECK_HEADER(CoreAudio/CoreAudio.h, have_coreaudio=yes, have_coreaudio=no)	95	AC_CHECK_HEADER(CoreAudio/CoreAudio.h, have_coreaudio=yes, have_coreaudio=no)
96		96
		97	AC_ARG_WITH([alsa], AS_HELP_STRING([--without-alsa], [Build without alsa library (default: test)]))
97	#	98	#
98	# Set up to use the identified ones	99	# Set up to use the identified ones
99	#	100	#
Lines 104-110 if [[ $have_oss = "yes" ]] ; then Link Here
104	objects="$objects px_unix_oss.o"	105	objects="$objects px_unix_oss.o"
105	fi	106	fi
106		107
107	if [[ $have_alsa = "yes" ]] ; then	108	if [[ $have_alsa = "yes" -a "x$with_alsa" != "xno" ]] ; then
108	AC_MSG_NOTICE(Including support for ALSA);	109	AC_MSG_NOTICE(Including support for ALSA);
109	AC_DEFINE(PX_USE_LINUX_ALSA)	110	AC_DEFINE(PX_USE_LINUX_ALSA)
110	objects="$objects px_linux_alsa.o"	111	objects="$objects px_linux_alsa.o"

Return to bug 278325