Commit 7a6c7c73 authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf

Configure: try to fix modplug detection

If 0.8.8 is detected and --enable-mod is passed, it will error,
if --disable-mod is passed, nothing will happen
else it will autodetect. This is mostly like all other PKG_ENABLE_MODULES_VLC
detections
(cherry picked from commit e043658db0f93148d2a3e499cd90e6fb76ee3fd2)
Signed-off-by: default avatarJean-Baptiste Kempf <jb@videolan.org>
parent c467012a
...@@ -2477,42 +2477,17 @@ dnl ...@@ -2477,42 +2477,17 @@ dnl
dnl modplug demux plugin dnl modplug demux plugin
dnl dnl
AC_ARG_ENABLE(mod, AC_ARG_ENABLE(mod,
[ --enable-mod Mod demux support (default enabled)]) [ --enable-mod Mod demux support (default auto)])
if test "${enable_mod}" != "no" if test "${enable_mod}" != "no" ; then
then PKG_CHECK_MODULES(LIBMODPLUG, [libmodplug >= 0.8.4 libmodplug != 0.8.8], [
AC_ARG_WITH(mod-tree,
[ --with-mod-tree=PATH mod tree for static linking])
if test -n "${with_mod_tree}"
then
AC_MSG_CHECKING(for libmodplug.a in ${with_mod_tree})
real_mod_tree="`cd ${with_mod_tree} 2>/dev/null && pwd`"
if test -z "${real_mod_tree}"
then
dnl The given directory can't be found
AC_MSG_RESULT(no)
AC_MSG_ERROR([cannot cd to ${with_mod_tree}])
fi
if test -f "${real_mod_tree}/src/.libs/libmodplug.a"
then
dnl Use a custom mod
AC_MSG_RESULT(${real_mod_tree}/src/.libs/libmodplug.a)
VLC_ADD_PLUGIN([mod])
VLC_ADD_LIBS([mod],[${real_mod_tree}/src/.libs/libmodplug.a -lstdc++])
VLC_ADD_CXXFLAGS([mod],[-I${real_mod_tree}/include])
else
dnl The given mod wasn't built
AC_MSG_RESULT(no)
AC_MSG_ERROR([cannot find ${real_mod_tree}/src/.libs/libmodplug.a, make sure you compiled mod in ${with_mod_tree}])
fi
else
PKG_CHECK_MODULES(LIBMODPLUG, [libmodplug >= 0.8 libmodplug != 0.8.8], [
VLC_ADD_PLUGIN([mod]) VLC_ADD_PLUGIN([mod])
VLC_ADD_CXXFLAGS([mod],[$LIBMODPLUG_CFLAGS]) VLC_ADD_CXXFLAGS([mod],[$LIBMODPLUG_CFLAGS])
VLC_ADD_LIBS([mod],[$LIBMODPLUG_LIBS]) VLC_ADD_LIBS([mod],[$LIBMODPLUG_LIBS])
], [ ],[
AC_MSG_WARN([libmodplug not found or a broken version (0.8.8.0) was found!]) AS_IF([test x"${enable_mod}" = "xyes"],
[AC_MSG_ERROR(libmodplug not found or a broken version (0.8.8.0) was found!)],
[AC_MSG_WARN(libmodplug not found or a broken version (0.8.8.0) was found!)])
]) ])
fi
fi fi
dnl dnl
......
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