From f2f5c4a07774a4618a16a3c8ff331f0654073085 Mon Sep 17 00:00:00 2001 From: Sam Hocevar Date: Thu, 1 Jun 2000 15:25:38 +0000 Subject: [PATCH] =?utf8?q?=20.=20petite=20erreur=20dans=20le=20configure.i?= =?utf8?q?n=20qui=20emp=EF=BF=BDchait=20de=20configurer=20=20=20convenable?= =?utf8?q?ment=20les=20options=20de=20compilation?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit maintenant faire: ./configure --enable-fb --enable-blabla (./configure --help pour tous les voir) . correction d'un warning en mode non-MMX --- Makefile.in | 3 ++- README | 6 ++++++ configure | 18 +++++++++--------- configure.in | 18 +++++++++--------- src/interface/main.c | 2 ++ 5 files changed, 28 insertions(+), 19 deletions(-) diff --git a/Makefile.in b/Makefile.in index 739247a4f0..c22b542d21 100644 --- 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 d5c3111cfb..9629da7cd0 100644 --- 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 649e98db13..899933261b 100755 --- 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 ad0e386b3c..2e8496127a 100644 --- 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 7b71d22c89..abf56ab03d 100644 --- 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 -- 2.39.2