Removed non converted omapfb video output module.

[vlc] / configure.ac

diff --git a/configure.ac b/configure.ac
index 27a05b8908036e4700251361333dec580cc443d3..1cfe76b8b1bf6d6ab88a4858c6f46714d66838c7 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -2,16 +2,16 @@ dnl Autoconf settings for vlc
 
 AC_COPYRIGHT([Copyright 2002-2010 the VideoLAN team])
 
-AC_INIT(vlc, 1.1.0-pre1)
+AC_INIT(vlc, 1.2.0-git)
 VERSION_MAJOR="1"
-VERSION_MINOR="1"
+VERSION_MINOR="2"
 VERSION_REVISION="0"
-VERSION_EXTRA="-pre1"
+VERSION_EXTRA="-git"
 PKGDIR="vlc"
 AC_SUBST(PKGDIR)
 
 CONFIGURE_LINE="`echo "$0 $ac_configure_args" | sed -e 's/\\\/\\\\\\\/g'`"
-CODENAME="The Luggage"
+CODENAME="Twoflower"
 COPYRIGHT_YEARS="1996-2010"
 
 AC_PREREQ(2.59c)
@@ -349,6 +349,7 @@ case "${host_os}" in
         # add ws2 for closesocket, select, recv
         VLC_ADD_LIBS([libvlccore access_http access_mms access_udp access_tcp access_ftp access_rtmp access_output_udp access_output_rtmp sap oldhttp netsync audioscrobbler growl rtp stream_out_rtp remoteosd ts oldtelnet audiobargraph_a netsync],[-lws2])
         VLC_ADD_LIBS([libvlccore],[-lmmtimer])
+        AC_CHECK_PROGS(U2D, [unix2dos todos], unix2dos)
    fi
     ;;
   *nto*)
@@ -1630,7 +1631,8 @@ then
       AC_MSG_ERROR([Could not find lua. Lua is needed for some interfaces (rc, telnet, http) as well as many other custom scripts. Use --disable-lua to ignore this error.])
   fi
   AC_ARG_VAR([LUAC], [LUA byte compiler])
-  AC_PATH_PROG(LUAC, luac, [
+  AC_PATH_PROG(LUAC, luac, [false])
+  AS_IF([test "${ac_cv_path_LUAC}" = "false"], [
     AC_MSG_ERROR([Could not find the LUA byte compiler.])
   ])
 fi
@@ -2666,7 +2668,7 @@ AC_ARG_ENABLE(avcodec,
 [  --enable-avcodec        libavcodec codec (default enabled)])
 if test "${enable_avcodec}" != "no"
 then
-  PKG_CHECK_MODULES(AVCODEC,[libavcodec >= 51.48.0 libavutil],
+  PKG_CHECK_MODULES(AVCODEC,[libavcodec >= 52.2.0 libavutil],
     [
       VLC_SAVE_FLAGS
       CPPFLAGS="${CPPFLAGS} ${AVCODEC_CFLAGS}"
@@ -3298,9 +3300,7 @@ dnl  Xlib
 dnl
 
 AC_PATH_XTRA()
-AC_CHECK_HEADERS(X11/Xlib.h, [
-  VLC_ADD_LIBS([omapfb],[${X_LIBS} ${X_PRE_LIBS} -lX11])
-])
+AC_CHECK_HEADERS(X11/Xlib.h)
 
 dnl
 dnl  X C Bindings modules
@@ -3518,31 +3518,6 @@ then
   VLC_ADD_PLUGIN([snapshot])
 fi
 
-dnl
-dnl Roku HD1000 Video output module
-dnl
-AC_ARG_ENABLE(hd1000v,
-  [  --enable-hd1000v        HD1000 Video Output module (default enabled on HD1000)])
-if test "${enable_hd1000v}" != "no" -a "${CXX}" != "" &&
-  (test "${SYS}" != "mingw32" -a "${SYS}" != "mingwce" ||
-   test "${enable_hd1000v}" = "yes"); then
-  AC_LANG_PUSH([C++])
-  AC_CHECK_HEADERS([cascade/graphics/CascadeScreen.h cascade/graphics/CascadeBitmap.h],
-  [
-    can_build_roku="yes"
-  ],
-  [
-    can_build_roku="no"
-    AC_MSG_WARN([Not building Roku HD1000 compatible video output])
-  ])
-  if test "$can_build_roku" = "yes"
-  then
-    VLC_ADD_PLUGIN([hd1000v])
-    VLC_ADD_LIBS([hd1000v],[-lCascade -ldvbpsi -lmad])
-  fi
-  AC_LANG_POP([C++])
-fi
-
 dnl
 dnl  Windows DirectX module
 dnl
@@ -3605,30 +3580,6 @@ AC_ARG_ENABLE(fb,
       ])
     fi
 
-dnl
-dnl  OMAP Framebuffer module
-dnl
-AC_ARG_ENABLE(omapfb,
-  [  --enable-omapfb         OMAP framebuffer support (default disabled)])
-    if test "${enable_omapfb}" = "yes"
-    then
-      AC_CHECK_HEADERS(asm/arch-omap/omapfb.h, [
-        VLC_ADD_PLUGIN([omapfb])
-      ])
-      VLC_ADD_PLUGIN([swscale_omap])
-    fi
-
-dnl
-dnl  SVGAlib module
-dnl
-AC_ARG_ENABLE(svgalib,
-  [  --enable-svgalib        SVGAlib support (default disabled)])
-if test "${enable_svgalib}" = "yes"
-then
-  VLC_ADD_PLUGIN([svgalib])
-  VLC_ADD_LIBS([svgalib],[-lvgagl -lvga])
-fi
-
 dnl
 dnl  DirectFB module
 dnl  try to find using: 1 - given location; 2 - directfb-config; 3 - pkg-config
@@ -3697,30 +3648,6 @@ if test "${enable_directfb}" = "yes"; then
     fi
 fi
 
-
-
-dnl
-dnl  GGI module
-dnl
-AC_ARG_ENABLE(ggi,
-  [  --enable-ggi            GGI support (default disabled)])
-if test "${enable_ggi}" = "yes"
-then
-  AC_CHECK_HEADER([ggi/ggi.h],[
-    VLC_ADD_PLUGIN([ggi])
-    VLC_ADD_LIBS([ggi],[-lggi])
-    AC_ARG_WITH(ggi,
-      [  --with-ggi=PATH         path to libggi],
-      [ if test "${with_ggi}" != "no" -a -n "${with_ggi}"
-        then
-          VLC_ADD_CPPFLAGS([ggi],[-I${with_ggi}/include])
-          VLC_ADD_LIBS([ggi],[-L${with_ggi}/lib])
-        fi ])
-    ],[
-       AC_MSG_ERROR([LibGGI development files can't be found])
-    ])
-fi
-
 dnl
 dnl  AA plugin
 dnl
@@ -4442,10 +4369,9 @@ AC_ARG_WITH(kde-solid,
 soliddatadir=""
 AS_IF([test "${with_kde_solid}" != "no"], [
   AS_IF([test "${with_kde_solid}" = "yes"], [
-    soliddatadir="`${KDE4_CONFIG} --install data`solid/actions"
-    AS_IF([test "x${soliddatadir}" = "x"], [
-      soliddatadir='$(datadir)/kde4/apps/solid/actions'
-    ])
+    kde4datadir="`${KDE4_CONFIG} --install data`"
+    AS_IF([test "x$kde4datadir" = "x"], [kde4datadir='${datadir}/kde4/apps'])
+    soliddatadir="${kde4datadir}/solid/actions"
   ], [
     soliddatadir="${with_kde_solid}"
   ])