diff options
| author | Matthias P. Braendli <matthias.braendli@mpb.li> | 2014-03-07 11:07:25 +0100 |
|---|---|---|
| committer | Matthias P. Braendli <matthias.braendli@mpb.li> | 2014-03-07 11:07:25 +0100 |
| commit | 5cb6703b20d269608eef98fbc107cb0b1136018e (patch) | |
| tree | 7ae8f83319108da0400d9cd38560471693ad8482 | |
| parent | 6f7bcc52a06a255c6cbd8d683ec13a36be4608ab (diff) | |
| parent | b7ac85a604c8756aad0a5cc9be3b61e943e5c220 (diff) | |
| download | fdk-aac-5cb6703b20d269608eef98fbc107cb0b1136018e.tar.gz fdk-aac-5cb6703b20d269608eef98fbc107cb0b1136018e.tar.bz2 fdk-aac-5cb6703b20d269608eef98fbc107cb0b1136018e.zip | |
Merge branch 'master' into alsa
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | configure.ac | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Makefile.am b/Makefile.am index e6ec457..5e2e8b2 100644 --- a/Makefile.am +++ b/Makefile.am @@ -43,7 +43,7 @@ aac_enc_dabplus_zmq_LDADD = libfdk-aac.la -lfec -lzmq aac_enc_dabplus_zmq_SOURCES = aac-enc-dabplus-zmq.c wavreader.c \ contrib/lib_crc.c -mot_encoder_CFLAGS = @MAGICKWAND_CPPFLAGS@ -Icontrib +mot_encoder_CFLAGS = @MAGICKWAND_CFLAGS@ -Icontrib mot_encoder_LDADD = @MAGICKWAND_LDADD@ mot_encoder_SOURCES = mot-encoder.c contrib/lib_crc.c diff --git a/configure.ac b/configure.ac index b4ad1e9..fb2314d 100644 --- a/configure.ac +++ b/configure.ac @@ -28,7 +28,7 @@ AC_CHECK_LIB(zmq, zmq_init, , AC_MSG_ERROR(ZeroMQ libzmq is required)) if pkg-config MagickWand; then MAGICKWAND_CFLAGS=`pkg-config MagickWand --cflags` MAGICKWAND_LDADD=`pkg-config MagickWand --libs` - AC_SUBST(MAGICKWAND_CPPFLAGS) + AC_SUBST(MAGICKWAND_CFLAGS) AC_SUBST(MAGICKWAND_LDADD) else AC_MSG_ERROR(MagickWand not found) |