diff options
| -rw-r--r-- | configure.ac | 9 | ||||
| -rw-r--r-- | plugins/dsp_libsrc/Makefile.am | 4 |
2 files changed, 7 insertions, 6 deletions
diff --git a/configure.ac b/configure.ac index 0974b2e5..2804183a 100644 --- a/configure.ac +++ b/configure.ac @@ -15,6 +15,7 @@ AC_PROG_LIBTOOL AC_CONFIG_MACRO_DIR([m4]) AC_C_BIGENDIAN AM_GNU_GETTEXT +PKG_PROG_PKG_CONFIG IT_PROG_INTLTOOL([0.40.0]) GETTEXT_PACKAGE=deadbeef @@ -55,8 +56,6 @@ esac test "x$prefix" = xNONE && prefix=$ac_default_prefix -PKG_CHECK_MODULES(DEPS, samplerate) - if test "x$enable_staticlink" != "xno" ; then HAVE_ZLIB=yes ZLIB_LIBS="../../$LIB/libz.a" @@ -106,9 +105,9 @@ AC_ARG_ENABLE(aac, [AS_HELP_STRING([--disable-aac ], [disable AAC decod AC_ARG_ENABLE(mms, [AS_HELP_STRING([--disable-mms ], [disable MMS streaming vfs plugin (default: enabled)])], [enable_mms=$enableval], [enable_mms=yes]) AC_ARG_ENABLE(shn, [AS_HELP_STRING([--disable-shn ], [disable shorten plugin (default: enabled)])], [enable_shn=$enableval], [enable_shn=yes]) AC_ARG_ENABLE(ao, [AS_HELP_STRING([--disable-ao ], [disable audio overload plugin (default: enabled)])], [enable_ao=$enableval], [enable_ao=yes]) -AC_ARG_ENABLE(staticlink, [AS_HELP_STRING([ --enable-staticlink link everything statically (default: disabled)])], [enable_staticlink=$enableval], [enable_staticlink=no]) -AC_ARG_ENABLE(portable, [AS_HELP_STRING([ --enable-portable make portable build (default: disabled, opts: yes,no,full)])], [enable_portable=$enableval], [enable_portable=no]) -AC_ARG_ENABLE(src, [AS_HELP_STRING([ --enable-src build libsamplerate (SRC) plugin (default: auto)])], [enable_src=$enableval], [enable_src=yes]) +AC_ARG_ENABLE(staticlink, [AS_HELP_STRING([--enable-staticlink], [link everything statically (default: disabled)])], [enable_staticlink=$enableval], [enable_staticlink=no]) +AC_ARG_ENABLE(portable, [AS_HELP_STRING([--enable-portable ], [make portable build (default: disabled, opts: yes,no,full)])], [enable_portable=$enableval], [enable_portable=no]) +AC_ARG_ENABLE(src, [AS_HELP_STRING([--enable-src ], [build libsamplerate (SRC) plugin (default: auto)])], [enable_src=$enableval], [enable_src=yes]) if test "x$enable_staticlink" != "xno" ; then AC_DEFINE_UNQUOTED([STATICLINK], [1], [Define if building static version]) diff --git a/plugins/dsp_libsrc/Makefile.am b/plugins/dsp_libsrc/Makefile.am index 90a5ec19..798be19f 100644 --- a/plugins/dsp_libsrc/Makefile.am +++ b/plugins/dsp_libsrc/Makefile.am @@ -5,7 +5,9 @@ dsp_libsrc_la_SOURCES = src.c src.h dsp_libsrc_la_LDFLAGS = -module -dsp_libsrc_la_LIBADD = $(LDADD) +dsp_libsrc_la_LIBADD = $(LIBADD) $(LIBSAMPLERATE_DEPS_LIBS) + +dsp_libsrc_la_CFLAGS = $(CFLAGS) $(LIBSAMPLERATE_DEPS_CFLAGS) AM_CFLAGS = -std=c99 endif |