Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 312837 | Differences between
and this patch

Collapse All | Expand All

(-)../audacity-src-1.3.12-beta.orig/configure.in (-7 / +17 lines)
Lines 559-564 Link Here
559
esac
559
esac
560
560
561
dnl PortAudio configuration
561
dnl PortAudio configuration
562
AC_ARG_WITH([alsa], AS_HELP_STRING([--without-alsa], [Build without alsa library (default: test)]))
563
AC_ARG_WITH([jack], AS_HELP_STRING([--without-jack], [Build without jack library (default: test)]))
562
564
563
LOCAL_LIBS="$LOCAL_LIBS portaudio-v19/lib/libportaudio.a"
565
LOCAL_LIBS="$LOCAL_LIBS portaudio-v19/lib/libportaudio.a"
564
EXTRAOBJS="$EXTRAOBJS ../lib-src/portaudio-v19/lib/libportaudio.a"
566
EXTRAOBJS="$EXTRAOBJS ../lib-src/portaudio-v19/lib/libportaudio.a"
Lines 575-587 Link Here
575
      ;;
577
      ;;
576
   *)
578
   *)
577
      dnl Unix
579
      dnl Unix
578
      AC_CHECK_LIB(asound, snd_pcm_open, have_alsa=yes, have_alsa=no)
580
      if test "x$with_alsa" != "xno"; then
579
      if [[ $have_alsa = "yes" ]] ; then
581
         AC_CHECK_LIB(asound, snd_pcm_open, have_alsa=yes, have_alsa=no)
580
         LIBS="$LIBS -lasound"
582
         if [[ $have_alsa = "yes" ]] ; then
581
      fi
583
            LIBS="$LIBS -lasound"
582
      PKG_CHECK_MODULES(JACK, jack, have_jack=yes, have_jack=no)
584
        else
583
      if [[ $have_jack = "yes" ]] ; then
585
            AC_MSG_WARN([Support for alsa not available])
584
         LIBS="$LIBS $JACK_LIBS"
586
         fi
587
      fi        
588
      if test "x$with_jack" != "xno"; then
589
         PKG_CHECK_MODULES(JACK, jack, have_jack=yes, have_jack=no)
590
         if [[ $have_jack = "yes" ]] ; then
591
            LIBS="$LIBS $JACK_LIBS"
592
        else
593
            AC_MSG_WARN([Support for jack not available])
594
         fi
585
      fi
595
      fi
586
      AC_CHECK_LIB(hpi, HPI_SubSysCreate, have_asihpi=yes, have_asihpi=no, -lm)
596
      AC_CHECK_LIB(hpi, HPI_SubSysCreate, have_asihpi=yes, have_asihpi=no, -lm)
587
      if [[ $have_asihpi = "yes" ]] ; then
597
      if [[ $have_asihpi = "yes" ]] ; then
(-)../audacity-src-1.3.12-beta.orig/lib-src/portmixer/configure.ac (-1 / +2 lines)
Lines 97-102 Link Here
97
AC_CHECK_HEADER(alsa/asoundlib.h,  have_alsa=yes, have_alsa=no)
97
AC_CHECK_HEADER(alsa/asoundlib.h,  have_alsa=yes, have_alsa=no)
98
AC_CHECK_HEADER(CoreAudio/CoreAudio.h, have_coreaudio=yes, have_coreaudio=no)
98
AC_CHECK_HEADER(CoreAudio/CoreAudio.h, have_coreaudio=yes, have_coreaudio=no)
99
99
100
AC_ARG_WITH([alsa], AS_HELP_STRING([--without-alsa], [Build without alsa library (default: test)]))
100
#
101
#
101
# Set up to use the identified ones
102
# Set up to use the identified ones
102
#
103
#
Lines 107-113 Link Here
107
   objects="$objects px_unix_oss.o"
108
   objects="$objects px_unix_oss.o"
108
fi
109
fi
109
110
110
if [[ $have_alsa = "yes" ]] ; then
111
if [[ $have_alsa = "yes" -a "x$with_alsa" != "xno" ]] ; then
111
   AC_MSG_NOTICE(Including support for ALSA);
112
   AC_MSG_NOTICE(Including support for ALSA);
112
   AC_DEFINE(PX_USE_LINUX_ALSA)
113
   AC_DEFINE(PX_USE_LINUX_ALSA)
113
   objects="$objects px_linux_alsa.o"
114
   objects="$objects px_linux_alsa.o"

Return to bug 312837