Propagate changes from previous commit

diff --git a/include/vlc_common.h b/include/vlc_common.h
index 4f0e3ae9df7e0085b3e132becc69c994ac6a65bc..461de6f86ba391f092e0c0786d2b228d7e87773a 100644 (file)
--- a/include/vlc_common.h
+++ b/include/vlc_common.h
@@ -1145,14 +1145,16 @@ VLC_EXPORT( const char *, VLC_CompileBy, ( void ) );
 VLC_EXPORT( const char *, VLC_CompileHost, ( void ) );
 VLC_EXPORT( const char *, VLC_CompileDomain, ( void ) );
 VLC_EXPORT( const char *, VLC_Compiler, ( void ) );
-VLC_EXPORT( const char *, VLC_Changeset, ( void ) );
 VLC_EXPORT( const char *, VLC_Error, ( int ) );
 
 /*****************************************************************************
  * Additional vlc stuff
  *****************************************************************************/
 #ifndef HAVE_SHARED_LIBVLC
+VLC_EXPORT( const char *, VLC_Changeset, ( void ) );
 #   include "vlc_symbols.h"
+#else
+#   define VLC_Changeset( ) ("exported")
 #endif
 #include "os_specific.h"
 #include "vlc_messages.h"

diff --git a/modules/control/http/http.c b/modules/control/http/http.c
index 36248fed6d3529a9e3dc6a786e10a83570362619..eb58e7db6c05c6ea77c453bdebf0fc1f625fd12f 100644 (file)
--- a/modules/control/http/http.c
+++ b/modules/control/http/http.c
@@ -538,7 +538,9 @@ static void ParseExecute( httpd_file_sys_t *p_args, char *p_buffer,
     E_(mvar_AppendNewVar)( p_args->vars, "vlc_compile_domain",
                            VLC_CompileDomain() );
     E_(mvar_AppendNewVar)( p_args->vars, "vlc_compiler", VLC_Compiler() );
+#ifndef HAVE_SHARED_LIBVLC
     E_(mvar_AppendNewVar)( p_args->vars, "vlc_changeset", VLC_Changeset() );
+#endif
     E_(mvar_AppendNewVar)( p_args->vars, "stream_position", position );
     E_(mvar_AppendNewVar)( p_args->vars, "stream_time", time );
     E_(mvar_AppendNewVar)( p_args->vars, "stream_length", length );

diff --git a/modules/gui/wince/interface.cpp b/modules/gui/wince/interface.cpp
index 10c960e51c8a76e1de047a79dbe0bb50da949b6e..599eb6ba2882e26b84bc6690f0682ccc9d63432f 100644 (file)
--- a/modules/gui/wince/interface.cpp
+++ b/modules/gui/wince/interface.cpp
@@ -498,7 +498,9 @@ LRESULT Interface::WndProc( HWND hwnd, UINT msg, WPARAM wp, LPARAM lp )
                 _("Compiled by ") + VLC_CompileBy() + "@" +
                 VLC_CompileHost() + "." + VLC_CompileDomain() + ".\n" +
                 _("Compiler: ") + VLC_Compiler() + ".\n" +
+#ifndef HAVE_SHARED_LIBVLC
                 _("Based on SVN revision: ") + VLC_Changeset() + ".\n\n" +
+#endif
                 _("The VideoLAN team <videolan@videolan.org>\n"
                   "http://www.videolan.org/");
 

diff --git a/modules/gui/wxwidgets/interface.cpp b/modules/gui/wxwidgets/interface.cpp
index d3566690b991af32c4e467a82ffd9d8f35571756..2d519fb30aa9bdb3828f2fec8e56b665802041a4 100644 (file)
--- a/modules/gui/wxwidgets/interface.cpp
+++ b/modules/gui/wxwidgets/interface.cpp
@@ -919,7 +919,9 @@ void Interface::OnAbout( wxCommandEvent& WXUNUSED(event) )
        wxU(_("Compiled by "))+ wxU(VLC_CompileBy())+ wxU("@") +
        wxU(VLC_CompileHost())+ wxT(".")+ wxU(VLC_CompileDomain())+ wxT(".\n") +
        wxU(_("Compiler: "))+ wxU(VLC_Compiler())+wxT( ".\n") +
+#ifndef HAVE_SHARED_LIBVLC
        wxU(_("Based on SVN revision: "))+wxU(VLC_Changeset())+wxT(".\n\n") +
+#endif
 #ifdef __WXMSW__
         wxU( vlc_wraptext(LICENSE_MSG,WRAPCOUNT) ) + wxT("\n\n") +
 #else