mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-27 12:11:13 +00:00
Code Issues 1 Projects Releases Wiki Activity

m4/mpeg2dec.m4: Test for cpuaccel library as well as mpeg2dec library. Add appropriate includes before test compile ...

Browse source 
Original commit message from CVS:
* m4/mpeg2dec.m4: Test for cpuaccel library as well as mpeg2dec
library.  Add appropriate includes before test compile of mpeg2.h
so that compilation succeeds.
This commit is contained in:
Richard Boulton 2002-06-03 15:10:39 +00:00
parent c22bd5e93a
commit 3e14a172cc
2 changed files with 29 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
2002-06-03 Richard Boulton <richard@tartarus.org>
* m4/mpeg2dec.m4: Test for cpuaccel library as well as mpeg2dec
library. Add appropriate includes before test compile of mpeg2.h
so that compilation succeeds.
2002-05-06 Thomas Vander Stichele <thomas@apestaart.org> 2002-05-06 Thomas Vander Stichele <thomas@apestaart.org>
* GConf stuff : from http://www.gnome.org/projects/gconf/ and eog * GConf stuff : from http://www.gnome.org/projects/gconf/ and eog

26
m4/mpeg2dec.m4
View file

@ -1,6 +1,6 @@
dnl MPEG2DEC_CHECK-LIBHEADER(FEATURE-NAME, LIB-NAME, LIB-FUNCTION, HEADER-NAME, dnl MPEG2DEC_CHECK-LIBHEADER(FEATURE-NAME, LIB-NAME, LIB-FUNCTION, HEADER-NAME,
dnl ACTION-IF-FOUND, ACTION-IF-NOT-FOUND, dnl ACTION-IF-FOUND, ACTION-IF-NOT-FOUND,
dnl EXTRA-LDFLAGS, EXTRA-CPPFLAGS) dnl EXTRA-LDFLAGS, EXTRA-CPPFLAGS, INCLUDES)
dnl dnl
dnl FEATURE-NAME - feature name; library and header files are treated dnl FEATURE-NAME - feature name; library and header files are treated
dnl as feature, which we look for dnl as feature, which we look for
@ -11,6 +11,8 @@ dnl ACTION-IF-FOUND - when feature is found then execute given action
dnl ACTION-IF-NOT-FOUND - when feature is not found then execute given action dnl ACTION-IF-NOT-FOUND - when feature is not found then execute given action
dnl EXTRA-LDFLAGS - extra linker flags (-L or -l) dnl EXTRA-LDFLAGS - extra linker flags (-L or -l)
dnl EXTRA-CPPFLAGS - extra C preprocessor flags, i.e. -I/usr/X11R6/include dnl EXTRA-CPPFLAGS - extra C preprocessor flags, i.e. -I/usr/X11R6/include
dnl INCLUDES - Any #include lines which need to be placed before the
dnl header so that it works.
dnl dnl
dnl Based on GST_CHECK_LIBHEADER from gstreamer plugins 0.3.1. dnl Based on GST_CHECK_LIBHEADER from gstreamer plugins 0.3.1.
dnl dnl
@ -22,7 +24,7 @@ AC_DEFUN(MPEG2DEC_CHECK_LIBHEADER,
if test "x$HAVE_[$1]" = "xyes"; then if test "x$HAVE_[$1]" = "xyes"; then
check_libheader_save_CPPFLAGS=$CPPFLAGS check_libheader_save_CPPFLAGS=$CPPFLAGS
CPPFLAGS="[$8] $CPPFLAGS" CPPFLAGS="[$8] $CPPFLAGS"
AC_CHECK_HEADER([$4], :, HAVE_[$1]=no) AC_CHECK_HEADER([$4], :, HAVE_[$1]=no, [$9])
CPPFLAGS=$check_libheader_save_CPPFLAGS CPPFLAGS=$check_libheader_save_CPPFLAGS
fi fi
@ -56,20 +58,36 @@ AC_ARG_WITH(mpeg2dec-prefix,
mpeg2dec_config_prefix="$withval", mpeg2dec_config_prefix="") mpeg2dec_config_prefix="$withval", mpeg2dec_config_prefix="")
if test x$mpeg2dec_config_prefix = x ; then if test x$mpeg2dec_config_prefix = x ; then
MPEG2DEC_CHECK_LIBHEADER(CPUACCEL, cpuaccel, mm_accel, mpeg2dec/mm_accel.h)
MPEG2DEC_CHECK_LIBHEADER(MPEG2DEC, mpeg2, mpeg2_init, mpeg2dec/mpeg2.h, MPEG2DEC_CHECK_LIBHEADER(MPEG2DEC, mpeg2, mpeg2_init, mpeg2dec/mpeg2.h,
MPEG2DEC_LIBS="-lmpeg2 -lcpuaccel",, -lcpuaccel) MPEG2DEC_LIBS="-lmpeg2 -lcpuaccel",, -lcpuaccel, , [
#include <inttypes.h>
#include <mpeg2dec/mm_accel.h>
#include <mpeg2dec/video_out.h>
])
else else
MPEG2DEC_CHECK_LIBHEADER(CPUACCEL, cpuaccel, mm_accel, mpeg2dec/mm_accel.h,
,, -L$mpeg2dec_config_prefix/lib, -I$mpeg2dec_config_prefix/include)
MPEG2DEC_CHECK_LIBHEADER(MPEG2DEC, mpeg2, mpeg2_init, mpeg2dec/mpeg2.h, [ MPEG2DEC_CHECK_LIBHEADER(MPEG2DEC, mpeg2, mpeg2_init, mpeg2dec/mpeg2.h, [
MPEG2DEC_LIBS="-lmpeg2 -lcpuaccel -L$mpeg2dec_config_prefix/lib" MPEG2DEC_LIBS="-lmpeg2 -lcpuaccel -L$mpeg2dec_config_prefix/lib"
MPEG2DEC_CFLAGS="-I$mpeg2dec_config_prefix/include" MPEG2DEC_CFLAGS="-I$mpeg2dec_config_prefix/include"
], , -L$mpeg2dec_config_prefix/lib -lcpuaccel, -I$mpeg2dec_config_prefix/include) ], , -L$mpeg2dec_config_prefix/lib -lcpuaccel,
-I$mpeg2dec_config_prefix/include, [
#include <inttypes.h>
#include <mpeg2dec/mm_accel.h>
#include <mpeg2dec/video_out.h>
])
fi fi
if test "x$HAVE_MPEG2DEC" = "xyes"; then if test "x$HAVE_MPEG2DEC" = "xyes"; then
if test "x$HAVE_CPUACCEL" = "xyes"; then
ifelse([$1], , :, [$1]) ifelse([$1], , :, [$1])
else else
ifelse([$2], , :, [$2]) ifelse([$2], , :, [$2])
fi fi
else
ifelse([$2], , :, [$2])
fi
AC_SUBST(MPEG2DEC_CFLAGS) AC_SUBST(MPEG2DEC_CFLAGS)
AC_SUBST(MPEG2DEC_LIBS) AC_SUBST(MPEG2DEC_LIBS)