Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-10-10 16:43:33 +02:00
Code Issues Releases Wiki Activity

Make sure LV2 isn't used from local source if system was requested

Browse Source
This commit is contained in:
lllucius@gmail.com
2013-10-30 06:44:01 +00:00
parent 5b4a9774c1
commit c311ab5214
2 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
configure vendored
View File

@@ -771,7 +771,7 @@ with_ffmpeg
with_midi with_midi
with_portaudio with_portaudio
with_lame with_lame
with_LV2 with_lv2
enable_audiounits enable_audiounits
enable_ladspa enable_ladspa
enable_quicktime enable_quicktime
@@ -8515,9 +8515,9 @@ $as_echo "$as_me: LAME library is NOT available as system library." >&6;}
# Check whether --with-LV2 was given. # Check whether --with-lv2 was given.
if test "${with_LV2+set}" = set; then : if test "${with_lv2+set}" = set; then :
withval=$with_LV2; LV2_ARGUMENT=$withval withval=$with_lv2; LV2_ARGUMENT=$withval
else else
LV2_ARGUMENT="unspecified" LV2_ARGUMENT="unspecified"
fi fi
@@ -8539,12 +8539,12 @@ if test -n "$LV2_CFLAGS"; then
pkg_cv_LV2_CFLAGS="$LV2_CFLAGS" pkg_cv_LV2_CFLAGS="$LV2_CFLAGS"
elif test -n "$PKG_CONFIG"; then elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \ if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lv2 lilv serd sord sratom\""; } >&5 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lv2 lilv-0 >= 0.16\""; } >&5
($PKG_CONFIG --exists --print-errors "lv2 lilv serd sord sratom") 2>&5 ($PKG_CONFIG --exists --print-errors "lv2 lilv-0 >= 0.16") 2>&5
ac_status=$? ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then test $ac_status = 0; }; then
pkg_cv_LV2_CFLAGS=`$PKG_CONFIG --cflags "lv2 lilv serd sord sratom" 2>/dev/null` pkg_cv_LV2_CFLAGS=`$PKG_CONFIG --cflags "lv2 lilv-0 >= 0.16" 2>/dev/null`
else else
pkg_failed=yes pkg_failed=yes
fi fi
@@ -8555,12 +8555,12 @@ if test -n "$LV2_LIBS"; then
pkg_cv_LV2_LIBS="$LV2_LIBS" pkg_cv_LV2_LIBS="$LV2_LIBS"
elif test -n "$PKG_CONFIG"; then elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \ if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lv2 lilv serd sord sratom\""; } >&5 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lv2 lilv-0 >= 0.16\""; } >&5
($PKG_CONFIG --exists --print-errors "lv2 lilv serd sord sratom") 2>&5 ($PKG_CONFIG --exists --print-errors "lv2 lilv-0 >= 0.16") 2>&5
ac_status=$? ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then test $ac_status = 0; }; then
pkg_cv_LV2_LIBS=`$PKG_CONFIG --libs "lv2 lilv serd sord sratom" 2>/dev/null` pkg_cv_LV2_LIBS=`$PKG_CONFIG --libs "lv2 lilv-0 >= 0.16" 2>/dev/null`
else else
pkg_failed=yes pkg_failed=yes
fi fi
@@ -8578,9 +8578,9 @@ else
_pkg_short_errors_supported=no _pkg_short_errors_supported=no
fi fi
if test $_pkg_short_errors_supported = yes; then if test $_pkg_short_errors_supported = yes; then
LV2_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "lv2 lilv serd sord sratom" 2>&1` LV2_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "lv2 lilv-0 >= 0.16" 2>&1`
else else
LV2_PKG_ERRORS=`$PKG_CONFIG --print-errors "lv2 lilv serd sord sratom" 2>&1` LV2_PKG_ERRORS=`$PKG_CONFIG --print-errors "lv2 lilv-0 >= 0.16" 2>&1`
fi fi
# Put the nasty error message in config.log where it belongs # Put the nasty error message in config.log where it belongs
echo "$LV2_PKG_ERRORS" >&5 echo "$LV2_PKG_ERRORS" >&5

2
m4/audacity_checklib_lv2.m4
View File

@@ -4,7 +4,7 @@ dnl for the benefit of automatic macro update systems
AC_DEFUN([AUDACITY_CHECKLIB_LV2], [ AC_DEFUN([AUDACITY_CHECKLIB_LV2], [
AC_ARG_WITH(LV2, AC_ARG_WITH(lv2,
[AS_HELP_STRING([--with-lv2], [AS_HELP_STRING([--with-lv2],
[use for adding LV2 plug-in support])], [use for adding LV2 plug-in support])],
LV2_ARGUMENT=$withval, LV2_ARGUMENT=$withval,