Fix initialization

[vlc] / configure.ac

diff --git a/configure.ac b/configure.ac
index 9082d62060cfc67c1b805b3e91e0abbb4e906d61..4a9fbf0fce30857784a45243023ca2b0946f8d8e 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1489,6 +1489,22 @@ AH_TEMPLATE(NDEBUG,
             [Define to 1 if debug code should NOT be compiled])
 AS_IF([test "x${enable_debug}" = "xno"], [AC_DEFINE(NDEBUG)])
 
+dnl
+dnl  Test coverage
+dnl
+AC_ARG_ENABLE(coverage,
+       [  --enable-coverage       build for test coverage (default disabled)],,
+       [enable_coverage="no"])
+AS_IF([test "${enable_coverage}" != "no"], [
+       CFLAGS="-fprofile-arcs -ftest-coverage ${CFLAGS}"
+       CXXFLAGS="-fprofile-arcs -ftest-coverage ${CXXFLAGS}"
+       LDFLAGS="-lgcov ${LDFLAGS}"
+       dnl ugly...
+       CFLAGS_save="${CFLAGS}"
+       CXXFLAGS_save="${CXXFLAGS}"
+       LDFLAGS_save="${LDFLAGS}"
+])
+
 dnl
 dnl  Enable release-specific flags
 dnl
@@ -1538,12 +1554,21 @@ AC_ARG_ENABLE(luaplaylist,
 if test "${enable_lua}" != "no"
 then
   PKG_CHECK_MODULES(LUA, lua5.1,
-    [ AC_DEFINE(HAVE_LUA, [], [Define if you have the lua library])
-      VLC_ADD_PLUGINS([luaplaylist])
-      VLC_ADD_LDFLAGS([luaplaylist],[$LUA_LIBS])
-      VLC_ADD_CFLAGS([luaplaylist],[$LUA_CFLAGS])
-    ],
-    [AC_MSG_WARN(lua 5.0 not found)])
+    [ have_lua=yes ],
+    [
+    AC_MSG_WARN([lua5.1 not found, trying lua >= 5.1 instead])
+    PKG_CHECK_MODULES(LUA, lua >= 5.1,
+      [ have_lua=yes ],
+      [ 
+       AC_MSG_WARN([lua >= 5.1 not found!])
+      ])
+    ])
+  if test "x${have_lua}" = "xyes"; then
+     AC_DEFINE(HAVE_LUA, [], [Define if you have the lua library])
+     VLC_ADD_PLUGINS([luaplaylist])
+     VLC_ADD_LDFLAGS([luaplaylist],[$LUA_LIBS])
+     VLC_ADD_CFLAGS([luaplaylist],[$LUA_CFLAGS])
+  fi
 fi
 
 dnl
@@ -5916,7 +5941,7 @@ AC_CONFIG_FILES([
   modules/video_chroma/Makefile
   modules/video_filter/Makefile
   modules/video_output/Makefile
-  modules/video_output/directx/Makefile
+  modules/video_output/msw/Makefile
   modules/video_output/qte/Makefile
   modules/video_output/x11/Makefile
   modules/visualization/Makefile