diff options
| -rw-r--r-- | configure.ac | 18 | ||||
| -rw-r--r-- | plugins/flac/Makefile.am | 9 | ||||
| -rw-r--r-- | plugins/liboggedit/Makefile.am | 4 |
3 files changed, 27 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac index 2e388de4..40f5703c 100644 --- a/configure.ac +++ b/configure.ac @@ -368,6 +368,23 @@ AS_IF([test "${enable_vorbis}" != "no"], [ ]) ]) +dnl libogg for oggedit +AS_IF([test "${enable_staticlink}" != "no"], [ + HAVE_OGG=yes + OGG_LIBS="../../$LIB/lib/libogg.a ../../$LIB/lib/libvorbis.a ../../$LIB/lib/libvorbisenc.a ../../$LIB/lib/libvorbisfile.a" + OGG_CFLAGS="-I../../$LIB/include" + AC_SUBST(OGG_LIBS) + AC_SUBST(OGG_CFLAGS) +], [ + AC_CHECK_LIB([ogg], [main], [HAVE_OGG=yes]) + AS_IF([test "$HAVE_OGG" = "yes"], [ + HAVE_VORBISPLUGIN=yes + OGG_LIBS="-logg" + AC_SUBST(OGG_LIBS) + ]) +]) + + dnl flac plugin AS_IF([test "${enable_flac}" != "no"], [ AS_IF([test "${enable_staticlink}" != "no"], [ @@ -734,6 +751,7 @@ PLUGINS_DIRS="plugins/liboggedit plugins/libmp4ff plugins/libparser plugins/last AM_CONDITIONAL(APE_USE_YASM, test "x$APE_USE_YASM" = "xyes") AM_CONDITIONAL(HAVE_VORBIS, test "x$HAVE_VORBISPLUGIN" = "xyes") +AM_CONDITIONAL(HAVE_OGG, test "x$HAVE_OGG" = "xyes") AM_CONDITIONAL(HAVE_FLAC, test "x$HAVE_FLACPLUGIN" = "xyes") AM_CONDITIONAL(HAVE_WAVPACK, test "x$HAVE_WAVPACKPLUGIN" = "xyes") AM_CONDITIONAL(HAVE_SNDFILE, test "x$HAVE_SNDFILEPLUGIN" = "xyes") diff --git a/plugins/flac/Makefile.am b/plugins/flac/Makefile.am index c87ca53d..40023a16 100644 --- a/plugins/flac/Makefile.am +++ b/plugins/flac/Makefile.am @@ -4,6 +4,11 @@ pkglib_LTLIBRARIES = flac.la flac_la_SOURCES = flac.c flac_la_LDFLAGS = -module -avoid-version -export-symbols-regex flac_load -flac_la_LIBADD = $(LDADD) $(FLAC_LIBS) ../liboggedit/liboggedit.a -AM_CFLAGS = $(CFLAGS) $(FLAC_CFLAGS) -std=c99 +if HAVE_OGG +oggedit_def = -DUSE_OGGEDIT=1 +oggedit_lib = ../liboggedit/liboggedit.a +endif + +flac_la_LIBADD = $(LDADD) $(FLAC_LIBS) $(oggedit_lib) +AM_CFLAGS = $(CFLAGS) $(FLAC_CFLAGS) $(oggedit_def) -std=c99 endif diff --git a/plugins/liboggedit/Makefile.am b/plugins/liboggedit/Makefile.am index 2134718f..651f9f44 100644 --- a/plugins/liboggedit/Makefile.am +++ b/plugins/liboggedit/Makefile.am @@ -1,6 +1,6 @@ -if HAVE_VORBIS +if HAVE_OGG noinst_LIBRARIES = liboggedit.a liboggedit_a_SOURCES = oggedit_internal.h oggedit.h \ oggedit_internal.c oggedit_utils.c oggedit_art.c oggedit_opus.c oggedit_vorbis.c oggedit_flac.c -AM_CFLAGS = $(VORBIS_CFLAGS) -fPIC -std=c99 +AM_CFLAGS = $(OGG_CFLAGS) -fPIC -std=c99 endif |