diff options
| author | Jesse Chappell <jesse@essej.net> | 2006-12-16 05:14:34 +0000 |
|---|---|---|
| committer | Jesse Chappell <jesse@essej.net> | 2006-12-16 05:14:34 +0000 |
| commit | 732a482f439f6df818b90634a5abb1b5d64ff05e (patch) | |
| tree | 4b0a7c70665ff01b7ca88c79c7e0ab23f28796c8 /libs | |
| parent | df9bb392efc120e30321f9d03bc0241ad32c4ce4 (diff) | |
added logarithmic option for waveform scaling. added save/restore of rectified and logscale waveform options in session. modified sconstruct to look for certain libs in some common locations, this should be usable controllable but isnt yet. deals better with the libsndfile build when flac is installed.
git-svn-id: svn://localhost/ardour2/trunk@1219 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs')
| -rw-r--r-- | libs/libsndfile/SConscript | 3 | ||||
| -rwxr-xr-x | libs/libsndfile/configure | 8 |
2 files changed, 10 insertions, 1 deletions
diff --git a/libs/libsndfile/SConscript b/libs/libsndfile/SConscript index f8e9fc5ecb..5817397e95 100644 --- a/libs/libsndfile/SConscript +++ b/libs/libsndfile/SConscript @@ -6,8 +6,9 @@ import glob sndfile_files = glob.glob('src/*.c') + glob.glob('src/GSM610/*.c') + glob.glob('src/G72x/*.c') -Import('env install_prefix') +Import('env install_prefix libraries') sndfile = env.Copy() +sndfile.Merge([libraries['flac'] ]) domain = 'libsndfile' diff --git a/libs/libsndfile/configure b/libs/libsndfile/configure index 8aaca4e783..bfa95c3aac 100755 --- a/libs/libsndfile/configure +++ b/libs/libsndfile/configure @@ -12235,9 +12235,17 @@ rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>conftest.er1 ac_status=$? + + cat conftest.$ac_ext > blah1.c + + echo $CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext > blah1 + grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 + + cat conftest.err > blah2 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -z "$ac_c_werror_flag" |