[vlc-devel] commit: Fix configuration ( Rafaël Carré )

[git version control]

vlc | branch: 0.8.6-bugfix | Rafaël Carré <funman at videolan.org> | Mon Jun  9 15:22:07 2008 +0200| [ba01d80af3427931ca7d8c32eb18481b1a56a7a6]

Fix configuration

VLC_SAVE_FLAGS is intended to be used only once : before any modification of the flags
Do not use $LIBS after it has been overwritten by FFmpeg checks
(cherry picked from commit 18c6e88e0aff698dc8647c244b509bf786d14c59)

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=ba01d80af3427931ca7d8c32eb18481b1a56a7a6
---

 configure.ac |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/configure.ac b/configure.ac
index 6133a38..673dab7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2705,7 +2705,6 @@ dnl Look for a ffmpeg-config (we are on debian )
 dnl Trying with pkg-config
    PKG_CHECK_MODULES(FFMPEG,[libavcodec, libavformat],
     [
-     VLC_SAVE_FLAGS
      CPPFLAGS="${CPPFLAGS} ${FFMPEG_CFLAGS}"
      CFLAGS="${CFLAGS} ${FFMPEG_CFLAGS}"
      AC_CHECK_HEADERS(ffmpeg/avcodec.h libavcodec/avcodec.h)
@@ -2773,7 +2772,6 @@ fi
 dnl Check if we have (required) img_resample() in libavcodec
 if test "${enable_ffmpeg}" != "no"
 then
-     VLC_SAVE_FLAGS
      CFLAGS="${CFLAGS} ${CFLAGS_ffmpeg}"
      LDFLAGS="${LDFLAGS} ${LDFLAGS_ffmpeg}"
      AC_CHECK_LIB(avcodec, img_resample, ,
@@ -2781,6 +2779,9 @@ then
      VLC_RESTORE_FLAGS
 fi
 
+dnl Clean out environment
+LIBS="${LIBS_save}"
+
 dnl
 dnl  ffmpegaltivec plugin
 dnl