Skip to content

V
vlc-1.1
Commit db10e796 authored by Sam Hocevar's avatar Sam Hocevar
Browse files
Options 

  * ./AUTHORS: added people locations, just for fun.
  * ./configure.in: disabled SSE plugins when using mingw32.
  * ./src/misc/configuration.c: disabled the AltiVec warning message on the
    PowerPC platform because it was misleading.
parent b4bea3cc
Hide whitespace changes
Inline Side-by-side
Showing with 108 additions and 34 deletions
AUTHORS
View file @ db10e796
...@@ -9,94 +9,113 @@ N: Marc Ariberti ...@@ -9,94 +9,113 @@ N: Marc Ariberti
C: marcari C: marcari
E: marcari@via.ecp.fr E: marcari@via.ecp.fr
D: communication with channel server D: communication with channel server
S: France
N: Sigmund Augdal N: Sigmund Augdal
E: sigmunau@idi.ntnu.no E: sigmunau@idi.ntnu.no
D: lirc plugin D: lirc plugin
D: norwegian translation D: norwegian translation
D: aalib plugin D: aalib plugin
S: Norway
N: Pierre Baillet N: Pierre Baillet
E: oct@zoy.org E: oct@zoy.org
C: octplane C: octplane
D: SDL audio and video output D: SDL audio and video output
S: France
N: Jeffrey Baker N: Jeffrey Baker
E: jwbaker@acm.org E: jwbaker@acm.org
D: port of the ALSA plugin to the ALSA 1.0 API D: port of the ALSA plugin to the ALSA 1.0 API
S: USA, California
N: Ethan C. Baldridge N: Ethan C. Baldridge
E: BaldridgeE@cadmus.com E: BaldridgeE@cadmus.com
D: directory browsing code in modules.c D: directory browsing code in modules.c
S: USA
N: Gildas Bazin N: Gildas Bazin
E: gbazin@netcourrier.com E: gbazin@netcourrier.com
C: gbazin C: gbazin
D: mingw32 port, various win32 fixes D: mingw32 port, various win32 fixes
D: DirectX audio and video output D: DirectX audio and video output
S: Spain
N: Johan Bilien N: Johan Bilien
E: jobi@via.ecp.fr E: jobi@via.ecp.fr
C: jobi C: jobi
D: VCD input D: VCD input
S: France
N: Julien Blache N: Julien Blache
E: jb@technologeek.org E: jb@technologeek.org
D: Disc ejection code D: Disc ejection code
S: France
N: Emmanuel Blindauer N: Emmanuel Blindauer
E: manu@agat.net E: manu@agat.net
D: aRts audio output D: aRts audio output
S: France
N: Stphane Borel N: Stphane Borel
E: stef@via.ecp.fr E: stef@via.ecp.fr
C: stef C: stef
D: MPEG video decoder D: MPEG video decoder
D: DVD input, IFO parsing, CSS decryption D: DVD input, IFO parsing, CSS decryption
S: France
N: Arnaud de Bossoreille de Ribou N: Arnaud de Bossoreille de Ribou
E: bozo@via.ecp.fr E: bozo@via.ecp.fr
C: bozo C: bozo
D: SDL video output D: SDL video output
S: France
N: Tony Castley N: Tony Castley
E: tony@castley.net E: tony@castley.net
C: tcastley C: tcastley
D: BeOS interface, BeOS Video D: BeOS interface, BeOS Video
S: Australia
N: Renaud Dartus N: Renaud Dartus
E: reno@via.ecp.fr E: reno@via.ecp.fr
C: reno C: reno
D: AC3 decoder D: AC3 decoder
S: France
N: Nilmoni Deb N: Nilmoni Deb
E: ndeb@ece.cmu.edu E: ndeb@ece.cmu.edu
D: Minor autoconf and Makefile fixes D: Minor autoconf and Makefile fixes
S: USA, Pennsylvania
N: Cyril Deguet N: Cyril Deguet
E: asmax@via.ecp.fr E: asmax@via.ecp.fr
C: asmax C: asmax
D: PS input packet allocator D: PS input packet allocator
S: France
N: Colin Delacroix N: Colin Delacroix
E: colin@zoy.org E: colin@zoy.org
C: colin C: colin
D: MacOS X sound support D: MacOS X sound support
S: France
N: Boris Dors N: Boris Dors
E: babal@via.ecp.fr E: babal@via.ecp.fr
C: babal C: babal
D: Win32 network input D: Win32 network input
S: France
N: Jean-Marc Dressler N: Jean-Marc Dressler
E: polux@via.ecp.fr E: polux@via.ecp.fr
C: polux C: polux
D: BeOS port D: BeOS port
D: MPEG video decoder D: MPEG video decoder
S: France
N: Rgis Duchesne N: Rgis Duchesne
E: regis@via.ecp.fr E: regis@via.ecp.fr
C: regis C: regis
S: USA, California
N: Henri Fallon N: Henri Fallon
E: henri@via.ecp.fr E: henri@via.ecp.fr
...@@ -104,38 +123,46 @@ C: henri ...@@ -104,38 +123,46 @@ C: henri
D: ALSA audio output D: ALSA audio output
D: MPEG TS input, input netlist D: MPEG TS input, input netlist
D: Decoder modularization D: Decoder modularization
S: France
N: Valek Filippov N: Valek Filippov
E: frob@df.ru E: frob@df.ru
D: Russian translation D: Russian translation
S: Russia
N: Arnaud Gomes-do-Vale N: Arnaud Gomes-do-Vale
E: arnaud@carrosse.frmug.org E: arnaud@carrosse.frmug.org
D: autoconf patches D: autoconf patches
S: France
N: Thomas Graf N: Thomas Graf
E: tgraf@europe.com E: tgraf@europe.com
D: gettext support, german translation D: gettext support, german translation
S: Switzerland
N: Jean-Philippe Grimaldi N: Jean-Philippe Grimaldi
E: jeanphi@via.ecp.fr E: jeanphi@via.ecp.fr
C: jeanphi C: jeanphi
D: Bug fixes D: Bug fixes
S: France
N: Alexis Guillard N: Alexis Guillard
E: alexis.guillard@bt.com E: alexis.guillard@bt.com
D: IPv6 D: IPv6
S: United Kingdom
N: Shane Harper N: Shane Harper
E: shanegh@optusnet.com.au E: shanegh@optusnet.com.au
D: SDL plugin fixes and enhancements D: SDL plugin fixes and enhancements
D: XVideo video output D: XVideo video output
D: Gnome and Gtk+ interface enhancements D: Gnome and Gtk+ interface enhancements
S: United Kingdom
N: Gal Hendryckx N: Gal Hendryckx
E: jimmy@via.ecp.fr E: jimmy@via.ecp.fr
C: jimmy C: jimmy
D: IDCT and YUV transformations D: IDCT and YUV transformations
S: France
N: Samuel Hocevar N: Samuel Hocevar
E: sam@zoy.org E: sam@zoy.org
...@@ -143,25 +170,30 @@ C: sam ...@@ -143,25 +170,30 @@ C: sam
D: playlist and modules system D: playlist and modules system
D: Gnome and Gtk+ interfaces, Glide and fb video outputs, Esound audio output D: Gnome and Gtk+ interfaces, Glide and fb video outputs, Esound audio output
D: DVD subtitles decoder D: DVD subtitles decoder
S: France
N: Aaron Holtzman N: Aaron Holtzman
E: aholtzma@ess.engr.uvic.ca E: aholtzma@ess.engr.uvic.ca
D: AC3 decoder D: AC3 decoder
D: MPEG video decoder D: MPEG video decoder
S: Canada
N: Hans-Peter Jansen N: Hans-Peter Jansen
E: hpj@urpla.net E: hpj@urpla.net
D: patch for module options handling D: patch for module options handling
S: Germany
N: Eugenio Jarosiewicz N: Eugenio Jarosiewicz
E: ej0@cise.ufl.edu E: ej0@cise.ufl.edu
C: ej C: ej
D: MacOS X interface, and various fixes D: MacOS X interface, and various fixes
S: USA, Florida
N: Brieuc Jeunhomme N: Brieuc Jeunhomme
E: bbp@via.ecp.fr E: bbp@via.ecp.fr
C: bbp C: bbp
D: Bug fixes D: Bug fixes
S: France
N: Jon Lech Johansen N: Jon Lech Johansen
E: jon-vl@nanocrew.net E: jon-vl@nanocrew.net
...@@ -169,6 +201,7 @@ C: jlj ...@@ -169,6 +201,7 @@ C: jlj
D: PS input fixes D: PS input fixes
D: Win32 DVD input port D: Win32 DVD input port
D: QNX RTOS plug-in D: QNX RTOS plug-in
S: Norway
N: Michel Kaempf N: Michel Kaempf
E: maxx@via.ecp.fr E: maxx@via.ecp.fr
...@@ -176,24 +209,29 @@ C: maxx ...@@ -176,24 +209,29 @@ C: maxx
D: audio output D: audio output
D: AC3 decoder D: AC3 decoder
D: MPEG audio decoder D: MPEG audio decoder
S: France
N: David Kennedy N: David Kennedy
E: dkennedy@tinytoad.com E: dkennedy@tinytoad.com
D: X11 fullscreen patch D: X11 fullscreen patch
S: Canada
N: yvind Kolbu N: yvind Kolbu
E: oyvindk@world-online.no E: oyvindk@world-online.no
D: FreeBSD patches D: FreeBSD patches
S: Norway
N: Andres Krapf N: Andres Krapf
E: dae@via.ecp.fr E: dae@via.ecp.fr
C: dae C: dae
D: FreeBSD port and tests D: FreeBSD port and tests
D: KDE interface D: KDE interface
S: France
N: Mathias Kretschmer N: Mathias Kretschmer
E: mathias@research.att.com E: mathias@research.att.com
D: IP Multicast support D: IP Multicast support
S: USA, New Jersey
N: Michel Lespinasse N: Michel Lespinasse
E: walken@zoy.org E: walken@zoy.org
...@@ -201,19 +239,23 @@ C: walken ...@@ -201,19 +239,23 @@ C: walken
D: AC3 decoder D: AC3 decoder
D: MPEG audio decoder D: MPEG audio decoder
D: MPEG video decoder D: MPEG video decoder
S: USA, California
N: Paul Mackerras N: Paul Mackerras
E: paulus@linuxcare.com.au E: paulus@linuxcare.com.au
D: Altivec IDCT and motion D: AltiVec IDCT and motion
S: Australia
N: Wade Majors N: Wade Majors
E: guru@startrek.com E: guru@startrek.com
D: BeOS testing, icon integration, debugging and fixes D: BeOS testing, icon integration, debugging and fixes
S: USA, Florida
N: Xavier Marchesini N: Xavier Marchesini
E: xav@alarue.net E: xav@alarue.net
C: xav C: xav
D: Win32 fixes D: Win32 fixes
S: France
N: Christophe Massiot N: Christophe Massiot
E: massiot@via.ecp.fr E: massiot@via.ecp.fr
...@@ -222,32 +264,39 @@ D: MPEG PS input ...@@ -222,32 +264,39 @@ D: MPEG PS input
D: bitstream and input core functions D: bitstream and input core functions
D: MPEG video decoder D: MPEG video decoder
D: Many ports D: Many ports
S: France
N: Arkadiusz Miskiewicz N: Arkadiusz Miskiewicz
E: misiek@pld.ORG.PL E: misiek@pld.ORG.PL
D: autoconf and Makefile patches D: autoconf and Makefile patches
S: Poland
N: Fumio Nakayama N: Fumio Nakayama
E: endymion@ca2.so-net.ne.jp E: endymion@ca2.so-net.ne.jp
D: Japanese translation D: Japanese translation
S: Japan
N: Florian G. Pflug N: Florian G. Pflug
E: fgp@phlo.org E: fgp@phlo.org
C: fgp C: fgp
D: MacOS X port D: MacOS X port
S: Austria
N: Olivier Pomel N: Olivier Pomel
E: pomel@via.ecp.fr E: pomel@via.ecp.fr
C: pomel C: pomel
S: France
N: Jean-Paul Saman N: Jean-Paul Saman
E: jpsaman@wxs.nl E: jpsaman@wxs.nl
D: libmad plug-in D: libmad plug-in
D: iPAQ port D: iPAQ port
S: Netherlands
N: Steven M. Schultz N: Steven M. Schultz
E: sms@TO.GD-ES.COM E: sms@TO.GD-ES.COM
D: BSD/OS port D: BSD/OS port
S: USA, California
N: Vincent Seguin N: Vincent Seguin
E: seguin@via.ecp.fr E: seguin@via.ecp.fr
...@@ -256,28 +305,34 @@ D: core vlc structure ...@@ -256,28 +305,34 @@ D: core vlc structure
D: interface and message queue D: interface and message queue
D: YUV transformations D: YUV transformations
D: X11 and GGI video outputs D: X11 and GGI video outputs
S: France
N: Richard Shepherd N: Richard Shepherd
E: richard@rshepherd.demon.co.uk E: richard@rshepherd.demon.co.uk
C: richards C: richards
D: BeOS video output (BBitmap and Overlay) D: BeOS video output (BBitmap and Overlay)
S: United Kingdom
N: Espen Skoglund N: Espen Skoglund
E: esk@ira.uka.de E: esk@ira.uka.de
D: FreeBSD autoconf and Makefile patches D: FreeBSD autoconf and Makefile patches
S: Germany
N: Benoit Steiner N: Benoit Steiner
E: benny@via.ecp.fr E: benny@via.ecp.fr
C: benny C: benny
D: MPEG system input D: MPEG system input
D: network input D: network input
S: USA, California
N: Peter Surda N: Peter Surda
E: shurdeek@panorama.sth.ac.at E: shurdeek@panorama.sth.ac.at
D: rc plugin for vlc control through /dev/stdin D: rc plugin for vlc control through /dev/stdin
S: Austria
N: Olivier Teulire N: Olivier Teulire
E: ipkiss@via.ecp.fr E: ipkiss@via.ecp.fr
C: ipkiss C: ipkiss
D: WIN32 interface D: Win32 interface
S: France
configure
View file @ db10e796
...@@ -647,7 +647,6 @@ fi ...@@ -647,7 +647,6 @@ fi
ac_aux_dir= ac_aux_dir=
for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
if test -f $ac_dir/install-sh; then if test -f $ac_dir/install-sh; then
...@@ -695,7 +694,7 @@ else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; } ...@@ -695,7 +694,7 @@ else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; }
fi fi
echo $ac_n "checking host system type""... $ac_c" 1>&6 echo $ac_n "checking host system type""... $ac_c" 1>&6
echo "configure:699: checking host system type" >&5 echo "configure:698: checking host system type" >&5
host_alias=$host host_alias=$host
case "$host_alias" in case "$host_alias" in
...@@ -716,7 +715,7 @@ host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` ...@@ -716,7 +715,7 @@ host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
echo "$ac_t""$host" 1>&6 echo "$ac_t""$host" 1>&6
echo $ac_n "checking target system type""... $ac_c" 1>&6 echo $ac_n "checking target system type""... $ac_c" 1>&6
echo "configure:720: checking target system type" >&5 echo "configure:719: checking target system type" >&5
target_alias=$target target_alias=$target
case "$target_alias" in case "$target_alias" in
...@@ -734,7 +733,7 @@ target_os=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` ...@@ -734,7 +733,7 @@ target_os=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
echo "$ac_t""$target" 1>&6 echo "$ac_t""$target" 1>&6
echo $ac_n "checking build system type""... $ac_c" 1>&6 echo $ac_n "checking build system type""... $ac_c" 1>&6
echo "configure:738: checking build system type" >&5 echo "configure:737: checking build system type" >&5
build_alias=$build build_alias=$build
case "$build_alias" in case "$build_alias" in
...@@ -757,6 +756,7 @@ test "$host_alias" != "$target_alias" && ...@@ -757,6 +756,7 @@ test "$host_alias" != "$target_alias" &&
program_prefix=${target_alias}- program_prefix=${target_alias}-
PACKAGE="vlc"
VERSION="0.3.0" VERSION="0.3.0"
CODENAME=Ourumov CODENAME=Ourumov
...@@ -1295,7 +1295,7 @@ fi ...@@ -1295,7 +1295,7 @@ fi
ALL_LINGUAS="de fr ja no ru nl" ALL_LINGUAS="de fr ja no ru nl"
cat >> confdefs.h <<EOF cat >> confdefs.h <<EOF
#define VLC_PACKAGE "vlc" #define VLC_PACKAGE "$PACKAGE"
EOF EOF
cat >> confdefs.h <<EOF cat >> confdefs.h <<EOF
...@@ -4468,7 +4468,7 @@ else ...@@ -4468,7 +4468,7 @@ else
fi fi
done done
for ac_hdr in sys/sockio.h fcntl.h sys/time.h sys/times.h for ac_hdr in sys/sockio.h fcntl.h sys/types.h sys/time.h sys/times.h
do do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
...@@ -5498,7 +5498,7 @@ rm -f conftest* ...@@ -5498,7 +5498,7 @@ rm -f conftest*
fi fi
echo "$ac_t""$ac_cv_sse_inline" 1>&6 echo "$ac_t""$ac_cv_sse_inline" 1>&6
if test x"$ac_cv_sse_inline" != x"no"; then if test x"$ac_cv_sse_inline" != x"no" -a x$SYS != xmingw32; then
cat >> confdefs.h <<\EOF cat >> confdefs.h <<\EOF
#define CAN_COMPILE_SSE 1 #define CAN_COMPILE_SSE 1
EOF EOF
...@@ -7790,7 +7790,7 @@ EOF ...@@ -7790,7 +7790,7 @@ EOF
if test -f conftest.c if test -f conftest.c
then then
if ${CC-cc} conftest.c -o conftest.o >config.log 2>&1 \ if ${CC-cc} -c conftest.c -o conftest.o >config.log 2>&1 \
&& test -f conftest.o && test -f conftest.o
then then
if test "`strings conftest.o | grep BIGenDianSyS`" if test "`strings conftest.o | grep BIGenDianSyS`"
...@@ -8010,7 +8010,7 @@ then ...@@ -8010,7 +8010,7 @@ then
fi fi
cat >> confdefs.h <<EOF cat >> confdefs.h <<EOF
#define VERSION_MESSAGE "vlc $VERSION $CODENAME Copyright 1996-2002 VideoLAN\n" #define VERSION_MESSAGE "vlc $VERSION $CODENAME Copyright 1996-2002 VideoLAN"
EOF EOF
cat >> confdefs.h <<EOF cat >> confdefs.h <<EOF
...@@ -8325,8 +8325,8 @@ s%@TUNING@%$TUNING%g ...@@ -8325,8 +8325,8 @@ s%@TUNING@%$TUNING%g
s%@RELEASE@%$RELEASE%g s%@RELEASE@%$RELEASE%g
s%@MOC@%$MOC%g s%@MOC@%$MOC%g
s%@BCBUILDER@%$BCBUILDER%g s%@BCBUILDER@%$BCBUILDER%g
s%@VLC_PACKAGE@%$VLC_PACKAGE%g s%@PACKAGE@%$PACKAGE%g
s%@VLC_VERSION@%$VLC_VERSION%g s%@VERSION@%$VERSION%g
s%@NEED_GETOPT@%$NEED_GETOPT%g s%@NEED_GETOPT@%$NEED_GETOPT%g
s%@CFLAGS_OPTIM@%$CFLAGS_OPTIM%g s%@CFLAGS_OPTIM@%$CFLAGS_OPTIM%g
s%@CFLAGS_OPTIM_NODEBUG@%$CFLAGS_OPTIM_NODEBUG%g s%@CFLAGS_OPTIM_NODEBUG@%$CFLAGS_OPTIM_NODEBUG%g
......
configure.in
View file @ db10e796
dnl Autoconf settings for vlc dnl Autoconf settings for vlc
AC_INIT(include/main.h) AC_INIT(include/main.h)
AC_CONFIG_HEADER(include/defs.h) AC_CONFIG_HEADER(include/defs.h)
AC_CANONICAL_SYSTEM AC_CANONICAL_SYSTEM
PACKAGE="vlc"
VERSION="0.3.0" VERSION="0.3.0"
CODENAME=Ourumov CODENAME=Ourumov
...@@ -41,7 +41,7 @@ fi ...@@ -41,7 +41,7 @@ fi
dnl Gettext stuff dnl Gettext stuff
ALL_LINGUAS="de fr ja no ru nl" ALL_LINGUAS="de fr ja no ru nl"
AC_DEFINE_UNQUOTED(VLC_PACKAGE, "vlc", [Package name]) AC_DEFINE_UNQUOTED(VLC_PACKAGE, "$PACKAGE", [Package name])
AC_DEFINE_UNQUOTED(VLC_VERSION, "$VERSION", [Package version]) AC_DEFINE_UNQUOTED(VLC_VERSION, "$VERSION", [Package version])
AM_GNU_GETTEXT AM_GNU_GETTEXT
...@@ -185,7 +185,7 @@ AC_EGREP_HEADER(strncasecmp,strings.h,[ ...@@ -185,7 +185,7 @@ AC_EGREP_HEADER(strncasecmp,strings.h,[
dnl Check for headers dnl Check for headers
AC_CHECK_HEADERS(getopt.h strings.h) AC_CHECK_HEADERS(getopt.h strings.h)
AC_CHECK_HEADERS(sys/sockio.h fcntl.h sys/time.h sys/times.h) AC_CHECK_HEADERS(sys/sockio.h fcntl.h sys/types.h sys/time.h sys/times.h)
AC_CHECK_HEADERS(dlfcn.h image.h) AC_CHECK_HEADERS(dlfcn.h image.h)
AC_CHECK_HEADERS(arpa/inet.h net/if.h netinet/in.h sys/socket.h) AC_CHECK_HEADERS(arpa/inet.h net/if.h netinet/in.h sys/socket.h)
AC_CHECK_HEADERS(machine/param.h sys/shm.h) AC_CHECK_HEADERS(machine/param.h sys/shm.h)
...@@ -432,7 +432,7 @@ AC_CACHE_CHECK([if \$CC groks SSE inline assembly], ...@@ -432,7 +432,7 @@ AC_CACHE_CHECK([if \$CC groks SSE inline assembly],
[ac_cv_sse_inline], [ac_cv_sse_inline],
[AC_TRY_COMPILE(,[void *p;asm volatile("xorps %%xmm1,%%xmm2"::"r"(p));], [AC_TRY_COMPILE(,[void *p;asm volatile("xorps %%xmm1,%%xmm2"::"r"(p));],
ac_cv_sse_inline=yes, ac_cv_sse_inline=no)]) ac_cv_sse_inline=yes, ac_cv_sse_inline=no)])
if test x"$ac_cv_sse_inline" != x"no"; then if test x"$ac_cv_sse_inline" != x"no" -a x$SYS != xmingw32; then
AC_DEFINE(CAN_COMPILE_SSE, 1, Define if \$CC groks SSE inline assembly.) AC_DEFINE(CAN_COMPILE_SSE, 1, Define if \$CC groks SSE inline assembly.)
ACCEL_MODULES="${ACCEL_MODULES} ${SSE_MODULES}" ACCEL_MODULES="${ACCEL_MODULES} ${SSE_MODULES}"
fi fi
...@@ -1313,7 +1313,7 @@ EOF ...@@ -1313,7 +1313,7 @@ EOF
] ]
if test -f conftest.c if test -f conftest.c
then then
if ${CC-cc} conftest.c -o conftest.o >config.log 2>&1 \ if ${CC-cc} -c conftest.c -o conftest.o >config.log 2>&1 \
&& test -f conftest.o && test -f conftest.o
then then
if test "`strings conftest.o | grep BIGenDianSyS`" if test "`strings conftest.o | grep BIGenDianSyS`"
...@@ -1411,7 +1411,7 @@ fi ...@@ -1411,7 +1411,7 @@ fi
dnl dnl
dnl Stuff used by the program dnl Stuff used by the program
dnl dnl
AC_DEFINE_UNQUOTED(VERSION_MESSAGE, "vlc $VERSION $CODENAME Copyright 1996-2002 VideoLAN\n", [Simple version string]) AC_DEFINE_UNQUOTED(VERSION_MESSAGE, "vlc $VERSION $CODENAME Copyright 1996-2002 VideoLAN", [Simple version string])
AC_DEFINE_UNQUOTED(COPYRIGHT_MESSAGE, "VideoLAN Client - version $VERSION $CODENAME - (c) 1996-2002 VideoLAN", [Copyright string]) AC_DEFINE_UNQUOTED(COPYRIGHT_MESSAGE, "VideoLAN Client - version $VERSION $CODENAME - (c) 1996-2002 VideoLAN", [Copyright string])
VLC_SYMBOL="`echo ${VERSION} | tr .- __`" VLC_SYMBOL="`echo ${VERSION} | tr .- __`"
...@@ -1441,8 +1441,8 @@ AC_SUBST(RELEASE) ...@@ -1441,8 +1441,8 @@ AC_SUBST(RELEASE)
AC_SUBST(MOC) AC_SUBST(MOC)
AC_SUBST(WINDRES) AC_SUBST(WINDRES)
AC_SUBST(BCBUILDER) AC_SUBST(BCBUILDER)
AC_SUBST(VLC_PACKAGE) AC_SUBST(PACKAGE)
AC_SUBST(VLC_VERSION) AC_SUBST(VERSION)
AC_SUBST(NEED_GETOPT) AC_SUBST(NEED_GETOPT)
AC_SUBST(CFLAGS_OPTIM) AC_SUBST(CFLAGS_OPTIM)
......
include/common.h
View file @ db10e796
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
* Collection of useful common types and macros definitions * Collection of useful common types and macros definitions
***************************************************************************** *****************************************************************************
* Copyright (C) 1998, 1999, 2000 VideoLAN * Copyright (C) 1998, 1999, 2000 VideoLAN
* $Id: common.h,v 1.93 2002/04/05 03:27:27 sam Exp $ * $Id: common.h,v 1.94 2002/04/17 11:43:31 sam Exp $
* *
* Authors: Samuel Hocevar <sam@via.ecp.fr> * Authors: Samuel Hocevar <sam@via.ecp.fr>
* Vincent Seguin <seguin@via.ecp.fr> * Vincent Seguin <seguin@via.ecp.fr>
...@@ -27,8 +27,13 @@ ...@@ -27,8 +27,13 @@
/***************************************************************************** /*****************************************************************************
* Required system headers * Required system headers
*****************************************************************************/ *****************************************************************************/
#include <string.h> /* strerror() */ #ifdef HAVE_STRING_H
#include <sys/types.h> # include <string.h> /* strerror() */
#endif
#ifdef HAVE_SYS_TYPES_H
# include <sys/types.h>
#endif
/***************************************************************************** /*****************************************************************************
* Basic types definitions * Basic types definitions
...@@ -476,14 +481,21 @@ typedef __int64 off_t; ...@@ -476,14 +481,21 @@ typedef __int64 off_t;
/***************************************************************************** /*****************************************************************************
* I18n stuff * I18n stuff
*****************************************************************************/ *****************************************************************************/
#ifndef PACKAGE #ifndef PACKAGE /* Borland C++ uses this ! */
#define PACKAGE VLC_PACKAGE #define PACKAGE VLC_PACKAGE
#endif #endif
#define VERSION VLC_VERSION #define VERSION VLC_VERSION
#if defined( ENABLE_NLS ) && defined ( HAVE_GETTEXT ) && !defined( __BORLANDC__ ) #if defined( ENABLE_NLS ) && defined ( HAVE_GETTEXT ) && !defined( __BORLANDC__ ) && !defined( MODULE_NAME_IS_gnome )
# include <libintl.h> # include <libintl.h>
#else # undef _
# define _(String) dgettext (PACKAGE, String)
# ifdef gettext_noop
# define N_(String) gettext_noop (String)
# else
# define N_(String) (String)
# endif
#elif !defined( MODULE_NAME_IS_gnome )
# define _(String) (String) # define _(String) (String)
# define N_(String) (String) # define N_(String) (String)
#endif #endif
......
include/defs.h.in
View file @ db10e796
...@@ -295,6 +295,9 @@ ...@@ -295,6 +295,9 @@
/* Define if you have the <sys/times.h> header file. */ /* Define if you have the <sys/times.h> header file. */
#undef HAVE_SYS_TIMES_H #undef HAVE_SYS_TIMES_H
/* Define if you have the <sys/types.h> header file. */
#undef HAVE_SYS_TYPES_H
/* Define if you have the <unistd.h> header file. */ /* Define if you have the <unistd.h> header file. */
#undef HAVE_UNISTD_H #undef HAVE_UNISTD_H
......
src/interface/main.c
View file @ db10e796
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
* and spawn threads. * and spawn threads.
***************************************************************************** *****************************************************************************
* Copyright (C) 1998-2001 VideoLAN * Copyright (C) 1998-2001 VideoLAN
* $Id: main.c,v 1.178 2002/04/15 14:06:19 jobi Exp $ * $Id: main.c,v 1.179 2002/04/17 11:43:31 sam Exp $
* *
* Authors: Vincent Seguin <seguin@via.ecp.fr> * Authors: Vincent Seguin <seguin@via.ecp.fr>
* Samuel Hocevar <sam@zoy.org> * Samuel Hocevar <sam@zoy.org>
...@@ -1057,7 +1057,8 @@ static void Version( void ) ...@@ -1057,7 +1057,8 @@ static void Version( void )
ShowConsole(); ShowConsole();
#endif #endif
intf_Msg( VERSION_MESSAGE intf_Msg( VERSION_MESSAGE );
intf_Msg(
"This program comes with NO WARRANTY, to the extent permitted by " "This program comes with NO WARRANTY, to the extent permitted by "
"law.\nYou may redistribute it under the terms of the GNU General " "law.\nYou may redistribute it under the terms of the GNU General "
"Public License;\nsee the file named COPYING for details.\n" "Public License;\nsee the file named COPYING for details.\n"
...@@ -1141,12 +1142,14 @@ static void IllegalSignalHandler( int i_signal ) ...@@ -1141,12 +1142,14 @@ static void IllegalSignalHandler( int i_signal )
sigrelse( i_signal ); sigrelse( i_signal );
#endif #endif
#if defined( __i386__ )
fprintf( stderr, "warning: your CPU has %s instructions, but not your " fprintf( stderr, "warning: your CPU has %s instructions, but not your "
"operating system.\n", psz_capability ); "operating system.\n", psz_capability );
fprintf( stderr, " some optimizations will be disabled unless " fprintf( stderr, " some optimizations will be disabled unless "
"you upgrade your OS\n" ); "you upgrade your OS\n" );
#ifdef SYS_LINUX # if defined( SYS_LINUX )
fprintf( stderr, " (for instance Linux kernel 2.4.x or later)" ); fprintf( stderr, " (for instance Linux kernel 2.4.x or later)\n" );
# endif
#endif #endif
longjmp( env, 1 ); longjmp( env, 1 );
......
src/misc/configuration.c
View file @ db10e796
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* configuration.c management of the modules configuration * configuration.c management of the modules configuration
***************************************************************************** *****************************************************************************
* Copyright (C) 2001 VideoLAN * Copyright (C) 2001 VideoLAN
* $Id: configuration.c,v 1.13 2002/04/02 11:31:36 ipkiss Exp $ * $Id: configuration.c,v 1.14 2002/04/17 11:43:31 sam Exp $
* *
* Authors: Gildas Bazin <gbazin@netcourrier.com> * Authors: Gildas Bazin <gbazin@netcourrier.com>
* *
...@@ -474,9 +474,10 @@ int config_SaveConfigFile( const char *psz_module_name ) ...@@ -474,9 +474,10 @@ int config_SaveConfigFile( const char *psz_module_name )
#else #else
i = mkdir( psz_filename ); i = mkdir( psz_filename );
#endif #endif
if( i ) if( i && errno != EEXIST )
{ {
intf_ErrMsg("Couldn't create %s (%s)", psz_filename, strerror(errno)); intf_ErrMsg( "config error: couldn't create %s (%s)",
psz_filename, strerror(errno) );
} }
strcat( psz_filename, "/" CONFIG_FILE ); strcat( psz_filename, "/" CONFIG_FILE );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment