X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=configure.in;h=111c16ca4754ffd8b4a6e69f413a03f4f8f0588c;hb=583c6553f6761421260d86bbc21b5b3169c04319;hp=1569b7615d3978afeb174f67f825df66a83509a0;hpb=7b9a281f7b6413e22f1966021fd831e7368c7b31;p=vlc

diff --git a/configure.in b/configure.in
index 1569b7615d..111c16ca47 100644
--- a/configure.in
+++ b/configure.in
@@ -4,7 +4,7 @@ AC_CONFIG_HEADER(include/defs.h)
 
 AC_CANONICAL_HOST
 
-VLC_VERSION=0.2.5
+VLC_VERSION=0.2.61
 AC_SUBST(VLC_VERSION)
 VLC_CODENAME=Urumov
 AC_SUBST(VLC_CODENAME)
@@ -101,13 +101,17 @@ AC_TYPE_SIZE_T
 AC_HEADER_TIME
 
 dnl Checks for DVD ioctls
-AC_CHECK_HEADERS(sys/ioctl.h)
-AC_CHECK_HEADERS(sys/dvdio.h)
-AC_CHECK_HEADERS(linux/cdrom.h)
-AC_EGREP_HEADER(dvd,linux/cdrom.h,AC_DEFINE(LINUX_DVD,1,DVD support for linux))
+AC_CHECK_HEADERS(sys/ioctl.h,
+  [AC_CHECK_HEADERS(linux/cdrom.h)
+   AC_EGREP_HEADER(dvd,linux/cdrom.h,AC_DEFINE(LINUX_DVD,1,DVD support for linux))])
 
 dnl default plugins 
-PLUGINS=${PLUGINS}"yuv idct idctclassic motion ";
+PLUGINS=${PLUGINS}"ps ts dvd yuv idct idctclassic motion "
+if test x$host_os = xbeos; then
+    ACCEL_PLUGINS="yuvmmx idctmmx motionmmx "
+else
+    ACCEL_PLUGINS="yuvmmx idctmmx idctmmxext motionmmx motionmmxext "
+fi
 
 ARCH=${host_cpu}
 AC_ARG_ENABLE(ppro,
@@ -116,8 +120,8 @@ AC_ARG_ENABLE(ppro,
 [ if test x${host_cpu} = xi686; then ARCH=${ARCH}" ppro"; fi ])
 AC_ARG_ENABLE(mmx,
 [  --disable-mmx           Disable MMX optimizations (default enabled for x86)],
-[ if test x$enableval = xyes; then ARCH=${ARCH}" mmx"; PLUGINS=${PLUGINS}"yuvmmx motionmmx motionmmxext idctmmx idctmmxext "; fi ],
-[ if test x${host_cpu} = xi686 -o x${host_cpu} = xi586; then ARCH=${ARCH}" mmx"; PLUGINS=${PLUGINS}"yuvmmx motionmmx motionmmxext idctmmx idctmmxext "; fi ])
+[ if test x$enableval = xyes; then ARCH=${ARCH}" mmx"; PLUGINS=${PLUGINS}${ACCEL_PLUGINS}; fi ],
+[ if test x${host_cpu} = xi686 -o x${host_cpu} = xi586; then ARCH=${ARCH}" mmx"; PLUGINS=${PLUGINS}${ACCEL_PLUGINS}; fi ])
 AC_ARG_ENABLE(debug,
 [  --enable-debug          Enable debug mode (default disabled)],
 [ if test x$enableval = xyes; then DEBUG=1; fi ])
@@ -139,7 +143,7 @@ dnl default case
 else
 
 AC_ARG_ENABLE(dummy,
-  [  --disable-dummy         dummy audio and video support (default enabled)])
+  [  --disable-dummy         dummy module (default enabled)])
 if test x$enable_dummy != xno; then PLUGINS=${PLUGINS}"dummy "; fi
 AC_ARG_ENABLE(null,
   [  --disable-null          Null module (default enabled)])
@@ -152,7 +156,7 @@ AC_ARG_ENABLE(esd,
   [if test x$enable_esd = xyes; then PLUGINS=${PLUGINS}"esd "; fi])
 AC_ARG_ENABLE(fb,
   [  --enable-fb             Linux framebuffer support (default disabled)],
-  [if test x$enable_fb = xyes; then PLUGINS=${PLUGINS}"fb "; ALIASES=${ALIASES}"fbvlc "; fi])
+  [if test x$enable_fb = xyes; then PLUGINS=${PLUGINS}"fb "; fi])
 AC_ARG_WITH(ggi,
   [  --with-ggi[=name]       GGI support (default disabled)],
   [ PLUGINS=${PLUGINS}"ggi ";
@@ -163,14 +167,19 @@ AC_ARG_WITH(ggi,
       LIB_GGI="-lggi"
     fi ])
 AC_ARG_WITH(sdl,
-  [  --with-sdl[=name]       SDL support (default disabled)],
+  [  --with-sdl[=name]       SDL support (default enabled)],
   [ PLUGINS=${PLUGINS}"sdl ";
     if test "x$withval" != "xyes";
     then
-      LIB_SDL="-l"$withval
+      LIB_SDL="L/usr/X11R6/lib -l"$withval
     else
-      LIB_SDL="-lSDL"
+      LIB_SDL="-L/usr/X11R6/lib -lSDL"
     fi ])
+    if test "x$withval" == "x";
+    then
+      PLUGINS=${PLUGINS}"sdl "
+      LIB_SDL="-L/usr/X11R6/lib -lSDL"
+    fi
 AC_ARG_WITH(glide,
   [  --with-glide[=name]     Glide (3dfx) support (default disabled)],
   [ PLUGINS=${PLUGINS}"glide ";
@@ -180,12 +189,16 @@ AC_ARG_WITH(glide,
     else
       LIB_GLIDE="-lglide2x"
     fi ])
+AC_ARG_ENABLE(ncurses,
+  [  --enable-ncurses        ncurses interface support (default disabled)],
+  [if test x$enable_ncurses = xyes; then PLUGINS=${PLUGINS}"ncurses "; fi])
+AC_ARG_ENABLE(gnome,
+  [  --disable-gnome         Gnome support (default enabled)])
+if test x$enable_gnome != xno; then PLUGINS=${PLUGINS}"gnome "; ALIASES=${ALIASES}"gvlc "; fi
 AC_ARG_ENABLE(gnome,
-  [  --enable-gnome          Gnome support (default disabled)],
-  [if test x$enable_gnome = xyes; then PLUGINS=${PLUGINS}"gnome "; ALIASES=${ALIASES}"gvlc "; fi])
-AC_ARG_ENABLE(x11,
   [  --disable-x11           X11 support (default enabled)])
 if test x$enable_x11 != xno; then PLUGINS=${PLUGINS}"x11 "; fi
+
 AC_ARG_ENABLE(alsa,
   [  --enable-alsa           Alsa sound drivers support (Only for linux) (default disabled)],
   [if test x$enable_alsa = xyes; then AC_CHECK_HEADER(sys/asoundlib.h, AC_CHECK_LIB(asound, main, have_alsa="true", have_alsa="false"),have_alsa="false") if test $have_alsa = true; then PLUGINS=${PLUGINS}"alsa "; fi; fi])