Commit 5d33b792 authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf

Configure: should repair --with-libtwolame-tree detection.

parent b248dab2
...@@ -3053,17 +3053,17 @@ then ...@@ -3053,17 +3053,17 @@ then
AC_MSG_RESULT(no) AC_MSG_RESULT(no)
AC_MSG_ERROR([cannot cd to ${with_twolame_tree}]) AC_MSG_ERROR([cannot cd to ${with_twolame_tree}])
fi fi
if test -f "${real_twolame_tree}/src/libtwolame/.libs/libtwolame.a" if test -f "${real_twolame_tree}/libtwolame/.libs/libtwolame.a"
then then
dnl Use a custom twolame dnl Use a custom twolame
AC_MSG_RESULT(${real_twolame_tree}/src/libtwolame/.libs/libtwolame.a) AC_MSG_RESULT(${real_twolame_tree}/libtwolame/.libs/libtwolame.a)
VLC_ADD_BUILTINS([twolame]) VLC_ADD_BUILTINS([twolame])
VLC_ADD_LDFLAGS([twolame],[${real_twolame_tree}/src/libtwolame/.libs/libtwolame.a]) VLC_ADD_LDFLAGS([twolame],[${real_twolame_tree}/libtwolame/.libs/libtwolame.a])
VLC_ADD_CPPFLAGS([twolame],[-I${real_twolame_tree}/src/libtwolame -DLIBTWOLAME_STATIC]) VLC_ADD_CPPFLAGS([twolame],[-I${real_twolame_tree}/libtwolame -DLIBTWOLAME_STATIC])
else else
dnl The given libtwolame wasn't built dnl The given libtwolame wasn't built
AC_MSG_RESULT(no) AC_MSG_RESULT(no)
AC_MSG_ERROR([cannot find ${real_twolame_tree}/src/libtwolame/.libs/libtwolame.a, make sure you compiled libtwolame in ${with_twolame_tree}]) AC_MSG_ERROR([cannot find ${real_twolame_tree}/libtwolame/.libs/libtwolame.a, make sure you compiled libtwolame in ${with_twolame_tree}])
fi fi
else else
CPPFLAGS="${CPPFLAGS_save} ${CPPFLAGS_twolame} -DLIBTWOLAME_STATIC" CPPFLAGS="${CPPFLAGS_save} ${CPPFLAGS_twolame} -DLIBTWOLAME_STATIC"
......
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