From 6ca5f88ddefed16a017e4c4b6543281da2577557 Mon Sep 17 00:00:00 2001 From: Egor Zaharov Date: Sun, 20 Mar 2016 13:43:00 +0000 Subject: configure: Restore CPPFLAGS after the last check The next checks can also set CPPFLAGS. https://bugzilla.gnome.org/show_bug.cgi?id=763940 --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 1e694d9..4d736f9 100644 --- a/configure.ac +++ b/configure.ac @@ -285,7 +285,6 @@ if test "x$with_system_libav" = "xyes"; then saved_CPPFLAGS="$CPPFLAGS" CPPFLAGS="$CPPFLAGS $LIBAV_CFLAGS" AC_CHECK_HEADERS([avi.h]) - CPPFLAGS="$saved_CPPFLAGS" AC_DEFINE([LIBAV_SOURCE], ["system install"], [Describes where the Libav libraries come from.]) HAVE_LIBAV_UNINSTALLED=0 AC_MSG_NOTICE([Using system-installed libav code]) @@ -300,6 +299,7 @@ if test "x$with_system_libav" = "xyes"; then #endif ]])], [is_ffmpeg=yes], [is_ffmpeg=no]) AC_MSG_RESULT([$is_ffmpeg]) + CPPFLAGS="$saved_CPPFLAGS" if test "$is_ffmpeg" = no; then AC_MSG_ERROR([Uncompatible libavcodec found]) fi -- cgit v1.2.1