From 808c7a7cd6004b0c039b00e0e9830027f424ab62 Mon Sep 17 00:00:00 2001 From: "Matthias P. Braendli" Date: Tue, 12 May 2020 16:45:33 +0200 Subject: Statically link toolame-dab and fdk-aac-dab ODR-AudioEnc is the only tool using those two libraries, and statically linking makes deployment simpler. --- configure.ac | 34 ++-------------------------------- 1 file changed, 2 insertions(+), 32 deletions(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index 7db7c45..5f94cfb 100644 --- a/configure.ac +++ b/configure.ac @@ -11,8 +11,8 @@ AC_CONFIG_HEADER([config.h]) dnl Checks for programs. AC_PROG_CC AC_PROG_CXX -AC_PROG_LIBTOOL -LT_INIT +AC_PROG_RANLIB +AM_PROG_AR AX_CXX_COMPILE_STDCXX(11,noext,mandatory) @@ -150,36 +150,6 @@ AS_IF([test "x$have_curl" = "xno"], AM_EXTRA_RECURSIVE_TARGETS([fdk-aac]) -#PKG_CHECK_MODULES([LIBFDKAAC], [fdk-aac]) -#AC_SUBST([LIBFDKAAC_CFLAGS]) -#AC_SUBST([LIBFDKAAC_LIBS]) -## We need to have the ODR fdk-aac, the upstream one doesn't support DAB+ -#AC_MSG_CHECKING([for DAB+ support in FDK-AAC]) -#AC_COMPILE_IFELSE( [AC_LANG_PROGRAM([[#include ]], -# [[char dummy[TT_DABPLUS];]])], -# [ -# AC_MSG_RESULT([yes]) -# ], -# [ -# AC_MSG_RESULT([no]) -# AC_MSG_ERROR(["Your FDK-AAC does not support DAB+, make sure you have installed the ODR version!"]) -# ] -# ) - - - -dnl soname version to use -dnl goes by ‘current[:revision[:age]]’ with the soname ending up as -dnl current.age.revision -LIBTOOLAME_DAB_VERSION=0:1:0 -FDK_AAC_VERSION=2:0:0 - -AS_IF([test x$enable_shared = xyes], [LIBS_PRIVATE=$LIBS], [LIBS_PUBLIC=$LIBS]) -AC_SUBST(FDK_AAC_VERSION) -AC_SUBST(LIBTOOLAME_DAB_VERSION) -AC_SUBST(LIBS_PUBLIC) -AC_SUBST(LIBS_PRIVATE) - AM_CONDITIONAL([IS_GIT_REPO], [test -d '.git']) AM_CONDITIONAL([EXAMPLE], [false]) -- cgit v1.2.3