[vlc-commits] commit: Configure: don't stop everything when modplug 0.8.8 is detected, just deactivate the module (Jean-Baptiste Kempf )

[git at videolan.org]

vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Sun Jul 18 18:28:19 2010 +0200| [a9d916728b2717206a0a7fe0702b0bc6dad16747] | committer: Jean-Baptiste Kempf 

Configure: don't stop everything when modplug 0.8.8 is detected, just deactivate the module

This was annoying because if you had a modplug.pc and didn't --enable-mod, it was auto-detected and then failed.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=a9d916728b2717206a0a7fe0702b0bc6dad16747
---

 configure.ac |   13 +++++--------
 1 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/configure.ac b/configure.ac
index d375cf3..ad074db 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2488,15 +2488,12 @@ then
       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], [
-      PKG_CHECK_MODULES(WORKING_LIBMODPLUG, [libmodplug != 0.8.8],, [
-        AC_MSG_ERROR([libmodplug version 0.8.8 will not work. Please upgrade to 0.8.8.1 or later (or downgrade to 0.8.7)!])
-      ])
-      VLC_ADD_PLUGIN([mod])
-      VLC_ADD_CXXFLAGS([mod],[$LIBMODPLUG_CFLAGS])
-      VLC_ADD_LIBS([mod],[$LIBMODPLUG_LIBS])
+    PKG_CHECK_MODULES(LIBMODPLUG, [libmodplug >= 0.8 libmodplug != 0.8.8], [
+          VLC_ADD_PLUGIN([mod])
+          VLC_ADD_CXXFLAGS([mod],[$LIBMODPLUG_CFLAGS])
+          VLC_ADD_LIBS([mod],[$LIBMODPLUG_LIBS])
     ], [
-      AC_MSG_WARN([libmodplug not found!])
+      AC_MSG_WARN([libmodplug not found or a broken version (0.8.8.0) was found!])
     ])
   fi
 fi