aboutsummaryrefslogtreecommitdiffstats
path: root/m4
diff options
context:
space:
mode:
Diffstat (limited to 'm4')
-rw-r--r--m4/faad.m418
-rw-r--r--m4/ucred.m42
2 files changed, 13 insertions, 7 deletions
diff --git a/m4/faad.m4 b/m4/faad.m4
index 007787557..1048c566c 100644
--- a/m4/faad.m4
+++ b/m4/faad.m4
@@ -39,8 +39,8 @@ if test x$enable_aac = xyes; then
oldcflags=$CFLAGS
oldlibs=$LIBS
oldcppflags=$CPPFLAGS
- CFLAGS="$CFLAGS $MPD_CFLAGS $FAAD_CFLAGS -I."
- LIBS="$LIBS $MPD_LIBS $FAAD_LIBS"
+ CFLAGS="$CFLAGS $FAAD_CFLAGS -I."
+ LIBS="$LIBS $FAAD_LIBS"
CPPFLAGS=$CFLAGS
AC_CHECK_HEADER(faad.h,,enable_aac=no)
if test x$enable_aac = xyes; then
@@ -50,10 +50,10 @@ if test x$enable_aac = xyes; then
AC_CHECK_DECL(faacDecInit2,,enable_aac=no,[#include <faad.h>])
fi
if test x$enable_aac = xyes; then
- AC_CHECK_LIB(faad,faacDecInit2,[MPD_LIBS="$MPD_LIBS $FAAD_LIBS";MPD_CFLAGS="$MPD_CFLAGS $FAAD_CFLAGS"],enable_aac=no)
+ AC_CHECK_LIB(faad,faacDecInit2,,enable_aac=no)
if test x$enable_aac = xno; then
enable_aac=yes
- AC_CHECK_LIB(faad,NeAACDecInit2,[MPD_LIBS="$MPD_LIBS $FAAD_LIBS";MPD_CFLAGS="$MPD_CFLAGS $FAAD_CFLAGS"],enable_aac=no)
+ AC_CHECK_LIB(faad,NeAACDecInit2,,enable_aac=no)
fi
fi
if test x$enable_aac = xyes; then
@@ -131,8 +131,8 @@ if test x$enable_aac = xyes; then
oldcflags=$CFLAGS
oldlibs=$LIBS
oldcppflags=$CPPFLAGS
- CFLAGS="$CFLAGS $MPD_CFLAGS $FAAD_CFLAGS -Werror"
- LIBS="$LIBS $MPD_LIBS $FAAD_LIBS"
+ CFLAGS="$CFLAGS $FAAD_CFLAGS -Werror"
+ LIBS="$LIBS $FAAD_LIBS"
CPPFLAGS=$CFLAGS
AC_MSG_CHECKING(for broken libfaad headers)
@@ -188,5 +188,11 @@ if test x$enable_aac = xyes; then
CPPFLAGS=$oldcppflags
else
enable_mp4=no
+ FAAD_CFLAGS=""
+ FAAD_LIBS=""
fi
+
+AC_SUBST(FAAD_CFLAGS)
+AC_SUBST(FAAD_LIBS)
+
])
diff --git a/m4/ucred.m4 b/m4/ucred.m4
index 3a8245245..cdc6ea3b3 100644
--- a/m4/ucred.m4
+++ b/m4/ucred.m4
@@ -20,7 +20,7 @@ AC_DEFUN([STRUCT_UCRED],[
mpd_cv_have_struct_ucred=no)
if test x$mpd_cv_have_struct_ucred = xyes; then
# :(
- MPD_CFLAGS="$MPD_CFLAGS -D_GNU_SOURCE"
+ CFLAGS="$CFLAGS -D_GNU_SOURCE"
fi
fi
])