Correction d'un bug de synchro pour les images monotrames.

[vlc] / configure.in

diff --git a/configure.in b/configure.in
index d8a2247e05efac02fce712b3229543339000f396..dd7fa641b11a48033816de7460eb47f28ccd2ef1 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -4,15 +4,19 @@ AC_CONFIG_HEADER(include/defs.h)
 
 AC_CANONICAL_HOST
 
-VLC_VERSION=0.1.99f
+VLC_VERSION=0.1.99h
 AC_SUBST(VLC_VERSION)
 VLC_CODENAME=Onatopp
 AC_SUBST(VLC_CODENAME)
 
 dnl Check for tools
 AC_PROG_MAKE_SET
-AC_PROG_CC
-AC_PROG_CPP
+if test -z "$CC"; then
+  AC_PROG_CC
+fi
+if test -z "$CPP"; then
+  AC_PROG_CPP
+fi
 
 dnl AM_PROG_LIBTOOL
 AC_PROG_INSTALL
@@ -64,10 +68,10 @@ PLUGINS=${PLUGINS}"yuv ";
 ARCH=${host_cpu}
 AC_ARG_ENABLE(ppro,
 [  --enable-ppro           Enable PentiumPro optimizations (default is no)],
-[ if test x$enableval = xyes; then ARCH=${ARCH}" pentiumpro"; fi ])
+[ if test x$enableval = xyes; then ARCH=${ARCH}" ppro"; fi ])
 AC_ARG_ENABLE(mmx,
 [  --enable-mmx            Enable MMX optimizations (default is no)],
-[ if test x$enableval = xyes; then ARCH=${ARCH}" mmx"; PLUGINS=${PLUGINS}"yuvmmx "; fi ])
+[ if test x`echo $ARCH | cut -b3-4` = x86 ; then if test x$enableval = xyes; then ARCH=${ARCH}" mmx"; PLUGINS=${PLUGINS}"yuvmmx "; fi; fi ])
 
 SYS=${host_os}
 
@@ -92,16 +96,19 @@ AC_ARG_ENABLE(fb,
   [if test x$enable_fb = xyes; then PLUGINS=${PLUGINS}"fb "; ALIASES=${ALIASES}"fbvlc "; fi])
 AC_ARG_ENABLE(ggi,
   [  --enable-ggi            GGI support (default disabled)],
-  [if test x$enable_ggi = xyes; then PLUGINS=${PLUGINS}"ggi "; ALIASES=${ALIASES}"ggivlc "; fi])
+  [if test x$enable_ggi = xyes; then PLUGINS=${PLUGINS}"ggi "; fi])
+AC_ARG_ENABLE(sdl,
+  [  --enable-sdl            SDL support (default disabled)],
+  [if test x$enable_sdl = xyes; then PLUGINS=${PLUGINS}"sdl "; fi])
 AC_ARG_ENABLE(glide,
   [  --enable-glide          Glide (3dfx) support (default disabled)],
-  [if test x$enable_glide = xyes; then PLUGINS=${PLUGINS}"glide "; ALIASES=${ALIASES}"glidevlc "; fi])
+  [if test x$enable_glide = xyes; then PLUGINS=${PLUGINS}"glide "; 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,
   [  --enable-x11            X11 support (default enabled)])
-if test x$enable_x11 != xno; then PLUGINS=${PLUGINS}"x11 "; ALIASES=${ALIASES}"xvlc "; fi
+if test x$enable_x11 != xno; then PLUGINS=${PLUGINS}"x11 "; fi
 
 fi
 
@@ -121,3 +128,4 @@ architecture          : ${ARCH}
 plugins               : ${PLUGINS}
 vlc aliases           : ${ALIASES}
 "
+