aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthew Hoops2013-07-01 21:29:59 -0400
committerMatthew Hoops2013-07-01 21:33:10 -0400
commit4ed1bc3a57e0160eb0b395c2a363151700216d04 (patch)
tree43cfe6e60b5a2ec8a9b081345e68de9981447569
parent1ff09c581b72c9bc6b71e7b6b6aa676f9af6cecf (diff)
downloadscummvm-rg350-4ed1bc3a57e0160eb0b395c2a363151700216d04.tar.gz
scummvm-rg350-4ed1bc3a57e0160eb0b395c2a363151700216d04.tar.bz2
scummvm-rg350-4ed1bc3a57e0160eb0b395c2a363151700216d04.zip
CONFIGURE: Make the libmpeg2 properly require 0.4.0
-rwxr-xr-xconfigure15
1 files changed, 9 insertions, 6 deletions
diff --git a/configure b/configure
index 41d96fbf72..eedd83eb7b 100755
--- a/configure
+++ b/configure
@@ -3474,7 +3474,7 @@ echo "$_zlib"
#
# Check for LibMPEG2
#
-echocheck "libmpeg2 >= 0.3.2"
+echocheck "libmpeg2 >= 0.4.0"
if test "$_mpeg2" = auto ; then
_mpeg2=no
cat > $TMPC << EOF
@@ -3486,16 +3486,19 @@ typedef unsigned $type_1_byte uint8_t;
typedef unsigned $type_2_byte uint16_t;
typedef unsigned $type_4_byte uint32_t;
+extern "C" {
#include <mpeg2dec/mpeg2.h>
+}
+
int main(void) {
+ #if MPEG2_RELEASE < MPEG2_VERSION(0, 4, 0)
+ #error libmpeg2 version too low
+ #endif
+
/* mpeg2_state_t first appears in 0.4.0 */
mpeg2_state_t state;
- #ifdef MPEG2_RELEASE
- if (MPEG2_RELEASE >= MPEG2_VERSION(0, 3, 2))
- return 0;
- #endif
- return 1;
+ return 0;
}
EOF