After 3 seconds, allow SIGINT to kill the process

[vlc] / configure.ac

diff --git a/configure.ac b/configure.ac
index 8170742849554ac57cdd3a941c4547af5e3d8802..6a64f83193174ed482a425b5d7192105198e58fa 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -2768,9 +2768,7 @@ dnl
 
 AC_ARG_ENABLE(swscale,
   AS_HELP_STRING([--enable-swscale],[libswscale image scaling and conversion
-                 (default enabled)]),, [
-  enable_swscale="${have_avcodec}"
-])
+                 (default enabled)]))
 if test "${enable_swscale}" != "no"
 then
   PKG_CHECK_MODULES(SWSCALE,[libswscale],
@@ -3890,10 +3888,10 @@ AS_IF([test "${enable_qt4}" != "no"], [
     ALIASES="${ALIASES} qvlc"
 
     AC_LANG_PUSH([C++])
-    CPPFLAGS_save="${CXXFLAGS}"
+    CPPFLAGS_save="${CPPFLAGS}"
 
     AC_MSG_CHECKING([whether Qt uses X11])
-    CPPFLAGS="${CXXFLAGS} ${QT4_CFLAGS}"
+    CPPFLAGS="${CPPFLAGS} ${QT4_CFLAGS}"
     AC_PREPROC_IFELSE([
 #include <QWidget>
 #if !defined (Q_WS_X11)
@@ -4708,7 +4706,6 @@ AC_CONFIG_FILES([
   Makefile
   projects/activex/Makefile
   doc/Makefile
-  extras/package/ipkg/Makefile
   libs/loader/Makefile
   libs/srtp/Makefile
   libs/unzip/Makefile