fdkaac: actually build and dist

diff --git a/configure.ac b/configure.ac
index e807625..01c22be 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -3443,6 +3443,7 @@ AM_CONDITIONAL(USE_RESINDVD, false)
 AM_CONDITIONAL(USE_FAAC, false)
 AM_CONDITIONAL(USE_FAAD, false)
 AM_CONDITIONAL(USE_FBDEV, false)
+AM_CONDITIONAL(USE_FDK_AAC, false)
 AM_CONDITIONAL(USE_FLITE, false)
 AM_CONDITIONAL(USE_FLUIDSYNTH, false)
 AM_CONDITIONAL(USE_GL, false)

diff --git a/ext/Makefile.am b/ext/Makefile.am
index d0bf515..bae25c2 100644 (file)
--- a/ext/Makefile.am
+++ b/ext/Makefile.am
@@ -112,6 +112,12 @@ else
  FAAD_DIR=
 endif
 
+if USE_FDK_AAC
+ FDK_AAC_DIR=fdkaac
+else
+ FDK_AAC_DIR=
+endif
+
 if USE_VOAACENC
  VOAACENC_DIR=voaacenc
 else
@@ -440,6 +446,7 @@ SUBDIRS=\
        $(QT_DIR) \
        $(FAAC_DIR) \
        $(FAAD_DIR) \
+       $(FDK_AAC_DIR) \
        $(FLITE_DIR) \
        $(FLUIDSYNTH_DIR) \
        $(GSM_DIR) \
@@ -503,6 +510,7 @@ DIST_SUBDIRS = \
        wayland \
        faac \
        faad \
+       fdkaac \
        flite \
        fluidsynth \
        gsm \