projects / packages / audacity.git / blame
| Commit | Line | Data |
|---|---|---|
| 3b0ff18d JB |
1 | --- audacity-src-1.3.2-beta/acinclude.m4.orig 2006-12-29 17:01:36.794372000 +0100 |
| 2 | +++ audacity-src-1.3.2-beta/acinclude.m4 2006-12-29 17:23:30.465234287 +0100 | |
| 3 | @@ -48,12 +48,22 @@ | |
| 4 | [Define if libtwolame (MP2 export) support should be enabled]) | |
| 5 | fi | |
| 6 | ||
| 7 | - dnl Libtwolame is so new, we should really use our patched local version for now | |
| 8 | - dnl FIXME: Might want to change this at some point of time in the future... | |
| 9 | - LIBTWOLAME_SYSTEM_AVAILABLE="no" | |
| 10 | - | |
| 11 | dnl see if libtwolame is available locally | |
| 12 | ||
| 13 | + PKG_CHECK_MODULES(TWOLAME, twolame, | |
| 14 | + twolame_available_system="yes", | |
| 15 | + twolame_available_system="no") | |
| 16 | + | |
| 17 | + if test "x$twolame_available_system" = "xyes" ; then | |
| 18 | + LIBTWOLAME_SYSTEM_AVAILABLE="yes" | |
| 19 | + LIBTWOLAME_SYSTEM_LIBS="$TWOLAME_LIBS" | |
| 20 | + LIBTWOLAME_SYSTEM_CXXFLAGS="$TWOLAME_CFLAGS" | |
| 21 | + AC_MSG_NOTICE([Twolame libraries are available as system libraries]) | |
| 22 | + else | |
| 23 | + LIBTWOLAME_SYSTEM_AVAILABLE="no" | |
| 24 | + AC_MSG_NOTICE([Twolame libraries are NOT available as system libraries]) | |
| 25 | + fi | |
| 26 | + | |
| 27 | AC_CHECK_FILE(${srcdir}/lib-src/twolame/libtwolame/twolame.h, | |
| 28 | twolame_h_found="yes", | |
| 29 | twolame_h_found="no") | |
| 3b0ff18d JB |
30 | @@ -133,7 +151,22 @@ |
| 31 | ||
| 32 | dnl ... but libresample isn't generally installed as a system library... | |
| 33 | ||
| 34 | - LIBRESAMPLE_SYSTEM_AVAILABLE="no" | |
| 35 | + AC_CHECK_LIB(resample, resample_open, | |
| 36 | + libresample_found="yes", | |
| 37 | + libresample_found="no") | |
| 38 | + | |
| 39 | + AC_CHECK_HEADER(libresample.h, | |
| 40 | + libresample_h_found="yes", | |
| 41 | + libresample_h_found="no") | |
| 42 | + | |
| 43 | + if test "x$libresample_found" = "xyes" && test "x$libresample_h_found" = "xyes" ; then | |
| 44 | + LIBRESAMPLE_SYSTEM_AVAILABLE="yes" | |
| 45 | + LIBRESAMPLE_SYSTEM_LIBS=-lresample | |
| 46 | + AC_MSG_NOTICE([Libresample libraries are available as system libraries]) | |
| 47 | + else | |
| 48 | + LIBRESAMPLE_SYSTEM_AVAILABLE="no" | |
| 49 | + AC_MSG_NOTICE([Libresample libraries are NOT available as system libraries]) | |
| 50 | + fi | |
| 51 | ||
| 52 | dnl see if libresample is available locally | |
| 53 |