From 30fe3b7bad08603c2d2c6e69da3d3298fcc920bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= Date: Fri, 9 Mar 2012 16:56:00 +0000 Subject: [PATCH] configure: fix AC_LANG_SOURCE-related warnings when doing autogen.sh --- common | 2 +- configure.ac | 20 ++++++++++++-------- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/common b/common index bb15f1a28b..4b51fb8ae1 160000 --- a/common +++ b/common @@ -1 +1 @@ -Subproject commit bb15f1a28b56d86380ed113cab88ed596b1ad452 +Subproject commit 4b51fb8ae1a8e2019010305cc96c8397dc68000d diff --git a/configure.ac b/configure.ac index 13bfb8e4dc..3af1e6904a 100644 --- a/configure.ac +++ b/configure.ac @@ -180,14 +180,18 @@ AC_CHECK_HEADERS([malloc.h]) ac_cppflags_save="$CPPFLAGS" CPPFLAGS="`$PKG_CONFIG --cflags libxml-2.0`" -AC_COMPILE_IFELSE( - AC_LANG_PROGRAM([ +AC_COMPILE_IFELSE([ + AC_LANG_PROGRAM([[ #include - ],[ +]],[[ #ifndef LIBXML_HTML_ENABLED #error libxml2 has no HTML support #endif /* LIBXML_HTML_ENABLED */ - ]), HAVE_LIBXML_HTML="yes", HAVE_LIBXML_HTML="no") +]])], [ + HAVE_LIBXML_HTML="yes" +], [ + HAVE_LIBXML_HTML="no" +]) CPPFLAGS="$ac_cppflags_save" AM_CONDITIONAL(HAVE_LIBXML_HTML, test "x$HAVE_LIBXML_HTML" = "xyes") @@ -812,14 +816,14 @@ AG_GST_CHECK_FEATURE(VORBIS, [Xiph Vorbis audio codec], vorbis, [ if test "x$HAVE_VORBIS" = "xyes"; then ac_cflags_save="$CFLAGS" - AC_COMPILE_IFELSE( - AC_LANG_PROGRAM([ + AC_COMPILE_IFELSE([ + AC_LANG_PROGRAM([[ #include - ],[ + ]],[[ vorbis_dsp_state *v; vorbis_synthesis_restart (v); - ]), HAVE_VSR=yes, HAVE_VSR=no) + ]])], HAVE_VSR=yes, HAVE_VSR=no) if test "x$HAVE_VSR" = "xyes"; then AC_DEFINE_UNQUOTED(HAVE_VORBIS_SYNTHESIS_RESTART, 1, [defined if vorbis_synthesis_restart is present])