Commit 9e081837 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

Use AC_LANG_SOURCE to make autoconf 2.68 happy

parent 972c39b6
...@@ -456,14 +456,14 @@ VLC_ADD_LIBS([libvlccore],[${LTLIBICONV}]) ...@@ -456,14 +456,14 @@ VLC_ADD_LIBS([libvlccore],[${LTLIBICONV}])
dnl Check for broken versions of mingw-runtime compatability library dnl Check for broken versions of mingw-runtime compatability library
AS_IF([test "${SYS}" = "mingw32" -o "${SYS}" = "mingwce"], [ AS_IF([test "${SYS}" = "mingw32" -o "${SYS}" = "mingwce"], [
AC_MSG_CHECKING(for broken mingw-runtime) AC_MSG_CHECKING(for broken mingw-runtime)
AC_PREPROC_IFELSE([ AC_PREPROC_IFELSE([AC_LANG_SOURCE([
#include <_mingw.h> #include <_mingw.h>
#if (__MINGW32_MAJOR_VERSION == 3) && (__MINGW32_MINOR_VERSION < 15) #if (__MINGW32_MAJOR_VERSION == 3) && (__MINGW32_MINOR_VERSION < 15)
#ifndef __MINGW64_VERSION_MAJOR #ifndef __MINGW64_VERSION_MAJOR
# error Attempting to use mingw-runtime with broken vsnprintf support # error Attempting to use mingw-runtime with broken vsnprintf support
#endif #endif
#endif #endif
], [ ])], [
AC_MSG_RESULT([ok]) AC_MSG_RESULT([ok])
], [ ], [
AC_MSG_RESULT([present]) AC_MSG_RESULT([present])
...@@ -527,13 +527,13 @@ dnl See sourceware.org bugs 5058 and 5443. ...@@ -527,13 +527,13 @@ dnl See sourceware.org bugs 5058 and 5443.
dnl Ubuntu alone has 20 bug numbers for this... dnl Ubuntu alone has 20 bug numbers for this...
dnl dnl
AC_MSG_CHECKING(for buggy GNU/libc versions) AC_MSG_CHECKING(for buggy GNU/libc versions)
AC_PREPROC_IFELSE([ AC_PREPROC_IFELSE([AC_LANG_SOURCE([
#include <limits.h> #include <limits.h>
#if defined (__GLIBC__) && (__GLIBC__ == 2) \ #if defined (__GLIBC__) && (__GLIBC__ == 2) \
&& (__GLIBC_MINOR__ >= 5) && (__GLIBC_MINOR__ <= 7) && (__GLIBC_MINOR__ >= 5) && (__GLIBC_MINOR__ <= 7)
# error GNU/libc with dcgettext killer bug! # error GNU/libc with dcgettext killer bug!
#endif #endif
], [ ])], [
AC_MSG_RESULT([not present]) AC_MSG_RESULT([not present])
], [ ], [
AC_MSG_RESULT([found]) AC_MSG_RESULT([found])
...@@ -1510,7 +1510,7 @@ AS_IF([test "${CFLAGS_TUNING}"], ...@@ -1510,7 +1510,7 @@ AS_IF([test "${CFLAGS_TUNING}"],
CFLAGS="${CFLAGS} ${CFLAGS_TUNING}" CFLAGS="${CFLAGS} ${CFLAGS_TUNING}"
AC_MSG_CHECKING([whether $CC accepts ${CFLAGS_TUNING}]) AC_MSG_CHECKING([whether $CC accepts ${CFLAGS_TUNING}])
AC_COMPILE_IFELSE([ ], AC_COMPILE_IFELSE([AC_LANG_SOURCE([])],
[tuning="yes"], [tuning="yes"],
[CFLAGS_TUNING=""; tuning="no" [CFLAGS_TUNING=""; tuning="no"
AS_IF([test "${with_tuning}"], AS_IF([test "${with_tuning}"],
...@@ -3620,12 +3620,12 @@ AS_IF([test "${enable_qt4}" != "no"], [ ...@@ -3620,12 +3620,12 @@ AS_IF([test "${enable_qt4}" != "no"], [
AC_MSG_CHECKING([whether Qt uses X11]) AC_MSG_CHECKING([whether Qt uses X11])
CPPFLAGS="${CPPFLAGS} ${QT4_CFLAGS}" CPPFLAGS="${CPPFLAGS} ${QT4_CFLAGS}"
AC_PREPROC_IFELSE([ AC_PREPROC_IFELSE([AC_LANG_SOURCE([
#include <QWidget> #include <QWidget>
#if !defined (Q_WS_X11) #if !defined (Q_WS_X11)
# error Fail # error Fail
#endif #endif
], [ ])], [
AC_MSG_RESULT([yes]) AC_MSG_RESULT([yes])
VLC_ADD_LIBS([qt4],[${X_LIBS} ${X_PRE_LIBS} -lX11]) VLC_ADD_LIBS([qt4],[${X_LIBS} ${X_PRE_LIBS} -lX11])
VLC_ADD_CXXFLAGS([qt4],[${X_CFLAGS}]) VLC_ADD_CXXFLAGS([qt4],[${X_CFLAGS}])
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment