[vlc-devel] commit: Fix ffmpeg section flag handling calls. ( at least it fixes the pkg-config code path) (Antoine Cellerier )

[git version control]

vlc | branch: master | Antoine Cellerier <antoine at macbook.(none)> | Wed May 28 16:04:53 2008 +0200| [8c140b9e37ab05d0f766a133c34f897e0a3fed92]

Fix ffmpeg section flag handling calls. (at least it fixes the pkg-config code path)

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

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

diff --git a/configure.ac b/configure.ac
index 0dfc689..056f89f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3033,18 +3033,19 @@ dnl Trying with pkg-config
          [${FFMPEG_LIBS}])
          ],
          [${SWSCALE_LIBS}])
-     VLC_RESTORE_FLAGS
     ],[AC_CHECK_LIB(avcodec,img_resample,[],
         [AC_MSG_ERROR([Your FFmpeg library doesn't have the needed img_resample() function. You should rebuild it with software scaler disabled, or install the swscale headers.])],
         [${FFMPEG_LIBS}])
       ]
     )
+    VLC_RESTORE_FLAGS
 
   ],[
 
     dnl
     dnl last chance: at the default place
     dnl
+      VLC_SAVE_FLAGS
       CPPFLAGS="${CPPFLAGS_save} ${CPPFLAGS_ffmpeg}"
       LDFLAGS="${LDFLAGS_save} ${LDFLAGS_ffmpeg} ${LIBS_ffmpeg}"
       AC_CHECK_HEADERS(ffmpeg/avcodec.h libavcodec/avcodec.h)
@@ -3071,8 +3072,7 @@ dnl Trying with pkg-config
 
       AC_CHECK_LIB(avformat, av_open_input_stream, [
         VLC_ADD_LIBS([ffmpeg],[-lavformat -lz]) ], [], [-lavcodec -lz $LDAVUTIL])
-      LDFLAGS="${LDFLAGS_save}"
-      CPPFLAGS="${CPPFLAGS_save}"
+      VLC_RESTORE_FLAGS
 
       AC_CHECK_LIB(swscale, sws_getContext, [
         AC_CHECK_HEADERS(ffmpeg/swscale.h libswscale/swscale.h)
@@ -3080,10 +3080,10 @@ dnl Trying with pkg-config
         [AC_CHECK_LIB(avcodec,img_resample,[],
             [AC_MSG_ERROR([Your FFmpeg library doesn't have the needed img_resample() function. You should rebuild it with software scaler disabled, or install the swscale headers.])],
         [-lavcodec $LDAVUTIL])
-      LDFLAGS="${LDFLAGS_save}"
-      CPPFLAGS="${CPPFLAGS_save}"
       ],
       [${SWSCALE_LIBS}])
+
+      VLC_RESTORE_FLAGS
   ])
 fi