summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthias P. Braendli <matthias.braendli@mpb.li>2014-03-07 11:07:20 +0100
committerMatthias P. Braendli <matthias.braendli@mpb.li>2014-03-07 11:07:20 +0100
commitb7ac85a604c8756aad0a5cc9be3b61e943e5c220 (patch)
treed51ef37128ee6fdbd45ead6a1a77dafc373132d4
parent58d7fcd0db89cdc62e9362aa6d63c88843f2837d (diff)
downloadfdk-aac-b7ac85a604c8756aad0a5cc9be3b61e943e5c220.tar.gz
fdk-aac-b7ac85a604c8756aad0a5cc9be3b61e943e5c220.tar.bz2
fdk-aac-b7ac85a604c8756aad0a5cc9be3b61e943e5c220.zip
fix magickwand compile flags
-rw-r--r--Makefile.am2
-rw-r--r--configure.ac2
2 files changed, 2 insertions, 2 deletions
diff --git a/Makefile.am b/Makefile.am
index ff9e1b9..885cdcd 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 5283420..9306aaf 100644
--- a/configure.ac
+++ b/configure.ac
@@ -20,7 +20,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)