diff options
| author | Matthias P. Braendli <matthias.braendli@mpb.li> | 2018-10-08 16:19:17 +0200 |
|---|---|---|
| committer | Matthias P. Braendli <matthias.braendli@mpb.li> | 2018-10-08 16:19:17 +0200 |
| commit | 7f9c0a810b6028680d14a9b479a61b37ffa10f83 (patch) | |
| tree | 8162469ab9228f7e5269df6d1fcdd9273d3343f3 | |
| parent | a7825f19f14e149f6b14107124ee1521417f2fec (diff) | |
| download | ODR-AudioEnc-7f9c0a810b6028680d14a9b479a61b37ffa10f83.tar.gz ODR-AudioEnc-7f9c0a810b6028680d14a9b479a61b37ffa10f83.tar.bz2 ODR-AudioEnc-7f9c0a810b6028680d14a9b479a61b37ffa10f83.zip | |
Use pkg-config to check for fdk-aac
This solves wrong linking if both /usr/lib/libfdk.so.0 and /usr/local/lib/libfdk.so.1 exist
| -rw-r--r-- | Makefile.am | 5 | ||||
| -rw-r--r-- | configure.ac | 4 |
2 files changed, 6 insertions, 3 deletions
diff --git a/Makefile.am b/Makefile.am index bfe5575..04f7ee6 100644 --- a/Makefile.am +++ b/Makefile.am @@ -77,8 +77,9 @@ odr_audioenc_LDADD = libtoolame-dab.la \ -lzmq \ $(odr_audioenc_LDADD_JACK) \ $(odr_audioenc_LDADD_ALSA) \ - $(LIBVLC_LIBS) -odr_audioenc_CPPFLAGS = $(AM_CPPFLAGS) $(GITVERSION_FLAGS) -ggdb -O2 + $(LIBVLC_LIBS) $(LIBFDKAAC_LIBS) +odr_audioenc_CPPFLAGS = $(AM_CPPFLAGS) $(LIBFDKAAC_CFLAGS) $(GITVERSION_FLAGS) \ + -ggdb -O2 odr_audioenc_SOURCES = src/odr-audioenc.cpp \ src/FileInput.cpp \ src/FileInput.h \ diff --git a/configure.ac b/configure.ac index 0a5cd6f..915f43d 100644 --- a/configure.ac +++ b/configure.ac @@ -80,7 +80,9 @@ AM_CONDITIONAL([HAVE_JACK], [ test "x$enable_jack" = "xyes" ]) AM_CONDITIONAL([HAVE_ALSA], [ test "x$enable_alsa" = "xyes" ]) AC_CHECK_LIB(zmq, zmq_init, , AC_MSG_ERROR(ZeroMQ libzmq is required)) -AC_CHECK_LIB(fdk-aac, aacEncOpen, , AC_MSG_ERROR(The FDK-AAC library is required)) +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]) |