test: Use image.jpg for testing tracks reading.

[vlc] / configure.ac

diff --git a/configure.ac b/configure.ac
index 3df2b8ae838a329e61dcac32c7606c6d5da106a3..73049462a764147c9e6265c5c3499d07ee07a38b 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1606,9 +1606,6 @@ then
             AC_CHECK_LIB( lua , luaL_newstate,
               [LUA_LIBS="-llua"],
               [ have_lua=no
-                AS_IF([test "x${enable_lua}" = "xyes"],
-                  [AC_MSG_ERROR([lua >= 5.1 not found!])],
-                  [AC_MSG_WARN([lua >= 5.1 not found!])])
               ], [-lm])
           )
         )
@@ -1723,7 +1720,11 @@ if test "${enable_live555}" != "no"; then
   if test -z "${with_live555_tree}" -a "${CXX}" != ""; then
     AC_LANG_PUSH(C++)
     CPPFLAGS_save="${CPPFLAGS}"
-    CPPFLAGS_live555="-I/usr/include/liveMedia -I/usr/include/groupsock -I/usr/include/BasicUsageEnvironment -I/usr/include/UsageEnvironment"
+    if test -z "${CONTRIB_DIR}"; then
+        CPPFLAGS_live555="-I/usr/include/liveMedia -I/usr/include/groupsock -I/usr/include/BasicUsageEnvironment -I/usr/include/UsageEnvironment"
+    else
+        CPPFLAGS_live555="-I${CONTRIB_DIR}/include/liveMedia -I${CONTRIB_DIR}/include/groupsock -I${CONTRIB_DIR}/include/BasicUsageEnvironment -I${CONTRIB_DIR}/include/UsageEnvironment"
+    fi
     if test "${SYS}" = "solaris"; then
       CPPFLAGS_live555="${CPPFLAGS_live555} -DSOLARIS"
     fi
@@ -2953,15 +2954,6 @@ if test "${enable_realrtsp}" = "yes"; then
   VLC_ADD_PLUGIN([access_realrtsp])
 fi
 
-AC_ARG_ENABLE(libsysfs,
-  [  --enable-libsysfs       Get user key from firewire connected iPod via libsysfs (default enabled)])
-
-AS_IF([test "${enable_libsysfs}" != "no"],[
-  AC_CHECK_HEADERS(sysfs/libsysfs.h, [
-    VLC_ADD_LIBS([mp4 mkv],[-lsysfs])
-  ] )
-])
-
 dnl
 dnl skins2 module
 dnl
@@ -4702,24 +4694,6 @@ fi
 AC_LANG_POP(C++)
 AM_CONDITIONAL(BUILD_MOZILLA,${mozilla})
 
-dnl
-dnl  test plugins
-dnl
-AC_ARG_ENABLE(testsuite,
-  [  --enable-testsuite      build test modules (default disabled)])
-if test "${enable_testsuite}" = "yes"
-then
-  TESTS="test1 test2 test3 test4"
-
-  dnl  we define those so that bootstrap sets the right linker
-  VLC_ADD_CXXFLAGS([test2],[])
-  VLC_ADD_OBJCFLAGS([test3],[])
-  dnl  this one is needed until automake knows what to do
-  VLC_ADD_LIBS([test3],[-lobjc])
-
-  VLC_ADD_PLUGIN([test1 test2 test3 test4])
-fi
-
 dnl
 dnl  Plugin and builtin checks
 dnl
@@ -4900,7 +4874,6 @@ AC_CONFIG_FILES([
   modules/misc/dummy/Makefile
   modules/misc/lua/Makefile
   modules/misc/notify/Makefile
-  modules/misc/testsuite/Makefile
   modules/misc/playlist/Makefile
   modules/misc/osd/Makefile
   modules/misc/stats/Makefile