m4: fix 'suspicious cache value id' warnings in gst-fionread.m4

And update common to pull in a related fix from there.
This commit is contained in:
Tim-Philipp Müller 2009-05-22 01:04:02 +01:00
parent c5ab83a1cb
commit 27f1e03661
2 changed files with 9 additions and 9 deletions

2
common

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

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