BUILD: static build

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

3rdparty/zita-resampler/Makefile.am

+noinst_LTLIBRARIES = libzita-resampler.la
+
+libzita_resampler_la_SOURCES = cresampler.cc resampler.cc resampler-table.cc vresampler.cc

Makefile.am

-SUBDIRS = src
+SUBDIRS = 3rdparty src
 ACLOCAL_AMFLAGS = -I m4
 
 EXTRA_DIST = README.adoc

configure.ac

@@ -27,18 +27,6 @@ AC_DEFUN([AC_LIBMPG123_REQUIREMENTS],
     AC_SUBST(LIBMPG123_LIBS)
 ])
 
-dnl
-dnl zita resampler
-dnl
-AC_DEFUN([AC_ZITA_REQUIREMENTS],
-[
-    AC_CHECK_LIB(zita-resampler, _Z28zita_resampler_major_versionv,[],
-      [
-        AC_MSG_ERROR([You need to install libzita-resampler to build this package.])
-      ]
-    )
-])
-
 dnl FFTW3
 AC_DEFUN([AC_FFTW_CHECK],
 [
@@ -68,7 +56,6 @@ AC_DEFUN([AC_FFTW_CHECK],
 
 AC_SNDFILE_REQUIREMENTS
 AC_LIBMPG123_REQUIREMENTS
-AC_ZITA_REQUIREMENTS
 AC_FFTW_CHECK
 AM_PATH_LIBGCRYPT
 
@@ -80,5 +67,5 @@ AC_LANG_PUSH([C++])
 AX_CHECK_COMPILE_FLAG([-Wall],                                 [CXXFLAGS="$CXXFLAGS -Wall"])
 AC_LANG_POP([C++])
 
-AC_CONFIG_FILES([Makefile src/Makefile])
+AC_CONFIG_FILES([Makefile src/Makefile 3rdparty/Makefile 3rdparty/zita-resampler/Makefile])
 AC_OUTPUT

src/Makefile.am

 bin_PROGRAMS = audiowmark
 
 COMMON_SRC = utils.hh utils.cc convcode.hh convcode.cc random.hh random.cc mp3.cc mp3.hh wavdata.cc wavdata.hh
-COMMON_LIBS = $(SNDFILE_LIBS) $(FFTW_LIBS) $(LIBGCRYPT_LIBS) $(LIBMPG123_LIBS)
+COMMON_LIBS = ../3rdparty/zita-resampler/libzita-resampler.la $(SNDFILE_LIBS) $(FFTW_LIBS) $(LIBGCRYPT_LIBS) -lFLAC -lvorbis -logg -lgpg-error -lvorbisenc /usr/local/mpg123/lib/libmpg123.a -lpthread
 
 audiowmark_SOURCES = audiowmark.cc fft.cc fft.hh $(COMMON_SRC)
-audiowmark_LDFLAGS = $(COMMON_LIBS)
+audiowmark_LDFLAGS = $(COMMON_LIBS) -all-static
 
 noinst_PROGRAMS = testconvcode testrandom testmp3