mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-07-08 07:35:52 +00:00
Code Issues 1 Projects Releases Wiki Activity

configure.ac: Use AC_TRY_COMPILE instead of AC_TRY_RUN for the faad and the xvid configure checks, so they still work...

Browse source 
Original commit message from CVS:
* configure.ac:
Use AC_TRY_COMPILE instead of AC_TRY_RUN for the faad and the
xvid configure checks, so they still work when cross-compiling.
Fixes #452009.
This commit is contained in:
Tim-Philipp Müller 2007-09-09 18:22:53 +00:00
parent 3d856bb379
commit 30e7dc80a2
2 changed files with 20 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
2007-09-09 Tim-Philipp Müller <tim at centricular dot net>
* configure.ac:
Use AC_TRY_COMPILE instead of AC_TRY_RUN for the faad and the
xvid configure checks, so they still work when cross-compiling.
Fixes #452009.
2007-09-07 Sebastian Dröge <slomo@circular-chaos.org> 2007-09-07 Sebastian Dröge <slomo@circular-chaos.org>
* gst/spectrum/gstspectrum.c: (gst_spectrum_start), * gst/spectrum/gstspectrum.c: (gst_spectrum_start),

24
configure.ac
View file

@ -509,24 +509,14 @@ AG_GST_CHECK_FEATURE(FAAD, [AAC decoder plug-in], faad, [
HAVE_FAAD="no",) HAVE_FAAD="no",)
fi fi
if test $HAVE_FAAD = "yes"; then if test $HAVE_FAAD = "yes"; then
AC_MSG_CHECKING([Checking for FAAD >= 2]) AC_MSG_CHECKING([Checking for FAAD >= 2.0])
AC_TRY_RUN([ AC_TRY_COMPILE([#include <faad.h>], [
#include <faad.h>
#if !defined(FAAD2_VERSION) || !defined(FAAD_FMT_DOUBLE) #if !defined(FAAD2_VERSION) || !defined(FAAD_FMT_DOUBLE)
#error Not faad2 #error Not faad2
#else #else
#include <string.h> /* Release candidate of 2.0 is not good enough for us. This field
* was added only in 2.0 final and does not exist in 2.0-RC3 */
int main() faacDecConfiguration conf; conf.dontUpSampleImplicitSBR = 1;
{
char version[9] = FAAD2_VERSION;
// a release candidate of 2.0 is not enought for us
if ( strstr( version, "2.0 RC" ) ) { return 1; }
return 0;
}
#endif #endif
], [ ], [
HAVE_FAAD="yes" HAVE_FAAD="yes"
@ -869,12 +859,10 @@ AG_GST_CHECK_FEATURE(XVID, [xvid plugins], xvid, [
AC_CHECK_LIB(xvidcore, xvid_decore, [ AC_CHECK_LIB(xvidcore, xvid_decore, [
AC_CHECK_LIB(xvidcore, xvid_global, [ AC_CHECK_LIB(xvidcore, xvid_global, [
AC_MSG_CHECKING([for uptodate XviD API version]) AC_MSG_CHECKING([for uptodate XviD API version])
AC_TRY_RUN([ AC_TRY_COMPILE([#include <xvid.h>], [
#include <xvid.h>
#if XVID_API_MAJOR(XVID_API) != 4 #if XVID_API_MAJOR(XVID_API) != 4
#error "Incompatible XviD API version" #error "Incompatible XviD API version"
#endif #endif
int main () { return 0; }
],[ AC_MSG_RESULT(yes) ],[ AC_MSG_RESULT(yes)
XVID_LIBS="-lxvidcore -lm" XVID_LIBS="-lxvidcore -lm"
AC_SUBST(XVID_LIBS) AC_SUBST(XVID_LIBS)