]>
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") | |
30 | @@ -88,11 +98,19 @@ | |
31 | ||
32 | dnl see if soundtouch is installed on the system | |
33 | ||
34 | - dnl ... TODO: I don't know if stock, unmodified soundtouch is | |
35 | - dnl suitable for audacity, so I don't allow it | |
36 | - | |
37 | - LIBSOUNDTOUCH_SYSTEM_AVAILABLE="no" | |
38 | - | |
39 | + PKG_CHECK_MODULES(SOUNDTOUCH, soundtouch-1.0, | |
40 | + soundtouch_available_system="yes", | |
41 | + soundtouch_available_system="no") | |
42 | + | |
43 | + if test "x$soundtouch_available_system" = "xyes" ; then | |
44 | + LIBSOUNDTOUCH_SYSTEM_AVAILABLE="yes" | |
45 | + LIBSOUNDTOUCH_SYSTEM_LIBS="$SOUNDTOUCH_LIBS" | |
46 | + LIBSOUNDTOUCH_SYSTEM_CXXFLAGS="$SOUNDTOUCH_CFLAGS" | |
47 | + AC_MSG_NOTICE([SoundTouch libraries are available as system libraries]) | |
48 | + else | |
49 | + LIBID3TAG_SYSTEM_AVAILABLE="no" | |
50 | + AC_MSG_NOTICE([SoundTouch libraries are NOT available as system libraries]) | |
51 | + fi | |
52 | dnl see if libresample is available locally | |
53 | ||
54 | AC_CHECK_FILE(${srcdir}/lib-src/soundtouch/include/SoundTouch.h, | |
55 | @@ -133,7 +151,22 @@ | |
56 | ||
57 | dnl ... but libresample isn't generally installed as a system library... | |
58 | ||
59 | - LIBRESAMPLE_SYSTEM_AVAILABLE="no" | |
60 | + AC_CHECK_LIB(resample, resample_open, | |
61 | + libresample_found="yes", | |
62 | + libresample_found="no") | |
63 | + | |
64 | + AC_CHECK_HEADER(libresample.h, | |
65 | + libresample_h_found="yes", | |
66 | + libresample_h_found="no") | |
67 | + | |
68 | + if test "x$libresample_found" = "xyes" && test "x$libresample_h_found" = "xyes" ; then | |
69 | + LIBRESAMPLE_SYSTEM_AVAILABLE="yes" | |
70 | + LIBRESAMPLE_SYSTEM_LIBS=-lresample | |
71 | + AC_MSG_NOTICE([Libresample libraries are available as system libraries]) | |
72 | + else | |
73 | + LIBRESAMPLE_SYSTEM_AVAILABLE="no" | |
74 | + AC_MSG_NOTICE([Libresample libraries are NOT available as system libraries]) | |
75 | + fi | |
76 | ||
77 | dnl see if libresample is available locally | |
78 |