* include/vlc_common.h:

    + Use PACKAGE_NAME instead of PACKAGE.
  * modules/codec/ffmpeg/ffmpeg.c:
    + This module does not require AltiVec for now.

diff --git a/include/vlc_common.h b/include/vlc_common.h
index e748ae2759678dec7400d99d638a275ff7ee69d1..88130e909d6b8904e92fbd5972204a5361322b37 100644 (file)
--- a/include/vlc_common.h
+++ b/include/vlc_common.h
@@ -38,6 +38,13 @@
 
 #include "config.h"
 
+#if !defined(PACKAGE_NAME)
+#   define PACKAGE_NAME PACKAGE
+#endif
+#if !defined(PACKAGE_VERSION)
+#   define PACKAGE_VERSION VERSION
+#endif
+
 #if defined( __BORLANDC__ )
 #   undef HAVE_VARIADIC_MACROS
 #   undef HAVE_STDINT_H
@@ -929,17 +936,13 @@ VLC_EXPORT( char *, vlc_dgettext, ( const char *package, const char *msgid ) );
       defined(MODULE_NAME_IS_pda))
     /* Declare nothing: gnome.h will do it for us */
 #elif defined( ENABLE_NLS )
-#if defined( HAVE_INCLUDED_GETTEXT )
-#   include "libintl.h"
-#else
-#   include <libintl.h>
-#endif
+#   if defined( HAVE_INCLUDED_GETTEXT )
+#       include "libintl.h"
+#   else
+#       include <libintl.h>
+#   endif
 #   undef _
-#if defined( __BORLANDC__ )
-#define _(String) vlc_dgettext (PACKAGE_TARNAME, String)
-#else
-#   define _(String) vlc_dgettext (PACKAGE, String)
-#endif
+#   define _(String) vlc_dgettext (PACKAGE_NAME, String)
 #   define N_(String) ((char*)(String))
 #else
 #   define _(String) ((char*)(String))

diff --git a/modules/codec/ffmpeg/ffmpeg.c b/modules/codec/ffmpeg/ffmpeg.c
index e7855054d45544e27278a3ebd8cddce452df3972..1acd0a14baac085b0e88b9f33b9b6ee4fb2b5c47 100644 (file)
--- a/modules/codec/ffmpeg/ffmpeg.c
+++ b/modules/codec/ffmpeg/ffmpeg.c
@@ -81,7 +81,7 @@ vlc_module_begin();
 #if defined(MODULE_NAME_is_ffmpegaltivec) \
      || (defined(CAN_COMPILE_ALTIVEC) && !defined(NO_ALTIVEC_IN_FFMPEG))
     set_description( _("AltiVec ffmpeg audio/video decoder ((MS)MPEG4,SVQ1,H263,WMV,WMA)") );
-    add_requirement( ALTIVEC );
+    /*add_requirement( ALTIVEC );*/
     set_capability( "decoder", 71 );
 #else
     set_description( _("ffmpeg audio/video decoder ((MS)MPEG4,SVQ1,H263,WMV,WMA)") );

diff --git a/modules/gui/wxwindows/interface.cpp b/modules/gui/wxwindows/interface.cpp
index 80f4229bf87132c81419f513c9aa6c8926f2ab53..95dd24a78e619693938721bf84744b63f8a4aad4 100644 (file)
--- a/modules/gui/wxwindows/interface.cpp
+++ b/modules/gui/wxwindows/interface.cpp
@@ -663,7 +663,7 @@ void Interface::OnExit( wxCommandEvent& WXUNUSED(event) )
 void Interface::OnAbout( wxCommandEvent& WXUNUSED(event) )
 {
     wxString msg;
-    msg.Printf( wxString(wxT("VLC media player " VERSION)) +
+    msg.Printf( wxString(wxT("VLC media player " PACKAGE_VERSION)) +
         wxU(_(" (wxWindows interface)\n\n")) +
         wxU(_("(c) 1996-2004 - the VideoLAN Team\n\n")) +
         wxU( vlc_wraptext(INTF_ABOUT_MSG,WRAPCOUNT,ISUTF8) ) + wxT("\n\n") +

diff --git a/modules/mux/ogg.c b/modules/mux/ogg.c
index 7fc3ae0260602989597e4bd49e6028463eee7bc1..348790f65e635d522f4bb5c3b789e75512e631c6 100644 (file)
--- a/modules/mux/ogg.c
+++ b/modules/mux/ogg.c
@@ -725,7 +725,8 @@ static block_t *OggCreateHeader( sout_mux_t *p_mux, mtime_t i_dts )
 
             /* comment */
             com[0] = PACKET_TYPE_COMMENT;
-            i_com = snprintf( &com[1], 128, VERSION" stream output" ) + 1;
+            i_com = snprintf( &com[1], 128, PACKAGE_VERSION" stream output" )
+                     + 1;
             op.packet = com;
             op.bytes  = i_com;
             op.b_o_s  = 0;

diff --git a/src/libvlc.c b/src/libvlc.c
index 83f9cec58d3110ef351ed6c41ed5b988a8c79b6c..09a1838b65047d47b4d3e61b9b83a7fc55e299f0 100644 (file)
--- a/src/libvlc.c
+++ b/src/libvlc.c
@@ -408,10 +408,10 @@ int VLC_Init( int i_object, int i_argc, char *ppsz_argv[] )
         /* Translate "C" to the language code: "fr", "en_GB", "nl", "ru"... */
         msg_Dbg( p_vlc, "translation test: code is \"%s\"", _("C") );
 
-        textdomain( PACKAGE );
+        textdomain( PACKAGE_NAME );
 
 #if defined( ENABLE_UTF8 )
-        bind_textdomain_codeset( PACKAGE, "UTF-8" );
+        bind_textdomain_codeset( PACKAGE_NAME, "UTF-8" );
 #endif
 
         module_EndBank( p_vlc );
@@ -1758,17 +1758,17 @@ static void SetLanguage ( char const *psz_lang )
               "locale" );
     psz_path = psz_tmp;
 #endif
-    if( !bindtextdomain( PACKAGE, psz_path ) )
+    if( !bindtextdomain( PACKAGE_NAME, psz_path ) )
     {
         fprintf( stderr, "warning: no domain %s in directory %s\n",
-                 PACKAGE, psz_path );
+                 PACKAGE_NAME, psz_path );
     }
 
     /* Set the default domain */
-    textdomain( PACKAGE );
+    textdomain( PACKAGE_NAME );
 
 #if defined( ENABLE_UTF8 )
-    bind_textdomain_codeset( PACKAGE, "UTF-8" );
+    bind_textdomain_codeset( PACKAGE_NAME, "UTF-8" );
 #endif
 
 #endif