diff options
| author |  Alexey Yakovenko <waker@users.sourceforge.net> | 2014-02-09 19:58:49 +0100 |
|---|---|---|
| committer | Alexey Yakovenko <waker@users.sourceforge.net> | 2014-02-09 19:58:49 +0100 |
| commit | 60b4548980c6f8d3b51d72a986e37cabf4faa7ba (patch) | |
| tree | b9089aebd6b33fa889fc2d5070d25fb873b5ea4a | |
| parent | 4f667ab091cea7059a8344b03ab5f06775ecc981 (diff) | |
fixed more include paths issues
| -rw-r--r-- | configure.ac | 8 | ||||
| -rw-r--r-- | plugins/flac/Makefile.am | 2 | ||||
| -rw-r--r-- | plugins/sndfile/Makefile.am | 2 | ||||
| -rw-r--r-- | plugins/wavpack/Makefile.am | 2 |
4 files changed, 10 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac index 71e76020..3832c70d 100644 --- a/configure.ac +++ b/configure.ac @@ -342,7 +342,9 @@ dnl flac plugin AS_IF([test "${enable_flac}" != "no"], [ AS_IF([test "${enable_staticlink}" != "no"], [ HAVE_FLACPLUGIN=yes + FLAC_CFLAGS="-I../../$LIB/include" FLAC_LIBS="../../$LIB/lib/libFLAC.a ../../$LIB/lib/libogg.a" + AC_SUBST(FLAC_CFLAGS) AC_SUBST(FLAC_LIBS) ], [ AC_CHECK_LIB([FLAC], [main], [HAVE_FLAC=yes]) @@ -358,7 +360,9 @@ dnl wavpack plugin AS_IF([test "${enable_wavpack}" != "no"], [ AS_IF([test "${enable_staticlink}" != "no"], [ HAVE_WAVPACKPLUGIN=yes + WAVPACK_CFLAGS="-I../../$LIB/include" WAVPACK_LIBS="../../$LIB/lib/libwavpack.a" + AC_SUBST(WAVPACK_CFLAGS) AC_SUBST(WAVPACK_LIBS) ], [ AC_CHECK_LIB([wavpack], [main], [HAVE_WAVPACK=yes]) @@ -374,7 +378,9 @@ dnl libsndfile plugin AS_IF([test "${enable_sndfile}" != "no"], [ AS_IF([test "${enable_staticlink}" != "no"], [ HAVE_SNDFILEPLUGIN=yes - SNDFILE_LIBS="../../$LIB/lib/libsndfile.a" + SNDFILE_CFLAGS="-I../../$LIB/include" + SNDFILE_LIBS="../../$LIB/lib/libsndfile" + AC_SUBST(SNDFILE_CFLAGS) AC_SUBST(SNDFILE_LIBS) ], [ AC_CHECK_LIB([sndfile], [main], [HAVE_SNDFILE=yes]) diff --git a/plugins/flac/Makefile.am b/plugins/flac/Makefile.am index 51efb662..49eecb7f 100644 --- a/plugins/flac/Makefile.am +++ b/plugins/flac/Makefile.am @@ -5,5 +5,5 @@ flac_la_SOURCES = flac.c flac_la_LDFLAGS = -module -avoid-version flac_la_LIBADD = $(LDADD) $(FLAC_LIBS) -AM_CFLAGS = $(CFLAGS) -std=c99 +AM_CFLAGS = $(CFLAGS) $(FLAC_CFLAGS) -std=c99 endif diff --git a/plugins/sndfile/Makefile.am b/plugins/sndfile/Makefile.am index d0116c64..10aca7ef 100644 --- a/plugins/sndfile/Makefile.am +++ b/plugins/sndfile/Makefile.am @@ -5,5 +5,5 @@ sndfile_la_SOURCES = sndfile.c sndfile_la_LDFLAGS = -module -avoid-version sndfile_la_LIBADD = $(LDADD) $(SNDFILE_LIBS) -AM_CFLAGS = $(CFLAGS) -std=c99 +AM_CFLAGS = $(CFLAGS) $(WAVPACK_CFLAGS) -std=c99 endif diff --git a/plugins/wavpack/Makefile.am b/plugins/wavpack/Makefile.am index 06100ea5..17651ee5 100644 --- a/plugins/wavpack/Makefile.am +++ b/plugins/wavpack/Makefile.am @@ -5,5 +5,5 @@ wavpack_la_SOURCES = wavpack.c wavpack_la_LDFLAGS = -module -avoid-version wavpack_la_LIBADD = $(LDADD) $(WAVPACK_LIBS) -AM_CFLAGS = $(CFLAGS) -std=c99 +AM_CFLAGS = $(CFLAGS) $(WAVPACK_CFLAGS) -std=c99 endif |