. petite erreur dans le configure.in qui emp�chait de configurer

  convenablement les options de compilation

  maintenant faire: ./configure --enable-fb --enable-blabla
    (./configure --help pour tous les voir)

 . correction d'un warning en mode non-MMX

diff --git a/Makefile.in b/Makefile.in
index 739247a4f0599bbf64d3cfbeeb503b3f0b3a6127..c22b542d21f15c555b93c29e080e3ed51f920bde 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -282,7 +282,8 @@ clean:
 
 distclean: clean
        rm -f **/*.o **/*.so **/*~ *.log
-       rm -f Makefile include/defs.h config.cache config.log
+       rm -f Makefile include/defs.h include/config.h
+       rm -f config.status config.cache config.log
        rm -f vlc gmon.out core
        rm -rf .dep
 

diff --git a/README b/README
index d5c3111cfbb91031029e5bdae86b03a15607a9b3..9629da7cd0df34b0eeafa545c3c8b63e2eddbf0a 100644 (file)
--- a/README
+++ b/README
@@ -9,6 +9,12 @@
 
 
 
+... Building VideoLAN
+
+[ nothing appropriate yet ]
+
+
+
 ... Running VideoLAN
 
 [ nothing appropriate yet ]

diff --git a/configure b/configure
index 649e98db13c0d4105c02ab75bba236368110a817..899933261b741fb9b2d1032702caf9509f388186 100755 (executable)
--- a/configure
+++ b/configure
@@ -14,21 +14,21 @@ ac_default_prefix=/usr/local
 ac_help="$ac_help
   --enable-vout-dummy     dummy video support (default enabled)"
 ac_help="$ac_help
-  --enable-vout-x11       X11 video support (default enabled)"
+  --enable-x11            X11 video support (default enabled)"
 ac_help="$ac_help
-  --enable-vout-fb        Linux framebuffer video support (default disabled)"
+  --enable-fb             Linux framebuffer video support (default disabled)"
 ac_help="$ac_help
-  --enable-vout-gnome     Gnome video support (default disabled)"
+  --enable-gnome          Gnome video support (default disabled)"
 ac_help="$ac_help
-  --enable-vout-glide     Glide (3dfx) video support (default disabled)"
+  --enable-glide          Glide (3dfx) video support (default disabled)"
 ac_help="$ac_help
-  --enable-vout-ggi       GGI video support (default disabled)"
+  --enable-ggi            GGI video support (default disabled)"
 ac_help="$ac_help
   --enable-aout-dummy     dummy audio support (default enabled)"
 ac_help="$ac_help
-  --enable-aout-dsp       Linux /dev/dsp support (default enabled)"
+  --enable-dsp            Linux /dev/dsp support (default enabled)"
 ac_help="$ac_help
-  --enable-aout-esd       Esound library support (default disabled)"
+  --enable-esd            Esound library support (default disabled)"
 ac_help="$ac_help
   --enable-ppro           Enable PentiumPro optimizations (default is no)"
 ac_help="$ac_help
@@ -3049,7 +3049,7 @@ if test "${enable_dummy+set}" = set; then
   :
 fi
 
-if test x$enable_dummy != xno; then VOUT=${VOUT}"dummy "; fi
+if test x$enable_vout_dummy != xno; then VOUT=${VOUT}"dummy "; fi
 # Check whether --enable-x11 or --disable-x11 was given.
 if test "${enable_x11+set}" = set; then
   enableval="$enable_x11"
@@ -3088,7 +3088,7 @@ if test "${enable_dummy+set}" = set; then
   :
 fi
 
-if test x$enable_dummy != xno; then AOUT=${AOUT}"dummy "; fi
+if test x$enable_aout_dummy != xno; then AOUT=${AOUT}"dummy "; fi
 # Check whether --enable-dsp or --disable-dsp was given.
 if test "${enable_dsp+set}" = set; then
   enableval="$enable_dsp"

diff --git a/configure.in b/configure.in
index ad0e386b3c6aa6beb84ad67f9add48098ac726fd..2e8496127a819cd2591f850510b0b5331f5afd0e 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -60,31 +60,31 @@ AC_HEADER_TIME
 
 AC_ARG_ENABLE(dummy,
   [  --enable-vout-dummy     dummy video support (default enabled)])
-if test x$enable_dummy != xno; then VOUT=${VOUT}"dummy "; fi
+if test x$enable_vout_dummy != xno; then VOUT=${VOUT}"dummy "; fi
 AC_ARG_ENABLE(x11,
-  [  --enable-vout-x11       X11 video support (default enabled)])
+  [  --enable-x11            X11 video support (default enabled)])
 if test x$enable_x11 != xno; then VOUT=${VOUT}"x11 "; fi
 AC_ARG_ENABLE(fb,
-  [  --enable-vout-fb        Linux framebuffer video support (default disabled)],
+  [  --enable-fb             Linux framebuffer video support (default disabled)],
   [if test x$enable_fb = xyes; then VOUT=${VOUT}"fb "; fi])
 AC_ARG_ENABLE(gnome,
-  [  --enable-vout-gnome     Gnome video support (default disabled)],
+  [  --enable-gnome          Gnome video support (default disabled)],
   [if test x$enable_gnome = xyes; then VOUT=${VOUT}"gnome "; fi])
 AC_ARG_ENABLE(glide,
-  [  --enable-vout-glide     Glide (3dfx) video support (default disabled)],
+  [  --enable-glide          Glide (3dfx) video support (default disabled)],
   [if test x$enable_glide = xyes; then VOUT=${VOUT}"glide "; fi])
 AC_ARG_ENABLE(ggi,
-  [  --enable-vout-ggi       GGI video support (default disabled)],
+  [  --enable-ggi            GGI video support (default disabled)],
   [if test x$enable_ggi = xyes; then VOUT=${VOUT}"ggi "; fi])
 
 AC_ARG_ENABLE(dummy,
   [  --enable-aout-dummy     dummy audio support (default enabled)])
-if test x$enable_dummy != xno; then AOUT=${AOUT}"dummy "; fi
+if test x$enable_aout_dummy != xno; then AOUT=${AOUT}"dummy "; fi
 AC_ARG_ENABLE(dsp,
-  [  --enable-aout-dsp       Linux /dev/dsp support (default enabled)])
+  [  --enable-dsp            Linux /dev/dsp support (default enabled)])
 if test x$enable_dsp != xno; then AOUT=${AOUT}"dsp "; fi
 AC_ARG_ENABLE(esd,
-  [  --enable-aout-esd       Esound library support (default disabled)],
+  [  --enable-esd            Esound library support (default disabled)],
   [if test x$enable_gnome = xyes; then AOUT=${AOUT}"esd "; fi])
 
 ARCH=${host_cpu}

diff --git a/src/interface/main.c b/src/interface/main.c
index 7b71d22c8985bdd798e1fff3d6877f038093b295..abf56ab03db9140f5750f761b4e34ed279a86102 100644 (file)
--- a/src/interface/main.c
+++ b/src/interface/main.c
@@ -132,7 +132,9 @@ static void Version                 ( void );
 
 static void InitSignalHandler       ( void );
 static void SignalHandler           ( int i_signal );
+#ifdef HAVE_MMX
 static int  TestMMX                 ( void );
+#endif
 
 /*****************************************************************************
  * main: parse command line, start interface and spawn threads