Remove COMPILE_DOMAIN, merge into COMPILE_HOST

diff --git a/configure.ac b/configure.ac
index c27d7d79f7df6f6e467a331161d69f8bb4160396..f8be2f32439733244fa68b25e649776496db168b 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -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

diff --git a/include/vlc_common.h b/include/vlc_common.h
index 14a308101ecbe25e39d7a2935d770ddb3b7ef56e..20d2232971be34a4ea792c6ddad7f154e252a2e8 100644 (file)
--- a/include/vlc_common.h
+++ b/include/vlc_common.h
@@ -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 );
 
 /*****************************************************************************

diff --git a/modules/control/http/http.c b/modules/control/http/http.c
index 7475a0515b3e52b3c1c46fb8fa25746bc970b9d6..69756fd878c74789419cba6f1a963b922c6ceba4 100644 (file)
--- a/modules/control/http/http.c
+++ b/modules/control/http/http.c
@@ -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 );

diff --git a/modules/gui/qt4/dialogs/help.cpp b/modules/gui/qt4/dialogs/help.cpp
index 90b47d05adab9960573366c3f253259d880be225..e37a37215dac3ba1eb0286274898810b566e26f2 100644 (file)
--- a/modules/gui/qt4/dialogs/help.cpp
+++ b/modules/gui/qt4/dialogs/help.cpp
@@ -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

diff --git a/src/libvlc.c b/src/libvlc.c
index b6b990188e112e0b383404bfe786b6f9d498d2dc..cd31fe65311420aaf03151168e908dbd95fb2126 100644 (file)
--- a/src/libvlc.c
+++ b/src/libvlc.c
@@ -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 );
 

diff --git a/src/libvlccore.sym b/src/libvlccore.sym
index f498526b060278718709019ac9b5da1d7dc9f4fc..8a6bbd739821c35bd4474924848f558ab64ac574 100644 (file)
--- a/src/libvlccore.sym
+++ b/src/libvlccore.sym
@@ -461,7 +461,6 @@ vlc_b64_encode_binary
 vlc_cancel
 vlc_clone
 VLC_CompileBy
-VLC_CompileDomain
 VLC_CompileHost
 VLC_Compiler
 vlc_cond_broadcast

diff --git a/src/version.c b/src/version.c
index 5d6c9357fb73b642aff4e9d320f6a4c889a13744..0dc70f3184b6369a84a59794b5114138d2052b55 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -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 )