Commit f70672fe authored by Christophe Massiot's avatar Christophe Massiot

* configure.ac: Worked around a bug in the OS X linker, with multiply

  defined symbols and libmp3lame
* Makefile.am: Build po before . because we need the po files to build
  VLC.app
* po/fr.po: French translation courtesy of Jean-Pierre Kuypers
* OS X interface: cosmetics
parent 913debaf
...@@ -7,7 +7,7 @@ NULL = ...@@ -7,7 +7,7 @@ NULL =
# SUBDIRS stores the directories where a "make" is required when building # SUBDIRS stores the directories where a "make" is required when building
# something. DIST_SUBDIRS stores the directories where nothing is built but # something. DIST_SUBDIRS stores the directories where nothing is built but
# which have makefiles with distribution information. # which have makefiles with distribution information.
SUBDIRS = intl modules . mozilla share po m4 SUBDIRS = intl modules po mozilla share m4 .
DIST_SUBDIRS = $(SUBDIRS) src debian doc ipkg lib autotools DIST_SUBDIRS = $(SUBDIRS) src debian doc ipkg lib autotools
EXTRA_DIST = \ EXTRA_DIST = \
......
dnl Autoconf settings for vlc dnl Autoconf settings for vlc
dnl $Id: configure.ac,v 1.44 2003/07/27 21:35:50 jpsaman Exp $ dnl $Id: configure.ac,v 1.45 2003/07/28 21:41:20 massiot Exp $
AC_INIT(vlc,0.6.1-test1) AC_INIT(vlc,0.6.1-test1)
...@@ -1506,7 +1506,10 @@ if test "${enable_ffmpeg}" != "no" ...@@ -1506,7 +1506,10 @@ if test "${enable_ffmpeg}" != "no"
then then
AC_ARG_WITH(ffmpeg-mp3lame, AC_ARG_WITH(ffmpeg-mp3lame,
[ --with-ffmpeg-mp3lame if ffmpeg has been compiled with mp3lame support], [ --with-ffmpeg-mp3lame if ffmpeg has been compiled with mp3lame support],
[ AX_ADD_LDFLAGS([stream_out_transcode],[-lmp3lame]) [
dnl XXX: we don't link with -lavcodec a 2nd time because the OS X
dnl linker would miserably barf on multiple definitions.
AX_ADD_LDFLAGS([stream_out_transcode],[])
AX_ADD_LDFLAGS([ffmpeg],[-lmp3lame]) ]) AX_ADD_LDFLAGS([ffmpeg],[-lmp3lame]) ])
AC_ARG_WITH(ffmpeg-tree, AC_ARG_WITH(ffmpeg-tree,
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* output.m: MacOS X Output Dialog * output.m: MacOS X Output Dialog
***************************************************************************** *****************************************************************************
* Copyright (C) 2002-2003 VideoLAN * Copyright (C) 2002-2003 VideoLAN
* $Id: output.m,v 1.11 2003/07/27 23:05:41 hartman Exp $ * $Id: output.m,v 1.12 2003/07/28 21:41:20 massiot Exp $
* *
* Authors: Jon Lech Johansen <jon-vl@nanocrew.net> * Authors: Jon Lech Johansen <jon-vl@nanocrew.net>
* Christophe Massiot <massiot@via.ecp.fr> * Christophe Massiot <massiot@via.ecp.fr>
...@@ -260,8 +260,8 @@ ...@@ -260,8 +260,8 @@
else if( [o_mode isEqualToString: _NS("RTP")] ) else if( [o_mode isEqualToString: _NS("RTP")] )
{ {
[o_stream_address setEnabled: YES]; [o_stream_address setEnabled: YES];
[o_stream_ttl setEnabled: NO]; [o_stream_ttl setEnabled: YES];
[o_stream_ttl_stp setEnabled: NO]; [o_stream_ttl_stp setEnabled: YES];
[[o_mux_selector itemAtIndex: 1] setEnabled: NO]; [[o_mux_selector itemAtIndex: 1] setEnabled: NO];
[[o_mux_selector itemAtIndex: 2] setEnabled: NO]; [[o_mux_selector itemAtIndex: 2] setEnabled: NO];
[[o_mux_selector itemAtIndex: 3] setEnabled: NO]; [[o_mux_selector itemAtIndex: 3] setEnabled: NO];
......
This diff is collapsed.
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