Fix windows package following [703887]

[vlc] / configure.ac

diff --git a/configure.ac b/configure.ac
index d225b521fb23b25d1cf5ec97c92b774f0f0a72e0..b69c5b3293114bc5042562a2da033325ff7f7d99 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1270,7 +1270,6 @@ AC_LANG_POP(C++)
 if test "${SYS}" != "mingwce"; then
   VLC_ADD_PLUGIN([gestures])
   VLC_ADD_PLUGIN([rc])
-  VLC_ADD_PLUGIN([telnet])
   VLC_ADD_PLUGIN([hotkeys])
   VLC_ADD_PLUGIN([showintf])
   VLC_ADD_PLUGIN([marq])
@@ -1766,6 +1765,7 @@ AS_IF([test "${enable_vlm}" != "no"], [
     AC_MSG_ERROR([VLM requires the stream output. Do not use --disable-sout.])
   ])
   AC_DEFINE(ENABLE_VLM, 1, [Define if you want the VideoLAN manager support])
+  VLC_ADD_PLUGIN([telnet])
 ])
 
 dnl
@@ -3023,12 +3023,13 @@ dnl Trying with pkg-config
          [AC_CHECK_HEADERS([ffmpeg/swscale.h libswscale/swscale.h])],
          [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}])
+         ],
          [${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.])],
-        [${SWSCALE_LIBS}])
+        [${FFMPEG_LIBS}])
       ]
     )
 
@@ -3074,7 +3075,8 @@ dnl Trying with pkg-config
         [-lavcodec $LDAVUTIL])
       LDFLAGS="${LDFLAGS_save}"
       CPPFLAGS="${CPPFLAGS_save}"
-    ])
+      ],
+      [${SWSCALE_LIBS}])
   ])
 fi