Permalink
Browse files

Fix autoconf warnings on newer versions:

warning: AC_LANG_CONFTEST: no AC_LANG_SOURCE call detected in body

reference: http://www.flameeyes.eu/autotools-mythbuster/forwardporting/autoconf.html
  • Loading branch information...
manio authored and Jim Carroll committed May 9, 2011
1 parent d1265ed commit 2b32c079efe85f0247d7b9318d21e93c21f029d8
Showing with 9 additions and 9 deletions.
  1. +5 −5 configure.in
  2. +4 −4 lib/cpluff/configure.ac
View
@@ -462,7 +462,7 @@ elif test "$use_arch" = "arm"; then
SAVE_CFLAGS="$CFLAGS"
CFLAGS="-mfpu=vfpv3-d16"
AC_COMPILE_IFELSE(
- [int foo;],
+ [AC_LANG_SOURCE([int foo;])],
[ CFLAGS="$SAVE_CFLAGS -Wno-psabi -Wa,-march=armv7a -mtune=cortex-a9 -mfpu=vfpv3-d16 -mthumb-interwork"
CXXFLAGS="$CXXFLAGS -Wno-psabi -Wa,-march=armv7a -mtune=cortex-a9 -mfpu=vfpv3-d16 -mthumb-interwork"
FFMPEG_EXTRACFLAGS+=" -mtune=cortex-a9 -mfpu=vfpv3-d16"
@@ -866,8 +866,8 @@ if test "$use_external_ffmpeg" = "yes"; then
if test "x$use_vdpau" != "xno"; then
AC_LANG_PUSH([C++])
AC_LINK_IFELSE(
- [ #include <libavutil/pixfmt.h>
- int main() { PixelFormat format = PIX_FMT_VDPAU_MPEG4; }],
+ [AC_LANG_SOURCE([ #include <libavutil/pixfmt.h>
+ int main() { PixelFormat format = PIX_FMT_VDPAU_MPEG4; }])],
[AC_DEFINE([PIX_FMT_VDPAU_MPEG4_IN_AVUTIL], [1],
[Whether AVUtil defines PIX_FMT_VDPAU_MPEG4.])],)
AC_LANG_POP([C++])
@@ -973,10 +973,10 @@ if test "x$use_crystalhd" != "xno"; then
CFLAGS="-llibcrystalhd"
# check for new crystalhd lib
AC_COMPILE_IFELSE(
- [ #define __LINUX_USER__
+ [AC_LANG_SOURCE([ #define __LINUX_USER__
#include <libcrystalhd/bc_dts_types.h>
#include <libcrystalhd/bc_dts_defs.h>
- PBC_INFO_CRYSTAL bCrystalInfo;],
+ PBC_INFO_CRYSTAL bCrystalInfo;])],
[ AC_DEFINE([HAVE_LIBCRYSTALHD], [2], [Define to 2 if you have the 'New Broadcom Crystal HD' library.]) ],
[ AC_DEFINE([HAVE_LIBCRYSTALHD], [1], [Define to 1 if you have the 'Old Broadcom Crystal HD' library.]) ])
CFLAGS="$SAVE_CFLAGS"
View
@@ -106,15 +106,15 @@ if test "$enable_threads" != no; then
( test -z "$enable_threads" || test "$enable_threads" = Posix ); then
AC_MSG_CHECKING([for Posix threads])
AC_LINK_IFELSE(
-[#include <pthread.h>
+[AC_LANG_SOURCE([#include <pthread.h>
int main(int argc, char *argv[]) {
pthread_mutex_t mutex;
pthread_mutex_init(&mutex, NULL);
return 0;
}
-], [AC_MSG_RESULT([yes])
+])], [AC_MSG_RESULT([yes])
cp_threads=Posix], AC_MSG_RESULT([no]))
fi
@@ -123,13 +123,13 @@ cp_threads=Posix], AC_MSG_RESULT([no]))
( test -z "$enable_threads" || test "$enable_threads" = Windows ); then
AC_MSG_CHECKING([for Windows threads])
AC_LINK_IFELSE(
-[#include <windows.h>
+[AC_LANG_SOURCE([#include <windows.h>
int main(int argc, char *argv[]) {
CreateMutex(NULL, FALSE, NULL);
return 0;
}
-], [AC_MSG_RESULT([yes])
+])], [AC_MSG_RESULT([yes])
cp_threads=Windows], AC_MSG_RESULT([no]))
fi

0 comments on commit 2b32c07

Please sign in to comment.