Support building without ffmpeg libs.

Signed-off-by: Stefan Westerfeld <stefan@space.twc.de>

src/Makefile.am

@@ -5,14 +5,14 @@ COMMON_SRC = utils.hh utils.cc convcode.hh convcode.cc random.hh random.cc wavda
 	     audiostream.cc audiostream.hh sfinputstream.cc sfinputstream.hh stdoutwavoutputstream.cc stdoutwavoutputstream.hh \
 	     sfoutputstream.cc sfoutputstream.hh rawinputstream.cc rawinputstream.hh rawoutputstream.cc rawoutputstream.hh \
 	     rawconverter.cc rawconverter.hh mp3inputstream.cc mp3inputstream.hh wmcommon.cc wmcommon.hh fft.cc fft.hh \
-	     limiter.cc limiter.hh shortcode.cc shortcode.hh mpegts.cc mpegts.hh hlsoutputstream.cc hlsoutputstream.hh \
-	     audiobuffer.hh
+	     limiter.cc limiter.hh shortcode.cc shortcode.hh mpegts.cc mpegts.hh hls.cc hls.hh audiobuffer.hh \
+	     wmget.cc wmadd.cc
 COMMON_LIBS = $(SNDFILE_LIBS) $(FFTW_LIBS) $(LIBGCRYPT_LIBS) $(LIBMPG123_LIBS) $(FFMPEG_LIBS)
 
-audiowmark_SOURCES = audiowmark.cc wmget.cc wmadd.cc hls.cc $(COMMON_SRC)
+audiowmark_SOURCES = audiowmark.cc $(COMMON_SRC)
 audiowmark_LDFLAGS = $(COMMON_LIBS)
 
-noinst_PROGRAMS = testconvcode testrandom testmp3 teststream testlimiter testshortcode testmpegts testhls
+noinst_PROGRAMS = testconvcode testrandom testmp3 teststream testlimiter testshortcode testmpegts
 
 testconvcode_SOURCES = testconvcode.cc $(COMMON_SRC)
 testconvcode_LDFLAGS = $(COMMON_LIBS)
@@ -35,5 +35,10 @@ testshortcode_LDFLAGS = $(COMMON_LIBS)
 testmpegts_SOURCES = testmpegts.cc $(COMMON_SRC)
 testmpegts_LDFLAGS = $(COMMON_LIBS)
 
-testhls_SOURCES = testhls.cc wmadd.cc hls.cc $(COMMON_SRC)
+if COND_WITH_FFMPEG
+COMMON_SRC += hlsoutputstream.cc hlsoutputstream.hh
+
+noinst_PROGRAMS += testhls
+testhls_SOURCES = testhls.cc $(COMMON_SRC)
 testhls_LDFLAGS = $(COMMON_LIBS)
+endif

src/hls.cc

@@ -26,17 +26,36 @@
 #include "utils.hh"
 #include "mpegts.hh"
 #include "sfinputstream.hh"
-#include "hlsoutputstream.hh"
 #include "sfoutputstream.hh"
 #include "wmcommon.hh"
 #include "wavdata.hh"
 
+#include "config.h"
+
 using std::string;
 using std::vector;
 using std::regex;
 using std::map;
 using std::min;
 
+#if !HAVE_FFMPEG
+int
+hls_prepare (const string& in_dir, const string& out_dir, const string& filename, const string& audio_master)
+{
+  error ("audiowmark: hls support is not available in this build of audiowmark\n");
+  return 1;
+}
+
+int
+hls_add (const string& infile, const string& outfile, const string& bits)
+{
+  error ("audiowmark: hls support is not available in this build of audiowmark\n");
+  return 1;
+}
+#else
+
+#include "hlsoutputstream.hh"
+
 static bool
 file_exists (const string& filename)
 {
@@ -548,5 +567,4 @@ hls_prepare (const string& in_dir, const string& out_dir, const string& filename
   info ("Time:         %d:%02d\n", orig_seconds / 60, orig_seconds % 60);
   return 0;
 }
-
-
+#endif