mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-17 22:06:41 +00:00
Code Issues 1 Projects Releases Wiki Activity

m4: fix 'suspicious cache id' warnings

Browse source 
and update common to pull in a similar fix. Also check in configure
whether the compiler supports do while macros (GLib wants this
defined and it is needed to avoid warnings with some c++ compilers
apparently).
This commit is contained in:
Tim-Philipp Müller 2009-05-22 01:10:12 +01:00
parent 67bcdf2d0b
commit 5776632762
3 changed files with 12 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
common

@ -1 +1 @@
Subproject commit 6ab11d17cb8e4d1ed755da7accac9630d567a097
Subproject commit 888e0a268b60904dd208b672a3c57f1ff7d9786c

3
configure.ac
View file

@ -116,6 +116,9 @@ AM_PROG_CC_C_O
dnl find an assembler
AM_PROG_AS
dnl check if the compiler supports do while(0) macros
AG_GST_CHECK_DOWHILE_MACROS
AC_PATH_PROG(VALGRIND_PATH, valgrind, no)
AM_CONDITIONAL(HAVE_VALGRIND, test ! "x$VALGRIND_PATH" = "xno")

16
m4/gst-fionread.m4
View file

@ -1,7 +1,7 @@
AC_DEFUN([GST_CHECK_FIONREAD], [
AC_MSG_CHECKING(for FIONREAD in sys/ioctl.h)
AC_CACHE_VAL(GST_FIONREAD_IN_SYS_IOCTL, [
AC_CACHE_VAL(_cv_gst_fionread_in_sys_ioctl, [
AC_TRY_COMPILE([
#include <sys/types.h>
#include <sys/ioctl.h>
@ -9,18 +9,18 @@ AC_DEFUN([GST_CHECK_FIONREAD], [
int x = FIONREAD;
if ( x )
return 0;
], GST_FIONREAD_IN_SYS_IOCTL="yes",GST_FIONREAD_IN_SYS_IOCTL="no")
], _cv_gst_fionread_in_sys_ioctl="yes",_cv_gst_fionread_in_sys_ioctl="no")
])
AC_MSG_RESULT($GST_FIONREAD_IN_SYS_IOCTL)
AC_MSG_RESULT($_cv_gst_fionread_in_sys_ioctl)
if test "$GST_FIONREAD_IN_SYS_IOCTL" = "yes"; then
if test "$_cv_gst_fionread_in_sys_ioctl" = "yes"; then
AC_DEFINE([HAVE_FIONREAD_IN_SYS_IOCTL], 1, [FIONREAD ioctl found in sys/ioclt.h])
else
AC_MSG_CHECKING(for FIONREAD in sys/filio.h)
AC_CACHE_VAL(GST_FIONREAD_IN_SYS_FILIO, [
AC_CACHE_VAL(_cv_gst_fionread_in_sys_filio, [
AC_TRY_COMPILE([
#include <sys/types.h>
#include <sys/filio.h>
@ -28,12 +28,12 @@ if ( x )
int x = FIONREAD;
if ( x )
return 0;
], GST_FIONREAD_IN_SYS_FILIO="yes",GST_FIONREAD_IN_SYS_FILIO="no")
], _cv_gst_fionread_in_sys_filio="yes",_cv_gst_fionread_in_sys_filio="no")
])
AC_MSG_RESULT($GST_FIONREAD_IN_SYS_FILIO)
AC_MSG_RESULT($_cv_gst_fionread_in_sys_filio)
if test "$GST_FIONREAD_IN_SYS_FILIO" = "yes"; then
if test "$_cv_gst_fionread_in_sys_filio" = "yes"; then
AC_DEFINE([HAVE_FIONREAD_IN_SYS_FILIO], 1, [FIONREAD ioctl found in sys/filio.h])
fi