[vlc-commits] commit: Reject libmodplug 0.8.8 ( Rémi Denis-Courmont )

[git at videolan.org]

vlc/vlc-1.1 | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Thu Jul  8 21:14:05 2010 +0300| [566bdb4ab17b7af95d960e4128019a39def6f4db] | committer: Rémi Denis-Courmont 

Reject libmodplug 0.8.8

(cherry picked from commit f566eb87f26199f73d9f7cec71724872c0fca714)

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

 configure.ac |   15 ++++++++++-----
 1 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/configure.ac b/configure.ac
index 60a9f61..0ddc095 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2488,11 +2488,16 @@ 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,
-        [ VLC_ADD_PLUGIN([mod])
-          VLC_ADD_CXXFLAGS([mod],[$LIBMODPLUG_CFLAGS])
-          VLC_ADD_LIBS([mod],[$LIBMODPLUG_LIBS])
-        ],[AC_MSG_WARN([libmodplug not found!])])
+    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])
+    ], [
+      AC_MSG_WARN([libmodplug not found!])
+    ])
   fi
 fi