Commit ed18daae authored by Sam Hocevar's avatar Sam Hocevar

* ./configure.ac.in: libmad and liba52 need to be explicitely disabled,

    otherwise we fail with an error when they are not found.
parent 7156d834
...@@ -1389,7 +1389,7 @@ dnl mad plugin ...@@ -1389,7 +1389,7 @@ dnl mad plugin
dnl dnl
AC_ARG_ENABLE(mad, AC_ARG_ENABLE(mad,
[ --enable-mad libmad module (default disabled)]) [ --enable-mad libmad module (default disabled)])
if test "x${enable_mad}" = "xyes" if test "x${enable_mad}" != "xno"
then then
AC_ARG_WITH(mad, AC_ARG_WITH(mad,
[ --with-mad=PATH path to libmad],[],[]) [ --with-mad=PATH path to libmad],[],[])
...@@ -1696,10 +1696,7 @@ then ...@@ -1696,10 +1696,7 @@ then
LDFLAGS_a52tofloat32="${LDFLAGS_test} -la52 ${LDFLAGS_a52tofloat32}" LDFLAGS_a52tofloat32="${LDFLAGS_test} -la52 ${LDFLAGS_a52tofloat32}"
CPPFLAGS_a52tofloat32="${CPPFLAGS_a52tofloat32} ${CPPFLAGS_test}" CPPFLAGS_a52tofloat32="${CPPFLAGS_a52tofloat32} ${CPPFLAGS_test}"
],[ ],[
if test "x${enable_dvbpsi}" != "x" AC_MSG_ERROR([Could not find a52 on your system: you may get it from http://liba52.sf.net/. Alternatively you can use --disable-a52 to disable the a52 plugin.])
then
AC_MSG_ERROR([Could not find a52 on your system: you may get it from http://liba52.sf.net])
fi
]) ])
]) ])
CPPFLAGS="${CPPFLAGS_save}" CPPFLAGS="${CPPFLAGS_save}"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment