Commit 00dc86ba authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

Remove COMPILE_DOMAIN, merge into COMPILE_HOST

parent 9934051b
......@@ -4912,8 +4912,7 @@ AC_SUBST(VERSION_REVISION)
AC_SUBST(VERSION_EXTRA)
AC_SUBST(COPYRIGHT_YEARS)
AC_DEFINE_UNQUOTED(VLC_COMPILE_BY, "`whoami`", [user who ran configure])
AC_DEFINE_UNQUOTED(VLC_COMPILE_HOST, "`hostname -s 2>/dev/null || hostname`", [host which ran configure])
AC_DEFINE_UNQUOTED(VLC_COMPILE_DOMAIN, "`dnsdomainname 2>/dev/null || domainname 2>/dev/null || echo unknown`", [domain of the host which ran configure])
AC_DEFINE_UNQUOTED(VLC_COMPILE_HOST, "`hostname -f 2>/dev/null || hostname`", [host which ran configure])
AC_DEFINE_UNQUOTED(VLC_COMPILER, "`$CC -v 2>&1 | tail -n 1`", [compiler])
dnl Win32 need s a numerical version_extra.
case $( echo ${VERSION_EXTRA}|wc -m ) in
......
......@@ -861,7 +861,6 @@ static inline void *xrealloc (void *ptr, size_t len)
VLC_EXPORT( const char *, VLC_Version, ( void ) LIBVLC_USED );
VLC_EXPORT( const char *, VLC_CompileBy, ( void ) LIBVLC_USED );
VLC_EXPORT( const char *, VLC_CompileHost, ( void ) LIBVLC_USED );
VLC_EXPORT( const char *, VLC_CompileDomain, ( void ) LIBVLC_USED );
VLC_EXPORT( const char *, VLC_Compiler, ( void ) LIBVLC_USED );
/*****************************************************************************
......
......@@ -431,8 +431,6 @@ static void ParseExecute( httpd_file_sys_t *p_args, char *p_buffer,
mvar_AppendNewVar( p_args->vars, "vlc_compile_by", VLC_CompileBy() );
mvar_AppendNewVar( p_args->vars, "vlc_compile_host",
VLC_CompileHost() );
mvar_AppendNewVar( p_args->vars, "vlc_compile_domain",
VLC_CompileDomain() );
mvar_AppendNewVar( p_args->vars, "vlc_compiler", VLC_Compiler() );
mvar_AppendNewVar( p_args->vars, "stream_position", position );
mvar_AppendNewVar( p_args->vars, "stream_time", time );
......
......@@ -116,8 +116,7 @@ AboutDialog::AboutDialog( intf_thread_t *_p_intf)
"VLC uses its internal codecs and works on essentially every "
"popular platform.\n\n" )
+ qtr( "This version of VLC was compiled by:\n " )
+ qfu( VLC_CompileBy() )+ "@" + qfu( VLC_CompileHost() ) + "."
+ qfu( VLC_CompileDomain() ) + ".\n"
+ qfu( VLC_CompileBy() )+ "@" + qfu( VLC_CompileHost() ) + ".\n"
+ qtr( "Compiler: " ) + qfu( VLC_Compiler() ) + ".\n"
+ qtr( "You are using the Qt4 Interface.\n\n" )
+ qtr( "Copyright (C) " ) + COPYRIGHT_YEARS
......
......@@ -1971,8 +1971,8 @@ static void Version( void )
utf8_fprintf( stdout, _("VLC version %s (%s)\n"), VLC_Version(),
psz_vlc_changeset );
utf8_fprintf( stdout, _("Compiled by %s@%s.%s\n"),
VLC_CompileBy(), VLC_CompileHost(), VLC_CompileDomain() );
utf8_fprintf( stdout, _("Compiled by %s on %s\n"),
VLC_CompileBy(), VLC_CompileHost() );
utf8_fprintf( stdout, _("Compiler: %s\n"), VLC_Compiler() );
utf8_fprintf( stdout, "%s", LICENSE_MSG );
......
......@@ -461,7 +461,6 @@ vlc_b64_encode_binary
vlc_cancel
vlc_clone
VLC_CompileBy
VLC_CompileDomain
VLC_CompileHost
VLC_Compiler
vlc_cond_broadcast
......
......@@ -41,7 +41,7 @@ char const * VLC_Version( void )
}
/*****************************************************************************
* VLC_CompileBy, VLC_CompileHost, VLC_CompileDomain,
* VLC_CompileBy, VLC_CompileHost
* VLC_Compiler, VLC_Changeset
*****************************************************************************/
#define DECLARE_VLC_VERSION( func, var ) \
......@@ -52,5 +52,4 @@ const char * VLC_##func ( void ) \
DECLARE_VLC_VERSION( CompileBy, COMPILE_BY )
DECLARE_VLC_VERSION( CompileHost, COMPILE_HOST )
DECLARE_VLC_VERSION( CompileDomain, COMPILE_DOMAIN )
DECLARE_VLC_VERSION( Compiler, COMPILER )
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