Mercurial > hg > octave-nkf
changeset 19661:8fe2780c1491
update configure.ac to build and configure sndfile audio file utilities
* configure.ac: use pkg-config to create build variables for sndfile
* module-files: build sndfile audio utilities with sndfile build options
author | Vytautas Jančauskas <unaudio@gmail.com> |
---|---|
date | Tue, 10 Sep 2013 15:45:48 +0300 |
parents | 157eeaa53277 |
children | febd874d363d |
files | configure.ac libinterp/dldfcn/module-files |
diffstat | 2 files changed, 19 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/configure.ac +++ b/configure.ac @@ -934,6 +934,19 @@ LIBS="$save_LIBS" CPPFLAGS="$save_CPPFLAGS" +### Check for sndfile + +SNDFILE_CPPFLAGS=`$PKG_CONFIG --cflags-only-I sndfile` +SNDFILE_LDFLAGS=`$PKG_CONFIG --libs-only-L sndfile` +SNDFILE_LIBS=`$PKG_CONFIG --libs-only-l sndfile` + +CPPFLAGS="$MAGICK_CPPFLAGS $CPPFLAGS" +LIBS="$MAGICK_LDFLAGS $MAGICK_LIBS $LIBS" + +AC_SUBST(MAGICK_CPPFLAGS) +AC_SUBST(MAGICK_LDFLAGS) +AC_SUBST(MAGICK_LIBS) + ### Check for either of Graphics/ImageMagick++ libraries AC_ARG_WITH([magick], @@ -2866,6 +2879,9 @@ Qt libraries: $QT_LIBS READLINE libraries: $READLINE_LIBS REGEX libraries: $REGEX_LIBS + Sndfile CPPFLAGS: $SNDFILE_CPPFLAGS + Sndfile LDFLAGS: $SNDFILE_LDFLAGS + Sndfile libraries: $SNDFILE_LIBS TERM libraries: $TERM_LIBS UMFPACK CPPFLAGS: $UMFPACK_CPPFLAGS UMFPACK LDFLAGS: $UMFPACK_LDFLAGS
--- a/libinterp/dldfcn/module-files +++ b/libinterp/dldfcn/module-files @@ -20,6 +20,6 @@ symrcm.cc|$(SPARSE_XCPPFLAGS)|$(SPARSE_XLDFLAGS)|$(SPARSE_XLIBS) tsearch.cc urlwrite.cc|$(CURL_CPPFLAGS)|$(CURL_LDFLAGS)|$(CURL_LIBS) -audioread.cc|-lsndfile -audiowrite.cc|-lsndfile -audioinfo.cc|-lsndfile \ No newline at end of file +audioread.cc|$(SNDFILE_CPPFLAGS)|$(SNDFILE_LDFLAGS)|$(SNDFILE_LIBS) +audiowrite.cc|$(SNDFILE_CPPFLAGS)|$(SNDFILE_LDFLAGS)|$(SNDFILE_LIBS) +audioinfo.cc|$(SNDFILE_CPPFLAGS)|$(SNDFILE_LDFLAGS)|$(SNDFILE_LIBS) \ No newline at end of file