Commit bb347b6a authored by Sam Hocevar's avatar Sam Hocevar

* ./configure.in: added libdvbpsi version check.

parent 5982dfbd
...@@ -6039,16 +6039,16 @@ fi ...@@ -6039,16 +6039,16 @@ fi
test_CFLAGS="-I${with_dvbpsi}/include" test_CFLAGS="-I${with_dvbpsi}/include"
fi fi
CPPFLAGS="$save_CPPFLAGS $test_CFLAGS" CPPFLAGS="$save_CPPFLAGS $test_CFLAGS"
ac_safe=`echo "dvbpsi/dvbpsi.h" | sed 'y%./+-%__p_%'` ac_safe=`echo "dvbpsi/dr.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for dvbpsi/dvbpsi.h""... $ac_c" 1>&6 echo $ac_n "checking for dvbpsi/dr.h""... $ac_c" 1>&6
echo "configure:6045: checking for dvbpsi/dvbpsi.h" >&5 echo "configure:6045: checking for dvbpsi/dr.h" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 6050 "configure" #line 6050 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <dvbpsi/dvbpsi.h> #include <dvbpsi/dr.h>
EOF EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
{ (eval echo configure:6055: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } { (eval echo configure:6055: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
...@@ -6077,7 +6077,7 @@ else ...@@ -6077,7 +6077,7 @@ else
if test "x$enable_dvbpsi" != x if test "x$enable_dvbpsi" != x
then then
{ echo "configure: error: Could not find libdvbpsi on your system: you may get it from www.videolan.org" 1>&2; exit 1; } { echo "configure: error: Could not find libdvbpsi on your system: you may get it from www.videolan.org, you'll need at least version 0.1.1" 1>&2; exit 1; }
fi fi
fi fi
......
...@@ -712,14 +712,14 @@ then ...@@ -712,14 +712,14 @@ then
test_CFLAGS="-I${with_dvbpsi}/include" test_CFLAGS="-I${with_dvbpsi}/include"
fi fi
CPPFLAGS="$save_CPPFLAGS $test_CFLAGS" CPPFLAGS="$save_CPPFLAGS $test_CFLAGS"
AC_CHECK_HEADER([dvbpsi/dvbpsi.h],[ AC_CHECK_HEADER([dvbpsi/dr.h],[
PLUGINS="${PLUGINS} mpeg_ts_dvbpsi" PLUGINS="${PLUGINS} mpeg_ts_dvbpsi"
mpeg_ts_dvbpsi_LDFLAGS="${mpeg_ts_dvbpsi_LDFLAGS} ${test_LDFLAGS} -ldvbpsi" mpeg_ts_dvbpsi_LDFLAGS="${mpeg_ts_dvbpsi_LDFLAGS} ${test_LDFLAGS} -ldvbpsi"
mpeg_ts_dvbpsi_CFLAGS="${mpeg_ts_dvbpsi_CFLAGS} ${test_CFLAGS}" mpeg_ts_dvbpsi_CFLAGS="${mpeg_ts_dvbpsi_CFLAGS} ${test_CFLAGS}"
],[ ],[
if test "x$enable_dvbpsi" != x if test "x$enable_dvbpsi" != x
then then
AC_MSG_ERROR([Could not find libdvbpsi on your system: you may get it from www.videolan.org]) AC_MSG_ERROR([Could not find libdvbpsi on your system: you may get it from www.videolan.org, you'll need at least version 0.1.1])
fi fi
]) ])
CPPFLAGS="$save_CPPFLAGS" CPPFLAGS="$save_CPPFLAGS"
......
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