[vlc-devel] commit: Use pkg-config to check for libmodplug, and check for version >= 0. 8, which is needed for some functions like ModPlug_NumSamples(), ModPlug_GetMessage(), ModPlug_NumInstruments(), etc... (Ramiro Polla )
git version control
git at videolan.org
Fri Jan 8 19:47:13 CET 2010
vlc | branch: master | Ramiro Polla <ramiro.polla at gmail.com> | Fri Jan 8 15:13:40 2010 -0200| [5824aabb9f5694ea7f35929e84b0630fb390683b] | committer: Jean-Baptiste Kempf
Use pkg-config to check for libmodplug, and check for version >= 0.8, which is needed for some functions like ModPlug_NumSamples(), ModPlug_GetMessage(), ModPlug_NumInstruments(), etc...
Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=5824aabb9f5694ea7f35929e84b0630fb390683b
---
configure.ac | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/configure.ac b/configure.ac
index 9f058ee..40a9029 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2756,10 +2756,11 @@ then
AC_MSG_ERROR([cannot find ${real_mod_tree}/src/.libs/libmodplug.a, make sure you compiled mod in ${with_mod_tree}])
fi
else
- AC_CHECK_HEADERS(libmodplug/modplug.h, [
- VLC_ADD_PLUGIN([mod])
- VLC_ADD_CXXFLAGS([mod],[])
- VLC_ADD_LIBS([mod],[-lmodplug -lstdc++])])
+ PKG_CHECK_MODULES(LIBMODPLUG, libmodplug >= 0.8,
+ [ VLC_ADD_PLUGIN([mod])
+ VLC_ADD_CXXFLAGS([mod],[$LIBMODPLUG_CFLAGS])
+ VLC_ADD_LIBS([mod],[$LIBMODPLUG_LIBS])
+ ],[AC_MSG_WARN([libmodplug not found!])])
fi
fi
More information about the vlc-devel
mailing list